From bf16f2d1c46a67c258f26171485c3c914602f0f2 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Wed, 26 Feb 2025 10:18:07 +0800
Subject: [PATCH] YT-1972
---
src/components/XButton/src/ButtonBaseMore.vue | 23 +++++++---
src/locales/en-US.ts | 3 +-
src/locales/zh-CN.ts | 3 +-
.../supplierdeliverRequestMain/index.vue | 44 ++++++++++---------
4 files changed, 43 insertions(+), 30 deletions(-)
diff --git a/src/components/XButton/src/ButtonBaseMore.vue b/src/components/XButton/src/ButtonBaseMore.vue
index deeec5238..0be296e6e 100644
--- a/src/components/XButton/src/ButtonBaseMore.vue
+++ b/src/components/XButton/src/ButtonBaseMore.vue
@@ -14,11 +14,11 @@
{{ item.label }}
-
- 更多
+
+ {{ t('ts.更多') }}
-
+
{
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;
+ }
+}
\ No newline at end of file
diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts
index 9ad53f092..c0a945a77 100644
--- a/src/locales/en-US.ts
+++ b/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',
},
}
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 1507cbc4c..73a16a4a9 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -1324,7 +1324,8 @@ export default {
作废成功:'作废成功',
退回: '退回',
'索赔金额不能为0,请修改后提交。': '索赔金额不能为0,请修改后提交。',
- 新增班次:'新增班次'
+ 新增班次:'新增班次',
+ 更多:'更多',
},
}
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 33190de62..4e399c439 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -55,7 +55,7 @@
-
@@ -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']),