From 02cb7ae4d616e943e2b8660044c535db51ef4203 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 27 十一月 2024 16:32:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/projectProcess/index.vue | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/views/projectProcess/index.vue b/src/views/projectProcess/index.vue
index ce1a2f3..af37779 100644
--- a/src/views/projectProcess/index.vue
+++ b/src/views/projectProcess/index.vue
@@ -270,9 +270,8 @@
:currentColumns="columns"
/>
- <RunProcess :show="showRunProcess"
+ <RunProcess ref="runProcess" :show="showRunProcess"
:now-process-id="nowProcessId"
- :now-process-name="nowProcessName"
:project-info="projectRunFrom"
:process-list="processList"
@close="closeRunProcess">
@@ -306,7 +305,6 @@
processList: [],
showRunProcess: false,
nowProcessId: '',
- nowProcessName: '',
isImportOrExport: false,
fileDialogVisible: false,
//鏄惁闇�瑕佹柊澧炴寜閽�(鍌ㄨ搫椤圭洰闇�瑕�)
@@ -390,6 +388,10 @@
},
methods: {
closeRunProcess() {
+ this.projectRunFrom = {
+ projectId: null,
+ projectName: ''
+ }
this.showRunProcess = false
this.getList()
},
@@ -398,10 +400,12 @@
// 鎷垮埌娴佺▼鍒楄〃 TODO 鏍规嵁椤圭洰绫诲瀷鍋氱瓫閫�
getProcessConfigInfoList().then(response => {
this.processList = response.data;
+ this.nowProcessId = row.flowableProcessId;
+ // // 闃叉锛歩d娌″彉涓嶈Е鍙戠洃鍚�
+ // this.$refs.runProcess.setSelect(row.flowableProcessId);
this.projectRunFrom.projectId = row.id;
this.projectRunFrom.projectName = row.projectName;
- this.nowProcessId = row.flowableProcessId;
- this.nowProcessName = row.flowableProcessName;
+
this.showRunProcess = true;
});
},
--
Gitblit v1.8.0