From dbb8f101f25741739c97b938743c43cca8715d98 Mon Sep 17 00:00:00 2001
From: weidy <lastanimals@163.com>
Date: 星期日, 25 六月 2023 10:53:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/template/SetPersonnel.vue | 90 +++++++++++++++++++++++++++++++--------------
1 files changed, 62 insertions(+), 28 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/template/SetPersonnel.vue b/Source/UBCS-WEB/src/components/template/SetPersonnel.vue
index a03ab9d..a8ee38e 100644
--- a/Source/UBCS-WEB/src/components/template/SetPersonnel.vue
+++ b/Source/UBCS-WEB/src/components/template/SetPersonnel.vue
@@ -73,14 +73,22 @@
watch: {
visible(n) {
this.dialogVisible = n;
- if(n){
- this.apiInit()
- this.apiDict()
+ if (n) {
+ this.apiInit()
+ this.apiDict()
}
},
dialogVisible(n) {
this.$emit('update:visible', n)
},
+ users:{
+ handler(val){
+ console.log('鐩戝惉users',val)
+ this.collectParam.flowTaskUsers = val
+ },
+ deep:true,
+ immediate:true
+ }
},
data() {
return {
@@ -125,9 +133,10 @@
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)
this.saveParam = { ...this.saveParam, modelKey, templateId, modelName }
- this.handleClickTag(this.tags[0])
+ if (this.tags.length !== 0) this.handleClickTag(this.tags[0])
}
},
async apiDict() {
@@ -154,12 +163,11 @@
this.collectParam = { ...this.collectParam, name: value }
console.log(this.collectParam)
const response = await personnelCollect(this.collectParam)
- Console.log(response)
+ console.log(response)
if (response.status === 200) {
this.$nextTick(() => {
this.apiInit()
})
- console.log(response)
}
}).catch(() => {
@@ -179,35 +187,60 @@
},
async apiSave() {
try {
- const response = await personnelSave(this.saveParam)
- if (response.status === 200) {
- console.log(response)
+ 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: 'success',
- message: response.data.msg
+ type: "error",
+ message: "璇烽�夋嫨鑺傜偣锛�"
});
- this.done()
+ } 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()
+ }
}
+
} catch {
console.error('鎺ュ彛璋冪敤澶辫触')
}
},
handleClickTag(event) {
- console.log(event)
- const flowTaskUsers = event.flowTaskUsers//collet.flowTaskUsers
- let tasks = this.collectParam.flowTaskUsers;//user
- for(let i=0;i<tasks.length;i++){
- let thisFlowTaskUsers = tasks[i];
- console.log('thisFlowTaskUsers',thisFlowTaskUsers)
- for(let j=0;j<flowTaskUsers.length;j++){
- let thisFflowTaskUsers = flowTaskUsers[j];
- if(thisFlowTaskUsers.taskId==thisFflowTaskUsers.taskId){
- thisFlowTaskUsers['userName']=thisFflowTaskUsers.userName;
- thisFlowTaskUsers['userId']=thisFflowTaskUsers.userId;
+ 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++) {
+ if (item.taskId == event.flowTaskUsers[i].taskId) {
+ item['userName'] = event.flowTaskUsers[i]['userName']
+ item['userId'] = event.flowTaskUsers[i]['userId']
}
}
- }
- console.log(this.collectParam)
+ return item
+ })
+ this.users = this.collectParam.flowTaskUsers
+ // const flowTaskUsers = event.flowTaskUsers//collet.flowTaskUsers
+ // let tasks = this.collectParam.flowTaskUsers;//user
+ // for (let i = 0; i < tasks.length; i++) {
+ // let thisFlowTaskUsers = tasks[i];
+ // for (let j = 0; j < flowTaskUsers.length; j++) {
+ // let thisFflowTaskUsers = flowTaskUsers[j];
+ // if (thisFlowTaskUsers.taskId == thisFflowTaskUsers.taskId) {
+ // thisFlowTaskUsers['userName'] = thisFflowTaskUsers.userName;
+ // thisFlowTaskUsers['userId'] = thisFflowTaskUsers.userId;
+ // }
+ // }
+ // }
+ // this.collectParam.flowTaskUsers = {...this.collectParam.flowTaskUsers,userId,userName}
},
handleCloseTag(event) {
console.log(event)
@@ -216,9 +249,10 @@
handleSelect(event, index) {
const res = this.typeName.find(item => item.userId === event)
const { userName } = res
- let users = { ... this.collectParam.flowTaskUsers[index], userName }
- console.log(users)
- this.users[index] = users
+ 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