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

src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/index.vue

@@ -328,11 +328,11 @@ const importSuccess = () => {
 }
 
 const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
-  if(formField == 'fromLocationCode'){
+  //if(formField == 'fromLocationCode'){
     const setV = {}
     setV[formField] = val[0][searchField]
     formRef.setValues(setV)
-  }
+  //}
 }
 // 主子数据 提交
 const submitForm = async (formType, submitData) => {

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts

@@ -1183,7 +1183,19 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       type: 'Select'
     }
   },
-
+   {
+    label: '箱数',
+    field: 'boxQty',
+    sort: 'custom',
+    isTable: true,
+    // sortTableDefault:5,
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
 
   {
     label: '采购标包数量',