Merge branch 'dev0.3' of http://36.137.93.232:3000/hf/byte-sailing-new into dev0.3

src/components/process/SendPurchase.vue

@@ -420,21 +420,25 @@ const getDetails = () => {
   if (props.queryData.type && props.queryData.type === "handoverSlip") {
     proxy.post("/contractProduct/getListDetail", ids.value).then((res) => {
       formData.data.purchaseDetailList = res.map((x) => {
-        delete x.id;
-        return {
+        let obj = {
           ...x,
+          dataResource: "1", //来源写死外销合同采购
+          dataResourceId: x.id,
           bussinessId: x.productId,
-          subscribeCount: x.sumPackQuantity,
+          subscribeCount: x.quantity || x.sumPackQuantity || 0,
           purchaseCount: x.sumPurchaseCount || 0,
           count: x.expendQuantity || 0,
           price: null,
           amount: null,
         };
+        delete obj.id;
+        return obj;
       });
     });
   } else {
     proxy.post("/subscribeDetail/detail", { ids: ids.value }).then((res) => {
       formData.data.purchaseDetailList = res.map((x) => ({
+        subscribeDetailId: x.id,
         bussinessId: x.bussinessId,
         goodType: x.productDefinition,
         productCode: x.productCode,
@@ -777,6 +781,11 @@ onMounted(() => {
     ids.value = props.queryData.ids.split(",") || [];
     getDetails();
   }
+  // if (props.queryData.type === "handoverSlip") {
+  //   formData.data.dataResource = "1"; //外销合同采购
+  //   formData.data.dataResourceId = "";
+  // }
+
   if (props.queryData.type === "handoverSlip" && props.queryData.arr) {
     contractData.value = JSON.parse(props.queryData.arr);
     auxiliaryData.value.unshift({

src/views/index.vue

@@ -2,18 +2,27 @@
 	<div class="app-container home">
 		
 		<div class="stat-warp">
-			<ul class="stat-warp" >
-				<li class="theme6">
-					<div class="label">我的待审批</div>
+			<ul>
+				<li class="theme1">
 					<div class="num">{{toBeProcessedData.total}}</div>
+					<div class="label">我的待审批</div>
+					<div class="icon-box">
+						<i class="icon iconfont icon-iconm_waixht"></i>
+					</div>
 				</li>
-				<li class="theme5">
-					<div class="label">我的发起（未结束）</div>
+				<li class="theme2">
 					<div class="num">{{haveInitiatedData.total}}</div>
+					<div class="label">我的发起（未结束）</div>
+					<div class="icon-box">
+						<i class="icon iconfont icon-iconm_wofqd"></i>
+					</div>
 				</li>
 				<li class="theme3">
-					<div class="label">未读消息</div>
 					<div class="num">3</div>
+					<div class="label">未读消息</div>
+					<div class="icon-box">
+						<i class="icon iconfont icon-iconm_unread"></i>
+					</div>
 				</li>
 			</ul>
 		</div>
@@ -73,6 +82,12 @@
 				<div class="commons-title">
 					系统公告
 				</div>
+				<ul class="announcement">
+					<li v-for="i in sendMegData.rows" :key="i.id">
+						<div class="time">{{i.createTime}} <span>系统公告</span></div>
+						<div class="content">{{i.content}}</div>
+					</li>
+				</ul>
 			</div>
 		</div>
 		<!-- <byTableDemo></byTableDemo> -->
@@ -99,13 +114,17 @@ let haveInitiatedData = ref({
 	total:0,
 	rows:[]
 })
+const sendMegData = ref({
+	total:0,
+	rows:[]
+})
 const pushProcessApproval = (row) => {
 	proxy.$router.replace({
 		path: "/platform_manage/process/processApproval",
 		query: {
 			flowKey: row.flowKey,
 			id: row.id,
-			processType:10,
+			processType:20,
 			version:row.version
 		},
 	});
@@ -126,7 +145,12 @@ const getData = (() => {
 	}).then(res=>{
 		haveInitiatedData.value = res
 	})
-	
+	proxy.post('sendMeg/page',{
+		pageNum:1,
+		pageSize:3,
+	}).then(res=>{
+		sendMegData.value = res
+	})
 	
 })
 getData()
@@ -142,6 +166,29 @@ onMounted(() => {})
 
 .app-container {
 	height: 100%;
+	.announcement{
+		padding: 0;
+		margin: 0;
+		li{
+			list-style: none;
+			border-radius: 2px;
+			padding: 14px 20px;
+			background: #EEEEEE;
+			margin-bottom:10px;
+			font-size: 14px;
+			cursor: pointer;
+			.time{
+				color:#999;
+			}
+			.content{
+				margin-top:10px;
+				color:#333;
+			}
+		}
+		li:hover{
+			background: #EFF6FF;
+		}
+	}
 	.table-warp{
 		//页面全屏，占据剩下的位置
 		height: calc(100% - 157px);
@@ -204,35 +251,56 @@ onMounted(() => {})
 				min-width: 285px;
 				box-sizing: border-box;
 				margin-right: 20px;
-				background: #eff6ff;
+				background: linear-gradient(360deg, #C7E3FE 0%, #DFECFF 100%);
 				float: left;
 				overflow: hidden;
 				padding: 20px;
 				color: #333333;
+				position: relative;
 				border-radius: 10px;
 				.label {
 					font-size: 14px;
+					margin-top: 10px;
 				}
 				.label::before {
-					width: 10px;
-					height: 10px;
-					content: '';
-					border-radius: 50%;
-					background: #0084ff;
-					display: inline-block;
-					margin-right: 10px;
+					// width: 10px;
+					// height: 10px;
+					// content: '';
+					// border-radius: 50%;
+					// background: #0084ff;
+					// display: inline-block;
+					// margin-right: 10px;
+					
 				}
 				.num {
-					margin-top: 10px;
+					
 					font-size: 24px;
 					font-weight: bold;
 				}
+				.icon-box{
+					position: absolute;
+					height: 40px;
+					width: 40px;
+					right: 20px;
+					top: 20px;
+					background: #fff;
+					border-radius: 10px;
+					text-align: center;
+					line-height: 40px;
+					i{
+						font-size: 20px;
+						color:#0084FF;
+					}
+				}
 			}
 			//#F5F3FF #9E64ED
 			.theme2 {
-				background: #f5f3ff;
+				background: linear-gradient(180deg, #EAE8FB 0%, #DED9FF 100%);
 				.label::before {
-					background: #9e64ed;
+					background: #7566F0;
+				}
+				.icon-box i {
+					color: #7566F0;
 				}
 			}
 			//#FFF1E1 #FF9315
@@ -241,6 +309,9 @@ onMounted(() => {})
 				.label::before {
 					background: #ff9315;
 				}
+				.icon-box i {
+					color: #FF9315;
+				}
 			}
 			//#E2FBE8 #39C55A
 			.theme4 {

src/views/process/dealWith/index.vue

@@ -163,16 +163,32 @@ const config = computed(() => {
                         },
                         el: 'button',
                         click() {
-                            proxy.$router.replace({
-                                path: "/platform_manage/process/processApproval",
-                                query: {
-                                    flowKey: row.flowKey,
-                                    id: row.id,
-									processType:10,
-									version:row.version
-                                },
-                            });
-                            
+							if(row.status == 1 || row.status == 0) {
+								proxy.$router.push({
+									path: "/platform_manage/process/processApproval",
+									query: {
+										flowKey: row.flowKey,
+										id: row.id,
+										processType:20,
+										version:row.version
+									},
+								});
+								return
+							}
+							proxy.post('flowExample/getApprovalRecord',{id:row.id}).then(res=>{
+								console.log(res)
+								if(res.recordList.length > 0) {
+									proxy.$router.push({
+										path: "/platform_manage/process/processApproval",
+										query: {
+											flowKey: row.flowKey,
+											id: row.id,
+											processType:res.recordList[0].nodeType == 1 && res.recordList[0].status == 2 ? 30 : 10,
+											version:row.version
+										},
+									});
+								}
+							})
                         },
                     } 
 						

src/views/process/processApproval/index.vue

@@ -493,7 +493,7 @@ const getRecords = (_id) => {
   console.log(queryData.data, "222");
 };
 onMounted(async () => {
-  //processType 10 为修改 20为查看
+  //processType 10 为修改 20为查看 30回退发起
   if (route.query.processType == 10 || route.query.processType == 20) {
     await proxy.post("/flowProcess/getStartData", { flowId: route.query.id }).then((res) => {
       queryData.data = { ...res };

src/views/process/processConfig/vueFlow.vue

@@ -75,7 +75,7 @@ import endBtn from './endBtn.vue'
 import handleBtn from './handleBtn.vue'
 import { MiniMap } from "@antv/x6-plugin-minimap";
 import useTagsViewStore from '@/store/modules/tagsView'
-import dataJson from './data.js'
+
 defineProps({
 	title: {
 		type: Object,
@@ -620,6 +620,7 @@ const antvInit = (data) => {
 	})
 	// #endregion
 	graph.on('cell:click', ({ e, x, y, cell, view }) => {
+		console.log(flowDefinitionNodeObj.value)
 		console.log(cell)
 		if (cell.shape === 'start-btn') return
 		if(cell.shape === 'end-btn' || cell.shape === 'edge') {
@@ -840,9 +841,15 @@ const antvInit = (data) => {
 }
 const getFlowInfo =	(()=>{
 	proxy.post('/flowDefinition/getDetails', {id:submitFormData.id}).then((res) => {
-		
 		if(res.lineObject) {
 			flowDefinitionNodeObj.value = JSON.parse(res.lineObject)
+			for (const key in flowDefinitionNodeObj.value) {
+				if(flowDefinitionNodeObj.value[key].nodeButtonSet) {
+					flowDefinitionNodeObj.value[key].nodeButtonSet = flowDefinitionNodeObj.value[key].nodeButtonSet.map(item=>{
+						return item*1
+					})
+				}
+			}
 		}
 		if(res.nodeObject) {
 			antvInit(JSON.parse(res.nodeObject))
@@ -858,7 +865,7 @@ const getFlowInfo =	(()=>{
 					//获取htmlNode节点下的title,修改title的内容
 					htmlNode.getElementsByClassName('title')[0].innerHTML = flowDefinitionNodeObj.value[key].nodeName
 				}
-			}, 100);
+			}, 1000);
 		}
 		dialogVisible.value = false
 	})
@@ -882,7 +889,7 @@ onMounted(() => {
 	submitFormData.tenantId = router.currentRoute.value.query.tenantId
 	if(submitFormData.flowInfoId) {
 		getFlowInfo()
-		//antvInit()
+		// antvInit()
 		// setTimeout(() => {
 		// 	for (let i = 0; i < dataJson.flowDefinitionNodeList.length; i++) {
 		// 		const element = dataJson.flowDefinitionNodeList[i];

src/views/purchaseManage/purchaseManage/handoverSlip/index.vue

@@ -517,7 +517,7 @@ const transferToProduction = (row) => {
     formData.data = {
       list: [
         {
-          sourceId: "1",
+          sourceId: row.id,
           source: "1",
           productId: row.productId,
           productCode: row.productCode,
@@ -532,7 +532,7 @@ const transferToProduction = (row) => {
     formData.data = {
       list: selectData.value.map((item) => {
         return {
-          sourceId: "1",
+          sourceId: item.id,
           source: "1",
           productId: item.productId,
           productCode: item.productCode,
@@ -554,7 +554,7 @@ watch(selectData, (newVal) => {
   } else if (newVal.length == 1) {
     const current = newVal[0];
     sourceList.value.data.forEach((x) => {
-      if (x.contractId !== current.contractId) {
+      if (x.corporationId !== current.corporationId) {
         x.isCheck = false;
       }
     });