From eb2ce7a401041a2bc9b9890a3ec020b8aa692f35 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Fri, 13 Dec 2024 15:24:30 +0800
Subject: [PATCH] =?UTF-8?q?YT-1650=E8=B0=83=E6=95=B4=E6=89=80=E6=9C=89?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=B8=AD=EF=BC=8C=E6=93=8D=E4=BD=9C=E5=88=97?=
 =?UTF-8?q?=E7=9A=84=E5=AE=BD=E5=BA=A6=EF=BC=8C=E6=9C=80=E5=A4=9A=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=B8=A4=E4=B8=AA=E6=8C=89=E9=92=AE=EF=BC=8C=E5=A6=82?=
 =?UTF-8?q?=E6=9E=9C=E5=A4=A7=E4=BA=8E=E4=B8=A4=E4=B8=AA=E5=88=99=E5=B0=86?=
 =?UTF-8?q?=E5=85=B6=E5=AE=83=E6=8C=89=E9=92=AE=E5=90=88=E5=B9=B6=E5=88=B0?=
 =?UTF-8?q?=E2=80=9C=E6=9B=B4=E5=A4=9A=E2=80=9D=EF=BC=8C=E5=8F=82=E8=80=83?=
 =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91=E8=B4=A7=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=88=97=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/XButton/src/ButtonBaseMore.vue          | 10 +++++-----
 .../systemSetting/supplierUser/index.vue               |  5 ++++-
 .../moldAllocation/supplierMoldCostMain/index.vue      |  2 +-
 .../purchasereceiptRecordMain/index.vue                |  2 +-
 .../purchasereturn/purchasereturnRecordMain/index.vue  |  5 ++++-
 .../supplierdeliverRecordMain/index.vue                |  2 +-
 .../wms/supplierManage/invoicingcalendar/index.vue     |  5 ++++-
 .../purchaseClaim/purchaseClaimRecord/index.vue        |  2 +-
 .../purchaseClaim/purchaseClaimRequest/index.vue       |  2 +-
 .../purchaseDiscreteOrderMain/index.vue                |  5 ++++-
 .../supplierApbalance/supplierApbalanceMain/index.vue  |  5 ++++-
 .../supplierinvoiceRecordMain/index.vue                |  5 ++++-
 .../supplierinvoiceRequestMain/index.vue               |  2 +-
 .../supplierManage/supplierinvoiceInvoiced/index.vue   |  5 ++++-
 14 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/src/components/XButton/src/ButtonBaseMore.vue b/src/components/XButton/src/ButtonBaseMore.vue
index a2f853471..deeec5238 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-dropdown placement="top-start" v-if="showList().length>2">
     <el-button link class="more" type="primary"> 更多 </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+2" class="btn-div">
           <el-button
             v-show="!item.hide"
             :type="item.type"
