From a6241468d4db09f412b0237baf594225b9398095 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Mon, 6 May 2024 09:37:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=B6=E5=93=81=E5=9B=9E=E6=94=B6=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=EF=BC=8C=E7=89=A9=E6=96=99=E7=AD=9B=E9=80=89=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=9C=89=E9=97=AE=E9=A2=98=EF=BC=8C=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/balance/index.ts                  | 11 ++++++++
 .../productredressRequestMain.data.ts         | 28 +++++++++----------
 .../supplierdeliverRequestMain/index.vue      |  1 +
 3 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/src/api/wms/balance/index.ts b/src/api/wms/balance/index.ts
index 432b14a1a..4b21cda4d 100644
--- a/src/api/wms/balance/index.ts
+++ b/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) {
diff --git a/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts b/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts
index dcc05b9a8..4afaf03c7 100644
--- a/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts
+++ b/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,
-        action: '==', // 查询拼接条件
-        isSearch: true, // 使用自定义拼接条件
-        isMainValue: false // 拼接条件必须要 false 同时不能与 isMainValue: true 同用
-        },{
+        searchPage: BalanceApi.getBalancePageByBusinessTypeByItemType, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'businessType',
+          value: businessTypeData.code,
+          action: '==', // 查询拼接条件
+          isSearch: true, // 使用自定义拼接条件
+          isMainValue: false // 拼接条件必须要 false 同时不能与 isMainValue: true 同用
+        },{
           key: 'packingNumber', // 查询列表中字段
           value: '', // 指查询具体值
           action: 'isNotStr', // 查询拼接条件
@@ -346,13 +346,13 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       searchField: 'itemCode', // 查询弹窗赋值字段
       searchTitle: '库存余额信息', // 查询弹窗标题
       searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类
-      searchPage: BalanceApi.getBalancePageByBusinessType, // 查询弹窗所需分页方法
+      searchPage: BalanceApi.getBalancePageByBusinessTypeByItemType, // 查询弹窗所需分页方法
       searchCondition: [{
-      key: 'businessType',
-      value: businessTypeData.code,
-      action: '==', // 查询拼接条件
-      isSearch: true, // 使用自定义拼接条件
-      isMainValue: false // 拼接条件必须要 false 同时不能与 isMainValue: true 同用
+        key: 'businessType',
+        value: businessTypeData.code,
+        action: '==', // 查询拼接条件
+        isSearch: true, // 使用自定义拼接条件
+        isMainValue: false // 拼接条件必须要 false 同时不能与 isMainValue: true 同用
       },{
         key: 'packingNumber', // 查询列表中字段
         value: '', // 指查询具体值
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 142997274..db79961d9 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/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]
 }