From 482bf0d15c09fef747a674d1b5b9ca60c4b90b64 Mon Sep 17 00:00:00 2001 From: 11528 <1152856986@qq.com> Date: Wed, 23 Mar 2022 14:13:17 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/processList/index.vue | 228 +- .../pages/details.vue | 2756 +++++++++-------- .../pages/details.vue | 2412 +++++++-------- .../nonConfomity/pages/keyIssues.vue | 130 +- .../pags/consultationDetails.vue | 1 - 5 files changed, 2767 insertions(+), 2760 deletions(-) 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/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue index d9fdc83b7..9ca8433b2 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue @@ -1,1377 +1,1379 @@ - - - - - - - - {{ sarAccessEO.detailedListName }} - - - - - - - - 国家/地区: - - {{ sarAccessEO.countryAreaShow }} - - - - - 清单说明: - {{ sarAccessEO.remark || "-" }} - - - 清单说明附件: - - {{ item.name }} - - - - - - - - - - - - - - - - - - - - - - - - 查询 - - - - 清空 - - - - 导出 - - - - 高级查询 - - - - - - - 数据获取中 - - - - - - - - {{ scope.row.standNumber }} - - - - - {{ scope.row.standName }} - - - - - {{ scope.row.standEnName }} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 取消 - 提交 - - - - - - {{ index + 1 }}. {{ item.creationUserName }} {{ item.creationTime }} {{ item.content }} - - - - - - - - - - - - - 基础信息 - - - - - - - - - - - - - {{ opt.label }} - - - - - - {{ opt.label }} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 日期选择 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {{ $t("m.dataAcquisition") }} - - - - - - + + + + + + + + {{ sarAccessEO.detailedListName }} + + + + + + + + 国家/地区: + + {{ sarAccessEO.countryAreaShow }} + + + + + 清单说明: + {{ sarAccessEO.remark || "-" }} + + + 清单说明附件: + + {{ item.name }} + + + + + - + + + + + + + + + + + + + + + + + + 查询 + + + + 清空 + + + + 导出 + + + + 高级查询 + + + + + + + 数据获取中 + + + + + + + + {{ scope.row.standNumber }} + + + + + {{ scope.row.standName }} + + + + + {{ scope.row.standEnName }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 取消 + 提交 + + + + + + {{ index + 1 }}. {{ item.creationUserName }} {{ item.creationTime }} {{ item.content }} + + + + + + + + + + + + + 基础信息 + + + + + + + + + + + + + {{ opt.label }} + + + + + + {{ opt.label }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 日期选择 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ $t("m.dataAcquisition") }} + + + + + + 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 @@ - - - - - - - 车型《{{ localProEO.projectName }}》 详情 - - - - - - - 管理主体: {{ localProEO.managementHostName || '-' }} - 开发主体: {{ localProEO.developmentHostName || '-' }} - 项目细分类:{{ localProEO.categoryName || '-' }} - 项目群: {{ localProEO.projectGroup }} - - - 项目编号: {{ localProEO.projectNumber }} - - - - {{ localProEO.projectName }} - - - - 项目名称: {{ - localProEO.projectName && localProEO.projectName.substring(0, 15) + "..." - }} - 项目名称: {{ localProEO.projectName }} - - - - 项目状态: {{ localProEO.projectStatus }} - - 当前节点: {{ localProEO.currentNode }} - - - - 项目经理: {{ localProEO.uname }} - 项目计划开始时间: {{ $moment(localProEO.projectStartDate).format('YYYY-MM-DD') }} - 项目计划完成时间: {{ $moment(localProEO.projectEndDate).format('YYYY-MM-DD') }} - - - - - - - 清单版本: {{ detailedListVersion ? $moment(detailedListVersion).format('YYYY-MM-DD HH:mm:ss') : '-' }} - - - 导出 - - - - - - - - - - - {{ - scope.row.standSort + ' ' + scope.row.standNumber + '-' + scope.row.standYear - }} - {{ - scope.row.standSortShow + ' ' + scope.row.standNumber + '-' + scope.row.standYear - }} - - - - - - - - - - - - - - - - - - - 符合 - 不符合 - 不涉及 - - - - - - - {{ scope.row.endTimes ? scope.row.endTimes.substring(0,10) : '' }} - - - - - - 数据获取中 - - - - - - - - - - - - - - - - - - - - - 查询 - - - - 清空 - - - - - - - - - - - - - - - - - 未发布 - 已发布 - 审核中 - - - - - {{ - scope.row.detailedListVision - }} - - - - - {{ - scope.row.updateTime ? $moment(scope.row.updateTime).format('YYYY-MM-DD') : scope.row.updateTime - }} - - - - - - - - 获取标准 - - - - - - - - - - - - - - - - - - - - - - - - - {{ opt.label }} - - - - - - - - - - - 查询 - - 清空 - - - - - - - - - - - - {{ scope.row.standSortShow }} {{ - scope.row.standNumber - }}-{{ scope.row.standYear }} - {{ scope.row.standSortShow }} - {{ scope.row.standNumber }} - - - - - {{ scope.row.standName }} - - - - - - - {{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }} - - - - - {{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }} - - - - - - {{ textStatusMap[scope.row.textStatus] }} - - - - - - - - - - - - - - - 导出 - - 取消 - - - - - - - + + + + + + + 车型《{{ localProEO.projectName }}》 详情 + + + + + + + 管理主体: {{ localProEO.managementHostName || '-' }} + 开发主体: {{ localProEO.developmentHostName || '-' }} + 项目细分类:{{ localProEO.categoryName || '-' }} + 项目群: {{ localProEO.projectGroup }} + + + 项目编号: {{ localProEO.projectNumber }} + + + + {{ localProEO.projectName }} + + + + 项目名称: {{ + localProEO.projectName && localProEO.projectName.substring(0, 15) + "..." + }} + 项目名称: {{ localProEO.projectName }} + + + + 项目状态: {{ localProEO.projectStatus }} + + 当前节点: {{ localProEO.currentNode }} + + + + 项目经理: {{ localProEO.uname }} + 项目计划开始时间: {{ $moment(localProEO.projectStartDate).format('YYYY-MM-DD') }} + 项目计划完成时间: {{ $moment(localProEO.projectEndDate).format('YYYY-MM-DD') }} + + + + + + + 清单版本: {{ detailedListVersion ? $moment(detailedListVersion).format('YYYY-MM-DD HH:mm:ss') : '-' }} + + + 导出 + + + + + + + + + + + {{ + scope.row.standSort + ' ' + scope.row.standNumber + '-' + scope.row.standYear + }} + {{ + scope.row.standSortShow + ' ' + scope.row.standNumber + '-' + scope.row.standYear + }} + + + + + + + + + + + + + + + + + + + 符合 + 不符合 + 不涉及 + + + + + + + {{ scope.row.endTimes ? scope.row.endTimes.substring(0,10) : '' }} + + + + + + 数据获取中 + + + + + + + + + + + + + + + + + + + + + 查询 + + + + 清空 + + + + + + + + + + + + + + + + + 未发布 + 已发布 + 审核中 + + + + + {{ + scope.row.detailedListVision + }} + + + + + {{ + scope.row.updateTime ? $moment(scope.row.updateTime).format('YYYY-MM-DD') : scope.row.updateTime + }} + + + + + + + + 获取标准 + + + + + + + + + + + + + + + + + + + + + + + + + {{ opt.label }} + + + + + + + + + + + 查询 + + 清空 + + + + + + + + + + + + {{ scope.row.standSortShow }} {{ + scope.row.standNumber + }}-{{ scope.row.standYear }} + {{ scope.row.standSortShow }} + {{ scope.row.standNumber }} + + + + + {{ scope.row.standName }} + + + + + + + {{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }} + + + + + {{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }} + + + + + + {{ textStatusMap[scope.row.textStatus] }} + + + + + + + + + + + + + + + 导出 + + 取消 + + + + + + + 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="章节名称"> From 63d7c54b4a2a490dea2a7e5bd3e50e128a93e4fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Wed, 23 Mar 2022 14:24:23 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=A6=85=E9=81=93bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/creatProcess/qbzxdlx/step1.vue | 9 ++++++++- .../processCenter/pages/creatProcess/qbzxdlx/step2.vue | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue index 39a340c15..761734c61 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue @@ -299,7 +299,7 @@ @@ -589,6 +589,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 +607,7 @@ export default { this.$refs.qblx_pageData.validateField('wgLeaderName') } this.workModel = false + this.workSearch.workGroupName = '' this.$refs.workGroup.clearSelection() } }, diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue index 6300cfc6c..000a67f17 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" > From 117adca57e3d134834cefc39b4648f25eabcb963 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Wed, 23 Mar 2022 15:02:24 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=A6=85=E9=81=93bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbzxdlx/step1.vue | 5 +++-- .../pages/creatProcess/qbzxdlx/step2.vue | 16 ++++++++++++++-- .../tabComponents/taskDraft/index.vue | 12 +++++++++++- .../pages/details.vue | 1 - 4 files changed, 28 insertions(+), 6 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue index 761734c61..500446124 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue @@ -124,7 +124,8 @@ 责任工程师 - + @@ -1021,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 000a67f17..a88f49e99 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue @@ -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/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 9ca8433b2..7c1f2fcc1 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue @@ -542,7 +542,6 @@ export default { XCXSSRQLAWS: '', //是否纳入认证清单 isRelateAccess: '', - standType: 'INLAND', askType: '', // 监管类型 dataSource: 'INLAND_STAND', // 数据来源 page: 1,
- 国家/地区: - - {{ sarAccessEO.countryAreaShow }} - -
- 清单说明: - {{ sarAccessEO.remark || "-" }} -
{{ item.name }} - - -
+ 国家/地区: + + {{ sarAccessEO.countryAreaShow }} + +
+ 清单说明: + {{ sarAccessEO.remark || "-" }} +
{{ item.name }} + + +