From f8c4f9ce6c1b7a58719e3c9d7fdf5d3111569c12 Mon Sep 17 00:00:00 2001 From: zeng yuneng Date: Fri, 2 Dec 2022 17:55:25 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E6=B5=81=E7=A8=8B-=E6=89=B9=E5=87=86=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E9=A9=B3=E5=9B=9E=E6=88=90=E5=8A=9F=E6=8F=90=E7=A4=BA=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzrk/step2.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index 00918cc45..091fc48ec 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -1337,7 +1337,8 @@ export default { }, res => { if (res.success) { if (this.formTongGuo.approvalOpinion == "1") { - this.$message.warning("驳回成功"); + // this.$message.warning("驳回成功"); + this.$message.success("驳回成功"); this.isSubmit = false; this.formTongGuo.commentText = ""; // 流程提交之后，应该流转至待办任务页面 From 2473186cf8de5a8f036085369c10a815816a2c87 Mon Sep 17 00:00:00 2001 From: zeng yuneng Date: Mon, 5 Dec 2022 10:07:38 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=81=E6=A0=87?= =?UTF-8?q?=E5=88=B6=E4=BF=AE=E8=AE=A2=E6=8A=80=E6=9C=AF=E6=A0=87=E5=87=86?= =?UTF-8?q?-=E8=BF=87=E7=A8=8B=E7=A8=BF=E4=BB=B6=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbrk/common/formEditList.vue | 5 ++++- src/pages/processCenter/pages/creatProcess/qbrk/step1.vue | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue index fe11b3b53..6a97bb9cd 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue @@ -119,7 +119,7 @@ -
+
@@ -1016,4 +1016,7 @@ export default { /deep/ .fileClass{ line-height: 22px !important; } + .process-manuscript /deep/ .el-form-item__error{ + right:45px !important; + } diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue index 9ec51c95d..9ba27d057 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue @@ -144,7 +144,7 @@ -
+
@@ -3315,4 +3315,7 @@ export default { } } } +.process-manuscript /deep/ .el-form-item__error{ + right:45px !important; +} From 857d6ae5ddc7c048ded87d28e6c96c339c553a2e Mon Sep 17 00:00:00 2001 From: zeng yuneng Date: Mon, 5 Dec 2022 14:06:55 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=90=88=E8=A7=84=E8=AF=84=E4=BC=B0-=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=88=86=E5=8F=91=E8=8A=82=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzpg/step4.vue | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue index 39ed192d7..a97671a00 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue @@ -434,12 +434,15 @@ export default { this.dataList.map(item => { delete item.termsConditions }) - this.dataList.forEach(item => { - if(item.implementer){ - comFlag = true - return - } - }) + console.log( this.dataList) + // this.dataList.forEach(item => { + // if(item.implementer){ + // comFlag = true + // return + // } + // }) + if(this.dataList.every(item => item.implementer)) comFlag = true + if(!comFlag){ this.$message.warning('请选择落实人') }else{ @@ -520,11 +523,13 @@ export default { this.selectProject = data }, choiceZRRS(row, type, index) { + let _index = this.dataList.findIndex(item => item.id===row.id&&item.projectName===row.projectName) localStorage.setItem('selectProject', JSON.stringify(this.selectProject)) this.type = type; if (type === 1) { this.nodeList2 = []; - this.lsIndex = index; + // this.lsIndex = index; + this.lsIndex = _index; if (row.implementerId) { this.nodeList2 = row.implementerId.split(","); } else { From a3d45b3afe8e79579a759ecf044c71aaaf2c32fc Mon Sep 17 00:00:00 2001 From: zeng yuneng Date: Mon, 5 Dec 2022 14:23:16 +0800 Subject: [PATCH 4/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-=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E9=A9=B3=E5=9B=9E=E5=BC=B9=E6=A1=86=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/qbrk/step4.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue index 6c4bb9194..efd24233f 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue @@ -2264,7 +2264,10 @@ this.$message.success(res.message) } }) - }}) + }else{ + this.$message.warning("请输入意见") + } + }) }, busVsFunc(){ this.$http.get('sarVppsTree/list', '', { From 11761a31b3f83b2928d12eced6c88bbf3e93d2b6 Mon Sep 17 00:00:00 2001 From: zeng yuneng Date: Mon, 5 Dec 2022 14:40:56 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=20=E5=9B=BD=E5=86=85=E6=A0=87=E5=87=86-?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domesticStandardsAndRegulations/index.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 5e6ab0b3b..f1f5dc88c 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -6524,4 +6524,7 @@ export default { } } } +.search-area /deep/ input.el-input__inner { + width: 168px !important; +} From 8b45cf4bb75ae03b9c23f329066fdadb775c5e4a Mon Sep 17 00:00:00 2001 From: zeng yuneng Date: Mon, 5 Dec 2022 14:56:04 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=B0=83=E7=A0=94?= =?UTF-8?q?=E6=B5=81=E7=A8=8B-=E5=AE=A1=E6=89=B9=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E9=A9=B3=E5=9B=9E=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzdy/step4.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue index 8e5ccbcdf..d9066941d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue @@ -388,7 +388,7 @@ this.isSubmit = false }) } else { - this.$message.warning('请输入反馈意见') + this.$message.warning('请输入审批意见') } }, getData() { From a9f65e64fbbb78eba2a57130878c4e0c199bd6d1 Mon Sep 17 00:00:00 2001 From: zeng yuneng Date: Mon, 5 Dec 2022 17:28:35 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E9=A6=96=E9=A1=B5-=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81-=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=84=8F=E8=A7=81=E5=90=8E=E6=8F=90=E4=BA=A4=EF=BC=8C=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E4=BF=A1=E6=81=AF=E9=A2=9C=E8=89=B2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzdy/step6.vue | 2 +- .../standardForComments/pags/AddFileDetails.vue | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue index 97c639876..abb1f4830 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue @@ -415,7 +415,7 @@ this.isSubmit = false }) } else { - this.$message.warning('请输入反馈意见') + this.$message.warning('请输入审批意见') } }, getData() { diff --git a/src/pages/regulatoryRepository/standardForComments/pags/AddFileDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/AddFileDetails.vue index 68c336777..31ba2fe8b 100644 --- a/src/pages/regulatoryRepository/standardForComments/pags/AddFileDetails.vue +++ b/src/pages/regulatoryRepository/standardForComments/pags/AddFileDetails.vue @@ -111,6 +111,7 @@ this.opinionContent.newText = '' // this.opinionContent.cause = '' this.opinionContent.chapterName = '' + this.$message.success(res.message) } }) }