Explorar el Código

Merge remote-tracking branch 'origin/master'

hmc hace 1 año
padre
commit
d80ac73696
Se han modificado 1 ficheros con 2 adiciones y 23 borrados
  1. 2 23
      zkqy-ui/src/views/orderMange/masterbatchManage/index.vue

+ 2 - 23
zkqy-ui/src/views/orderMange/masterbatchManage/index.vue

@@ -55,8 +55,7 @@
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="转码" align="center" prop="materieEncoding"/>
       <el-table-column label="色号" align="center" prop="materieColorNumber"/>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width"
-                       v-if="hasPermission(['system:materiel:edit', 'system:materiel:remove'])">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-dropdown>
             <el-button type="warning" plain size="small">
@@ -126,7 +125,6 @@ import {
   getMaterielCode,
   checkMaterieEncoding
 } from "@/api/masterbatchManage/materiel";
-import { mapState } from 'vuex';
 
 export default {
   name: "Materiel",
@@ -172,30 +170,11 @@ export default {
       }
     };
   },
-  computed: {
-    ...mapState({
-      userPermissions: state => state.permission.permissions
-    })
-  },
-
   created() {
     this.getList();
   },
   methods: {
-    hasPermission(requiredPermissions) {
-      // 确保 this.userPermissions 存在并且不为空
-      if (this.userPermissions && this.userPermissions.length > 0) {
-        // 如果用户拥有所有权限,返回 true
-        if (this.userPermissions.includes('*:*:*')) {
-          return true;
-        }
-        // 检查用户是否有任意一个所需权限
-        return requiredPermissions.some(permission => this.userPermissions.includes(permission));
-      } else {
-        // 如果权限未定义或者为空,则默认不具有权限
-        return false;
-      }
-    },
+
     /** 查询物料信息列表 */
     getList() {
       this.loading = true;