From 7350b3aee0c67c264f258e7a14733e346431689a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Thu, 19 Oct 2023 14:09:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=20=E5=A4=B4=E9=83=A8?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=20=E5=88=B7=E6=96=B0=E5=8F=8A=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E4=B8=BA=E9=BB=98=E8=AE=A4=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/TableHead/src/TableHead.vue | 12 +++++++++---
 src/utils/disposition/defaultButtons.ts    | 14 ++++++++++++++
 src/views/wms/bom/index.vue                |  2 --
 src/views/wms/itembasic/index.vue          |  2 --
 src/views/wms/itempackaging/index.vue      |  4 +++-
 src/views/wms/productionlineitem/index.vue |  2 --
 src/views/wms/stdcostprice/index.vue       |  2 --
 7 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/src/components/TableHead/src/TableHead.vue b/src/components/TableHead/src/TableHead.vue
index 708bb2b30..6271bd127 100644
--- a/src/components/TableHead/src/TableHead.vue
+++ b/src/components/TableHead/src/TableHead.vue
@@ -4,7 +4,7 @@
       <div class="tableNavLeftBtns">
         <ButtonBase
           :Butttondata="buttonsLeft"
-          @buttonBaseClick="buttonBaseClick"
+          @button-base-click="buttonBaseClick"
         />
       </div>
       <div class="tableNavRightBtns">
@@ -18,7 +18,7 @@
           style="margin-right: 15px;"
         ></SearchNormal> -->
         <!-- 右侧按钮 -->
-        <ButtonBase :Butttondata="buttonsRight" @buttonBaseClick="buttonBaseClick" />
+        <ButtonBase :Butttondata="buttonsRight" @button-base-click="buttonBaseClick" />
       </div>
     </div>
     <slot></slot>
@@ -26,6 +26,7 @@
 </template>
 <script setup>
 import ButtonBase from '@/components/XButton/src/ButtonBase.vue'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
 // import SearchNormal from '@/components/SearchNormal/index.vue'
 // import * as highSearch from '@/utils/search/highSearch'
 // import * as primarySearch from '@/utils/search/primarySearch'
@@ -63,7 +64,12 @@ import ButtonBase from '@/components/XButton/src/ButtonBase.vue'
     //   buttonsRight.value.push(defaultButtons.defaultFilterBtn())
     // }
     // 父级传参处理左右
-    props.HeadButttondata.forEach(item=>{
+    const buttonData = ref([])
+    // 默认按钮 刷新 和 设置
+    buttonData.value.push(defaultButtons.defaultFreshBtn(null))
+    buttonData.value.push(defaultButtons.defaultSetBtn(null))
+    buttonData.value = [...buttonData.value,...props.HeadButttondata]
+    buttonData.value.forEach(item=>{
       if(item.float && item.float == 'right'){
         buttonsRight.value.push(item)
       }else{
diff --git a/src/utils/disposition/defaultButtons.ts b/src/utils/disposition/defaultButtons.ts
index 4fc3a28bf..50a5f00b0 100644
--- a/src/utils/disposition/defaultButtons.ts
+++ b/src/utils/disposition/defaultButtons.ts
@@ -103,6 +103,20 @@ export function defaultResetBtn(option:any) {
   })
 }
 
+// 设置
+export function defaultSetBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '设置',
+    name: 'set',
+    hide: false,
+    type: 'primary',
+    icon: 'ep:refresh',
+    color: '',
+    float:'right',
+    hasPermi: ''
+  })
+}
+
 // 筛选按钮
 export function defaultFilterBtn(option:any) {
   return __defaultBtnOption(option,{
diff --git a/src/views/wms/bom/index.vue b/src/views/wms/bom/index.vue
index a01843411..ae0f50f4e 100644
--- a/src/views/wms/bom/index.vue
+++ b/src/views/wms/bom/index.vue
@@ -98,8 +98,6 @@ const HeadButttondata = [
   defaultButtons.defaultAddBtn({hasPermi:'wms:bom:create'}), // 新增
   defaultButtons.defaultImportBtn({hasPermi:'wms:bom:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:bom:export'}), // 导出
-  // defaultButtons.defaultFilterBtn(), // 筛选
-  defaultButtons.defaultFreshBtn(null), // 刷新
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',
diff --git a/src/views/wms/itembasic/index.vue b/src/views/wms/itembasic/index.vue
index 5fdd4906f..3b76c245a 100644
--- a/src/views/wms/itembasic/index.vue
+++ b/src/views/wms/itembasic/index.vue
@@ -66,8 +66,6 @@ const HeadButttondata = [
   defaultButtons.defaultAddBtn(null), // 新增
   defaultButtons.defaultImportBtn(null), // 导入
   defaultButtons.defaultExportBtn(null), // 导出
-  // defaultButtons.defaultFilterBtn(), // 筛选
-  defaultButtons.defaultFreshBtn(null), // 刷新
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',
diff --git a/src/views/wms/itempackaging/index.vue b/src/views/wms/itempackaging/index.vue
index 70c0042f0..d1a29910f 100644
--- a/src/views/wms/itempackaging/index.vue
+++ b/src/views/wms/itempackaging/index.vue
@@ -88,7 +88,6 @@ const HeadButttondata = [
   defaultButtons.defaultImportBtn({hasPermi:'wms:itempackaging:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:itempackaging:export'}), // 导出
   // defaultButtons.defaultFilterBtn(), // 筛选
-  defaultButtons.defaultFreshBtn(null), // 刷新
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',
@@ -101,6 +100,7 @@ const HeadButttondata = [
 
 // 头部按钮事件 
 const buttonBaseClick = (val, item) => {
+  console.log(104, val)
   if (val == 'add') { // 新增
     openForm('create')
   } else if (val == 'import') { // 导入
@@ -109,6 +109,8 @@ const buttonBaseClick = (val, item) => {
     handleExport()
   } else if (val == 'refresh') { // 刷新
     getList()
+  } else if (val == 'set') { // 设置
+    getList()
   } else if (val == 'filtrate') { // 筛选
   } else { // 其他按钮 
     console.log('其他按钮', item)
diff --git a/src/views/wms/productionlineitem/index.vue b/src/views/wms/productionlineitem/index.vue
index dc34706e2..91a2345d8 100644
--- a/src/views/wms/productionlineitem/index.vue
+++ b/src/views/wms/productionlineitem/index.vue
@@ -99,8 +99,6 @@ const HeadButttondata = [
   defaultButtons.defaultAddBtn({hasPermi:'wms:productionlineitem:create'}), // 新增
   defaultButtons.defaultImportBtn({hasPermi:'wms:productionlineitem:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:productionlineitem:export'}), // 导出
-  // defaultButtons.defaultFilterBtn(), // 筛选
-  defaultButtons.defaultFreshBtn(null), // 刷新
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',
diff --git a/src/views/wms/stdcostprice/index.vue b/src/views/wms/stdcostprice/index.vue
index 566e72126..796898aaf 100644
--- a/src/views/wms/stdcostprice/index.vue
+++ b/src/views/wms/stdcostprice/index.vue
@@ -93,8 +93,6 @@ const HeadButttondata = [
   defaultButtons.defaultAddBtn({hasPermi:'wms:stdcostprice:create'}), // 新增
   defaultButtons.defaultImportBtn({hasPermi:'wms:stdcostprice:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:stdcostprice:export'}), // 导出
-  // defaultButtons.defaultFilterBtn(), // 筛选
-  defaultButtons.defaultFreshBtn(null), // 刷新
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',