YT-1972

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>2">
+  <el-dropdown placement="top-start" v-if="showList().length>showMoreLength">
-    <el-button link class="more" type="primary"> 更多 </el-button>
+    <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+2" 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(2)
+  return list.slice(props.showMoreLength)
 })
 const getButtonList = computed(()=>{
   let list = showList()
-  if(list.length>2){
+  if(list.length>props.showMoreLength){
     console.log('list===',list)
-    return list.slice(0, 2)
+    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>

src/locales/en-US.ts

@@ -1325,6 +1325,7 @@ export default {
     退回:'Return',
     作废成功: 'Invalid successfully',
     '索赔金额不能为0，请修改后提交。': 'The claim amount cannot be 0, please modify and submit.',
-    新增班次: 'Create Shift'
+    新增班次: 'Create Shift',
+    更多:'More',
   },
 }

src/locales/zh-CN.ts

@@ -1324,7 +1324,8 @@ export default {
     作废成功:'作废成功',
     退回: '退回',
     '索赔金额不能为0，请修改后提交。': '索赔金额不能为0，请修改后提交。',
-    新增班次:'新增班次'
+    新增班次:'新增班次',
+    更多:'更多',
   },
 
 }

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)"
         />
@@ -548,6 +548,16 @@ const butttondata = (row, $index) => {
     //   hasPermi: '',
     //   link: true // 文本展现按钮
     // }, // 上传履历表
+    {
+      label: t('ts.生成标签'),
+      name: 'ssbq',
+      hide: isShowMainButtonLabel(row, ['3']),
+      type: 'primary',
+      icon: '',
+      color: '',
+      hasPermi: 'wms:supplierdeliver-request-main:genLabels',
+      link: true // 文本展现按钮
+    },
     defaultButtons.mainListPointBtn({
       hide: isShowMainButton(row, ['3', '8']),
       hasPermi: 'wms:supplierdeliver-request-main:printLabel'
@@ -564,6 +574,16 @@ const butttondata = (row, $index) => {
       hasPermi: 'wms:supplierdeliver-request-main:genRecords',
       link: true // 文本展现按钮
     },
+    {
+      label: t('ts.重新生成标签'),
+      name: 'ressbq',
+      hide: isReGenLabelShowMainButtonLabel(row, ['3']),
+      type: 'primary',
+      icon: '',
+      color: '',
+      hasPermi: 'wms:supplierdeliver-request-main:genLabels',
+      link: true // 文本展现按钮
+    },
     defaultButtons.mainListPlanSubBtn({
       hide: isShowMainButton(row, ['1']),
       hasPermi: 'wms:supplierdeliver-request-main:sub'
@@ -581,26 +601,8 @@ const butttondata = (row, $index) => {
       hasPermi: 'wms:supplierdeliver-request-main:update'
     }), // 编辑
     // defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:supplierdeliver-request-main:delete' }), // 删除
-    {
+    
-      label: t('ts.生成标签'),
+    
-      name: 'ssbq',
-      hide: isShowMainButtonLabel(row, ['3']),
-      type: 'primary',
-      icon: '',
-      color: '',
-      hasPermi: 'wms:supplierdeliver-request-main:genLabels',
-      link: true // 文本展现按钮
-    },
-    {
-      label: t('ts.重新生成标签'),
-      name: 'ressbq',
-      hide: isReGenLabelShowMainButtonLabel(row, ['3']),
-      type: 'primary',
-      icon: '',
-      color: '',
-      hasPermi: 'wms:supplierdeliver-request-main:genLabels',
-      link: true // 文本展现按钮
-    },
     
     defaultButtons.mainListPurchasePlanCloBtn({
       hide: isShowMainButton(row, ['1', '2', '4', '3']),