diff --git a/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/modules/NonmatchItemLookModal.vue b/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/modules/NonmatchItemLookModal.vue
index 82f8aa7..114d786 100644
--- a/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/modules/NonmatchItemLookModal.vue
+++ b/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/modules/NonmatchItemLookModal.vue
@@ -27,10 +27,10 @@
-
+
diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/DesignEngineerEvaluation.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/DesignEngineerEvaluation.vue
index 4c1544d..175f19e 100644
--- a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/DesignEngineerEvaluation.vue
+++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/DesignEngineerEvaluation.vue
@@ -127,7 +127,7 @@ export default {
2: { // 不符合
rules: {
// 整改周期
- correctionPeriod: { required: true, message: this.$t('pleaseSelect') + this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'), trigger: 'blur' },
+ correctionPeriod: { required: true, message: this.$t('pleaseEnter') + this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'), trigger: 'blur' },
// 整改费用
correctionCost: { required: true, message: this.$t('pleaseEnter') + this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCost'), trigger: 'blur' },
// 共用后本项目所需费用
@@ -141,11 +141,10 @@ export default {
},
formArr: [
{ // 整改周期
- fieldShowType: 5,
+ fieldShowType: 4,
dbFieldTxt: this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'),
fieldMustInput: true,
- dbFieldName: 'correctionPeriod',
- dictCode: 'correction_period'
+ dbFieldName: 'correctionPeriod'
},
{ // 整改费用
fieldShowType: 4,
@@ -202,7 +201,7 @@ export default {
4: { // 待验证
rules: {
// 整改周期
- correctionPeriod: { required: true, message: this.$t('pleaseSelect') + this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'), trigger: 'blur' },
+ correctionPeriod: { required: true, message: this.$t('pleaseEnter') + this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'), trigger: 'blur' },
// 整改费用
correctionCost: { required: true, message: this.$t('pleaseEnter') + this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCost'), trigger: 'blur' },
// 共用后本项目所需费用
@@ -216,11 +215,10 @@ export default {
},
formArr: [
{ // 整改周期
- fieldShowType: 5,
+ fieldShowType: 4,
dbFieldTxt: this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'),
fieldMustInput: true,
- dbFieldName: 'correctionPeriod',
- dictCode: 'correction_period'
+ dbFieldName: 'correctionPeriod'
},
{ // 整改费用
fieldShowType: 4,
@@ -294,8 +292,7 @@ export default {
this.dataSource[index].material = ''
this.dataSource[index].unsatisfiedRequire = ''
this.dataSource[index].correctionSolution = ''
- this.dataSource[index].correctionPeriod = null
- this.dataSource[index].correctionPeriod_dictText = ''
+ this.dataSource[index].correctionPeriod = ''
this.dataSource[index].correctionCost = ''
this.dataSource[index].commonality = ''
this.dataSource[index].commonalityCost = ''
diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/FinishAuditBaseInfo.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/FinishAuditBaseInfo.vue
index 1e61c89..45fc631 100644
--- a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/FinishAuditBaseInfo.vue
+++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/FinishAuditBaseInfo.vue
@@ -128,7 +128,7 @@ export default {
title: this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'),
align: 'center',
width: 180,
- dataIndex: 'correctionPeriod_dictText',
+ dataIndex: 'correctionPeriod',
scopedSlots: { customRender: 'text' }
},
{ // 整改费用
diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderCollectBaseInfo.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderCollectBaseInfo.vue
index 5b4b247..263be44 100644
--- a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderCollectBaseInfo.vue
+++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderCollectBaseInfo.vue
@@ -153,6 +153,13 @@ export default {
dataIndex: 'termNumber',
scopedSlots: { customRender: 'text' }
},
+ { // 条款标题
+ title: this.$t('clauseTitle'),
+ align: 'center',
+ width: 180,
+ dataIndex: 'termTitle',
+ scopedSlots: { customRender: 'text' }
+ },
{ // 条款内容
title: this.$t('clauseContent'),
align: 'center',
@@ -213,7 +220,7 @@ export default {
title: this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'),
align: 'center',
width: 180,
- dataIndex: 'correctionPeriod_dictText',
+ dataIndex: 'correctionPeriod',
scopedSlots: { customRender: 'text' }
},
{ // 整改费用
diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderCollectEditModal.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderCollectEditModal.vue
index 3f6fd85..fcd2b0d 100644
--- a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderCollectEditModal.vue
+++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderCollectEditModal.vue
@@ -32,9 +32,9 @@
-
+
@@ -177,8 +177,7 @@ export default {
this.model.material = ''
this.model.unsatisfiedRequire = ''
this.model.correctionSolution = ''
- this.model.correctionPeriod = undefined
- this.model.correctionPeriod_dictText = ''
+ this.model.correctionPeriod = ''
this.model.correctionCost = ''
this.model.commonality = ''
this.model.commonalityCost = ''
diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderDistributesBaseInfo.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderDistributesBaseInfo.vue
index 1ca38e4..c6eddda 100644
--- a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderDistributesBaseInfo.vue
+++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderDistributesBaseInfo.vue
@@ -384,7 +384,7 @@ export default {
2: { // 不符合
rules: {
// 整改周期
- correctionPeriod: { required: true, message: this.$t('pleaseSelect') + this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'), trigger: 'blur' },
+ correctionPeriod: { required: true, message: this.$t('pleaseEnter') + this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'), trigger: 'blur' },
// 整改费用
correctionCost: { required: true, message: this.$t('pleaseEnter') + this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCost'), trigger: 'blur' },
// 共用后本项目所需费用
@@ -398,11 +398,10 @@ export default {
},
formArr: [
{ // 整改周期
- fieldShowType: 5,
+ fieldShowType: 4,
dbFieldTxt: this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'),
fieldMustInput: true,
- dbFieldName: 'correctionPeriod',
- dictCode: 'correction_period'
+ dbFieldName: 'correctionPeriod'
},
{ // 整改费用
fieldShowType: 4,
@@ -459,7 +458,7 @@ export default {
4: { // 待验证
rules: {
// 整改周期
- correctionPeriod: { required: true, message: this.$t('pleaseSelect') + this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'), trigger: 'blur' },
+ correctionPeriod: { required: true, message: this.$t('pleaseEnter') + this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'), trigger: 'blur' },
// 整改费用
correctionCost: { required: true, message: this.$t('pleaseEnter') + this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCost'), trigger: 'blur' },
// 共用后本项目所需费用
@@ -473,11 +472,10 @@ export default {
},
formArr: [
{ // 整改周期
- fieldShowType: 5,
+ fieldShowType: 4,
dbFieldTxt: this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'),
fieldMustInput: true,
- dbFieldName: 'correctionPeriod',
- dictCode: 'correction_period'
+ dbFieldName: 'correctionPeriod'
},
{ // 整改费用
fieldShowType: 4,
@@ -605,8 +603,7 @@ export default {
material: '',
unsatisfiedRequire: '',
correctionSolution: '',
- correctionPeriod: undefined,
- correctionPeriod_dictText: '',
+ correctionPeriod: '',
correctionCost: '',
commonality: '',
commonalityCost: ''
@@ -667,8 +664,7 @@ export default {
this.dataSourceEvaluate[index].material = ''
this.dataSourceEvaluate[index].unsatisfiedRequire = ''
this.dataSourceEvaluate[index].correctionSolution = ''
- this.dataSourceEvaluate[index].correctionPeriod = null
- this.dataSourceEvaluate[index].correctionPeriod_dictText = ''
+ this.dataSourceEvaluate[index].correctionPeriod = ''
this.dataSourceEvaluate[index].correctionCost = ''
this.dataSourceEvaluate[index].commonality = ''
this.dataSourceEvaluate[index].commonalityCost = ''
diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderSingleAuditBaseInfo.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderSingleAuditBaseInfo.vue
index 54ec235..d586f50 100644
--- a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderSingleAuditBaseInfo.vue
+++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderSingleAuditBaseInfo.vue
@@ -76,6 +76,13 @@ export default {
dataIndex: 'termNumber',
scopedSlots: { customRender: 'text' }
},
+ { // 条款标题
+ title: this.$t('clauseTitle'),
+ align: 'center',
+ width: 180,
+ dataIndex: 'termTitle',
+ scopedSlots: { customRender: 'text' }
+ },
{ // 条款内容
title: this.$t('clauseContent'),
align: 'center',
@@ -136,7 +143,7 @@ export default {
title: this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'),
align: 'center',
width: 180,
- dataIndex: 'correctionPeriod_dictText',
+ dataIndex: 'correctionPeriod',
scopedSlots: { customRender: 'text' }
},
{ // 整改费用