From a3b0dd9b1f9799584c51ff99c489a4122e51b94e Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Tue, 9 Jul 2024 18:00:32 +0800 Subject: [PATCH] =?UTF-8?q?=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 --- .../productionreturnRequestMain/index.vue | 11 +++++++-- .../productionMainAssemble/index.vue | 10 ++++++-- .../productionMainAssemble.data.ts | 1 + .../productionMainAssembleSparePart/index.vue | 10 ++++++-- .../productionMainAssembleSparePart.data.ts | 1 + .../productionMainPredictSparePart/index.vue | 10 ++++++-- .../productionMainPredictSparePart.data.ts | 1 + .../index.vue | 24 ++++++++++++------- .../productputawayAssembleRequestMain.data.ts | 1 + .../productreceiptRequestMain/index.vue | 15 ++++++++++-- .../productreceiptRequestMain.data.ts | 1 + .../index.vue | 14 +++++++++-- .../productreceiptAssembleRequestMain.data.ts | 1 + .../productreceiptscrapRequestMain/index.vue | 19 ++++++++++++--- .../productreceiptscrapRequestMain.data.ts | 1 + .../productscrapRequestMain/index.vue | 14 ++++++++--- .../productscrapRequestMain.data.ts | 1 + 17 files changed, 108 insertions(+), 27 deletions(-) diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue index 59cb00dc0..af65818e2 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue @@ -42,6 +42,8 @@ }) } } else if(formField == 'workStationCode') { - row['workStationCode'] = val[0]['code'] - row['fromLocationCode'] = val[0]['rawLocationCode'] + // 明细查询页赋值 + val.forEach(item=>{ + const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) + newRow['workStationCode'] = item['code'] + newRow['fromLocationCode'] = item['rawLocationCode'] + tableData.value.push(newRow) + }) } else if(formField == 'packUnit') { row['packUnit'] = val[0]['packUnit'] row['packQty'] = val[0]['packQty'] diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue index d74384f20..0afec4008 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue +++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue @@ -42,6 +42,8 @@ // }).catch(err =>{ // console.log(err); // }) - row[formField] = val[0][searchField] - 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 { const setV = {} if(formField == 'workshop'){ diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts index b6b85d8b5..4bf309088 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts @@ -635,6 +635,7 @@ export const ProductionDetail = useCrudSchemas(reactive([ } }, tableForm:{ + multiple: true, enterSearch:true, isInpuFocusShow: true, searchListPlaceholder: '请选择物料代码', // 输入框占位文本 diff --git a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue index 1c8dc8bb6..41164cefb 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue +++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue @@ -42,6 +42,8 @@ // }).catch(err =>{ // console.log(err); // }) - row[formField] = val[0][searchField] - 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 { const setV = {} if(formField == 'workshop'){ diff --git a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts index 7b01b6b20..47e9efe15 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts @@ -627,6 +627,7 @@ export const ProductionDetail = useCrudSchemas(reactive([ } }, tableForm:{ + multiple:true, enterSearch:true, isInpuFocusShow: true, searchListPlaceholder: '请选择物料代码', // 输入框占位文本 diff --git a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue index c9a6eb60f..6aa22fecd 100644 --- a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue +++ b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue @@ -42,6 +42,8 @@ // }).catch(err =>{ // console.log(err); // }) - row[formField] = val[0][searchField] - 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 { const setV = {} if(formField == 'workshop'){ diff --git a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts index 4ad8db37b..5b2907265 100644 --- a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts @@ -628,6 +628,7 @@ export const ProductionDetail = useCrudSchemas(reactive([ } }, tableForm:{ + multiple:true, enterSearch:true, isInpuFocusShow: true, searchListPlaceholder: '请选择物料代码', // 输入框占位文本 diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue index b7195c45f..378abf063 100644 --- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue +++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue @@ -42,6 +42,8 @@ nextTick(() => { if (type == 'tableForm') { // 明细查询页赋值 - row[formField] = val[0][searchField] - row['poLine'] = val[0]['itemCode'] - 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'] + val.forEach(item=>{ + const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) + newRow[formField] = item[searchField] + newRow['poLine'] = item['itemCode'] + newRow['packingNumber'] = item['packingNumber'] + newRow['containerNumber'] = item['containerNumber'] + newRow['batch'] = item['batch'] + newRow['uom'] = item['uom'] + newRow['inventoryStatus'] = item['inventoryStatus'] + newRow['fromLocationCode'] = item['locationCode'] + tableData.value.push(newRow) + }) } else { const setV = {} setV[formField] = val[0][searchField] diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts index 620475a8a..9dcc911d5 100644 --- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts +++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts @@ -447,6 +447,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive width: 150 }, tableForm:{ + multiple: true, isInpuFocusShow: true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择物料代码', // 输入框占位文本 diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue index 7fb5b61d8..8263f8d62 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue @@ -42,6 +42,8 @@ if (formField == 'secondPackUnit') { row['secondPackUnit'] = val[0]['packUnit'] row['secondPackQty'] = val[0]['packQty'] + row[formField] = val[0][searchField] }else if(formField == 'packUnit'){ row['packUnit'] = val[0]['packUnit'] row['packQty'] = val[0]['packQty'] + row[formField] = val[0][searchField] }else if (formField == 'itemCode') { row['uom'] = val[0]['uom'] row['produceDate'] = dayjs().valueOf() + row[formField] = val[0][searchField] + }else if (formField == 'workStationCode') { + // 明细查询页赋值 + val.forEach(item=>{ + const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) + newRow[formField] = item[searchField] + tableData.value.push(newRow) + }) } - // 明细查询页赋值 - row[formField] = val[0][searchField] + } else { const setV = {} setV[formField] = val[0][searchField] diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts index ad2d93277..560808251 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts @@ -615,6 +615,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive width: 150 }, tableForm:{ + multiple: true, isInpuFocusShow: true, searchListPlaceholder: '请选择工位代码', searchField: 'code', diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue index cd06bef9a..6296dda1e 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue @@ -42,6 +42,8 @@ if (formField == 'secondPackUnit') { row['secondPackUnit'] = val[0]['packUnit'] row['secondPackQty'] = val[0]['packQty'] + row[formField] = val[0][searchField] }else if(formField == 'packUnit'){ row['packUnit'] = val[0]['packUnit'] row['packQty'] = val[0]['packQty'] + row[formField] = val[0][searchField] }else if (formField == 'itemCode') { row['uom'] = val[0]['uom'] row['produceDate'] = dayjs().valueOf() + row[formField] = val[0][searchField] + }else if (formField == 'workStationCode') { + // 明细查询页赋值 + val.forEach(item=>{ + const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) + newRow[formField] = item[searchField] + tableData.value.push(newRow) + }) } - // 明细查询页赋值 - row[formField] = val[0][searchField] } else { const setV = {} setV[formField] = val[0][searchField] diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts index 84fb8ddaa..63fd5b156 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts @@ -616,6 +616,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive width: 150 }, tableForm:{ + multiple: true, isInpuFocusShow: true, searchListPlaceholder: '请选择工位代码', searchField: 'code', diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue index e76239855..d2be36d10 100644 --- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue @@ -42,6 +42,8 @@ { // 查询页面返回 const searchTableSuccess = async (formField, searchField, val, formRef, type, row ) => { + console.log(formField, searchField, val, formRef, type, row) nextTick(async () => { if (type == 'tableForm') { if (formField == 'secondPackUnit') { row['secondPackUnit'] = val[0]['packUnit'] row['secondPackQty'] = val[0]['packQty'] + row[formField] = val[0][searchField] + }else if(formField == 'itemCode'){ - let res = await ItembasicApi.getQueryItemCodeInfo({itemCodes:val.map(item=>item.itemCode).join(',')}) if(res.length>0){ row['uom'] = res[0]['uom'] } + row[formField] = val[0][searchField] + console.log('获取计量单位',res) + }else{ + //添加明细 + val.forEach(item=>{ + const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) + newRow.batch = formatTime(new Date(), 'yyyyMMdd') + newRow[formField] = item[searchField] + tableData.value.push(newRow) + }) } - // 明细查询页赋值 - row[formField] = val[0][searchField] } else { const setV = {} setV[formField] = val[0][searchField] diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts index 7896c89eb..668c03dbc 100644 --- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts @@ -523,6 +523,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive width: 150 }, tableForm:{ + multiple: true, isInpuFocusShow: true, searchListPlaceholder: '请选择生产线代码', searchField: 'code', diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue index 5243a5682..cae64b1f9 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue +++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue @@ -42,6 +42,8 @@ if(formField == 'productionLineCode'){ row['productionLineCode'] = val[0]['code'] }else if(formField == 'workStationCode'){ - row['workStationCode'] = val[0]['code'] - row['fromLocationCode'] = val[0]['rawLocationCode'] + val.forEach(item=>{ + const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) + newRow['workStationCode'] = item['code'] + newRow['fromLocationCode'] = item['rawLocationCode'] + tableData.value.push(newRow) + }) + }else if(formField == 'processCode'){ row['processCode'] = val[0]['code'] }else if(formField == 'itemCode'){ diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts index 5e4add7ff..c7ad921ec 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts +++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts @@ -551,6 +551,7 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive([ width: 150 }, tableForm:{ + multiple: true, isInpuFocusShow: true, searchListPlaceholder: '请选择工位代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段