diff --git a/src/components/customField/AddForm.vue b/src/components/customField/AddForm.vue index da250f9e..70dae7d0 100644 --- a/src/components/customField/AddForm.vue +++ b/src/components/customField/AddForm.vue @@ -466,7 +466,7 @@ export default { this.innerDisabledField = this.innerDisabledField.filter(item => item !== 'standard_state') } } - // 起草、征求依据、报批状态时发布日期、实施日期不必填 + // 起草、征求依据、报批、废止状态时发布日期、实施日期不必填 this.handleRequiredByState(val) } }, @@ -715,7 +715,7 @@ export default { let notRequiredStatus = [], fields = [] // 国内和海外的标准状态是同一个数据字典 if (this.flag === StandardSource.DOMESTIC.value || this.flag === StandardSource.OVERSEAS.value) { - notRequiredStatus = [StandardStatus.DRAFT.value, StandardStatus.SEEK_FOR_OPTIONS.value, StandardStatus.EXAMINE.value, StandardStatus.APPROVAL.value] + notRequiredStatus = [StandardStatus.DRAFT.value, StandardStatus.SEEK_FOR_OPTIONS.value, StandardStatus.EXAMINE.value, StandardStatus.APPROVAL.value, StandardStatus.ABOLISH.value] fields = ['release_date', 'implementation_date'] } else { // 处理企标 notRequiredStatus = [EnterpriseStandardStatus.DRAFT.value, EnterpriseStandardStatus.SEEK_FOR_OPTIONS.value, EnterpriseStandardStatus.EXAMINE.value, EnterpriseStandardStatus.APPROVAL.value] diff --git a/src/views/workCenter/standardEntryOrChangeProcess/StandardEntryOrChangeProcess.vue b/src/views/workCenter/standardEntryOrChangeProcess/StandardEntryOrChangeProcess.vue index f0113075..544b46fd 100644 --- a/src/views/workCenter/standardEntryOrChangeProcess/StandardEntryOrChangeProcess.vue +++ b/src/views/workCenter/standardEntryOrChangeProcess/StandardEntryOrChangeProcess.vue @@ -1147,11 +1147,11 @@ export default { return this.formInline.source }, /** - * 标准状态为起草、征求意见、报批等状态时发布日期、实施日期不应是必填项 + * 标准状态为起草、征求意见、报批、废止状态时发布日期、实施日期不应是必填项 * @param val */ handleRequiredByState (val) { - const notRequiredStatus = [StandardStatus.DRAFT.value, StandardStatus.SEEK_FOR_OPTIONS.value, StandardStatus.EXAMINE.value, StandardStatus.APPROVAL.value] + const notRequiredStatus = [StandardStatus.DRAFT.value, StandardStatus.SEEK_FOR_OPTIONS.value, StandardStatus.EXAMINE.value, StandardStatus.APPROVAL.value, StandardStatus.ABOLISH.value] const fields = ['release_date', 'implementation_date'] const rules = JSON.parse(JSON.stringify(this.rules)) if (notRequiredStatus.includes(val)) {