diff --git a/src/views/wms/inventoryManage/balance/index.vue b/src/views/wms/inventoryManage/balance/index.vue index d4b4d477c..27fab2eea 100644 --- a/src/views/wms/inventoryManage/balance/index.vue +++ b/src/views/wms/inventoryManage/balance/index.vue @@ -353,11 +353,12 @@ const handlePoint = async (row) => { const row1 = cloneDeep(row) await getLabelDetailPage(row1, false) console.log(row1) - labelPointFormRef.value.open('create', row1, null, 'createLabel') //创建标签页面 createLabel 标题 } const searchTableRef = ref() const enableBuyOrenableMake = ref()//是可制造还是可采购 +const enableMake = ref('')//可制造 +const enableBuy = ref('')//可采购 const getLabelDetailPage = async (row, useToPackingNumber) => { ////英泰项目没有包装号 所以只能通过物料号,批次,到库位代码去查询对应的包装 // let defaultParams = { @@ -391,50 +392,55 @@ const getLabelDetailPage = async (row, useToPackingNumber) => { if (res.list.length > 0) { // 判断物料 可采购 detailListTableColumnsRules.value = cloneDeep(detailListTableColumnsRules) - enableBuyOrenableMake.value = res.list[0].enableBuy == "TRUE" ? 'enableBuy' : res.list[0].enableMake == "TRUE" ? 'enableMake' :'' - if (res.list[0].enableBuy == "TRUE") { - detailListTableColumns.tableFormColumns = BalancePackage.allSchemas.tableFormColumns.filter(item=>item.field != 'productionLineCodePackage') - delete detailListTableColumnsRules.value.productionLineCodePackage - // 修改 tableform 属性 - await SupplieritemApi.getSupplieritemPage({ - pageSize: 10, - pageNo: 1, - itemCode: row.itemCode, - sort: '', - by: 'ASC', - }).then(response => { - detailListTableColumns.tableFormColumns.map(itemColumns => { - if(itemColumns.field == 'supplierItemCode') { - row.supplierItemCode = response?.list[0]?.supplierCode - } - }) - - }) - } - // 判断物料 可制造 - if (res.list[0].enableMake == "TRUE") { - // 修改 tableform 属性 - detailListTableColumns.tableFormColumns = BalancePackage.allSchemas.tableFormColumns.filter(item => item.field != 'supplierItemCode') - delete detailListTableColumnsRules.value.supplierItemCode - await ProductionlineitemApi.getProductionlineitemPage({ - pageNo: 1, - itemCode: row.itemCode, - sort: '', - by: 'ASC', - }).then(response => { - detailListTableColumns.tableFormColumns.map(itemColumns => { - if(itemColumns.field == 'productionLineCodePackage') { - row.productionLineCodePackage = response?.list[0]?.productionLineCode - } - }) - }) - } + enableBuyOrenableMake.value = res.list[0].enableBuy == "TRUE" ? 'enableBuy' : res.list[0].enableMake == "TRUE" ? 'enableMake' : '' + enableBuy.value = res.list[0].enableBuy + enableMake.value = res.list[0].enableMake + } else { message.warning('没有查询到物料代码:【' + row.itemCode + '】') return } }) + if (enableBuy.value == "TRUE" && enableMake.value == "FALSE") { + detailListTableColumns.tableFormColumns = BalancePackage.allSchemas.tableFormColumns.filter(item=>item.field != 'productionLineCodePackage') + delete detailListTableColumnsRules.value.productionLineCodePackage + // 修改 tableform 属性 + await SupplieritemApi.getSupplieritemPage({ + pageSize: 10, + pageNo: 1, + itemCode: row.itemCode, + sort: '', + by: 'ASC', + }).then(response => { + detailListTableColumns.tableFormColumns.map(itemColumns => { + if(itemColumns.field == 'supplierItemCode') { + row.supplierItemCode = response?.list[0]?.supplierCode + } + }) + }) + }// 判断物料 可制造 + else if (enableMake.value == "TRUE"&& enableBuy.value == "FALSE") { + // 修改 tableform 属性 + detailListTableColumns.tableFormColumns = BalancePackage.allSchemas.tableFormColumns.filter(item => item.field != 'supplierItemCode') + delete detailListTableColumnsRules.value.supplierItemCode + await ProductionlineitemApi.getProductionlineitemPage({ + pageNo: 1, + itemCode: row.itemCode, + sort: '', + by: 'ASC', + }).then(response => { + detailListTableColumns.tableFormColumns.map(itemColumns => { + if(itemColumns.field == 'productionLineCodePackage') { + row.productionLineCodePackage = response?.list[0]?.productionLineCode + } + }) + }) + } else { + message.error('物料基础信息错误,不可以创建标签') + console.log(1111) + return + } detatableData1.value=[]//不走打印详情接口,用主数据 detatableData1.value.push(row) @@ -447,7 +453,9 @@ const getLabelDetailPage = async (row, useToPackingNumber) => { item['disabled_batch'] = false } }) - // searchTableRef.value.openData('标签信息', tableObjectPrint, { tableColumns }, true) + console.log(1111) + + labelPointFormRef.value.open('create', row, null, 'createLabel') //创建标签页面 createLabel 标题 } // 批量打印--预生产收货