From ce09f05787d274a506326c7e164a645d3bb1f377 Mon Sep 17 00:00:00 2001
From: zhangxp <zhangxp@chicecm.com>
Date: 星期日, 25 六月 2023 18:02:38 +0800
Subject: [PATCH] 流程调试
---
Source/UBCS-WEB/src/components/template/SetPersonnel.vue | 10 +++++++---
Source/UBCS-WEB/src/views/flow/flowPath.vue | 6 +++++-
Source/UBCS-WEB/src/views/work/process/leave/handle.vue | 4 ++--
3 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/template/SetPersonnel.vue b/Source/UBCS-WEB/src/components/template/SetPersonnel.vue
index a8ee38e..17edef3 100644
--- a/Source/UBCS-WEB/src/components/template/SetPersonnel.vue
+++ b/Source/UBCS-WEB/src/components/template/SetPersonnel.vue
@@ -52,7 +52,9 @@
typeof: String,
default: '娴佺▼瀹℃壒'
},
- // 鍙傛暟锛氶�夋嫨鐨刬d锛屽涓互鏁扮粍鏂瑰紡浼犻�掞細['id','id']锛屾ā鏉縤d锛屾ā鏉跨敤閫旓紝娴佺▼鍚嶅瓧锛屾祦绋嬫ā鏉�
+ // 鍙傛暟锛氶�夋嫨鐨刬d锛屽涓互鏁扮粍鏂瑰紡浼犻�掞細['id','id']锛屾ā鏉縤d锛屾ā鏉跨敤閫旓紝娴佺▼鍚嶅瓧锛屾祦绋嬫ā鏉�,
+ // flowTemplate锛�
+ // vars锛歰bject鏍煎紡锛屽悕瀛椾负vars锛岄噷闈ey閿�硷紝鑷繁闅忔剰
parameter: {
typeof: Object,
default: () => { }
@@ -119,6 +121,7 @@
processName: this.parameter[this.parameterKeys.flowTemplate],
topName: this.title,
ids: this.parameter[this.parameterKeys.ids],
+ vars:this.parameter['vars']
}
},
userIndex(arr1) {
@@ -197,8 +200,9 @@
message: "璇烽�夋嫨鑺傜偣锛�"
});
} else {
- console.log('baoc')
- const response = await personnelSave({ ...this.saveParam, flowTaskUsers: this.collectParam.flowTaskUsers })
+ const {modelKey,modelName,processDesc,processName,templateId,topName,vars} = this.saveParam
+ const vals= {modelKey,modelName,processDesc,processName,templateId,topName,...vars}
+ const response = await personnelSave({ variables:vals, flowTaskUsers: this.collectParam.flowTaskUsers, })
if (response.status === 200) {
console.log(response)
this.$message({
diff --git a/Source/UBCS-WEB/src/views/flow/flowPath.vue b/Source/UBCS-WEB/src/views/flow/flowPath.vue
index 8aec65c..7bfb746 100644
--- a/Source/UBCS-WEB/src/views/flow/flowPath.vue
+++ b/Source/UBCS-WEB/src/views/flow/flowPath.vue
@@ -23,7 +23,11 @@
ids:['0000','22222222'],
code:'8b5e2017-990f-454a-9c39-4c4eeeb57553',
type:'PUBLIC',
- template:'妯℃澘template'
+ template:'妯℃澘template',
+ vars:{
+ name:'111',
+ sex:'222'
+ }
},
props:{
flowTemplate:'template',
diff --git a/Source/UBCS-WEB/src/views/work/process/leave/handle.vue b/Source/UBCS-WEB/src/views/work/process/leave/handle.vue
index 86617b7..056cfed 100644
--- a/Source/UBCS-WEB/src/views/work/process/leave/handle.vue
+++ b/Source/UBCS-WEB/src/views/work/process/leave/handle.vue
@@ -96,7 +96,7 @@
{ label: '浠诲姟鍚嶇О', prop: 'historyActivityName', minWidth: 120 },
{ label: '鎵ц鎿嶄綔', prop: 'sex', minWidth: 80 },
{ label: '浠诲姟寮�濮嬫椂闂�', prop: 'createTime', minWidth: 140 },
- { label: '瀹℃壒鎰忚', prop: 'sex', minWidth: 220, overHidden: true },
+ { label: '瀹℃壒鎰忚', prop: 'comment', minWidth: 220, overHidden: true },
{ label: '鎵ц浜�', prop: 'assigneeName', minWidth: 80 },
{ label: '浠诲姟瀹屾垚鏃堕棿', prop: 'endTime', minWidth: 140 },
{ label: '宸蹭笂浼犲鎵规枃浠�', prop: 'sex', minWidth: 220, overHidden: true },
@@ -145,7 +145,7 @@
if (res.success) {
this.$message.success(res.msg);
this.$router.$avueRouter.closeTag();
- this.$router.push({ path: `/work/start` });
+ this.$router.push({ path: `/work/todo` });
} else {
this.$message.error(res.msg || '鎻愪氦澶辫触');
}
--
Gitblit v1.9.3