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) {
// 说明是已发起流程