From 9e3a35f01422bdee1c1060e554d0719dcfe5cdae Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Fri, 31 May 2024 19:41:21 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereturnRequestMain/index.vue       | 40 ++++++++++---------
 .../purchasereturnRequestMain.data.ts         | 35 +++++++++++++++-
 2 files changed, 55 insertions(+), 20 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
index e0f65f42e..27581ecc1 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
@@ -260,14 +260,16 @@ const searchTableSuccess = async(formField, searchField, val, formRef, type, row
         // row['fromLocationCode'] = val[0]['fromLocationCode']
         row['toLocationCode'] = val[0]['toLocationCode']
       }else if(formField=='fromLocationCode'){
-          let params = {
-          itemCode: row.itemCode,
-          batch: row.batch,
-          locationCode:val[0]['code']
-        }
-        let aa  = await  BalanceApi.getSumByConditions(params);
-        console.log('23423423',aa);
-        row['inventoryBalance'] = aa//库存余额
+        //   let params = {
+        //   itemCode: row.itemCode,
+        //   batch: row.batch,
+        //   locationCode:val[0]['code']
+        // }
+        // let aa  = await  BalanceApi.getSumByConditions(params);
+        // console.log('23423423',aa);
+        // row['inventoryBalance'] = aa//库存余额
+      }else if(formField=='packingNumber'){
+        row['inventoryBalance'] = val[0]['qty']//库存余额
       }
     } else {
       const setV = {}
@@ -491,17 +493,17 @@ const butttondata = (row,$index) => {
       hide: isShowMainButton(row, ['1']),
       hasPermi: 'wms:purchasereceipt-request-main:update'
     }), // 编辑
-    {
-      label: '生成标签',
-      name: 'ssbq',
-      hide: isShowMainButton(row, ['3']),
-      type: 'primary',
-      icon: '',
-      color: '',
-      hasPermi: '',
-      link: true // 文本展现按钮
-    },
-    defaultButtons.mainListPointBtn({ hide: isShowMainButton(row, ['3','6']) }), // 标签打印
+    // {
+    //   label: '生成标签',
+    //   name: 'ssbq',
+    //   hide: isShowMainButton(row, ['3']),
+    //   type: 'primary',
+    //   icon: '',
+    //   color: '',
+    //   hasPermi: '',
+    //   link: true // 文本展现按钮
+    // },
+    // defaultButtons.mainListPointBtn({ hide: isShowMainButton(row, ['3','6']) }), // 标签打印
   ]
 }
 
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
index c2c4592a0..e26d13203 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
@@ -10,6 +10,8 @@ import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackag
 import * as ItemPackageApi from '@/api/wms/itempackage/index'
 import * as LocationApi from "@/api/wms/location";
 import {Location} from "@/views/wms/basicDataManage/factoryModeling/location/location.data";
+import * as BalanceApi from '@/api/wms/balance'
+import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
 
 
 
@@ -937,7 +939,38 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       componentProps:{
         disabled:true
       }
-    }
+    },
+    tableForm:{
+      // labelMessage: '信息提示说明！！！',
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择物料代码、批次、从库位代码',
+      searchField: 'packingNumber',
+      searchTitle: '库存余额信息', // 查询弹窗标题
+      searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类
+      searchPage: BalanceApi.getBalancePage,
+      searchCondition: [{
+        key: 'itemCode',
+        value: 'itemCode',
+        message: '请填写物料代码',
+        isTableRowValue: true, //查询当前searchTable表中行数据的值
+        required:true,
+        isMainValue:false
+      },{
+        key: 'batch',
+        value: 'batch',
+        message: '请填写批次',
+        isTableRowValue: true, //查询当前searchTable表中行数据的值
+        required:true,
+        isMainValue:false
+      },{
+        key: 'fromLocationCode',
+        value: 'fromLocationCode',
+        message: '请选择从库位代码',
+        isTableRowValue: true, //查询当前searchTable表中行数据的值
+        required:true,
+        isMainValue:false
+      }]
+    },
   },
   {
     label: '库存余额',