xiaodai2022 2 years ago
parent
commit
29f340a60f
100 changed files with 1209 additions and 1965 deletions
  1. 11 14
      scripts/page/indexPage.js
  2. 26 21
      src/apis/user/index.js
  3. 6 11
      src/components/globalComponents/class-tree/main.vue
  4. 8 13
      src/components/globalComponents/goodsClass-tree/main.vue
  5. 8 13
      src/components/globalComponents/organize-tree/main.vue
  6. 15 46
      src/components/globalComponents/shy-tree/main.vue
  7. 6 11
      src/components/globalComponents/staff-tree/main.vue
  8. 21 48
      src/components/globalComponents/tree-table/tree-row.vue
  9. 1 0
      src/store/getters.js
  10. 249 275
      src/store/modules/user.js
  11. 47 37
      src/utils/auth.js
  12. 16 26
      src/views/bigScreen/bigScreenNew/index.vue
  13. 7 15
      src/views/bigScreen/bigScreenOld/datavScr/index.vue
  14. 18 47
      src/views/dataCorrection/cgMessage/index.vue
  15. 12 32
      src/views/dataCorrection/cgMessageList/index.vue
  16. 1 1
      src/views/good-share/components/changeBackGood.vue
  17. 8 11
      src/views/goodStore/active/components/baseForm.vue
  18. 16 16
      src/views/goodStore/active/detail.vue
  19. 6 9
      src/views/goodStore/active/index.vue
  20. 5 8
      src/views/goodStore/activeGood/index.vue
  21. 10 13
      src/views/goodStore/brand/index.vue
  22. 6 9
      src/views/goodStore/dealGoodsPool/index.vue
  23. 9 12
      src/views/goodStore/goldPrice/components/priceList.vue
  24. 4 7
      src/views/goodStore/goldPrice/index.vue
  25. 4 7
      src/views/goodStore/goodsCost/components/baseForm.vue
  26. 17 17
      src/views/goodStore/goodsCost/detail.vue
  27. 25 21
      src/views/goodStore/goodsCost/index.vue
  28. 4 7
      src/views/goodStore/goodsOffline/detail.vue
  29. 5 8
      src/views/goodStore/goodsOffline/index.vue
  30. 4 7
      src/views/goodStore/goodsOnline/add.vue
  31. 14 22
      src/views/goodStore/goodsOnline/detail.vue
  32. 10 13
      src/views/goodStore/goodsOnline/index.vue
  33. 5 8
      src/views/goodStore/searchSort/index.vue
  34. 12 15
      src/views/goodStore/sort/index.vue
  35. 10 13
      src/views/goodStore/specs/index.vue
  36. 11 14
      src/views/goodStore/unit/index.vue
  37. 10 13
      src/views/interest/account/index.vue
  38. 12 15
      src/views/interest/action/index.vue
  39. 10 13
      src/views/interest/dataShare/index.vue
  40. 9 12
      src/views/interest/group/index.vue
  41. 4 7
      src/views/interest/handover/addDetail.vue
  42. 7 10
      src/views/interest/handover/components/addEditForm.vue
  43. 16 22
      src/views/interest/handover/detail.vue
  44. 31 45
      src/views/interest/handover/index.vue
  45. 6 9
      src/views/interest/organize/index.vue
  46. 90 248
      src/views/interest/processPermission/index.vue
  47. 10 13
      src/views/interest/role/index.vue
  48. 19 22
      src/views/orderEntry/orderConfirm/index.vue
  49. 22 73
      src/views/orderEntry/orderEnter/index.vue
  50. 4 7
      src/views/orderEntry/source/index.vue
  51. 7 10
      src/views/process/done/index.vue
  52. 7 10
      src/views/process/oing/index.vue
  53. 6 9
      src/views/process/read/index.vue
  54. 5 8
      src/views/process/unRead/index.vue
  55. 4 7
      src/views/purchaseIn/purchaseDiffOrder/detail.vue
  56. 5 8
      src/views/purchaseIn/purchaseDiffOrder/index.vue
  57. 3 6
      src/views/purchaseIn/purchaseOrder/components/editPrice.vue
  58. 6 9
      src/views/purchaseIn/purchaseOrder/components/order-in-table.vue
  59. 7 10
      src/views/purchaseIn/purchaseOrder/detail.vue
  60. 16 36
      src/views/purchaseIn/purchaseOrder/index.vue
  61. 3 6
      src/views/purchaseIn/purchaseReturn/components/purchase-order-addEdit.vue
  62. 4 7
      src/views/purchaseIn/purchaseReturn/detail.vue
  63. 8 11
      src/views/purchaseIn/purchaseReturn/index.vue
  64. 4 7
      src/views/purchaseIn/recovery/index.vue
  65. 3 6
      src/views/purchaseIn/workbench/components/baseForm.vue
  66. 5 8
      src/views/purchaseIn/workbench/detail.vue
  67. 6 17
      src/views/purchaseIn/workbench/index.vue
  68. 4 7
      src/views/purchaseIn/wsmInOrder/components/wsm-in-order-check-form.vue
  69. 6 9
      src/views/purchaseIn/wsmInOrder/components/wsm-in-order-record-form.vue
  70. 6 9
      src/views/purchaseIn/wsmInOrder/components/wsm-in-order-return-form.vue
  71. 6 9
      src/views/purchaseIn/wsmInOrder/detail.vue
  72. 6 9
      src/views/purchaseIn/wsmInOrder/index.vue
  73. 3 6
      src/views/reportQuery/financeReport/history-data.vue
  74. 4 7
      src/views/reportQuery/financeReport/index.vue
  75. 3 6
      src/views/reportQuery/financeReport/pre-export.vue
  76. 3 6
      src/views/reportQuery/financeReport/real-time-export-new.vue
  77. 3 6
      src/views/reportQuery/financeReport/real-time-export.vue
  78. 5 9
      src/views/reportQuery/productReport/index.vue
  79. 4 7
      src/views/reportQuery/purchaseReport/index.vue
  80. 4 7
      src/views/reportQuery/saleReport/index.vue
  81. 3 6
      src/views/reportQuery/saleReportOrder/history-data.vue
  82. 4 7
      src/views/reportQuery/saleReportOrder/index.vue
  83. 3 6
      src/views/reportQuery/saleReportOrder/pre-export.vue
  84. 3 6
      src/views/reportQuery/saleReportOrder/real-time-export-new.vue
  85. 3 6
      src/views/reportQuery/saleReportOrder/real-time-export.vue
  86. 3 6
      src/views/reportQuery/stockReport/history-data.vue
  87. 4 7
      src/views/reportQuery/stockReport/index.vue
  88. 3 6
      src/views/reportQuery/stockReport/pre-export.vue
  89. 3 6
      src/views/reportQuery/stockReport/real-time-export-new.vue
  90. 3 6
      src/views/reportQuery/stockReport/real-time-export.vue
  91. 12 15
      src/views/sellOut/bargainList/detail.vue
  92. 5 8
      src/views/sellOut/bargainList/index.vue
  93. 33 57
      src/views/sellOut/project/components/backGoodShow.vue
  94. 10 29
      src/views/sellOut/project/components/grossForm.vue
  95. 15 15
      src/views/sellOut/project/components/setPlan.vue
  96. 11 22
      src/views/sellOut/project/detail.vue
  97. 6 9
      src/views/sellOut/project/index.vue
  98. 16 19
      src/views/sellOut/returnOrder/components/auditForm.vue
  99. 16 65
      src/views/sellOut/returnOrder/components/return-record.vue
  100. 10 36
      src/views/sellOut/returnOrder/components/returnCheck.vue

+ 11 - 14
scripts/page/indexPage.js

