From 7f044c8640264a6c8bbf55a3e95438523faf9619 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 17 Mar 2022 11:20:44 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E4=BA=BA=E5=91=98=E5=88=97=E8=A1=A8=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E6=B6=88=E5=A4=B1=2051848?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/pages/mechanismManage/pages/workgroup.vue | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/pages/config/pages/mechanismManage/pages/workgroup.vue b/src/pages/config/pages/mechanismManage/pages/workgroup.vue index 6e9946b8f..02d62b7f0 100644 --- a/src/pages/config/pages/mechanismManage/pages/workgroup.vue +++ b/src/pages/config/pages/mechanismManage/pages/workgroup.vue @@ -244,7 +244,9 @@ export default { }, { _this: this }, res => { - res.data.records.map(item => { + this.workData = res.data.records + let work = res.data.records + work.map(item => { item.workLeaderGroup = []; item.workPeopleGroup = []; var workLeaderArray = item.workLeader.split(","); @@ -258,8 +260,8 @@ export default { item.workPeopleGroup.push({ name: workPeopleArray[j], id: workPeopleIdArray[j] }); } }); - this.workData = res.data.records; this.total = res.data.total; + this.Loading = false }, e => { }); }, @@ -340,11 +342,14 @@ export default { }, //取消新增 cancelModel() { + this.Loading = true this.addForm = { workGroup: "", workPeopleGroup: [], workLeaderGroup: [] }; + this.getWorkData(); + this.$refs.workGroup.clearSelection() this.addModel = false; }, //确定新增 @@ -357,6 +362,7 @@ export default { } else if (!this.addForm.workPeopleGroup.length) { this.$message.warning("请选择工作组组员"); } else { + this.Loading = true let workLeader = "", workLeaderId = ""; this.addForm.workLeaderGroup.map(item => { workLeader += item.name; @@ -395,6 +401,7 @@ export default { } else if (!this.addForm.workPeopleGroup.length) { this.$message.warning("请选择工作组组员"); } else { + this.Loading = true let workLeader = ""; let workLeaderId = ""; this.addForm.workLeaderGroup.map(item => { From 9fe9e96a33b4145b76188380bc23b11eec6b236e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 17 Mar 2022 13:40:01 +0800 Subject: [PATCH 2/7] =?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=89=8B=E6=9C=BA=E7=AB=AF=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/phone/wfhxzg/step2.vue | 1 + src/pages/processCenter/pages/phone/wfhxzg/step3.vue | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/phone/wfhxzg/step2.vue b/src/pages/processCenter/pages/phone/wfhxzg/step2.vue index ed67bb269..46d702c3b 100644 --- a/src/pages/processCenter/pages/phone/wfhxzg/step2.vue +++ b/src/pages/processCenter/pages/phone/wfhxzg/step2.vue @@ -288,6 +288,7 @@ export default { let json = { dockUserList: list, passInfo: this.passInfo, + passFlag: '0', commentText: this.commentInfo } let flag=false diff --git a/src/pages/processCenter/pages/phone/wfhxzg/step3.vue b/src/pages/processCenter/pages/phone/wfhxzg/step3.vue index c3d383d96..620e895f8 100644 --- a/src/pages/processCenter/pages/phone/wfhxzg/step3.vue +++ b/src/pages/processCenter/pages/phone/wfhxzg/step3.vue @@ -2,7 +2,7 @@
- +
基础信息
From feab4fba29089030f54122214c0d28acbcdc592f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 17 Mar 2022 13:48:05 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E6=89=8B=E6=9C=BA=E7=AB=AF=E8=B7=B3=E8=BD=AC=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E9=94=99=E8=AF=AFbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/phone/xmpg/step4.vue | 4 ++-- src/pages/processCenter/pages/phone/xmpg/step5.vue | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/processCenter/pages/phone/xmpg/step4.vue b/src/pages/processCenter/pages/phone/xmpg/step4.vue index c24e83246..4ac9b67ab 100644 --- a/src/pages/processCenter/pages/phone/xmpg/step4.vue +++ b/src/pages/processCenter/pages/phone/xmpg/step4.vue @@ -466,7 +466,7 @@ export default { if (!this.commentText) { this.$message.warning("请填写审批意见"); } else { - this.listForm.dlFlag = "2"; + this.listForm.passFlag = "1"; this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); this.$http.post("lawss/activiti/completeTask", { @@ -487,7 +487,7 @@ export default { //提交事件 handleSubmit() { this.isSubmit = true; - this.listForm.dlFlag = "1"; + this.listForm.passFlag = "0"; this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); this.$http.post("lawss/activiti/completeTask", { diff --git a/src/pages/processCenter/pages/phone/xmpg/step5.vue b/src/pages/processCenter/pages/phone/xmpg/step5.vue index a2410475e..f1ed18dbc 100644 --- a/src/pages/processCenter/pages/phone/xmpg/step5.vue +++ b/src/pages/processCenter/pages/phone/xmpg/step5.vue @@ -485,7 +485,7 @@ export default { //提交事件 handleSubmit() { this.isSubmit = true; - this.listForm.dlFlag = "1"; + this.listForm.dataList = this.dataList this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); this.$http.post("lawss/activiti/completeTask", { From 4a1d677b8c6f4f0f9536fbbd7aa3b5facc9f6484 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 17 Mar 2022 14:05:17 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=88=87=E6=8D=A2=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=97=B6=E4=B8=8B=E9=9D=A2=E6=A0=87=E5=87=86=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9C=AA=E6=B8=85=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/xmpg/step1.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index 2819f1899..fabdcae36 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -648,6 +648,7 @@ export default { this.$message.warning("请选择一条数据进行带入"); } else { this.addShow = false + this.dataList = [] this.projectId = this.selectedList[0].id; this.listForm.projectId = this.selectedList[0].id; this.listForm.projectNumber = this.selectedList[0].projectNumber; From 6eecdb423b5fb9d092da50e8917c8c313b50245a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 17 Mar 2022 14:47:10 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=20=E8=A1=A8=E6=A0=BC=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E4=B8=8D=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzpg/step1.vue | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue index b44f38fb2..bc9b0b463 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue @@ -1058,11 +1058,15 @@ export default { this.projectList = data; }, choiceZRR(scope, type, title, id) { + console.log(scope); if (scope != null) { this.currentIndex = scope.$index; + this.nodeList = []; + this.nodeList.push(scope.row.distributePersonId); + }else{ + this.nodeList = []; + this.nodeList.push(id); } - this.nodeList = []; - this.nodeList.push(id); this.type = type; this.drawerTitle = title; this.modalshowflag = true; From 7b5fb2b5a14e547268397915dbf86df9fa9de2c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 17 Mar 2022 15:35:56 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2-=E6=8A=80=E6=9C=AF=E6=A0=87=E5=87=86=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=97=A0=E6=B3=95=E8=B7=B3=E8=BD=AC=2051868?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/home2/components/todoList/index.vue | 2 +- src/pages/processCenter/pages/creatProcess/qbrk/step8.vue | 2 +- src/pages/processCenter/pages/phone/qbrk/step8.vue | 2 +- .../pages/processList/tabComponents/processCenter/index.vue | 2 +- .../pages/processList/tabComponents/taskDraft/index.vue | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/pages/home2/components/todoList/index.vue b/src/pages/home2/components/todoList/index.vue index 97939c3d3..74b85d3f5 100644 --- a/src/pages/home2/components/todoList/index.vue +++ b/src/pages/home2/components/todoList/index.vue @@ -205,7 +205,7 @@ export default { prcType: row.prcType } }) - }else if (row.taskInfo === '起草单位高级经理审核'){ + }else if (row.taskInfo === '批准'){ this.$router.push({ name: 'bussLibrary8', query: { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue index 321797cfb..354b654a6 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue @@ -592,7 +592,7 @@ loading: false, dataLoading: true, drawerModal: false, - taskInfo:'起草单位高级经理审核', + taskInfo:'批准', assigneeNewLoading: false, disabledState: true, userId:this.$store.getters.userInfo.userId, diff --git a/src/pages/processCenter/pages/phone/qbrk/step8.vue b/src/pages/processCenter/pages/phone/qbrk/step8.vue index 6d4aa495b..0ef8fbed9 100644 --- a/src/pages/processCenter/pages/phone/qbrk/step8.vue +++ b/src/pages/processCenter/pages/phone/qbrk/step8.vue @@ -275,7 +275,7 @@ export default { loading: false, dataLoading: true, drawerModal: false, - taskInfo:'起草单位高级经理审核', + taskInfo:'批准', assigneeNewLoading: false, disabledState: true, userId:this.$store.getters.userInfo.userId, diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 71b2c9333..7520b3541 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -419,7 +419,7 @@ export default { prcType: row.prcType } }) - }else if (row.taskInfo === '起草单位高级经理审核'){ + }else if (row.taskInfo === '批准'){ this.$router.push({ name: 'bussLibrary8', query: { diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue index ee7127c78..0ab70c38d 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue @@ -389,7 +389,7 @@ export default { verifySarStandard: true, } }) - }else if (mes.taskInfo === '起草单位高级经理审核'){ + }else if (mes.taskInfo === '批准'){ this.$router.push({ name: 'bussLibrary8', query: { From 7a0366b263369280c5cbd61f66e29cfc95859451 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 17 Mar 2022 15:45:55 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=2051869?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/creatProcess/qbrk-product/step10.vue | 2 +- src/pages/processCenter/pages/phone/qbrk-product/step10.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue index 4844c13fd..e91d77e4f 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue @@ -2,7 +2,7 @@ - +
基础信息
diff --git a/src/pages/processCenter/pages/phone/qbrk-product/step10.vue b/src/pages/processCenter/pages/phone/qbrk-product/step10.vue index 2d813d39e..db88ffd4e 100644 --- a/src/pages/processCenter/pages/phone/qbrk-product/step10.vue +++ b/src/pages/processCenter/pages/phone/qbrk-product/step10.vue @@ -3,7 +3,7 @@ - +
基础信息