|
|
|
@ -127,7 +127,7 @@ |
|
|
|
<el-input v-model="modalData.partDesc" disabled style="width: 340px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'物料单位'"> |
|
|
|
<el-input v-model="modalData.printUnit" disabled style="width: 100px"></el-input> |
|
|
|
<el-input v-model="modalData.printUnitName" disabled style="width: 100px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'制造类型'" prop="bomType"> |
|
|
|
<el-select v-model="modalData.bomType" @change="bomTypeChange" :disabled="modalDisableFlag" style="width: 130px"> |
|
|
|
@ -466,7 +466,7 @@ |
|
|
|
<el-input v-model="componentData.componentPartDesc" disabled style="width: 249px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'物料单位'"> |
|
|
|
<el-input v-model="componentData.printUnit" disabled style="width: 110px"></el-input> |
|
|
|
<el-input v-model="componentData.printUnitName" disabled style="width: 110px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'消耗项目'" prop="consumptionItem"> |
|
|
|
<el-select v-model="componentData.consumptionItem" style="width: 165px"> |
|
|
|
@ -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 |
|
|
|
|