From ef23237ddabf5ea44856ff369a7c8973758db3d0 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 03 八月 2023 17:52:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/template/SetPersonnel.vue | 40 +++++++++++++++++-----------------------
1 files changed, 17 insertions(+), 23 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/template/SetPersonnel.vue b/Source/UBCS-WEB/src/components/template/SetPersonnel.vue
index 2c7a417..c208c2b 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="娴佺▼鎻忚堪">
@@ -66,7 +66,8 @@
ids: 'ids',
flowTemplate: 'flowTemplate',
code: 'code',
- type: 'type'
+ type: 'type',
+ btmtype:'btmtype'
}
}
}
@@ -76,7 +77,6 @@
visible(n) {
this.dialogVisible = n;
if (n) {
- this.saveParam=this.setSaveParam();
this.apiInit()
this.apiDict()
}
@@ -86,7 +86,6 @@
},
users:{
handler(val){
- console.log('鐩戝惉users',val)
this.collectParam.flowTaskUsers = val
},
deep:true,
@@ -94,8 +93,10 @@
},
parameter:{
handler(newval,oldval){
- console.log('瀛�',newval)
- }
+ this.saveParam=newval;
+ },
+ deep:true,
+ immediate:true
}
},
data() {
@@ -106,7 +107,7 @@
tags: [],
typeName: [],
collectParam: {},
- saveParam: this.setSaveParam(),
+ saveParam: {},
users: [],
rules: {
processName: [
@@ -118,10 +119,8 @@
},
mounted() {
- console.log('---',this.parameter)
},
created() {
- console.log('parameter',this.parameter)
},
methods: {
setSaveParam() {
@@ -129,6 +128,8 @@
processName: this.parameter[this.parameterKeys.flowTemplate],
topName: this.title,
ids: this.parameter[this.parameterKeys.ids],
+ oids: this.parameter[this.parameterKeys.ids],
+ btmtype:this.parameter[this.parameterKeys.btmtype],
vars:this.parameter['vars']
}
},
@@ -138,7 +139,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
@@ -146,7 +146,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])
}
},
@@ -199,36 +201,31 @@
async apiSave() {
try {
const len = this.collectParam.flowTaskUsers.length
- console.log(this.collectParam.flowTaskUsers)
- console.log(len == 0)
- console.log(len != this.initFrom.length)
if (len == 0 && len != this.initFrom.length) {
this.$message({
type: "error",
message: "璇烽�夋嫨鑺傜偣锛�"
});
} else {
- const {modelKey,modelName,processDesc,processName,templateId,topName,vars,ids} = this.saveParam
- const vals= {modelKey,modelName,processDesc,processName,templateId,topName,ids,...vars}
+ const {modelKey,modelName,processDesc,processName,templateId,topName,vars,ids,btmtype} = this.saveParam
+ let vals= {modelKey,modelName,processDesc,processName,templateId,topName,ids,btmtype,...vars}
+ vals.oids=ids;
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 {
- console.error('鎺ュ彛璋冪敤澶辫触')
+ this.$message.error('鎺ュ彛璋冪敤澶辫触')
}
},
handleClickTag(event) {
- console.log(event.flowTaskUsers)
-
- console.log(this.collectParam.flowTaskUsers)
let flowTaskUsers = this.collectParam.flowTaskUsers
this.collectParam.flowTaskUsers = flowTaskUsers.map((item, index) => {
for (let i = 0; i < event.flowTaskUsers.length; i++) {
@@ -255,16 +252,13 @@
// this.collectParam.flowTaskUsers = {...this.collectParam.flowTaskUsers,userId,userName}
},
handleCloseTag(event) {
- console.log(event)
this.canCollect(event.name)
},
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)
},
done() {
this.dialogVisible = false
--
Gitblit v1.9.3