From fcf855a0e48ee32efb9535457aaf6c1e8b1bcd51 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Tue, 9 Jul 2024 16:50:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=86=85=E4=BD=9C=E4=B8=9A=E7=AE=A1?= =?UTF-8?q?=E7=90=86--=E6=B7=BB=E5=8A=A0=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../containerMainRequest.data.ts | 1 + .../containerMainRequest/index.vue | 15 ++++-- .../initialContainerMainRequest/index.vue | 23 +++++--- .../initialContainerMainRequest.data.ts | 1 + .../inventoryinitRequestMain/index.vue | 14 ++++- .../inventoryinitRequestMain.data.ts | 1 + .../packageoverRequestMain/index.vue | 34 +++++++----- .../packageoverRequestMain.data.ts | 1 + .../transferissueRequestMain/index.vue | 20 ++++--- .../transferissueRequestMain.data.ts | 1 + .../inventorychangeRequestMain/index.vue | 54 ++++++++++--------- .../inventorychangeRequestMain.data.ts | 1 + 12 files changed, 108 insertions(+), 58 deletions(-) diff --git a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts index ed1f59bfd..dabab54a5 100644 --- a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts +++ b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts @@ -357,6 +357,7 @@ export const ContainerDetailRequest = useCrudSchemas(reactive([ field: 'containerNumber', sort: 'custom', tableForm:{ + multiple:true, isInpuFocusShow: true, // 开启查询弹窗 searchListPlaceholder: '请选择器具号', searchField: 'itemCode', diff --git a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue index 250cf0c72..6226545d9 100644 --- a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue @@ -42,6 +42,8 @@ nextTick(() => { if (type == 'tableForm') { if(formField == 'containerNumber') { - row['containerNumber'] = val[0]['itemCode'] - row['uom'] = val[0]['uom'] - row['fromLocationCode'] = val[0]['locationCode'] - row['fromInventoryStatus'] = val[0]['inventoryStatus'] + + val.forEach(item=>{ + const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) + newRow['containerNumber'] = item['itemCode'] + newRow['uom'] = item['uom'] + newRow['fromLocationCode'] = item['locationCode'] + newRow['fromInventoryStatus'] = item['inventoryStatus'] + tableData.value.push(newRow) + }) }else if(formField == 'toLocationCode'){ row['toLocationCode'] = val[0]['code'] }else { diff --git a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue index a8b9799b5..80a5ba071 100644 --- a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue @@ -42,6 +42,8 @@ nextTick(() => { if (type == 'tableForm') { if(formField == 'containerNumber') { - row['containerNumber'] = val[0]['code'] - row['uom'] = val[0]['uom'] - row['toInventoryStatus'] = 'OK' - }else if(formField == 'toLocationCode'){ - row['toLocationCode'] = val[0]['code'] - }else { - row[formField] = val[0][searchField] - } + val.forEach(item=>{ + const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) + newRow['containerNumber'] = item['code'] + newRow['uom'] = item['uom'] + newRow['toInventoryStatus'] = 'OK' + tableData.value.push(newRow) + }) + + }else if(formField == 'toLocationCode'){ + row['toLocationCode'] = val[0]['code'] + }else { + row[formField] = val[0][searchField] + } } const setV = {} setV[formField] = val[0][searchField] diff --git a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts index 42a132c15..97a6dc837 100644 --- a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts +++ b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts @@ -358,6 +358,7 @@ export const ContainerDetailRequest = useCrudSchemas(reactive([ field: 'containerNumber', sort: 'custom', tableForm:{ + multiple:true, isInpuFocusShow: true, // 开启查询弹窗 searchListPlaceholder: '请选择器具号', searchField: 'itemCode', diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue index 342766d7c..391bc45ec 100644 --- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue @@ -42,6 +42,8 @@ nextTick(() => { if (type == 'tableForm') { // 明细查询页赋值 - row[formField] = val[0][searchField] if(formField=='itemCode'){ //物料代码 - row['uom'] = val[0]['uom'] + val.forEach(item=>{ + const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) + newRow[formField] = item[searchField] + newRow['uom'] = item['uom'] + tableData.value.push(newRow) + }) + }else if(formField=='packUnit'){ //包装规格1 + row[formField] = val[0][searchField] row['packUnit'] = val[0]['packUnit'] row['packQty'] = val[0]['packQty'] }else if(formField=='secondPackUnit'){ //包装规格2 + row[formField] = val[0][searchField] row['secondPackUnit'] = val[0]['packUnit'] row['secondPackQty'] = val[0]['packQty'] }else if(formField == 'balancePackUnit'){ // 入库存包装规格 + row[formField] = val[0][searchField] row['balancePackUnit'] = val[0]['packUnit'] } } else { diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts index 8f7b40872..7ea15a22d 100644 --- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts @@ -394,6 +394,7 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( width: 150 }, tableForm:{ + multiple:true, enterSearch:true, isInpuFocusShow: true, // 开启查询弹窗 searchListPlaceholder: '请选择物料代码', diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue index 788f4465e..dab4cf2b7 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue @@ -42,6 +42,8 @@ if (type == 'tableForm') { // 明细查询页赋值 if (formField == 'itemCode') { - row['itemCode'] = val[0]['itemCode'] - row['uom'] = val[0]['uom'] - row['qty'] = val[0]['qty'] - row['batch'] = val[0]['batch'] - row['fromLocationCode'] = val[0]['locationCode'] - row['toLocationCode'] = val[0]['locationCode'] - row['fromLocationGroupCode'] = val[0]['locationGroupCode'] - row['toLocationGroupCode'] = val[0]['locationGroupCode'] - row['fromAreaCode'] = val[0]['areaCode'] - row['toAreaCode'] = val[0]['areaCode'] - row['inventoryStatus'] = val[0]['inventoryStatus'] - row['fromPackUnit'] = val[0]['packUnit'] - row['fromPackQty'] = val[0]['packQty'] + + val.forEach(item=>{ + const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) + newRow['itemCode'] = item['itemCode'] + newRow['uom'] = item['uom'] + newRow['qty'] = item['qty'] + newRow['batch'] = item['batch'] + newRow['fromLocationCode'] = item['locationCode'] + newRow['toLocationCode'] = item['locationCode'] + newRow['fromLocationGroupCode'] = item['locationGroupCode'] + newRow['toLocationGroupCode'] = item['locationGroupCode'] + newRow['fromAreaCode'] = item['areaCode'] + newRow['toAreaCode'] = item['areaCode'] + newRow['inventoryStatus'] = item['inventoryStatus'] + newRow['fromPackUnit'] = item['packUnit'] + newRow['fromPackQty'] = item['packQty'] + tableData.value.push(newRow) + }) + } else if (formField == 'toPackUnit') { row['toPackUnit'] = val[0]['packUnit'] row['toPackQty'] = val[0]['packQty'] diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts index ad67b4e19..91bbeb867 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts @@ -452,6 +452,7 @@ export const PackageoverRequestDetail = useCrudSchemas(reactive([ } }, tableForm:{ + multiple:true, isInpuFocusShow: true, searchListPlaceholder: '请选择物料代码', // 输入框占位文本 searchField: 'itemCode', // 查询弹窗赋值字段 diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue index ae1397bce..c10f1bcc4 100644 --- a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue @@ -42,6 +42,8 @@ if (type == 'tableForm') { // 明细查询页赋值 if (formField == 'packingNumber') { - row['packingNumber'] = val[0]['packingNumber'] - row['containerNumber'] = val[0]['containerNumber'] - row['batch'] = val[0]['batch'] - row['uom'] = val[0]['uom'] - row['inventoryStatus'] = val[0]['inventoryStatus'] - row['fromLocationCode'] = val[0]['locationCode'] - row['itemCode'] = val[0]['itemCode'] + 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) + }) } 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 4c5170a52..1d3630a91 100644 --- a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts @@ -619,6 +619,7 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive( width: 150 }, tableForm:{ + multiple:true, isInpuFocusShow: true, // 开启查询弹窗 searchListPlaceholder: '请选择包装号', searchField: 'packingNumber', diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue index 143b2f135..aefda2d5c 100644 --- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue +++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue @@ -53,6 +53,8 @@ if(formField=='toOwnerCode'){ //到货主代码 row['toOwnerCode'] = val[0]['code'] - }else{ - row[formField] = val[0][searchField] - row['fromPackingNumber'] = val[0]['packingNumber'] - row['toPackingNumber'] = val[0]['packingNumber'] - row['fromBatch'] = val[0]['batch'] - row['toBatch'] = val[0]['batch'] - row['fromInventoryStatus'] = val[0]['inventoryStatus'] - row['toInventoryStatus'] = val[0]['inventoryStatus'] - row['fromContainerNumber'] = val[0]['containerNumber'] - row['toContainerNumber'] = val[0]['containerNumber'] - row['fromQty'] = val[0]['qty'] - row['toQty'] = val[0]['qty'] - row['fromOwnerCode'] = val[0]['ownerCode'] - row['fromAltBatch'] = val[0]['altBatch'] - row['toAltBatch'] = val[0]['altBatch'] - row['fromArriveDate'] = val[0]['arriveDate'] - row['toArriveDate'] = val[0]['arriveDate'] - row['fromProduceDate'] = val[0]['produceDate'] - row['toProduceDate'] = val[0]['produceDate'] - row['fromExpireDate'] = val[0]['expireDate'] - row['toExpireDate'] = val[0]['expireDate'] - row['itemCode'] = val[0]['itemCode'] - row['locationCode'] = val[0]['locationCode'] - row['uom'] = val[0]['uom'] + }else if(formField == 'fromPackingNumber'){ + val.forEach(item=>{ + const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) + newRow[formField] = item[searchField] + newRow['fromPackingNumber'] = item['packingNumber'] + newRow['toPackingNumber'] = item['packingNumber'] + newRow['fromBatch'] = item['batch'] + newRow['toBatch'] = item['batch'] + newRow['fromInventoryStatus'] = item['inventoryStatus'] + newRow['toInventoryStatus'] = item['inventoryStatus'] + newRow['fromContainerNumber'] = item['containerNumber'] + newRow['toContainerNumber'] = item['containerNumber'] + newRow['fromQty'] = item['qty'] + newRow['toQty'] = item['qty'] + newRow['fromOwnerCode'] = item['ownerCode'] + newRow['fromAltBatch'] = item['altBatch'] + newRow['toAltBatch'] = item['altBatch'] + newRow['fromArriveDate'] = item['arriveDate'] + newRow['toArriveDate'] = item['arriveDate'] + newRow['fromProduceDate'] = item['produceDate'] + newRow['toProduceDate'] = item['produceDate'] + newRow['fromExpireDate'] = item['expireDate'] + newRow['toExpireDate'] = item['expireDate'] + newRow['itemCode'] = item['itemCode'] + newRow['locationCode'] = item['locationCode'] + newRow['uom'] = item['uom'] + tableData.value.push(newRow) + }) } } else { diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts index 74acc42bd..b6e8cc592 100644 --- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts @@ -383,6 +383,7 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive