From 457ffd031d12465114365c640544dd75073fa8be Mon Sep 17 00:00:00 2001 From: danshihao Date: Tue, 19 Dec 2023 14:33:41 +0800 Subject: [PATCH] fix 79400 --- .../InspectionExtensionRequestProcess.vue | 8 ++++++-- .../modules/RequestExtensionModal.vue | 12 ++++++++---- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/views/workCenter/inspectionExtensionRequestProcess/InspectionExtensionRequestProcess.vue b/src/views/workCenter/inspectionExtensionRequestProcess/InspectionExtensionRequestProcess.vue index 1bdb9526..3c6f48c5 100644 --- a/src/views/workCenter/inspectionExtensionRequestProcess/InspectionExtensionRequestProcess.vue +++ b/src/views/workCenter/inspectionExtensionRequestProcess/InspectionExtensionRequestProcess.vue @@ -284,6 +284,7 @@ export default { }, // 获取页面参数 async getPageParams (isValidate = true) { + // 必须有数据才能提交 if (this.$refs.extensionRequestTable.dataSource.length === 0) { this.$message.warning(this.$t('addAtLeastOneRowOfData')) throw new Error('base') @@ -376,10 +377,13 @@ export default { */ handleSubmit () { if (this.loading) return - // 节点1 判断表格稽查联络人是否填写 + // 节点1 判断表格是否填写:稽查联络人 && 申请延期日期 if ( this.currentNode === InspectionExtensionRequestProcess.initiate.value && - this.$refs.extensionRequestTable.dataSource.some(item => !item.liaisons) + this.$refs.extensionRequestTable.dataSource.some(item => { + // 稽查联络人 申请延期日期 任意一个为空都不能发起 + return !item.liaisons || !item.liaisons.length || !item.requestDelayDate + }) ) { this.switchChange('base') this.$message.warning(this.$t('pleaseCompleteTableInfo')) diff --git a/src/views/workCenter/inspectionExtensionRequestProcess/modules/RequestExtensionModal.vue b/src/views/workCenter/inspectionExtensionRequestProcess/modules/RequestExtensionModal.vue index 450f4519..21ad1a8d 100644 --- a/src/views/workCenter/inspectionExtensionRequestProcess/modules/RequestExtensionModal.vue +++ b/src/views/workCenter/inspectionExtensionRequestProcess/modules/RequestExtensionModal.vue @@ -10,7 +10,7 @@ :cancelText="$t('close')"> - + - + import { editInspectExtensionTable } from '@api/workCenter' +import moment from 'moment' export default { name: 'RequestExtensionModal', @@ -57,8 +59,6 @@ export default { xs: { span: 24 }, sm: { span: 16 } }, - // 章节条款下拉 - sectionClauseList: [], rules: { requestDelayDate: [ { required: true, message: this.$t('pleaseSelect') + this.$t('workCenter.incExtensionRequest.requestExtensionDate'), trigger: 'change' } @@ -112,6 +112,10 @@ export default { close () { this.$emit('close') this.visible = false + }, + // 禁用日期选择大于当前天 + disabledDate (date) { + return date.isBefore(moment().add(1, 'days'), 'day') } } }