From 173c32ead1e7d77e855cc05330ab3c335dfdcaa2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Mon, 28 Aug 2023 17:12:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90=E5=88=B0=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E6=A8=A1=E6=8B=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/currenButton/index.vue     |  9 ++---
 .../components/currenButton/innerButton.vue   | 10 ++----
 .../src/components/tablePagination/index.vue  | 36 ++++++++++++++-----
 .../src/layout/components/Navbar.vue          |  4 +--
 PC/InterFace.Dash/src/store/modules/user.js   |  5 +--
 .../src/components/currenButton/index.vue     |  9 ++---
 .../components/currenButton/innerButton.vue   | 10 ++----
 .../src/components/tablePagination/index.vue  | 36 ++++++++++++++-----
 .../src/store/modules/user.js                 |  5 +--
 .../src/components/currenButton/index.vue     |  9 ++---
 .../components/currenButton/innerButton.vue   | 10 ++----
 .../src/components/tablePagination/index.vue  | 36 ++++++++++++++-----
 .../src/store/modules/user.js                 |  5 +--
 13 files changed, 107 insertions(+), 77 deletions(-)

diff --git a/PC/InterFace.Dash/src/components/currenButton/index.vue b/PC/InterFace.Dash/src/components/currenButton/index.vue
index 7ef7dd2..40e53c9 100644
--- a/PC/InterFace.Dash/src/components/currenButton/index.vue
+++ b/PC/InterFace.Dash/src/components/currenButton/index.vue
@@ -2,7 +2,7 @@
   <div class="tableNavBtnsContent">
     <div class="tableNavLeftBtns">
       <!-- 左侧按钮 -->
-      <innerButton :isRoutePermission="isRoutePermission" :Butttondata="buttonsLeft" @tableButtonClick="tableButtonClick"></innerButton>
+      <innerButton :Butttondata="buttonsLeft" @tableButtonClick="tableButtonClick"></innerButton>
     </div>
     <div class="tableNavRightBtns">
       <!-- 快速搜索 -->
@@ -14,7 +14,7 @@
         @searchNormalClear="quicklySearchClear"
       ></searchNormal>
       <!-- 右侧按钮 -->
-      <innerButton :isRoutePermission="isRoutePermission" :Butttondata="buttonsRight" @tableButtonClick="tableButtonClick"></innerButton>
+      <innerButton :Butttondata="buttonsRight" @tableButtonClick="tableButtonClick"></innerButton>
     </div>
     <slot></slot>
   </div>
