1. 优化

src/myComponents/switchBox.vue

@@ -1,12 +1,14 @@
 <template>
     <div class="m-switch-wrap">
-      <div @click="disabled ? e => e.preventDefault() : onSwitch()" :class="['m-switch', { 'switch-checked': checkedVal == activeValue, 'disabled': disabled }]">
+      <div v-if="(permi && checkPermi(permi)) || !permi"  @click="disabled ? e => e.preventDefault() : onSwitch()" :class="['m-switch', { 'switch-checked': checkedVal == activeValue, 'disabled': disabled }]">
         <div :class="['u-switch-inner', checkedVal == activeValue ? 'inner-checked' : 'inner-unchecked' ]">{{ checkedVal == activeValue ? checkedInfo : uncheckedInfo }}</div>
         <div :class="['u-node', { 'node-checked': checkedVal == activeValue }]"></div>
       </div>
+      <div v-else> {{ checked == activeValue? '启用':'禁用' }} </div>
     </div>
   </template>
   <script>
+  import { checkPermi } from "@/utils/permission"
   export default {
     name: 'SwitchBox',
     model: {
@@ -42,6 +44,10 @@
         type: [String,Boolean,Number],
         default: false
       },
+      permi: { // 权限
+        type: [String,Array],
+        default: ''
+      }
     },
     data () {
       return {
@@ -60,6 +66,7 @@
       this.initSwitcher()
     },
     methods: {
+      checkPermi,
       initSwitcher () {
         this.checkedVal = this.checked
         // if (typeof this.checked === 'boolean') {

src/views/tourism/membershipManagement/equityCard/equityCardManage.vue

@@ -105,8 +105,8 @@
                 @click="handleDetails(scope.row)"
                 v-hasPermi="configPermi.details"
               >详情</el-button>
-              <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="[configPermi.resetPwd, configPermi.AuthRole]">
-                  <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
+              <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" >
+                  <el-button size="mini" type="text" icon="el-icon-d-arrow-right" v-hasPermi="[...configPermi.Password, ...configPermi.AuthRole]">更多</el-button>
                   <el-dropdown-menu slot="dropdown">
                       <el-dropdown-item command="handleAuthRole" v-if="scope.row.actStatus != 1" icon="el-icon-circle-check"
                       v-hasPermi="configPermi.AuthRole">审核</el-dropdown-item>

src/views/tourism/membershipManagement/physicalCard/physicalCardManagement.vue

@@ -75,6 +75,7 @@
             <el-table-column label="禁用/启用" align="center" key="status" prop="status" v-if="columns[5].visible" :show-overflow-tooltip="true">
               <template slot-scope="scope">
                 <switchBox 
+                :permi="configPermi.updateStatus"
                 :defaultChecked="true" 
                 v-model="scope.row.status" 
                 @changeFun="openAttraction(scope.row)" 
@@ -94,6 +95,15 @@
               class-name="small-padding fixed-width"
             >
               <template slot-scope="scope" >
+                <span v-if="scope.row.status == 0" style="margin-right: 10px;">
+                  <el-button
+                    size="mini"
+                    type="text"
+                    icon="el-icon-delete"
+                    @click="handleDelete(scope.row)"
+                    v-hasPermi="configPermi.delect"
+                  >删除</el-button>
+                </span>
                 <el-button
                   size="mini"
                   type="text"
@@ -101,13 +111,6 @@
                   @click="handleDetails(scope.row)"
                   v-hasPermi="configPermi.details"
                 >详情</el-button>
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-delete"
-                  @click="handleDelete(scope.row)"
-                  v-hasPermi="configPermi.delect"
-                >销卡</el-button>
                 <el-button
                   size="mini"
                   type="text"
@@ -157,21 +160,18 @@
           add: ['physicalCard:physicalCardManagement:add'], // 新增权限
           details: ['physicalCard:physicalCardManagement:details'], // 详情权限
           delect: ['physicalCard:physicalCardManagement:delect'], // 删除权限
-          edit: ['physicalCard:physicalCardManagement:edit'], // 编辑权限
           upload: [''],// 导入权限
           export: [''],// 导出权限
-          resetPwd: ['physicalCard:physicalCardManagement:resetPwd'],// 设置积分
-          AuthRole: ['physicalCard:physicalCardManagement:AuthRole'],// 设置储值
-          Password: ['physicalCard:physicalCardManagement:Password'], // 重置密码
-          print: ['physicalCard:physicalCardManagement:print']
+          print: ['physicalCard:physicalCardManagement:print'],// 打印
+          updateStatus: ['physicalCard:physicalCardManagement:updateStatus'],
         },
         configUrl: {
           list: '/merchant/memberEntitycard/pageList', // 列表地址
           delect: '/merchant/memberEntitycard/deleteById', // 删除地址
+          updateStatus: '/merchant/memberEntitycard/updateStatus', // 销卡
           upload: '',// 导入地址
           download:'', // 下载模板地址
           export: '',// 导出地址
-          updateStatus: '/merchant/memberEntitycard/updateStatus', // 编辑地址
           resetPassword: '/merchant/merchantEntitycard/resetPassword',
           listCopy: '/merchant/merchantEntitycardConfig/pageList'
         },