From 8fae5b662bd34195c13646d0a44e404803054612 Mon Sep 17 00:00:00 2001
From: lidm0086 <lidm0086@163.com>
Date: Tue, 4 Jun 2024 11:49:06 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=8F=AD=E7=BB=84=20=20=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=20=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E5=8F=AF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/basicDataManage/orderManage/team/team.data.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/basicDataManage/orderManage/team/team.data.ts b/src/views/wms/basicDataManage/orderManage/team/team.data.ts
index f2e67fdcc..c3b374686 100644
--- a/src/views/wms/basicDataManage/orderManage/team/team.data.ts
+++ b/src/views/wms/basicDataManage/orderManage/team/team.data.ts
@@ -76,8 +76,8 @@ export const Team = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'available',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
-    isSearch: true,
+    isTable: false,
+    isSearch: false,
     sort: 'custom',
     form: {
       component: 'Switch',

From 12ea2c658a0f7fb9b4110e621c7c5d05321e028f Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Tue, 4 Jun 2024 11:59:07 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0loading?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/axios/config.ts                      | 2 +-
 src/views/wms/inventoryManage/balance/index.vue | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/config/axios/config.ts b/src/config/axios/config.ts
index 811650873..9bf0a928a 100644
--- a/src/config/axios/config.ts
+++ b/src/config/axios/config.ts
@@ -16,7 +16,7 @@ const config: {
   /**
    * 接口请求超时时间
    */
-  request_timeout: 30000,
+  request_timeout: 300000,
 
   /**
    * 默认接口请求类型
diff --git a/src/views/wms/inventoryManage/balance/index.vue b/src/views/wms/inventoryManage/balance/index.vue
index bc9a950bc..c546435e2 100644
--- a/src/views/wms/inventoryManage/balance/index.vue
+++ b/src/views/wms/inventoryManage/balance/index.vue
@@ -173,8 +173,14 @@ const handleSelectionPoint = async ()=>{
     rows = [...rows,...item.selectionRows.map(item1=>item1.packingNumber)]
   })
   console.log('批量打印',rows.join(','))
+  let getLoading = ElLoading.service({
+    lock: true,
+    text: 'loading...',
+    background: 'rgba(0, 0, 0, 0.7)'
+  })
   PackageApi.getBalanceToPackageSelection(rows).then(res => {
     console.log('res',res);
+    getLoading?.close()
     if(res.zzLabel){
       //制造标签
       const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
@@ -188,6 +194,7 @@ const handleSelectionPoint = async ()=>{
     
   }).catch(err => {
     console.log(err)
+    getLoading?.close()
   })
   // window.open(srcPoint.value+'&relateNumber='+rows.join(','))
 }