diff --git a/src/pages/config/pages/mechanismManage/pages/workgroup.vue b/src/pages/config/pages/mechanismManage/pages/workgroup.vue index 0af0db617..70e06c64a 100644 --- a/src/pages/config/pages/mechanismManage/pages/workgroup.vue +++ b/src/pages/config/pages/mechanismManage/pages/workgroup.vue @@ -483,11 +483,11 @@ export default { this.roleModal2 = false }, pageChange(page) { - this.page = page; + this.workSearch.page = page this.getWorkData() }, pageSizeChange(pageSize) { - this.pageSize = pageSize; + this.workSearch.pageSize = pageSize this.getWorkData() } } diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue index 477713585..518a658d7 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue @@ -781,10 +781,10 @@ export default { }, roleFormRules: { dockUserName: [ - { required: true, message: "请选择会签责任人", trigger: "change" } + {required: true, message: "请选择相关业务单位", trigger: "change"} ], directorUserName: [ - { required: true, message: "请选择审批责任人", trigger: "change" } + {required: true, message: "请选择标准法规部法规分析业务经理", trigger: "change"} ] }, dataList: [],//清单里的标准数据 diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index 83e34a0ce..3eba6e0cc 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -750,10 +750,10 @@ export default { }, roleFormRules: { dockUserName: [ - {required: true, message: "请选择会签责任人", trigger: "change"} + {required: true, message: "请选择相关业务单位", trigger: "change"} ], directorUserName: [ - {required: true, message: "请选择审批责任人", trigger: "change"} + {required: true, message: "请选择标准法规部法规分析业务经理", trigger: "change"} ] }, dataList: [],//清单里的标准数据 diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue index 0410568e9..7617ca8c8 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue @@ -726,7 +726,7 @@ export default { this.qcdwOptions = res.data.QCDW // 起草单位 }) this.getStandDataBtn() - + this.getWorkData() }, watch:{ message: { diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue index 0193652ae..24c4bc1c9 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue @@ -312,8 +312,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" } + ], } }; }, diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue index d6c4eb3a0..69a911291 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue @@ -514,6 +514,7 @@ export default { this.$refs.qblx_pageData.validateField('wgLeaderName') } this.workModel = false + this.$refs.workGroup.clearSelection() } }, getWorkData() { diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 4e8c42ae4..d81453389 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -279,6 +279,7 @@ export default { this.queryProcess() }, dealWith (row) { // 办理 + this.$store.commit('setDetailMap', this.$route.path) this.setHandleInfo(JSON.stringify(row)) const prcType = row.prcType switch(prcType) { diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue index a9bd824c5..72d2e093e 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue @@ -243,6 +243,7 @@ export default { const { prcType, id } = row const mes = JSON.parse(row.mes) console.log(mes) + this.$store.commit('setDetailMap', this.$route.path) switch (prcType) { // 标准入库、 case '1': diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index c2410f783..2b7d4d474 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -1170,10 +1170,14 @@ export default { // 国内标准法规可查字段 if (val === 'INLAND_STAND') { this.sarAccessInfo.dataSource = 'INLAND_STAND' + this.standLabelNum = '标准号' + this.standLabelName = '标准名称' this.selectLawsStands() // 海外标准法规可查字段 } else if (val === 'FOREIGN_STAND') { this.sarAccessInfo.dataSource = 'FOREIGN_STAND' + this.standLabelNum = '标准号' + this.standLabelName = '英文名称' this.selectLawsStands() // 国内外政策可查字段 } else if (val === 'FOREIGN_LAWS') { diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue index 9965a63e3..1104990e1 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue @@ -767,12 +767,12 @@ export default { if (item.xcxssrqgj === "undefined") { item.xcxssrqgj = '' } - if (item.ssrq === "undefined" || item.ssrq === 'null' || item.ssrq) { + if (item.ssrq === "undefined" || item.ssrq === 'null' || !item.ssrq) { item.ssrq = '' } }); this.standinfoList = res.data.records; - this.standardFormTotal = res.data.total; + this.total = res.data.total; this.standinfoList.forEach(item => { if (item.standYear === null) { item.standNumber = item.standSortShow + " " + item.standNumber; diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue index a5d72f782..c3166918c 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue @@ -1172,10 +1172,14 @@ export default { // 国内标准法规可查字段 if (val === 'INLAND_STAND') { this.sarAccessInfo.dataSource = 'INLAND_STAND' + this.standLabelNum = '标准号' + this.standLabelName = '标准名称' this.selectLawsStands() // 海外标准法规可查字段 } else if (val === 'FOREIGN_STAND') { this.sarAccessInfo.dataSource = 'FOREIGN_STAND' + this.standLabelNum = '标准号' + this.standLabelName = '英文名称' this.selectLawsStands() // 国内外政策可查字段 } else if (val === 'FOREIGN_LAWS') { diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue index 4a5c39932..1d11479e3 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue @@ -1103,10 +1103,14 @@ export default { // 国内标准法规可查字段 if (val === 'INLAND_STAND') { this.sarAccessInfo.dataSource = 'INLAND_STAND' + this.standLabelNum = '标准号' + this.standLabelName = '标准名称' this.selectLawsStands() // 海外标准法规可查字段 } else if (val === 'FOREIGN_STAND') { this.sarAccessInfo.dataSource = 'FOREIGN_STAND' + this.standLabelNum = '标准号' + this.standLabelName = '英文名称' this.selectLawsStands() // 国内外政策可查字段 } else if (val === 'FOREIGN_LAWS') { diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue b/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue index 7f7c0f7f4..94833ef5f 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue @@ -135,7 +135,6 @@ prop="actualCloseTime" width="130" align="center" - sortable label="实际关闭时间"> diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue index c9933b533..e8e282650 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue @@ -185,7 +185,6 @@