From c86748a2c254ea22ac8f57d7984cc4743efaaed7 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 26 七月 2024 16:53:07 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/PLTWEB
---
Source/plt-web/plt-web-ui/src/components/actions/base/startWorkFlow.vue | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/components/actions/base/startWorkFlow.vue b/Source/plt-web/plt-web-ui/src/components/actions/base/startWorkFlow.vue
index 7b1d72e..f6fe790 100644
--- a/Source/plt-web/plt-web-ui/src/components/actions/base/startWorkFlow.vue
+++ b/Source/plt-web/plt-web-ui/src/components/actions/base/startWorkFlow.vue
@@ -1,7 +1,6 @@
<template>
<el-dialog v-dialogDrag
:close-on-click-modal="false"
- :destroy-on-close="true"
:visible.sync="visible"
:width="width"
append-to-body="true"
@@ -162,16 +161,18 @@
},
created() {
// this.modelNameChange();
- this.getWorkByType();
+
},
mounted() {
+ this.getWorkByType();
},
methods: {
// 鑾峰彇娴佺▼妯℃澘淇℃伅
getWorkByType() {
+ console.log('this.paramVOS',this.paramVOS)
let params = {
- type: '鏂囨。瀹＄娴佺▼',
- filterTemplate: ""
+ type: this.paramVOS.templatetype,
+ filterTemplate: this.paramVOS.filterTemplate || ""
}
getTemplateByType(params).then(res => {
const data = res.data.data;
@@ -179,7 +180,7 @@
this.processTemplateList = data;
this.saveParam.processTemplate = data[0].value;
- this.saveParam.processName = userInfo.content.userName + '-' + data[0].value; // 瀵规祦绋嬫ā鏉� 娴佺▼鍚嶇О璧嬮粯璁ゅ��
+ this.saveParam.processName = this.paramVOS.processname || userInfo.content.userName + '-' + data[0].value; // 瀵规祦绋嬫ā鏉� 娴佺▼鍚嶇О璧嬮粯璁ゅ��
this.getProcessNode(data[0].attributes.oid); // 棣栨杩涘叆璋冪敤绗竴涓ā鏉跨殑鎵�鏈夎妭鐐�
}).catch(err => {
@@ -191,7 +192,7 @@
getProcessNode(oid) {
let params = {
processOid: oid,
- maxSecret: -1
+ maxSecret: this.paramVOS.maxSecret || -1
}
getAllProcessNode(params).then(res => {
const nodes = res.data.data;
@@ -222,14 +223,15 @@
},
handleConfirm() {
+ const oids = this.dataStore.map(item => item.oid).join(',');
let params = {
deployid:this.processTemplateList[0].attributes.deploymentId,
title:this.saveParam.processName,
description:this.saveParam.processDesc,
btmType:this.processTemplateList[0].attributes.taskType,
uiType:this.processTemplateList[0].attributes.taskType,
- oids:'', // 褰撳墠鏁版嵁oid锛屽涓敤,鍒嗛殧
- detailInfoUrl:'', // 鐢ㄦ埛閰嶇疆灞炴��
+ oids:oids, // 褰撳墠鏁版嵁oid锛屽涓敤,鍒嗛殧
+ detailInfoUrl:this.paramVOS.detailInfoUrl || '', // 鐢ㄦ埛閰嶇疆灞炴��
resetStatus:'Editing',
nodeUsers:{
...this.collectParam
--
Gitblit v1.9.3