12.03

lkk

2024-12-03 7860fe0191d10b79a53bd294edd36d31e9fb504c

12.03

 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"

 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;
      });
    },