From 1bec87c9260279471a636e50485759ec8f357a30 Mon Sep 17 00:00:00 2001 From: zhangxp <zhangxp@chicecm.com> Date: 星期三, 21 六月 2023 17:57:35 +0800 Subject: [PATCH] 流程发布修改 --- Source/UBCS-WEB/src/components/template/SetPersonnel.vue | 97 ++++++++++++++++++++++++++++++------------------ 1 files changed, 60 insertions(+), 37 deletions(-) diff --git a/Source/UBCS-WEB/src/components/template/SetPersonnel.vue b/Source/UBCS-WEB/src/components/template/SetPersonnel.vue index 5718a6f..cb7a2e9 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 { @@ -127,7 +135,7 @@ this.collectParam = { modelKey, templateId, flowTaskUsers: flowTaskUsers } 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 +162,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,44 +186,60 @@ }, async apiSave() { try { - if(this.collectParam.flowTaskUsers.length ===0){ + 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 response = await personnelSave({...this.saveParam,flowTaskUsers:this.collectParam.flowTaskUsers}) - if (response.status === 200) { - console.log(response) - 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) - console.log('tasks', this.collectParam) - 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) @@ -225,9 +248,9 @@ 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 + 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