Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

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 = {}      

src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts

@@ -508,7 +508,7 @@ export const CustomerreturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
   },
   {
     label: '批次',
-    field: 'batch',
+    field: 'toBatch',
     sort: 'custom',
     table: {
       width: 150
@@ -516,7 +516,7 @@ export const CustomerreturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
   },
   {
     label: '包装号',
-    field: 'packingNumber',
+    field: 'toPackingNumber',
     sort: 'custom',
     table: {
       width: 150

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') {

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 = {}

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]

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]

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 = {}

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 = {}

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 {

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 = {}

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'){

src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts

@@ -656,7 +656,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
     tableForm:{
       multiple: true,
       enterSearch:true,
-      isInpuFocusShow: true,
+      // isInpuFocusShow: true,
       searchListPlaceholder: '请选择物料代码', // 输入框占位文本
       searchField: 'itemCode', // 查询弹窗赋值字段
       searchTitle: '生产线物料关系信息', // 查询弹窗标题

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'){

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'){

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]

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 = {}

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 = {}

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 = {}

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