diff --git a/src/views/wms/inventoryManage/balance/balance.data.ts b/src/views/wms/inventoryManage/balance/balance.data.ts index 0966dc3d6..bbdfff2e7 100644 --- a/src/views/wms/inventoryManage/balance/balance.data.ts +++ b/src/views/wms/inventoryManage/balance/balance.data.ts @@ -839,12 +839,12 @@ export const BalancePackageRules = reactive({ { required: true, message: '请输入打印数量', trigger: ['change', 'blur'] }, { validator: validatePositiveNumber, message: '必须是一个正数', trigger: ['change','blur'] } ], - supplierItemCode: [ - { required: true, message: '请输入标签供应商代码', trigger: 'blur' } - ], - productionLineCodePackage: [ - { required: true, message: '请输入标签生产线代码', trigger: 'blur' } - ], + // supplierItemCode: [ + // { required: true, message: '请输入标签供应商代码', trigger: 'blur' } + // ], + // productionLineCodePackage: [ + // { required: true, message: '请输入标签生产线代码', trigger: 'blur' } + // ], }) export const BalancePackage = useCrudSchemas(reactive([ { diff --git a/src/views/wms/inventoryManage/balance/index.vue b/src/views/wms/inventoryManage/balance/index.vue index 20f9a7e04..d4b4d477c 100644 --- a/src/views/wms/inventoryManage/balance/index.vue +++ b/src/views/wms/inventoryManage/balance/index.vue @@ -351,7 +351,8 @@ const labelPointFormRef = ref() const detatableData1 = ref([]) const handlePoint = async (row) => { const row1 = cloneDeep(row) - await getLabelDetailPage(row1,false) + await getLabelDetailPage(row1, false) + console.log(row1) labelPointFormRef.value.open('create', row1, null, 'createLabel') //创建标签页面 createLabel 标题 } @@ -386,7 +387,7 @@ const getLabelDetailPage = async (row, useToPackingNumber) => { code: row.itemCode, sort: '', by: 'ASC', - }).then(res => { + }).then(async res => { if (res.list.length > 0) { // 判断物料 可采购 detailListTableColumnsRules.value = cloneDeep(detailListTableColumnsRules) @@ -394,38 +395,39 @@ const getLabelDetailPage = async (row, useToPackingNumber) => { if (res.list[0].enableBuy == "TRUE") { detailListTableColumns.tableFormColumns = BalancePackage.allSchemas.tableFormColumns.filter(item=>item.field != 'productionLineCodePackage') delete detailListTableColumnsRules.value.productionLineCodePackage - // 修改 tableform 属性 - detailListTableColumns.tableFormColumns.map(itemColumns => { + // 修改 tableform 属性 + await SupplieritemApi.getSupplieritemPage({ + pageSize: 10, + pageNo: 1, + itemCode: row.itemCode, + sort: '', + by: 'ASC', + }).then(response => { + detailListTableColumns.tableFormColumns.map(itemColumns => { if(itemColumns.field == 'supplierItemCode') { - SupplieritemApi.getSupplieritemPage({ - pageSize: 10, - pageNo: 1, - itemCode: row.itemCode, - sort: '', - by: 'ASC', - }).then(response => { - row.supplierItemCode = response.list[0].supplierCode - }) + 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 + 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') { - ProductionlineitemApi.getProductionlineitemPage({ - pageNo: 1, - itemCode: row.itemCode, - sort: '', - by: 'ASC', - }).then(response => { - row.productionLineCodePackage = response.list[0].productionLineCode - }) + row.productionLineCodePackage = response?.list[0]?.productionLineCode } }) + }) } } else { message.warning('没有查询到物料代码:【' + row.itemCode + '】')