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'] + } + }) }) }) + + }