From 8af3888c136bc008b63b74a5d93983d0b03e8b3c Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Thu, 8 Jul 2021 11:00:42 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E6=95=B4=E6=94=B9=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/wfhxzg/step2.vue | 136 +++++++++--------- 1 file changed, 72 insertions(+), 64 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue index c0fef385a..de7d8b846 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue @@ -80,7 +80,6 @@ class="common-button-default" size="small" type="primary" - v-btn-permission="'5905d0743c3504799aee83ac9697f8c5'" @click="dutyEngineerList"> 批量分发负责人 @@ -88,7 +87,8 @@ - + @@ -253,45 +253,7 @@ export default { active: '1', // 默认显示 isSubmit: false, saveLoading: false, - dataList: [ - { - standId: '1', - productName: '1', - itemsNum: '1', - itemsName: '1', - planCloseTime: '1', - responsibleUnit: '1', - dutyEngineer: '1', - duty: '', - },{ - standId: '332', - productName: '333', - itemsNum: '33', - itemsName: '33', - planCloseTime: '33', - responsibleUnit: '33', - dutyEngineer: '33', - duty: '' - },{ - standId: '312`', - productName: '31312', - itemsNum: '31`2', - itemsName: '312`1`', - planCloseTime: '321`3`2', - responsibleUnit: '312`123`', - dutyEngineer: '312123', - duty: '121' - },{ - standId: '32123', - productName: '32132', - itemsNum: '312321', - itemsName: '3123', - planCloseTime: '3123', - responsibleUnit: '3123', - dutyEngineer: '3123', - duty: '' - }, - ], + dataList: [], // 新增选择分发责任人数组 multipleSelection: [], // 当前页数 @@ -333,8 +295,51 @@ export default { ProcessTitle }, created() { + this.getData() + this.getTree() }, methods: { + getData() { + this.dataList = [ + { + standId: '1', + productName: '1', + itemsNum: '1', + itemsName: '1', + planCloseTime: '1', + responsibleUnit: '1', + dutyEngineer: '1', + dutyPeople: '', + },{ + standId: '332', + productName: '333', + itemsNum: '33', + itemsName: '33', + planCloseTime: '33', + responsibleUnit: '33', + dutyEngineer: '33', + dutyPeople: '' + },{ + standId: '312`', + productName: '31312', + itemsNum: '31`2', + itemsName: '312`1`', + planCloseTime: '321`3`2', + responsibleUnit: '312`123`', + dutyEngineer: '312123', + dutyPeople: '121' + },{ + standId: '32123', + productName: '32132', + itemsNum: '312321', + itemsName: '3123', + planCloseTime: '3123', + responsibleUnit: '3123', + dutyEngineer: '3123', + dutyPeople: '' + }, + ] + }, getList() { this.myLoading.loadData = true this.$http.get('sarStandUnqualified/sar-stand-unqualified', { @@ -357,32 +362,23 @@ export default { if (this.multipleSelection.length === 0) { this.$message.warning("请选择至少一条数据进行分发责任人"); } else { - this.multipleSelection.forEach((val, index)=> { - val.show = true - this.$set(val, index) + this.multipleSelection.map((i, index)=> { + i.show = true + this.$set(this.dataList, i, index) }) - // this.modalshowflag = true - // this.$set(this.dataList.duty) } }, // 选择勾选项的集合 - handleSelectionChange(val) { - this.multipleSelection = val; - console.log(this.multipleSelection) + handleSelectionChange(value) { + this.multipleSelection = value + console.log(value) }, // 选择分发责任人时 - choiceDuty() { - for (let i = 0; i < this.multipleSelection.length; i++ ) { - if (this.multipleSelection[i].duty !== '') { - console.log(i) - for (let b = 0; b < this.multipleSelection.length; b++) { - this.multipleSelection[b].duty = this.multipleSelection[i].duty - this.multipleSelection.forEach(val=> { - val.show = false - }) - } - } - } + choiceDuty(type, title, id) { + this.nodeList = [] + this.nodeList.push(id) + this.drawerTitle = title + this.modalshowflag = true }, selectPeople(row) { this.modalshowflag = true @@ -421,6 +417,18 @@ export default { }, // 流程节点负责人抽屉保存按钮 saveUserInfo () { + // 选取负责人时的操作 + for (let i = 0; i < this.multipleSelection.length; i++ ) { + this.multipleSelection[i].dutyPeople = this.roleRow.name + for (let b = 0; b < this.multipleSelection.length; b++) { + this.multipleSelection[b].dutyPeople = this.multipleSelection[i].dutyPeople + this.dataList.forEach(val=> { + val.show = false + }) + } + this.multipleSelection = [] + this.$refs.multipleTable.clearSelection(); + } if (this.type === 'dockUser') { this.roleForm.dockUser = this.roleRow.id this.roleForm.dockUserName = this.roleRow.name From ea55d8f65a5739f117b3719abe9fb0969e899645 Mon Sep 17 00:00:00 2001 From: duanwenbin <12345678> Date: Thu, 8 Jul 2021 11:08:37 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=A0=87=E5=87=86=E6=8B=86=E5=88=86-=E6=89=8B=E5=8A=A8?= =?UTF-8?q?=E6=9F=A5=E6=89=BE=E7=9A=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/localTool/standAutoSplit/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/localTool/standAutoSplit/index.vue b/src/pages/localTool/standAutoSplit/index.vue index b5526366e..018032f77 100644 --- a/src/pages/localTool/standAutoSplit/index.vue +++ b/src/pages/localTool/standAutoSplit/index.vue @@ -852,7 +852,7 @@ export default { } }) } else { - this.$http.get('lawss/sarStandardsInfo/getSarStandardsInfoPage', { + this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', { page: this.conditionForm.page, pageSize: this.conditionForm.pageSize, standNumber: this.conditionForm.numberName,