chenrui 4 роки тому
батько
коміт
3443a83f1e
2 змінених файлів з 16 додано та 8 видалено
  1. 13 5
      src/views/power/role/roleList.vue
  2. 3 3
      src/views/power/user/userList.vue

+ 13 - 5
src/views/power/role/roleList.vue

@@ -10,7 +10,13 @@
           </a-col>
           <a-col :md="6" :sm="24">
             <a-form-item label="状态">
-              <v-select code="ENABLE_STATE" v-model="queryParam.isEnable" id="role-enable" allowClear placeholder="请选择状态" ></v-select>
+              <v-select
+                code="ENABLE_STATE"
+                ref="isEnable"
+                v-model="queryParam.isEnable"
+                id="role-enable"
+                allowClear
+                placeholder="请选择状态" ></v-select>
             </a-form-item>
           </a-col>
           <a-col :md="4" :sm="24" class="flex-sp">
@@ -34,14 +40,16 @@
       bordered
     >
       <span slot="status" slot-scope="text, record">
-        <a-switch v-hasPermission="'B_power_role_enable'" checkedChildren="" unCheckedChildren="" v-model="record.isEnable" @change="changeFlagHandle(text, record)"/>
+        <a-switch v-if="$hasPermissions('B_power_role_enable')" checkedChildren="" unCheckedChildren="" v-model="record.isEnable" @change="changeFlagHandle(text, record)"/>
+        <span v-else>{{ $refs.isEnable.getNameByCode(record.isEnable) }}</span>
       </span>
 
       <span slot="action" slot-scope="text, record">
         <template>
-          <a v-hasPermission="'B_power_role_menu'" class="action-button menu-text" id="role-btn-menu" @click="openMenuModal(record)">菜单权限</a>
-          <a v-hasPermission="'B_power_role_edit'" class="action-button" id="role-btn-edit" @click="handleEdit(record)">修改</a>
-          <a v-if="!record.isEnable" v-hasPermission="'B_power_role_del'" class="action-button red-text" id="role-btn-del" @click="delect(record)">删除</a>
+          <a v-if="$hasPermissions('B_power_role_menu')" class="action-button menu-text" id="role-btn-menu" @click="openMenuModal(record)">菜单权限</a>
+          <a v-if="$hasPermissions('B_power_role_edit')" class="action-button" id="role-btn-edit" @click="handleEdit(record)">修改</a>
+          <a v-if="!record.isEnable && $hasPermissions('B_power_role_del')" class="action-button red-text" id="role-btn-del" @click="delect(record)">删除</a>
+          <span v-if="!$hasPermissions('B_power_role_menu') && !$hasPermissions('B_power_role_edit') && !(!record.isEnable && $hasPermissions('B_power_role_del'))">--</span>
         </template>
       </span>
     </s-table>

+ 3 - 3
src/views/power/user/userList.vue

@@ -56,9 +56,9 @@
         <template>
           <div >
             <a class="action-button" v-if="$hasPermissions('B_power_user_edit')" @click="handleEdit(record)">修改</a>
-            <a v-else-if="record.loginFlag && $hasPermissions('B_power_user_resetPsd')" class="action-button reset-text" id="user-btn-resetPass" @click="resetPassword(record)">重置密码</a>
-            <a v-else-if="!record.loginFlag && $hasPermissions('B_power_user_del')" class="action-button red-text" id="user-btn-del" @click="delect(record)">删除</a>
-            <span v-else>--</span>
+            <a v-if="record.loginFlag && $hasPermissions('B_power_user_resetPsd')" class="action-button reset-text" id="user-btn-resetPass" @click="resetPassword(record)">重置密码</a>
+            <a v-if="!record.loginFlag && $hasPermissions('B_power_user_del')" class="action-button red-text" id="user-btn-del" @click="delect(record)">删除</a>
+            <span v-if="!$hasPermissions('B_power_user_edit') && !(record.loginFlag && $hasPermissions('B_power_user_resetPsd')) && !(!record.loginFlag && $hasPermissions('B_power_user_del'))">--</span>
           </div>
         </template>
       </span>