diff --git a/src/components/JExpandTable.vue b/src/components/JExpandTable.vue index 10485ac..1bc1b41 100644 --- a/src/components/JExpandTable.vue +++ b/src/components/JExpandTable.vue @@ -69,6 +69,13 @@ :disabled="allDisabled || form.isDisabled || (form.dynamicIsDisabled && form.dynamicIsDisabled(record)) || false" v-model="record[form.dbFieldName]" /> + + + diff --git a/src/enums/commonEnums.js b/src/enums/commonEnums.js index f001793..1436ac2 100644 --- a/src/enums/commonEnums.js +++ b/src/enums/commonEnums.js @@ -180,7 +180,8 @@ export const RegulatoryComplianceCheckNodes = new EsEnums({ mainFinderCollect: { text: '主排查人汇总', value: 'sid-A478E1B2-84B6-4884-875B-E6C53392BC4F' }, countersign: { text: '会签', value: 'sid-D3B3377E-9392-44D6-81D5-9DDDA91FB083' }, designEngineerManagerReview: { text: '设计工程师科室经理审核', value: 'sid-B253F229-2E92-4882-A054-EAA068069F0F' }, - seniorManagerApproved: { text: '高级经理/技术官批准', value: 'sid-31D9FF6F-D1BE-4B02-910C-5DB7A5D0A626' } + seniorManagerApproved: { text: '高级经理/技术官批准', value: 'sid-31D9FF6F-D1BE-4B02-910C-5DB7A5D0A626' }, + mainFinderTwiceDistributes: { text: '主排查人分批下发(二次分发)', value: 'sid-3D1BFC0F-9074-4868-891F-2F76D00A21C7' } }) // 市场清单发布流程节点 diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/RegulatoryComplianceCheckProcess.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/RegulatoryComplianceCheckProcess.vue index d09438b..6ffbce5 100644 --- a/src/views/workCenter/regulatoryComplianceCheckProcess/RegulatoryComplianceCheckProcess.vue +++ b/src/views/workCenter/regulatoryComplianceCheckProcess/RegulatoryComplianceCheckProcess.vue @@ -58,7 +58,7 @@ v-decorator="['processDescription']" /> - + - + + + {{ $t('processApprovalInformation') }} @@ -155,6 +157,15 @@ {{ $t('submit') }} + + + + {{ $t('turnTo') }} + + {{ $t('preservation') }} + + {{ $t('submit') }} + {{ $t('turnTo') }} @@ -210,10 +221,12 @@ import DesignEngineerEvaluation from './modules/DesignEngineerEvaluation' import MainFinderSingleAuditBaseInfo from './modules/MainFinderSingleAuditBaseInfo' import MainFinderCollectBaseInfo from './modules/MainFinderCollectBaseInfo' import FinishAuditBaseInfo from './modules/FinishAuditBaseInfo' +import MainFinderTwiceDistributesBaseInfo from './modules/MainFinderTwiceDistributesBaseInfo' export default { name: 'RegulatoryComplianceCheckProcess', components: { + MainFinderTwiceDistributesBaseInfo, FinishAuditBaseInfo, MainFinderCollectBaseInfo, MainFinderSingleAuditBaseInfo, @@ -264,6 +277,9 @@ export default { } else if (nodeId === RegulatoryComplianceCheckNodes.seniorManagerApproved.value) { // 高级经理/技术官批准 this.currentNode = 9 + } else if (nodeId === RegulatoryComplianceCheckNodes.mainFinderTwiceDistributes.value) { + // 主排查人二次分发节点 + this.currentNode = 10 } else { // 预留加签节点 this.currentNode = 999 diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/DesignEngineerEvaluation.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/DesignEngineerEvaluation.vue index 6c9128f..f70d91b 100644 --- a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/DesignEngineerEvaluation.vue +++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/DesignEngineerEvaluation.vue @@ -112,7 +112,7 @@ export default { 2: { // 不符合 rules: { // 整改周期 - correctionCycle: { required: true, message: this.$t('pleaseEnter') + this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'), trigger: 'blur' }, + correctionCycle: { required: true, message: this.$t('pleaseSelect') + this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'), trigger: 'blur' }, // 整改费用 correctionCost: { required: true, message: this.$t('pleaseEnter') + this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCost'), trigger: 'blur' }, // 共用后本项目所需费用 @@ -126,10 +126,11 @@ export default { }, formArr: [ { // 整改周期 - fieldShowType: 4, + fieldShowType: 5, dbFieldTxt: this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'), fieldMustInput: true, - dbFieldName: 'correctionCycle' + dbFieldName: 'correctionCycle', + dictCode: 'correction_period' }, { // 整改费用 fieldShowType: 4, @@ -186,7 +187,7 @@ export default { 4: { // 待验证 rules: { // 整改周期 - correctionCycle: { required: true, message: this.$t('pleaseEnter') + this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'), trigger: 'blur' }, + correctionCycle: { required: true, message: this.$t('pleaseSelect') + this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'), trigger: 'blur' }, // 整改费用 correctionCost: { required: true, message: this.$t('pleaseEnter') + this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCost'), trigger: 'blur' }, // 共用后本项目所需费用 @@ -200,10 +201,11 @@ export default { }, formArr: [ { // 整改周期 - fieldShowType: 4, + fieldShowType: 5, dbFieldTxt: this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'), fieldMustInput: true, - dbFieldName: 'correctionCycle' + dbFieldName: 'correctionCycle', + dictCode: 'correction_period' }, { // 整改费用 fieldShowType: 4, diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderDistributesBaseInfo.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderDistributesBaseInfo.vue index ff00207..8be1f7c 100644 --- a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderDistributesBaseInfo.vue +++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderDistributesBaseInfo.vue @@ -378,7 +378,7 @@ export default { 2: { // 不符合 rules: { // 整改周期 - correctionCycle: { required: true, message: this.$t('pleaseEnter') + this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'), trigger: 'blur' }, + correctionCycle: { required: true, message: this.$t('pleaseSelect') + this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'), trigger: 'blur' }, // 整改费用 correctionCost: { required: true, message: this.$t('pleaseEnter') + this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCost'), trigger: 'blur' }, // 共用后本项目所需费用 @@ -392,10 +392,11 @@ export default { }, formArr: [ { // 整改周期 - fieldShowType: 4, + fieldShowType: 5, dbFieldTxt: this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'), fieldMustInput: true, - dbFieldName: 'correctionCycle' + dbFieldName: 'correctionCycle', + dictCode: 'correction_period' }, { // 整改费用 fieldShowType: 4, @@ -452,7 +453,7 @@ export default { 4: { // 待验证 rules: { // 整改周期 - correctionCycle: { required: true, message: this.$t('pleaseEnter') + this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'), trigger: 'blur' }, + correctionCycle: { required: true, message: this.$t('pleaseSelect') + this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'), trigger: 'blur' }, // 整改费用 correctionCost: { required: true, message: this.$t('pleaseEnter') + this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCost'), trigger: 'blur' }, // 共用后本项目所需费用 @@ -466,10 +467,11 @@ export default { }, formArr: [ { // 整改周期 - fieldShowType: 4, + fieldShowType: 5, dbFieldTxt: this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'), fieldMustInput: true, - dbFieldName: 'correctionCycle' + dbFieldName: 'correctionCycle', + dictCode: 'correction_period' }, { // 整改费用 fieldShowType: 4, diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderTwiceDistributesBaseInfo.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderTwiceDistributesBaseInfo.vue new file mode 100644 index 0000000..c01668e --- /dev/null +++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderTwiceDistributesBaseInfo.vue @@ -0,0 +1,191 @@ + + + + {{ $t('dispatchInformation') }} + + + + + + {{ $t('workCenter.regulatoryComplianceCheckProcess.batchSelector') }} + + + + + + + + + + + + + + + + +