@@ -80,13 +80,13 @@ const showList = ()=>{
 }
 const getMoreList = computed(()=>{
   let list = showList()
-  return list.slice(3)
+  return list.slice(2)
 })
 const getButtonList = computed(()=>{
   let list = showList()
-  if(list.length>3){
+  if(list.length>2){
     console.log('list===',list)
-    return list.slice(0, 3)
+    return list.slice(0, 2)
   }
   return list
 })
diff --git a/src/views/wms/basicDataManage/systemSetting/supplierUser/index.vue b/src/views/wms/basicDataManage/systemSetting/supplierUser/index.vue
index 862db6be2..2e8298e25 100644
--- a/src/views/wms/basicDataManage/systemSetting/supplierUser/index.vue
+++ b/src/views/wms/basicDataManage/systemSetting/supplierUser/index.vue
@@ -33,7 +33,10 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore
+          :Butttondata="butttondata(row, $index)"
+          @button-base-click="buttonTableClick($event, row)"
+        />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/deliversettlementManage/moldAllocation/supplierMoldCostMain/index.vue b/src/views/wms/deliversettlementManage/moldAllocation/supplierMoldCostMain/index.vue
index 2af61f1f1..40c492941 100644
--- a/src/views/wms/deliversettlementManage/moldAllocation/supplierMoldCostMain/index.vue
+++ b/src/views/wms/deliversettlementManage/moldAllocation/supplierMoldCostMain/index.vue
@@ -38,7 +38,7 @@
           </el-button>
         </template>
         <template #action="{ row, $index }">
-          <ButtonBase
+          <ButtonBaseMore
             :Butttondata="butttondata(row, $index)"
             @button-base-click="buttonTableClick($event, row)"
           />
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
index 44b2ca51a..0a0844360 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
@@ -43,7 +43,7 @@
         </el-button>
       </template>
       <template #action="{ row, $index }">
-        <ButtonBase
+        <ButtonBaseMore
           :Butttondata="butttondata(row, $index)"
           @button-base-click="buttonTableClick($event, row)"
         />
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue
index 10e18ee6e..0e0bae18f 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue
@@ -34,7 +34,10 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore
+          :Butttondata="butttondata(row, $index)"
+          @button-base-click="buttonTableClick($event, row)"
+        />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue
index 6754f0406..22d7869cc 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue
@@ -42,7 +42,7 @@
         </el-button>
       </template>
       <template #action="{ row, $index }">
-        <ButtonBase
+        <ButtonBaseMore
           :Butttondata="butttondata(row, $index)"
           @button-base-click="buttonTableClick($event, row)"
         />
diff --git a/src/views/wms/supplierManage/invoicingcalendar/index.vue b/src/views/wms/supplierManage/invoicingcalendar/index.vue
index f02f1abb0..ae2c85c2c 100644
--- a/src/views/wms/supplierManage/invoicingcalendar/index.vue
+++ b/src/views/wms/supplierManage/invoicingcalendar/index.vue
@@ -33,7 +33,10 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore
+          :Butttondata="butttondata(row, $index)"
+          @button-base-click="buttonTableClick($event, row)"
+        />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRecord/index.vue b/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRecord/index.vue
index 6b1f47fce..e92dca74d 100644
--- a/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRecord/index.vue
+++ b/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRecord/index.vue
@@ -40,7 +40,7 @@
         </el-button>
       </template>
       <template #action="{ row, $index }">
-        <ButtonBase
+        <ButtonBaseMore
           :Butttondata="butttondata(row, $index)"
           @button-base-click="buttonTableClick($event, row)"
         />
diff --git a/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRequest/index.vue b/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRequest/index.vue
index 32ac1a8ea..01e6b48e9 100644
--- a/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRequest/index.vue
+++ b/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRequest/index.vue
@@ -40,7 +40,7 @@
         </el-button>
       </template>
       <template #action="{ row, $index }">
-        <ButtonBase
+        <ButtonBaseMore
           :Butttondata="butttondata(row, $index)"
           @button-base-click="buttonTableClick($event, row)"
         />
diff --git a/src/views/wms/supplierManage/purchaseDiscreteOrder/purchaseDiscreteOrderMain/index.vue b/src/views/wms/supplierManage/purchaseDiscreteOrder/purchaseDiscreteOrderMain/index.vue
index a3c980593..f1aa4c716 100644
--- a/src/views/wms/supplierManage/purchaseDiscreteOrder/purchaseDiscreteOrderMain/index.vue
+++ b/src/views/wms/supplierManage/purchaseDiscreteOrder/purchaseDiscreteOrderMain/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
+            :Butttondata="butttondata(row, $index)"
+            @button-base-click="buttonTableClick($event, row)"
+          />
         </template>
       </Table>
     </ContentWrap>
diff --git a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue
index 459b3230b..cabf4f58c 100644
--- a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue
+++ b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue
@@ -33,7 +33,10 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore
+          :Butttondata="butttondata(row, $index)"
+          @button-base-click="buttonTableClick($event, row)"
+        />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
index 8b9b6d9a1..cf8c8e0a3 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
+          :Butttondata="butttondata(row, $index)"
+          @button-base-click="buttonTableClick($event, row)"
+        />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index fc058e78a..030de7e73 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -47,7 +47,7 @@
         }}</span>
       </template>
       <template #action="{ row, $index }">
-        <ButtonBase
+        <ButtonBaseMore
           :Butttondata="butttondata(row, $index)"
           @button-base-click="buttonTableClick($event, row)"
         />
diff --git a/src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue b/src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue
index 827f95a2c..bc0b78565 100644
--- a/src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue
@@ -33,7 +33,10 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore
+          :Butttondata="butttondata(row, $index)"
+          @button-base-click="buttonTableClick($event, row)"
+        />
       </template>
     </Table>
   </ContentWrap>