From ed1725920ebfb8de9d175ecc655bb7facf78e217 Mon Sep 17 00:00:00 2001 From: zhang_li Date: Tue, 8 Apr 2025 18:05:56 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=8A=E4=B8=80=E4=B8=AA=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E9=87=8D=E6=96=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliverBasicForm.vue | 58 ++++++++----------- 1 file changed, 24 insertions(+), 34 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue index 10973212b..66a7758ce 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue @@ -53,7 +53,6 @@ import * as ItembasicApi from '@/api/wms/itembasic' import { addDay } from '@/utils/formatTime' import { PurchasePlanDetail } from '../purchasePlanMain/purchasePlanMain.data' import { formatDate } from '@/utils/formatTime' -import * as SupplieritemApi from '@/api/wms/supplieritem' const emit = defineEmits(['getList']) const getList = () =>{ @@ -236,39 +235,29 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) => newRow.expireDate = item['expireTime']?addDay(newRow['produceDate'],item['expireTime']).valueOf():dayjs('2099-12-31').valueOf() // if(tableData.value.find(item1=>item1['itemCode'] == item['itemCode']&&item1['poLine'] == item['poLine']&&item1['poNumber'] == item['poNumber'])) return - // 供应商发货申请时，如果物料不允许超发，那么发货数量等于计划数量，且不可以编辑 - console.log(777, newRow['allowOverShipment']) - SupplieritemApi.getSupplierItemListByCodes({ supplierCode: item['supplierCode'], itemCodes: item['itemCode'] }).then((result) => { - if (result.length > 0) { - const res1 = result[0] - if (res1['allowOverShipment'] == 'TRUE') { - newRow['qty'] =0 - newRow['disabled_qty'] = false - } else { - newRow['qty'] = newRow['planQty'] - newRow['disabled_qty'] = true - } - } - - tableData.value.push(newRow) - itemCodes.push(item['itemCode']) - if(itemCodes.length>0){ - //有效期 - ItembasicApi.getItembasicPage({ - code:itemCodes.join(',') - }).then((res)=>{ - res.list.forEach((item,index)=>{ - const findItem = tableData.value.find(item1=>item1['itemCode']==item['code']) - findItem['expireTime'] = item['expireTime'] - }) - }) - } - }).catch((err) => { - - }); - + // 可以允许超发 + console.log(888,newRow['allowOverShipment']) + if (newRow['allowOverShipment'] == 'TRUE') { + newRow['qty'] =0 + newRow['disabled_qty'] = false + } else { + newRow['qty'] = newRow['planQty'] + newRow['disabled_qty'] = true + } + itemCodes.push(item['itemCode']) + tableData.value.push(newRow) }) - + if(itemCodes.length>0){ + //有效期 + ItembasicApi.getItembasicPage({ + code:itemCodes.join(',') + }).then((res)=>{ + res.list.forEach((item,index)=>{ + const findItem = tableData.value.find(item1=>item1['itemCode']==item['code']) + findItem['expireTime'] = item['expireTime'] + }) + }) + } } else { const setV = {} @@ -348,8 +337,9 @@ const getSearchTableData = async (number,formField,searchField,isAll)=>{ newRow['disabled_qty'] = true } tableData.value.push(newRow) + itemCodes.push(row['itemCode']) }) - itemCodes.push(row['itemCode']) + //有效期 ItembasicApi.getItembasicPage({ code:itemCodes.join(',') From 81a06c80510b6711d861283570de7465d6aadeaf Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Tue, 8 Apr 2025 20:52:25 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E5=9B=9E=E8=BD=AC?= =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=86=B2=E9=94=80=E6=97=A5=E8=AE=B0=E8=B4=A6?= =?UTF-8?q?=E5=92=8C=E8=B0=83=E6=95=B4=E8=B4=A6=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchaseDiscreteOrderMain.data.ts | 4 ++-- .../supplierinvoice/supplierinvoiceRecordMain/index.vue | 4 ++-- .../supplierinvoiceRecordMain.data.ts | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/views/wms/supplierManage/purchaseDiscreteOrder/purchaseDiscreteOrderMain/purchaseDiscreteOrderMain.data.ts b/src/views/wms/supplierManage/purchaseDiscreteOrder/purchaseDiscreteOrderMain/purchaseDiscreteOrderMain.data.ts index 1c79a7820..8db4c085a 100644 --- a/src/views/wms/supplierManage/purchaseDiscreteOrder/purchaseDiscreteOrderMain/purchaseDiscreteOrderMain.data.ts +++ b/src/views/wms/supplierManage/purchaseDiscreteOrder/purchaseDiscreteOrderMain/purchaseDiscreteOrderMain.data.ts @@ -1809,7 +1809,7 @@ export const SupplierinvoiceRecordMainTransfer = useCrudSchemas(reactive { //发票回转 const submitForm = async (formType, data) => { - data.reverseInvoiceJournal = 'APINVCOR' - data.adjustmentJournal = 'APADJ' + data.reverseInvoiceJournal = 'VDCOR' + data.adjustmentJournal = 'VDADJ' console.log('发票回转',formType, data) loadStart() try{ diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts index 169eea442..68bb5bc7e 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts @@ -1917,7 +1917,7 @@ export const SupplierinvoiceRecordMainTransfer = useCrudSchemas(reactive