diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue index 39a340c15..500446124 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue @@ -124,7 +124,8 @@

责任工程师

- +
@@ -299,7 +300,7 @@ @@ -589,6 +590,12 @@ export default { workChange(data) { this.workChangeList = data }, + //工作组取消按钮 + closeWorkDrawer(){ + this.workModel = false + this.workSearch.workGroupName = '' + this.$refs.workGroup.clearSelection() + }, OkWork(){ if(this.workChangeList.length > 1 ){ this.$message.warning('您只能选择一条数据进行带入') @@ -601,6 +608,7 @@ export default { this.$refs.qblx_pageData.validateField('wgLeaderName') } this.workModel = false + this.workSearch.workGroupName = '' this.$refs.workGroup.clearSelection() } }, @@ -1014,7 +1022,7 @@ export default { height: 100%; /deep/ .el-upload-list__item-name { - margin-left: 48px; + //margin-left: 48px; } /deep/ .el-upload-list { diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue index 6300cfc6c..a88f49e99 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue @@ -194,7 +194,7 @@ :enterpriseStandard="true" :placeholderText="'包括已有、应有的关联标准,如企业标准、行业标准、国家标准'" :config="{attrName: '引用标准'}" - :labelWidth="'180px'" + :labelWidth="'150px'" v-model="qbfsForm.esMatingRelations" > @@ -675,8 +675,20 @@ export default { //必填人员校验规则 roleFormRules: { dockUserName: [ - { required: true, message: "请选择工作组组长", trigger: "change" } - ] + { required: true, message: "请选择标准立项单位整车/系统总工", trigger: "change" } + ], + countersignerName:[ + {required: true, message:'请选择会签人员', trigger: "change" } + ], + examineName:[ + {required: true, message:'请选择标准体系工作组组长', trigger: "change" } + ], + approverName:[ + {required: true, message:'请选择总院技术委员会覆盖领域企业标准:专委会主任/总院技术委员会未覆盖领域企业标准:总院院长或总院主管副院长', trigger: "change" } + ], + engineerName:[ + {required: true, message:'请选择相关单位、工程研究总院标准法规部', trigger: "change" } + ], }, roleForm: { prcCreateUserName: this.$store.getters.userInfo.userName, diff --git a/src/pages/processCenter/pages/processList/index.vue b/src/pages/processCenter/pages/processList/index.vue index 652cdc47f..3bceb3b92 100644 --- a/src/pages/processCenter/pages/processList/index.vue +++ b/src/pages/processCenter/pages/processList/index.vue @@ -1,111 +1,117 @@ - - - - - - + + + + + + diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue index c10c9e14c..989404319 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue @@ -247,7 +247,6 @@ export default { //草稿办理待开发 const { prcType, id } = row const mes = JSON.parse(row.mes) - console.log(mes) this.$store.commit('setDetailMap', this.$route.path) switch (prcType) { // 标准入库、 @@ -899,6 +898,17 @@ export default { } }) break + //企标制修订立项计划 + case '26': + this.$router.push({ + name: 'qbzxdlxStep1', + query: { + type: '26', + processName: '企标制修订立项计划', + bpnId: id + } + }) + break } }, ...mapMutations(['setProcess', 'setHandleInfo']), diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue index d9fdc83b7..7c1f2fcc1 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue @@ -1,1377 +1,1378 @@ - - - - - + + + + + diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue index c7809efbe..3800f6098 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue @@ -1,1206 +1,1206 @@ - - - - + + + + diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/keyIssues.vue b/src/pages/regulatoryRepository/nonConfomity/pages/keyIssues.vue index ea9994723..67ee31d0c 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/keyIssues.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/keyIssues.vue @@ -1,65 +1,65 @@ - - - - - - + + + + + + diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue index fe5e79f2a..e1cdf15e4 100644 --- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue +++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue @@ -114,7 +114,6 @@ label="章节名称">