diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue index c10f1bcc4..11ecd8cc3 100644 --- a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue @@ -114,17 +114,27 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => if (type == 'tableForm') { // 明细查询页赋值 if (formField == 'packingNumber') { + let itemCodes = [] val.forEach(item=>{ - const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) - newRow['packingNumber'] = item['packingNumber'] - newRow['containerNumber'] = item['containerNumber'] - newRow['batch'] = item['batch'] - newRow['uom'] = item['uom'] - newRow['inventoryStatus'] = item['inventoryStatus'] - newRow['fromLocationCode'] = item['locationCode'] - newRow['itemCode'] = item['itemCode'] - tableData.value.push(newRow) + const findIndex = tableData.value.findIndex(valItem=>valItem['itemCode']==item.itemCode&&valItem['batch']==item.batch&&valItem['packingNumber']==item.packingNumber) + if(findIndex == -1){ + const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) + newRow['packingNumber'] = item['packingNumber'] + newRow['containerNumber'] = item['containerNumber'] + newRow['batch'] = item['batch'] + newRow['uom'] = item['uom'] + newRow['inventoryStatus'] = item['inventoryStatus'] + newRow['fromLocationCode'] = item['locationCode'] + newRow['itemCode'] = item['itemCode'] + tableData.value.push(newRow) + }else{ + itemCodes.push(item['packingNumber']) + } }) + if(itemCodes.length>0){ + message.warning(`${t('ts.包装号')}${itemCodes.join(',')}${t('ts.已经存在')}`); + } + } else { row[formField] = val[0][searchField] } diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts index 1d3630a91..dd15cd5ef 100644 --- a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts @@ -619,8 +619,9 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive( width: 150 }, tableForm:{ + disabled:true, multiple:true, - isInpuFocusShow: true, // 开启查询弹窗 + // isInpuFocusShow: true, // 开启查询弹窗 searchListPlaceholder: '请选择包装号', searchField: 'packingNumber', searchTitle: '库存余额信息', diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue index a066d3239..cc0ccf7cf 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue @@ -236,6 +236,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => newRow[formField] = item[searchField] tableData.value.push(newRow) }) + }else{ + row[formField] = val[0][searchField] } } else { const setV = {} diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts index 23823cded..0894abf29 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts @@ -667,7 +667,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ }, { label: '采购价格审批人', - field: 'procurementCreator', + field: 'procurementCreatorName', sort: 'custom', table: { width: 150 @@ -943,7 +943,7 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive
- 系统未税金额:{{selections.selections.reduce((prev, item) => prev + Number(Number(Number(Number(item['purchasePrice']).toFixed(2))*item['invoicableQuantity']).toFixed(2)),0)}} + 系统未税金额:{{Number(selections.selections.reduce((prev, item) => prev + Number(Number(Number(Number(item['purchasePrice']).toFixed(2))*item['invoicableQuantity']).toFixed(2)),0)).toFixed(2)}}