From 22fd925f05dfffbce9da106defe60a1eac5b081d Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Sat, 30 Nov 2024 14:29:03 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=A4=96=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E5=8F=AF=E6=98=BE=E7=A4=BA=E4=BE=9B=E5=BA=94=E5=95=86=E5=92=8C?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=BA=BF=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../unplannedreceiptRequestMain/index.vue | 73 +++++++++---------- .../unplannedreceiptRequestMain.data.ts | 51 +++++++++++++ 2 files changed, 84 insertions(+), 40 deletions(-) diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue index 6437a5922..a73900573 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue @@ -134,6 +134,8 @@ import { getJmreportBaseUrl } from '@/utils/systemParam' import { formatDate } from '@/utils/formatTime' import { usePageLoading } from '@/hooks/web/usePageLoading' import * as SubjectAccountApi from '@/api/wms/subjectAccount' +import * as SupplieritemApi from '@/api/wms/supplieritem' +import * as ProductionlineitemApi from '@/api/wms/productionlineitem' const { loadStart, loadDone } = usePageLoading() import * as ruleApi from '@/api/wms/rule/index' // 计划外入库申请 @@ -443,6 +445,10 @@ const butttondata = (row,$index) => { } // 列表-操作按钮事件 + +const enableBuyOrenableMake = ref()//是可制造还是可采购 +const enableMake = ref('')//可制造 +const enableBuy = ref('')//可采购 const buttonTableClick = async (val, row) => { console.log("val",val) if (val == 'mainClose') { // 关闭 @@ -498,50 +504,37 @@ const buttonTableClick = async (val, row) => { // dialogVisible.value = true formLabelRef.value.open('create', row) detatableData.tableList.map((item) => { - // 查询物料类型 原料 只能选择 供应商代码 半成品成品其他 只能选择 生产线 - ItembasicApi.getItembasicPage({ - pageSize: 10, - pageNo: 1, - code: item.itemCode, - sort: '', - by: 'ASC', - }).then(res => { - if (res.list.length > 0) { - // 判断物料 可采购 可制造 - if (res.list[0].enableMake == "FALSE") { + if (item.itemType=='可采购') { + detailListTableColumns.tableFormColumns = UnplannedreceiptRequestDetailLabel.allSchemas.tableFormColumns.filter(item=>item.field != 'productionLineCodePackage') // 修改 tableform 属性 - detailListTableColumns.tableFormColumns.map(item => { - if(item.field == 'productionLineCodePackage') { - item.tableForm.isInpuFocusShow = false - item.tableForm.disabled = true - UnplannedreceiptRequestDetailLabelRules.productionLineCodePackage[0].required = false - } - if(item.field == 'supplierItemCode') { - item.tableForm.isInpuFocusShow = true - item.tableForm.disabled = false - UnplannedreceiptRequestDetailLabelRules.supplierItemCode[0].required = true - } + SupplieritemApi.getSupplieritemPage({ + pageSize: 10, + pageNo: 1, + itemCode: item.itemCode, + sort: '', + by: 'ASC', + }).then(response => { + detailListTableColumns.tableFormColumns.map(itemColumns => { + if(itemColumns.field == 'supplierItemCode') { + item.supplierItemCode = response?.list[0]?.supplierCode + } + }) }) - } else { - // 修改 tableform 属性 - detailListTableColumns.tableFormColumns.map(item => { - if(item.field == 'supplierItemCode') { - item.tableForm.isInpuFocusShow = false - item.tableForm.disabled = true - UnplannedreceiptRequestDetailLabelRules.supplierItemCode[0].required = false - } - if(item.field == 'productionLineCodePackage') { - item.tableForm.isInpuFocusShow = true - item.tableForm.disabled = false - UnplannedreceiptRequestDetailLabelRules.productionLineCodePackage[0].required = true + }else if (item.itemType=='可制造') { + detailListTableColumns.tableFormColumns = UnplannedreceiptRequestDetailLabel.allSchemas.tableFormColumns.filter(item => item.field != 'supplierItemCode') + ProductionlineitemApi.getProductionlineitemPage({ + pageNo: 1, + itemCode: item.itemCode, + sort: '', + by: 'ASC', + }).then(response => { + detailListTableColumns.tableFormColumns.map(itemColumns => { + if(itemColumns.field == 'productionLineCodePackage') { + item.productionLineCodePackage = response?.list[0]?.productionLineCode } }) - } - } else { - message.warning('没有查询到物料代码：【' + item.itemCode + '】') - return - } - }) + }) + } ruleApi.getManagementPrecision({ itemCodes: [item['itemCode']], locationCode:item['toLocationCode'] diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts index e82223e60..e849b3ff6 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts @@ -24,6 +24,12 @@ import { QadProject } from '@/views/wms/basicDataManage/subject/qadProject/qadPr import * as QadProjectApi from '@/api/wms/qadProject' import * as BusinesstypeApi from '@/api/wms/businesstype' +import * as SupplieritemApi from '@/api/wms/supplieritem' +import { Supplieritem } from '@/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data' + +import * as ProductionlineitemApi from '@/api/wms/productionlineitem' +import { Productionlineitem } from '@/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data' + const businessType = 'UnplannedReceipt' const { t } = useI18n() // 国际化 @@ -1762,6 +1768,51 @@ export const UnplannedreceiptRequestDetailLabel = useCrudSchemas(reactive