From d4b425d1f115aafd23b4dcf377eef4ed1ba400cc Mon Sep 17 00:00:00 2001
From: lihang <lihang@vci-tech.com>
Date: 星期三, 05 七月 2023 16:35:13 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS-WEB/src/components/template/SetPersonnel.vue | 47 +++++++++++++++++++++++++++++------------------
1 files changed, 29 insertions(+), 18 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/template/SetPersonnel.vue b/Source/UBCS-WEB/src/components/template/SetPersonnel.vue
index 7980a59..60d037f 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: () => { }
@@ -88,7 +90,12 @@
},
deep:true,
immediate:true
- }
+ },
+ parameter:{
+ handler(newval,oldval){
+ console.log('瀛�',newval)
+ }
+ }
},
data() {
return {
@@ -98,7 +105,7 @@
tags: [],
typeName: [],
collectParam: {},
- saveParam: this.saveParam(),
+ saveParam: this.setSaveParam(),
users: [],
rules: {
processName: [
@@ -110,22 +117,25 @@
},
mounted() {
- // this.apiInit()
- // this.apiDict()
+ console.log('---',this.parameter)
},
- methods: {
- saveParam() {
+ created() {
+ console.log('parameter',this.parameter)
+ },
+ methods: {
+ setSaveParam() {
return {
processName: this.parameter[this.parameterKeys.flowTemplate],
topName: this.title,
ids: this.parameter[this.parameterKeys.ids],
+ vars:this.parameter['vars']
}
},
userIndex(arr1) {
return this.initFrom.findIndex(i => i.taskId === arr1)
},
async apiInit() {
- const response = await personnelInit({ type: this.parameter[this.parameterKeys.type], templateId: this.parameter[this.parameterKeys.code] })
+ const response = await personnelInit({ type: this.parameter[this.parameterKeys.type], templateId: this.parameter[this.parameterKeys.code],ids:this.parameter.ids, codeClassifyOid:this.parameter.codeClassifyOid})
if (response.status === 200) {
console.log(response)
this.initFrom = response.data.data.user
@@ -197,16 +207,17 @@
message: "璇烽�夋嫨鑺傜偣锛�"
});
} else {
- console.log('baoc')
- // const response = await personnelSave({ ...this.saveParam, flowTaskUsers: this.collectParam.flowTaskUsers })
- // if (response.status === 200) {
- // console.log(response)
- // this.$message({
- // type: 'success',
- // message: response.data.msg
- // });
- // this.done()
- // }
+ const {modelKey,modelName,processDesc,processName,templateId,topName,vars,ids} = this.saveParam
+ const vals= {modelKey,modelName,processDesc,processName,templateId,topName,ids,...vars}
+ const response = await personnelSave({ variables:vals, flowTaskUsers: this.collectParam.flowTaskUsers, })
+ if (response.status === 200) {
+ console.log(response)
+ this.$message({
+ type: 'success',
+ message: response.data.msg
+ });
+ this.done()
+ }
}
} catch {
--
Gitblit v1.9.3