From 7ce6fabb2781b2de8411ed1580ee55d25788891c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Tue, 26 Mar 2024 13:58:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=81=E6=A0=87=E5=88=B6?= =?UTF-8?q?=E4=BF=AE=E8=AE=A2-=E6=8A=80=E6=9C=AF=E6=A0=87=E5=87=86?= =?UTF-8?q?=E7=9A=84=E5=8E=86=E5=8F=B2=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processNodeInformation/index.vue | 33 +++++++++-- .../pages/processDetail/index.vue | 59 +++++++++++++------ 2 files changed, 69 insertions(+), 23 deletions(-) diff --git a/src/components/processNodeInformation/index.vue b/src/components/processNodeInformation/index.vue index ffdc5e72a..2bb1fc246 100644 --- a/src/components/processNodeInformation/index.vue +++ b/src/components/processNodeInformation/index.vue @@ -226,11 +226,6 @@ } }, mounted() { - if (this.$route.query.oldAndNew == 'new') { - this.getProcessList() - } else { - this.processNum() - } this.processTable() }, methods: { @@ -255,6 +250,11 @@ _this: this }, res => { this.histortData = res + if (this.$route.query.oldAndNew == 'new') { + this.getProcessList() + } else { + this.processNum() + } this.loading = false }, e => { }) @@ -274,6 +274,29 @@ val.userNames = val.userNames.split(',') } }) + if (this.$route.query.prcType == 'buss1'){ + if (this.histortData && this.histortData.length > 0){ + if (this.histortData[this.histortData.length - 1].taskKey == 'BussLibraryC3'){ + this.nameList.forEach(val => { + if (val.taskKey == 'BussLibrary3') { + val.taskStatus = 'todo' + } + }) + }else if (this.histortData[this.histortData.length - 1].taskKey == 'BussLibraryC1'){ + this.nameList.forEach(val => { + if (val.taskKey == 'BussLibrary1') { + val.taskStatus = 'todo' + } + }) + }else if (this.histortData[this.histortData.length - 1].taskKey == 'BussLibraryC6'){ + this.nameList.forEach(val => { + if (val.taskKey == 'BussLibrary6') { + val.taskStatus = 'todo' + } + }) + } + } + } this.$nextTick(() => { let flowGroupProcess = document.getElementsByClassName('flow-group-process') let num = (flowGroupProcess[0].offsetWidth - 100) / 248 diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue index 15d471c31..0a72c5a76 100644 --- a/src/pages/processCenter/pages/processDetail/index.vue +++ b/src/pages/processCenter/pages/processDetail/index.vue @@ -342,6 +342,29 @@ val.userNames = val.userNames.split(',') } }) + if (this.$route.query.flowType == 'buss1'){ + if (this.detailData && this.detailData.length > 0){ + if (this.detailData[this.detailData.length - 1].taskKey == 'BussLibraryC3'){ + this.nameList.forEach(val => { + if (val.taskKey == 'BussLibrary3') { + val.taskStatus = 'todo' + } + }) + }else if (this.detailData[this.detailData.length - 1].taskKey == 'BussLibraryC1'){ + this.nameList.forEach(val => { + if (val.taskKey == 'BussLibrary1') { + val.taskStatus = 'todo' + } + }) + }else if (this.detailData[this.detailData.length - 1].taskKey == 'BussLibraryC6'){ + this.nameList.forEach(val => { + if (val.taskKey == 'BussLibrary6') { + val.taskStatus = 'todo' + } + }) + } + } + } this.$nextTick(() => { let flowGroupProcess = document.getElementsByClassName('flow-group-process') let num = (flowGroupProcess[0].offsetWidth - 100) / 248 @@ -350,8 +373,6 @@ let offsetWidth = flowGroupProcess[0].offsetWidth flowGroupProcess[0].style.width = (offsetWidth - (offsetWidth - 100 - width) + 40) + 'px' - console.log(offsetWidth); - console.log(flowGroupProcess); }) }, e => { }) @@ -368,12 +389,12 @@ if (res.success) { this.drawerModal = false this.$message.success('调整成功') - if (this.$route.query.oldAndNew == 'new' && (this.$route.query.flowType == '3' || this.$route.query.flowType == 'buss1')) { - this.getProcessList() - } else { - this.processNum() - } - this.processTable() + // if (this.$route.query.oldAndNew == 'new' && (this.$route.query.flowType == '3' || this.$route.query.flowType == 'buss1')) { + // this.getProcessList() + // } else { + // this.processNum() + // } + this.processTable(1) } else { this.$message.warning(res.message) } @@ -1368,12 +1389,12 @@ if (res.success) { this.drawerModal = false this.$message.success('调整成功') - if (this.$route.query.oldAndNew == 'new' && (this.$route.query.flowType == '3' || this.$route.query.flowType == 'buss1')) { +/* if (this.$route.query.oldAndNew == 'new' && (this.$route.query.flowType == '3' || this.$route.query.flowType == 'buss1')) { this.getProcessList() } else { this.processNum() - } - this.processTable() + }*/ + this.processTable(1) } else { this.$message.warning(res.message) } @@ -1419,7 +1440,7 @@ }) }, // 请求列表 - processTable() { + processTable(num) { let url = '' let query = {} if (this.$route.query.oldAndNew == 'new' && (this.$route.query.flowType == '3' || this.$route.query.flowType == 'buss1')) { @@ -1441,6 +1462,13 @@ _this: this }, res => { this.detailData = res + if (num && num == 1){ + if (this.$route.query.oldAndNew == 'new' && (this.$route.query.flowType == '3' || this.$route.query.flowType == 'buss1')) { + this.getProcessList() + } else { + this.processNum() + } + } }, e => { }) }, @@ -1646,12 +1674,7 @@ } }, mounted() { - if (this.$route.query.oldAndNew == 'new' && (this.$route.query.flowType == '3' || this.$route.query.flowType == 'buss1')) { - this.getProcessList() - } else { - this.processNum() - } - this.processTable() + this.processTable(1) this.getApproveShow() } }