chenrui 4 years ago
parent
commit
5e53f98cab
2 changed files with 14 additions and 10 deletions
  1. 1 5
      src/views/SetmealSales/PurchasedSetmeal.vue
  2. 13 5
      src/views/power/user/userList.vue

+ 1 - 5
src/views/SetmealSales/PurchasedSetmeal.vue

@@ -53,7 +53,7 @@
             </a-form-item>
           </a-col>
           <a-col :span="12">
-            <a-button class="handle-btn serach-btn" id="purchasedSetmeal-serach" type="primary" @click="handleSearch">查询</a-button>
+            <a-button class="handle-btn serach-btn" id="purchasedSetmeal-serach" type="primary" @click="$refs.table.refresh(true)">查询</a-button>
             <a-button class="handle-btn" type="" id="purchasedSetmeal-reset" @click="handleReset">重置</a-button>
             <a-button class="handle-btn export-btn" id="purchasedSetmeal-export" type="" :loading="loading" @click="handleExport">导出</a-button>
           </a-col>
@@ -208,10 +208,6 @@ export default {
       this.detailId = String(record.id)
       this.openDetailModal = true
     },
-    // 查询
-    handleSearch () {
-      this.$refs.table.refresh()
-    },
     // 重置
     handleReset () {
       this.searchForm.beginDate = getDate.getToday().starttime

+ 13 - 5
src/views/power/user/userList.vue

@@ -15,7 +15,13 @@
           </a-col>
           <a-col :md="6" :sm="24">
             <a-form-item label="状态">
-              <v-select code="ENABLE_STATE" v-model="queryParam.loginFlag" id="user-loginFlag" allowClear placeholder="请选择状态"></v-select>
+              <v-select
+                code="ENABLE_STATE"
+                v-model="queryParam.loginFlag"
+                ref="loginFlag"
+                id="user-loginFlag"
+                allowClear
+                placeholder="请选择状态"></v-select>
             </a-form-item>
           </a-col>
           <a-col :md="4" :sm="24" class="flex-sp">
@@ -39,7 +45,8 @@
       bordered
     >
       <span slot="status" slot-scope="text, record">
-        <a-switch v-hasPermission="'B_power_user_enable'" checkedChildren="" unCheckedChildren="" v-model="record.loginFlag" @change="changeFlagHandle(text, record)"/>
+        <a-switch v-if="$hasPermissions('B_power_user_enable')" checkedChildren="" unCheckedChildren="" v-model="record.loginFlag" @change="changeFlagHandle(text, record)"/>
+        <span v-else>{{ $refs.loginFlag.getNameByCode(record.loginFlag) }}</span>
       </span>
       <div slot="roleNames" slot-scope="text, record" :title="record.roleNames">
         <span v-if="record.roleNames">{{ record.roleNames.substr(0,12) + '...' }}</span>
@@ -48,9 +55,10 @@
       <span slot="action" slot-scope="text, record">
         <template>
           <div >
-            <a class="action-button" v-hasPermission="'B_power_user_edit'" @click="handleEdit(record)">修改</a>
-            <a v-if="record.loginFlag" v-hasPermission="'B_power_user_resetPsd'" class="action-button reset-text" id="user-btn-resetPass" @click="resetPassword(record)">重置密码</a>
-            <a v-if="!record.loginFlag" v-hasPermission="'B_power_user_del'" class="action-button red-text" id="user-btn-del" @click="delect(record)">删除</a>
+            <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>
           </div>
         </template>
       </span>