From 3001bfdf35e7ffd9840101aa15daf77fb5d9a5d6 Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Tue, 19 Dec 2023 17:10:24 +0800 Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9=E4=BC=81=E6=A0=87?= =?UTF-8?q?=E5=88=B6=E4=BF=AE=E8=AE=A2=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/enums/commonEnums.js | 38 +++++++++---------- .../modules/BaseInfoForm.vue | 11 ++++-- 2 files changed, 27 insertions(+), 22 deletions(-) diff --git a/src/enums/commonEnums.js b/src/enums/commonEnums.js index 17295cc0..8c0cb501 100644 --- a/src/enums/commonEnums.js +++ b/src/enums/commonEnums.js @@ -173,7 +173,7 @@ export const ProcessKey = { // 年度制修订-标准化部门主动发起 ES_ANNUAL_INIT: { text: 'es-annual-init', value: 'es-annual-init' }, // 企标制修订流程 - ES_EDIT: { text: '', value: '' }, + ES_EDIT: { text: 'es-revision', value: 'es-revision' }, // 企标更改流程 ES_CHANGE: { text: 'es-change', value: 'es-change' }, // 企标复审流程 @@ -452,24 +452,24 @@ export const EsRevisionPlanStandardizationInitNodes = new EsEnums({ // 企标制修订流程 export const EsRevisionNodes = new EsEnums({ - mainDrafterSend: { text: '主起草人起草分发', value: '' }, - otherDrafterUploadStandard: { text: '其他起草人上传企标', value: '' }, - mainDrafterAllUploadMinute: { text: '主起草人汇总上传会议纪要', value: '' }, - standardizationAudit: { text: '标准化审核', value: '' }, - scorerMark: { text: '评分人打分', value: '' }, - standardizationConfirmIsStartAdvice: { text: '标准化确认是否开启征求意见', value: '' }, - contactSend: { text: '部所联络人下发', value: '' }, - takeAdviceObjectEnterAdvice: { text: '征求意见对象填写意见', value: '' }, - contactAll: { text: '部所联络人汇总数据', value: '' }, - contactLeaderApproval: { text: '部门联络人主管级领导审批', value: '' }, - mainDrafterAll: { text: '主起草人汇总', value: '' }, - mainDrafterUploadMinute: { text: '主起草人上传会议纪要', value: '' }, - otherDrafterProofread: { text: '其他起草人校对', value: '' }, - leaderApproval: { text: '主管级领导审批', value: '' }, - standardizationApproval: { text: '标准化审批', value: '' }, - relatedDeptLeaderCountersign: { text: '相关部门领导会签', value: '' }, - allEngineerApproval: { text: '总工程师审批', value: '' }, - mainDrafterPublish: { text: '主起草人发布', value: '' } + mainDrafterSend: { text: '主起草人起草分发', value: 'Activity_0v98tow' }, + otherDrafterUploadStandard: { text: '其他起草人上传企标', value: 'Activity_1d2la4l' }, + mainDrafterAllUploadMinute: { text: '主起草人汇总上传会议纪要', value: 'Activity_1dz3u0m' }, + standardizationAudit: { text: '标准化审核', value: 'Activity_0m576ex' }, + scorerMark: { text: '评分人打分', value: 'Activity_1qhpnpa' }, + standardizationConfirmIsStartAdvice: { text: '标准化确认是否开启征求意见', value: 'Activity_1siuksf' }, + contactSend: { text: '部所联络人下发', value: 'Activity_1ns6olf' }, + takeAdviceObjectEnterAdvice: { text: '征求意见对象填写意见', value: 'Activity_04m430n' }, + contactAll: { text: '部所联络人汇总数据', value: 'Activity_1riqzkp' }, + contactLeaderApproval: { text: '部门联络人主管级领导审批', value: 'Activity_1ralk8e' }, + mainDrafterAll: { text: '主起草人汇总', value: 'Activity_1hb9aun' }, + mainDrafterUploadMinute: { text: '主起草人上传会议纪要', value: 'Activity_11uuyg0' }, + otherDrafterProofread: { text: '其他起草人校对', value: 'Activity_1seways' }, + leaderApproval: { text: '主管级领导审批', value: 'Activity_1l028rz' }, + standardizationApproval: { text: '标准化审批', value: 'Activity_0uxua0b' }, + relatedDeptLeaderCountersign: { text: '相关部门领导会签', value: 'Activity_05pybsc' }, + allEngineerApproval: { text: '总工程师审批', value: 'Activity_1yr56ac' }, + mainDrafterPublish: { text: '主起草人发布', value: 'Activity_0n0h60s' } }) // 企标更改流程 diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/BaseInfoForm.vue b/src/views/workCenter/enterpriseStandardRevision/modules/BaseInfoForm.vue index 3015565a..635c0593 100644 --- a/src/views/workCenter/enterpriseStandardRevision/modules/BaseInfoForm.vue +++ b/src/views/workCenter/enterpriseStandardRevision/modules/BaseInfoForm.vue @@ -281,8 +281,12 @@ export default { // 2、加零部件名称和代替标准号 const partName = res.result.适用范围.find(item => item.dbFieldName === 'part_name') const substituteStandardNumber = res.result.关联信息.find(item => item.dbFieldName === 'substitute_standard_number') - dataList.push(partName) - dataList.push(substituteStandardNumber) + if (partName) { + dataList.push(partName) + } + if (substituteStandardNumber) { + dataList.push(substituteStandardNumber) + } // 3、企标编号如果是自动发起的就带入(文本框)，从新建流程点入的话就从企标计划选择（选择企标计划组件） if (this.flowInitType === 'newProcess') { // 是新建流程,删除企标编号字段,在html中设置显示企标计划选择 @@ -290,8 +294,9 @@ export default { dataList.shift() } } + console.log(dataList) this.dataList = dataList - this.ruleList = this.dataList + this.ruleList = dataList this.integrateData() this.getOptionsData() // 获取下拉数据 callBack && callBack()