From 8022884aba77eed406e6d9cf4a50bdb6eec2917e Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Tue, 10 Dec 2024 10:33:27 +0800
Subject: [PATCH] =?UTF-8?q?FWHL-98SCP=E6=AD=A3=E5=BC=8F=E7=8E=AF=E5=A2=83?=
 =?UTF-8?q?=EF=BC=8C=E5=88=87=E6=8D=A2=E4=B8=BA=E8=8B=B1=E6=96=87=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=EF=BC=8C=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91=E8=B4=A7?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E7=9A=84=E6=9B=B4=E5=A4=9A=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=93=8D=E4=BD=9C=E3=80=82=E5=BD=B1=E5=93=8D?=
 =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E6=89=93=E5=8D=B0=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/XButton/src/ButtonBaseMore.vue | 21 +++++++++++++------
 .../supplierdeliverRequestMain/index.vue      |  2 +-
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/components/XButton/src/ButtonBaseMore.vue b/src/components/XButton/src/ButtonBaseMore.vue
index f1b7574d1..9a4e459e2 100644
--- a/src/components/XButton/src/ButtonBaseMore.vue
+++ b/src/components/XButton/src/ButtonBaseMore.vue
@@ -14,11 +14,11 @@
       <span :style="{width:item.width+'px'||'auto'}" :class="[item.width?'ellipsis':'']">{{ item.label }}</span>
     </el-button>
   </div>
-  <el-dropdown placement="top-start" v-if="showList().length>3">
-    <el-button link class="more"> 更多 </el-button>
+  <el-dropdown placement="top-start" v-if="showList().length>showMoreLength">
+    <el-button link class="more" style="justify-self: flex-end;"> {{ t('ts.更多') }} </el-button>
     <template #dropdown>
       <el-dropdown-menu>
-        <el-dropdown-item v-for="(item, index) in getMoreList" :key="index+3" class="btn-div">
+        <el-dropdown-item v-for="(item, index) in getMoreList" :key="index+showMoreLength" class="btn-div">
           <el-button
             v-show="!item.hide"
             :type="item.type"
@@ -44,6 +44,7 @@ import { clearButtonBlurHandle } from '@/utils/index'
 import rowDrop from '@/components/rowDrop/index.vue'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 const { wsCache } = useCache()
+const { t } = useI18n() // 国际化
 
 const props = defineProps({
   Butttondata: {
@@ -60,6 +61,10 @@ const props = defineProps({
     type: Object,
     default: null
   },
+  showMoreLength: {
+    type: Number,
+    default: 3
+  }
 })
 const showList = ()=>{
   const all_permission = '*:*:*'
@@ -80,13 +85,13 @@ const showList = ()=>{
 }
 const getMoreList = computed(()=>{
   let list = showList()
-  return list.slice(3)
+  return list.slice(props.showMoreLength)
 })
 const getButtonList = computed(()=>{
   let list = showList()
   if(list.length>3){
     console.log('list===',list)
-    return list.slice(0, 3)
+    return list.slice(0, props.showMoreLength)
   }
   return list
 })
@@ -131,5 +136,9 @@ const updataTableColumns = (val) => {
     margin: 0px;
   }
 }
-
+.more{
+  &.el-button:focus-visible {
+    outline: none;
+  }
+}
 </style>
\ No newline at end of file
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 14d3475d7..1333b3e35 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -55,7 +55,7 @@
         </el-button>
       </template>
       <template #action="{ row, $index }">
-        <ButtonBaseMore
+        <ButtonBaseMore :showMoreLength="wsCache.get('lang')=='en-US'?2:3"
           :Butttondata="butttondata(row, $index)"
           @button-base-click="buttonTableClick($event, row)"
         />