From e4b1fa678847e068349b2d26b7177eea594ff39b Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Fri, 12 Jul 2024 15:49:22 +0800 Subject: [PATCH 1/3] =?UTF-8?q?SCP=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?= =?UTF-8?q?=E8=B4=A7=E7=94=B3=E8=AF=B7=20=E7=94=9F=E6=88=90=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E6=97=B6=EF=BC=8C=E5=A1=AB=E5=86=99=E4=B8=BA=E7=A9=BA?= =?UTF-8?q?=EF=BC=8C=E7=A7=BB=E5=87=BA=E7=84=A6=E7=82=B9=EF=BC=8C=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliver/supplierdeliverRequestMain/labelForm.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue index d098eb51c..aca148dcb 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue @@ -484,7 +484,7 @@ const blurOne = (oneRow, twoRow) => { // twoRow.children = [] // twoRow.qtyOne = parseFloat(twoRow.xNumber) * parseFloat(oneRow.packQty) // } - twoRow.qtyOne = parseFloat(twoRow.xNumber) * parseFloat(oneRow.packQty) + twoRow.qtyOne = parseFloat(twoRow.xNumber)? parseFloat(twoRow.xNumber)* parseFloat(oneRow.packQty) : '' // let num = 0 // oneRow.packageList.forEach((item) => { // num += parseFloat(item.xNumber) || 0 From b05bf48da2313a6dccb1c5b301be33a07243a950 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com> Date: Fri, 12 Jul 2024 15:52:55 +0800 Subject: [PATCH 2/3] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerreturnRecordMain/customerreturnRecordMain.data.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts index 188819bec..f13024157 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts @@ -508,7 +508,7 @@ export const CustomerreturnRecordDetail = useCrudSchemas(reactive( }, { label: '批次', - field: 'batch', + field: 'toBatch', sort: 'custom', table: { width: 150 @@ -516,7 +516,7 @@ export const CustomerreturnRecordDetail = useCrudSchemas(reactive( }, { label: '包装号', - field: 'packingNumber', + field: 'toPackingNumber', sort: 'custom', table: { width: 150 From 06e926182b3956580b018d0c744ec22588c9cb0b Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Fri, 12 Jul 2024 16:06:59 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=80=89=E4=B8=8D=E4=B8=8A=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../itemManage/itemarea/index.vue | 27 ++++++----- .../deliverplan/deliverPlanMain/index.vue | 5 ++- .../saleShipmentMainRequest/index.vue | 2 + .../scrap/scrapRequestMain/index.vue | 35 ++++++++------- .../index.vue | 27 ++++++----- .../unplannedissueRequestMain/index.vue | 8 ++-- .../preparetoissueMain/index.vue | 4 +- .../inventorychangeRequestMain/index.vue | 2 + .../processproductionRequest/index.vue | 11 +++-- .../productionMainAssemble/index.vue | 45 ++++++++++--------- .../productionMainAssemble.data.ts | 2 +- .../productionMainAssembleSparePart/index.vue | 44 +++++++++--------- .../productionMainPredictSparePart/index.vue | 44 +++++++++--------- .../index.vue | 31 +++++++------ .../productscrapRequestMain/index.vue | 2 + .../purchasereceiptRequestMain/index.vue | 2 + .../sparereceiptRequestMain/index.vue | 2 + 17 files changed, 170 insertions(+), 123 deletions(-) diff --git a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue index b4bd4fd9d..ffb5fdd0a 100644 --- a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue +++ b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue @@ -122,17 +122,22 @@ const updataTableColumns = (val) => { const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => { nextTick(() => { if (type == 'tableForm') { - val.forEach(item=>{ - const newRow = {...row} - if(formField == 'locationCode') { - if(tableData.value.find(item1=>item1['locationCode'] == item['code'])) return - newRow['locationCode'] = item['code'] - }else{ - newRow[formField] = item[searchField] - } - newRow['id'] = item['id'] - tableData.value.push(newRow) - }) + if(formField == 'locationCode'){ + val.forEach(item=>{ + const newRow = {...row} + if(formField == 'locationCode') { + if(tableData.value.find(item1=>item1['locationCode'] == item['code'])) return + newRow['locationCode'] = item['code'] + }else{ + newRow[formField] = item[searchField] + } + newRow['id'] = item['id'] + tableData.value.push(newRow) + }) + } else { + row[formField] = val[0][searchField] + } + }else{ const setV = {} diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue index c98a71cd7..043524a2a 100644 --- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue @@ -160,16 +160,19 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => val.forEach(item=>{ if(tableData.value.find(item1=>item1['itemCode'] == item['itemCode'])) return const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) + row[formField] = item[searchField] newRow['uom'] = item['customerUom'] newRow['id'] = item['id'] tableData.value.push(newRow) }) + }else{ + row[formField] = val[0][searchField] } // if(formField == 'itemCode') { // row['uom'] = val[0]['customerUom'] // } // 明细查询页赋值 - row[formField] = val[0][searchField] + } else { const setV = {} if(formField == 'customerDockCode') { diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue index f34280f34..e0eecb53b 100644 --- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue +++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue @@ -123,6 +123,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => }else if(formField == 'fromLocationCode'){ row['fromLocationCode'] = val[0]['defaultLocationCode'] + }else{ + row[formField] = val[0][searchField] } }else { const setV = {} diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue index 62613ab63..9a5679c56 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue @@ -128,22 +128,27 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => // tableData.value.push(newRow) // }) // 查询标准价格 - let param = {'itemCodes':val.map(item=>item.itemCode).join(',') as string} - StdcostpriceApi.queryStdcostpriceByItemCode(param).then(res => { - val.forEach(item=>{ - const itemCode = res.find(item1=>item1['itemCode']==item['itemCode']) - const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) - newRow[formField] = item[searchField] - newRow['packingNumber'] = item['packingNumber'] - newRow['batch'] = item['batch'] - newRow['fromLocationCode'] = item['locationCode'] - newRow['itemCode'] = item['itemCode'] - newRow['uom'] = item['uom'] - newRow['singlePrice'] = itemCode?itemCode['price']:'' - tableData.value.push(newRow) + if(formField == 'packingNumber'){ + let param = {'itemCodes':val.map(item=>item.itemCode).join(',') as string} + StdcostpriceApi.queryStdcostpriceByItemCode(param).then(res => { + val.forEach(item=>{ + const itemCode = res.find(item1=>item1['itemCode']==item['itemCode']) + const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) + newRow[formField] = item[searchField] + newRow['packingNumber'] = item['packingNumber'] + newRow['batch'] = item['batch'] + newRow['fromLocationCode'] = item['locationCode'] + newRow['itemCode'] = item['itemCode'] + newRow['uom'] = item['uom'] + newRow['singlePrice'] = itemCode?itemCode['price']:'' + tableData.value.push(newRow) + }) + // row['singlePrice'] = res.price }) - // row['singlePrice'] = res.price - }) + } else { + row[formField] = val[0][searchField] + } + } else { const setV = {} setV[formField] = val[0][searchField] diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue index bc3ae5443..79a4547e5 100644 --- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue @@ -113,17 +113,22 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => nextTick(() => { if (type == 'tableForm') { // 明细查询页赋值 - let newRow = JSON.parse(JSON.stringify(tableFormKeys)) - val.forEach(item=>{ - newRow['packingNumber'] = item['packingNumber'] - newRow['containerNumber'] = item['containerNumber'] - newRow['batch'] = item['batch'] - newRow['inventoryStatus'] = item['inventoryStatus'] - newRow['fromLocationCode'] = item['locationCode'] - newRow['itemCode'] = item['itemCode'] - newRow['uom'] = item['uom'] - tableData.value.push(newRow) - }) + if(formField=='itemCode'){ + val.forEach(item=>{ + let newRow = JSON.parse(JSON.stringify(tableFormKeys)) + newRow['packingNumber'] = item['packingNumber'] + newRow['containerNumber'] = item['containerNumber'] + newRow['batch'] = item['batch'] + newRow['inventoryStatus'] = item['inventoryStatus'] + newRow['fromLocationCode'] = item['locationCode'] + newRow['itemCode'] = item['itemCode'] + newRow['uom'] = item['uom'] + tableData.value.push(newRow) + }) + } else { + row[formField] = val[0][searchField] + } + } else { const setV = {} setV[formField] = val[0][searchField] diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue index 1433448b5..3049ec147 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue @@ -127,12 +127,12 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => newRow['qty'] = item['qty'] tableData.value.push(newRow) }) - } - if(formField === 'costcentreCode'){ + }else if(formField === 'costcentreCode'){ row['costcentreCode'] = val[0]['costcentreCode'] - } - if(formField === 'qadProjectCode'){ + }else if(formField === 'qadProjectCode'){ row['qadProjectCode'] = val[0]['projectCode'] + } else { + row[formField] = val[0][searchField] } } else { const setV = {} diff --git a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue index 81cccfca0..fa9344e05 100644 --- a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue +++ b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue @@ -114,13 +114,15 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => if (formField == 'itemCode') { row['itemCode'] = val[0]['componentItemCode'] row['uom'] = val[0]['componentUom'] - } else { + } else if(formField == 'workStation'){ val.forEach(item=>{ const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) newRow[formField] = item[searchField] newRow['toLocationCode'] = item['rawLocationCode'] tableData.value.push(newRow) }) + } else { + row[formField] = val[0][searchField] } } else { const setV = {} diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue index aefda2d5c..63fc24a71 100644 --- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue +++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue @@ -160,6 +160,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => newRow['uom'] = item['uom'] tableData.value.push(newRow) }) + } else { + row[formField] = val[0][searchField] } } else { diff --git a/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue b/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue index 02730bae1..16efcd877 100644 --- a/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue +++ b/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue @@ -135,15 +135,14 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => }) tableData.value.push(newRow) }) - } - if(formField === 'processCode'){ + }else if(formField === 'processCode'){ row['processCode']=val[0]['code'] - } - if(formField === 'locationCode'){ + }else if(formField === 'locationCode'){ row['locationCode']=val[0]['code'] - } - if(formField === 'componentItemCode'){ + }else if(formField === 'componentItemCode'){ row['componentItemCode']=val[0]['componentItemCode'] + } else { + row[formField] = val[0][searchField] } }else{ const setV = {} diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue index de3c21983..b562f868a 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue +++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue @@ -117,27 +117,32 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => // }).catch(err =>{ // console.log(err); // }) - val.forEach(async item=>{ - const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) - newRow[formField] = item[searchField] - newRow['uom'] = item['uom'] - // 查看BOM版本 - const param1 = { - productItemCode: item['itemCode'], - available: 'TRUE', - pageSize: 20, - pageNo: 1, - sort: '', - by: 'ASC', - } - await BomApi.getBomPage(param1).then(res => { - console.log(res) - if(res?.list?.length>0){ - newRow['bomVersion'] = res.list[0].version + if(formField == 'itemCode'){ + val.forEach(async item=>{ + const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) + newRow[formField] = item[searchField] + newRow['uom'] = item['uom'] + // 查看BOM版本 + const param1 = { + productItemCode: item['itemCode'], + available: 'TRUE', + pageSize: 20, + pageNo: 1, + sort: '', + by: 'ASC', } - }) - tableData.value.push(newRow) - }) + await BomApi.getBomPage(param1).then(res => { + console.log(res) + if(res?.list?.length>0){ + newRow['bomVersion'] = res.list[0].version + } + }) + tableData.value.push(newRow) + }) + } else { + row[formField] = val[0][searchField] + } + } 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 6cdca9280..cce78d9d4 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts @@ -656,7 +656,7 @@ export const ProductionDetail = useCrudSchemas(reactive([ tableForm:{ multiple: true, enterSearch:true, - isInpuFocusShow: true, + // isInpuFocusShow: true, searchListPlaceholder: '请选择物料代码', // 输入框占位文本 searchField: 'itemCode', // 查询弹窗赋值字段 searchTitle: '生产线物料关系信息', // 查询弹窗标题 diff --git a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue index cd26ba054..9b81d1f8f 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue +++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue @@ -117,27 +117,31 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => // }).catch(err =>{ // console.log(err); // }) - val.forEach(async item=>{ - const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) - newRow[formField] = item[searchField] - newRow['uom'] = item['uom'] - // 查看BOM版本 - const param1 = { - productItemCode: item['itemCode'], - available: 'TRUE', - pageSize: 20, - pageNo: 1, - sort: '', - by: 'ASC', - } - await BomApi.getBomPage(param1).then(res => { - console.log(res) - if(res?.list?.length>0){ - newRow['bomVersion'] = res.list[0].version + if(formField == 'itemCode'){ + val.forEach(async item=>{ + const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) + newRow[formField] = item[searchField] + newRow['uom'] = item['uom'] + // 查看BOM版本 + const param1 = { + productItemCode: item['itemCode'], + available: 'TRUE', + pageSize: 20, + pageNo: 1, + sort: '', + by: 'ASC', } - }) - tableData.value.push(newRow) - }) + await BomApi.getBomPage(param1).then(res => { + console.log(res) + if(res?.list?.length>0){ + newRow['bomVersion'] = res.list[0].version + } + }) + tableData.value.push(newRow) + }) + } else { + row[formField] = val[0][searchField] + } } else { const setV = {} if(formField == 'workshop'){ diff --git a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue index 60a8f1605..b909f6175 100644 --- a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue +++ b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue @@ -117,27 +117,31 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => // }).catch(err =>{ // console.log(err); // }) - val.forEach(async item=>{ - const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) - newRow[formField] = item[searchField] - newRow['uom'] = item['uom'] - // 查看BOM版本 - const param1 = { - productItemCode: item['itemCode'], - available: 'TRUE', - pageSize: 20, - pageNo: 1, - sort: '', - by: 'ASC', - } - await BomApi.getBomPage(param1).then(res => { - console.log(res) - if(res?.list?.length>0){ - newRow['bomVersion'] = res.list[0].version + if(formField == 'itemCode'){ + val.forEach(async item=>{ + const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) + newRow[formField] = item[searchField] + newRow['uom'] = item['uom'] + // 查看BOM版本 + const param1 = { + productItemCode: item['itemCode'], + available: 'TRUE', + pageSize: 20, + pageNo: 1, + sort: '', + by: 'ASC', } - }) - tableData.value.push(newRow) - }) + await BomApi.getBomPage(param1).then(res => { + console.log(res) + if(res?.list?.length>0){ + newRow['bomVersion'] = res.list[0].version + } + }) + tableData.value.push(newRow) + }) + } else { + row[formField] = val[0][searchField] + } } else { const setV = {} if(formField == 'workshop'){ diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue index 378abf063..956de7a21 100644 --- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue +++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue @@ -109,19 +109,24 @@ const updataTableColumns = (val) => { const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => { nextTick(() => { if (type == 'tableForm') { - // 明细查询页赋值 - 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) - }) + if(formField=='itemCode'){ + // 明细查询页赋值 + 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 { + row[formField] = val[0][searchField] + } + } else { const setV = {} setV[formField] = val[0][searchField] diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue index ceef161d2..55a76f671 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue +++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue @@ -342,6 +342,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => }) }else if(formField == 'bomVersion'){ row['bomVersion'] = val[0]['version'] + } else { + row[formField] = val[0][searchField] } } else { const setV = {} diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue index 7e3031b00..5323a3d6c 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue @@ -246,6 +246,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => row['packUnit'] = val[0]['packUnit'] }else if(formField == 'defaultToLocationCode'){ row['defaultToLocationCode'] = val[0]['code'] + } else { + row[formField] = val[0][searchField] } } else { const setV = {} diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue index 45c2359b6..ffd5f3682 100644 --- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue @@ -193,6 +193,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => row['packUnit'] = val[0]['packUnit'] }else if(formField == 'defaultToLocationCode'){ row['defaultToLocationCode'] = val[0]['code'] + } else { + row[formField] = val[0][searchField] } } else { const setV = {}