diff --git a/src/components/selection/StandardSelectionModal.vue b/src/components/selection/StandardSelectionModal.vue index 9229e776..29011e68 100644 --- a/src/components/selection/StandardSelectionModal.vue +++ b/src/components/selection/StandardSelectionModal.vue @@ -232,7 +232,7 @@ export default { if (res.success) { this.dataList = res.result.records this.ipagination.total = res.result.total - this.selectedRowKeys = this.value.split(',') + this.selectedRowKeys = this.value ? this.value.split(',') : [] } else { this.dataList = [] } diff --git a/src/views/workCenter/annualRevisionPlanActivelyReport/modules/ContactEnterSendTaskModal.vue b/src/views/workCenter/annualRevisionPlanActivelyReport/modules/ContactEnterSendTaskModal.vue index b4dd65b9..d1f5848f 100644 --- a/src/views/workCenter/annualRevisionPlanActivelyReport/modules/ContactEnterSendTaskModal.vue +++ b/src/views/workCenter/annualRevisionPlanActivelyReport/modules/ContactEnterSendTaskModal.vue @@ -883,6 +883,16 @@ export default { projectTypeChange (value) { console.log(value) this.formInline.decadeCode = new Date().getFullYear() + '' + if (value && value === ProjectType.ENACT.value) { + // 是制定,原企标编号和原企标名称置空 + this.formInline.originEnStandardNo = '' + this.formInline.originEnStandardName = '' + } else if (value && value === ProjectType.MODIFY.value) { + // 是修订,三个代号置空 + this.formInline.enStandardCode = undefined + this.formInline.enNameCode = undefined + this.formInline.standardCategoryCode = undefined + } }, // 选择用户得到用户名 userSelectNameChange (value, fieldName) { @@ -930,21 +940,25 @@ export default { formInline.changeStatus = 1 formInline.changeStatus_dictText = '新增' } + console.log(1) // 翻译隶属工作组 if (formInline.workGroup) { formInline.workGroup_dictText = formInline.workGroup.label formInline.workGroup = formInline.workGroup.value } + console.log(2) // 翻译企业标准代号 if (formInline.enStandardCode) { formInline.enStandardCode_dictText = this.$refs.enStandardCodeRef.dictOptions.find(item => item.value === formInline.enStandardCode).text } + console.log(3) // 处理标准体系 if (formInline.enStandardSystem && formInline.enStandardSystem.length > 0) { formInline.enStandardSystem = formInline.enStandardSystem.map(item => item.value).join(',') } else { formInline.enStandardSystem = '' } + console.log(4) // 设置创建人 const currentUser = Vue.ls.get(USER_INFO) formInline.contactUser_dictText = currentUser.realname + '(' + currentUser.username + ')' diff --git a/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/BaseInfoTableModal.vue b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/BaseInfoTableModal.vue index 5e811ea4..d7c6cf15 100644 --- a/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/BaseInfoTableModal.vue +++ b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/BaseInfoTableModal.vue @@ -923,9 +923,17 @@ export default { }, // 项目类别改变 projectTypeChange (value) { - if (value === this.ProjectType.ENACT.value) { + if (value && value === this.ProjectType.ENACT.value) { // 是制定 this.formInline.decadeCode = new Date().getFullYear() + '' + // 是制定,原企标编号和原企标名称置空 + this.formInline.originEnStandardNo = '' + this.formInline.originEnStandardName = '' + } else if (value && value === ProjectType.MODIFY.value) { + // 是修订,三个代号置空 + this.formInline.enStandardCode = undefined + this.formInline.enNameCode = undefined + this.formInline.standardCategoryCode = undefined } }, // 授权部门返回参数