From 6483e075183e9013cb12ab975cf4fe2f78c00938 Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Mon, 22 Jul 2024 17:50:42 +0800 Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E8=AF=A6=E6=83=85=E8=BF=9B=E5=85=A5=E6=8A=A5?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=B8=8D=E5=AD=98=E5=9C=A8=EF=BC=8C=E5=B8=82?= =?UTF-8?q?=E5=9C=BA=E6=B8=85=E5=8D=95=E6=B5=81=E7=A8=8B=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=92=8C=E5=9B=BD=E5=AE=B6=E5=9C=B0=E5=8C=BA=E6=B2=A1=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=EF=BC=8C=E5=B8=82=E5=9C=BA=E6=B8=85=E5=8D=95=E5=AD=90?= =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=A4=87=E6=B3=A8=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/lang/en-us.js | 1 + src/common/lang/zh-cn.js | 1 + .../MarketRegulationsDetailPage.vue | 7 +++++++ .../MarketRegulationsFormPage.vue | 7 +++++++ .../modules/MarketRegulationsModal.vue | 6 ++++++ .../MarketListReleaseProcess.vue | 19 ++++++++++--------- .../modules/BaseInfoForm.vue | 4 ++-- .../NewRegulationIntroductionProcess.vue | 19 ++++++++++--------- .../RegulatoryComplianceCheckProcess.vue | 19 ++++++++++--------- 9 files changed, 54 insertions(+), 29 deletions(-) diff --git a/src/common/lang/en-us.js b/src/common/lang/en-us.js index 9790b67..95acb52 100644 --- a/src/common/lang/en-us.js +++ b/src/common/lang/en-us.js @@ -226,6 +226,7 @@ module.exports = { networkTimeout: 'Network Timeout', unauthorized: 'Unauthorized, please log in again', tableDataDisabledClear: 'The table requires at least one piece of data', + autoTakeout: 'Automatic takeout', // 树右键 treeRight: { addFolder: 'Create New Folder', diff --git a/src/common/lang/zh-cn.js b/src/common/lang/zh-cn.js index ae70b51..a7de709 100644 --- a/src/common/lang/zh-cn.js +++ b/src/common/lang/zh-cn.js @@ -243,6 +243,7 @@ module.exports = { networkTimeout: '网络超时', unauthorized: '未授权，请重新登录', tableDataDisabledClear: '表格至少需要一条数据', + autoTakeout: '自动带出', // 标准字段 standardField: { standardEnglishName: '标准英文名称', diff --git a/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsDetailPage.vue b/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsDetailPage.vue index e93c7c7..66d7149 100644 --- a/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsDetailPage.vue +++ b/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsDetailPage.vue @@ -331,6 +331,13 @@ export default { width: 180, dataIndex: 'requireType_dictText', scopedSlots: { customRender: 'text' } + }, + { // 备注 + title: this.$t('remarks'), + align: 'center', + width: 180, + dataIndex: 'remarks', + scopedSlots: { customRender: 'text' } } ], dataSource: [], diff --git a/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsFormPage.vue b/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsFormPage.vue index 9e6dc98..ff496bf 100644 --- a/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsFormPage.vue +++ b/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsFormPage.vue @@ -442,6 +442,13 @@ export default { dataIndex: 'requireType_dictText', scopedSlots: { customRender: 'text' } }, + { // 备注 + title: this.$t('remarks'), + align: 'center', + width: 180, + dataIndex: 'remarks', + scopedSlots: { customRender: 'text' } + }, { title: this.$t('operation'), scopedSlots: { customRender: 'action' }, diff --git a/src/views/standardRegulationLibrary/marketRegulationsList/modules/MarketRegulationsModal.vue b/src/views/standardRegulationLibrary/marketRegulationsList/modules/MarketRegulationsModal.vue index 851ab8f..2e004d1 100644 --- a/src/views/standardRegulationLibrary/marketRegulationsList/modules/MarketRegulationsModal.vue +++ b/src/views/standardRegulationLibrary/marketRegulationsList/modules/MarketRegulationsModal.vue @@ -134,6 +134,12 @@ dict-code="requirement_type" v-decorator.trim="[ 'requireType', validatorRules.requireType ]" /> + + + + diff --git a/src/views/workCenter/marketListReleaseProcess/MarketListReleaseProcess.vue b/src/views/workCenter/marketListReleaseProcess/MarketListReleaseProcess.vue index 7c19d64..b0caae0 100644 --- a/src/views/workCenter/marketListReleaseProcess/MarketListReleaseProcess.vue +++ b/src/views/workCenter/marketListReleaseProcess/MarketListReleaseProcess.vue @@ -24,7 +24,7 @@ :wrapperCol="$i18n.locale === EN ? wrapperColEn : wrapperCol" :label="$t('processName')" :colon="formItemColon"> - @@ -233,14 +233,6 @@ export default { } } }) - if (this.$route.query.taskId && !this.$route.query.draftId) { - // 有流程id说明是从流程中心来的，需要初始化数据 - this.getProcessData('todo', { taskId: this.$route.query.taskId }) - } - if (this.$route.query.draftId) { - // 有草稿id，说明是从流程中心-草稿来的，需要初始化数据 - this.getProcessData('draft', { draftId: this.$route.query.draftId, projectId: this.$route.query.projectId }) - } if (this.$route.query.isLook + '' === '1') { // 是查看 this.isLook = true @@ -248,6 +240,15 @@ export default { this.initPersonInfoData(false) // 查询数据 this.getProcessData('look', { snapshotId: this.$route.query.snapshotId }) + } else { + if (this.$route.query.taskId && !this.$route.query.draftId) { + // 有流程id说明是从流程中心来的，需要初始化数据 + this.getProcessData('todo', { taskId: this.$route.query.taskId }) + } + if (this.$route.query.draftId) { + // 有草稿id，说明是从流程中心-草稿来的，需要初始化数据 + this.getProcessData('draft', { draftId: this.$route.query.draftId, projectId: this.$route.query.projectId }) + } } if (this.$route.query.taskName) { // 说明是已发起流程 diff --git a/src/views/workCenter/marketListReleaseProcess/modules/BaseInfoForm.vue b/src/views/workCenter/marketListReleaseProcess/modules/BaseInfoForm.vue index 04793d4..b222272 100644 --- a/src/views/workCenter/marketListReleaseProcess/modules/BaseInfoForm.vue +++ b/src/views/workCenter/marketListReleaseProcess/modules/BaseInfoForm.vue @@ -212,7 +212,7 @@ export default { title: this.$t('workCenter.marketListReleaseProcess.applicableCountryRegion'), align: 'center', width: 180, - dataIndex: 'applicableCountryRegion_dictText', + dataIndex: 'country_dictText', scopedSlots: { customRender: 'text' } }, { // 适用车型 @@ -240,7 +240,7 @@ export default { title: this.$t('workCenter.marketListReleaseProcess.type'), align: 'center', width: 180, - dataIndex: 'stanardClass_dictText', + dataIndex: 'type_dictText', scopedSlots: { customRender: 'text' } }, { // 动力类型 diff --git a/src/views/workCenter/newRegulationIntroductionProcess/NewRegulationIntroductionProcess.vue b/src/views/workCenter/newRegulationIntroductionProcess/NewRegulationIntroductionProcess.vue index 2cb25b9..de75b00 100644 --- a/src/views/workCenter/newRegulationIntroductionProcess/NewRegulationIntroductionProcess.vue +++ b/src/views/workCenter/newRegulationIntroductionProcess/NewRegulationIntroductionProcess.vue @@ -24,7 +24,7 @@ :wrapperCol="$i18n.locale === EN ? wrapperColEn : wrapperCol" :label="$t('processName')" :colon="formItemColon"> - @@ -202,14 +202,6 @@ export default { } } }) - if (this.$route.query.taskId && !this.$route.query.draftId) { - // 有流程id说明是从流程中心来的，需要初始化数据 - this.getProcessData('todo', { taskId: this.$route.query.taskId }) - } - if (this.$route.query.draftId) { - // 有草稿id，说明是从流程中心-草稿来的，需要初始化数据 - this.getProcessData('draft', { draftId: this.$route.query.draftId, projectId: this.$route.query.projectId }) - } if (this.$route.query.isLook + '' === '1') { // 是查看 this.isLook = true @@ -217,6 +209,15 @@ export default { this.initPersonInfoData(false) // 查询数据 this.getProcessData('look', { snapshotId: this.$route.query.snapshotId }) + } else { + if (this.$route.query.taskId && !this.$route.query.draftId) { + // 有流程id说明是从流程中心来的，需要初始化数据 + this.getProcessData('todo', { taskId: this.$route.query.taskId }) + } + if (this.$route.query.draftId) { + // 有草稿id，说明是从流程中心-草稿来的，需要初始化数据 + this.getProcessData('draft', { draftId: this.$route.query.draftId, projectId: this.$route.query.projectId }) + } } if (this.$route.query.taskName) { // 说明是已发起流程 diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/RegulatoryComplianceCheckProcess.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/RegulatoryComplianceCheckProcess.vue index ae4c879..b9889f0 100644 --- a/src/views/workCenter/regulatoryComplianceCheckProcess/RegulatoryComplianceCheckProcess.vue +++ b/src/views/workCenter/regulatoryComplianceCheckProcess/RegulatoryComplianceCheckProcess.vue @@ -24,7 +24,7 @@ :wrapperCol="$i18n.locale === EN ? wrapperColEn : wrapperCol" :label="$t('processName')" :colon="formItemColon"> - @@ -296,14 +296,6 @@ export default { } } }) - if (this.$route.query.taskId && !this.$route.query.draftId) { - // 有流程id说明是从流程中心来的，需要初始化数据 - this.getProcessData('todo', { taskId: this.$route.query.taskId }) - } - if (this.$route.query.draftId) { - // 有草稿id，说明是从流程中心-草稿来的，需要初始化数据 - this.getProcessData('draft', { draftId: this.$route.query.draftId, projectId: this.$route.query.projectId }) - } if (this.$route.query.isLook + '' === '1') { // 是查看 this.isLook = true @@ -311,6 +303,15 @@ export default { this.initPersonInfoData(false) // 查询数据 this.getProcessData('look', { snapshotId: this.$route.query.snapshotId }) + } else { + if (this.$route.query.taskId && !this.$route.query.draftId) { + // 有流程id说明是从流程中心来的，需要初始化数据 + this.getProcessData('todo', { taskId: this.$route.query.taskId }) + } + if (this.$route.query.draftId) { + // 有草稿id，说明是从流程中心-草稿来的，需要初始化数据 + this.getProcessData('draft', { draftId: this.$route.query.draftId, projectId: this.$route.query.projectId }) + } } if (this.$route.query.taskName) { // 说明是已发起流程