From be935300089c97ea7477edd6e888a43ab244c44f Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 10 十二月 2024 09:35:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/projectProcess/components/RunProcess.vue |   39 ++++++++++++++++++++++++++-------------
 1 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/src/views/projectProcess/components/RunProcess.vue b/src/views/projectProcess/components/RunProcess.vue
index ce9d718..4331c69 100644
--- a/src/views/projectProcess/components/RunProcess.vue
+++ b/src/views/projectProcess/components/RunProcess.vue
@@ -10,7 +10,7 @@
       <div>
         <div style="display: flex; flex-direction: row; justify-content: center; align-items: center;font-size: 24px">
           <div>褰撳墠娴佺▼锛�</div>
-          <div v-if="nowProcessId">{{selectProcessName}}</div>
+          <div v-if="nowProcessDefId">{{selectProcessName}}<span v-if="nowProcessInsId" style="color: red">锛堣繍琛屼腑锛�</span></div>
           <div v-else>鏈粦瀹氭祦绋�</div>
         </div>
       </div>
@@ -28,6 +28,11 @@
           <el-table-column
             prop="name"
             label="娴佺▼鍚嶇О"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="version"
+            label="娴佺▼鐗堟湰"
           >
           </el-table-column>
           <el-table-column
@@ -74,8 +79,8 @@
         </el-table>
       </div>
       <span slot="footer" class="dialog-footer">
-        <el-button type="danger" @click="startProcess" :disable="!this.selectProcessId">鍚姩娴佺▼</el-button>
-        <el-button type="primary" @click="changeProcess">鍙樻洿</el-button>
+        <el-button type="danger" @click="startProcess" :disabled="(nowProcessInsId !== '') || (selectProcessDefId === '')">鍚姩娴佺▼</el-button>
+        <el-button type="primary" @click="changeProcess" :disabled="((nowProcessDefId === selectProcessDefId) && nowProcessInsId !== '') || selectProcessDefId === '' || nowProcessInsId === ''">娴佺▼鍙樻洿</el-button>
       </span>
     </el-dialog>
   </div>
@@ -100,26 +105,33 @@
       required: true,
       type: Array
     },
-    nowProcessId: {  // 褰撳墠椤圭洰缁戝畾鐨勬祦绋媔d
+    nowProcessDefId: {  // 褰撳墠椤圭洰缁戝畾鐨勫畾涔塱d
       required: true,
       type: String
-    }
+    },
+    nowProcessInsId: {  // 褰撳墠椤圭洰缁戝畾鐨勫疄渚媔d
+      required: true,
+      type: String
+    },
   },
   watch: {
     // 鐩戝惉鍥炴樉鍊�
     projectInfo: {
       handler(newVal, oldVal) {
         console.log("浼犲叆鍊硷細", newVal, this.processList)
-        this.setSelect(this.nowProcessId)
+        this.setSelect(this.nowProcessDefId)
       },
       deep: true
     }
   },
   data() {
     return {
-      selectProcessId: '',  // 缁勪欢鍐呴儴閫変腑鐨勬祦绋媔d
+      selectProcessDefId: '',  // 缁勪欢鍐呴儴閫変腑鐨勬祦绋媔d
       selectProcessName: '',  // 缁勪欢鍐呴儴閫変腑鐨勬祦绋媔d
     }
+  },
+  created() {
+    console.log(this.nowProcessInsId, typeof this.nowProcessInsId, "wwwww")
   },
   methods: {
     setSelect(value) {
@@ -142,25 +154,26 @@
         this.$refs.myTable.toggleRowSelection(val[val.length - 1]);
       }
       if(val.length != 0){
-        this.selectProcessId = val[val.length - 1].id;
-        console.log("閫変腑id锛�", this.selectProcessId)
+        this.selectProcessDefId = val[val.length - 1].id;
+        console.log("閫変腑id锛�", this.selectProcessDefId)
       }
     },
     // 鍚姩娴佺▼
     startProcess() {
-      startProcess(this.projectInfo.projectId, this.selectProcessId).then(res => {
+      startProcess(this.projectInfo.projectId, this.selectProcessDefId).then(res => {
         this.$message.success(res.msg);
+        this.handleClose()
       })
     },
     // 鍙樻洿娴佺▼
     changeProcess() {
-      if (!this.selectProcessId) {
+      if (!this.selectProcessDefId) {
         this.$message.error("閫夊垯涓�涓祦绋嬪悗鎵嶈兘鍙樻洿")
         return
       }
       const data = {
         projectId: this.projectInfo.projectId,
-        flowableProcessId: this.selectProcessId
+        processDefId: this.selectProcessDefId
       }
       projectSetProcess(data).then(res => {
         this.$message.success("鍙樻洿鎴愬姛")
@@ -168,7 +181,7 @@
       })
     },
     handleClose() {
-      this.selectProcessId = ""
+      this.selectProcessDefId = ""
       this.selectProcessName = ""
       this.$emit("close")
     }

--
Gitblit v1.8.0