diff --git a/src/views/modules/part/bom_create.vue b/src/views/modules/part/bom_create.vue index e97621d..97b6feb 100644 --- a/src/views/modules/part/bom_create.vue +++ b/src/views/modules/part/bom_create.vue @@ -64,11 +64,11 @@ - Build - Retire - - - + + 保存 + + Build + Retire diff --git a/src/views/modules/part/part_create.vue b/src/views/modules/part/part_create.vue index 88beb61..ba8b462 100644 --- a/src/views/modules/part/part_create.vue +++ b/src/views/modules/part/part_create.vue @@ -3501,15 +3501,16 @@ export default { chooseTemplate(this.modalData).then(({data}) => { if (data&&data.code===0) { Object.keys(data.data).forEach(key => { - if (key !== 'tempNo') { + if (key !== 'templateNo') { this.modalData[key] = data.data[key]; } }); this.modalData.umId2 = data.data.umId this.modalData.familyID = data.data.familyId - if (this.modalData.partType2&&this.modalData.partType2==='Manufactured') - this.modalData.templateNo = data.data.bomTemplateNo - this.modalData.templateName = data.data.bomTemplateName + if (this.modalData.partType2&&this.modalData.partType2==='Manufactured'){ + this.modalData.templateNo = data.data.bomTemplateNo + this.modalData.templateName = data.data.bomTemplateName + } } }) }, diff --git a/src/views/modules/part/quicklyCreateBom.vue b/src/views/modules/part/quicklyCreateBom.vue index 20b3123..d1926e0 100644 --- a/src/views/modules/part/quicklyCreateBom.vue +++ b/src/views/modules/part/quicklyCreateBom.vue @@ -1036,6 +1036,7 @@ export default { this.attributeFlag = true this.attributeFlag1 = true this.inventoryPartTable = 'part_item' + this.getNodeTree() } else { this.previousCodeNo = this.searchData.codeNo } @@ -3836,14 +3837,16 @@ export default { chooseTemplate(row).then(({data}) => { if (data&&data.code===0) { Object.keys(data.data).forEach(key => { - if (key !== 'tempNo') { + if (key !== 'templateNo') { row[key] = data.data[key]; } }); row.umId2 = data.data.umId row.familyID = data.data.familyId - row.templateNo = data.data.bomTemplateNo - row.templateName = data.data.bomTemplateName + if (row.partType2&&row.partType2==='Manufactured'){ + row.templateNo = data.data.bomTemplateNo + row.templateName = data.data.bomTemplateName + } } }) }, diff --git a/src/views/modules/part/routing_create.vue b/src/views/modules/part/routing_create.vue index 6cb238f..6a6c930 100644 --- a/src/views/modules/part/routing_create.vue +++ b/src/views/modules/part/routing_create.vue @@ -49,12 +49,12 @@ - Build - Retire - 基于标准工序快速创建 - - - + + 保存 + + Build + Retire + 基于标准工序快速创建