From d13c3d44ca14ba07d92216bb92ff29ab504ae048 Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期三, 02 八月 2023 17:40:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/template/SetPersonnel.vue | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/template/SetPersonnel.vue b/Source/UBCS-WEB/src/components/template/SetPersonnel.vue
index cf03538..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="娴佺▼鎻忚堪">
@@ -76,7 +76,6 @@
visible(n) {
this.dialogVisible = n;
if (n) {
- this.saveParam=this.setSaveParam();
this.apiInit()
this.apiDict()
}
@@ -86,7 +85,6 @@
},
users:{
handler(val){
- console.log('鐩戝惉users',val)
this.collectParam.flowTaskUsers = val
},
deep:true,
@@ -94,8 +92,10 @@
},
parameter:{
handler(newval,oldval){
- console.log('瀛�',newval)
- }
+ this.saveParam=newval;
+ },
+ deep:true,
+ immediate:true
}
},
data() {
@@ -106,7 +106,7 @@
tags: [],
typeName: [],
collectParam: {},
- saveParam: this.setSaveParam(),
+ saveParam: {},
users: [],
rules: {
processName: [
@@ -119,7 +119,7 @@
mounted() {
},
- created() {
+ created() {
},
methods: {
setSaveParam() {
@@ -136,7 +136,6 @@
async apiInit() {
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
@@ -144,7 +143,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])
}
},
@@ -200,6 +201,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",
@@ -208,6 +210,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)
@@ -215,6 +218,7 @@
type: 'success',
message: response.data.msg
});
+ this.$emit('onLoad')
this.done()
}
}
--
Gitblit v1.9.3