审批流程

.env.development

@@ -6,9 +6,9 @@ VUE_APP_TITLE = 城发集团招采管理平台
 
 # 接口地址
 # VUE_APP_API_BASEURL = http://www.qdeasydo.com
-# VUE_APP_API_BASEURL = http://192.168.101.93:8810
+VUE_APP_API_BASEURL = http://192.168.101.93:8810
 
-VUE_APP_API_BASEURL = http://172.16.1.150:8810
+# VUE_APP_API_BASEURL = http://172.16.1.150:8810
 # VUE_APP_API_BASEURL = http://172.16.1.132:8810
 
 # 本地端口

src/layout/index.vue

@@ -90,7 +90,7 @@
 
 			// 路由监听高亮
 			showThis() {
-				this.$nextTick(()=> this.active = this.$route.fullPath);
+				this.$nextTick(() => this.active = this.$route.fullPath);
 				this.$store.commit("setRouteShow", true);
 			},
 

src/views/procurement/plan/detail.vue

@@ -88,7 +88,7 @@
 				});
 			},
 			
-			submit(mode, templateId) {
+			submit(mode, templateId, userTaskAssigneePropsList) {
                 const data = {};
 				for (const key in this.$refs.scPlan.form) {
 					if (key == "folders") {
@@ -105,6 +105,7 @@
 				}
 
 				if (templateId) data["templateId"] = templateId;
+				if (userTaskAssigneePropsList) data["userTaskAssigneePropsList"] = userTaskAssigneePropsList;
 				if (mode == "resubmit") data["processTaskId"] = this.form.processTaskId;
 
 				this.isSaveing = true;
@@ -116,8 +117,8 @@
 				}).catch(() => this.isSaveing = false);
 			},
 
-			approve(data) {
-				this.submit("saveApprove", data.processDefinitionId || null);
+			approve({ processDefinitionId, userTaskAssigneeDtos }) {
+				this.submit("saveApprove", processDefinitionId || null, userTaskAssigneeDtos || []);
 			}
 		}
 	}

src/views/procurement/process/detail.vue

@@ -86,7 +86,7 @@
                 }).catch(() => false);
 			},
 
-			submit(mode, templateId) {
+			submit(mode, templateId, userTaskAssigneePropsList) {
 				const data = {};
 				for (const key in this.$refs.scApply.form) {
 					if (key == "folders") {
@@ -102,6 +102,7 @@
 					} else data[key] = this.$refs.scApply.form[key];
 				}
 				if (templateId) data["templateId"] = templateId;
+				if (userTaskAssigneePropsList) data["userTaskAssigneePropsList"] = userTaskAssigneePropsList;
 				if (mode == "resubmit") data["processTaskId"] = this.form.processTaskId;
 
 				this.isSaveing = true;
@@ -113,8 +114,8 @@
 				}).catch(() => this.isSaveing = false);
 			},
 
-			approve(data) {
-				this.submit("saveApprove", data.processDefinitionId || null);
+			approve({ processDefinitionId, userTaskAssigneeDtos }) {
+				this.submit("saveApprove", processDefinitionId || null, userTaskAssigneeDtos || []);
 			}
 		}
 	}

src/views/procurement/process/handle.vue

@@ -69,7 +69,6 @@
 			open(mode = "purchase_matter") {
 				this.mode = mode;
 				this.activeName = mode;
-				
 				this.visible = true;
 				return this;
 			},
@@ -101,7 +100,7 @@
 				});
 			},
 
-			submit(mode, templateId) {
+			submit(mode, templateId, userTaskAssigneePropsList) {
 				const data = {};
 				for (const key in this.$refs.scHandler.form) {
 					if (key == "folders") {
@@ -117,6 +116,7 @@
 					} else data[key] = this.$refs.scHandler.form[key];
 				}
 				if (templateId) data["templateId"] = templateId;
+				if (userTaskAssigneePropsList) data["userTaskAssigneePropsList"] = userTaskAssigneePropsList;
 				if (this.mode == "purchase_bid_notice") data["projectId"] = this.$refs.scHandler.apply.projectId || null;
 				if (mode == "resubmit") data["processTaskId"] = this.form.processTaskId;
 				
@@ -129,8 +129,8 @@
 				}).catch(() => this.isSaveing = false);
 			},
 
-			approve(data) {
-				this.submit("saveApprove", data.processDefinitionId || null);
+			approve({ processDefinitionId, userTaskAssigneeDtos }) {
+				this.submit("saveApprove", processDefinitionId || null, userTaskAssigneeDtos || []);
 			}
 		}
 	}

src/views/procurement/process/index.vue

@@ -110,9 +110,7 @@
                     
                     <el-table-column label="是否共用" fixed="right" align="center" width="100">
                         <template #default="scope">
-                            <!-- <template v-if="scope.row.bidNotice.processState == 'ENDED'"> -->
-                                <el-switch :model-value="scope.row.isShare" :loading="loading.share" :active-value="0" :inactive-value="1" @change="val => openShareChange(val, scope.row)"></el-switch>
-                            <!-- </template> -->
+                            <el-switch :model-value="scope.row.isShare" :loading="loading.share" :active-value="0" :inactive-value="1" @change="val => openShareChange(val, scope.row)"></el-switch>
                         </template>
                     </el-table-column>
                     <el-table-column label="是否开启" fixed="right" align="center" width="100">