From acb7c4c272aa02c2ed24cde72db429defef9fb8f Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期四, 27 七月 2023 13:54:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/template/SetPersonnel.vue | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/template/SetPersonnel.vue b/Source/UBCS-WEB/src/components/template/SetPersonnel.vue
index f637e5f..2a71099 100644
--- a/Source/UBCS-WEB/src/components/template/SetPersonnel.vue
+++ b/Source/UBCS-WEB/src/components/template/SetPersonnel.vue
@@ -85,7 +85,6 @@
},
users:{
handler(val){
- console.log('鐩戝惉users',val)
this.collectParam.flowTaskUsers = val
},
deep:true,
@@ -93,8 +92,9 @@
},
parameter:{
handler(newval,oldval){
- console.log('瀛�',newval)
- }
+ this.saveParam=newval
+ },deep:true,
+ immediate:true
}
},
data() {
@@ -105,7 +105,7 @@
tags: [],
typeName: [],
collectParam: {},
- saveParam: this.setSaveParam(),
+ saveParam: {},
users: [],
rules: {
processName: [
@@ -117,10 +117,8 @@
},
mounted() {
- console.log('---',this.parameter)
},
created() {
- console.log('parameter',this.parameter)
},
methods: {
setSaveParam() {
@@ -135,9 +133,8 @@
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
@@ -145,7 +142,9 @@
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])
}
},
@@ -201,6 +200,7 @@
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",
@@ -209,6 +209,7 @@
} else {
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)
--
Gitblit v1.9.3