@@ -30,11 +30,6 @@ export default {
     searchNormal
   },
   props: {
-    // 是否按路由配置按钮权限
-    isRoutePermission:{
-      type: Boolean,
-      default: false,
-    },
     Butttondata: {
       type: Array,
       default: () => {
diff --git a/PC/InterFace.Dash/src/components/currenButton/innerButton.vue b/PC/InterFace.Dash/src/components/currenButton/innerButton.vue
index 38f5bb8..2b32b42 100644
--- a/PC/InterFace.Dash/src/components/currenButton/innerButton.vue
+++ b/PC/InterFace.Dash/src/components/currenButton/innerButton.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="currenButton clearfix">
-    <el-button 
+    <el-button
         v-for="(item, index) in Butttondata" :key="index"
         v-show="typeof item.hide == 'function' ? !item.hide() : !item.hide"
         :type="item.type"
@@ -16,8 +16,8 @@
         }"
         :class="item.class"
         @click="tableButtonClick(item.name,item)"
-        v-permission="isRoutePermission ? [$route.name+'.'+item.name] : item.permission"
     >{{ item.label }}</el-button>
+    <!-- v-permission="item.permission" -->
   </div>
 </template>
 <script>
@@ -31,14 +31,8 @@ export default {
                 return []
             }
         },
-        // 是否按路由配置按钮权限
-        isRoutePermission:{
-            type: Boolean,
-            default: false,
-        },
     },
     mounted(){
-        console.log(36,this.$route,this.$store.getters)
         window.addEventListener('setItemEvent', (item) => {
             if (item.key.indexOf('tableColumns') > -1) {
                 this.initButtonType(item)
diff --git a/PC/InterFace.Dash/src/components/tablePagination/index.vue b/PC/InterFace.Dash/src/components/tablePagination/index.vue
index 3fb8e82..afc8d66 100644
--- a/PC/InterFace.Dash/src/components/tablePagination/index.vue
+++ b/PC/InterFace.Dash/src/components/tablePagination/index.vue
@@ -3,9 +3,9 @@
     <!-- 头部按钮 -->
     <div class="table-nav">
       <curren-Button
-        :isRoutePermission="isRoutePermission"
+        v-if="headerButttondata"
         ref="tablePagination_topNav"
-        :Butttondata="currenButtonData"
+        :Butttondata="headerButttondata"
         @tableButtonClick="topbutton"
         @quicklySearchClick="quicklySearchClick"
         @quicklySearchClear="quicklySearchClear"
@@ -93,6 +93,13 @@ export default {
     rowDrop
   },
   props: {
+    // 不使用权限的按钮
+    noUsePermissionBtn:{
+      type: Array,
+      default: () => {
+        return ['refresh','field']
+      }
+    },
     rowMaxHeight:{
       type:String,
       default:'calc(90vh - 280px)'
@@ -117,11 +124,6 @@ export default {
       type: Boolean,
       default: false,
     },
-    // 是否按路由配置按钮权限
-    isRoutePermission:{
-      type: Boolean,
-      default: false,
-    },
     // 显示搜索配置
     quicklySearchOption:{
       type: Object,
@@ -234,6 +236,7 @@ export default {
   },
   data () {
     return {
+      headerButttondata:null,
       // 字段设置是否显示
       rowDropVisible: false,
       // table 重新渲染所需key
@@ -282,6 +285,7 @@ export default {
     this.uTableTopHeight = this.appRemoveHeight
     this.uTableOuterHeight =  this.$refs.tablePaginationTableRef.getTableHeight()
     this.uTableOuterHeight_init = Number(JSON.stringify(this.uTableOuterHeight))
+    this.initButttondata()
     
     // 点击外部，字段设置弹窗隐藏
     document.addEventListener('click',(e)=>{
@@ -296,6 +300,22 @@ export default {
     })
   },
   methods: {
+    initButttondata(){
+      let _list = []
+      this.currenButtonData.forEach(item=>{
+        if(item.permission){
+          _list.push(item)
+        }else{
+          if(this.noUsePermissionBtn.indexOf(item.name) < 0){
+            item.permission =  [this.$route.name+'.'+item.name]
+          }else{
+            item.permission = []
+          }
+          _list.push(item)
+        }
+      })
+      this.headerButttondata = _list
+    },
     // 重新渲染表格
     doFreshTableLayout(){
       if(this.$refs.tablePaginationTableRef && this.$refs.tablePaginationTableRef.doFreshLayout){
@@ -410,7 +430,7 @@ export default {
     // 全面筛选组件所有按钮事件
     overallSearchFormClick(options){
       //增加快速搜索实体
-      options.vm_quickly = this.$refs.tablePagination_topNav.getQuicklySearchDom()
+      if(this.$refs.tablePagination_topNav)options.vm_quickly = this.$refs.tablePagination_topNav.getQuicklySearchDom()
       this.$emit("overallSearchFormClick", options)
     },
     // 关闭字段设置
diff --git a/PC/InterFace.Dash/src/layout/components/Navbar.vue b/PC/InterFace.Dash/src/layout/components/Navbar.vue
index 8545743..949158c 100644
--- a/PC/InterFace.Dash/src/layout/components/Navbar.vue
+++ b/PC/InterFace.Dash/src/layout/components/Navbar.vue
@@ -16,9 +16,9 @@
 
         <!-- <screenfull id="screenfull" class="right-menu-item hover-effect" /> -->
 
-        <!--  <el-tooltip content="Global Size" effect="dark" placement="bottom">
+         <el-tooltip content="Global Size" effect="dark" placement="bottom">
           <size-select id="size-select" class="right-menu-item hover-effect" />
-        </el-tooltip> -->
+        </el-tooltip>
       </template>
 
       <el-dropdown
diff --git a/PC/InterFace.Dash/src/store/modules/user.js b/PC/InterFace.Dash/src/store/modules/user.js
index 66d65a1..bfbd08b 100644
--- a/PC/InterFace.Dash/src/store/modules/user.js
+++ b/PC/InterFace.Dash/src/store/modules/user.js
@@ -30,9 +30,10 @@ const mutations = {
   // 设置权限（v-permission）
   SET_ROLES: (state, roles) => {
     let _roles = [
-      'IncomingData',
-      'IncomingData.filter',
+      'IncomingDataHistory.filter',
       'IncomingData.export',
+      'MesProductL7PartsNote.filter',
+      'MesProductL7PartsNote.export'
     ]
     state.roles = _roles
   },
diff --git a/PC/UI.WinIn.FasterZ.Job/src/components/currenButton/index.vue b/PC/UI.WinIn.FasterZ.Job/src/components/currenButton/index.vue
index 7ef7dd2..40e53c9 100644
--- a/PC/UI.WinIn.FasterZ.Job/src/components/currenButton/index.vue
+++ b/PC/UI.WinIn.FasterZ.Job/src/components/currenButton/index.vue
@@ -2,7 +2,7 @@
   <div class="tableNavBtnsContent">
     <div class="tableNavLeftBtns">
       <!-- 左侧按钮 -->
-      <innerButton :isRoutePermission="isRoutePermission" :Butttondata="buttonsLeft" @tableButtonClick="tableButtonClick"></innerButton>
+      <innerButton :Butttondata="buttonsLeft" @tableButtonClick="tableButtonClick"></innerButton>
     </div>
     <div class="tableNavRightBtns">
       <!-- 快速搜索 -->
@@ -14,7 +14,7 @@
         @searchNormalClear="quicklySearchClear"
       ></searchNormal>
       <!-- 右侧按钮 -->
-      <innerButton :isRoutePermission="isRoutePermission" :Butttondata="buttonsRight" @tableButtonClick="tableButtonClick"></innerButton>
+      <innerButton :Butttondata="buttonsRight" @tableButtonClick="tableButtonClick"></innerButton>
     </div>
     <slot></slot>
   </div>
@@ -30,11 +30,6 @@ export default {
     searchNormal
   },
   props: {
-    // 是否按路由配置按钮权限
-    isRoutePermission:{
-      type: Boolean,
-      default: false,
-    },
     Butttondata: {
       type: Array,
       default: () => {
diff --git a/PC/UI.WinIn.FasterZ.Job/src/components/currenButton/innerButton.vue b/PC/UI.WinIn.FasterZ.Job/src/components/currenButton/innerButton.vue
index 020a183..aed6679 100644
--- a/PC/UI.WinIn.FasterZ.Job/src/components/currenButton/innerButton.vue
+++ b/PC/UI.WinIn.FasterZ.Job/src/components/currenButton/innerButton.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="currenButton clearfix">
-      <el-button 
+      <el-button
           v-for="(item, index) in Butttondata" :key="index"
           v-show="typeof item.hide == 'function' ? !item.hide() : !item.hide"
           :type="item.type"
@@ -16,8 +16,8 @@
           }"
           :class="item.class"
           @click="tableButtonClick(item.name,item)"
-          v-permission="isRoutePermission ? [$route.name+'.'+item.name] : item.permission"
       >{{ item.label }}</el-button>
+      <!-- v-permission="item.permission" -->
     </div>
   </template>
   <script>
@@ -31,14 +31,8 @@
                   return []
               }
           },
-          // 是否按路由配置按钮权限
-          isRoutePermission:{
-              type: Boolean,
-              default: false,
-          },
       },
       mounted(){
-          console.log(36,this.$route,this.$store.getters)
           window.addEventListener('setItemEvent', (item) => {
               if (item.key.indexOf('tableColumns') > -1) {
                   this.initButtonType(item)
diff --git a/PC/UI.WinIn.FasterZ.Job/src/components/tablePagination/index.vue b/PC/UI.WinIn.FasterZ.Job/src/components/tablePagination/index.vue
index 3fb8e82..afc8d66 100644
--- a/PC/UI.WinIn.FasterZ.Job/src/components/tablePagination/index.vue
+++ b/PC/UI.WinIn.FasterZ.Job/src/components/tablePagination/index.vue
@@ -3,9 +3,9 @@
     <!-- 头部按钮 -->
     <div class="table-nav">
       <curren-Button
-        :isRoutePermission="isRoutePermission"
+        v-if="headerButttondata"
         ref="tablePagination_topNav"
-        :Butttondata="currenButtonData"
+        :Butttondata="headerButttondata"
         @tableButtonClick="topbutton"
         @quicklySearchClick="quicklySearchClick"
         @quicklySearchClear="quicklySearchClear"
@@ -93,6 +93,13 @@ export default {
     rowDrop
   },
   props: {
+    // 不使用权限的按钮
+    noUsePermissionBtn:{
+      type: Array,
+      default: () => {
+        return ['refresh','field']
+      }
+    },
     rowMaxHeight:{
       type:String,
       default:'calc(90vh - 280px)'
@@ -117,11 +124,6 @@ export default {
       type: Boolean,
       default: false,
     },
-    // 是否按路由配置按钮权限
-    isRoutePermission:{
-      type: Boolean,
-      default: false,
-    },
     // 显示搜索配置
     quicklySearchOption:{
       type: Object,
@@ -234,6 +236,7 @@ export default {
   },
   data () {
     return {
+      headerButttondata:null,
       // 字段设置是否显示
       rowDropVisible: false,
       // table 重新渲染所需key
@@ -282,6 +285,7 @@ export default {
     this.uTableTopHeight = this.appRemoveHeight
     this.uTableOuterHeight =  this.$refs.tablePaginationTableRef.getTableHeight()
     this.uTableOuterHeight_init = Number(JSON.stringify(this.uTableOuterHeight))
+    this.initButttondata()
     
     // 点击外部，字段设置弹窗隐藏
     document.addEventListener('click',(e)=>{
@@ -296,6 +300,22 @@ export default {
     })
   },
   methods: {
+    initButttondata(){
+      let _list = []
+      this.currenButtonData.forEach(item=>{
+        if(item.permission){
+          _list.push(item)
+        }else{
+          if(this.noUsePermissionBtn.indexOf(item.name) < 0){
+            item.permission =  [this.$route.name+'.'+item.name]
+          }else{
+            item.permission = []
+          }
+          _list.push(item)
+        }
+      })
+      this.headerButttondata = _list
+    },
     // 重新渲染表格
     doFreshTableLayout(){
       if(this.$refs.tablePaginationTableRef && this.$refs.tablePaginationTableRef.doFreshLayout){
@@ -410,7 +430,7 @@ export default {
     // 全面筛选组件所有按钮事件
     overallSearchFormClick(options){
       //增加快速搜索实体
-      options.vm_quickly = this.$refs.tablePagination_topNav.getQuicklySearchDom()
+      if(this.$refs.tablePagination_topNav)options.vm_quickly = this.$refs.tablePagination_topNav.getQuicklySearchDom()
       this.$emit("overallSearchFormClick", options)
     },
     // 关闭字段设置
diff --git a/PC/UI.WinIn.FasterZ.Job/src/store/modules/user.js b/PC/UI.WinIn.FasterZ.Job/src/store/modules/user.js
index 66d65a1..bfbd08b 100644
--- a/PC/UI.WinIn.FasterZ.Job/src/store/modules/user.js
+++ b/PC/UI.WinIn.FasterZ.Job/src/store/modules/user.js
@@ -30,9 +30,10 @@ const mutations = {
   // 设置权限（v-permission）
   SET_ROLES: (state, roles) => {
     let _roles = [
-      'IncomingData',
-      'IncomingData.filter',
+      'IncomingDataHistory.filter',
       'IncomingData.export',
+      'MesProductL7PartsNote.filter',
+      'MesProductL7PartsNote.export'
     ]
     state.roles = _roles
   },
diff --git a/PC/UI.WinIn.FasterZ.Store/src/components/currenButton/index.vue b/PC/UI.WinIn.FasterZ.Store/src/components/currenButton/index.vue
index 7ef7dd2..40e53c9 100644
--- a/PC/UI.WinIn.FasterZ.Store/src/components/currenButton/index.vue
+++ b/PC/UI.WinIn.FasterZ.Store/src/components/currenButton/index.vue
@@ -2,7 +2,7 @@
   <div class="tableNavBtnsContent">
     <div class="tableNavLeftBtns">
       <!-- 左侧按钮 -->
-      <innerButton :isRoutePermission="isRoutePermission" :Butttondata="buttonsLeft" @tableButtonClick="tableButtonClick"></innerButton>
+      <innerButton :Butttondata="buttonsLeft" @tableButtonClick="tableButtonClick"></innerButton>
     </div>
     <div class="tableNavRightBtns">
       <!-- 快速搜索 -->
@@ -14,7 +14,7 @@
         @searchNormalClear="quicklySearchClear"
       ></searchNormal>
       <!-- 右侧按钮 -->
-      <innerButton :isRoutePermission="isRoutePermission" :Butttondata="buttonsRight" @tableButtonClick="tableButtonClick"></innerButton>
+      <innerButton :Butttondata="buttonsRight" @tableButtonClick="tableButtonClick"></innerButton>
     </div>
     <slot></slot>
   </div>
@@ -30,11 +30,6 @@ export default {
     searchNormal
   },
   props: {
-    // 是否按路由配置按钮权限
-    isRoutePermission:{
-      type: Boolean,
-      default: false,
-    },
     Butttondata: {
       type: Array,
       default: () => {
diff --git a/PC/UI.WinIn.FasterZ.Store/src/components/currenButton/innerButton.vue b/PC/UI.WinIn.FasterZ.Store/src/components/currenButton/innerButton.vue
index 020a183..aed6679 100644
--- a/PC/UI.WinIn.FasterZ.Store/src/components/currenButton/innerButton.vue
+++ b/PC/UI.WinIn.FasterZ.Store/src/components/currenButton/innerButton.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="currenButton clearfix">
-      <el-button 
+      <el-button
           v-for="(item, index) in Butttondata" :key="index"
           v-show="typeof item.hide == 'function' ? !item.hide() : !item.hide"
           :type="item.type"
@@ -16,8 +16,8 @@
           }"
           :class="item.class"
           @click="tableButtonClick(item.name,item)"
-          v-permission="isRoutePermission ? [$route.name+'.'+item.name] : item.permission"
       >{{ item.label }}</el-button>
+      <!-- v-permission="item.permission" -->
     </div>
   </template>
   <script>
@@ -31,14 +31,8 @@
                   return []
               }
           },
-          // 是否按路由配置按钮权限
-          isRoutePermission:{
-              type: Boolean,
-              default: false,
-          },
       },
       mounted(){
-          console.log(36,this.$route,this.$store.getters)
           window.addEventListener('setItemEvent', (item) => {
               if (item.key.indexOf('tableColumns') > -1) {
                   this.initButtonType(item)
diff --git a/PC/UI.WinIn.FasterZ.Store/src/components/tablePagination/index.vue b/PC/UI.WinIn.FasterZ.Store/src/components/tablePagination/index.vue
index 3fb8e82..afc8d66 100644
--- a/PC/UI.WinIn.FasterZ.Store/src/components/tablePagination/index.vue
+++ b/PC/UI.WinIn.FasterZ.Store/src/components/tablePagination/index.vue
@@ -3,9 +3,9 @@
     <!-- 头部按钮 -->
     <div class="table-nav">
       <curren-Button
-        :isRoutePermission="isRoutePermission"
+        v-if="headerButttondata"
         ref="tablePagination_topNav"
-        :Butttondata="currenButtonData"
+        :Butttondata="headerButttondata"
         @tableButtonClick="topbutton"
         @quicklySearchClick="quicklySearchClick"
         @quicklySearchClear="quicklySearchClear"
@@ -93,6 +93,13 @@ export default {
     rowDrop
   },
   props: {
+    // 不使用权限的按钮
+    noUsePermissionBtn:{
+      type: Array,
+      default: () => {
+        return ['refresh','field']
+      }
+    },
     rowMaxHeight:{
       type:String,
       default:'calc(90vh - 280px)'
@@ -117,11 +124,6 @@ export default {
       type: Boolean,
       default: false,
     },
-    // 是否按路由配置按钮权限
-    isRoutePermission:{
-      type: Boolean,
-      default: false,
-    },
     // 显示搜索配置
     quicklySearchOption:{
       type: Object,
@@ -234,6 +236,7 @@ export default {
   },
   data () {
     return {
+      headerButttondata:null,
       // 字段设置是否显示
       rowDropVisible: false,
       // table 重新渲染所需key
@@ -282,6 +285,7 @@ export default {
     this.uTableTopHeight = this.appRemoveHeight
     this.uTableOuterHeight =  this.$refs.tablePaginationTableRef.getTableHeight()
     this.uTableOuterHeight_init = Number(JSON.stringify(this.uTableOuterHeight))
+    this.initButttondata()
     
     // 点击外部，字段设置弹窗隐藏
     document.addEventListener('click',(e)=>{
@@ -296,6 +300,22 @@ export default {
     })
   },
   methods: {
+    initButttondata(){
+      let _list = []
+      this.currenButtonData.forEach(item=>{
+        if(item.permission){
+          _list.push(item)
+        }else{
+          if(this.noUsePermissionBtn.indexOf(item.name) < 0){
+            item.permission =  [this.$route.name+'.'+item.name]
+          }else{
+            item.permission = []
+          }
+          _list.push(item)
+        }
+      })
+      this.headerButttondata = _list
+    },
     // 重新渲染表格
     doFreshTableLayout(){
       if(this.$refs.tablePaginationTableRef && this.$refs.tablePaginationTableRef.doFreshLayout){
@@ -410,7 +430,7 @@ export default {
     // 全面筛选组件所有按钮事件
     overallSearchFormClick(options){
       //增加快速搜索实体
-      options.vm_quickly = this.$refs.tablePagination_topNav.getQuicklySearchDom()
+      if(this.$refs.tablePagination_topNav)options.vm_quickly = this.$refs.tablePagination_topNav.getQuicklySearchDom()
       this.$emit("overallSearchFormClick", options)
     },
     // 关闭字段设置
diff --git a/PC/UI.WinIn.FasterZ.Store/src/store/modules/user.js b/PC/UI.WinIn.FasterZ.Store/src/store/modules/user.js
index 66d65a1..bfbd08b 100644
--- a/PC/UI.WinIn.FasterZ.Store/src/store/modules/user.js
+++ b/PC/UI.WinIn.FasterZ.Store/src/store/modules/user.js
@@ -30,9 +30,10 @@ const mutations = {
   // 设置权限（v-permission）
   SET_ROLES: (state, roles) => {
     let _roles = [
-      'IncomingData',
-      'IncomingData.filter',
+      'IncomingDataHistory.filter',
       'IncomingData.export',
+      'MesProductL7PartsNote.filter',
+      'MesProductL7PartsNote.export'
     ]
     state.roles = _roles
   },