@@ -2,7 +2,7 @@ module.exports = function (inputName, compoenntName) {
   return `<template>
     <div class="${compoenntName} pagePadding">
     <div
-    v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
+    v-if="powers.some((i)=> i == '001')"
   >
     <ex-table
       v-loading="loading"
@@ -109,14 +109,14 @@ module.exports = function (inputName, compoenntName) {
           :size="tablebtnSize"
           :type="scope.row.status == '0' ? 'warning' : ''"
           v-text="
-            (statusOptions.find((item) => item.id == scope.row.status) || {})
+            (statusOptions.find((i)=> i.id == scope.row.status) || {})
               .label || '--'
           "
         ></el-tag>
       </template>
       <template #operation="{ scope }">
         <el-tooltip
-          v-if="powers.some((item) => item == '002')"
+          v-if="powers.some((i)=> i == '002')"
            
           effect="dark"
           content="重置密码"
@@ -129,7 +129,7 @@ module.exports = function (inputName, compoenntName) {
         </el-tooltip>
 
         <el-tooltip
-          v-if="powers.some((item) => item == '007')"
+          v-if="powers.some((i)=> i == '007')"
            
           effect="dark"
           content="详情"
@@ -141,7 +141,7 @@ module.exports = function (inputName, compoenntName) {
           ></i>
         </el-tooltip>
         <el-tooltip
-          v-if="powers.some((item) => item == '005')"
+          v-if="powers.some((i)=> i == '005')"
            
           effect="dark"
           content="修改"
@@ -154,7 +154,7 @@ module.exports = function (inputName, compoenntName) {
         </el-tooltip>
         <el-tooltip
           v-if="
-            powers.some((item) => item == '004') && scope.row.status === '1'
+            powers.some((i)=> i == '004') && scope.row.status === '1'
           "
            
           effect="dark"
@@ -168,7 +168,7 @@ module.exports = function (inputName, compoenntName) {
         </el-tooltip>
         <el-tooltip
           v-if="
-            powers.some((item) => item == '004') && scope.row.status === '0'
+            powers.some((i)=> i == '004') && scope.row.status === '0'
           "
            
           effect="dark"
@@ -213,15 +213,12 @@ module.exports = function (inputName, compoenntName) {
     computed: {
       ...mapGetters(["tablebtnSize", "searchSize", "size"]),
       powers() {
-        let tran =
+        const tran =
           this.$store.getters.btnList.find(
-            (item) => item.menu_route == "${compoenntName}"
+            (i)=> i.menu_route == "${compoenntName}"
           ) || {};
-        if (tran && tran.action && tran.action.length > 0) {
-          return tran.action;
-        } else {
-          return [];
-        }
+        const { action } = tran ?? {};
+        return action ?? [];
       },
     },
     data() {

+ 26 - 21
src/apis/user/index.js

@@ -1,45 +1,50 @@
-import http from '@/apis/user/axios'
-import urlConfig from '@/apis/url-config'
+import http from "@/apis/user/axios";
+import urlConfig from "@/apis/url-config";
 // 登录
 export function login(data) {
   return http({
     url: `${urlConfig.userURL}Api/login`,
-    method: 'post',
-    data
-  })
+    method: "post",
+    data,
+  });
 }
 // 获取个人信息
 export function userinfo(data) {
   return http({
     url: `${urlConfig.baseURL}admin/userinfo`,
-    method: 'post',
-    data
-  })
+    method: "post",
+    data,
+  });
 }
 // 获取用户权限导航列表
 export function menuList(data) {
   return http({
     url: `${urlConfig.baseURL}admin/menu`,
-    method: 'post',
-    data
-  })
+    method: "post",
+    data,
+  });
 }
 // 钉钉获取用户信息
 export function dingdingdetail(data) {
   return http({
     url: `${urlConfig.userURL}Api/dintalk`,
-    method: 'post',
-    data
-  })
+    method: "post",
+    data,
+  });
 }
 // 获取账号业务设置
 export function usergetinfo(data) {
   return http({
-    url:  `${urlConfig.baseURL}admin/usergetinfo`,
-    method: 'post',
-    data
-  })
+    url: `${urlConfig.baseURL}admin/usergetinfo`,
+    method: "post",
+    data,
+  });
+}
+// 获取角色流程节点详情
+export function roleProcessInfo(data) {
+  return http({
+    url: `${urlConfig.baseURL}admin/role_process_detail`,
+    method: "post",
+    data,
+  });
 }
-
-
-

+ 6 - 11
src/components/globalComponents/class-tree/main.vue

@@ -6,7 +6,7 @@
         <span class="staff-name">{{ item.nickname }}</span>
         <span class="btn-list" @click="(e) => e.stopPropagation()">
           <el-button
-            v-if="powers.some((item) => item == '005')"
+            v-if="powers.some((i) => i == '005')"
             :type="item.position === '1' ? 'primary' : 'info'"
             size="mini"
             @click="setUpEdit($event, item.id, item.position)"
@@ -25,15 +25,10 @@ export default {
   props: ["list", "level"],
   computed: {
     powers() {
-      let tran =
-        this.$store.getters.btnList.find(
-          (item) => item.menu_route == "goodsTree"
-        ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const tran =
+        this.$store.getters.btnList.find((i) => i.menu_route == "goodsTree") || {};
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {
@@ -49,7 +44,7 @@ export default {
   },
 };
 </script>
-<style lang="scss" >
+<style lang="scss">
 .staff-tree {
   margin-left: 18px;
   cursor: pointer;

+ 8 - 13
src/components/globalComponents/goodsClass-tree/main.vue

@@ -14,7 +14,7 @@
           <i class="el-icon-arrow-right"></i>
           <span class="btn-list" @click="(e) => e.stopPropagation()">
             <el-button
-              v-if="powers.some((item) => item == '005')"
+              v-if="powers.some((i) => i == '005')"
               type="warning"
               size="mini"
               @click="
@@ -33,7 +33,7 @@
             </el-button>
 
             <el-button
-              v-if="powers.some((item) => item == '004')"
+              v-if="powers.some((i) => i == '004')"
               :type="item.status === '1' ? 'primary' : 'info'"
               size="mini"
               @click="
@@ -50,7 +50,7 @@
             </el-button>
 
             <!-- <el-button
-              v-if="powers.some((item) => item == '006')"
+              v-if="powers.some((i)=> i == '006')"
               type="danger"
               size="mini"
               @click="
@@ -95,15 +95,10 @@ export default {
   props: ["list", "level", "page"],
   computed: {
     powers() {
-      let tran =
-        this.$store.getters.btnList.find(
-          (item) => item.menu_route == "goodsClass"
-        ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const tran =
+        this.$store.getters.btnList.find((i) => i.menu_route == "goodsClass") || {};
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {
@@ -136,7 +131,7 @@ export default {
   },
 };
 </script>
-<style lang="scss" >
+<style lang="scss">
 .organize-tree {
   margin-left: 18px;
   cursor: pointer;

+ 8 - 13
src/components/globalComponents/organize-tree/main.vue

@@ -14,7 +14,7 @@
           <i class="el-icon-arrow-right"></i>
           <span class="btn-list" @click="(e) => e.stopPropagation()">
             <el-button
-              v-if="powers.some((item) => item == '005')"
+              v-if="powers.some((i) => i == '005')"
               type="warning"
               size="mini"
               @click="
@@ -33,7 +33,7 @@
             </el-button>
 
             <el-button
-              v-if="powers.some((item) => item == '004')"
+              v-if="powers.some((i) => i == '004')"
               :type="item.status === '1' ? 'primary' : 'info'"
               size="mini"
               @click="
@@ -50,7 +50,7 @@
             </el-button>
 
             <el-button
-              v-if="powers.some((item) => item == '006')"
+              v-if="powers.some((i) => i == '006')"
               type="danger"
               size="mini"
               @click="
@@ -77,15 +77,10 @@ export default {
   props: ["list", "level"],
   computed: {
     powers() {
-      let tran =
-        this.$store.getters.btnList.find(
-          (item) => item.menu_route == "organize"
-        ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const tran =
+        this.$store.getters.btnList.find((i) => i.menu_route == "organize") || {};
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {
@@ -114,7 +109,7 @@ export default {
   },
 };
 </script>
-<style lang="scss" >
+<style lang="scss">
 .organize-tree {
   margin-left: 18px;
   cursor: pointer;

+ 15 - 46
src/components/globalComponents/shy-tree/main.vue

@@ -8,12 +8,7 @@
           :class="iconFont[index].down"
           style="font-size: 18px; margin-right: 10px"
           @click="
-            openChildren(
-              item.id,
-              item.pid,
-              level,
-              item.child && item.child.length > 0
-            )
+            openChildren(item.id, item.pid, level, item.child && item.child.length > 0)
           "
         />
         <i
@@ -22,12 +17,7 @@
           :class="iconFont[index].up"
           style="font-size: 18px; margin-right: 10px"
           @click="
-            openChildren(
-              item.id,
-              item.pid,
-              level,
-              item.child && item.child.length > 0
-            )
+            openChildren(item.id, item.pid, level, item.child && item.child.length > 0)
           "
         />
         <i
@@ -35,30 +25,20 @@
           v-show="level < 3"
           :class="item.menu_img"
           @click="
-            openChildren(
-              item.id,
-              item.pid,
-              level,
-              item.child && item.child.length > 0
-            )
+            openChildren(item.id, item.pid, level, item.child && item.child.length > 0)
           "
         />
         <span
           class="label"
           @click="
-            openChildren(
-              item.id,
-              item.pid,
-              level,
-              item.child && item.child.length > 0
-            )
+            openChildren(item.id, item.pid, level, item.child && item.child.length > 0)
           "
         >
           {{ item.menu_name || item.action_name }}
         </span>
         <span class="btn-list">
           <el-button
-            v-if="level < 3 && powers.some((item) => item == '003')"
+            v-if="level < 3 && powers.some((i) => i == '003')"
             type="success"
             size="mini"
             @click="addEdit('0', item.id, level + 1, false, true, {})"
@@ -66,7 +46,7 @@
             添加
           </el-button>
           <el-button
-            v-if="powers.some((item) => item == '005')"
+            v-if="powers.some((i) => i == '005')"
             type="warning"
             size="mini"
             @click="
@@ -83,22 +63,17 @@
             修改
           </el-button>
           <el-button
-            v-if="powers.some((item) => item == '004')"
+            v-if="powers.some((i) => i == '004')"
             :type="item.status === '1' ? 'primary' : 'info'"
             size="mini"
             @click="
-              remove(
-                item.id,
-                level === 3 ? item.menuid : item.pid,
-                level,
-                item.status
-              )
+              remove(item.id, level === 3 ? item.menuid : item.pid, level, item.status)
             "
           >
             {{ item.status === "1" ? "禁用" : "启用" }}
           </el-button>
           <el-button
-            v-if="powers.some((item) => item == '006')"
+            v-if="powers.some((i) => i == '006')"
             type="danger"
             size="mini"
             @click="
@@ -120,7 +95,7 @@
           @addEdit="addEdit"
           @openChildren="openChildren"
           @remove="remove"
-           @deleteMenu="deleteMenu"
+          @deleteMenu="deleteMenu"
         />
       </div>
     </div>
@@ -137,15 +112,10 @@ export default {
   props: ["value", "level"],
   computed: {
     powers() {
-      let tran =
-        this.$store.getters.btnList.find(
-          (item) => item.menu_route == "menuOperator"
-        ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const tran =
+        this.$store.getters.btnList.find((i) => i.menu_route == "menuOperator") || {};
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {
@@ -188,7 +158,6 @@ export default {
     },
     deleteMenu(id, pid, level, status) {
       this.$emit("deleteMenu", id, pid, level, status);
-     
     },
   },
 };
@@ -203,7 +172,7 @@ export default {
     text-align: center;
     line-height: 50px;
     color: #666;
-    margin:20px 0 0 0;
+    margin: 20px 0 0 0;
     border: 1px solid #ccc;
     border-radius: 6px;
   }

+ 6 - 11
src/components/globalComponents/staff-tree/main.vue

@@ -6,7 +6,7 @@
         <span class="staff-name">{{ item.nickname }}</span>
         <span class="btn-list" @click="(e) => e.stopPropagation()">
           <el-button
-            v-if="powers.some((item) => item == '005')"
+            v-if="powers.some((i) => i == '005')"
             :type="item.position === '1' ? 'primary' : 'info'"
             size="mini"
             @click="setUpEdit($event, item.id, item.position)"
@@ -25,15 +25,10 @@ export default {
   props: ["list", "level"],
   computed: {
     powers() {
-      let tran =
-        this.$store.getters.btnList.find(
-          (item) => item.menu_route == "organize"
-        ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const tran =
+        this.$store.getters.btnList.find((i) => i.menu_route == "organize") || {};
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {
@@ -49,7 +44,7 @@ export default {
   },
 };
 </script>
-<style lang="scss" >
+<style lang="scss">
 .staff-tree {
   margin-left: 18px;
   cursor: pointer;

+ 21 - 48
src/components/globalComponents/tree-table/tree-row.vue

@@ -14,8 +14,7 @@
                 v-if="node.ex_status === '0'"
                 :class="{
                   'hover-tag':
-                    node.status === '0' &&
-                    powers.some((itemsome) => itemsome == '010'),
+                    node.status === '0' && powers.some((itemsome) => itemsome == '010'),
                 }"
                 :type="'warning'"
                 @click="
@@ -23,16 +22,14 @@
                     node.id,
                     false,
                     true,
-                    node.status === '0' &&
-                      powers.some((itemsome) => itemsome == '010')
+                    node.status === '0' && powers.some((itemsome) => itemsome == '010')
                   )
                 "
               >
                 <i
                   class="el-icon-thumb"
                   v-if="
-                    node.status === '0' &&
-                    powers.some((itemsome) => itemsome == '010')
+                    node.status === '0' && powers.some((itemsome) => itemsome == '010')
                   "
                   style="margin-right: 1px"
                 ></i>
@@ -50,23 +47,20 @@
                 v-else-if="node.ex_status === '2'"
                 :class="{
                   'hover-tag':
-                    node.status === '0' &&
-                    powers.some((itemsome) => itemsome == '009'),
+                    node.status === '0' && powers.some((itemsome) => itemsome == '009'),
                 }"
                 :type="'danger'"
                 @click="
                   again(
                     node.id,
-                    node.status === '0' &&
-                      powers.some((itemsome) => itemsome == '009')
+                    node.status === '0' && powers.some((itemsome) => itemsome == '009')
                   )
                 "
               >
                 <i
                   class="el-icon-thumb"
                   v-if="
-                    node.status === '0' &&
-                    powers.some((itemsome) => itemsome == '009')
+                    node.status === '0' && powers.some((itemsome) => itemsome == '009')
                   "
                   style="margin-right: 1px"
                 ></i>
@@ -77,23 +71,20 @@
                 v-else-if="node.ex_status === '3'"
                 :class="{
                   'hover-tag':
-                    node.status === '0' &&
-                    powers.some((itemsome) => itemsome == '009'),
+                    node.status === '0' && powers.some((itemsome) => itemsome == '009'),
                 }"
                 :type="'info'"
                 @click="
                   again(
                     node.id,
-                    node.status === '0' &&
-                      powers.some((itemsome) => itemsome == '009')
+                    node.status === '0' && powers.some((itemsome) => itemsome == '009')
                   )
                 "
               >
                 <i
                   class="el-icon-thumb"
                   v-if="
-                    node.status === '0' &&
-                    powers.some((itemsome) => itemsome == '009')
+                    node.status === '0' && powers.some((itemsome) => itemsome == '009')
                   "
                   style="margin-right: 1px"
                 ></i>
@@ -105,7 +96,7 @@
                 <el-tag
                   v-if="node[item.prop] === '1'"
                   type="success"
-                  :class="{ 'hover-tag': powers.some((item) => item == '004') }"
+                  :class="{ 'hover-tag': powers.some((i) => i == '004') }"
                   :size="tablebtnSize"
                   @click="
                     statusConfirm(
@@ -125,7 +116,7 @@
                 >
                 <el-tag
                   v-else
-                  :class="{ 'hover-tag': powers.some((item) => item == '004') }"
+                  :class="{ 'hover-tag': powers.some((i) => i == '004') }"
                   :size="tablebtnSize"
                   type="warning"
                   @click="
@@ -177,10 +168,7 @@
                 </el-link>
 
                 <el-link
-                  v-if="
-                    node.rateEdit &&
-                    powers.some((itemsome) => itemsome == '017')
-                  "
+                  v-if="node.rateEdit && powers.some((itemsome) => itemsome == '017')"
                   class="mini-link"
                   type="primary"
                   :underline="false"
@@ -193,9 +181,7 @@
             </div>
             <div
               class="item-div item-input"
-              v-else-if="
-                node.rateEdit === true && item.prop == 'in_rate' && item.show
-              "
+              v-else-if="node.rateEdit === true && item.prop == 'in_rate' && item.show"
             >
               <el-input-number
                 style="width: 100%"
@@ -211,9 +197,7 @@
             </div>
             <div
               class="item-div item-input"
-              v-else-if="
-                node.rateEdit === true && item.prop == 'low_rate' && item.show
-              "
+              v-else-if="node.rateEdit === true && item.prop == 'low_rate' && item.show"
             >
               <el-input-number
                 style="width: 100%"
@@ -229,9 +213,7 @@
             </div>
             <div
               class="item-div item-input"
-              v-else-if="
-                node.rateEdit === true && item.prop == 'out_rate' && item.show
-              "
+              v-else-if="node.rateEdit === true && item.prop == 'out_rate' && item.show"
             >
               <el-input-number
                 style="width: 100%"
@@ -247,9 +229,7 @@
             </div>
             <div
               class="item-div item-input"
-              v-else-if="
-                node.rateEdit === true && item.prop == 'rate' && item.show
-              "
+              v-else-if="node.rateEdit === true && item.prop == 'rate' && item.show"
             >
               <el-input-number
                 style="width: 100%"
@@ -279,9 +259,7 @@
                     'el-icon-arrow-right': !node['open'],
                     'el-icon-arrow-down': node['open'],
                   }"
-                  v-if="
-                    cindex === 0 && node.children && node.children.length > 0
-                  "
+                  v-if="cindex === 0 && node.children && node.children.length > 0"
                 ></i>
                 {{ node[item.prop] }}</span
               >
@@ -313,14 +291,9 @@ export default {
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
-      let tran =
-        this.$store.getters.btnList.find((item) => item.menu_route == "sort") ||
-        {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const tran = this.$store.getters.btnList.find((i) => i.menu_route == "sort") || {};
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   props: {
@@ -484,4 +457,4 @@ export default {
     //  display: flex;
   }
 }
-</style>
+</style>

+ 1 - 0
src/store/getters.js

@@ -18,5 +18,6 @@ const getters = {
   business_company: state => state.user.business_company,
   business_companyNo: state => state.user.business_companyNo,
   private_field: state => state.user.private_field,
+  roleProcess: state => state.user.roleProcess,
 }
 export default getters

+ 249 - 275
src/store/modules/user.js

@@ -1,4 +1,12 @@
-import { login, logout, userinfo, menuList, dingdingdetail, usergetinfo } from '@/apis/user'
+import {
+  login,
+  logout,
+  userinfo,
+  menuList,
+  dingdingdetail,
+  usergetinfo,
+  roleProcessInfo,
+} from "@/apis/user";
 import {
   getToken,
   setToken,
@@ -18,41 +26,44 @@ import {
   get_private_field,
   set_private_field,
   remove_private_field,
-} from '@/utils/auth'
-
+  get_action_data,
+  set_action_data,
+  remove_action_data,
+} from "@/utils/auth";
 const state = {
   token: getToken(),
-  name: '',
-  avatar: require('@/assets/img/avatar.gif'),
-  introduction: '',
-  roles: ['admin'],
+  name: "",
+  avatar: require("@/assets/img/avatar.gif"),
+  introduction: "",
+  roles: ["admin"],
   btnList: getBtn(),
   navList: getMenu(),
   business_company: get_business_company() || "",
   business_companyNo: get_business_companyNo() || "",
   private_field: get_private_field() || [],
-}
+  roleProcess: get_action_data() || [],
+};
 const mutations = {
   SET_TOKEN: (state, token) => {
-    state.token = token
+    state.token = token;
   },
   SET_MENU: (state, menu) => {
-    state.menu = menu
+    state.menu = menu;
   },
   SET_HAS: (state, has) => {
-    state.has = has
+    state.has = has;
   },
   SET_INTRODUCTION: (state, introduction) => {
-    state.introduction = introduction
+    state.introduction = introduction;
   },
   SET_NAME: (state, name) => {
-    state.name = name
+    state.name = name;
   },
   SET_AVATAR: (state, avatar) => {
-    state.avatar = avatar
+    state.avatar = avatar;
   },
   SET_ROLES: (state, roles) => {
-    state.roles = roles
+    state.roles = roles;
   },
   // mainListFn(state, val) {
   //   if (!val) {
@@ -66,81 +77,91 @@ const mutations = {
       val = [];
     }
     state.navList = val;
-    setMenu(val)
+    setMenu(val);
   },
   btnListFn(state, val) {
     if (!val) {
       val = [];
     }
-    state.btnList = val
-    setBtn(val)
+    state.btnList = val;
+    setBtn(val);
   },
   business_company(state, val) {
-    state.business_company = val
-    set_business_company(val)
+    state.business_company = val;
+    set_business_company(val);
   },
   business_companyNo(state, val) {
-    state.business_companyNo = val
-    set_business_companyNo(val)
+    state.business_companyNo = val;
+    set_business_companyNo(val);
+  },
+  roleProcess(state, val) {
+    state.roleProcess = val;
+    set_action_data(val);
   },
   private_field(state, val) {
-    state.private_field = val
-    set_private_field(val)
+    state.private_field = val;
+    set_private_field(val);
   },
-}
+};
 
 const actions = {
   // user login
   login({ commit }, userInfo) {
-    const { username, password } = userInfo
+    const { username, password } = userInfo;
     return new Promise((resolve, reject) => {
       login({ username: username.trim(), password: password })
-        .then(response => {
-          const { data } = response
+        .then((response) => {
+          const { data } = response;
           if (response.code === 0) {
-            commit('SET_TOKEN', data.token)
-            setToken(data.token)
+            commit("SET_TOKEN", data.token);
+            setToken(data.token);
           }
-          resolve(response)
+          resolve(response);
         })
-        .catch(error => {
-          reject(error)
-        })
-    })
+        .catch((error) => {
+          reject(error);
+        });
+    });
   },
 
   dingUserInfor({ commit }, code) {
     return new Promise(async (resolve, reject) => {
       dingdingdetail(code)
-        .then(response => {
-          const { data } = response
+        .then((response) => {
+          const { data } = response;
           if (response.code === 0) {
-            commit('SET_TOKEN', data.token)
-            setToken(data.token)
-            resolve("success")
+            commit("SET_TOKEN", data.token);
+            setToken(data.token);
+            resolve("success");
           } else {
-            resolve("error")
+            resolve("error");
           }
         })
-        .catch(error => {
-          reject(error)
-        })
-    })
+        .catch((error) => {
+          reject(error);
+        });
+    });
   },
   async getMenuList({ commit, that }) {
     return new Promise(async (resolve, reject) => {
       if (!getToken()) {
-        resolve("noToken")
+        resolve("noToken");
       } else {
-        let userRes = await usergetinfo({})
-        if (userRes.code === 0) {
-          const { business, private_field } = userRes.data
-          let business_company = "", business_companyNo = "";
+        const { ucode, udata, umsg } = await getUserInfo();
+
+        if (ucode >= 100 && ucode <= 104) {
+          resolve("noToken");
+        } else if (ucode !== 0) {
+          resolve({ code: ucodd, data: udata, massage: umsg });
+        } else {
+          const { business, private_field, roleid } = udata;
+          let business_company = "",
+            business_companyNo = "";
           if (business && business.length > 0) {
-            business.forEach(e => {
-              if (e.is_main === '1') {
-                business_company = e.company
-                business_companyNo = e.companyNo
+            business.forEach((e) => {
+              if (e.is_main === "1") {
+                business_company = e.company;
+                business_companyNo = e.companyNo;
               }
             });
           }
@@ -149,284 +170,237 @@ const actions = {
           // 保存默认业务公司编号
           commit("business_companyNo", business_companyNo);
           // 关键字段设置
-          commit("private_field", private_field === '' ? [] : private_field);
-
-          let res = await menuList({})
-          if (res.code === 0) {
-            let list = res.data
-            list = list.filter((item) => item.child && item.child.length > 0)
-            let arrag = []
-            let btnList = []
-            // console.log(list)
-            let isok = false;
-            list.forEach(v1 => {
-              const {menu_route,child}=v1
-              if (menu_route==='bigScreen'&&child.length) {
-                isok = true
-              }
-              let pItem = {
-                name: v1.menu_route,
-                path: `/${v1.menu_route}`,
-                meta: {
-                  title: v1.menu_name,
-                  icon: v1.menu_img
-                },
-                children: []
-              }
-              v1.child.forEach(v2 => {
-                let item = {
-                  path: v2.menu_route,
-                  name: v2.menu_route,
-                  hidden: parseInt(v2.is_display + "") === 0,
-                  meta: {
-                    title: v2.menu_name,
-                    icon: v2.menu_img
-                  },
-                  url: v2.menu_url
-                }
-                let model = {
-                  menu_route: v2.menu_route,
-                  action: v2.action
-                }
-                btnList.push(model)
-                pItem.children.push(item)
-              })
-              arrag.push(pItem)
-            })
-            // console.log(arrag);
-
-            list.forEach(asd => {
-              // console.log(asd);
-              const {menu_route,child}=asd
-              if (menu_route==='bigScreen'&&child.length) {
-                isok = true
-              }
-            })
-            // 生成页面权限
-            commit("navListFn", arrag);
-            // 生成按钮权限
-            commit("btnListFn", btnList);
-            // 生成路由
-            initRouter(arrag, that);
-            // state.commit("loginInfoCommit", res.data);
-            resolve(isok ? "success-dataV" : 'success')
-          } else if (res.code >= 100 && res.code <= 104) {
-            resolve("noToken")
+          commit("private_field", private_field === "" ? [] : private_field);
+          const { pcode, pdata, pmsg } = await getRoleProcess(roleid);
+          if (pcode >= 100 && pcode <= 104) {
+            resolve("noToken");
+          } else if (pcode !== 0) {
+            resolve({ code: pcode, data: {}, massage: pmsg });
           } else {
-            resolve(res)
+            // 保存默认业务公司编号
+            commit("roleProcess", pdata ?? []);
+            const { mcode, mdata, mmsg } = await getRoleMenuList();
+            if (mcode >= 100 && mcode <= 104) {
+              resolve("noToken");
+            } else if (mcode !== 0) {
+              resolve({ code: mcodd, data: {}, massage: mmsg });
+            } else {
+              const { arrag, isok, btnList } = mdata;
+
+              // 生成页面权限
+              commit("navListFn", arrag);
+              // 生成按钮权限
+              commit("btnListFn", btnList);
+              // 生成路由
+              initRouter(arrag, that);
+              // state.commit("loginInfoCommit", res.data);
+              resolve(isok ? "success-dataV" : "success");
+            }
           }
-        } else if (userRes.code >= 100 && userRes.code <= 104) {
-          resolve("noToken")
-        } else {
-          resolve(res)
         }
       }
-    })
+    });
   },
 
-
-
   // user logout
   logout({ commit, state, dispatch }) {
     return new Promise((resolve, reject) => {
-      commit('SET_TOKEN', '')
-      commit('SET_ROLES', [])
-      removeToken()
-      commit('SET_MENU', '')
-      commit('SET_HAS', '')
+      commit("SET_TOKEN", "");
+      commit("SET_ROLES", []);
+      removeToken();
+      commit("SET_MENU", "");
+      commit("SET_HAS", "");
 
-      removeMenu()
-      removeBtn()
-      remove_business_company()
-      commit('business_company', '')
-      commit('business_companyNo', '')
-      remove_business_companyNo()
-      remove_private_field()
-      commit('private_field', [])
+      removeMenu();
+      removeBtn();
+      remove_business_company();
+      commit("business_company", "");
+      commit("business_companyNo", "");
+      remove_business_companyNo();
+      remove_private_field();
+      commit("private_field", []);
+      remove_action_data();
+      commit("action_data", []);
       // removeMainList()
       // reset visited views and cached views
       // to fixed https://github.com/PanJiaChen/vue-element-admin/issues/2485
-      dispatch('tagsView/delAllViews', null, { root: true })
-      resolve()
-    })
+      dispatch("tagsView/delAllViews", null, { root: true });
+      resolve();
+    });
   },
 
   // remove token
   resetToken({ commit }) {
-    return new Promise(resolve => {
-      commit('SET_TOKEN', '')
-      commit('SET_ROLES', [])
-      removeToken()
-      resolve()
-    })
+    return new Promise((resolve) => {
+      commit("SET_TOKEN", "");
+      commit("SET_ROLES", []);
+      removeToken();
+      resolve();
+    });
   },
-
-
+};
+async function getUserInfo() {
+  const { code, data, meaasge } = await usergetinfo({});
+  return {
+    ucode: code,
+    udata: data,
+    umsg: meaasge,
+  };
+}
+async function getRoleProcess(roleid) {
+  const { code, data, meaasge } = await roleProcessInfo({ roleid });
+  let list = data;
+  list.map((si) => {
+    si.action = [];
+    si.child.map((sii) => {
+      si.action.push(sii.order_process + "");
+      return sii;
+    });
+    return si;
+  });
+  return {
+    pcode: code,
+    pdata: list,
+    pmsg: meaasge,
+  };
+}
+async function getRoleMenuList() {
+  const { code, data, meaasge } = await menuList({});
+  let arrag = [];
+  let btnList = [];
+  let list = [];
+  let isok = false;
+  if (code === 0) {
+    list = data ?? [];
+    list = list.filter((item) => item.child && item.child.length > 0);
+    list.forEach((v1) => {
+      const { menu_route, child } = v1;
+      if (menu_route === "bigScreen" && child.length) {
+        isok = true;
+      }
+      let pItem = {
+        name: v1.menu_route,
+        path: `/${v1.menu_route}`,
+        meta: {
+          title: v1.menu_name,
+          icon: v1.menu_img,
+        },
+        children: [],
+      };
+      v1.child.forEach((v2) => {
+        let item = {
+          path: v2.menu_route,
+          name: v2.menu_route,
+          hidden: parseInt(v2.is_display + "") === 0,
+          meta: {
+            title: v2.menu_name,
+            icon: v2.menu_img,
+          },
+          url: v2.menu_url,
+        };
+        let model = {
+          menu_route: v2.menu_route,
+          action: v2.action,
+        };
+        btnList.push(model);
+        pItem.children.push(item);
+      });
+      arrag.push(pItem);
+    });
+  }
+  return {
+    mcode: code,
+    mdata: {
+      isok,
+      arrag,
+      btnList,
+    },
+    mmsg: meaasge,
+  };
 }
 
 function initRouter(arr) {
   const IndexRoute = [
-
     // 个人信息
     {
-      path: '/person',
-      component: () => import('@/layout/index'),
-      redirect: '/person/my-message',
+      path: "/person",
+      component: () => import("@/layout/index"),
+      redirect: "/person/my-message",
       hidden: true,
       alwaysShow: true,
       meta: {
-        title: '个人中心',
-        icon: 'user'
+        title: "个人中心",
+        icon: "user",
       },
       children: [
         {
-          path: 'my-message',
-          component: () => import('@/views/person-infor/my-message'),
-          name: 'MyMessage',
+          path: "my-message",
+          component: () => import("@/views/person-infor/my-message"),
+          name: "MyMessage",
           alwaysShow: true,
-          meta: { title: '我的信息', noCache: true, breadcrumb: true }
+          meta: { title: "我的信息", noCache: true, breadcrumb: true },
         },
         {
-          path: 'change-phone',
-          component: () => import('@/views/person-infor/change-phone'),
-          name: 'ChangePhone',
+          path: "change-phone",
+          component: () => import("@/views/person-infor/change-phone"),
+          name: "ChangePhone",
           alwaysShow: true,
-          meta: { title: '更换手机号', noCache: true, breadcrumb: true }
+          meta: { title: "更换手机号", noCache: true, breadcrumb: true },
         },
         {
-          path: 'change-password',
-          component: () => import('@/views/person-infor/change-password'),
-          name: 'ChangePassword',
+          path: "change-password",
+          component: () => import("@/views/person-infor/change-password"),
+          name: "ChangePassword",
           alwaysShow: true,
-          meta: { title: '修改密码', noCache: true, breadcrumb: true }
-        }
-      ]
+          meta: { title: "修改密码", noCache: true, breadcrumb: true },
+        },
+      ],
     },
     //欢迎页
     {
-      path: '/welcome',
-      component: () => import('@/layout/index'),
-      redirect: '/welcome/dashboard',
+      path: "/welcome",
+      component: () => import("@/layout/index"),
+      redirect: "/welcome/dashboard",
       children: [
         {
-          path: 'dashboard',
-          component: () => import('@/views/dashboard/index'),
-          name: 'Dashboard',
-          meta: { title: '首页', icon: 'dashboard', affix: true }
+          path: "dashboard",
+          component: () => import("@/views/dashboard/index"),
+          name: "Dashboard",
+          meta: { title: "首页", icon: "dashboard", affix: true },
         },
-      ]
+      ],
     },
   ];
 
-  arr.map(v1 => {
-    v1.component = (resolve) => require([`@/layout/index.vue`], resolve)
+  arr.map((v1) => {
+    v1.component = (resolve) => require([`@/layout/index.vue`], resolve);
     if (v1.children && v1.children.length > 0) {
-      v1.redirect = `/${v1.name}/${v1.children[0].name}`
-      v1.children.map(v2 => {
-        v2.component = (resolve) => require([`@/views/${v2.url}.vue`], resolve)
-        return v2
-      })
+      v1.redirect = `/${v1.name}/${v1.children[0].name}`;
+      v1.children.map((v2) => {
+        v2.component = (resolve) => require([`@/views/${v2.url}.vue`], resolve);
+        return v2;
+      });
     }
-    return v1
-  })
-  IndexRoute.push(...arr)
+    return v1;
+  });
+  IndexRoute.push(...arr);
   IndexRoute.push({
-    path: '404',
-    component: () => import('@/views/error-page/404'),
+    path: "404",
+    component: () => import("@/views/error-page/404"),
     hidden: false,
-    noCache: true
-  })
+    noCache: true,
+  });
 
   IndexRoute.push({
     path: "*",
-    redirect: '/404',
-  })
+    redirect: "/404",
+  });
   window.vm.$router.addRoutes(IndexRoute);
 }
 
-// function initRouter(arr) {
-//   const IndexRoute = [
-
-//     // 个人信息
-//     {
-//       path: '/person',
-//       component: () => import('@/layout/index'),
-//       redirect: '/person/my-message',
-//       hidden: true,
-//       alwaysShow: true,
-//       meta: {
-//         title: '个人中心',
-//         icon: 'user'
-//       },
-//       children: [
-//         {
-//           path: 'my-message',
-//           component: () => import('@/views/person-infor/my-message'),
-//           name: 'MyMessage',
-//           alwaysShow: true,
-//           meta: { title: '我的信息', noCache: true, breadcrumb: true }
-//         },
-//         {
-//           path: 'change-phone',
-//           component: () => import('@/views/person-infor/change-phone'),
-//           name: 'ChangePhone',
-//           alwaysShow: true,
-//           meta: { title: '更换手机号', noCache: true, breadcrumb: true }
-//         },
-//         {
-//           path: 'change-password',
-//           component: () => import('@/views/person-infor/change-password'),
-//           name: 'ChangePassword',
-//           alwaysShow: true,
-//           meta: { title: '修改密码', noCache: true, breadcrumb: true }
-//         }
-//       ]
-//     },
-//     //欢迎页
-//     {
-//       path: '/welcome',
-//       component: () => import('@/layout/index'),
-//       redirect: '/welcome/dashboard',
-//       children: [
-//         {
-//           path: 'dashboard',
-//           component: () => import('@/views/dashboard/index'),
-//           name: 'Dashboard',
-//           meta: { title: '首页', icon: 'dashboard', affix: true }
-//         },
-//       ]
-//     },
-//   ];
-
-//   arr.map(v1 => {
-//     v1.component = (resolve) => require([`@/layout/index.vue`], resolve)
-//     if (v1.children && v1.children.length > 0) {
-//       v1.redirect = `/${v1.name}/${v1.children[0].name}`
-//       v1.children.map(v2 => {
-//         v2.component = (resolve) => require([`@/views/${v2.url}.vue`], resolve)
-//         return v2
-//       })
-//     }
-//     return v1
-//   })
-//   IndexRoute.push(...arr)
-//   IndexRoute.push({
-//     path: '404',
-//     component: () => import('@/views/error-page/404'),
-//     hidden: false,
-//     noCache: true
-//   })
-
-//   IndexRoute.push({
-//     path: "*",
-//     redirect: '/404',
-//   })
-//   window.vm.$router.addRoutes(IndexRoute);
-// }
-
 export default {
   namespaced: true,
   state,
   mutations,
-  actions
-}
+  actions,
+};

+ 47 - 37
src/utils/auth.js

@@ -1,112 +1,122 @@
-import Cookies from 'js-cookie'
-
-const TokenKey = 'Purchase-Console-Token'
-const MenuKey = 'Purchase-Console-Menu'
-const BtnKey = 'Purchase-Console-MenuBtn'
-const NoticeKey = "Purchase-Console-Notice"
-const mainMenuKey = 'Purchase-Console-MainMenu'
-const businessCompanyKey = 'Purchase-Console-businessCompany'
-const businessCompanyNoKey = 'Purchase-Console-businessCompanyNo'
-const privateFieldKey = 'Purchase-Console-privateField'
+import Cookies from "js-cookie";
+
+const TokenKey = "Purchase-Console-Token";
+const MenuKey = "Purchase-Console-Menu";
+const BtnKey = "Purchase-Console-MenuBtn";
+const NoticeKey = "Purchase-Console-Notice";
+const mainMenuKey = "Purchase-Console-MainMenu";
+const businessCompanyKey = "Purchase-Console-businessCompany";
+const businessCompanyNoKey = "Purchase-Console-businessCompanyNo";
+const privateFieldKey = "Purchase-Console-privateField";
+const actionDataKey = "Purchase-Console-actionData";
 export function getToken() {
-  return Cookies.get(TokenKey)
+  return Cookies.get(TokenKey);
 }
 
 export function setToken(token) {
-  return Cookies.set(TokenKey, token)
+  return Cookies.set(TokenKey, token);
 }
 
 export function removeToken() {
-  return Cookies.remove(TokenKey)
+  return Cookies.remove(TokenKey);
 }
 
 export function getMenu() {
-  const menu = Cookies.get(MenuKey)
+  const menu = Cookies.get(MenuKey);
   if (menu) {
-    return JSON.parse(menu)
+    return JSON.parse(menu);
   } else {
-    return []
+    return [];
   }
 }
 
 export function setMenu(menu) {
-  return Cookies.set(MenuKey, menu)
+  return Cookies.set(MenuKey, menu);
 }
 
 export function removeMenu() {
-  return Cookies.remove(MenuKey)
+  return Cookies.remove(MenuKey);
 }
 
 export function getBtn() {
-  return Cookies.get(BtnKey)
+  return Cookies.get(BtnKey);
 }
 
 export function setBtn(has) {
-  return Cookies.set(BtnKey, has)
+  return Cookies.set(BtnKey, has);
 }
 
 export function removeBtn() {
-  return Cookies.remove(BtnKey)
+  return Cookies.remove(BtnKey);
 }
 
 export function getNotice() {
-  return Cookies.get(NoticeKey)
+  return Cookies.get(NoticeKey);
 }
 
 export function setNotice(has) {
-  return Cookies.set(NoticeKey, has)
+  return Cookies.set(NoticeKey, has);
 }
 
 export function removeNotice() {
-  return Cookies.remove(NoticeKey)
+  return Cookies.remove(NoticeKey);
 }
 
 export function getMainList() {
-  return Cookies.get(mainMenuKey)
+  return Cookies.get(mainMenuKey);
 }
 
 export function setMainList(has) {
-  return Cookies.set(mainMenuKey, has)
+  return Cookies.set(mainMenuKey, has);
 }
 
 export function removeMainList() {
-  return Cookies.remove(mainMenuKey)
+  return Cookies.remove(mainMenuKey);
 }
 
 export function get_business_company() {
-  return Cookies.get(businessCompanyKey)
+  return Cookies.get(businessCompanyKey);
 }
 
 export function set_business_company(has) {
-  return Cookies.set(businessCompanyKey, has)
+  return Cookies.set(businessCompanyKey, has);
 }
 
 export function remove_business_company() {
-  return Cookies.remove(businessCompanyKey)
+  return Cookies.remove(businessCompanyKey);
 }
 export function get_business_companyNo() {
-  return Cookies.get(businessCompanyNoKey)
+  return Cookies.get(businessCompanyNoKey);
 }
 
 export function set_business_companyNo(has) {
-  return Cookies.set(businessCompanyNoKey, has)
+  return Cookies.set(businessCompanyNoKey, has);
 }
 
 export function remove_business_companyNo() {
-  return Cookies.remove(businessCompanyNoKey)
+  return Cookies.remove(businessCompanyNoKey);
 }
 
-
 export function get_private_field() {
-  return Cookies.get(privateFieldKey)
+  return Cookies.get(privateFieldKey);
 }
 
 export function set_private_field(has) {
-  return Cookies.set(privateFieldKey, has)
+  return Cookies.set(privateFieldKey, has);
 }
 
 export function remove_private_field() {
-  return Cookies.remove(privateFieldKey)
+  return Cookies.remove(privateFieldKey);
 }
 
+export function get_action_data() {
+  return Cookies.get(actionDataKey);
+}
 
+export function set_action_data(has) {
+  return Cookies.set(actionDataKey, has);
+}
+
+export function remove_action_data() {
+  return Cookies.remove(actionDataKey);
+}

+ 16 - 26
src/views/bigScreen/bigScreenNew/index.vue

@@ -1,8 +1,6 @@
 <template>
   <div class="datavScr box">
-    <div
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
-    >
+    <div v-if="powers.some((i) => i == '001')">
       <div class="dataBox">
         <div class="top">
           <div style="width: 35%">
@@ -11,9 +9,7 @@
           <div style="width: 20%">
             <topCenter></topCenter>
           </div>
-          <div
-            style="width: 35%; "
-          >
+          <div style="width: 35%">
             <div style="width: 100%">
               <topRight1></topRight1>
             </div>
@@ -75,15 +71,10 @@ export default {
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
-      let tran =
-        this.$store.getters.btnList.find(
-          (item) => item.menu_route == "bigScreenNew"
-        ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const tran =
+        this.$store.getters.btnList.find((i) => i.menu_route == "bigScreenNew") || {};
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {
@@ -101,7 +92,7 @@ export default {
     centerRight,
     bottomLeft,
     bottomCenter,
-    bottomRight
+    bottomRight,
   },
   mounted() {},
   beforeDestroy() {},
@@ -112,11 +103,11 @@ export default {
 <style lang="scss" scoped>
 .datavScr.box {
   width: 100%;
-//   height: 100vh;
-    // background: #000;
-    // background: url("./img/pageBg.png");
-    background: url("./img/1.jpeg");
-    background-size: 100% 100%;
+  //   height: 100vh;
+  // background: #000;
+  // background: url("./img/pageBg.png");
+  background: url("./img/1.jpeg");
+  background-size: 100% 100%;
   margin: 0;
   padding: 20px 20px 70px;
   // color: #fff;
@@ -125,7 +116,6 @@ export default {
   width: 100%;
   height: 100%;
   min-width: 1300px;
-
 }
 
 .top {
@@ -133,17 +123,17 @@ export default {
   display: flex;
   justify-content: space-between;
 }
-.center{
+.center {
   width: 100%;
   display: flex;
   justify-content: space-between;
   margin-top: 30px;
 }
-.bottom{
-width: 100%;
+.bottom {
+  width: 100%;
   display: flex;
   justify-content: space-between;
-//   margin-top: 30px;
+  //   margin-top: 30px;
   max-height: 400px;
 }
 </style>

+ 7 - 15
src/views/bigScreen/bigScreenOld/datavScr/index.vue

@@ -1,8 +1,6 @@
 <template>
   <div class="datavScr box">
-    <div
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
-    >
+    <div v-if="powers.some((i) => i == '001')">
       <div id="index" ref="appRef">
         <div class="bg">
           <dv-loading v-if="loading">Loading...</dv-loading>
@@ -23,7 +21,6 @@
                   class="dv-dec-8"
                   :reverse="true"
                   :color="decorationColor"
-                  
                 />
               </div>
               <dv-decoration-10 class="dv-dec-10-s" />
@@ -95,7 +92,7 @@
               </div>
             </div>
             <!-- 防止数据更新闪白屏 -->
-            <div style="width:100%;height:100vh;" v-if="!initFlag"></div>
+            <div style="width: 100%; height: 100vh" v-if="!initFlag"></div>
           </div>
         </div>
       </div>
@@ -125,15 +122,10 @@ export default {
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
-      let tran =
-        this.$store.getters.btnList.find(
-          (item) => item.menu_route == "datavScr"
-        ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const tran =
+        this.$store.getters.btnList.find((i) => i.menu_route == "datavScr") || {};
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {
@@ -179,7 +171,7 @@ export default {
     },
     cancelLoading() {
       // setTimeout(() => {
-        this.loading = false;
+      this.loading = false;
       // }, 0);
     },
 

+ 18 - 47
src/views/dataCorrection/cgMessage/index.vue

@@ -1,9 +1,6 @@
 <template>
   <div class="cgMessage pagePadding">
-    <div
-      class="box"
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
-    >
+    <div class="box" v-if="powers.some((i) => i == '001')">
       <el-collapse v-model="activeNames" style="margin: -18px 0 0 0">
         <el-collapse-item title="采购单信息" name="1" v-if="sitem">
           <show-data-table
@@ -17,8 +14,7 @@
               <el-popover placement="top" width="300" trigger="hover">
                 <ul>
                   <li>
-                    <span>销售方公司编号:</span
-                    ><span>{{ sitem.supplierNo }}</span>
+                    <span>销售方公司编号:</span><span>{{ sitem.supplierNo }}</span>
                   </li>
                 </ul>
                 <i class="el-icon-warning-outline fr" slot="reference"></i>
@@ -29,8 +25,7 @@
               <el-popover placement="top" width="300" trigger="hover">
                 <ul>
                   <li>
-                    <span>购买方公司编号:</span
-                    ><span>{{ sitem.companyNo }}</span>
+                    <span>购买方公司编号:</span><span>{{ sitem.companyNo }}</span>
                   </li>
                 </ul>
                 <i class="el-icon-warning-outline fr" slot="reference"></i>
@@ -42,10 +37,7 @@
                 :size="'mini'"
                 :type="sitem.status == '0' ? 'warning' : ''"
                 v-text="
-                  (
-                    statusOptions.find((item) => item.value == sitem.status) ||
-                    {}
-                  ).label || '--'
+                  (statusOptions.find((i) => i.value == sitem.status) || {}).label || '--'
                 "
               ></el-tag>
             </template>
@@ -53,11 +45,8 @@
               <el-tag
                 :size="'mini'"
                 v-text="
-                  (
-                    cg_order_type_options.find(
-                      (item) => item.id == sitem.order_type
-                    ) || {}
-                  ).label || '--'
+                  (cg_order_type_options.find((i) => i.id == sitem.order_type) || {})
+                    .label || '--'
                 "
               ></el-tag>
               <el-popover
@@ -80,8 +69,7 @@
               <el-popover placement="top" width="300" trigger="hover">
                 <ul>
                   <li>
-                    <span>仓库公司编号:</span
-                    ><span>{{ sitem.wsm_supplierNo }}</span>
+                    <span>仓库公司编号:</span><span>{{ sitem.wsm_supplierNo }}</span>
                   </li>
                   <li>
                     <span>仓库名称编号:</span><span>{{ sitem.wsm_code }}</span>
@@ -144,10 +132,7 @@
                   </el-col>
 
                   <el-col :span="14" v-show="order_type + '' == '1'">
-                    <el-form-item
-                      label="采购单仓库信息: "
-                      prop="wsm_supplierNo"
-                    >
+                    <el-form-item label="采购单仓库信息: " prop="wsm_supplierNo">
                       <search-supplier
                         :size="searchSize"
                         :value="ruleForm.wsm_supplierNo"
@@ -169,9 +154,7 @@
                         :isRelation="true"
                         :isDetail="true"
                         :wsmtype="'5'"
-                        :companyNo="
-                          sitem && sitem.companyNo ? sitem.companyNo : ''
-                        "
+                        :companyNo="sitem && sitem.companyNo ? sitem.companyNo : ''"
                         :companyCode="wsm_supplierNo"
                         :names="wsm_name"
                         @searchChange="stockChange"
@@ -221,15 +204,10 @@ export default {
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
-      let tran =
-        this.$store.getters.btnList.find(
-          (item) => item.menu_route == "cgMessage"
-        ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const tran =
+        this.$store.getters.btnList.find((i) => i.menu_route == "cgMessage") || {};
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {
@@ -336,9 +314,7 @@ export default {
             model.supplierNo = model.supplierNo.toString();
             model.wsm_supplierNo = model.wsm_supplierNo.toString();
             model.wsm_code = model.wsm_code.toString();
-            const { code, data, message } = await asyncRequest.cgdeditnew(
-              model
-            );
+            const { code, data, message } = await asyncRequest.cgdeditnew(model);
 
             if (code === 0) {
               this.$notify.success({
@@ -421,17 +397,13 @@ export default {
           if (this.order_type === "1") {
             this.wsm_supplier = wsm_supplier || "";
             this.wsm_supplierNo = wsm_supplierNo || "";
-            this.ruleForm.wsm_supplierNo = wsm_supplierNo
-              ? [wsm_supplierNo]
-              : [];
+            this.ruleForm.wsm_supplierNo = wsm_supplierNo ? [wsm_supplierNo] : [];
             this.wsm_name = wsm_name || "";
             this.wsm_code = wsm_code || "";
             this.ruleForm.wsm_code = wsm_code ? [wsm_code] : [];
           }
-          this.rulesThis.wsm_supplierNo[0].required =
-            this.order_type + "" === "1" ;
-          this.rulesThis.wsm_code[0].required =
-            this.order_type + "" === "1" ;
+          this.rulesThis.wsm_supplierNo[0].required = this.order_type + "" === "1";
+          this.rulesThis.wsm_code[0].required = this.order_type + "" === "1";
           this.getNewTime();
         } else if (code >= 100 && code <= 104) {
           await this.logout();
@@ -454,5 +426,4 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>

+ 12 - 32
src/views/dataCorrection/cgMessageList/index.vue

@@ -1,9 +1,6 @@
 <template>
   <div class="pagePadding">
-    <div
-      class="box"
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
-    >
+    <div class="box" v-if="powers.some((i) => i == '001')">
       <ex-table
         v-loading="loading"
         :table="table"
@@ -37,10 +34,7 @@
                   @timeReturned="handleTime"
                 />
               </el-col>
-              <el-col
-                :span="5"
-                style="width: 230px; float: left; margin-left: 10px"
-              >
+              <el-col :span="5" style="width: 230px; float: left; margin-left: 10px">
                 <el-input
                   v-model="parmValue.cgdNo"
                   :size="'mini'"
@@ -68,7 +62,7 @@
                 :span="3"
                 class="fr"
                 style="width: 66px; padding: 0 0 0 10px"
-                v-if="powers.some((item) => item == '003')"
+                v-if="powers.some((i) => i == '003')"
               >
                 <el-button
                   :size="searchSize"
@@ -81,15 +75,11 @@
               </el-col>
             </el-row>
             <el-row style="padding-top: 10px">
-          
-              <el-col
-                :span="5"
-                style="width: 155px; float: left; margin-left: 0px"
-              >
+              <el-col :span="5" style="width: 155px; float: left; margin-left: 0px">
                 <el-input
                   v-model="parmValue.creater"
                   :size="'mini'"
-                   style="width: 100%"
+                  style="width: 100%"
                   placeholder="创建人"
                   @blur="
                     pageInfo.curr = 1;
@@ -98,14 +88,11 @@
                   "
                 ></el-input>
               </el-col>
-              <el-col
-                :span="5"
-                style="width: 155px; float: left; margin-left: 10px"
-              >
+              <el-col :span="5" style="width: 155px; float: left; margin-left: 10px">
                 <el-input
                   v-model="parmValue.company_name"
                   :size="'mini'"
-                   style="width: 100%"
+                  style="width: 100%"
                   placeholder="创建人部门"
                   @blur="
                     pageInfo.curr = 1;
@@ -124,7 +111,6 @@
                   重置
                 </el-button>
               </el-col>
-             
             </el-row>
           </div>
         </template>
@@ -148,15 +134,10 @@ export default {
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
-      let tran =
-        this.$store.getters.btnList.find(
-          (item) => item.menu_route == "cgMessageList"
-        ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const tran =
+        this.$store.getters.btnList.find((i) => i.menu_route == "cgMessageList") || {};
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {
@@ -254,5 +235,4 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>

+ 1 - 1
src/views/good-share/components/changeBackGood.vue

@@ -183,7 +183,7 @@
             <el-table-column fixed="right" label="操作" width="50">
               <template slot-scope="scope">
                 <el-tooltip
-                  v-if="powers.some((item) => item == '006')"
+                  v-if="powers.some((i) => i == '006')"
                   effect="dark"
                   content="删除"
                   placement="top"

+ 8 - 11
src/views/goodStore/active/components/baseForm.vue

@@ -116,10 +116,10 @@
           v-if="
             status == '4' ||
             !(
-              (status === '0' && powers.some((item) => item == '056')) ||
-              (status === '1' && powers.some((item) => item == '057')) ||
-              (status === '2' && powers.some((item) => item == '058')) ||
-              (status === '3' && powers.some((item) => item == '059'))
+              (status === '0' && powers.some((i) => i == '056')) ||
+              (status === '1' && powers.some((i) => i == '057')) ||
+              (status === '2' && powers.some((i) => i == '058')) ||
+              (status === '3' && powers.some((i) => i == '059'))
             )
           "
         >
@@ -300,14 +300,11 @@ export default {
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size", "business_companyNo"]),
     powers() {
-      let tran =
-        this.$store.getters.btnList.find((item) => item.menu_route == "activeDetail") ||
+      const tran =
+        this.$store.getters.btnList.find((i) => i.menu_route == "activeDetail") ||
         {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {

+ 16 - 16
src/views/goodStore/active/detail.vue

@@ -1,9 +1,6 @@
 <template>
   <div class="activeDetail">
-    <div
-      class="activeDetail-main"
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '007')"
-    >
+    <div class="activeDetail-main" v-if="powers.some((i) => i == '007')">
       <el-tabs v-model="activeTabs">
         <el-tab-pane label="新建活动" name="0" v-if="queryType === 'add'">
           <base-form
@@ -30,7 +27,7 @@
             <el-collapse-item
               title="产品部门审批"
               name="1"
-              v-if="status == '0' && powers.some((item) => item == '056')"
+              v-if="status === '0' && ppowers.some((i) => i == '0')"
             >
               <exam-form
                 :statusList="statusList"
@@ -43,7 +40,7 @@
             <el-collapse-item
               title="采购部定价"
               name="2"
-              v-if="status == '1' && powers.some((item) => item == '057')"
+              v-if="status === '1' && ppowers.some((i) => i == '1')"
             >
               <finance-exam-one-form
                 v-if="newTime !== ''"
@@ -58,7 +55,7 @@
             <el-collapse-item
               title="财务定价"
               name="3"
-              v-if="status == '2' && powers.some((item) => item == '058')"
+              v-if="status === '2' && ppowers.some((i) => i == '2')"
             >
               <finance-exam-two-form
                 v-if="newTime !== ''"
@@ -73,7 +70,7 @@
             <el-collapse-item
               title="财务审核定价"
               name="4"
-              v-if="status == '3' && powers.some((item) => item == '059')"
+              v-if="status === '3' && ppowers.some((i) => i == '3')"
             >
               <finance-exam-three-form
                 v-if="newTime !== ''"
@@ -120,15 +117,18 @@ export default {
   },
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
+
     powers() {
-      let tran =
-        this.$store.getters.btnList.find((item) => item.menu_route == "activeDetail") ||
-        {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const tran =
+        this.$store.getters.btnList.find((i) => i.menu_route == "activeDetail") || {};
+      const { action } = tran ?? {};
+      return action ?? [];
+    },
+    ppowers() {
+      const tran =
+        this.$store.getters.roleProcess.find((i) => i.process_type === "HD") || {};
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
 

+ 6 - 9
src/views/goodStore/active/index.vue

@@ -2,7 +2,7 @@
   <div class="active pagePadding">
     <ex-table
       v-loading="loading"
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
+      v-if=" powers.some((i) => i == '001')"
       :table="table"
       :data="tableData"
       :columns="columns"
@@ -131,7 +131,7 @@
               :span="3"
               class="fr"
               style="width: 66px; padding: 0 0 0 10px"
-              v-if="powers.some((item) => item == '003')"
+              v-if="powers.some((i) => i == '003')"
             >
               <el-button
                 :size="searchSize"
@@ -168,7 +168,7 @@
       </template>
       <template #operation="{ scope }">
         <el-tooltip
-          v-if="powers.some((item) => item == '007')"
+          v-if="powers.some((i) => i == '007')"
           effect="dark"
           content="详情"
           placement="top"
@@ -205,15 +205,12 @@ export default {
     //组件SIZE设置
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
-      let tran =
+      const tran =
         this.$store.getters.btnList.find(
           (item) => item.menu_route == "active"
         ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {

+ 5 - 8
src/views/goodStore/activeGood/index.vue

@@ -2,7 +2,7 @@
   <div class="activeGood pagePadding">
     <div
       v-loading="loading"
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
+      v-if=" powers.some((i) => i == '001')"
     >
       <ex-table
         :table="table"
@@ -160,7 +160,7 @@
 
         <template #operation="{ scope }">
           <el-tooltip
-            v-if="powers.some((item) => item == '007')"
+            v-if="powers.some((i) => i == '007')"
             effect="dark"
             content="详情"
             placement="top"
@@ -200,15 +200,12 @@ export default {
     //组件SIZE设置
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
-      let tran =
+      const tran =
         this.$store.getters.btnList.find(
           (item) => item.menu_route == "activeGood"
         ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {

+ 10 - 13
src/views/goodStore/brand/index.vue

@@ -2,7 +2,7 @@
   <div class="brand pagePadding">
     <ex-table
       v-loading="loading"
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
+      v-if=" powers.some((i) => i == '001')"
       :table="table"
       :data="tableData"
       :columns="columns"
@@ -120,7 +120,7 @@
               :span="3"
               class="fr"
               style="width: 66px; padding: 0 0 0 10px"
-              v-if="powers.some((item) => item == '003')"
+              v-if="powers.some((i) => i == '003')"
             >
               <el-button
                 :size="searchSize"
@@ -147,7 +147,7 @@
 
       <template #operation="{ scope }">
         <el-tooltip
-          v-if="powers.some((item) => item == '007')"
+          v-if="powers.some((i) => i == '007')"
           effect="dark"
           content="详情"
           placement="top"
@@ -158,7 +158,7 @@
           ></i>
         </el-tooltip>
         <el-tooltip
-          v-if="powers.some((item) => item == '005')"
+          v-if="powers.some((i) => i == '005')"
           effect="dark"
           content="修改"
           placement="top"
@@ -170,7 +170,7 @@
         </el-tooltip>
         <el-tooltip
           v-if="
-            powers.some((item) => item == '004') && scope.row.status === '1'
+            powers.some((i) => i == '004') && scope.row.status === '1'
           "
           effect="dark"
           content="禁用"
@@ -183,7 +183,7 @@
         </el-tooltip>
         <el-tooltip
           v-if="
-            powers.some((item) => item == '004') && scope.row.status === '0'
+            powers.some((i) => i == '004') && scope.row.status === '0'
           "
           effect="dark"
           content="启用"
@@ -195,7 +195,7 @@
           ></i>
         </el-tooltip>
         <el-tooltip
-          v-if="powers.some((item) => item == '006')"
+          v-if="powers.some((i) => i == '006')"
           effect="dark"
           content="删除"
           placement="top"
@@ -236,15 +236,12 @@ export default {
     //组件SIZE设置
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
-      let tran =
+      const tran =
         this.$store.getters.btnList.find(
           (item) => item.menu_route == "brand"
         ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {

+ 6 - 9
src/views/goodStore/dealGoodsPool/index.vue

@@ -2,7 +2,7 @@
   <div class="dealGoodsPool pagePadding">
     <ex-table
       v-loading="loading"
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
+      v-if=" powers.some((i) => i == '001')"
       :table="table"
       :data="tableData"
       :columns="columns"
@@ -69,7 +69,7 @@
               :span="3"
               class="fr"
               style="width: 110px; padding: 0 0 0 10px"
-              v-if="powers.some((item) => item == '055')"
+              v-if="powers.some((i) => i == '055')"
              
             >
               <el-button
@@ -169,7 +169,7 @@
 
       <template #operation="{ scope }">
         <el-tooltip
-          v-if="powers.some((item) => item == '007')"
+          v-if="powers.some((i) => i == '007')"
           effect="dark"
           content="详情"
           placement="top"
@@ -219,15 +219,12 @@ export default {
     //组件SIZE设置
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
-      let tran =
+      const tran =
         this.$store.getters.btnList.find(
           (item) => item.menu_route == "dealGoodsPool"
         ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {

+ 9 - 12
src/views/goodStore/goldPrice/components/priceList.vue

@@ -37,7 +37,7 @@
         :span="3"
         class="fr"
         style="width: 66px; padding: 0 0 0 10px"
-        v-if="powers.some((item) => item == '003')"
+        v-if="powers.some((i) => i == '003')"
       >
         <el-button
           :size="searchSize"
@@ -79,7 +79,7 @@
           <el-table-column label="操作">
             <template slot-scope="scope">
               <el-tooltip
-                v-if="powers.some((item) => item == '007')"
+                v-if="powers.some((i) => i == '007')"
                 effect="dark"
                 content="详情"
                 placement="top"
@@ -90,7 +90,7 @@
                 ></i>
               </el-tooltip>
               <el-tooltip
-                v-if="powers.some((item) => item == '005')"
+                v-if="powers.some((i) => i == '005')"
                 effect="dark"
                 content="修改"
                 placement="top"
@@ -102,7 +102,7 @@
               </el-tooltip>
               <el-tooltip
                 v-if="
-                  powers.some((item) => item == '004') &&
+                  powers.some((i) => i == '004') &&
                   scope.row.status === '1'
                 "
                 effect="dark"
@@ -116,7 +116,7 @@
               </el-tooltip>
               <el-tooltip
                 v-if="
-                  powers.some((item) => item == '004') &&
+                  powers.some((i) => i == '004') &&
                   scope.row.status === '0'
                 "
                 effect="dark"
@@ -129,7 +129,7 @@
                 ></i>
               </el-tooltip>
               <el-tooltip
-                v-if="powers.some((item) => item == '006')"
+                v-if="powers.some((i) => i == '006')"
                 effect="dark"
                 content="删除"
                 placement="top"
@@ -170,15 +170,12 @@ export default {
     //组件SIZE设置
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
-      let tran =
+      const tran =
         this.$store.getters.btnList.find(
           (item) => item.menu_route == "goldPrice"
         ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {

+ 4 - 7
src/views/goodStore/goldPrice/index.vue

@@ -2,7 +2,7 @@
   <div class="goldPrice pagePadding">
     <el-row
       style="padding: 10px 0 0 0"
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
+      v-if=" powers.some((i) => i == '001')"
     >
       <el-tabs v-model="activeName">
         <el-tab-pane label="当前金价" name="first">
@@ -28,15 +28,12 @@ export default {
   },
   computed: {
     powers() {
-      let tran =
+      const tran =
         this.$store.getters.btnList.find(
           (item) => item.menu_route == "goldPrice"
         ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {

+ 4 - 7
src/views/goodStore/goodsCost/components/baseForm.vue

@@ -1071,14 +1071,11 @@ export default {
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
-      let tran =
-        this.$store.getters.btnList.find((item) => item.menu_route == "goodsCostAdd") ||
+      const tran =
+        this.$store.getters.btnList.find((i) => i.menu_route == "goodsCostAdd") ||
         {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   watch: {

+ 17 - 17
src/views/goodStore/goodsCost/detail.vue

@@ -1,9 +1,6 @@
 <template>
   <div class="goodsCostDetail">
-    <div
-      class="goodsCostDetail-main"
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '007')"
-    >
+    <div class="goodsCostDetail-main" v-if="powers.some((i) => i == '007')">
       <el-tabs v-model="activeTabs">
         <el-tab-pane label="新建商品成本" name="0" v-if="queryType === 'add'">
           <base-form
@@ -31,9 +28,10 @@
               title="采购部门审批"
               name="1"
               v-if="
-                (status === '0' || status === '2' || status === '3') &&
-                queryType === 'view' &&
-                powers.some((item) => item == '036')
+                ((status === '0' && powers.some((i) => i == '0')) ||
+                  (status === '2' && powers.some((i) => i == '2')) ||
+                  (status === '3' && powers.some((i) => i == '3'))) &&
+                queryType === 'view'
               "
             >
               <exam-form
@@ -47,7 +45,7 @@
           </el-collapse>
         </el-tab-pane>
         <el-tab-pane label="审批记录" name="2" v-if="queryType !== 'add'">
-            <process-time-line
+          <process-time-line
             v-if="newTime !== ''"
             :newTime="newTime"
             :type="'SPCB'"
@@ -61,7 +59,7 @@
     </div>
   </div>
 </template>
-   <script>
+<script>
 import asyncRequest from "@/apis/service/goodStore/goodsCost";
 import resToken from "@/mixins/resToken";
 import { mapGetters } from "vuex";
@@ -75,15 +73,18 @@ export default {
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
-      let tran =
+      const tran =
         this.$store.getters.btnList.find(
           (item) => item.menu_route == "goodsCostDetail"
         ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
+    },
+    ppowers() {
+      const tran =
+        this.$store.getters.roleProcess.find((i) => i.process_type === "SPCB") || {};
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
 
@@ -199,7 +200,7 @@ export default {
   },
 };
 </script>
-   <style lang="scss" scoped>
+<style lang="scss" scoped>
 .goodsCostDetail {
   width: 100%;
   box-sizing: border-box;
@@ -240,4 +241,3 @@ export default {
   }
 }
 </style>
-   

+ 25 - 21
src/views/goodStore/goodsCost/index.vue

@@ -2,7 +2,7 @@
   <div class="goodsCost pagePadding">
     <ex-table
       v-loading="loading"
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
+      v-if="powers.some((i) => i == '001')"
       :table="table"
       :data="tableData"
       :columns="columns"
@@ -147,7 +147,7 @@
               :span="3"
               class="fr"
               style="width: 66px; padding: 0 0 0 10px"
-              v-if="powers.some((item) => item == '003')"
+              v-if="powers.some((i) => i == '003')"
             >
               <el-button
                 :size="searchSize"
@@ -162,7 +162,7 @@
               :span="3"
               class="fr"
               style="width: 110px; padding: 0 0 0 10px"
-              v-if="powers.some((item) => item == '055')"
+              v-if="powers.some((i) => i == '055')"
             >
               <el-button
                 :size="searchSize"
@@ -216,7 +216,7 @@
 
       <template #operation="{ scope }">
         <el-tooltip
-          v-if="powers.some((item) => item == '007') && scope.row.status !== '8'"
+          v-if="powers.some((i) => i == '007') && scope.row.status !== '8'"
           effect="dark"
           content="详情"
           placement="top"
@@ -227,7 +227,7 @@
           ></i>
         </el-tooltip>
         <el-tooltip
-          v-if="powers.some((item) => item == '079') && scope.row.status !== '8'"
+          v-if="powers.some((i) => i == '079') && scope.row.status !== '8'"
           effect="dark"
           content="下线商品"
           placement="top"
@@ -237,11 +237,12 @@
             @click="showDonlineDlg(scope.row.spuCode)"
           ></i>
         </el-tooltip>
+
         <el-tooltip
           v-if="
-            (powers.some((item) => item == '005') && scope.row.status === '7') ||
-            (powers.some((item) => item == '005') && scope.row.status === '6') ||
-            (powers.some((item) => item == '005') && scope.row.status === '8')
+            (ppowers.some((i) => i == '7') && scope.row.status === '7') ||
+            (ppowers.some((i) => i == '6') && scope.row.status === '6') ||
+            (ppowers.some((i) => i == '8') && scope.row.status === '8')
           "
           effect="dark"
           content="修改"
@@ -259,8 +260,8 @@
         </el-tooltip>
         <el-tooltip
           v-if="
-            (powers.some((item) => item == '054') && scope.row.status === '1') ||
-            (powers.some((item) => item == '054') && scope.row.status === '4')
+            ppowers.some((i) => i == '4') &&
+            (scope.row.status === '4' || scope.row.status === '1')
           "
           effect="dark"
           content="修改基础信息"
@@ -273,8 +274,8 @@
         </el-tooltip>
         <el-tooltip
           v-if="
-            (powers.some((item) => item == '053') && scope.row.status === '1') ||
-            (powers.some((item) => item == '053') && scope.row.status === '5')
+            ppowers.some((i) => i == '5') &&
+            (scope.row.status === '5' || scope.row.status === '1')
           "
           effect="dark"
           content="修改成本信息"
@@ -287,7 +288,7 @@
         </el-tooltip>
         <el-tooltip
           v-if="
-            powers.some((item) => item == '010') &&
+            powers.some((i) => i == '010') &&
             !(scope.row.status === '7' || scope.row.status === '8')
           "
           effect="dark"
@@ -301,7 +302,7 @@
         </el-tooltip>
 
         <el-tooltip
-          v-if="powers.some((item) => item == '006')"
+          v-if="powers.some((i) => i == '006')"
           effect="dark"
           content="删除"
           placement="top"
@@ -374,13 +375,16 @@ export default {
     //组件SIZE设置
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
-      let tran =
-        this.$store.getters.btnList.find((item) => item.menu_route == "goodsCost") || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const tran =
+        this.$store.getters.btnList.find((i) => i.menu_route == "goodsCost") || {};
+      const { action } = tran ?? {};
+      return action ?? [];
+    },
+    ppowers() {
+      const tran =
+        this.$store.getters.roleProcess.find((i) => i.process_type === "SPCB") || {};
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {

+ 4 - 7
src/views/goodStore/goodsOffline/detail.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="box">
-    <div v-if="powers && powers.length > 0 && powers.some((item) => item == '007')">
+    <div v-if=" powers.some((i) => i == '007')">
       <el-tabs v-model="activeName" @tab-click="handleClick" v-loading="loading">
         <el-tab-pane label="商品下线详情" name="1">
           <show-data-table
@@ -45,15 +45,12 @@ export default {
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
-      let tran =
+      const tran =
         this.$store.getters.btnList.find(
           (item) => item.menu_route == "goodsOfflineDetail"
         ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {

+ 5 - 8
src/views/goodStore/goodsOffline/index.vue

@@ -75,7 +75,7 @@
        </template>
       <template #operation="{ scope }">
         <el-tooltip
-          v-if="powers.some((item) => item == '007')"
+          v-if="powers.some((i) => i == '007')"
           effect="dark"
           content="详情"
           placement="top"
@@ -111,14 +111,11 @@ export default {
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
-      let tran =
-        this.$store.getters.btnList.find((item) => item.menu_route == "goodsOffline") ||
+      const tran =
+        this.$store.getters.btnList.find((i) => i.menu_route == "goodsOffline") ||
         {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
     },
     
   },

+ 4 - 7
src/views/goodStore/goodsOnline/add.vue

@@ -2,7 +2,7 @@
   <div class="goodsOnlineAdd">
     <div
       class="goodsOnlineAdd-main"
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '007')"
+      v-if=" powers.some((i) => i == '007')"
     >
       <el-form
         :model="ruleForm"
@@ -209,15 +209,12 @@ export default {
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
-      let tran =
+      const tran =
         this.$store.getters.btnList.find(
           (item) => item.menu_route == "goodsOnlineAdd"
         ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   watch: {

+ 14 - 22
src/views/goodStore/goodsOnline/detail.vue

@@ -1,9 +1,6 @@
 <template>
   <div class="goodsOnlineDetail">
-    <div
-      class="goodsOnlineDetail-main"
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '007')"
-    >
+    <div class="goodsOnlineDetail-main" v-if="powers.some((i) => i == '007')">
       <el-tabs v-model="activeTabs">
         <el-tab-pane label="商品上线详情" name="1" v-if="queryType !== 'add'">
           <el-collapse v-model="activeNames" style="margin: -18px 0 0 0">
@@ -232,9 +229,7 @@
               title="产品部门审批"
               name="1"
               v-if="
-                status === '2' &&
-                queryType == 'view' &&
-                powers.some((item) => item == '056')
+                status === '2' && ppowers.some((i) => i == '2') && queryType == 'view'
               "
             >
               <online-exam-form
@@ -251,9 +246,7 @@
               title="财务定价"
               name="2"
               v-if="
-                status === '3' &&
-                queryType == 'view' &&
-                powers.some((item) => item == '058')
+                status === '3' && ppowers.some((i) => i == '3') && queryType == 'view'
               "
             >
               <fixed-price-form
@@ -272,9 +265,7 @@
               title="财务审核定价"
               name="3"
               v-if="
-                status === '4' &&
-                queryType == 'view' &&
-                powers.some((item) => item == '059')
+                status === '4' && ppowers.some((i) => i == '4') && queryType == 'view'
               "
             >
               <examFormNew
@@ -290,9 +281,7 @@
               title="操作商品上线"
               name="4"
               v-if="
-                status === '5' &&
-                queryType == 'view' &&
-                powers.some((item) => item == '071')
+                status === '5' && ppowers.some((i) => i == '5') && queryType == 'view'
               "
             >
               <handle-online-form
@@ -361,15 +350,18 @@ export default {
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size", "private_field"]),
     powers() {
-      let tran =
+      const tran =
         this.$store.getters.btnList.find(
           (item) => item.menu_route == "goodsOnlineDetail"
         ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
+    },
+    ppowers() {
+      const tran =
+        this.$store.getters.roleProcess.find((i) => i.process_type === "SPSX") || {};
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
 

+ 10 - 13
src/views/goodStore/goodsOnline/index.vue

@@ -2,7 +2,7 @@
   <div class="goodsOnline pagePadding">
     <ex-table
       v-loading="loading"
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
+      v-if=" powers.some((i) => i == '001')"
       :table="table"
       :data="tableData"
       :columns="columns"
@@ -164,7 +164,7 @@
               :span="3"
               class="fr"
               style="width: 66px; padding: 0 0 0 10px"
-              v-if="powers.some((item) => item == '003')"
+              v-if="powers.some((i) => i == '003')"
             >
               <el-button
                 :size="searchSize"
@@ -180,7 +180,7 @@
               :span="3"
               class="fr"
               style="width: 66px; padding: 0 0 0 10px"
-              v-if="powers.some((item) => item == '087')"
+              v-if="powers.some((i) => i == '087')"
             >
               <el-button
                 :size="searchSize"
@@ -231,7 +231,7 @@
 
       <template #operation="{ scope }">
         <el-tooltip
-          v-if="powers.some((item) => item == '007')"
+          v-if="powers.some((i) => i == '007')"
           effect="dark"
           content="详情"
           placement="top"
@@ -243,7 +243,7 @@
         </el-tooltip>
         <el-tooltip
           v-if="
-            powers.some((item) => item == '078') &&
+            powers.some((i) => i == '078') &&
             (scope.row.status === '7' || scope.row.status === '8')
           "
           effect="dark"
@@ -256,7 +256,7 @@
           ></i>
         </el-tooltip>
         <el-tooltip
-          v-if="powers.some((item) => item == '079') && scope.row.status !== '8'"
+          v-if="powers.some((i) => i == '079') && scope.row.status !== '8'"
           effect="dark"
           content="下线商品"
           placement="top"
@@ -387,14 +387,11 @@ export default {
     //组件SIZE设置
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
-      let tran =
-        this.$store.getters.btnList.find((item) => item.menu_route == "goodsOnline") ||
+      const tran =
+        this.$store.getters.btnList.find((i) => i.menu_route == "goodsOnline") ||
         {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {

+ 5 - 8
src/views/goodStore/searchSort/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="searchSort pagePadding">
     <div
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
+      v-if=" powers.some((i) => i == '001')"
     >
       <ex-table
         :table="table"
@@ -140,7 +140,7 @@
         </template>
         <template #operation="{ scope }">
           <el-tooltip
-            v-if="powers.some((item) => item == '061')"
+            v-if="powers.some((i) => i == '061')"
             effect="dark"
             content="查看毛利率"
             placement="top"
@@ -179,15 +179,12 @@ export default {
     //组件SIZE设置
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
-      let tran =
+      const tran =
         this.$store.getters.btnList.find(
           (item) => item.menu_route == "searchSort"
         ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {

+ 12 - 15
src/views/goodStore/sort/index.vue

@@ -2,7 +2,7 @@
   <div class="sort pagePadding">
     <ex-table
       v-loading="loading"
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
+      v-if=" powers.some((i) => i == '001')"
       :table="table"
       :data="tableData"
       :columns="columns"
@@ -112,7 +112,7 @@
               :span="3"
               class="fr"
               style="width: 66px; padding: 0 0 0 10px"
-              v-if="powers.some((item) => item == '003')"
+              v-if="powers.some((i) => i == '003')"
             >
               <el-button
                 :size="searchSize"
@@ -139,7 +139,7 @@
 
       <template #operation="{ scope }">
         <el-tooltip
-          v-if="powers.some((item) => item == '007')"
+          v-if="powers.some((i) => i == '007')"
           effect="dark"
           content="详情"
           placement="top"
@@ -150,7 +150,7 @@
           ></i>
         </el-tooltip>
         <el-tooltip
-          v-if="powers.some((item) => item == '005')"
+          v-if="powers.some((i) => i == '005')"
           effect="dark"
           content="修改"
           placement="top"
@@ -162,7 +162,7 @@
         </el-tooltip>
         <el-tooltip
           v-if="
-            powers.some((item) => item == '004') && scope.row.status === '1'
+            powers.some((i) => i == '004') && scope.row.status === '1'
           "
           effect="dark"
           content="禁用"
@@ -175,7 +175,7 @@
         </el-tooltip>
         <el-tooltip
           v-if="
-            powers.some((item) => item == '004') && scope.row.status === '0'
+            powers.some((i) => i == '004') && scope.row.status === '0'
           "
           effect="dark"
           content="启用"
@@ -187,7 +187,7 @@
           ></i>
         </el-tooltip>
         <el-tooltip
-          v-if="powers.some((item) => item == '006')"
+          v-if="powers.some((i) => i == '006')"
           effect="dark"
           content="删除"
           placement="top"
@@ -198,7 +198,7 @@
           ></i>
         </el-tooltip>
         <el-tooltip
-          v-if="powers.some((item) => item == '060')"
+          v-if="powers.some((i) => i == '060')"
           effect="dark"
           content="设置毛利率"
           placement="top"
@@ -259,14 +259,11 @@ export default {
     //组件SIZE设置
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
-      let tran =
-        this.$store.getters.btnList.find((item) => item.menu_route == "sort") ||
+      const tran =
+        this.$store.getters.btnList.find((i) => i.menu_route == "sort") ||
         {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {

+ 10 - 13
src/views/goodStore/specs/index.vue

@@ -2,7 +2,7 @@
   <div class="specs pagePadding">
     <ex-table
       v-loading="loading"
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
+      v-if=" powers.some((i) => i == '001')"
       :table="table"
       :data="tableData"
       :columns="columns"
@@ -120,7 +120,7 @@
               :span="3"
               class="fr"
               style="width: 66px; padding: 0 0 0 10px"
-              v-if="powers.some((item) => item == '003')"
+              v-if="powers.some((i) => i == '003')"
             >
               <el-button
                 :size="searchSize"
@@ -147,7 +147,7 @@
 
       <template #operation="{ scope }">
         <el-tooltip
-          v-if="powers.some((item) => item == '007')"
+          v-if="powers.some((i) => i == '007')"
           effect="dark"
           content="详情"
           placement="top"
@@ -158,7 +158,7 @@
           ></i>
         </el-tooltip>
         <el-tooltip
-          v-if="powers.some((item) => item == '005')"
+          v-if="powers.some((i) => i == '005')"
           effect="dark"
           content="修改"
           placement="top"
@@ -170,7 +170,7 @@
         </el-tooltip>
         <el-tooltip
           v-if="
-            powers.some((item) => item == '004') && scope.row.status === '1'
+            powers.some((i) => i == '004') && scope.row.status === '1'
           "
           effect="dark"
           content="禁用"
@@ -183,7 +183,7 @@
         </el-tooltip>
         <el-tooltip
           v-if="
-            powers.some((item) => item == '004') && scope.row.status === '0'
+            powers.some((i) => i == '004') && scope.row.status === '0'
           "
           effect="dark"
           content="启用"
@@ -195,7 +195,7 @@
           ></i>
         </el-tooltip>
         <el-tooltip
-          v-if="powers.some((item) => item == '006')"
+          v-if="powers.some((i) => i == '006')"
           effect="dark"
           content="删除"
           placement="top"
@@ -236,15 +236,12 @@ export default {
     //组件SIZE设置
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
-      let tran =
+      const tran =
         this.$store.getters.btnList.find(
           (item) => item.menu_route == "specs"
         ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {

+ 11 - 14
src/views/goodStore/unit/index.vue

@@ -2,7 +2,7 @@
   <div class="unit pagePadding">
     <ex-table
       v-loading="loading"
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
+      v-if=" powers.some((i) => i == '001')"
       :table="table"
       :data="tableData"
       :columns="columns"
@@ -120,7 +120,7 @@
               :span="3"
               class="fr"
               style="width: 66px; padding: 0 0 0 10px"
-              v-if="powers.some((item) => item == '003')"
+              v-if="powers.some((i) => i == '003')"
             >
               <el-button
                 :size="searchSize"
@@ -147,7 +147,7 @@
 
       <template #operation="{ scope }">
         <el-tooltip
-          v-if="powers.some((item) => item == '007')"
+          v-if="powers.some((i) => i == '007')"
           effect="dark"
           content="详情"
           placement="top"
@@ -158,7 +158,7 @@
           ></i>
         </el-tooltip>
         <el-tooltip
-          v-if="powers.some((item) => item == '005')"
+          v-if="powers.some((i) => i == '005')"
           effect="dark"
           content="修改"
           placement="top"
@@ -170,7 +170,7 @@
         </el-tooltip>
         <el-tooltip
           v-if="
-            powers.some((item) => item == '004') && scope.row.status === '1'
+            powers.some((i) => i == '004') && scope.row.status === '1'
           "
           effect="dark"
           content="禁用"
@@ -183,7 +183,7 @@
         </el-tooltip>
         <el-tooltip
           v-if="
-            powers.some((item) => item == '004') && scope.row.status === '0'
+            powers.some((i) => i == '004') && scope.row.status === '0'
           "
           effect="dark"
           content="启用"
@@ -195,7 +195,7 @@
           ></i>
         </el-tooltip>
         <el-tooltip
-          v-if="powers.some((item) => item == '006')"
+          v-if="powers.some((i) => i == '006')"
           effect="dark"
           content="删除"
           placement="top"
@@ -236,14 +236,11 @@ export default {
     //组件SIZE设置
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
-      let tran =
-        this.$store.getters.btnList.find((item) => item.menu_route == "unit") ||
+      const tran =
+        this.$store.getters.btnList.find((i) => i.menu_route == "unit") ||
         {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {

+ 10 - 13
src/views/interest/account/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="account pagePadding">
-    <div v-if="powers && powers.length > 0 && powers.some((item) => item == '001')">
+    <div v-if=" powers.some((i) => i == '001')">
       <ex-table
         v-loading="loading"
         :table="table"
@@ -122,7 +122,7 @@
         </template>
         <template #operation="{ scope }">
           <el-tooltip
-            v-if="powers.some((item) => item == '002')"
+            v-if="powers.some((i) => i == '002')"
             effect="dark"
             content="重置密码"
             placement="top"
@@ -134,7 +134,7 @@
           </el-tooltip>
 
           <el-tooltip
-            v-if="powers.some((item) => item == '007')"
+            v-if="powers.some((i) => i == '007')"
             effect="dark"
             content="详情"
             placement="top"
@@ -145,7 +145,7 @@
             ></i>
           </el-tooltip>
           <el-tooltip
-            v-if="powers.some((item) => item == '005')"
+            v-if="powers.some((i) => i == '005')"
             effect="dark"
             content="修改"
             placement="top"
@@ -156,7 +156,7 @@
             ></i>
           </el-tooltip>
           <el-tooltip
-            v-if="powers.some((item) => item == '004') && scope.row.status === '1'"
+            v-if="powers.some((i) => i == '004') && scope.row.status === '1'"
             effect="dark"
             content="禁用"
             placement="top"
@@ -167,7 +167,7 @@
             ></i>
           </el-tooltip>
           <el-tooltip
-            v-if="powers.some((item) => item == '004') && scope.row.status === '0'"
+            v-if="powers.some((i) => i == '004') && scope.row.status === '0'"
             effect="dark"
             content="启用"
             placement="top"
@@ -219,13 +219,10 @@ export default {
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
-      let tran =
-        this.$store.getters.btnList.find((item) => item.menu_route == "account") || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const tran =
+        this.$store.getters.btnList.find((i) => i.menu_route == "account") || {};
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {

+ 12 - 15
src/views/interest/action/index.vue

@@ -2,7 +2,7 @@
   <div class="action">
     <div
       class="action_show_box"
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
+      v-if=" powers.some((i) => i == '001')"
     >
       <ul class="role-list fl">
         <p class="role-list__title">角色列表</p>
@@ -69,7 +69,7 @@
                       <div class="checkAll">
                         <el-checkbox
                           v-model="subItem.checkAll"
-                          :disabled="!powers.some((item) => item == '008')"
+                          :disabled="!powers.some((i) => i == '008')"
                           :indeterminate="indeterminateCheck(subItem)"
                           @change="handleCheckAllChange($event, index, item, subIndex)"
                           >功能全选</el-checkbox
@@ -78,14 +78,14 @@
                       <div class="checkItem">
                         <el-checkbox-group
                           v-model="subItem.checkList"
-                          :disabled="!powers.some((item) => item == '008')"
+                          :disabled="!powers.some((i) => i == '008')"
                           @change="
                             handleCheckedGroupChange($event, index, item, subIndex)
                           "
                         >
                           <template v-for="children in subItem.action">
                             <el-checkbox
-                              :disabled="!powers.some((item) => item == '008')"
+                              :disabled="!powers.some((i) => i == '008')"
                               :key="'checkItem' + children.id"
                               :label="children.id"
                               @change="
@@ -110,7 +110,7 @@
                       <div class="checkAll">
                         <el-checkbox
                           v-model="subItem.fieldAll"
-                          :disabled="!powers.some((item) => item == '008')"
+                          :disabled="!powers.some((i) => i == '008')"
                           :indeterminate="indeterminateField(subItem)"
                           @change="handleFieldAllChange($event, index, item, subIndex)"
                           >字段全选</el-checkbox
@@ -119,14 +119,14 @@
                       <div class="checkItem">
                         <el-checkbox-group
                           v-model="subItem.fieldList"
-                          :disabled="!powers.some((item) => item == '008')"
+                          :disabled="!powers.some((i) => i == '008')"
                           @change="handleFieldGroupChange($event, index, item, subIndex)"
                         >
                           <template v-for="children in subItem.action_data">
                             <el-checkbox
                               :key="'FieldItem' + children.id"
                               :label="children.id"
-                              :disabled="!powers.some((item) => item == '008')"
+                              :disabled="!powers.some((i) => i == '008')"
                               @change="
                                 handleFieldChange(
                                   $event,
@@ -153,7 +153,7 @@
         <el-button
           size="small"
           type="primary"
-          v-if="powers.some((item) => item == '008')"
+          v-if="powers.some((i) => i == '008')"
           :disabled="isBtnDisabled"
           @click="save()"
           >提 交</el-button
@@ -192,13 +192,10 @@ export default {
   },
   computed: {
     powers() {
-      let tran =
-        this.$store.getters.btnList.find((item) => item.menu_route == "action") || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const tran =
+        this.$store.getters.btnList.find((i) => i.menu_route == "action") || {};
+      const { action } = tran ?? {};
+      return action ?? [];
     },
     indeterminateCheck() {
       return (item) => {

+ 10 - 13
src/views/interest/dataShare/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="dataShare pagePadding">
-    <div v-if="powers && powers.length > 0 && powers.some((item) => item == '001')">
+    <div v-if=" powers.some((i) => i == '001')">
       <ex-table
         v-loading="loading"
         :table="table"
@@ -75,7 +75,7 @@
               <el-col
                 :span="3"
                 style="width: 66px; float: right"
-                v-if="powers.some((item) => item == '003')"
+                v-if="powers.some((i) => i == '003')"
               >
                 <el-button
                   :size="searchSize"
@@ -102,7 +102,7 @@
 
         <template #operation="{ scope }">
           <el-tooltip
-            v-if="powers.some((item) => item == '007')"
+            v-if="powers.some((i) => i == '007')"
             effect="dark"
             content="详情"
             placement="top"
@@ -110,7 +110,7 @@
             <i class="el-icon-view tb-icon" @click="openModal(scope.row.id, true)"></i>
           </el-tooltip>
           <el-tooltip
-            v-if="powers.some((item) => item == '005')"
+            v-if="powers.some((i) => i == '005')"
             effect="dark"
             content="修改"
             placement="top"
@@ -118,7 +118,7 @@
             <i class="el-icon-edit tb-icon" @click="openModal(scope.row.id, false)"></i>
           </el-tooltip>
           <el-tooltip
-            v-if="powers.some((item) => item == '004') && scope.row.status === '1'"
+            v-if="powers.some((i) => i == '004') && scope.row.status === '1'"
             effect="dark"
             content="禁用"
             placement="top"
@@ -129,7 +129,7 @@
             ></i>
           </el-tooltip>
           <el-tooltip
-            v-if="powers.some((item) => item == '004') && scope.row.status === '0'"
+            v-if="powers.some((i) => i == '004') && scope.row.status === '0'"
             effect="dark"
             content="启用"
             placement="top"
@@ -171,13 +171,10 @@ export default {
     //组件SIZE设置
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
-      let tran =
-        this.$store.getters.btnList.find((item) => item.menu_route == "dataShare") || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const tran =
+        this.$store.getters.btnList.find((i) => i.menu_route == "dataShare") || {};
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {

+ 9 - 12
src/views/interest/group/index.vue

@@ -6,7 +6,7 @@
   <div class="group pagePadding">
     <ex-table
       v-loading="loading"
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
+      v-if=" powers.some((i) => i == '001')"
       :table="table"
       :data="tableData"
       :columns="columns"
@@ -43,7 +43,7 @@
               <el-col
                 :span="3"
                 style="width: 66px; float: right"
-                v-if="powers.some((item) => item == '003')"
+                v-if="powers.some((i) => i == '003')"
               >
                 <el-button
                   :size="searchSize"
@@ -71,7 +71,7 @@
 
       <template #operation="{ scope }">
         <el-tooltip
-          v-if="powers.some((item) => item == '007')"
+          v-if="powers.some((i) => i == '007')"
            
           effect="dark"
           content="详情"
@@ -83,7 +83,7 @@
           ></i>
         </el-tooltip>
         <el-tooltip
-          v-if="powers.some((item) => item == '005')"
+          v-if="powers.some((i) => i == '005')"
            
           effect="dark"
           content="修改"
@@ -96,7 +96,7 @@
         </el-tooltip>
         <el-tooltip
           v-if="
-            powers.some((item) => item == '004') && scope.row.status === '1'
+            powers.some((i) => i == '004') && scope.row.status === '1'
           "
            
           effect="dark"
@@ -110,7 +110,7 @@
         </el-tooltip>
         <el-tooltip
           v-if="
-            powers.some((item) => item == '004') && scope.row.status === '0'
+            powers.some((i) => i == '004') && scope.row.status === '0'
           "
            
           effect="dark"
@@ -151,15 +151,12 @@ export default {
     //组件SIZE设置
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
-      let tran =
+      const tran =
         this.$store.getters.btnList.find(
           (item) => item.menu_route == "group"
         ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {

+ 4 - 7
src/views/interest/handover/addDetail.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="newProcess pagePadding">
     <div
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
+      v-if=" powers.some((i) => i == '001')"
     >
       <!-- v-if="v-if="status === 0"" -->
       <div style="width: 500px">
@@ -53,15 +53,12 @@ export default {
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
-      let tran =
+      const tran =
         this.$store.getters.btnList.find(
           (item) => item.menu_route == "newProcess"
         ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {

+ 7 - 10
src/views/interest/handover/components/addEditForm.vue

@@ -16,7 +16,7 @@
             :disabled="
               !(
                 id === 'add' ||
-                (status === '0' && powers.some((item) => item == '005'))
+                (status === '0' && powers.some((i) => i == '005'))
               )
             "
             :is-detail="id !== 'add'"
@@ -34,7 +34,7 @@
             :disabled="
               !(
                 id === 'add' ||
-                (status === '0' && powers.some((item) => item == '005'))
+                (status === '0' && powers.some((i) => i == '005'))
               )
             "
             :is-detail="id !== 'add'"
@@ -57,7 +57,7 @@
             :disabled="
               !(
                 id === 'add' ||
-                (status === '0' && powers.some((item) => item == '005'))
+                (status === '0' && powers.some((i) => i == '005'))
               )
             "
           >
@@ -82,7 +82,7 @@
         style="text-align: right; padding: 0 0 20px 0"
         v-if="
           id === 'add' ||
-          (status === '0' && powers.some((item) => item == '005'))
+          (status === '0' && powers.some((i) => i == '005'))
         "
       >
         <el-button type="primary" :size="'mini'" @click="submitForm"
@@ -143,15 +143,12 @@ export default {
   },
   computed: {
     powers() {
-      let tran =
+      const tran =
         this.$store.getters.btnList.find(
           (item) => item.menu_route == "handoverDetail"
         ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   mounted() {

+ 16 - 22
src/views/interest/handover/detail.vue

@@ -1,8 +1,6 @@
 <template>
   <div class="handoverDetail pagePadding">
-    <div
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
-    >
+    <div v-if="powers.some((i) => i == '001')">
       <div class="detail-page-title">
         <span>离职交接记录编号:</span><span v-if="sitem">{{ queryId }}</span>
         <el-button
@@ -11,10 +9,7 @@
           class="fr"
           :size="'mini'"
           plain
-          v-if="
-            (status === '0' || status === '1') &&
-            powers.some((item) => item == '015')
-          "
+          v-if="(status === '0' || status === '1') && powers.some((i) => i == '015')"
           >作废该条信息</el-button
         >
         <el-button
@@ -22,7 +17,7 @@
           plain
           class="fr"
           :size="'mini'"
-          v-if="status === '1' && powers.some((item) => item == '014')"
+          v-if="status === '1' && powers.some((i) => i == '014')"
           >取消审核流程</el-button
         >
       </div>
@@ -47,7 +42,7 @@
             <el-collapse-item
               title="发起审核流程"
               name="1"
-              v-if="status === '0' && powers.some((item) => item == '012')"
+              v-if="status === '0' && ppowers.some((i) => i == '0')"
             >
               <div style="height: 50px; padding: 0 0px 20px 0">
                 <el-button
@@ -62,7 +57,7 @@
             <el-collapse-item
               title="离职交接审核"
               name="2"
-              v-if="status === '1' && powers.some((item) => item == '016')"
+              v-if="status === '1' && ppowers.some((i) => i == '1')"
             >
               <div style="height: 50px; padding: 0 0px 20px 0">
                 <el-button
@@ -149,7 +144,7 @@
     </div>
   </div>
 </template>
-   <script>
+<script>
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
 import addEditForm from "./components/addEditForm";
@@ -163,15 +158,16 @@ export default {
   },
   computed: {
     powers() {
-      let tran =
-        this.$store.getters.btnList.find(
-          (item) => item.menu_route == "handoverDetail"
-        ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const tran =
+        this.$store.getters.btnList.find((i) => i.menu_route == "handoverDetail") || {};
+      const { action } = tran ?? {};
+      return action ?? [];
+    },
+    ppowers() {
+      const tran =
+        this.$store.getters.roleProcess.find((i) => i.process_type === "LZJJ") || {};
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   watch: {
@@ -324,5 +320,3 @@ export default {
   },
 };
 </script>
-
-   

+ 31 - 45
src/views/interest/handover/index.vue

@@ -1,8 +1,6 @@
 <template>
   <div class="account pagePadding">
-    <div
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
-    >
+    <div v-if="powers.some((i) => i == '001')">
       <ex-table
         v-loading="loading"
         :table="table"
@@ -69,11 +67,7 @@
                     刷新
                   </el-button>
                 </el-col>
-                <el-col
-                  :span="4"
-                  class="fr"
-                  style="width: 66px; padding: 0 0 0 10px"
-                >
+                <el-col :span="4" class="fr" style="width: 66px; padding: 0 0 0 10px">
                   <el-button
                     type="warning"
                     class="fr"
@@ -111,7 +105,7 @@
                 <el-col
                   :span="3"
                   style="width: 66px; float: right"
-                  v-if="powers.some((item) => item == '003')"
+                  v-if="powers.some((i) => i == '003')"
                 >
                   <el-button
                     :size="searchSize"
@@ -147,21 +141,21 @@
                 : ''
             "
             v-text="
-              (status_options.find((item) => item.value == scope.row.status) || {})
-                .label || '--'
+              (status_options.find((i) => i.value == scope.row.status) || {}).label ||
+              '--'
             "
           ></el-tag>
         </template>
         <template #operation="{ scope }">
           <el-tooltip
-            v-if="powers.some((item) => item == '007')"
+            v-if="powers.some((i) => i == '007')"
             effect="dark"
             content="详情"
             placement="top"
           >
             <i
               class="el-icon-view tb-icon"
-               @click="getRouter('handoverDetail', scope.row.id  )"
+              @click="getRouter('handoverDetail', scope.row.id)"
             ></i>
           </el-tooltip>
         </template>
@@ -195,15 +189,10 @@ export default {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
 
     powers() {
-      let tran =
-        this.$store.getters.btnList.find(
-          (item) => item.menu_route == "handover"
-        ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const tran =
+        this.$store.getters.btnList.find((i) => i.menu_route == "handover") || {};
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {
@@ -264,7 +253,7 @@ export default {
           label: "状态",
           _slot_: "status",
         },
-          {
+        {
           prop: "expire_date",
           label: "生效时间",
           sortable: true,
@@ -278,7 +267,7 @@ export default {
           prop: "",
           label: "操作",
           fixed: "right",
-          width:50,
+          width: 50,
           _noset_: true,
           _slot_: "operation",
         },
@@ -289,36 +278,34 @@ export default {
     const { back } = this.$route.query;
     if (back) {
       this.parmValue = JSON.parse(back);
-      console.log(this.parmValue)
-      const {page,size}=this.parmValue;
+      console.log(this.parmValue);
+      const { page, size } = this.parmValue;
       // this.parmValue.start = start || last_start;
       // this.parmValue.end = end || last_end;
-      if(this.parmValue.resign_uid.length>0){
-        this.resign_uid = [this.parmValue.resign_uid] ;
+      if (this.parmValue.resign_uid.length > 0) {
+        this.resign_uid = [this.parmValue.resign_uid];
       }
-      if(this.parmValue.hand_uid.length>0){
-        this.hand_uid = [this.parmValue.hand_uid] ;
+      if (this.parmValue.hand_uid.length > 0) {
+        this.hand_uid = [this.parmValue.hand_uid];
       }
-      
-      
-       this.pageInfo= {
+
+      this.pageInfo = {
         size: size,
         curr: page,
         total: 0,
-      }
+      };
       //多选条件
-    // this.select = this.parmValue.select;
-    // this.sselect = this.parmValue.sselect;
-    // this.sinput = this.parmValue.sinput
-
-    }else{
+      // this.select = this.parmValue.select;
+      // this.sselect = this.parmValue.sselect;
+      // this.sinput = this.parmValue.sinput
+    } else {
       //  this.select = "1";
       //  this.sselect = "创建时间"
     }
     this.searchList();
   },
   methods: {
-    getRouter(toRouter, queryId){
+    getRouter(toRouter, queryId) {
       if (toRouter && queryId) {
         let model = {
           id: queryId,
@@ -330,13 +317,13 @@ export default {
         // this.parmValue.sselect = this.sselect ;
         // this.parmValue.sinput= this.sinput;
         //
-        console.log(this.parmValue)
-         let routerModel = {
+        console.log(this.parmValue);
+        let routerModel = {
           options: JSON.parse(JSON.stringify(this.parmValue)),
           router: this.$route.path,
         };
         model.preModel = JSON.stringify(routerModel);
-        
+
         this.routeGoto(toRouter, model);
       } else {
         this.$message.warning("暂未找到相关流程!");
@@ -424,5 +411,4 @@ export default {
   },
 };
 </script>
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>

+ 6 - 9
src/views/interest/organize/index.vue

@@ -2,7 +2,7 @@
   <div class="organize pagePadding">
     <div
       v-loading="loading"
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
+      v-if=" powers.some((i) => i == '001')"
     >
       <el-row>
         <el-col :span="24">
@@ -58,7 +58,7 @@
                   刷新
                 </el-button>
                 <el-button
-                  v-if="powers.some((item) => item == '003')"
+                  v-if="powers.some((i) => i == '003')"
                   type="success"
                   :size="searchSize"
                   style="float: right"
@@ -85,7 +85,7 @@
         <el-col
           :span="24"
           v-if="
-            powers && powers.length > 0 && powers.some((item) => item == '001')
+             powers.some((i) => i == '001')
           "
         >
           <organize-tree
@@ -148,15 +148,12 @@ export default {
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
-      let tran =
+      const tran =
         this.$store.getters.btnList.find(
           (item) => item.menu_route == "organize"
         ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {

+ 90 - 248
src/views/interest/processPermission/index.vue

@@ -2,7 +2,7 @@
   <div class="processPermission">
     <div
       class="processPermission_show_box"
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
+      v-if=" powers.some((i) => i == '001')"
     >
       <ul class="role-list fl">
         <p class="role-list__title">角色列表</p>
@@ -26,43 +26,31 @@
       <div class="rule-view fr">
         <div class="rule-list">
           <el-row v-for="(item, index) in perActionList" :key="'menu' + item.id + index">
-            <el-col class="ffff" :span="24">
-              <div class="checkAll">
-                <!-- @change="handleCheckAllChange($event, index, item, subIndex)" -->
-                <!-- :indeterminate="indeterminateCheck(subItem)" -->
+            <el-col class="title" :span="24">
+              <el-checkbox
+                v-model="item.checkAll"
+                @change="handleCheckAllChange($event, index, item)"
+                :indeterminate="indeterminateCheck(item)"
+                :disabled="!powers.some((it) => it == '008')"
+                >全选</el-checkbox
+              >
+              <span style="padding: 0 0 0 30px">{{ item.process_name }}</span>
+            </el-col>
+            <el-col class="main" :span="24">
+              <el-checkbox-group
+                v-model="item.checkList"
+                @change="handleCheckedGroupChange($event, index, item)"
+                :disabled="!powers.some((it) => it == '008')"
+              >
                 <el-checkbox
-                  v-model="item.checkAll"
-                  :disabled="!powers.some((item) => item == '008')"
-                  >审核节点全选</el-checkbox
-                >
-              </div>
-              <div class="checkItem">
-                <!-- @change=" handleCheckedGroupChange($event, index, item, subIndex) -->
-                <!-- " -->
-                <el-checkbox-group
-                  v-model="item.checkList"
-                  :disabled="!powers.some((item) => item == '008')"
+                  @change="handleCheckedChange($event, subitem.id, index, item)"
+                  v-for="(subitem, subIndex) in item.child"
+                  :key="'checkItem' + subitem.id"
+                  :label="subitem.id"
+                  >{{ subitem.status_name }}</el-checkbox
                 >
-                  <!-- @change="
-                                handleCheckedChange(
-                                  $event,
-                                  children.id,
-                                  index,
-                                  subIndex,
-                                  item
-                                )
-                              " -->
-                  <template v-for="children in item.child">
-                    <el-checkbox
-                      :disabled="!powers.some((item) => item == '008')"
-                      :key="'checkItem' + children.id"
-                      :label="children.id"
-                      >{{ children.status_name }}</el-checkbox
-                    >
-                  </template>
-                </el-checkbox-group>
-              </div>
-            </el-col>
+              </el-checkbox-group></el-col
+            >
           </el-row>
         </div>
       </div>
@@ -70,7 +58,7 @@
         <el-button
           size="small"
           type="primary"
-          v-if="powers.some((item) => item == '008')"
+          v-if="powers.some((i) => i == '008')"
           :disabled="isBtnDisabled"
           @click="save()"
           >提 交</el-button
@@ -101,7 +89,6 @@ export default {
       rules: [],
       // 功能权限列表
       perActionList: [],
-      processPermission_data: [], // 字段数据
       processPermission: [], // 功能数据
       private_data: [], //私有数据菜单ID
       private_field: [],
@@ -109,33 +96,30 @@ export default {
   },
   computed: {
     powers() {
-      let tran =
+      const tran =
         this.$store.getters.btnList.find(
           (item) => item.menu_route === "processPermission"
         ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
+    },
+    indeterminateCheck() {
+      return (item) => {
+        // 选中子节点的数量
+        const selectItemLength = item.child.filter(
+          (filitem) =>
+            item.checkList.findIndex((finditem) => finditem === filitem.id) > -1
+        ).length;
+        // 未选中子节点的数量
+        const noSlectItemLength = item.child.filter(
+          (filitem) =>
+            item.checkList.findIndex((finditem) => finditem === filitem.id) == -1
+        ).length;
+        // // 当前节点的index
+        // 存在选中子节点且存在未选中子节点为中间态
+        return selectItemLength > 0 && noSlectItemLength > 0;
+      };
     },
-    // indeterminateCheck() {
-    //   return (item) => {
-    //     // 选中子节点的数量
-    //     const selectItemLength = item.processPermission.filter(
-    //       (filitem) =>
-    //         item.checkList.findIndex((finditem) => finditem === filitem.id) > -1
-    //     ).length;
-    //     // 未选中子节点的数量
-    //     const noSlectItemLength = item.processPermission.filter(
-    //       (filitem) =>
-    //         item.checkList.findIndex((finditem) => finditem === filitem.id) == -1
-    //     ).length;
-    //     // // 当前节点的index
-    //     // 存在选中子节点且存在未选中子节点为中间态
-    //     return selectItemLength > 0 && noSlectItemLength > 0;
-    //   };
-    // },
   },
   mounted() {
     this.initperActionList();
@@ -143,54 +127,46 @@ export default {
 
   methods: {
     // 全选/全不选
-    handleCheckAllChange(checkAll, index, item, subIndex) {
-      this.perActionList[index].child[subIndex].checkAll = checkAll;
+    handleCheckAllChange(checkAll, index, item) {
+      this.perActionList[index].checkAll = checkAll;
       this.$set(this.perActionList, index, item);
-      this.perActionList[index].child[subIndex].processPermission.forEach((element) => {
-        const findindex = this.perActionList[index].child[subIndex].checkList.findIndex(
+      this.perActionList[index].child.forEach((element) => {
+        const findindex = this.perActionList[index].checkList.findIndex(
           (findItem) => findItem === element.id
         );
         if (checkAll && findindex == -1) {
-          this.perActionList[index].child[subIndex].checkList.push(element.id);
+          this.perActionList[index].checkList.push(element.id);
         } else if (!checkAll && findindex > -1) {
-          this.perActionList[index].child[subIndex].checkList.splice(findindex, 1);
+          this.perActionList[index].checkList.splice(findindex, 1);
         }
       });
     },
 
     // 复选框组内的选中/不选中
-    handleCheckedGroupChange(event, index, item, subIndex) {
-      // console.log(event, index, subIndex);
-      this.perActionList[index].child[subIndex].checkAll = this.perActionList[
-        index
-      ].child[subIndex].processPermission.every(
+    handleCheckedGroupChange(event, index, item) {
+      this.perActionList[index].checkAll = this.perActionList[index].child.every(
         (evitem) =>
-          this.perActionList[index].child[subIndex].checkList.findIndex(
+          this.perActionList[index].checkList.findIndex(
             (finditem) => finditem === evitem.id
           ) > -1
       );
       this.$set(this.perActionList, index, item);
     },
 
-    // 单项复选框选中/不选中
-
-    handleCheckedChange(checked, id, index, subIndex, item) {
-      // console.log(checked, id, index, subIndex);
+    // 多选框选中/不选中
+    handleCheckedChange(checked, id, index, item) {
       if (checked) {
-        // 选中时检查pid的选中状态
-        this.perActionList[index].child[subIndex].checkList.indexOf(id) == -1 &&
-          this.perActionList[index].child[subIndex].checkList.push(id);
+        this.perActionList[index].checkList.indexOf(id) == -1 &&
+          this.perActionList[index].checkList.push(id);
       } else {
-        const find = this.perActionList[index].child[subIndex].checkList.findIndex(
-          (e) => e == id
-        );
+        const find = this.perActionList[index].checkList.findIndex((e) => e == id);
         if (find > -1) {
-          this.perActionList[index].child[subIndex].checkList.splice(find, 1);
+          this.perActionList[index].checkList.splice(find, 1);
         }
-        this.perActionList[index].child[subIndex].checkAll = false;
+        this.perActionList[index].checkAll = false;
       }
       this.$set(this.perActionList, index, item);
-      // console.log(this.perActionList[index].child[subIndex]);
+      // console.log(this.perActionList[index]);
     },
 
     // 切换角色
@@ -202,43 +178,30 @@ export default {
     },
     // 保存
     async save() {
-      this.processPermission_data = []; // 字段数据
-      this.processPermission = []; // 功能数据
       let arr = [];
       this.perActionList.forEach((x) => {
-        x.child.forEach((y) => {
-          this.processPermission.push(...y.checkList);
-          if (y.is_private_change === "1") {
-            arr.push(y.id);
-          }
-        });
+        arr.push(...x.checkList);
       });
 
-      // this.processPermission_data.length === 0 || 和字段
-      if (this.processPermission.length === 0) {
-        this.$message.warning("请选择功能!");
+      if (arr.length === 0) {
+        this.$message.warning("请选择节点!");
       } else {
         const model = {
           roleid: this.roleActive.id,
-          role_name: this.ruleForm.role_name,
-          level: this.ruleForm.level,
-          processPermission: this.processPermission,
-          processPermission_data: this.processPermission_data,
-          private_data: arr,
-          private_field: this.private_field,
+          action_data: arr,
         };
 
         const loadding = this.$loading();
-        const res = await asyncRequest.update(model);
-        if (res && res.code === 0 && res.data) {
+        const { code, data, message } = await asyncRequest.update(model);
+        if (code === 0) {
           this.$notify.success({
             title: "保存成功!",
             message: "",
           });
-        } else if (res && res.code >= 100 && res.code <= 104) {
+        } else if (code >= 100 && code <= 104) {
           await this.logout();
         } else {
-          this.$message.warning(res.message);
+          this.$message.warning(message);
         }
         loadding.close();
       }
@@ -295,55 +258,26 @@ export default {
       const list = JSON.parse(JSON.stringify(this.rules));
       let arr = list.filter((item) => item.child && item.child.length > 0);
       arr = arr.map((x) => {
+        x.checkAll = false;
+        x.checkList = [];
         x.child.map((y) => {
-          y.checkAll = false;
-          y.checkList = [];
-          // y.fieldAll = false;
-          // y.fieldList = [];
-          // y.is_private_change = "0";
-          // if (y.is_private === "0") {
-          //   y.private = [];
-          // } else {
-          //   y.private = [
-          //     {
-          //       id: "0",
-          //       label: "公有数据",
-          //     },
-          //     {
-          //       id: "1",
-          //       label: "私有数据",
-          //     },
-          //   ];
-          // }
+          y.id += "";
           return y;
         });
         return x;
       });
       this.perActionList = arr;
+      console.log(this.perActionList);
+      console.log(this.action_data_list);
       this.perActionList.forEach((x, xi) => {
         if (x.child && x.child.length > 0) {
           x.child.forEach((y, yi) => {
-            let id = y.id;
-            if (y.processPermission && y.processPermission.length > 0) {
-              y.processPermission.forEach((z) => {
-                const Aindex = this.processPermission.findIndex((a) => a === z.id);
-                if (Aindex !== -1) {
-                  y.checkList.push(this.processPermission[Aindex]);
-                }
-                if (y.processPermission.length === y.checkList.length) {
-                  y.checkAll = true;
-                }
-              });
+            const Aindex = this.action_data_list.findIndex((a) => a === y.id);
+            if (Aindex !== -1) {
+              x.checkList.push(this.action_data_list[Aindex]);
             }
-            if (y.private && y.private.length === 2) {
-              let Cindex = this.private_data.findIndex((a) => a === y.id);
-              if (Cindex !== -1) {
-                y.is_private_change = "1";
-              } else {
-                y.is_private_change = "0";
-              }
-            } else {
-              y.is_private_change = "0";
+            if (x.child.length === x.checkList.length) {
+              x.checkAll = true;
             }
           });
         }
@@ -422,110 +356,18 @@ export default {
       width: calc(100% - 200px);
       overflow-y: auto;
       @include scrollBar();
-      // padding: 0 0 0 16px;
-      .ffff {
-        width: 100%;
-        display: flex;
-        align-items: stretch;
-        .ftitle {
-          width: 110px;
-          text-align: center;
-          border-right: 1px solid #dfe6ec;
-          border-bottom: 1px solid #dfe6ec;
-          padding: 12px 14px;
-          display: flex;
-          align-items: center;
-          span {
-            display: inline-block;
-            width: 100%;
-            font-size: 17px;
-            text-align: center;
-            color: #97a8be;
-          }
+      .rule-list {
+        border-right: 1px solid #dfe6ec;
+        .title {
+          padding: 18px 18px 12px 18px;
+          border-bottom: 1px dashed #dfe6ec;
+          font-size: 15px;
+          color: #97a8be;
         }
-        .fbody {
-          width: calc(100% - 110px);
-          .fbody-item {
-            border-right: 1px solid #dfe6ec;
-            border-bottom: 1px solid #dfe6ec;
-
-            .stitle {
-              padding: 18px 18px 12px 18px;
-              border-bottom: 1px dashed #dfe6ec;
-              font-size: 14px;
-              color: #97a8be;
-              ._h2 {
-                display: inline-block;
-                // width: 100px;
-              }
-            }
-            .scheck {
-              padding: 15px 0 10px 0;
-              display: flex;
-              width: 100%;
-              .checkAll {
-                width: 140px;
-                text-align: right;
-                padding: 0 35px 0 0;
-              }
-              .checkItem {
-                width: calc(100% - 140px);
-              }
-            }
-            .sfield {
-              padding: 0 0 10px 0;
-              display: flex;
-              width: 100%;
-              .checkAll {
-                width: 140px;
-                text-align: right;
-                padding: 0 35px 0 0;
-              }
-              .checkItem {
-                width: calc(100% - 140px);
-              }
-            }
-          }
+        .main {
+          padding: 18px 18px 12px 18px;
+          border-bottom: 1px solid #dfe6ec;
         }
-        // .rule-list {
-        //   height: 100%;
-        //   overflow-y: auto;
-        //   padding: 0 0 80px 0;
-        //   .rule-title {
-        //     .title {
-        //       font-size: 20px;
-        //       color: #333;
-        //     }
-        //     .desc {
-        //       margin: 10px 0;
-        //       font-size: 12px;
-        //       color: #999;
-        //     }
-        //   }
-        //   .rule-item {
-        //     .title {
-        //       margin: 30px 30px 10px 0;
-        //       font-size: 18px;
-        //       padding-bottom: 12px;
-        //       border-bottom: 1px solid #eee;
-        //       color: #333;
-        //       .el-checkbox {
-        //         margin-left: 10px;
-        //       }
-        //     }
-        //     .el-checkbox-group {
-        //       margin: 10px 30px 30px 0;
-        //       .el-checkbox {
-        //         line-height: 30px;
-        //       }
-        //       .children-checkbox-hr {
-        //         margin: 8px 0;
-        //         border: none;
-        //         border-top: 2px dotted #eee;
-        //       }
-        //     }
-        //   }
-        // }
       }
     }
     .rule-bottom {

+ 10 - 13
src/views/interest/role/index.vue

@@ -2,7 +2,7 @@
   <div class="role pagePadding">
     <ex-table
       v-loading="loading"
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
+      v-if=" powers.some((i) => i == '001')"
       :table="table"
       :data="tableData"
       :columns="columns"
@@ -114,7 +114,7 @@
               <el-col
                 :span="3"
                 style="width: 66px; float: right"
-                v-if="powers.some((item) => item == '003')"
+                v-if="powers.some((i) => i == '003')"
               >
                 <el-button
                   :size="searchSize"
@@ -142,7 +142,7 @@
 
       <template #operation="{ scope }">
         <el-tooltip
-          v-if="powers.some((item) => item == '007')"
+          v-if="powers.some((i) => i == '007')"
           effect="dark"
           content="详情"
           placement="top"
@@ -153,7 +153,7 @@
           ></i>
         </el-tooltip>
         <el-tooltip
-          v-if="powers.some((item) => item == '005')"
+          v-if="powers.some((i) => i == '005')"
           effect="dark"
           content="修改"
           placement="top"
@@ -165,7 +165,7 @@
         </el-tooltip>
         <el-tooltip
           v-if="
-            powers.some((item) => item == '004') && scope.row.status === '1'
+            powers.some((i) => i == '004') && scope.row.status === '1'
           "
           effect="dark"
           content="禁用"
@@ -178,7 +178,7 @@
         </el-tooltip>
         <el-tooltip
           v-if="
-            powers.some((item) => item == '004') && scope.row.status === '0'
+            powers.some((i) => i == '004') && scope.row.status === '0'
           "
           effect="dark"
           content="启用"
@@ -220,14 +220,11 @@ export default {
     //组件SIZE设置
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
-      let tran =
-        this.$store.getters.btnList.find((item) => item.menu_route == "role") ||
+      const tran =
+        this.$store.getters.btnList.find((i) => i.menu_route == "role") ||
         {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {

+ 19 - 22
src/views/orderEntry/orderConfirm/index.vue

@@ -2,7 +2,7 @@
   <div class="orderConfirm pagePadding">
     <div
       style="width: 100%"
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
+      v-if=" powers.some((i) => i == '001')"
     >
       <show-data-table
         style="margin: 0 0 10px 0; padding: 0"
@@ -84,7 +84,7 @@
                           :disabled="
                             !(
                               status === '2' &&
-                              powers.some((item) => item == '008')
+                              powers.some((i) => i == '008')
                             )
                           "
                           placeholder="平台订单号"
@@ -99,7 +99,7 @@
                           :disabled="
                             !(
                               status === '2' &&
-                              powers.some((item) => item == '008')
+                              powers.some((i) => i == '008')
                             )
                           "
                           placeholder="其他单号"
@@ -247,7 +247,7 @@
                           :disabled="
                             !(
                               status === '2' &&
-                              powers.some((item) => item == '008')
+                              powers.some((i) => i == '008')
                             )
                           "
                           :picker-options="pickerOptions"
@@ -264,7 +264,7 @@
                           :disabled="
                             !(
                               status === '2' &&
-                              powers.some((item) => item == '008')
+                              powers.some((i) => i == '008')
                             )
                           "
                           @focus="showModel = true"
@@ -417,7 +417,7 @@
                           :disabled="
                             !(
                               status === '2' &&
-                              powers.some((item) => item == '008')
+                              powers.some((i) => i == '008')
                             )
                           "
                           placeholder="收费模式"
@@ -441,7 +441,7 @@
                           :disabled="
                             !(
                               status === '2' &&
-                              powers.some((item) => item == '008')
+                              powers.some((i) => i == '008')
                             )
                           "
                           placeholder="销售渠道"
@@ -491,7 +491,7 @@
                           :disabled="
                             !(
                               status === '2' &&
-                              powers.some((item) => item == '008')
+                              powers.some((i) => i == '008')
                             )
                           "
                           placeholder="收货人"
@@ -506,7 +506,7 @@
                           :disabled="
                             !(
                               status === '2' &&
-                              powers.some((item) => item == '008')
+                              powers.some((i) => i == '008')
                             )
                           "
                           placeholder="收货电话"
@@ -548,7 +548,7 @@
                           :disabled="
                             !(
                               status === '2' &&
-                              powers.some((item) => item == '008')
+                              powers.some((i) => i == '008')
                             )
                           "
                           placeholder="收货省市区"
@@ -564,7 +564,7 @@
                           :disabled="
                             !(
                               status === '2' &&
-                              powers.some((item) => item == '008')
+                              powers.some((i) => i == '008')
                             )
                           "
                           placeholder="详细地址"
@@ -596,7 +596,7 @@
                       maxlength="100"
                       :disabled="
                         !(
-                          status === '2' && powers.some((item) => item == '008')
+                          status === '2' && powers.some((i) => i == '008')
                         )
                       "
                       placeholder="订单备注" /></el-form-item
@@ -637,7 +637,7 @@
                           :disabled="
                             !(
                               status === '2' &&
-                              powers.some((item) => item == '008')
+                              powers.some((i) => i == '008')
                             )
                           "
                           @reschange="number_change($event, 'num')"
@@ -653,7 +653,7 @@
                           :disabled="
                             !(
                               status === '2' &&
-                              powers.some((item) => item == '008')
+                              powers.some((i) => i == '008')
                             )
                           "
                           :max="100000000000"
@@ -692,7 +692,7 @@
                       clearable
                       :disabled="
                         !(
-                          status === '2' && powers.some((item) => item == '008')
+                          status === '2' && powers.some((i) => i == '008')
                         )
                       "
                       @change="get_new_price"
@@ -731,7 +731,7 @@
           </div>
           <div
             class="tab-row"
-            v-if="status === '2' && powers.some((item) => item == '008')"
+            v-if="status === '2' && powers.some((i) => i == '008')"
           >
             <div class="tab-item-label">
               <label style="color: transparent">*</label>
@@ -789,15 +789,12 @@ export default {
   },
   computed: {
     powers() {
-      let tran =
+      const tran =
         this.$store.getters.btnList.find(
           (item) => item.menu_route == "orderConfirm"
         ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {

+ 22 - 73
src/views/orderEntry/orderEnter/index.vue

@@ -1,9 +1,6 @@
 <template>
   <div class="pagePadding">
-    <div
-      class="tableBox"
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
-    >
+    <div class="tableBox" v-if="powers.some((i) => i == '001')">
       <ex-table
         ref="multipleTable"
         v-loading="loading"
@@ -61,16 +58,8 @@
                 />
               </el-col>
 
-              <el-col
-                :span="2"
-                class="fr"
-                style="width: 66px; padding: 0 0 0 10px"
-              >
-                <el-button
-                  size="mini"
-                  type="primary"
-                  class="btn"
-                  @click="resetF5"
+              <el-col :span="2" class="fr" style="width: 66px; padding: 0 0 0 10px">
+                <el-button size="mini" type="primary" class="btn" @click="resetF5"
                   >刷新</el-button
                 >
               </el-col>
@@ -79,20 +68,10 @@
                 :span="2"
                 class="fr"
                 style="width: 130px; padding: 0 0 0 10px"
-                v-if="
-                  powers &&
-                  powers.length > 0 &&
-                  powers.some((item) => item == '013')
-                "
+                v-if="powers.some((i) => i == '013')"
               >
-                <el-button
-                  type="primary"
-                  icon="el-icon-download"
-                  class="btn"
-                  size="mini"
-                  ><a href="./static/C端订单导入模板.xlsx"
-                    >下载导入模板</a
-                  ></el-button
+                <el-button type="primary" icon="el-icon-download" class="btn" size="mini"
+                  ><a href="./static/C端订单导入模板.xlsx">下载导入模板</a></el-button
                 >
               </el-col>
             </el-row>
@@ -117,11 +96,7 @@
                   @timeReturned="addtime"
                 />
               </el-col>
-              <el-col
-                :span="2"
-                class="fr"
-                style="width: 66px; padding: 0 0 0 10px"
-              >
+              <el-col :span="2" class="fr" style="width: 66px; padding: 0 0 0 10px">
                 <el-button type="warning" class="btn" @click="reset" size="mini"
                   >重置</el-button
                 >
@@ -130,11 +105,7 @@
                 :span="2"
                 class="fr"
                 style="width: 130px; padding: 0 0 0 10px"
-                v-if="
-                  powers &&
-                  powers.length > 0 &&
-                  powers.some((item) => item == '085')
-                "
+                v-if="powers.some((i) => i == '085')"
               >
                 <el-button
                   size="mini"
@@ -183,13 +154,9 @@
                 :span="2"
                 class="fr"
                 style="width: 66px; padding: 0 0 0 10px"
-                v-if="powers.some((item) => item == '006')"
+                v-if="powers.some((i) => i == '006')"
               >
-                <el-button
-                  size="mini"
-                  type="danger"
-                  class="btn"
-                  @click="batchDel"
+                <el-button size="mini" type="danger" class="btn" @click="batchDel"
                   >删除</el-button
                 >
               </el-col>
@@ -198,11 +165,7 @@
                 :span="2"
                 class="fr"
                 style="width: 130px; padding: 0 0 0 10px"
-                v-if="
-                  powers &&
-                  powers.length > 0 &&
-                  powers.some((item) => item == '086')
-                "
+                v-if="powers.some((i) => i == '086')"
               >
                 <el-button
                   class="btn entry"
@@ -226,9 +189,7 @@
         </template>
         <template #operation="{ scope }">
           <el-tooltip
-            v-if="
-              powers.some((item) => item == '007') && scope.row.status !== '5'
-            "
+            v-if="powers.some((i) => i == '007') && scope.row.status !== '5'"
             effect="dark"
             content="详情"
             placement="top"
@@ -240,17 +201,14 @@
           </el-tooltip>
           <el-tooltip
             v-if="
-              powers.some((item) => item == '006') &&
+              powers.some((i) => i == '006') &&
               (scope.row.status === '2' || scope.row.status === '4')
             "
             effect="dark"
             content="删除"
             placement="top"
           >
-            <i
-              class="el-icon-delete tb-icon"
-              @click="deleteItem([scope.row.id])"
-            ></i>
+            <i class="el-icon-delete tb-icon" @click="deleteItem([scope.row.id])"></i>
           </el-tooltip>
         </template>
       </ex-table>
@@ -335,15 +293,10 @@ export default {
     //组件SIZE设置
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
-      let tran =
-        this.$store.getters.btnList.find(
-          (item) => item.menu_route == "orderEnter"
-        ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const tran =
+        this.$store.getters.btnList.find((item) => item.menu_route == "orderEnter") || {};
+      const { action } = tran ?? {};
+      return action ?? [];
     },
     statusActive() {
       return function (status) {
@@ -469,17 +422,14 @@ export default {
         return;
       }
       if (
-        (this.parmValue.addtime_start !== "" &&
-          this.parmValue.addtime_end === "") ||
-        (this.parmValue.addtime_start === "" &&
-          this.parmValue.addtime_end !== "")
+        (this.parmValue.addtime_start !== "" && this.parmValue.addtime_end === "") ||
+        (this.parmValue.addtime_start === "" && this.parmValue.addtime_end !== "")
       ) {
         this.$message.warning("导入时间区间不完整!");
         return;
       }
 
-      this.parmValue.platform_code =
-        this.selectValue == "1" ? this.inputValue : "";
+      this.parmValue.platform_code = this.selectValue == "1" ? this.inputValue : "";
       this.parmValue.plat_code = this.selectValue == "2" ? this.inputValue : "";
       this.parmValue.po_code = this.selectValue == "3" ? this.inputValue : "";
       this.parmValue.orderCode = this.selectValue == "4" ? this.inputValue : "";
@@ -667,5 +617,4 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>

+ 4 - 7
src/views/orderEntry/source/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="source pagePadding">
     <div
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
+      v-if=" powers.some((i) => i == '001')"
       v-loading="loading"
     >
       <el-row style="padding: 8px 0 10px 0">
@@ -45,15 +45,12 @@ export default {
     //组件SIZE设置
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
-      let tran =
+      const tran =
         this.$store.getters.btnList.find(
           (item) => item.menu_route == "source"
         ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {

+ 7 - 10
src/views/process/done/index.vue

@@ -2,7 +2,7 @@
   <div class="done pagePadding">
     <ex-table
       v-loading="loading"
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
+      v-if=" powers.some((i) => i == '001')"
       :table="table"
       :data="tableData"
       :columns="columns"
@@ -67,7 +67,7 @@
               <el-col
                 :span="3"
                 style="width: 66px; float: right"
-                v-if="powers.some((item) => item == '003')"
+                v-if="powers.some((i) => i == '003')"
               >
                 <el-button
                   :size="searchSize"
@@ -94,7 +94,7 @@
 
       <template #operation="{ scope }">
         <el-tooltip
-          v-if="powers.some((item) => item == '007')"
+          v-if="powers.some((i) => i == '007')"
           effect="dark"
           content="详情"
           placement="top"
@@ -122,14 +122,11 @@ export default {
     //组件SIZE设置
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
-      let tran =
-        this.$store.getters.btnList.find((item) => item.menu_route == "done") ||
+      const tran =
+        this.$store.getters.btnList.find((i) => i.menu_route == "done") ||
         {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {

+ 7 - 10
src/views/process/oing/index.vue

@@ -2,7 +2,7 @@
   <div class="oing pagePadding">
     <ex-table
       v-loading="loading"
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
+      v-if=" powers.some((i) => i == '001')"
       :table="table"
       :data="tableData"
       :columns="columns"
@@ -68,7 +68,7 @@
             <el-col
               :span="3"
               style="width: 66px; float: right"
-              v-if="powers.some((item) => item == '003')"
+              v-if="powers.some((i) => i == '003')"
             >
               <el-button
                 :size="searchSize"
@@ -95,7 +95,7 @@
 
       <template #operation="{ scope }">
         <el-tooltip
-          v-if="powers.some((item) => item == '007')"
+          v-if="powers.some((i) => i == '007')"
           effect="dark"
           content="详情"
           placement="top"
@@ -120,14 +120,11 @@ export default {
     //组件SIZE设置
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
-      let tran =
-        this.$store.getters.btnList.find((item) => item.menu_route == "oing") ||
+      const tran =
+        this.$store.getters.btnList.find((i) => i.menu_route == "oing") ||
         {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {

+ 6 - 9
src/views/process/read/index.vue

@@ -2,7 +2,7 @@
   <div class="read pagePadding">
     <ex-table
       v-loading="loading"
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
+      v-if=" powers.some((i) => i == '001')"
       :table="table"
       :data="tableData"
       :columns="columns"
@@ -83,7 +83,7 @@
 
       <template #operation="{ scope }">
         <el-tooltip
-          v-if="powers.some((item) => item == '007')"
+          v-if="powers.some((i) => i == '007')"
           effect="dark"
           content="详情"
           placement="top"
@@ -114,14 +114,11 @@ export default {
     //组件SIZE设置
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
-      let tran =
-        this.$store.getters.btnList.find((item) => item.menu_route == "read") ||
+      const tran =
+        this.$store.getters.btnList.find((i) => i.menu_route == "read") ||
         {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {

+ 5 - 8
src/views/process/unRead/index.vue

@@ -2,7 +2,7 @@
   <div class="unRead pagePadding">
     <ex-table
       v-loading="loading"
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
+      v-if=" powers.some((i) => i == '001')"
       :table="table"
       :data="tableData"
       :columns="readUnRead"
@@ -103,7 +103,7 @@
 
       <template #operation="{ scope }">
         <el-tooltip
-          v-if="powers.some((item) => item == '007')"
+          v-if="powers.some((i) => i == '007')"
           effect="dark"
           content="详情"
           placement="top"
@@ -128,15 +128,12 @@ export default {
     //组件SIZE设置
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
-      let tran =
+      const tran =
         this.$store.getters.btnList.find(
           (item) => item.menu_route == "unRead"
         ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {

+ 4 - 7
src/views/purchaseIn/purchaseDiffOrder/detail.vue

@@ -2,7 +2,7 @@
   <div class="purchaseDiffOrderDetail pagePadding">
     <div
       style="width: 100%"
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
+      v-if=" powers.some((i) => i == '001')"
     >
       <!-- <div class="detail-page-title">
         <span>采购工差单编号:</span><span v-if="sitem">{{ sitem.id }}</span>
@@ -116,15 +116,12 @@ export default {
   },
   computed: {
     powers() {
-      let tran =
+      const tran =
         this.$store.getters.btnList.find(
           (item) => item.menu_route == "purchaseDiffOrderDetail"
         ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {

+ 5 - 8
src/views/purchaseIn/purchaseDiffOrder/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="purchaseDiffOrder pagePadding">
     <div
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
+      v-if=" powers.some((i) => i == '001')"
     >
       <ex-table
         v-loading="loading"
@@ -127,7 +127,7 @@
         </template>
         <template #operation="{ scope }">
           <el-tooltip
-            v-if="powers.some((item) => item == '007')"
+            v-if="powers.some((i) => i == '007')"
             effect="dark"
             content="详情"
             placement="top"
@@ -171,15 +171,12 @@ export default {
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
-      let tran =
+      const tran =
         this.$store.getters.btnList.find(
           (item) => item.menu_route == "purchaseDiffOrder"
         ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {

+ 3 - 6
src/views/purchaseIn/purchaseOrder/components/editPrice.vue

@@ -48,15 +48,12 @@ export default {
   mixins: [resToken],
   computed: {
     powers() {
-      let tran =
+      const tran =
         this.$store.getters.btnList.find(
           (item) => item.menu_route == "projectDetail"
         ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   watch: {

+ 6 - 9
src/views/purchaseIn/purchaseOrder/components/order-in-table.vue

@@ -31,8 +31,8 @@
                 class="fr"
                 style="margin: 3px 0 0 0"
                 v-if="
-                  (status === '1' && powers.some((item) => item == '028')) ||
-                  (status === '2' && powers.some((item) => item == '028'))
+                  (status === '1' && powers.some((i) => i == '028')) ||
+                  (status === '2' && powers.some((i) => i == '028'))
                 "
                 effect="dark"
                 content="添加"
@@ -48,7 +48,7 @@
             </template>
             <template slot-scope="scope">
               <el-tooltip
-                v-if="powers.some((item) => item == '007')"
+                v-if="powers.some((i) => i == '007')"
                 effect="dark"
                 content="详情"
                 placement="top"
@@ -87,15 +87,12 @@ export default {
   components: { wsmInOrderModel },
   computed: {
     powers() {
-      let tran =
+      const tran =
         this.$store.getters.btnList.find(
           (item) => item.menu_route == "purchaseOrderDetail"
         ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {

+ 7 - 10
src/views/purchaseIn/purchaseOrder/detail.vue

@@ -3,18 +3,18 @@
    
     <div
       style="width: 100%"
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
+      v-if=" powers.some((i) => i == '001')"
     >
       <div
         class="detail-page-title"
-        v-if="status === '1' && powers.some((item) => item == '082')"
+        v-if="status === '1' && powers.some((i) => i == '082')"
       >
         <span>采购单编号:</span><span>{{ queryId }} </span>
         <tolerance
           :newTime="newTime"
           v-if="newTime !== ''"
           :sitem="sitem"
-          :showBtn="status === '1' && powers.some((item) => item == '082')"
+          :showBtn="status === '1' && powers.some((i) => i == '082')"
         />
       </div>
       <el-tabs v-model="activeTabs">
@@ -67,7 +67,7 @@
                   <el-tooltip
                     class="fr"
                     v-if="
-                      powers.some((item) => item == '089') &&
+                      powers.some((i) => i == '089') &&
                       sitem.status === '0'
                     "
                     effect="dark"
@@ -303,15 +303,12 @@ export default {
 
   computed: {
     powers() {
-      let tran =
+      const tran =
         this.$store.getters.btnList.find(
           (item) => item.menu_route == "purchaseOrderDetail"
         ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {

+ 16 - 36
src/views/purchaseIn/purchaseOrder/index.vue

@@ -1,8 +1,6 @@
 <template>
   <div class="purchaseOrder pagePadding">
-    <div
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
-    >
+    <div v-if="powers.some((i) => i == '001')">
       <ex-table
         v-loading="loading"
         :table="table"
@@ -78,10 +76,7 @@
                 <el-dropdown @command="handleClick($event)" :size="searchSize">
                   <el-button :size="searchSize" style="width: 120px">
                     {{ sselect }}
-                    <i
-                      class="el-icon-arrow-down el-icon--right"
-                      :size="searchSize"
-                    ></i>
+                    <i class="el-icon-arrow-down el-icon--right" :size="searchSize"></i>
                   </el-button>
                   <el-dropdown-menu slot="dropdown">
                     <el-dropdown-item
@@ -116,11 +111,7 @@
               <el-col
                 :span="4"
                 style="width: 150px; float: right"
-                v-if="
-                  powers &&
-                  powers.length > 0 &&
-                  powers.some((item) => item == '089')
-                "
+                v-if="powers.some((i) => i == '089')"
               >
                 <el-button
                   type="primary"
@@ -185,11 +176,7 @@
               <el-col
                 :span="4"
                 style="width: 66px; float: right"
-                v-if="
-                  powers &&
-                  powers.length > 0 &&
-                  powers.some((item) => item == '087')
-                "
+                v-if="powers.some((i) => i == '087')"
               >
                 <el-button
                   type="primary"
@@ -214,10 +201,8 @@
           <el-tag
             :size="tablebtnSize"
             v-text="
-              (
-                statusOptions.find((item) => item.value == scope.row.status) ||
-                {}
-              ).label || '--'
+              (statusOptions.find((item) => item.value == scope.row.status) || {})
+                .label || '--'
             "
           ></el-tag>
         </template>
@@ -226,16 +211,15 @@
             :size="tablebtnSize"
             v-text="
               (
-                cg_order_type_options.find(
-                  (item) => item.id == scope.row.order_type
-                ) || {}
+                cg_order_type_options.find((item) => item.id == scope.row.order_type) ||
+                {}
               ).label || '--'
             "
           ></el-tag>
         </template>
         <template #operation="{ scope }">
           <el-tooltip
-            v-if="powers.some((item) => item == '007')"
+            v-if="powers.some((i) => i == '007')"
             effect="dark"
             content="详情"
             placement="top"
@@ -253,7 +237,7 @@
     </div>
   </div>
 </template>
-   <script>
+<script>
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
 import urlConfig from "@/apis/url-config";
@@ -269,15 +253,11 @@ export default {
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
-      let tran =
-        this.$store.getters.btnList.find(
-          (item) => item.menu_route == "purchaseOrder"
-        ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const tran =
+        this.$store.getters.btnList.find((item) => item.menu_route == "purchaseOrder") ||
+        {};
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {
@@ -669,7 +649,7 @@ export default {
   },
 };
 </script>
-   <style lang="scss" scoped>
+<style lang="scss" scoped>
 .purchaseOrder {
   // text-align: right;
 }

+ 3 - 6
src/views/purchaseIn/purchaseReturn/components/purchase-order-addEdit.vue

@@ -32,15 +32,12 @@ export default {
   // components: { purchaseOrderAddeditModel },
   computed: {
     powers() {
-      let tran =
+      const tran =
         this.$store.getters.btnList.find(
           (item) => item.menu_route == "purchaseOrderDetail"
         ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {

+ 4 - 7
src/views/purchaseIn/purchaseReturn/detail.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="purchaseReturnDetail pagePadding">
     <div
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
+      v-if=" powers.some((i) => i == '001')"
     >
       <el-tabs v-model="activeTabs">
         <el-tab-pane label="业务详情" name="1">
@@ -77,15 +77,12 @@ export default {
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
-      let tran =
+      const tran =
         this.$store.getters.btnList.find(
           (item) => item.menu_route == "purchaseReturnDetail"
         ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {

+ 8 - 11
src/views/purchaseIn/purchaseReturn/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="purchaseReturn pagePadding">
     <div
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
+      v-if=" powers.some((i) => i == '001')"
     >
       <ex-table
         v-loading="loading"
@@ -130,7 +130,7 @@
         </template>
         <template #operation="{ scope }">
           <el-tooltip
-            v-if="powers.some((item) => item == '007')"
+            v-if="powers.some((i) => i == '007')"
             effect="dark"
             content="详情"
             placement="top"
@@ -142,7 +142,7 @@
             ></i>
           </el-tooltip>
           <el-tooltip
-            v-if="powers.some((item) => item == '005')"
+            v-if="powers.some((i) => i == '005')"
             effect="dark"
             content="修改"
             placement="top"
@@ -154,7 +154,7 @@
           </el-tooltip>
           <el-tooltip
             v-if="
-              powers.some((item) => item == '004') && scope.row.status === '1'
+              powers.some((i) => i == '004') && scope.row.status === '1'
             "
             effect="dark"
             content="禁用"
@@ -167,7 +167,7 @@
           </el-tooltip>
           <el-tooltip
             v-if="
-              powers.some((item) => item == '004') && scope.row.status === '0'
+              powers.some((i) => i == '004') && scope.row.status === '0'
             "
             effect="dark"
             content="启用"
@@ -199,15 +199,12 @@ export default {
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
-      let tran =
+      const tran =
         this.$store.getters.btnList.find(
           (item) => item.menu_route == "purchaseReturn"
         ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {

+ 4 - 7
src/views/purchaseIn/recovery/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="recovery pagePadding">
     <div
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
+      v-if=" powers.some((i) => i == '001')"
     >
       <ex-table
         v-loading="loading"
@@ -152,15 +152,12 @@ export default {
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
-      let tran =
+      const tran =
         this.$store.getters.btnList.find(
           (item) => item.menu_route == "recovery"
         ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {

+ 3 - 6
src/views/purchaseIn/workbench/components/baseForm.vue

@@ -698,15 +698,12 @@ export default {
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
-      let tran =
+      const tran =
         this.$store.getters.btnList.find(
           (item) => item.menu_route == "goodsCostAdd"
         ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   watch: {

+ 5 - 8
src/views/purchaseIn/workbench/detail.vue

@@ -2,7 +2,7 @@
   <div class="workbenchdetail">
     <div
       class="page-main clear"
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '007')"
+      v-if=" powers.some((i) => i == '007')"
     >
       <div v-if="status !== '1'">
         <search-not :placeholder="'招标任务已结束!'" />
@@ -243,7 +243,7 @@
               </template>
               <template slot-scope="scope">
                 <el-tooltip
-                  v-if="powers.some((item) => item == '007')"
+                  v-if="powers.some((i) => i == '007')"
                   effect="dark"
                   content="详情"
                   placement="top"
@@ -285,15 +285,12 @@ export default {
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
-      let tran =
+      const tran =
         this.$store.getters.btnList.find(
           (item) => item.menu_route == "workbenchDetail"
         ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {

+ 6 - 17
src/views/purchaseIn/workbench/index.vue

@@ -1,10 +1,6 @@
 <template>
   <div class="workbench">
-    <div
-      class="workbench-main"
-      v-loading="loading"
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
-    >
+    <div class="workbench-main" v-loading="loading" v-if="powers.some((i) => i == '001')">
       <ul class="clear po-ul">
         <li class="po-li">
           <div class="taskTitle color1">竞价单任务</div>
@@ -108,13 +104,10 @@ export default {
     //组件SIZE设置
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
-      let tran =
-        this.$store.getters.btnList.find((item) => item.menu_route == "workbench") || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const tran =
+        this.$store.getters.btnList.find((i) => i.menu_route == "workbench") || {};
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {
@@ -198,11 +191,7 @@ export default {
   methods: {
     wantTo(infoNo) {
       console.log(this.powers);
-      if (
-        this.powers &&
-        this.powers.length > 0 &&
-        this.powers.some((item) => item == "007")
-      ) {
+      if (this.powers.some((i) => i == "007")) {
         this.routeGoto("workbenchDetail", { id: infoNo });
       }
     },

+ 4 - 7
src/views/purchaseIn/wsmInOrder/components/wsm-in-order-check-form.vue

@@ -96,7 +96,7 @@
         <el-col :span="24" style="text-align: right; padding: 0 0 10px 0">
           <el-button
             :size="'mini'"
-            v-if="status === '2' && powers.some((item) => item == '030')"
+            v-if="status === '2' && powers.some((i) => i == '030')"
             type="primary"
             @click="submitForm"
             >保 存
@@ -116,15 +116,12 @@ export default {
   mixins: [resToken],
   computed: {
     powers() {
-      let tran =
+      const tran =
         this.$store.getters.btnList.find(
           (item) => item.menu_route == "wsmInOrderDetail"
         ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {

+ 6 - 9
src/views/purchaseIn/wsmInOrder/components/wsm-in-order-record-form.vue

@@ -26,7 +26,7 @@
               :placeholder="'正常数量'"
               :min="0"
               :disabled="
-                !(status === '1' && powers.some((item) => item == '029'))
+                !(status === '1' && powers.some((i) => i == '029'))
               "
               :max="ruleForm.send_num"
               :position="'right'"
@@ -92,7 +92,7 @@
             <el-table-column
               fixed="right"
               width="80"
-              v-if="status === '1' && powers.some((item) => item == '029')"
+              v-if="status === '1' && powers.some((i) => i == '029')"
             >
               <template slot="header" slot-scope="scope">
                 <span>操作</span>
@@ -126,7 +126,7 @@
         <el-button
           type="primary"
           :size="'mini'"
-          v-if="status === '1' && powers.some((item) => item == '029')"
+          v-if="status === '1' && powers.some((i) => i == '029')"
           @click="submitForm"
           >保 存
         </el-button>
@@ -146,15 +146,12 @@ export default {
   mixins: [resToken],
   computed: {
     powers() {
-      let tran =
+      const tran =
         this.$store.getters.btnList.find(
           (item) => item.menu_route == "wsmInOrderDetail"
         ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {

+ 6 - 9
src/views/purchaseIn/wsmInOrder/components/wsm-in-order-return-form.vue

@@ -24,7 +24,7 @@
       <el-col :span="6">
         <el-form-item label="物流公司" prop="post_company">
           <search-express
-            :disabled="!(status === '5' && powers.some((item) => item == '032'))"
+            :disabled="!(status === '5' && powers.some((i) => i == '032'))"
             :value="ruleForm.post_company"
             :placeholder="'物流公司'"
             :order_source="'0'"
@@ -39,7 +39,7 @@
         <el-form-item label="物流单号" prop="post_code">
           <el-input
             placeholder="物流单号"
-            :disabled="!(status === '5' && powers.some((item) => item == '032'))"
+            :disabled="!(status === '5' && powers.some((i) => i == '032'))"
             v-model="ruleForm.post_code"
             maxlength="100"
           >
@@ -49,7 +49,7 @@
       <el-col :span="2" style="text-align: right">
         <el-button
           type="primary"
-          v-if="status === '5' && powers.some((item) => item == '032')"
+          v-if="status === '5' && powers.some((i) => i == '032')"
           :size="'mini'"
           @click="submitForm"
           >保 存
@@ -68,15 +68,12 @@ export default {
   mixins: [resToken],
   computed: {
     powers() {
-      let tran =
+      const tran =
         this.$store.getters.btnList.find(
           (item) => item.menu_route == "wsmInOrderDetail"
         ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {

+ 6 - 9
src/views/purchaseIn/wsmInOrder/detail.vue

@@ -2,7 +2,7 @@
   <div class="stockInDetail pagePadding">
     <div
       style="width: 100%"
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
+      v-if=" powers.some((i) => i == '001')"
     >
       <!-- <div class="detail-page-title">
         <span class="title">入库单编号:{{ queryId }}</span>
@@ -135,7 +135,7 @@
               name="5"
               v-if="
                 status == '3' &&
-                powers.some((item) => item == '031') &&
+                powers.some((i) => i == '031') &&
                 sitem &&
                 sitem.sendtype === '1'
               "
@@ -155,7 +155,7 @@
               name="6"
               v-if="
                 status == '5' &&
-                powers.some((item) => item == '032') &&
+                powers.some((i) => i == '032') &&
                 sitem.sendtype === '1'
               "
             >
@@ -212,15 +212,12 @@ export default {
   },
   computed: {
     powers() {
-      let tran =
+      const tran =
         this.$store.getters.btnList.find(
           (item) => item.menu_route == "wsmInOrderDetail"
         ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {

+ 6 - 9
src/views/purchaseIn/wsmInOrder/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="purchaseOrder pagePadding">
-    <div v-if="powers && powers.length > 0 && powers.some((item) => item == '001')">
+    <div v-if=" powers.some((i) => i == '001')">
       <ex-table
         v-loading="loading"
         :table="table"
@@ -221,7 +221,7 @@
 
         <template #operation="{ scope }">
           <el-tooltip
-            v-if="powers.some((item) => item == '007')"
+            v-if="powers.some((i) => i == '007')"
             effect="dark"
             content="详情"
             placement="top"
@@ -255,13 +255,10 @@ export default {
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
-      let tran =
-        this.$store.getters.btnList.find((item) => item.menu_route == "wsmInOrder") || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const tran =
+        this.$store.getters.btnList.find((i) => i.menu_route == "wsmInOrder") || {};
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {

+ 3 - 6
src/views/reportQuery/financeReport/history-data.vue

@@ -106,15 +106,12 @@ export default {
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
-      let tran =
+      const tran =
         this.$store.getters.btnList.find(
           (item) => item.menu_route == "financeReport"
         ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {

+ 4 - 7
src/views/reportQuery/financeReport/index.vue

@@ -2,7 +2,7 @@
   <div class="financeReport pagePadding">
     <div
       v-loading="loading"
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
+      v-if=" powers.some((i) => i == '001')"
       style="margin-top:25px"
     >
       <el-tabs type="border-card" v-model="activeName">
@@ -47,15 +47,12 @@ export default {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     //组件SIZE设置
     powers() {
-      let tran =
+      const tran =
         this.$store.getters.btnList.find(
           (item) => item.menu_route == "financeReport"
         ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {

+ 3 - 6
src/views/reportQuery/financeReport/pre-export.vue

@@ -100,15 +100,12 @@ export default {
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
-      let tran =
+      const tran =
         this.$store.getters.btnList.find(
           (item) => item.menu_route == "financeReport"
         ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {

+ 3 - 6
src/views/reportQuery/financeReport/real-time-export-new.vue

@@ -101,15 +101,12 @@ export default {
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
-      let tran =
+      const tran =
         this.$store.getters.btnList.find(
           (item) => item.menu_route == "financeReport"
         ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {

+ 3 - 6
src/views/reportQuery/financeReport/real-time-export.vue

@@ -55,15 +55,12 @@ export default {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     //组件SIZE设置
     powers() {
-      let tran =
+      const tran =
         this.$store.getters.btnList.find(
           (item) => item.menu_route == "financeReport"
         ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {

+ 5 - 9
src/views/reportQuery/productReport/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="pagePadding">
-    <div v-if="powers && powers.length > 0 && powers.some((item) => item == '001')">
+    <div v-if="powers.some((i) => i == '001')">
       <el-tabs v-model="activeName">
         <el-tab-pane label="商品基本信息报表" name="table3">
           <table3 v-if="activeName == 'table3'"></table3>
@@ -38,14 +38,10 @@ export default {
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
-      let tran =
-        this.$store.getters.btnList.find((item) => item.menu_route == "productReport") ||
-        {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const tran =
+        this.$store.getters.btnList.find((i) => i.menu_route == "productReport") || {};
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {

+ 4 - 7
src/views/reportQuery/purchaseReport/index.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="pagePadding">
     <div
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
+      v-if=" powers.some((i) => i == '001')"
     >
         <!-- <el-tabs v-model="activeName" @tab-click="handleClick"> -->
         <el-tabs v-model="activeName">
@@ -73,15 +73,12 @@ components:{
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
-      let tran =
+      const tran =
         this.$store.getters.btnList.find(
           (item) => item.menu_route == "purchaseReport"
         ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data(){

+ 4 - 7
src/views/reportQuery/saleReport/index.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="pagePadding">
     <div
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
+      v-if=" powers.some((i) => i == '001')"
     >
         <!-- <el-tabs v-model="activeName" @tab-click="handleClick"> -->
         <el-tabs v-model="activeName">
@@ -91,15 +91,12 @@ components:{
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
-      let tran =
+      const tran =
         this.$store.getters.btnList.find(
           (item) => item.menu_route == "saleReport"
         ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data(){

+ 3 - 6
src/views/reportQuery/saleReportOrder/history-data.vue

@@ -106,15 +106,12 @@ export default {
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
-      let tran =
+      const tran =
         this.$store.getters.btnList.find(
           (item) => item.menu_route == "saleReportOrder"
         ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {

+ 4 - 7
src/views/reportQuery/saleReportOrder/index.vue

@@ -2,7 +2,7 @@
   <div class="financeReport pagePadding">
     <div
       v-loading="loading"
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
+      v-if=" powers.some((i) => i == '001')"
       style="margin-top:25px"
     >
       <el-tabs type="border-card" v-model="activeName">
@@ -47,15 +47,12 @@ export default {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     //组件SIZE设置
     powers() {
-      let tran =
+      const tran =
         this.$store.getters.btnList.find(
           (item) => item.menu_route == "saleReportOrder"
         ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {

+ 3 - 6
src/views/reportQuery/saleReportOrder/pre-export.vue

@@ -100,15 +100,12 @@ export default {
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
-      let tran =
+      const tran =
         this.$store.getters.btnList.find(
           (item) => item.menu_route == "saleReportOrder"
         ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {

+ 3 - 6
src/views/reportQuery/saleReportOrder/real-time-export-new.vue

@@ -101,15 +101,12 @@ export default {
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
-      let tran =
+      const tran =
         this.$store.getters.btnList.find(
           (item) => item.menu_route == "saleReportOrder"
         ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {

+ 3 - 6
src/views/reportQuery/saleReportOrder/real-time-export.vue

@@ -55,15 +55,12 @@ export default {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     //组件SIZE设置
     powers() {
-      let tran =
+      const tran =
         this.$store.getters.btnList.find(
           (item) => item.menu_route == "saleReportOrder"
         ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {

+ 3 - 6
src/views/reportQuery/stockReport/history-data.vue

@@ -106,15 +106,12 @@ export default {
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
-      let tran =
+      const tran =
         this.$store.getters.btnList.find(
           (item) => item.menu_route == "stockReport"
         ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {

+ 4 - 7
src/views/reportQuery/stockReport/index.vue

@@ -2,7 +2,7 @@
   <div class="financeReport pagePadding">
     <div
       v-loading="loading"
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
+      v-if=" powers.some((i) => i == '001')"
       style="margin-top:25px"
     >
       <el-tabs type="border-card" v-model="activeName">
@@ -47,15 +47,12 @@ export default {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     //组件SIZE设置
     powers() {
-      let tran =
+      const tran =
         this.$store.getters.btnList.find(
           (item) => item.menu_route == "stockReport"
         ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {

+ 3 - 6
src/views/reportQuery/stockReport/pre-export.vue

@@ -100,15 +100,12 @@ export default {
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
-      let tran =
+      const tran =
         this.$store.getters.btnList.find(
           (item) => item.menu_route == "stockReport"
         ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {

+ 3 - 6
src/views/reportQuery/stockReport/real-time-export-new.vue

@@ -101,15 +101,12 @@ export default {
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
-      let tran =
+      const tran =
         this.$store.getters.btnList.find(
           (item) => item.menu_route == "stockReport"
         ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {

+ 3 - 6
src/views/reportQuery/stockReport/real-time-export.vue

@@ -55,15 +55,12 @@ export default {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     //组件SIZE设置
     powers() {
-      let tran =
+      const tran =
         this.$store.getters.btnList.find(
           (item) => item.menu_route == "stockReport"
         ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {

+ 12 - 15
src/views/sellOut/bargainList/detail.vue

@@ -2,7 +2,7 @@
   <div class="bargainListDetail">
     <div
       class="bargainListDetail-main"
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '007')"
+      v-if=" powers.some((i) => i == '007')"
     >
       <el-tabs v-model="projectTabs" v-loading="loading">
         <el-tab-pane label="议价单详情" name="1">
@@ -123,14 +123,14 @@
               name="2"
               v-if="
                 eaxmList.some((item) => item.info_status + '' == '0') ||
-                (status == '0' && powers.some((item) => item == '043'))
+                (status == '0' && powers.some((i) => i == '043'))
               "
             >
               <exam-formss
                 :newTime="newTime"
                 v-if="newTime !== ''"
                 :disabled="
-                  !(status == '0' && powers.some((item) => item == '043'))
+                  !(status == '0' && powers.some((i) => i == '043'))
                 "
                 :sitem="orderItem"
                 @searchChange="examFormSubmit($event, '业务部门')"
@@ -141,14 +141,14 @@
               name="3"
               v-if="
                 eaxmList.some((item) => item.info_status + '' == '2') ||
-                (status == '2' && powers.some((item) => item == '058'))
+                (status == '2' && powers.some((i) => i == '058'))
               "
             >
               <exam-formss
                 :newTime="newTime"
                 v-if="newTime !== ''"
                 :disabled="
-                  !(status == '2' && powers.some((item) => item == '058'))
+                  !(status == '2' && powers.some((i) => i == '058'))
                 "
                 :sitem="moneyDirItem"
                 @searchChange="examFormSubmit($event, '财务专员')"
@@ -159,14 +159,14 @@
               name="4"
               v-if="
                 eaxmList.some((item) => item.info_status + '' == '4') ||
-                (status == '4' && powers.some((item) => item == '059'))
+                (status == '4' && powers.some((i) => i == '059'))
               "
             >
               <exam-formss
                 :newTime="newTime"
                 v-if="newTime !== ''"
                 :disabled="
-                  !(status == '4' && powers.some((item) => item == '059'))
+                  !(status == '4' && powers.some((i) => i == '059'))
                 "
                 :sitem="moneyItem"
                 @searchChange="examFormSubmit($event, '财务主管')"
@@ -177,14 +177,14 @@
               name="5"
               v-if="
                 eaxmList.some((item) => item.info_status + '' == '7') ||
-                (status == '7' && powers.some((item) => item == '084'))
+                (status == '7' && powers.some((i) => i == '084'))
               "
             >
               <exam-formss
                 :newTime="newTime"
                 v-if="newTime !== ''"
                 :disabled="
-                  !(status == '7' && powers.some((item) => item == '084'))
+                  !(status == '7' && powers.some((i) => i == '084'))
                 "
                 :sitem="BossItem"
                 @searchChange="examFormSubmit($event, 'BOSS')"
@@ -241,15 +241,12 @@ export default {
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size", "private_field"]),
     powers() {
-      let tran =
+      const tran =
         this.$store.getters.btnList.find(
           (item) => item.menu_route == "bargainListDetail"
         ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
 

+ 5 - 8
src/views/sellOut/bargainList/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="bargainList pagePadding">
     <div
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
+      v-if=" powers.some((i) => i == '001')"
     >
       <ex-table
         v-loading="loading"
@@ -149,7 +149,7 @@
         </template>
         <template #operation="{ scope }">
           <el-tooltip
-            v-if="powers.some((item) => item == '007')"
+            v-if="powers.some((i) => i == '007')"
             effect="dark"
             content="详情"
             placement="top"
@@ -181,15 +181,12 @@ export default {
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
-      let tran =
+      const tran =
         this.$store.getters.btnList.find(
           (item) => item.menu_route == "bargainList"
         ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {

+ 33 - 57
src/views/sellOut/project/components/backGoodShow.vue

@@ -8,22 +8,15 @@
       <div class="project-backGoodShow-title">商品要求{{ index + 1 }}</div>
       <div class="project-backGoodShow-ask-table">
         <template v-if="item.ladder">
-          <el-table
-            :data="item.ladder"
-            :size="'mini'"
-            border
-            stripe
-            style="width: 100%"
-          >
+          <el-table :data="item.ladder" :size="'mini'" border stripe style="width: 100%">
             <el-table-column prop="good_type" label="商品类型" width="80px">
               <template slot-scope="scope">
                 <el-tag
                   :size="'mini'"
                   v-text="
                     (
-                      statusOptions.find(
-                        (item) => item.value == scope.row.good_type
-                      ) || {}
+                      statusOptions.find((item) => item.value == scope.row.good_type) ||
+                      {}
                     ).label || '--'
                   "
                 ></el-tag
@@ -57,12 +50,7 @@
         <el-tooltip
           effect="dark"
           class="fr"
-          v-if="
-            powers &&
-            powers.length > 0 &&
-            powers.some((item) => item == '062') &&
-            (status === '1' || status === '2')
-          "
+          v-if="ppowers.some((i) => i == '0') && (status === '1' || status === '2')"
           content="添加线上商品"
           style="margin: 16px 10px 0 0"
           placement="top"
@@ -134,13 +122,8 @@
             >
               <template slot-scope="scope">
                 <span>{{ scope.row.good_name }}</span>
-                <span
-                  v-for="(si, sii) in scope.row.specinfo"
-                  :key="si.id + sii"
-                >
-                  {{ sii === 0 ? "_" : "-" }}{{ si.spec_name }}[{{
-                    si.spec_value_name
-                  }}]
+                <span v-for="(si, sii) in scope.row.specinfo" :key="si.id + sii">
+                  {{ sii === 0 ? "_" : "-" }}{{ si.spec_name }}[{{ si.spec_value_name }}]
                 </span>
               </template>
             </el-table-column>
@@ -160,9 +143,7 @@
                 <el-tag
                   :size="'mini'"
                   :type="scope.row.data_source === '1' ? 'success' : ''"
-                  >{{
-                    scope.row.data_source === "1" ? "平台商品" : "采反商品"
-                  }}</el-tag
+                  >{{ scope.row.data_source === "1" ? "平台商品" : "采反商品" }}</el-tag
                 >
               </template>
             </el-table-column>
@@ -190,26 +171,26 @@
               min-width="60px"
               show-overflow-tooltip
             />
-            <el-table-column label="操作" width="80px" show-overflow-tooltip fixed="right">
+            <el-table-column
+              label="操作"
+              width="80px"
+              show-overflow-tooltip
+              fixed="right"
+            >
               <template slot-scope="scope">
                 <el-tooltip
-                  v-if="powers.some((item) => item == '007')"
+                  v-if="powers.some((i) => i == '007')"
                   effect="dark"
                   content="详情"
                   placement="top"
                 >
-                  <i
-                    class="el-icon-view tb-icon"
-                    @click="show_view(scope.row)"
-                  ></i>
+                  <i class="el-icon-view tb-icon" @click="show_view(scope.row)"></i>
                 </el-tooltip>
                 <el-tooltip
                   effect="dark"
                   content="删除"
                   placement="top"
-                  v-if="
-                    scope.row.data_source === '1' && status === '2'
-                  "
+                  v-if="scope.row.data_source === '1' && status === '2'"
                 >
                   <i
                     class="el-icon-delete tb-icon"
@@ -218,11 +199,7 @@
                 </el-tooltip> </template
             ></el-table-column>
           </el-table>
-          <div
-            v-if="item.tableData"
-            class="Pagination"
-            style="text-align: right"
-          >
+          <div v-if="item.tableData" class="Pagination" style="text-align: right">
             <el-pagination
               :current-page="item.pageInfo.curr"
               :page-size="item.pageInfo.size"
@@ -290,7 +267,7 @@
 
             <template #operation="{ scope }">
               <el-tooltip
-                v-if="powers.some((item) => item == '007')"
+                v-if="powers.some((i) => i == '007')"
                 effect="dark"
                 content="详情"
                 placement="top"
@@ -350,15 +327,17 @@ export default {
   },
   computed: {
     powers() {
-      let tran =
-        this.$store.getters.btnList.find(
-          (item) => item.menu_route == "projectDetail"
-        ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const tran =
+        this.$store.getters.btnList.find((item) => item.menu_route == "projectDetail") ||
+        {};
+      const { action } = tran ?? {};
+      return action ?? [];
+    },
+    ppowers() {
+      const tran =
+        this.$store.getters.roleProcess.find((i) => i.process_type === "PRO") || {};
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   watch: {
@@ -432,14 +411,13 @@ export default {
       this.allList[index].loading = true;
       this.allList[index].tableData = [];
       await this.searchList(index);
-    
     },
     //初始化整个组件
     async initListData() {
       this.allList = [];
       const { projectNo, ladder, status } = this.sitem;
       this.status = status;
-        console.log(this.status);
+      console.log(this.status);
       this.projectNo = projectNo;
       if (ladder && ladder.length > 0) {
         ladder.forEach((e) => {
@@ -515,12 +493,10 @@ export default {
           v.model = "";
           if (v.specinfo && v.specinfo.length > 0) {
             v.specinfo.forEach((y, yi) => {
-              v.model += `${yi !== 0 ? "--" : ""}${y.spec_name}[${
-                y.spec_value_name
-              }]`;
+              v.model += `${yi !== 0 ? "--" : ""}${y.spec_name}[${y.spec_value_name}]`;
             });
           }
-           if (v.good_img) {
+          if (v.good_img) {
             v.good_img =
               Object.prototype.toString.call(v.good_img) === "[object Array]"
                 ? v.good_img
@@ -579,7 +555,7 @@ export default {
 };
 </script>
 
-   <style lang="scss" scoped>
+<style lang="scss" scoped>
 .project-backGoodShow {
   box-sizing: border-box;
   width: 100%;

+ 10 - 29
src/views/sellOut/project/components/grossForm.vue

@@ -19,10 +19,7 @@
             :precision="2"
             :size="'mini'"
             :disabled="
-              (status === '5' || status === '6') &&
-              powers &&
-              powers.length > 0 &&
-              powers.some((item) => item == '060')
+              (status === '5' || status === '6') && powers.some((i) => i == '060')
             "
             :controls="false"
             :append="'%'"
@@ -33,16 +30,9 @@
       <el-col
         :span="12"
         style="text-align: right"
-        v-if="
-          (status !== '5' || status !== '6') &&
-          powers &&
-          powers.length > 0 &&
-          powers.some((item) => item == '060')
-        "
+        v-if="(status !== '5' || status !== '6') && powers.some((i) => i == '060')"
       >
-        <el-button type="primary" :size="'mini'" @click="submitForm"
-          >保 存
-        </el-button>
+        <el-button type="primary" :size="'mini'" @click="submitForm">保 存 </el-button>
       </el-col>
     </el-row>
   </el-form>
@@ -57,15 +47,11 @@ export default {
   mixins: [resToken],
   computed: {
     powers() {
-      let tran =
-        this.$store.getters.btnList.find(
-          (item) => item.menu_route == "projectDetail"
-        ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const tran =
+        this.$store.getters.btnList.find((item) => item.menu_route == "projectDetail") ||
+        {};
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   watch: {
@@ -85,12 +71,7 @@ export default {
     const validate_sale_price = (rule, value, callback) => {
       if (value === "") {
         callback(new Error("项目毛利率不能为空!"));
-      } else if (
-        value === "0" ||
-        value === "0." ||
-        value === "0.0" ||
-        value === "0.00"
-      ) {
+      } else if (value === "0" || value === "0." || value === "0.0" || value === "0.00") {
         callback(new Error("项目毛利率不能为零!"));
       } else {
         callback();
@@ -186,7 +167,7 @@ export default {
 };
 </script>
 
-   <style lang="scss" scoped>
+<style lang="scss" scoped>
 .account {
 }
 </style>

+ 15 - 15
src/views/sellOut/project/components/setPlan.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="project-setPlan" v-loading="loading">
+    {{ ppowers }}
     <div class="project-setPlan-main">
       <div class="project-setPlan-title">商品要求</div>
       <div class="project-setPlan-ask-table">
@@ -191,12 +192,7 @@
           <el-button
             type="primary"
             class="fr"
-            v-if="
-              powers &&
-              powers.length > 0 &&
-              powers.some((item) => item == '064') &&
-              (status == '3' || status == '4')
-            "
+            v-if="ppowers.some((i) => i == '3') && (status == '3' || status == '4')"
             @click="add_plan"
             icon="el-icon-circle-plus-outline"
             :size="'mini'"
@@ -205,7 +201,9 @@
           <el-button
             type="primary"
             class="fr"
-            v-if="plan_show.status === '1'"
+            v-if="
+              plan_show.status === '1' && ppowers.some((i) => i == '5') && status == '5'
+            "
             @click="place_order"
             :size="'mini'"
             >项目下单<i class="el-icon-shopping-cart-2 el-icon--right"></i>
@@ -422,14 +420,16 @@ export default {
   },
   computed: {
     powers() {
-      let tran =
-        this.$store.getters.btnList.find((item) => item.menu_route == "projectDetail") ||
-        {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const tran =
+        this.$store.getters.btnList.find((i) => i.menu_route == "projectDetail") || {};
+      const { action } = tran ?? {};
+      return action ?? [];
+    },
+    ppowers() {
+      const tran =
+        this.$store.getters.roleProcess.find((i) => i.process_type === "PRO") || {};
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   watch: {

+ 11 - 22
src/views/sellOut/project/detail.vue

@@ -1,10 +1,7 @@
 <template>
   <div class="projectDetail pagePadding">
-    <div
-      class="projectDetail-main"
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '007')"
-    >
-      <div class="share-a" v-if="powers.some((item) => item == '063')">
+    <div class="projectDetail-main" v-if="powers.some((i) => i == '007')">
+      <div class="share-a" v-if="powers.some((i) => i == '063')">
         <el-tooltip effect="dark" content="分享项目" placement="top">
           <el-button
             @click="copyToClip('good-share')"
@@ -41,7 +38,7 @@
             <el-collapse-item
               title="设置项目毛利率"
               name="1"
-              v-if="powers.some((item) => item == '061')"
+              v-if="powers.some((i) => i == '061')"
             >
               <gross-form
                 v-if="newTime !== ''"
@@ -69,10 +66,7 @@
           name="3"
           v-if="
             queryType !== 'add' &&
-            (status === '3' ||
-              status === '4' ||
-              status === '5' ||
-              status === '6')
+            (status === '3' || status === '4' || status === '5' || status === '6')
           "
         >
           <set-plan
@@ -101,7 +95,7 @@
     </div>
   </div>
 </template>
-   <script>
+<script>
 import asyncRequest from "@/apis/service/sellOut/project";
 import resToken from "@/mixins/resToken";
 import { mapGetters } from "vuex";
@@ -122,15 +116,11 @@ export default {
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
-      let tran =
-        this.$store.getters.btnList.find(
-          (item) => item.menu_route == "projectDetail"
-        ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const tran =
+        this.$store.getters.btnList.find((item) => item.menu_route == "projectDetail") ||
+        {};
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
 
@@ -247,7 +237,7 @@ export default {
   },
 };
 </script>
-   <style lang="scss" scoped>
+<style lang="scss" scoped>
 .projectDetail {
   position: relative;
   height: 100%;
@@ -297,4 +287,3 @@ export default {
   }
 }
 </style>
-   

+ 6 - 9
src/views/sellOut/project/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="project pagePadding">
     <div
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
+      v-if=" powers.some((i) => i == '001')"
     >
       <ex-table
         v-loading="loading"
@@ -139,7 +139,7 @@
                   :span="3"
                   class="fr"
                   style="width: 66px; padding: 0 0 0 10px"
-                  v-if="powers.some((item) => item == '003')"
+                  v-if="powers.some((i) => i == '003')"
                 >
                   <el-button
                     :size="searchSize"
@@ -175,7 +175,7 @@
         </template>
         <template #operation="{ scope }">
           <el-tooltip
-            v-if="powers.some((item) => item == '007')"
+            v-if="powers.some((i) => i == '007')"
             effect="dark"
             content="详情"
             placement="top"
@@ -206,15 +206,12 @@ export default {
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
-      let tran =
+      const tran =
         this.$store.getters.btnList.find(
           (item) => item.menu_route == "project"
         ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {

+ 16 - 19
src/views/sellOut/returnOrder/components/auditForm.vue

@@ -18,7 +18,7 @@
             placeholder="审核状态"
             style="width: 100%"
             :disabled="
-              !(status === '3' && powers.some((item) => item == '043'))
+              !(status === '3' && powers.some((i) => i == '043'))
             "
             @change="stateChange"
           >
@@ -38,7 +38,7 @@
             placeholder="驳回节点"
             style="width: 100%"
             :disabled="
-              !(status === '3' && powers.some((item) => item == '043'))
+              !(status === '3' && powers.some((i) => i == '043'))
             "
           >
             <el-option
@@ -60,7 +60,7 @@
             placeholder="请输入审核备注"
             v-model="ruleForm.status_remark"
             :disabled="
-              !(status === '3' && powers.some((item) => item == '043'))
+              !(status === '3' && powers.some((i) => i == '043'))
             "
             maxlength="250"
             :autosize="{ minRows: 3, maxRows: 3 }"
@@ -71,7 +71,7 @@
       <el-col
         :span="2"
         class="fr"
-        v-if="status === '3' && powers.some((item) => item == '043')"
+        v-if="status === '3' && powers.some((i) => i == '043')"
       >
         <el-form-item class="fr">
           <el-button
@@ -92,7 +92,7 @@
             placeholder="审核状态"
             style="width: 100%"
             :disabled="
-              !(status === '3' && powers.some((item) => item == '043'))
+              !(status === '3' && powers.some((i) => i == '043'))
             "
             @change="stateChange"
           >
@@ -120,7 +120,7 @@
             :min="0"
             :max="100000000000"
             :disabled="
-              !(status === '3' && powers.some((item) => item == '043'))
+              !(status === '3' && powers.some((i) => i == '043'))
             "
             :size="'mini'"
             :position="'right'"
@@ -142,7 +142,7 @@
             :min="0"
             :max="100000000000"
             :disabled="
-              !(status === '3' && powers.some((item) => item == '043'))
+              !(status === '3' && powers.some((i) => i == '043'))
             "
             :size="'mini'"
             :position="'right'"
@@ -159,7 +159,7 @@
             :min="0"
             :size="'mini'"
             :disabled="
-              !(status === '3' && powers.some((item) => item == '043'))
+              !(status === '3' && powers.some((i) => i == '043'))
             "
             :max="100000000000"
             :position="'right'"
@@ -194,7 +194,7 @@
             :size="'mini'"
             :value="ruleForm.can_sell_wsm_com"
             :disabled="
-              !(status === '3' && powers.some((item) => item == '043'))
+              !(status === '3' && powers.some((i) => i == '043'))
             "
             :placeholder="'仓库所在公司'"
             :names="ruleForm.can_sell_wsm_com_name"
@@ -210,7 +210,7 @@
             :value="ruleForm.can_sell_wsm"
             :placeholder="'可销售入库仓库'"
             :disabled="
-              !(status === '3' && powers.some((item) => item == '043'))
+              !(status === '3' && powers.some((i) => i == '043'))
             "
             :isDetail="true"
             :isRelation="true"
@@ -245,7 +245,7 @@
             :size="'mini'"
             :value="ruleForm.defective_wsm_com"
             :disabled="
-              !(status === '3' && powers.some((item) => item == '043'))
+              !(status === '3' && powers.some((i) => i == '043'))
             "
             :placeholder="'仓库所在公司'"
             :names="ruleForm.defective_wsm_com_name"
@@ -261,7 +261,7 @@
             :value="ruleForm.defective_wsm"
             :placeholder="'次品入库仓库'"
             :disabled="
-              !(status === '3' && powers.some((item) => item == '043'))
+              !(status === '3' && powers.some((i) => i == '043'))
             "
             :isDetail="true"
             :isRelation="true"
@@ -276,7 +276,7 @@
       <el-col
         :span="24"
         style="text-align: right; padding: 0 0 15px 0"
-        v-if="status === '3' && powers.some((item) => item == '043')"
+        v-if="status === '3' && powers.some((i) => i == '043')"
       >
         <el-button type="primary" @click="submitForm" size="mini"
           >保 存</el-button
@@ -299,15 +299,12 @@ export default {
   },
   computed: {
     powers() {
-      let tran =
+      const tran =
         this.$store.getters.btnList.find(
           (item) => item.menu_route == "returnOrderDetail"
         ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {

+ 16 - 65
src/views/sellOut/returnOrder/components/return-record.vue

@@ -22,14 +22,7 @@
           </el-form-item>
           <el-form-item label="可销售数量" prop="normal">
             <el-input
-              :disabled="
-                !(
-                  status === '1' &&
-                  powers &&
-                  powers.length > 0 &&
-                  powers.some((item) => item == '047')
-                )
-              "
+              :disabled="!(status === '1' && powers.some((i) => i == '047'))"
               v-model="ruleForm.normal"
               placeholder="可销售数量"
             ></el-input>
@@ -38,14 +31,7 @@
         <el-col :span="16">
           <el-form-item label="其他备注" prop="remark">
             <el-input
-              :disabled="
-                !(
-                  status === '1' &&
-                  powers &&
-                  powers.length > 0 &&
-                  powers.some((item) => item == '047')
-                )
-              "
+              :disabled="!(status === '1' && powers.some((i) => i == '047'))"
               type="textarea"
               maxlength="250"
               :rows="3"
@@ -56,15 +42,7 @@
             </el-input>
           </el-form-item>
         </el-col>
-        <el-col
-          :span="24"
-          v-if="
-            status === '1' &&
-            powers &&
-            powers.length > 0 &&
-            powers.some((item) => item == '047')
-          "
-        >
+        <el-col :span="24" v-if="status === '1' && powers.some((i) => i == '047')">
           <el-form-item label="异常情况记录" :size="'mini'">
             <el-form
               :model="ruleForm"
@@ -73,12 +51,7 @@
               :size="'mini'"
               class="demo-tableForm product_go"
             >
-              <el-table
-                :data="ruleForm.product_go"
-                border
-                :size="'mini'"
-                row-key="key"
-              >
+              <el-table :data="ruleForm.product_go" border :size="'mini'" row-key="key">
                 <el-table-column label="异常数量" prop="error_num" />
                 <el-table-column label="异常原因" prop="error_code_name" />
                 <el-table-column label="异常备注" prop="error_remark" />
@@ -86,12 +59,7 @@
                   fixed="right"
                   label="操作"
                   width="80"
-                  v-if="
-                    status === '1' &&
-                    powers &&
-                    powers.length > 0 &&
-                    powers.some((item) => item == '047')
-                  "
+                  v-if="status === '1' && powers.some((i) => i == '047')"
                 >
                   <template slot="header" slot-scope="scope">
                     <!-- v-if="status == '1' || status == '0'" -->
@@ -144,18 +112,9 @@
         <el-col
           :span="24"
           style="text-align: right; margin: -5px 0 20px 0"
-          v-if="
-            status === '1' &&
-            powers &&
-            powers.length > 0 &&
-            powers.some((item) => item == '047')
-          "
+          v-if="status === '1' && powers.some((i) => i == '047')"
         >
-          <el-button
-            type="primary"
-            class="fr"
-            :size="'mini'"
-            @click="submitForm"
+          <el-button type="primary" class="fr" :size="'mini'" @click="submitForm"
             >保 存
           </el-button>
         </el-col>
@@ -243,15 +202,12 @@ export default {
   },
   computed: {
     powers() {
-      let tran =
+      const tran =
         this.$store.getters.btnList.find(
           (item) => item.menu_route == "returnOrderDetail"
         ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
 
@@ -299,10 +255,7 @@ export default {
           let { child, status, normal_num, remark, return_num } = this.sitem;
           this.status = status;
           if (child) {
-            this.arr =
-              child && child.length > 0
-                ? JSON.parse(JSON.stringify(child))
-                : [];
+            this.arr = child && child.length > 0 ? JSON.parse(JSON.stringify(child)) : [];
             this.arr.forEach((v) => {
               v.is_del = "0";
               v.error_code_name = v.error_msg;
@@ -401,9 +354,7 @@ export default {
     },
     openModal(index) {
       this.s_item =
-        index === -1
-          ? {}
-          : JSON.parse(JSON.stringify(this.ruleForm.product_go[index]));
+        index === -1 ? {} : JSON.parse(JSON.stringify(this.ruleForm.product_go[index]));
       this.index = index;
       this.showModel = true;
     },
@@ -413,8 +364,9 @@ export default {
       if (index === -1) {
         this.ruleForm.product_go.push(JSON.parse(JSON.stringify(item)));
       } else {
-        const { error_num, error_code, error_remark, error_code_name, id } =
-          JSON.parse(JSON.stringify(item));
+        const { error_num, error_code, error_remark, error_code_name, id } = JSON.parse(
+          JSON.stringify(item)
+        );
         this.ruleForm.product_go[index].id = id;
         this.ruleForm.product_go[index].error_num = error_num;
         this.ruleForm.product_go[index].error_code = error_code;
@@ -427,5 +379,4 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>

+ 10 - 36
src/views/sellOut/returnOrder/components/returnCheck.vue

@@ -8,12 +8,7 @@
         :size="'mini'"
         class="demo-tableForm product_go"
       >
-        <el-table
-          :data="tableForm.product_go"
-          border
-          :size="'mini'"
-          row-key="key"
-        >
+        <el-table :data="tableForm.product_go" border :size="'mini'" row-key="key">
           <el-table-column label="异常数量" prop="anomalous_numbers" />
           <el-table-column label="异常原因" prop="anomalous_reason" />
           <el-table-column label="异常备注" prop="anomalous_remark" />
@@ -63,12 +58,7 @@
             fixed="right"
             label="操作"
             width="80"
-            v-if="
-              status === '2' &&
-              powers &&
-              powers.length > 0 &&
-              powers.some((item) => item == '042')
-            "
+            v-if="status === '2' && powers.some((i) => i == '042')"
           >
             <template slot-scope="scope">
               <el-tooltip
@@ -77,10 +67,7 @@
                 v-if="!scope.row.edit"
                 placement="top"
               >
-                <i
-                  class="el-icon-edit tb-icon"
-                  @click="editRow(scope.$index)"
-                ></i>
+                <i class="el-icon-edit tb-icon" @click="editRow(scope.$index)"></i>
               </el-tooltip>
 
               <el-tooltip
@@ -107,22 +94,15 @@
         <el-col
           :span="24"
           style="text-align: right; padding: 30px 0 10px 0"
-          v-if="
-            status === '2' &&
-            powers &&
-            powers.length > 0 &&
-            powers.some((item) => item == '042')
-          "
+          v-if="status === '2' && powers.some((i) => i == '042')"
         >
-          <el-button type="primary" :size="'mini'" @click="submitForm"
-            >保 存
-          </el-button>
+          <el-button type="primary" :size="'mini'" @click="submitForm">保 存 </el-button>
         </el-col>
       </el-form>
     </el-col>
   </el-row>
 </template>
-   <script>
+<script>
 import asyncRequest from "@/apis/service/sellOut/returnOrder";
 import resToken from "@/mixins/resToken";
 import config from "./columns"; //表格列参数
@@ -133,15 +113,12 @@ export default {
   mixins: [resToken],
   computed: {
     powers() {
-      let tran =
+      const tran =
         this.$store.getters.btnList.find(
           (item) => item.menu_route == "returnOrderDetail"
         ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   data() {
@@ -303,7 +280,4 @@ export default {
   },
 };
 </script>
-<style lang="scss" scoped>
-</style>
-
-   
+<style lang="scss" scoped></style>

Some files were not shown because too many files changed in this diff