QR/laws_chery_client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[update] 法规符合性评估流程单线审核和主排查人汇总节点增加条款标题列，整改周期改成输入框

Browse Source
This commit is contained in:
lideqin
2024-07-19 15:00:35 +08:00
parent 201aae9a04
commit 3052c91143
7 changed files with 40 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/modules/NonmatchItemLookModal.vue
+4 -4
View File
@@ -27,10 +27,10 @@
</a-form-item> </a-form-item>
<!-- 整改周期 --> <!-- 整改周期 -->
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('regulatoryComplianceAssessmentDatabase.nonmatchItem.rectificationCycle')"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('regulatoryComplianceAssessmentDatabase.nonmatchItem.rectificationCycle')">
<j-dict-select-tag disabled <a-input :max-length="50"
dict-code="correction_period" disabled
:placeholder="$t('pleaseSelect')+$t('regulatoryComplianceAssessmentDatabase.nonmatchItem.rectificationCycle')" :placeholder="$t('pleaseSelect')+$t('regulatoryComplianceAssessmentDatabase.nonmatchItem.rectificationCycle')"
v-decorator.trim="[ 'correctionPeriod']"/> v-decorator.trim="[ 'correctionPeriod']"/>
</a-form-item> </a-form-item>
<!-- 整改费用 --> <!-- 整改费用 -->
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('regulatoryComplianceAssessmentDatabase.nonmatchItem.rectificationCost')"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('regulatoryComplianceAssessmentDatabase.nonmatchItem.rectificationCost')">
src/views/workCenter/regulatoryComplianceCheckProcess/modules/DesignEngineerEvaluation.vue
+7 -10
View File
@@ -127,7 +127,7 @@ export default {
2: { // 不符合 2: { // 不符合
rules: { 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' }, correctionCost: { required: true, message: this.$t('pleaseEnter') + this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCost'), trigger: 'blur' },
// 共用后本项目所需费用 // 共用后本项目所需费用
@@ -141,11 +141,10 @@ export default {
}, },
formArr: [ formArr: [
{ // 整改周期 { // 整改周期
fieldShowType: 5, fieldShowType: 4,
dbFieldTxt: this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'), dbFieldTxt: this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'),
fieldMustInput: true, fieldMustInput: true,
dbFieldName: 'correctionPeriod', dbFieldName: 'correctionPeriod'
dictCode: 'correction_period'
}, },
{ // 整改费用 { // 整改费用
fieldShowType: 4, fieldShowType: 4,
@@ -202,7 +201,7 @@ export default {
4: { // 待验证 4: { // 待验证
rules: { 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' }, correctionCost: { required: true, message: this.$t('pleaseEnter') + this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCost'), trigger: 'blur' },
// 共用后本项目所需费用 // 共用后本项目所需费用
@@ -216,11 +215,10 @@ export default {
}, },
formArr: [ formArr: [
{ // 整改周期 { // 整改周期
fieldShowType: 5, fieldShowType: 4,
dbFieldTxt: this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'), dbFieldTxt: this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'),
fieldMustInput: true, fieldMustInput: true,
dbFieldName: 'correctionPeriod', dbFieldName: 'correctionPeriod'
dictCode: 'correction_period'
}, },
{ // 整改费用 { // 整改费用
fieldShowType: 4, fieldShowType: 4,
@@ -294,8 +292,7 @@ export default {
this.dataSource[index].material = '' this.dataSource[index].material = ''
this.dataSource[index].unsatisfiedRequire = '' this.dataSource[index].unsatisfiedRequire = ''
this.dataSource[index].correctionSolution = '' this.dataSource[index].correctionSolution = ''
this.dataSource[index].correctionPeriod = null this.dataSource[index].correctionPeriod = ''
this.dataSource[index].correctionPeriod_dictText = ''
this.dataSource[index].correctionCost = '' this.dataSource[index].correctionCost = ''
this.dataSource[index].commonality = '' this.dataSource[index].commonality = ''
this.dataSource[index].commonalityCost = '' this.dataSource[index].commonalityCost = ''
src/views/workCenter/regulatoryComplianceCheckProcess/modules/FinishAuditBaseInfo.vue
+1 -1
View File
@@ -128,7 +128,7 @@ export default {
title: this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'), title: this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'),
align: 'center', align: 'center',
width: 180, width: 180,
dataIndex: 'correctionPeriod_dictText', dataIndex: 'correctionPeriod',
scopedSlots: { customRender: 'text' } scopedSlots: { customRender: 'text' }
}, },
{ // 整改费用 { // 整改费用
src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderCollectBaseInfo.vue
+8 -1
View File
@@ -153,6 +153,13 @@ export default {
dataIndex: 'termNumber', dataIndex: 'termNumber',
scopedSlots: { customRender: 'text' } scopedSlots: { customRender: 'text' }
}, },
{ // 条款标题
title: this.$t('clauseTitle'),
align: 'center',
width: 180,
dataIndex: 'termTitle',
scopedSlots: { customRender: 'text' }
},
{ // 条款内容 { // 条款内容
title: this.$t('clauseContent'), title: this.$t('clauseContent'),
align: 'center', align: 'center',
@@ -213,7 +220,7 @@ export default {
title: this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'), title: this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'),
align: 'center', align: 'center',
width: 180, width: 180,
dataIndex: 'correctionPeriod_dictText', dataIndex: 'correctionPeriod',
scopedSlots: { customRender: 'text' } scopedSlots: { customRender: 'text' }
}, },
{ // 整改费用 { // 整改费用
src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderCollectEditModal.vue
+4 -5
View File
@@ -32,9 +32,9 @@
<template v-if="[EvaluationResult.INCONFORMITY.value, EvaluationResult.TO_BE_VERIFIED.value].includes(model.result)"> <template v-if="[EvaluationResult.INCONFORMITY.value, EvaluationResult.TO_BE_VERIFIED.value].includes(model.result)">
<!-- 整改周期 --> <!-- 整改周期 -->
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle')"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle')">
<j-dict-select-tag :placeholder="$t('pleaseSelect') + $t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle')" <a-input :placeholder="$t('pleaseEnter') + $t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle')"
dict-code="correction_period" :maxLength="50"
v-decorator="['correctionPeriod', validatorRules.correctionPeriod]" /> v-decorator="['correctionPeriod', validatorRules.correctionPeriod]" />
</a-form-item> </a-form-item>
<!-- 整改费用 --> <!-- 整改费用 -->
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('workCenter.regulatoryComplianceCheckProcess.rectificationCost')"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('workCenter.regulatoryComplianceCheckProcess.rectificationCost')">
@@ -177,8 +177,7 @@ export default {
this.model.material = '' this.model.material = ''
this.model.unsatisfiedRequire = '' this.model.unsatisfiedRequire = ''
this.model.correctionSolution = '' this.model.correctionSolution = ''
this.model.correctionPeriod = undefined this.model.correctionPeriod = ''
this.model.correctionPeriod_dictText = ''
this.model.correctionCost = '' this.model.correctionCost = ''
this.model.commonality = '' this.model.commonality = ''
this.model.commonalityCost = '' this.model.commonalityCost = ''
src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderDistributesBaseInfo.vue
+8 -12
View File
@@ -384,7 +384,7 @@ export default {
2: { // 不符合 2: { // 不符合
rules: { 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' }, correctionCost: { required: true, message: this.$t('pleaseEnter') + this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCost'), trigger: 'blur' },
// 共用后本项目所需费用 // 共用后本项目所需费用
@@ -398,11 +398,10 @@ export default {
}, },
formArr: [ formArr: [
{ // 整改周期 { // 整改周期
fieldShowType: 5, fieldShowType: 4,
dbFieldTxt: this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'), dbFieldTxt: this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'),
fieldMustInput: true, fieldMustInput: true,
dbFieldName: 'correctionPeriod', dbFieldName: 'correctionPeriod'
dictCode: 'correction_period'
}, },
{ // 整改费用 { // 整改费用
fieldShowType: 4, fieldShowType: 4,
@@ -459,7 +458,7 @@ export default {
4: { // 待验证 4: { // 待验证
rules: { 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' }, correctionCost: { required: true, message: this.$t('pleaseEnter') + this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCost'), trigger: 'blur' },
// 共用后本项目所需费用 // 共用后本项目所需费用
@@ -473,11 +472,10 @@ export default {
}, },
formArr: [ formArr: [
{ // 整改周期 { // 整改周期
fieldShowType: 5, fieldShowType: 4,
dbFieldTxt: this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'), dbFieldTxt: this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'),
fieldMustInput: true, fieldMustInput: true,
dbFieldName: 'correctionPeriod', dbFieldName: 'correctionPeriod'
dictCode: 'correction_period'
}, },
{ // 整改费用 { // 整改费用
fieldShowType: 4, fieldShowType: 4,
@@ -605,8 +603,7 @@ export default {
material: '', material: '',
unsatisfiedRequire: '', unsatisfiedRequire: '',
correctionSolution: '', correctionSolution: '',
correctionPeriod: undefined, correctionPeriod: '',
correctionPeriod_dictText: '',
correctionCost: '', correctionCost: '',
commonality: '', commonality: '',
commonalityCost: '' commonalityCost: ''
@@ -667,8 +664,7 @@ export default {
this.dataSourceEvaluate[index].material = '' this.dataSourceEvaluate[index].material = ''
this.dataSourceEvaluate[index].unsatisfiedRequire = '' this.dataSourceEvaluate[index].unsatisfiedRequire = ''
this.dataSourceEvaluate[index].correctionSolution = '' this.dataSourceEvaluate[index].correctionSolution = ''
this.dataSourceEvaluate[index].correctionPeriod = null this.dataSourceEvaluate[index].correctionPeriod = ''
this.dataSourceEvaluate[index].correctionPeriod_dictText = ''
this.dataSourceEvaluate[index].correctionCost = '' this.dataSourceEvaluate[index].correctionCost = ''
this.dataSourceEvaluate[index].commonality = '' this.dataSourceEvaluate[index].commonality = ''
this.dataSourceEvaluate[index].commonalityCost = '' this.dataSourceEvaluate[index].commonalityCost = ''
src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderSingleAuditBaseInfo.vue
+8 -1
View File
@@ -76,6 +76,13 @@ export default {
dataIndex: 'termNumber', dataIndex: 'termNumber',
scopedSlots: { customRender: 'text' } scopedSlots: { customRender: 'text' }
}, },
{ // 条款标题
title: this.$t('clauseTitle'),
align: 'center',
width: 180,
dataIndex: 'termTitle',
scopedSlots: { customRender: 'text' }
},
{ // 条款内容 { // 条款内容
title: this.$t('clauseContent'), title: this.$t('clauseContent'),
align: 'center', align: 'center',
@@ -136,7 +143,7 @@ export default {
title: this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'), title: this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'),
align: 'center', align: 'center',
width: 180, width: 180,
dataIndex: 'correctionPeriod_dictText', dataIndex: 'correctionPeriod',
scopedSlots: { customRender: 'text' } scopedSlots: { customRender: 'text' }
}, },
{ // 整改费用 { // 整改费用