From 614cb0ce301f7dfffb89f771723b4779d8caa8b1 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 10 十二月 2024 16:37:49 +0800
Subject: [PATCH] 流程推进页面返回页面
---
src/views/projectProcess/index.vue | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/src/views/projectProcess/index.vue b/src/views/projectProcess/index.vue
index 18f76a8..969ae34 100644
--- a/src/views/projectProcess/index.vue
+++ b/src/views/projectProcess/index.vue
@@ -185,7 +185,7 @@
v-loading="loading"
:data="projectInfoList"
@selection-change="handleSelectionChange"
- height="60vh"
+ height="100%"
sortable="custom"
:show-overflow-tooltip="true">
<el-table-column type="selection" width="55" align="center"/>
@@ -230,6 +230,7 @@
size="medium"
type="text"
icon="el-icon-view"
+ v-if="scope.row.processInsId"
@click="lookProcessDetail(scope.row)"
>
</el-button>
@@ -271,7 +272,8 @@
/>
<RunProcess ref="runProcess" :show="showRunProcess"
- :now-process-id="nowProcessId"
+ :now-process-def-id="nowProcessDefId"
+ :now-process-ins-id="nowProcessInsId"
:project-info="projectRunFrom"
:process-list="processList"
@close="closeRunProcess">
@@ -304,7 +306,8 @@
},
processList: [],
showRunProcess: false,
- nowProcessId: '',
+ nowProcessDefId: '',
+ nowProcessInsId: '',
isImportOrExport: false,
fileDialogVisible: false,
//鏄惁闇�瑕佹柊澧炴寜閽�(鍌ㄨ搫椤圭洰闇�瑕�)
@@ -389,11 +392,12 @@
methods: {
// 鏌ョ湅璇︽儏
lookProcessDetail(row) {
+ console.log(row.processDefId)
this.$router.push({
path: '/projectFlow/detail',
query: {
projectId: row.id,
- processId: row.flowableProcessId
+ processDefId: row.processDefId
}
})
},
@@ -402,6 +406,8 @@
projectId: null,
projectName: ''
}
+ this.nowProcessDefId = "";
+ this.nowProcessInsId = "";
this.showRunProcess = false
this.getList()
},
@@ -410,7 +416,8 @@
// 鎷垮埌娴佺▼鍒楄〃 TODO 鏍规嵁椤圭洰绫诲瀷鍋氱瓫閫�
getProcessConfigInfoList().then(response => {
this.processList = response.data;
- this.nowProcessId = row.flowableProcessId;
+ this.nowProcessDefId = row.processDefId ? row.processDefId : '';
+ this.nowProcessInsId = row.processInsId ? row.processInsId : '';
// // 闃叉锛歩d娌″彉涓嶈Е鍙戠洃鍚�
// this.$refs.runProcess.setSelect(row.flowableProcessId);
this.projectRunFrom.projectId = row.id;
@@ -477,8 +484,8 @@
getProjectProcess(this.queryParams).then(response => {
this.projectInfoList = response.data;
this.total = response.total;
+ this.loading = false;
});
- this.loading = false;
},
// 鍙栨秷鎸夐挳
cancel() {
--
Gitblit v1.8.0