Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

doum

15 小时以前 cb6aca0642ac8dd5de877ade168066d85acb589c

 admin/src/views/business/deviceRole.vue

@@ -1,9 +1,9 @@
<template>
    <TableLayout :permissions="['business:devicerole:query']">
        <!-- 搜索表单 -->
        <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
            <el-form-item label="门禁组名称" prop="name">
                <el-input v-model="searchForm.name" placeholder="请输入门禁组名称" @keypress.enter.native="search"></el-input>
        <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="110px" inline>
            <el-form-item title="门禁点分组名称" prop="name">
                <el-input v-model="searchForm.name" placeholder="请输入门禁点分组名称" @keypress.enter.native="search"></el-input>
            </el-form-item>
            <section>
                <el-button type="primary" @click="search">搜索</el-button>
@@ -13,22 +13,23 @@
        <!-- 表格和分页 -->
        <template v-slot:table-wrap>
            <ul class="toolbar" v-permissions="['business:devicerole:create', 'business:devicerole:delete']">
                <li><el-button type="primary" @click="$refs.operaDeviceRoleWindow.open('新建门禁角色')" icon="el-icon-plus" v-permissions="['business:devicerole:create']">新建</el-button></li>
                <li><el-button type="primary" @click="$refs.operaDeviceRoleWindow.open('新建门禁点分组')" icon="el-icon-plus" v-permissions="['business:devicerole:create']">新建</el-button></li>
                <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:devicerole:delete']">删除</el-button></li>
            </ul>
            <el-table
                :height="tableHeightNew"
                v-loading="isWorking.search"
                :data="tableData.list"
                stripe
                @selection-change="handleSelectionChange"
            >
                <el-table-column type="selection" width="55"></el-table-column>
                <el-table-column prop="name" label="门禁组名称" min-width="100px"></el-table-column>
                <el-table-column prop="name" label="门禁点分组" min-width="100px"></el-table-column>
                <el-table-column prop="memberNum" label="使用人数" min-width="100px"></el-table-column>
                <el-table-column prop="isDefault" label="是否默认" min-width="100px">
                    <template slot-scope="{row}">
                        <el-switch
                            @change="changeIsDefault"
                            @change="changeIsDefault($event, row.id)"
                            v-model="row.isDefault"
                            active-color="#13ce66"
                            inactive-color="#ff4949"
@@ -83,16 +84,16 @@
  },
  created () {
    this.config({
      module: '门禁角色',
      module: '门禁点分组',
      api: '/business/deviceRole',
      'field.id': 'id',
      'field.main': 'id'
      'field.main': 'name'
    })
    this.search()
  },
  methods: {
    changeIsDefault (r) {
      updateStatusById({ isDefault: r, type: 2 })
    changeIsDefault (r, id) {
      updateStatusById({ isDefault: r, type: 2, id })
        .finally(() => {
          this.search()
        })
@@ -100,13 +101,15 @@
    edit (row) {
      if (row.doorIds) {
        row.radio = 1
        row.doorIds = row.doorIds.split(',')
        row.doorIds = row.doorIds.map(item => Number(item))
        if (typeof row.doorIds !== 'object') {
          row.doorIds = row.doorIds.split(',')
          row.doorIds = row.doorIds.map(item => Number(item))
        }
      } else {
        row.radio = 0
        row.doorIds = []
      }
      this.$refs.operaDeviceRoleWindow.open('编辑门禁角色', row)
      this.$refs.operaDeviceRoleWindow.open('编辑门禁点分组', row)
    }
  }
}