From 7860fe0191d10b79a53bd294edd36d31e9fb504c Mon Sep 17 00:00:00 2001
From: lkk <364857242@qq.com>
Date: 星期二, 03 十二月 2024 10:03:26 +0800
Subject: [PATCH] 12.03
---
src/views/reservation/reservations/index.vue | 6 ++++--
src/views/system/role/selectUser.vue | 5 ++++-
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/views/reservation/reservations/index.vue b/src/views/reservation/reservations/index.vue
index dca5707..d1144aa 100644
--- a/src/views/reservation/reservations/index.vue
+++ b/src/views/reservation/reservations/index.vue
@@ -89,9 +89,10 @@
size="mini"
:disabled="multiple"
@click="batch"
- v-hasPermi="['reservation:reservation:remove']"
+
>鎾ら攢棰勭害</el-button
>
+ <!-- v-hasPermi="['reservation:reservation:remove']" -->
</el-col>
<el-col :span="1.5">
<el-button
@@ -99,9 +100,10 @@
size="mini"
:disabled="single"
@click="receipt"
- v-hasPermi="['reservation:reservation:remove']"
+
>琛ユ墦灏忕エ</el-button
>
+ <!-- v-hasPermi="['reservation:reservation:remove']" -->
</el-col>
<right-toolbar
:showSearch.sync="showSearch"
diff --git a/src/views/system/role/selectUser.vue b/src/views/system/role/selectUser.vue
index 496b283..a5840cc 100644
--- a/src/views/system/role/selectUser.vue
+++ b/src/views/system/role/selectUser.vue
@@ -106,7 +106,10 @@
unallocatedUserList(this.queryParams).then(res => {
console.log(res,6969);
- this.userList = res.rows;
+ this.userList = res.rows.map(item=>{
+ item.deptName = item.dept ? item.dept.deptName : '';
+ return item
+ })
this.total = res.total;
});
},
--
Gitblit v1.8.0