From 2b2935a5790f3f6f01c4b36938eabed303d2bf5f Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Thu, 14 Nov 2024 10:27:18 +0800 Subject: [PATCH] 2024-11-14 --- src/views/modules/part/bomManagement.vue | 18 ++++++++++++------ .../modules/part/bom_component_upload.vue | 4 +++- src/views/modules/qc/FAIResultEntry.vue | 8 +++++--- src/views/modules/qc/FQCResultEntry.vue | 8 +++++--- src/views/modules/qc/IPQCResultEntry.vue | 8 +++++--- src/views/modules/qc/IQCResultEntry.vue | 6 ++++-- 6 files changed, 34 insertions(+), 18 deletions(-) diff --git a/src/views/modules/part/bomManagement.vue b/src/views/modules/part/bomManagement.vue index 187204f..2eb7be5 100644 --- a/src/views/modules/part/bomManagement.vue +++ b/src/views/modules/part/bomManagement.vue @@ -127,7 +127,7 @@ - + @@ -466,7 +466,7 @@ - + @@ -999,6 +999,7 @@ import {getSiteAndBuByUserName, getSiteAndBuByUserName2} from "@/api/qc/qc.js" import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js" import ChooseList from '@/views/modules/common/Chooselist_eam' import BomComponentUpload from "./bom_component_upload.vue"; +import {Decimal} from "decimal.js"; export default { // 组件 @@ -1124,6 +1125,7 @@ export default { updateBy: '', printUnit: '', printUnitName: '', + yieldRate: '' }, detailData: { site: this.$store.state.user.site, @@ -1705,7 +1707,7 @@ export default { serialNumber: '601002Table2PrintUnit', tableId: '601002Table2', tableName: 'BOM子物料表', - columnProp: 'printUnit', + columnProp: 'printUnitName', headerAlign: 'center', align: 'center', columnLabel: '物料单位', @@ -2310,6 +2312,7 @@ export default { createBy: this.$store.state.user.name, printUnit: '', printUnitName: '', + yieldRate: '' } this.detailData = { site: '', @@ -2357,7 +2360,8 @@ export default { updateBy: this.$store.state.user.name, printUnit: row.printUnit, printUnitName: row.printUnitName, - alternativeNo: row.alternativeNo + alternativeNo: row.alternativeNo, + yieldRate: row.yieldRate } this.subDetailTable = 'bom_sub_detail' // 查bom明细 @@ -2500,7 +2504,7 @@ export default { qtyPerAssembly: 0, componentScrap: 0, issueType: 'Reserve And Backflush', - shrinkageFactor: 0, + shrinkageFactor: new Decimal(100).sub(new Decimal(this.modalData.yieldRate)).toNumber(), lineItemNo: '', operationId: '', operationNo: '', @@ -2548,7 +2552,7 @@ export default { this.batchComponentPartList = [] } }) - this.batchComponentPartData.shrinkageFactor = 0 + this.batchComponentPartData.shrinkageFactor = new Decimal(100).sub(new Decimal(this.modalData.yieldRate)).toNumber() this.choosePartList = [] }, @@ -2562,6 +2566,7 @@ export default { bomType: this.detailData.bomType, alternativeNo: this.detailData.alternativeNo, createBy: this.$store.state.user.name, + shrinkageFactor: new Decimal(100).sub(new Decimal(this.modalData.yieldRate)).toNumber() } //打开组件 去做新增业务 this.$nextTick(() => { @@ -3416,6 +3421,7 @@ export default { engRevision: data.rows.modalData.engRevision, typeFlag: data.rows.modalData.typeFlag, netWeight: data.rows.modalData.netWeight, + yieldRate: data.rows.modalData.yieldRate } this.detailDataList = data.rows.detailDataList this.detailData = data.rows.detailData diff --git a/src/views/modules/part/bom_component_upload.vue b/src/views/modules/part/bom_component_upload.vue index 3835fcf..2bc2e62 100644 --- a/src/views/modules/part/bom_component_upload.vue +++ b/src/views/modules/part/bom_component_upload.vue @@ -39,7 +39,8 @@ export default { engChgLevel: '', bomType: '', alternativeNo: '', - createBy: '' + createBy: '', + shrinkageFactor: '' }, } }, @@ -95,6 +96,7 @@ export default { formData.append("engChgLevel", this.pageData.engChgLevel) formData.append("bomType", this.pageData.bomType) formData.append("alternativeNo", this.pageData.alternativeNo) + formData.append("shrinkageFactor", this.pageData.shrinkageFactor) saveBomComponentByExcel(formData).then(({data}) => { if (data.code === 0) { this.$message.success(data.msg) diff --git a/src/views/modules/qc/FAIResultEntry.vue b/src/views/modules/qc/FAIResultEntry.vue index f93d6cc..0376112 100644 --- a/src/views/modules/qc/FAIResultEntry.vue +++ b/src/views/modules/qc/FAIResultEntry.vue @@ -517,8 +517,8 @@ - 应用 - 保存 + 应用 + 保存 关闭 @@ -1581,7 +1581,8 @@ operator: '', operatorName: '', responsiblePerson: '', - responsiblePersonName: '' + responsiblePersonName: '', + state: '' }, detailInformationFlag: false, detailList: [], @@ -3520,6 +3521,7 @@ this.detailData.operatorName = row.operatorName this.detailData.responsiblePerson = row.responsiblePerson this.detailData.responsiblePersonName = row.responsiblePersonName + this.detailData.state = row.state this.getInspectionFormData() this.inspectorSearch() // this.acquisitionList = [] diff --git a/src/views/modules/qc/FQCResultEntry.vue b/src/views/modules/qc/FQCResultEntry.vue index ec5523b..8c91ce6 100644 --- a/src/views/modules/qc/FQCResultEntry.vue +++ b/src/views/modules/qc/FQCResultEntry.vue @@ -501,8 +501,8 @@ - 应用 - 保存 + 应用 + 保存 关闭 @@ -1555,7 +1555,8 @@ operator: '', operatorName: '', responsiblePerson: '', - responsiblePersonName: '' + responsiblePersonName: '', + state: '' }, detailInformationFlag: false, detailList: [], @@ -3493,6 +3494,7 @@ this.detailData.operatorName = row.operatorName this.detailData.responsiblePerson = row.responsiblePerson this.detailData.responsiblePersonName = row.responsiblePersonName + this.detailData.state = row.state this.getInspectionFormData() this.inspectorSearch() // this.acquisitionList = [] diff --git a/src/views/modules/qc/IPQCResultEntry.vue b/src/views/modules/qc/IPQCResultEntry.vue index 8b17221..d518a56 100644 --- a/src/views/modules/qc/IPQCResultEntry.vue +++ b/src/views/modules/qc/IPQCResultEntry.vue @@ -515,8 +515,8 @@ - 应用 - 保存 + 应用 + 保存 关闭 @@ -1601,7 +1601,8 @@ operator: '', operatorName: '', responsiblePerson: '', - responsiblePersonName: '' + responsiblePersonName: '', + state: '' }, detailInformationFlag: false, detailList: [], @@ -3574,6 +3575,7 @@ this.detailData.operatorName = row.operatorName this.detailData.responsiblePerson = row.responsiblePerson this.detailData.responsiblePersonName = row.responsiblePersonName + this.detailData.state = row.state this.getInspectionFormData() this.inspectorSearch() // this.acquisitionList = [] diff --git a/src/views/modules/qc/IQCResultEntry.vue b/src/views/modules/qc/IQCResultEntry.vue index 5f31a21..6177cd0 100644 --- a/src/views/modules/qc/IQCResultEntry.vue +++ b/src/views/modules/qc/IQCResultEntry.vue @@ -408,8 +408,8 @@ - 应用 - 保存 + 应用 + 保存 关闭 @@ -1622,6 +1622,7 @@ responsiblePerson: '', responsiblePersonName: '', invdefinetype: '', + state: '' }, detailInformationFlag: false, detailList: [], @@ -2442,6 +2443,7 @@ this.detailData.responsiblePerson = row.responsiblePerson this.detailData.responsiblePersonName = row.responsiblePersonName this.detailData.invdefinetype = row.invdefinetype + this.detailData.state = row.state this.getInspectionFormData() this.inspectorSearch() // this.acquisitionList = []