diff --git a/src/components/customField/AddForm.vue b/src/components/customField/AddForm.vue index e9f30bf4..0700e61b 100644 --- a/src/components/customField/AddForm.vue +++ b/src/components/customField/AddForm.vue @@ -681,7 +681,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.APPROVAL.value] + notRequiredStatus = [StandardStatus.DRAFT.value, StandardStatus.SEEK_FOR_OPTIONS.value, StandardStatus.EXAMINE.value, StandardStatus.APPROVAL.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/enums/commonEnums.js b/src/enums/commonEnums.js index 1a051f94..8e3a1ac8 100644 --- a/src/enums/commonEnums.js +++ b/src/enums/commonEnums.js @@ -137,6 +137,7 @@ export const IsTrial = { export const StandardStatus = { DRAFT: { text: '起草', value: '1' }, SEEK_FOR_OPTIONS: { text: '征求意见', value: '2' }, + EXAMINE: { text: '审查', value: '2.1' }, APPROVAL: { text: '报批', value: '3' }, RELEASE: { text: '发布', value: '4' }, BE_IMPLEMENTED_SOON: { text: '即将实施', value: '5' }, @@ -395,10 +396,10 @@ export const EsStartUseNodes = new EsEnums({ // 法规合规流程节点 export const StandardComplianceNodes = new EsEnums({ initial: { text: '法规工程师发起', value: '1', btn: ['save', 'submit'] }, - departLeaderIssue: { text: '部所主管级领导下发', value: '2', btn: [] }, - moduleOwnerIssue: { text: '模块责任人分发', value: '3', btn: [] }, - designEngineerAssess: { text: '设计工程师评估', value: '4', btn: [] }, - moduleOwnerReview: { text: '模块责任人审批', value: '5', btn: [] }, + departLeaderIssue: { text: '部所主管级领导下发', value: '2', btn: ['return', 'save', 'submit'] }, + moduleOwnerIssue: { text: '模块责任人分发', value: '3', btn: ['return', 'save', 'submit'] }, + designEngineerAssess: { text: '设计工程师评估', value: '4', btn: ['return', 'save', 'submit'] }, + moduleOwnerReview: { text: '模块责任人审批', value: '5', btn: ['return', 'save', 'agree', 'reject'] }, departLeaderApprove: { text: '部所主管级领导审批', value: '6', btn: [] }, regulatoryEngineerApprove: { text: '法规工程师审批', value: '7', btn: [] }, designEngineerWriteProject: { text: '设计工程师补充立项项目号', value: '8', btn: [] } diff --git a/src/views/workCenter/standardEntryOrChangeProcess/StandardEntryOrChangeProcess.vue b/src/views/workCenter/standardEntryOrChangeProcess/StandardEntryOrChangeProcess.vue index 66c0b958..3a7ad655 100644 --- a/src/views/workCenter/standardEntryOrChangeProcess/StandardEntryOrChangeProcess.vue +++ b/src/views/workCenter/standardEntryOrChangeProcess/StandardEntryOrChangeProcess.vue @@ -1094,7 +1094,7 @@ export default { * @param val */ handleRequiredByState (val) { - const notRequiredStatus = [StandardStatus.DRAFT.value, StandardStatus.SEEK_FOR_OPTIONS.value, StandardStatus.APPROVAL.value] + const notRequiredStatus = [StandardStatus.DRAFT.value, StandardStatus.SEEK_FOR_OPTIONS.value, StandardStatus.EXAMINE.value, StandardStatus.APPROVAL.value] const fields = ['release_date', 'implementation_date'] const rules = JSON.parse(JSON.stringify(this.rules)) if (notRequiredStatus.includes(val)) {