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

src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue

@@ -674,19 +674,23 @@ const buttonBaseClick = (val, item) => {
 // 获取供应商列表
 const getFormSupplierList = async () => {
 
-  options.originSupplierList = await getSupplierList()
+  options.originSupplierList = await getSupplierList(null)
   options.supplierList = [...options.originSupplierList]
 }
 // 获取客户列表
 const getFormCustomerList = async () => {
 
-  options.originSupplierList = await getCustomerList()
+  options.originSupplierList = await getCustomerList(null)
   options.supplierList = [...options.originSupplierList]
 }
 const filterMethod = (query: string) => {
   if (query) {
     options.supplierList = options.originSupplierList.filter((item) => {
+      if(item.name==''){
+        return item.code.includes(query)
+      }else{
         return item.name.includes(query)
+      }
     })
   } else {
     options.supplierList = [...options.originSupplierList]

src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue

@@ -190,6 +190,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         } else {
           row['itemCode'] = val[0]['code']
           row['uom'] = val[0]['uom']
+          row['singlePrice'] = val[0]['price']
         }
       } else if(formField === 'costcentreCode'){
         row['costcentreCode'] = val[0]['costcentreCode']

src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts

@@ -532,6 +532,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
     label: '包装号',
     field: 'packingNumber',
     sort: 'custom',
+    isTableForm:false,
     table: {
       width: 150
     },
@@ -543,6 +544,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
     label: '器具号',
     field: 'containerNumber',
     sort: 'custom',
+    isTableForm:false,
     table: {
       width: 150
     },
@@ -581,7 +583,8 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
       width: 150
     },
     tableForm: {
-      type: 'Select'
+      type: 'Select',
+      disabled: true
     }
   },
   {
@@ -602,6 +605,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
       type: 'InputNumber',
       min: 0,
       precision: 6,
+      disabled: true
     },
   },
   {