diff --git a/src/App.vue b/src/App.vue index 610b62e0c..fc1f8863f 100644 --- a/src/App.vue +++ b/src/App.vue @@ -83,7 +83,7 @@ + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue index 2c8735abf..e8ef175fa 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue @@ -25,10 +25,11 @@ - + @@ -237,7 +238,7 @@ @@ -274,7 +275,7 @@ @@ -478,7 +479,7 @@ 其他起草人 - + @@ -488,7 +489,7 @@ 企标编写汇总修订人 - + @@ -498,7 +499,7 @@ 总院各中心兼职标准化员/各事业部标准化员 - + @@ -508,7 +509,7 @@ 会签征求意见人员 - + @@ -518,7 +519,7 @@ 技术委员会评审/评审意见修改人员 - + @@ -528,7 +529,7 @@ 标准法规部标准化工程师 - + @@ -538,7 +539,7 @@ 起草单位高级经理 - + @@ -548,7 +549,7 @@ 标准法规部高级经理 - + @@ -558,7 +559,7 @@ 起草单位中心主任 - + @@ -568,7 +569,7 @@ 总院院长或总院主管副院长 - + @@ -578,7 +579,7 @@ 标准法规部标准化工程师发布人员 - + @@ -886,7 +887,7 @@ align="center" label="制修订状态"> - {{ scope.row.reviseStatus === '0'? '制定完成' : (scope.row.reviseStatus === '1'? '制定中' : '未制定') }} + {{ scope.row.reviseStatus === ''? '' : (scope.row.reviseStatus === '1'? '制定' : '修订') }} { this.handleSearchStandard() }, 100) @@ -1965,7 +1973,19 @@ }, choiceZRRList (type, title, id) { this.nodeList2 = [] - this.nodeList2.push(id) + if(type === 'qcUserId'){ + if ( this.roleForm.qcUserId.length > 0) { + this.nodeList2 = this.roleForm.qcUserId.split(',') + } + }else if(type === 'hqUserId'){ + if ( this.roleForm.hqUserId.length > 0) { + this.nodeList2 = this.roleForm.hqUserId.split(',') + } + }else if(type === 'QCRBUSS'){ + if ( this.form.QCRBUSSID.length > 0) { + this.nodeList2 = this.form.QCRBUSSID.split(',') + } + } this.userType = type this.drawerTitle = title this.modalShowRoleFlag = true @@ -2019,7 +2039,9 @@ }, choiceQCDW(type, title, id) { this.nodeListZRBM = [] - this.nodeListZRBM.push(id) + if(this.form.QCDWID.length > 0){ + this.nodeListZRBM = this.form.QCDWID.split(',') + } this.drawerTitle = title this.modalShowFlagZRBM = true }, @@ -2600,7 +2622,6 @@ this.isSubmit = true this.saveLoading = true this.form.country=this.countryArr; - this.form.standCode = this.form.standSort + ' ' + this.form.standNumber + ( this.form.standYear === '' ? '' : '-' + this.form.standYear) +' X' var json = Object.assign(this.form, this.roleForm) json.zrUserId = this.form.zrUserId json.jlUserId = this.form.jlUserId @@ -2623,28 +2644,21 @@ this.$message.success(res.message) const planForm = {} planForm.id = this.form.planId - planForm.planStatus = this.form.reviseStatus !== undefined ? ( this.form.reviseStatus === '1' ? '1' : '2') :'' + planForm.planStatus = '2' this.$http.post("esRevisePlan/es-revise-plan/modPlan", planForm, { _this: this }, res => { - this.submitLoading = false if (res.ok) { if (res.data === '操作成功') { - this.addDrawer = false - this.$message.success(tips + '成功') - this.getData() - } else { - this.addDrawer = false - this.$message.warning(res.data) - this.getData() + this.submitLoading = false + this.isSubmit = false + // 流程提交之后,应该流转至待办任务页面 + this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) } else { } } else { - this.$message.warning(tips + '失败') + this.$message.warning(res.data) } }) - this.isSubmit = false - // 流程提交之后,应该流转至待办任务页面 - this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) } }) } diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue index b4720bf4d..f74f63192 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue @@ -798,6 +798,9 @@ countryArr:'', commentCycleDate:'', form: { + planId:'', + planStatus:'', + reviseStatus:'', modelData:[], modelDataNameVerify:[], modelDataZrUserVerify:[], diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue index 75ee3ac5d..e5faa7cbd 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue @@ -798,6 +798,9 @@ countryArr:'', commentCycleDate:'', form: { + planId:'', + planStatus:'', + reviseStatus:'', modelData:[], modelDataNameVerify:[], modelDataZrUserVerify:[], diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue index f41974199..7988d7c2d 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue @@ -18,7 +18,7 @@ label-width="210px" > - + > @@ -561,7 +561,7 @@