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() { 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/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 { 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 = ""; // 流程提交之后,应该流转至待办任务页面 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; +} 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', '', { 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; +} 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) } }) }