From 7ec9f6515694786d3cb85c0ad7992e98ff971944 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 26 十一月 2024 22:40:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/flowable/definition/index.vue | 41 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 40 insertions(+), 1 deletions(-)
diff --git a/src/views/flowable/definition/index.vue b/src/views/flowable/definition/index.vue
index 3c8e449..d8963ad 100644
--- a/src/views/flowable/definition/index.vue
+++ b/src/views/flowable/definition/index.vue
@@ -92,6 +92,7 @@
<el-table-column label="鎿嶄綔" width="250" fixed="right"class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button @click="handleLoadXml(scope.row)" icon="el-icon-edit-outline" type="text" size="small">璁捐</el-button>
+ <el-button @click="handleConfig(scope.row)" icon="el-icon-edit-outline" type="text" size="small">娴佺▼閰嶇疆</el-button>
<el-button @click="handleAddForm(scope.row)" icon="el-icon-edit-el-icon-s-promotion" type="text" size="small" v-if="scope.row.formId == null">閰嶇疆涓昏〃鍗�</el-button>
<el-button @click="handleUpdateSuspensionState(scope.row)" icon="el-icon-video-pause" type="text" size="small" v-if="scope.row.suspensionState === 1">鎸傝捣</el-button>
<el-button @click="handleUpdateSuspensionState(scope.row)" icon="el-icon-video-play" type="text" size="small" v-if="scope.row.suspensionState === 2">婵�娲�</el-button>
@@ -224,6 +225,11 @@
<!-- append-to-body>-->
<!-- <Model :deployId="deployId"/>-->
<!-- </el-dialog>-->
+
+ <edit-process-config :process-config-show="processConfigShow"
+ :deploy-name="configDeployName"
+ :form="configForm"
+ @close="closeConfig"/>
</div>
</template>
@@ -242,16 +248,29 @@
import { getForm, addDeployForm ,listForm } from "@/api/flowable/form";
import BpmnViewer from '@/components/Process/viewer';
import Model from './model';
+import EditProcessConfig from '@/views/flowable/definition/component/EditProcessConfig';
+import {getProcessConfigInfoByDeploy} from "@/api/projectProcess/processConfigInfo";
export default {
name: "Definition",
dicts: ['sys_process_category'],
components: {
BpmnViewer,
- Model
+ Model,
+ EditProcessConfig
},
data() {
return {
+ configForm: {
+ deployId: '',
+ deployVersion: null,
+ projectType: '', // 椤圭洰绫诲瀷
+ fundType: '', // 璧勯噾绫诲瀷
+ investType: '', // 鎶曡祫绫诲埆
+ importanceType: '', // 閲嶇偣鍒嗙被
+ },
+ processConfigShow: false, // 淇敼娴佺▼淇℃伅show
+ configDeployName: '', // 淇敼閰嶇疆鐨勯儴缃插悕绉�
// 閬僵灞�
loading: true,
dialogVisible: false,
@@ -341,6 +360,26 @@
}
},
methods: {
+ closeConfig() {
+ this.processConfigShow = false
+ },
+ handleConfig(row) {
+ const infoArr = row.id.split(":");
+
+ const params = {
+ deployId: infoArr[2],
+ deployVersion: infoArr[1]
+ }
+ getProcessConfigInfoByDeploy(params).then(res => {
+ if (res.data) {
+ this.configForm = res.data
+ }
+ })
+ this.configForm.deployId = infoArr[2]
+ this.configForm.deployVersion = infoArr[1]
+ this.configDeployName = row.name
+ this.processConfigShow = true
+ },
/** 鏌ヨ娴佺▼瀹氫箟鍒楄〃 */
getList() {
this.loading = true;
--
Gitblit v1.8.0