From 94664497d7ce871cf7c595fa6b6234ca71969789 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Thu, 12 Dec 2024 09:35:43 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E5=A4=9A=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/XButton/src/ButtonBaseMore.vue                | 2 +-
 .../supplierinvoice/supplierinvoiceRecordMain/index.vue      | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/components/XButton/src/ButtonBaseMore.vue b/src/components/XButton/src/ButtonBaseMore.vue
index 9a4e459e2..0be296e6e 100644
--- a/src/components/XButton/src/ButtonBaseMore.vue
+++ b/src/components/XButton/src/ButtonBaseMore.vue
@@ -89,7 +89,7 @@ const getMoreList = computed(()=>{
 })
 const getButtonList = computed(()=>{
   let list = showList()
-  if(list.length>3){
+  if(list.length>props.showMoreLength){
     console.log('list===',list)
     return list.slice(0, props.showMoreLength)
   }
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
index c5a62bd99..51c0e2cc5 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
@@ -39,7 +39,10 @@
         <span :class="{'red-text':row.differencePrice!=0}">{{ row.differencePrice }}</span>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore v-if="wsCache.get('lang')=='en-US'" :showMoreLength="1"
+           :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)"
+        />
+        <ButtonBase v-else :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

From fd646cae8bb4b0acc177c9927ef096be4836354a Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Thu, 12 Dec 2024 10:13:30 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=BA=93=E5=AD=98=E8=BD=AC=E7=A7=BB?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95.=E6=89=93=E5=8D=B0=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inventorymove/inventorymoveRecordMainNew/index.vue     | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue
index 38e2281b2..325922058 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue
@@ -205,6 +205,7 @@ const searchTableRef = ref()
 const labelType = ref('') // 标签类别 采购还是制造等
 //获取类型
 const getLabelType = async (row,useToPackingNumber)=>{
+  labelType.value = ''
   let resType = await PackageApi.getPackagePage(useToPackingNumber?{
     number: row.toPackingNumber
   }:{
@@ -217,8 +218,11 @@ const getLabelType = async (row,useToPackingNumber)=>{
     } else {
       labelType.value = 'cg'
     }
+    console.log('labelType',labelType.value)
+    await getLabelDetailPage(row,false)
+
   }else{
-    getLabelType(row,true)
+    await getLabelType(row,true)
   }
 }
 const getLabelDetailPage = async (row,useToPackingNumber)=>{
@@ -250,7 +254,6 @@ const labelPrint = async (row) => {
   tableObject.loading = true
   //获取类型
   await getLabelType(row,false)
-  await getLabelDetailPage(row,false)
   
 }
 // 批量打印--预生产收货