From 97b5e0334dbcf08ea104fc1cc37df6be01d596f2 Mon Sep 17 00:00:00 2001 From: zhang_li Date: Tue, 8 Apr 2025 17:37:54 +0800 Subject: [PATCH 1/3] =?UTF-8?q?YT-2358=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?= =?UTF-8?q?=E8=B4=A7=E7=94=B3=E8=AF=B7=E6=97=B6=EF=BC=8C=E5=A6=82=E6=9E=9C?= =?UTF-8?q?=E7=89=A9=E6=96=99=E4=B8=8D=E5=85=81=E8=AE=B8=E8=B6=85=E5=8F=91?= =?UTF-8?q?=EF=BC=8C=E9=82=A3=E4=B9=88=E5=8F=91=E8=B4=A7=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E7=AD=89=E4=BA=8E=E8=AE=A1=E5=88=92=E6=95=B0=E9=87=8F=EF=BC=8C?= =?UTF-8?q?=E4=B8=94=E4=B8=8D=E5=8F=AF=E4=BB=A5=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliverBasicForm.vue | 75 ++++++++++++------- 1 file changed, 50 insertions(+), 25 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue index cd8b1434f..8c5d3b156 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue @@ -53,6 +53,7 @@ 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 = () =>{ @@ -235,21 +236,39 @@ 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 - - itemCodes.push(item['itemCode']) - tableData.value.push(newRow) + // 供应商发货申请时，如果物料不允许超发，那么发货数量等于计划数量，且不可以编辑 + 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) => { + + }); + }) - 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 = {} @@ -320,24 +339,30 @@ const getSearchTableData = async (number,formField,searchField,isAll)=>{ newRow['supplierBatch'] = produceDateStr newRow.expireDate = row['expireTime'] ? addDay(newRow['produceDate'], row['expireTime']).valueOf() : dayjs('2099-12-31').valueOf() // 可以允许超发 + 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 } tableData.value.push(newRow) itemCodes.push(row['itemCode']) - }) - - //有效期 - ItembasicApi.getItembasicPage({ - code:itemCodes.join(',') - }).then((res)=>{ - res.list.forEach((item,index)=>{ - const findItem = tableData.value.find(item1=>item1['itemCode']==item['code']) - if(findItem){ - findItem['expireTime'] = findItem['expireTime'] - } + //有效期 + ItembasicApi.getItembasicPage({ + code:itemCodes.join(',') + }).then((res)=>{ + res.list.forEach((item,index)=>{ + const findItem = tableData.value.find(item1=>item1['itemCode']==item['code']) + if(findItem){ + findItem['expireTime'] = findItem['expireTime'] + } + }) }) }) + + } From 61a3a713b5babf8563069b2798d41381496f2c80 Mon Sep 17 00:00:00 2001 From: zhang_li Date: Tue, 8 Apr 2025 17:48:25 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=B8=8A=E4=B8=80=E4=B8=AA=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E7=9A=84=E5=90=8E=E7=BB=AD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliverBasicForm.vue | 24 +++++++++---------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue index 8c5d3b156..10973212b 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue @@ -348,21 +348,19 @@ const getSearchTableData = async (number,formField,searchField,isAll)=>{ newRow['disabled_qty'] = true } tableData.value.push(newRow) - itemCodes.push(row['itemCode']) - //有效期 - ItembasicApi.getItembasicPage({ - code:itemCodes.join(',') - }).then((res)=>{ - res.list.forEach((item,index)=>{ - const findItem = tableData.value.find(item1=>item1['itemCode']==item['code']) - if(findItem){ - findItem['expireTime'] = findItem['expireTime'] - } - }) + }) + itemCodes.push(row['itemCode']) + //有效期 + ItembasicApi.getItembasicPage({ + code:itemCodes.join(',') + }).then((res)=>{ + res.list.forEach((item,index)=>{ + const findItem = tableData.value.find(item1=>item1['itemCode']==item['code']) + if(findItem){ + findItem['expireTime'] = findItem['expireTime'] + } }) }) - - } From ed1725920ebfb8de9d175ecc655bb7facf78e217 Mon Sep 17 00:00:00 2001 From: zhang_li Date: Tue, 8 Apr 2025 18:05:56 +0800 Subject: [PATCH 3/3] =?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(',')