diff --git a/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue b/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue index 77adfc44..90401cd6 100644 --- a/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue +++ b/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue @@ -570,6 +570,8 @@ export default { param.data.otherDraftUserVOS = data.otherDraftUserVOS // 企标计划id param.data.espId = data.formInline.espId + // data的id + param.data.id = this.model.data.id || '' let func if (this.$route.query.taskId) { // 有taskId说明是驳回的提交 diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/BaseInfoForm.vue b/src/views/workCenter/enterpriseStandardRevision/modules/BaseInfoForm.vue index ffa470a3..24252e78 100644 --- a/src/views/workCenter/enterpriseStandardRevision/modules/BaseInfoForm.vue +++ b/src/views/workCenter/enterpriseStandardRevision/modules/BaseInfoForm.vue @@ -264,38 +264,41 @@ export default { } } } else if (val && this.isEditSetData) { - if (val === StandardGradeClassify.ZERO_LEVEL.value) { - // 选的是0级，授权部门带出不可编辑 - if (!this.innerDisabledField.includes('auth_dept')) { - this.innerDisabledField.push('auth_dept') + // 使用定时器是因为有可能授权部门组件还没有获取完部门列表 + setTimeout(() => { + if (val === StandardGradeClassify.ZERO_LEVEL.value) { + // 选的是0级，授权部门带出不可编辑 + if (!this.innerDisabledField.includes('auth_dept')) { + this.innerDisabledField.push('auth_dept') + } + } else if (val === StandardGradeClassify.ONE_LEVEL.value) { + // 选的是1级 + // 设置可选择项 + this.departSelectRange = this.standardGradeClassification.find(item => item.level + '' === '1').deptIds.split(',') + // 设置授权部门可编辑 + if (this.innerDisabledField.includes('auth_dept')) { + this.innerDisabledField = this.innerDisabledField.filter(item => item !== 'auth_dept') + } + } else if (val === StandardGradeClassify.TWO_LEVEL.value) { + // 选的是2级 + // 设置可选择项 + this.departSelectRange = this.standardGradeClassification.find(item => item.level + '' === '2').deptIds.split(',') + // 设置授权部门可编辑 + if (this.innerDisabledField.includes('auth_dept')) { + this.innerDisabledField = this.innerDisabledField.filter(item => item !== 'auth_dept') + } + } else if (val === StandardGradeClassify.THREE_LEVEL.value) { + // 选的是3级，授权部门带出不可编辑 + if (!this.innerDisabledField.includes('auth_dept')) { + this.innerDisabledField.push('auth_dept') + } } - } else if (val === StandardGradeClassify.ONE_LEVEL.value) { - // 选的是1级 - // 设置可选择项 - this.departSelectRange = this.standardGradeClassification.find(item => item.level + '' === '1').deptIds.split(',') - // 设置授权部门可编辑 - if (this.innerDisabledField.includes('auth_dept')) { - this.innerDisabledField = this.innerDisabledField.filter(item => item !== 'auth_dept') - } - } else if (val === StandardGradeClassify.TWO_LEVEL.value) { - // 选的是2级 - // 设置可选择项 - this.departSelectRange = this.standardGradeClassification.find(item => item.level + '' === '2').deptIds.split(',') - // 设置授权部门可编辑 - if (this.innerDisabledField.includes('auth_dept')) { - this.innerDisabledField = this.innerDisabledField.filter(item => item !== 'auth_dept') - } - } else if (val === StandardGradeClassify.THREE_LEVEL.value) { - // 选的是3级，授权部门带出不可编辑 - if (!this.innerDisabledField.includes('auth_dept')) { - this.innerDisabledField.push('auth_dept') - } - } + }, 500) } }, // 主起草单位改变后，需要将选中的主起草单位增加到授权部门 'formInline.main_drafting_unit' (val) { - if (val) { + if (val && !this.isEditSetData) { if (this.formInline.grade_classification === StandardGradeClassify.ONE_LEVEL.value || this.formInline.grade_classification === StandardGradeClassify.TWO_LEVEL.value) { // 标准等级分类是1级或者2级需要，把主起草单位追加到授权部门 @@ -377,39 +380,43 @@ export default { if (this.flowInitType === 'auto' && !data.businessJson) { // 说明是刚刚自动发起的流程 getEnterpriseStandardPlanInfoById({ id: data.espId }).then(res => { - const formInline = {} - // 制修订类型 - formInline.typeOfRevision = res.result.applicationCategory - formInline.typeOfRevision_dictText = res.result.applicationCategory_dictText - // 企标编号 - formInline.standard_number = res.result.newEnStandardNo - // 企标名称 - formInline.standard_name = res.result.newEnStandardName - // 标准英文名称 - formInline.standard_english_name = res.result.enStandardEnglishName - // 标准体系 - formInline.standard_system = res.result.enStandardSystem ? res.result.enStandardSystem.split(',').map(item => { - return { value: item } - }) : [] - // 标准等级分类 - formInline.grade_classification = res.result.enStandardClassification - // 授权部门？？ - // formInline.auth_dept = res.result.applicationCategory - // 发布日期？？ - // formInline.release_date = res.result.applicationCategory - // 实施日期？？ - // formInline.implementation_date = res.result.applicationCategory - // 编制说明 - formInline.comp_illustration = res.result.compilationDescription - // 是否试行？？ - // formInline.try_flag = res.result.applicationCategory - // 试行周期？？ - // formInline.trial_period = res.result.applicationCategory - // 代替标准号 - // formInline.standard_number = res.result.applicationCategory - // 主起草单位,初始化是因为标准等级分类需要带出 - formInline.main_drafting_unit = res.result.mainDraftingUnit - this.formInline = Object.assign({}, formInline) + if (res.success) { + const formInline = {} + // 制修订类型 + formInline.typeOfRevision = res.result.applicationCategory + formInline.typeOfRevision_dictText = res.result.applicationCategory_dictText + // 企标编号 + formInline.standard_number = res.result.newEnStandardNo + // 企标名称 + formInline.standard_name = res.result.newEnStandardName + // 标准英文名称 + formInline.standard_english_name = res.result.enStandardEnglishName + // 标准体系 + formInline.standard_system = res.result.enStandardSystem ? res.result.enStandardSystem.split(',').map(item => { + return { value: item } + }) : [] + // 标准等级分类 + formInline.grade_classification = res.result.enStandardClassification + // 授权部门？？ + // formInline.auth_dept = res.result.authDept + // 发布日期？？ + // formInline.release_date = res.result.applicationCategory + // 实施日期？？ + // formInline.implementation_date = res.result.applicationCategory + // 编制说明 + formInline.comp_illustration = res.result.compilationDescription + // 是否试行？？ + // formInline.try_flag = res.result.applicationCategory + // 试行周期？？ + // formInline.trial_period = res.result.applicationCategory + // 代替标准号 + // formInline.standard_number = res.result.applicationCategory + // 主起草单位,初始化是因为标准等级分类需要带出 + formInline.main_drafting_unit = res.result.mainDraftingUnit + // 征求意见稿计划完成日期,因为部所联络人节点征求意见截止日期需要限制比征求意见稿计划完成日期早 + formInline.solicitationDraftPlanCompleteDate = res.result.solicitationDraftPlanCompleteDate + this.formInline = Object.assign({}, formInline) + } }).finally(() => { this.isEditSetData = false }) @@ -418,7 +425,9 @@ export default { this.formInline.standard_system = this.formInline.standard_system ? this.formInline.standard_system.split(',').map(item => { return { value: item } }) : [] - this.isEditSetData = false + setTimeout(() => { + this.isEditSetData = false + }, 500) } }, getData () { @@ -636,6 +645,9 @@ export default { // this.formInline.standard_number = value[0].applicationCategory // 设置主起草单位,改变标准等级分类的时候设置授权部门有时会需要主起草单位 this.formInline.main_drafting_unit = value[0].mainDraftingUnit + // 征求意见稿计划完成日期,因为部所联络人节点征求意见截止日期需要限制比征求意见稿计划完成日期早 + this.formInline.solicitationDraftPlanCompleteDate = value[0].solicitationDraftPlanCompleteDate + this.formInline = Object.assign({}, this.formInline) // 设置流程名称 const processName = this.formInline.standard_number + '-' + (this.formInline.standard_name || '') + '-' + this.formInline.typeOfRevision_dictText this.$emit('processNameChange', processName) diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectBaseInfo.vue b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectBaseInfo.vue index 46ee762f..17178dc7 100644 --- a/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectBaseInfo.vue +++ b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectBaseInfo.vue @@ -45,6 +45,8 @@ import BaseInfoForm from './BaseInfoForm' import JTable from '@/components/jero/JTable' import CommentModal from './CommentModal' +import { USER_INFO } from '@/store/mutation-types' +import Vue from 'vue' export default { name: 'MainDrafterCollectBaseInfo', @@ -211,7 +213,9 @@ export default { this.dataSource.splice(index, 1, value) } else { // 没有下标， 是新增 - this.dataSource.push(value) + const currentUser = Vue.ls.get(USER_INFO) + const currentUserId = currentUser.realname + '(' + currentUser.username + ')' + this.dataSource.push({ ...value, createUserId_dictText: currentUserId }) } } } diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterUploadMinuteBaseInfo.vue b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterUploadMinuteBaseInfo.vue index 8c5fd1ff..be2a20c8 100644 --- a/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterUploadMinuteBaseInfo.vue +++ b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterUploadMinuteBaseInfo.vue @@ -34,6 +34,7 @@