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

@@ -121,11 +121,15 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         row[formField] = val[0][searchField]
       }
     }else{
-      const setV = {}
+      const setV = {}      
       if(formField == 'areaCode') {
         console.log(val[0]);
         setV['areaCode'] = val[0]['code']
         setV['areaType'] = val[0]['type']
+      }else  if(formField == 'inPackUnit') {
+        setV['inPackUnit'] = val[0]['code']
+      }else  if(formField == 'outPackUnit') {
+        setV['outPackUnit'] = val[0]['code']
       }else{ 
         setV[formField] = setV[0][searchField]
       }

src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts

@@ -603,6 +603,7 @@ export const StockupDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     tableForm: {
+      type: 'Select',
       disabled: true
     },
     form: {

src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue

@@ -83,6 +83,7 @@ import { InventorymoveRequestMain,InventorymoveRequestMainRules,InventorymoveReq
 import * as InventorymoveRequestMainApi from '@/api/wms/inventorymoveRequestMain'
 import * as InventorymoveRequestDetailApi from '@/api/wms/inventorymoveRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { log } from 'console'
 
 // 库存转移申请
 defineOptions({ name: 'InventorymoveRequestMain' })
@@ -596,9 +597,10 @@ const submitForm = async (formType, data) => {
   data.subList = tableData.value // 拼接子表数据参数  
   let isExist = false
   tableData.value.forEach(item => {
-   let rs =  tableData.value.filter(filterItem => (filterItem.packingNumber == item.packingNumber))
+    console.log(item,777777777777);
-   console.log(rs);
+    
-   
+   let rs =  tableData.value.filter(filterItem => (filterItem.fromPackingNumber == item.fromPackingNumber)   )
+   console.log(rs,5666);
    if(rs.length > 1) isExist = true
   })
   if (isExist) {
@@ -617,7 +619,7 @@ const submitForm = async (formType, data) => {
       flag.value = true
       return;
     } 
-          })
+          })      
   if(flag.value){
     formRef.value.formLoading = false
     return