From 54f35ae7866dac5c497372b68d03309c7eae9424 Mon Sep 17 00:00:00 2001
From: dangsn <dangsn@chicecm.com>
Date: 星期三, 02 八月 2023 18:15:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/template/SetPersonnel.vue | 58 +++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 37 insertions(+), 21 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/template/SetPersonnel.vue b/Source/UBCS-WEB/src/components/template/SetPersonnel.vue
index cb7a2e9..29cec50 100644
--- a/Source/UBCS-WEB/src/components/template/SetPersonnel.vue
+++ b/Source/UBCS-WEB/src/components/template/SetPersonnel.vue
@@ -10,7 +10,7 @@
<el-input placeholder="娴佺▼妯℃澘" v-model="saveParam.modelName" disabled></el-input>
</el-form-item>
<el-form-item label="娴佺▼鍚嶇О" prop="processName">
- <el-input placeholder="娴佺▼鍚嶇О" v-model="saveParam.processName">
+ <el-input placeholder="娴佺▼鍚嶇О" v-model="saveParam.template">
</el-input>
</el-form-item>
<el-form-item label="娴佺▼鎻忚堪">
@@ -52,7 +52,9 @@
typeof: String,
default: '娴佺▼瀹℃壒'
},
- // 鍙傛暟锛氶�夋嫨鐨刬d锛屽涓互鏁扮粍鏂瑰紡浼犻�掞細['id','id']锛屾ā鏉縤d锛屾ā鏉跨敤閫旓紝娴佺▼鍚嶅瓧锛屾祦绋嬫ā鏉�
+ // 鍙傛暟锛氶�夋嫨鐨刬d锛屽涓互鏁扮粍鏂瑰紡浼犻�掞細['id','id']锛屾ā鏉縤d锛屾ā鏉跨敤閫旓紝娴佺▼鍚嶅瓧锛屾祦绋嬫ā鏉�,
+ // flowTemplate锛�
+ // vars锛歰bject鏍煎紡锛屽悕瀛椾负vars锛岄噷闈ey閿�硷紝鑷繁闅忔剰
parameter: {
typeof: Object,
default: () => { }
@@ -83,12 +85,18 @@
},
users:{
handler(val){
- console.log('鐩戝惉users',val)
this.collectParam.flowTaskUsers = val
},
deep:true,
immediate:true
- }
+ },
+ parameter:{
+ handler(newval,oldval){
+ this.saveParam=newval;
+ },
+ deep:true,
+ immediate:true
+ }
},
data() {
return {
@@ -98,7 +106,7 @@
tags: [],
typeName: [],
collectParam: {},
- saveParam: this.saveParam(),
+ saveParam: {},
users: [],
rules: {
processName: [
@@ -110,31 +118,34 @@
},
mounted() {
- // this.apiInit()
- // this.apiDict()
},
- methods: {
- saveParam() {
+ created() {
+ },
+ 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]})
if (response.status === 200) {
- console.log(response)
this.initFrom = response.data.data.user
this.tags = response.data.data.collect
const { modelKey, templateId, modelName } = response.data.data.flow
let flowTaskUsers = response.data.data.user
this.collectParam = { modelKey, templateId, flowTaskUsers: flowTaskUsers }
+ this.users = response.data.data.user
console.log(this.collectParam)
+ console.log('this.saveParam.before',this.saveParam)
this.saveParam = { ...this.saveParam, modelKey, templateId, modelName }
+ console.log('this.saveParam',this.saveParam)
if (this.tags.length !== 0) this.handleClickTag(this.tags[0])
}
},
@@ -190,22 +201,26 @@
console.log(this.collectParam.flowTaskUsers)
console.log(len == 0)
console.log(len != this.initFrom.length)
+ console.log('saveParam',this.saveParam)
if (len == 0 && len != this.initFrom.length) {
this.$message({
type: "error",
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}
+ console.log('vals',vals);
+ 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.$emit('onLoad')
+ this.done()
+ }
}
} catch {
@@ -248,6 +263,7 @@
handleSelect(event, index) {
const res = this.typeName.find(item => item.userId === event)
const { userName } = res
+ console.log(this.users)
this.$set(this.users, index, { ... this.collectParam.flowTaskUsers[index], userName })
// this.users[index] = { ... this.collectParam.flowTaskUsers[index], userName }
console.log(this.users)
--
Gitblit v1.9.3