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

src/api/wms/balance/index.ts

@@ -83,6 +83,17 @@ export const getBalancePageByBusinessType = async (params) => {
 }
 
 
+// 查询库存余额列表根据业务类型
+export const getBalancePageByBusinessTypeByItemType = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/balance/seniorBusinessTypeByItemType', data })
+  } else {
+    return await request.get({ url: `/wms/balance/pageBusinessTypeByItemType`, params })
+  }
+}
+
 // 备件出库查询库存余额列表
 export const getBalancePageSpare = async (params) => {
   if (params.isSearch) {

src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts

@@ -323,14 +323,14 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
         searchField: 'itemCode', // 查询弹窗赋值字段
         searchTitle: '库存余额信息', // 查询弹窗标题
         searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类
-         searchPage: BalanceApi.getBalancePageByBusinessType, // 查询弹窗所需分页方法
-        searchCondition: [{
-          key: 'businessType',
-          value: businessTypeData.code,
+        searchPage: BalanceApi.getBalancePageByBusinessTypeByItemType, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'businessType',
+          value: businessTypeData.code,
           action: '==', // 查询拼接条件
           isSearch: true, // 使用自定义拼接条件
           isMainValue: false // 拼接条件必须要 false 同时不能与 isMainValue: true 同用
-        },{
+        },{
           key: 'packingNumber', // 查询列表中字段
           value: '', // 指查询具体值
           action: 'isNotStr', // 查询拼接条件
@@ -346,7 +346,7 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       searchField: 'itemCode', // 查询弹窗赋值字段
       searchTitle: '库存余额信息', // 查询弹窗标题
       searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类
-      searchPage: BalanceApi.getBalancePageByBusinessType, // 查询弹窗所需分页方法
+      searchPage: BalanceApi.getBalancePageByBusinessTypeByItemType, // 查询弹窗所需分页方法
       searchCondition: [{
         key: 'businessType',
         value: businessTypeData.code,

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue

@@ -645,6 +645,7 @@ const handleUploadQualityReport  = async (row) => {
   SupplierdeliverInspectionDetail.allSchemas.tableFormColumns.forEach((item) => {
     tableFormKeys[item.field] = item.default ? item.default : ''
   })
+  
   uploadQualityReportTableData.value = [tableFormKeys]
 }