钥匙柜、钥匙

MrShi

3 天以前 43dc204f89527ba402666ba92345efbfe751f297

钥匙柜、钥匙

 admin/.env.development

@@ -2,7 +2,7 @@
NODE_ENV = 'development'

# VUE_APP_API_URL  = 'https://atwl.ahzyssl.com/zhyq_interface'
VUE_APP_API_URL  = 'http://192.168.1.46:10010'
VUE_APP_API_URL  = 'http://192.168.1.54:10010'
# VUE_APP_API_URL  = 'https://atwl.ahzyssl.com/zhyq_interface'
# VUE_APP_API_URL  = 'http://10.50.250.253:8088/gateway_interface'


 admin/package-lock.json

@@ -1886,63 +1886,6 @@
          "integrity": "sha1-/q7SVZc9LndVW4PbwIhRpsY1IPo=",
          "dev": true
        },
        "ansi-styles": {
          "version": "4.3.0",
          "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
          "dev": true,
          "optional": true,
          "requires": {
            "color-convert": "^2.0.1"
          }
        },
        "chalk": {
          "version": "4.1.2",
          "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
          "dev": true,
          "optional": true,
          "requires": {
            "ansi-styles": "^4.1.0",
            "supports-color": "^7.1.0"
          }
        },
        "color-convert": {
          "version": "2.0.1",
          "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
          "dev": true,
          "optional": true,
          "requires": {
            "color-name": "~1.1.4"
          }
        },
        "color-name": {
          "version": "1.1.4",
          "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
          "dev": true,
          "optional": true
        },
        "has-flag": {
          "version": "4.0.0",
          "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
          "dev": true,
          "optional": true
        },
        "loader-utils": {
          "version": "2.0.4",
          "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.4.tgz",
          "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
          "dev": true,
          "optional": true,
          "requires": {
            "big.js": "^5.2.2",
            "emojis-list": "^3.0.0",
            "json5": "^2.1.2"
          }
        },
        "ssri": {
          "version": "8.0.1",
          "resolved": "https://registry.npm.taobao.org/ssri/download/ssri-8.0.1.tgz?cache=0&sync_timestamp=1617826515595&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fssri%2Fdownload%2Fssri-8.0.1.tgz",
@@ -1950,28 +1893,6 @@
          "dev": true,
          "requires": {
            "minipass": "^3.1.1"
          }
        },
        "supports-color": {
          "version": "7.2.0",
          "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
          "dev": true,
          "optional": true,
          "requires": {
            "has-flag": "^4.0.0"
          }
        },
        "vue-loader-v16": {
          "version": "npm:vue-loader@16.8.3",
          "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz",
          "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
          "dev": true,
          "optional": true,
          "requires": {
            "chalk": "^4.1.0",
            "hash-sum": "^2.0.0",
            "loader-utils": "^2.0.0"
          }
        }
      }
@@ -14207,6 +14128,87 @@
        }
      }
    },
    "vue-loader-v16": {
      "version": "npm:vue-loader@16.8.3",
      "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz",
      "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
      "dev": true,
      "optional": true,
      "requires": {
        "chalk": "^4.1.0",
        "hash-sum": "^2.0.0",
        "loader-utils": "^2.0.0"
      },
      "dependencies": {
        "ansi-styles": {
          "version": "4.3.0",
          "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
          "dev": true,
          "optional": true,
          "requires": {
            "color-convert": "^2.0.1"
          }
        },
        "chalk": {
          "version": "4.1.2",
          "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
          "dev": true,
          "optional": true,
          "requires": {
            "ansi-styles": "^4.1.0",
            "supports-color": "^7.1.0"
          }
        },
        "color-convert": {
          "version": "2.0.1",
          "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
          "dev": true,
          "optional": true,
          "requires": {
            "color-name": "~1.1.4"
          }
        },
        "color-name": {
          "version": "1.1.4",
          "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
          "dev": true,
          "optional": true
        },
        "has-flag": {
          "version": "4.0.0",
          "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
          "dev": true,
          "optional": true
        },
        "loader-utils": {
          "version": "2.0.4",
          "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.4.tgz",
          "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
          "dev": true,
          "optional": true,
          "requires": {
            "big.js": "^5.2.2",
            "emojis-list": "^3.0.0",
            "json5": "^2.1.2"
          }
        },
        "supports-color": {
          "version": "7.2.0",
          "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
          "dev": true,
          "optional": true,
          "requires": {
            "has-flag": "^4.0.0"
          }
        }
      }
    },
    "vue-property-decorator": {
      "version": "8.5.1",
      "resolved": "https://registry.npmjs.org/vue-property-decorator/-/vue-property-decorator-8.5.1.tgz",

 admin/src/components/business/BorrowingAndReturningRecords.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,153 @@
<template>
    <GlobalWindow
        :title="title"
        width="100%"
        :visible.sync="visible"
        :withFooter="false"
    >
        <el-form ref="searchForm" :model="searchForm" label-width="100px" inline>
            <el-form-item label="钥匙" prop="keyId">
                <el-input v-model="searchForm.keyId" placeholder="请输入钥匙编码或名称" @keypress.enter.native="getList"></el-input>
            </el-form-item>
            <el-form-item label="状态" prop="status">
                <el-select v-model="searchForm.status" placeholder="请选择" @change="getList">
                    <el-option label="全部" value=""></el-option>
                    <el-option label="启用" :value="0"></el-option>
                    <el-option label="禁用" :value="1"></el-option>
                </el-select>
            </el-form-item>
            <el-form-item label="柜格状态" prop="bindStatus">
                <el-select v-model="searchForm.bindStatus" placeholder="请选择" @change="getList">
                    <el-option label="全部" value=""></el-option>
                    <el-option label="未绑定" :value="0"></el-option>
                    <el-option label="已绑定" :value="1"></el-option>
                </el-select>
            </el-form-item>
            <el-form-item>
                <el-button type="primary" @click="getList">搜索</el-button>
            </el-form-item>
            <el-form-item>
                <el-button @click="reset">重置</el-button>
            </el-form-item>
        </el-form>
        <ul class="toolbar">
            <li><el-button type="primary">批量解绑</el-button></li>
        </ul>
        <el-table
            v-loading="loading"
            :data="list"
            stripe
        >
            <el-table-column prop="code" label="柜格编号" min-width="100px"></el-table-column>
            <el-table-column prop="cabinetName" label="所属钥匙柜" min-width="100px"></el-table-column>
            <el-table-column prop="keyId" label="绑定钥匙" min-width="100px"></el-table-column>
            <el-table-column label="状态" min-width="100px">
                <template slot-scope="{row}">
                    <el-switch
                        v-model="row.status"
                        active-color="#13ce66"
                        inactive-color="#ff4949"
                        :active-value="0"
                        :inactive-value="1">
                    </el-switch>
                </template>
            </el-table-column>
            <el-table-column label="运行状态" min-width="100px">
                <template slot-scope="{row}">
                    <el-link type="success" v-if="row.workingStatus === 0">正常</el-link>
                    <el-link type="warning" v-if="row.workingStatus === 1">故障</el-link>
                </template>
            </el-table-column>
            <el-table-column label="柜格状态" min-width="100px">
                <template slot-scope="{row}">
                    <el-link type="warning" v-if="row.bindStatus === 0">未绑定</el-link>
                    <el-link type="success" v-if="row.bindStatus === 1">已绑定</el-link>
                </template>
            </el-table-column>
            <el-table-column
                label="操作"
                min-width="100"
                fixed="right"
            >
                <template slot-scope="{row}">
                    <el-button type="text" v-if="row.bindStatus === 0">绑定</el-button>
                    <el-button type="text" v-if="row.bindStatus === 1">解绑</el-button>
                </template>
            </el-table-column>
        </el-table>
        <div style="width: 100%; text-align: right; margin-top: 20px">
            <el-pagination
                @current-change="handleCurrentChange"
                :current-page="page"
                :page-size="10"
                layout="total, prev, pager, next, jumper"
                :total="total">
            </el-pagination>
        </div>
    </GlobalWindow>
</template>

<script>
  import BaseOpera from '@/components/base/BaseOpera'
  import GlobalWindow from '@/components/common/GlobalWindow'
  import { fetchList } from '@/api/business/jkCabinetGrid'
  import { allList } from '@/api/business/cars'
  export default {
    name: 'BorrowingAndReturningRecords',
    extends: BaseOpera,
    components: { GlobalWindow },
    data () {
      return {
        id: null,
        info: null,
        searchForm: {
          keyId: '',
          status: '',
          bindStatus: ''
        },
        list: [],
        page: 1,
        total: 0,
        loading: false
      }
    },
    methods: {
      open (title, id) {
        this.title = title
        this.id = id
        this.getList()
        this.visible = true
      },
      handleCurrentChange(e) {
        this.page = e
        this.getList()
      },
      reset() {
        this.searchForm.keyId = ''
        this.searchForm.status = ''
        this.searchForm.workingStatus = ''
        this.page = 1
        this.getList()
      },
      getList() {
        this.loading = true
        fetchList({
          capacity: 10,
          page: this.page,
          model: {
            cabinetId: this.id,
            keyId: this.searchForm.keyId,
            status: this.searchForm.status,
            workingStatus: this.searchForm.workingStatus
          }
        }).then(res => {
          console.log(res)
          this.list = res.records
          this.total = res.total
        }).finally(() => {
          this.loading = false
        })
      }
    }
  }
</script>

 admin/src/components/business/OperaJkCabinetWindow.vue

@@ -1,29 +1,13 @@
<template>
  <GlobalWindow
    width="50%"
    :title="title"
    :visible.sync="visible"
    :confirm-working="isWorking"
    @confirm="confirm"
  >
    <el-form :model="form" ref="form" :rules="rules">
      <el-form-item label="创建人编码" prop="creator">
        <el-input v-model="form.creator" placeholder="请输入创建人编码" v-trim/>
      </el-form-item>
      <el-form-item label="创建时间" prop="createDate">
        <el-date-picker v-model="form.createDate" value-format="yyyy-MM-dd" placeholder="请输入创建时间"></el-date-picker>
      </el-form-item>
      <el-form-item label="更新人编码" prop="editor">
        <el-input v-model="form.editor" placeholder="请输入更新人编码" v-trim/>
      </el-form-item>
      <el-form-item label="更新时间" prop="editDate">
        <el-date-picker v-model="form.editDate" value-format="yyyy-MM-dd" placeholder="请输入更新时间"></el-date-picker>
      </el-form-item>
      <el-form-item label="是否删除0否 1是" prop="isdeleted">
        <el-input v-model="form.isdeleted" placeholder="请输入是否删除0否 1是" v-trim/>
      </el-form-item>
      <el-form-item label="备注" prop="info">
        <el-input v-model="form.info" placeholder="请输入备注" v-trim/>
      </el-form-item>
      <h3 style="margin: 0 0 20px 0;">设备信息</h3>
      <el-form-item label="设备编号" prop="code">
        <el-input v-model="form.code" placeholder="请输入设备编号" v-trim/>
      </el-form-item>
@@ -39,53 +23,97 @@
      <el-form-item label="通讯地址" prop="linkAddr">
        <el-input v-model="form.linkAddr" placeholder="请输入通讯地址" v-trim/>
      </el-form-item>
      <el-form-item label="状态 0未绑定 1在位 2借出" prop="status">
        <el-input v-model="form.status" placeholder="请输入状态 0未绑定 1在位 2借出" v-trim/>
      <el-form-item label="端口号" prop="port">
        <el-input v-model="form.port" placeholder="请输入端口号" v-trim/>
      </el-form-item>
      <el-form-item label="端口" prop="port">
        <el-input v-model="form.port" placeholder="请输入端口" v-trim/>
      <el-form-item label="设备管理员" prop="managerIdList">
        <el-select v-model="form.managerIdList" filterable multiple placeholder="请选择设备管理员">
          <el-option
            v-for="item in memberList"
            :key="item.id"
            :label="item.name+'-'+item.companyName"
            :value="item.id">
          </el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="设备管理员编码（关联member)" prop="managerId">
        <el-input v-model="form.managerId" placeholder="请输入设备管理员编码（关联member)" v-trim/>
      <el-form-item label="使用时长" prop="useTime">
        <div style="width: 100%; display: flex; align-items: center;">
          <el-input v-model="form.useTime" placeholder="请输入单次拿取钥匙可使用时长" v-trim style="flex: 1;"/>
          <span style="margin-left: 20px;">单位：分钟</span>
        </div>
      </el-form-item>
      <el-form-item label="使用时长(秒)" prop="useTime">
        <el-input v-model="form.useTime" placeholder="请输入使用时长(秒)" v-trim/>
      <el-form-item label="双重验证" prop="doubleAuth">
        <div style="width: 100%; display: flex; align-items: center;">
          <el-switch
            v-model="form.doubleAuth"
            active-color="#13ce66"
            inactive-color="#ff4949"
            :active-value="1"
            :inactive-value="0">
          </el-switch>
          <span style="margin-left: 20px; color: #999999;">开启双重认证后，钥匙领取时先校验验证人身份，再校验司机身份</span>
        </div>
      </el-form-item>
      <el-form-item label="是否双重验证 0否 1是" prop="doubleAuth">
        <el-input v-model="form.doubleAuth" placeholder="请输入是否双重验证 0否 1是" v-trim/>
      </el-form-item>
      <el-form-item label="验证人编码（关联member)" prop="authMemberId">
        <el-input v-model="form.authMemberId" placeholder="请输入验证人编码（关联member)" v-trim/>
      </el-form-item>
      <el-form-item label="排数" prop="rowNum">
        <el-input v-model="form.rowNum" placeholder="请输入排数" v-trim/>
      </el-form-item>
      <el-form-item label="列数" prop="columnNum">
        <el-input v-model="form.columnNum" placeholder="请输入列数" v-trim/>
      </el-form-item>
      <el-form-item label="最后通讯时间" prop="haertTime">
        <el-date-picker v-model="form.haertTime" value-format="yyyy-MM-dd" placeholder="请输入最后通讯时间"></el-date-picker>
      <el-form-item label="验证人" prop="authMemberIdList">
        <el-select v-model="form.authMemberIdList" filterable multiple placeholder="请选择验证人">
          <el-option
            v-for="item in memberList"
            :key="item.id"
            :label="item.name+'-'+item.companyName"
            :value="item.id">
          </el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="所在位置" prop="lacation">
        <el-input v-model="form.lacation" placeholder="请输入所在位置" v-trim/>
      </el-form-item>
      <el-form-item label="经度" prop="longitude">
        <el-input v-model="form.longitude" placeholder="请输入经度" v-trim/>
      <el-form-item label="经纬度" prop="longitude">
        <div style="width: 100%; display: flex; align-items: center;">
          <el-input v-model="form.longitude" placeholder="请输入经纬度" v-trim/>
          <a style="margin-left: 20px; flex-shrink: 0;" href="https://lbs.amap.com/tools/picker" target="_blank">经纬度在线拾取地址</a>
        </div>
      </el-form-item>
      <el-form-item label="维度" prop="latitude">
        <el-input v-model="form.latitude" placeholder="请输入维度" v-trim/>
      <el-form-item label="状态" prop="status">
        <el-switch
          v-model="form.status"
          active-color="#13ce66"
          inactive-color="#ff4949"
          :active-value="0"
          :inactive-value="1">
        </el-switch>
      </el-form-item>
      <el-form-item label="编码方式 0自动编码 1手动编码" prop="noType">
        <el-input v-model="form.noType" placeholder="请输入编码方式 0自动编码 1手动编码" v-trim/>
      <h3 style="margin: 20px 0;">柜组信息</h3>
      <el-form-item label="排列" prop="rowNum">
        <div style="width: 100%; display: flex; align-items: center;">
          <el-input v-model="form.rowNum" type="number" placeholder="请输入排数" v-trim>
            <template slot="append">排</template>
          </el-input>
          <span style="margin: 0 20px;">x</span>
          <el-input v-model="form.columnNum" type="number" placeholder="请输入列数" v-trim>
            <template slot="append">列</template>
          </el-input>
        </div>
      </el-form-item>
      <el-form-item label="编码前缀" prop="noPrefix">
        <el-input v-model="form.noPrefix" placeholder="请输入编码前缀" v-trim/>
      <el-form-item label="编码" prop="noType">
        <el-radio-group v-model="form.noType" @change="changeNoType">
          <el-radio :label="0">自动编码</el-radio>
          <el-radio :label="1">手动编码</el-radio>
        </el-radio-group>
      </el-form-item>
      <el-form-item label="编码位数" prop="noLength">
        <el-input v-model="form.noLength" placeholder="请输入编码位数" v-trim/>
      <el-form-item label="前缀" prop="noPrefix" v-if="form.noType === 1">
        <div style="width: 100%; display: flex; align-items: center;">
          <el-input style="flex: 1;" v-model="form.noPrefix" placeholder="请输入数字或字母" v-trim/>
          <span style="margin: 0 20px;">位数</span>
          <el-input style="flex: 1;" v-model="form.noLength" placeholder="请输入数字" v-trim/>
          <span style="margin: 0 20px;">起始编号</span>
          <el-input style="flex: 1;" v-model="form.noIndex" placeholder="请输入数字" v-trim/>
        </div>
      </el-form-item>
      <el-form-item label="起始编码" prop="noIndex">
        <el-input v-model="form.noIndex" placeholder="请输入起始编码" v-trim/>
      <el-form-item label="排列顺序" prop="sortType" v-if="form.noType === 1">
        <el-radio-group v-model="form.sortType">
          <el-radio :label="0">从左往右</el-radio>
          <el-radio :label="1">从上向下</el-radio>
        </el-radio-group>
      </el-form-item>
    </el-form>
  </GlobalWindow>
@@ -94,6 +122,7 @@
<script>
import BaseOpera from '@/components/base/BaseOpera'
import GlobalWindow from '@/components/common/GlobalWindow'
import { allList } from '@/api/business/member'
export default {
  name: 'OperaJkCabinetWindow',
  extends: BaseOpera,
@@ -103,37 +132,65 @@
      // è¡¨å•æ•°æ®
      form: {
        id: null,
        creator: '',
        createDate: '',
        editor: '',
        editDate: '',
        isdeleted: '',
        info: '',
        code: '',
        name: '',
        devId: '',
        serialNo: '',
        linkAddr: '',
        status: '',
        status: 0,
        port: '',
        managerId: '',
        managerIdList: '',
        useTime: '',
        doubleAuth: '',
        authMemberId: '',
        doubleAuth: 0,
        authMemberIdList: '',
        rowNum: '',
        columnNum: '',
        haertTime: '',
        lacation: '',
        longitude: '',
        latitude: '',
        noType: '',
        noType: 0,
        noPrefix: '',
        noLength: '',
        noIndex: ''
        noIndex: '',
        sortType: 0
      },
      // éªŒè¯è§„则
      rules: {
      }
        code: [
          { required: true, message: '请输入设备编号', trigger: 'blur' }
        ],
        name: [
          { required: true, message: '请输入设备名称', trigger: 'blur' }
        ],
        devId: [
          { required: true, message: '请输入设备ID', trigger: 'blur' }
        ],
        linkAddr: [
          { required: true, message: '请输入通讯地址', trigger: 'blur' }
        ],
        port: [
          { required: true, message: '请输入端口号', trigger: 'blur' }
        ],
        managerIdList: [
          { required: true, message: '请选择设备管理员', trigger: 'blur' }
        ],
        authMemberIdList: [
          { required: true, message: '请选择验证人', trigger: 'blur' }
        ],
        rowNum: [
          { required: true, message: '请输入排列', trigger: 'blur' }
        ],
        noType: [
          { required: true, message: '请选择编码', trigger: 'blur' }
        ],
        noPrefix: [
          { required: true, message: '请输入前缀', trigger: 'blur' }
        ],
        sortType: [
          { required: true, message: '请输入排列顺序', trigger: 'blur' }
        ]
      },
      memberList: []
    }
  },
  created () {
@@ -141,6 +198,42 @@
      api: '/business/jkCabinet',
      'field.id': 'id'
    })
  },
  methods: {
    open (title, target) {
      this.title = title
      this.loadMember()
      this.visible = true
      // æ–°å»º
      if (target == null) {
        this.$nextTick(() => {
          this.$refs.form.resetFields()
          this.form[this.configData['field.id']] = null
        })
        return
      }
      // ç¼–辑
      this.$nextTick(() => {
        for (const key in this.form) {
          this.form[key] = target[key]
        }
      })
    },
    loadMember () {
      allList({
        type: 2
      }).then(res => {
        this.memberList = res
      })
    },
    changeNoType() {
      if (this.form.noType === 0) {
        this.form.noPrefix = ''
        this.form.noLength = ''
        this.form.noIndex = ''
        this.form.sortType = 0
      }
    }
  }
}
</script>

 admin/src/components/business/OperaJkKeysWindow.vue

@@ -1,46 +1,33 @@
<template>
  <GlobalWindow
    width="50%"
    :title="title"
    :visible.sync="visible"
    :confirm-working="isWorking"
    @confirm="confirm"
  >
    <el-form :model="form" ref="form" :rules="rules">
      <el-form-item label="创建人编码" prop="creator">
        <el-input v-model="form.creator" placeholder="请输入创建人编码" v-trim/>
      </el-form-item>
      <el-form-item label="创建时间" prop="createDate">
        <el-date-picker v-model="form.createDate" value-format="yyyy-MM-dd" placeholder="请输入创建时间"></el-date-picker>
      </el-form-item>
      <el-form-item label="更新人编码" prop="editor">
        <el-input v-model="form.editor" placeholder="请输入更新人编码" v-trim/>
      </el-form-item>
      <el-form-item label="更新时间" prop="editDate">
        <el-date-picker v-model="form.editDate" value-format="yyyy-MM-dd" placeholder="请输入更新时间"></el-date-picker>
      </el-form-item>
      <el-form-item label="是否删除0否 1是" prop="isdeleted">
        <el-input v-model="form.isdeleted" placeholder="请输入是否删除0否 1是" v-trim/>
      </el-form-item>
      <el-form-item label="备注" prop="info">
        <el-input v-model="form.info" placeholder="请输入备注" v-trim/>
      </el-form-item>
      <el-form-item label="钥匙编号" prop="code">
        <el-input v-model="form.code" placeholder="请输入钥匙编号" v-trim/>
      </el-form-item>
      <el-form-item label="车牌号" prop="carCode">
        <el-input v-model="form.carCode" placeholder="请输入车牌号" v-trim/>
      </el-form-item>
      <el-form-item label="所属车辆(关联cars)" prop="carId">
        <el-input v-model="form.carId" placeholder="请输入所属车辆(关联cars)" v-trim/>
      <el-form-item label="所属车辆" prop="carId">
        <el-select v-model="form.carId" placeholder="请选择">
          <el-option
            v-for="item in carAll"
            :key="item.id"
            :label="item.name"
            :value="item.id">
          </el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="RFID标签" prop="rfidLable">
        <el-input v-model="form.rfidLable" placeholder="请输入RFID标签" v-trim/>
      </el-form-item>
      <el-form-item label="领取规则 0随车 1随派车单" prop="roleType">
        <el-input v-model="form.roleType" placeholder="请输入领取规则 0随车 1随派车单" v-trim/>
      </el-form-item>
      <el-form-item label="状态 0未绑定 1在位 2借出" prop="status">
        <el-input v-model="form.status" placeholder="请输入状态 0未绑定 1在位 2借出" v-trim/>
      <el-form-item label="领取规则" prop="roleType">
        <el-radio-group v-model="form.roleType">
          <el-radio :label="0">随车</el-radio>
          <el-radio :label="1">随派车单</el-radio>
        </el-radio-group>
      </el-form-item>
    </el-form>
  </GlobalWindow>
@@ -49,6 +36,7 @@
<script>
import BaseOpera from '@/components/base/BaseOpera'
import GlobalWindow from '@/components/common/GlobalWindow'
import { allList } from '@/api/business/cars'
export default {
  name: 'OperaJkKeysWindow',
  extends: BaseOpera,
@@ -58,22 +46,27 @@
      // è¡¨å•æ•°æ®
      form: {
        id: null,
        creator: '',
        createDate: '',
        editor: '',
        editDate: '',
        isdeleted: '',
        info: '',
        code: '',
        carCode: '',
        carId: '',
        rfidLable: '',
        roleType: '',
        status: ''
        roleType: 0
      },
      // éªŒè¯è§„则
      rules: {
      }
        code: [
          { required: true, message: '请输入钥匙编号', trigger: 'blur' }
        ],
        carId: [
          { required: true, message: '请选择所属车辆', trigger: 'blur' }
        ],
        rfidLable: [
          { required: true, message: '请输入RFID标签', trigger: 'blur' }
        ],
        roleType: [
          { required: true, message: '请选择领取规则', trigger: 'blur' }
        ]
      },
      carAll: []
    }
  },
  created () {
@@ -81,6 +74,15 @@
      api: '/business/jkKeys',
      'field.id': 'id'
    })
    this.getCars()
  },
  methods: {
    getCars() {
      allList({ type: 0 })
        .then(res => {
          console.log(res)
        })
    }
  }
}
</script>

 admin/src/components/business/cabinetDetails.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,152 @@
<template>
    <GlobalWindow
        :title="title"
        width="100%"
        :visible.sync="visible"
        :withFooter="false"
    >
        <el-form ref="searchForm" :model="searchForm" label-width="100px" inline>
            <el-form-item label="钥匙" prop="keyId">
                <el-input v-model="searchForm.keyId" placeholder="请输入钥匙编码或名称" @keypress.enter.native="getList"></el-input>
            </el-form-item>
            <el-form-item label="状态" prop="status">
                <el-select v-model="searchForm.status" placeholder="请选择" @change="getList">
                    <el-option label="全部" value=""></el-option>
                    <el-option label="启用" :value="0"></el-option>
                    <el-option label="禁用" :value="1"></el-option>
                </el-select>
            </el-form-item>
            <el-form-item label="柜格状态" prop="bindStatus">
                <el-select v-model="searchForm.bindStatus" placeholder="请选择" @change="getList">
                    <el-option label="全部" value=""></el-option>
                    <el-option label="未绑定" :value="0"></el-option>
                    <el-option label="已绑定" :value="1"></el-option>
                </el-select>
            </el-form-item>
            <el-form-item>
                <el-button type="primary" @click="getList">搜索</el-button>
            </el-form-item>
            <el-form-item>
                <el-button @click="reset">重置</el-button>
            </el-form-item>
        </el-form>
        <ul class="toolbar">
            <li><el-button type="primary">批量解绑</el-button></li>
        </ul>
        <el-table
            v-loading="loading"
            :data="list"
            stripe
        >
            <el-table-column prop="code" label="柜格编号" min-width="100px"></el-table-column>
            <el-table-column prop="cabinetName" label="所属钥匙柜" min-width="100px"></el-table-column>
            <el-table-column prop="keyId" label="绑定钥匙" min-width="100px"></el-table-column>
            <el-table-column label="状态" min-width="100px">
                <template slot-scope="{row}">
                    <el-switch
                        v-model="row.status"
                        active-color="#13ce66"
                        inactive-color="#ff4949"
                        :active-value="0"
                        :inactive-value="1">
                    </el-switch>
                </template>
            </el-table-column>
            <el-table-column label="运行状态" min-width="100px">
                <template slot-scope="{row}">
                    <el-link type="success" v-if="row.workingStatus === 0">正常</el-link>
                    <el-link type="warning" v-if="row.workingStatus === 1">故障</el-link>
                </template>
            </el-table-column>
            <el-table-column label="柜格状态" min-width="100px">
                <template slot-scope="{row}">
                    <el-link type="warning" v-if="row.bindStatus === 0">未绑定</el-link>
                    <el-link type="success" v-if="row.bindStatus === 1">已绑定</el-link>
                </template>
            </el-table-column>
            <el-table-column
                label="操作"
                min-width="100"
                fixed="right"
            >
                <template slot-scope="{row}">
                    <el-button type="text" v-if="row.bindStatus === 0">绑定</el-button>
                    <el-button type="text" v-if="row.bindStatus === 1">解绑</el-button>
                </template>
            </el-table-column>
        </el-table>
        <div style="width: 100%; text-align: right; margin-top: 20px">
            <el-pagination
                @current-change="handleCurrentChange"
                :current-page="page"
                :page-size="10"
                layout="total, prev, pager, next, jumper"
                :total="total">
            </el-pagination>
        </div>
    </GlobalWindow>
</template>

<script>
  import BaseOpera from '@/components/base/BaseOpera'
  import GlobalWindow from '@/components/common/GlobalWindow'
  import { fetchList } from '@/api/business/jkCabinetGrid'
  export default {
    name: 'cabinetDetails',
    extends: BaseOpera,
    components: { GlobalWindow },
    data () {
      return {
        id: null,
        info: null,
        searchForm: {
          keyId: '',
          status: '',
          bindStatus: ''
        },
        list: [],
        page: 1,
        total: 0,
        loading: false
      }
    },
    methods: {
      open (title, id) {
        this.title = title
        this.id = id
        this.getList()
        this.visible = true
      },
      handleCurrentChange(e) {
        this.page = e
        this.getList()
      },
      reset() {
        this.searchForm.keyId = ''
        this.searchForm.status = ''
        this.searchForm.workingStatus = ''
        this.page = 1
        this.getList()
      },
      getList() {
        this.loading = true
        fetchList({
          capacity: 10,
          page: this.page,
          model: {
            cabinetId: this.id,
            keyId: this.searchForm.keyId,
            status: this.searchForm.status,
            workingStatus: this.searchForm.workingStatus
          }
        }).then(res => {
          console.log(res)
          this.list = res.records
          this.total = res.total
        }).finally(() => {
          this.loading = false
        })
      }
    }
  }
</script>

 admin/src/views/business/jkCabinet.vue

@@ -2,146 +2,82 @@
  <TableLayout :permissions="['business:jkcabinet:query']">
    <!-- æœç´¢è¡¨å• -->
    <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
      <el-form-item label="主键" prop="id">
        <el-input v-model="searchForm.id" placeholder="请输入主键" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="创建人编码" prop="creator">
        <el-input v-model="searchForm.creator" placeholder="请输入创建人编码" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="创建时间" prop="createDate">
        <el-date-picker v-model="searchForm.createDate" value-format="yyyy-MM-dd" placeholder="请输入创建时间" @change="search"/>
      </el-form-item>
      <el-form-item label="更新人编码" prop="editor">
        <el-input v-model="searchForm.editor" placeholder="请输入更新人编码" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="更新时间" prop="editDate">
        <el-date-picker v-model="searchForm.editDate" value-format="yyyy-MM-dd" placeholder="请输入更新时间" @change="search"/>
      </el-form-item>
      <el-form-item label="是否删除0否 1是" prop="isdeleted">
        <el-input v-model="searchForm.isdeleted" placeholder="请输入是否删除0否 1是" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="备注" prop="info">
        <el-input v-model="searchForm.info" placeholder="请输入备注" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="设备编号" prop="code">
        <el-input v-model="searchForm.code" placeholder="请输入设备编号" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="设备名称" prop="name">
        <el-input v-model="searchForm.name" placeholder="请输入设备名称" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="设备ID" prop="devId">
        <el-input v-model="searchForm.devId" placeholder="请输入设备ID" @keypress.enter.native="search"></el-input>
      <el-form-item label="运行状态" prop="rumStatus">
        <el-select v-model="searchForm.rumStatus" placeholder="请选择" @change="search">
          <el-option label="全部" value=""></el-option>
          <el-option label="在线" :value="0"></el-option>
          <el-option label="离线" :value="1"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="序列号" prop="serialNo">
        <el-input v-model="searchForm.serialNo" placeholder="请输入序列号" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="通讯地址" prop="linkAddr">
        <el-input v-model="searchForm.linkAddr" placeholder="请输入通讯地址" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="状态 0未绑定 1在位 2借出" prop="status">
        <el-input v-model="searchForm.status" placeholder="请输入状态 0未绑定 1在位 2借出" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="端口" prop="port">
        <el-input v-model="searchForm.port" placeholder="请输入端口" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="设备管理员编码（关联member)" prop="managerId">
        <el-input v-model="searchForm.managerId" placeholder="请输入设备管理员编码（关联member)" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="使用时长(秒)" prop="useTime">
        <el-input v-model="searchForm.useTime" placeholder="请输入使用时长(秒)" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="是否双重验证 0否 1是" prop="doubleAuth">
        <el-input v-model="searchForm.doubleAuth" placeholder="请输入是否双重验证 0否 1是" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="验证人编码（关联member)" prop="authMemberId">
        <el-input v-model="searchForm.authMemberId" placeholder="请输入验证人编码（关联member)" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="排数" prop="rowNum">
        <el-input v-model="searchForm.rowNum" placeholder="请输入排数" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="列数" prop="columnNum">
        <el-input v-model="searchForm.columnNum" placeholder="请输入列数" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="最后通讯时间" prop="haertTime">
        <el-date-picker v-model="searchForm.haertTime" value-format="yyyy-MM-dd" placeholder="请输入最后通讯时间" @change="search"/>
      </el-form-item>
      <el-form-item label="所在位置" prop="lacation">
        <el-input v-model="searchForm.lacation" placeholder="请输入所在位置" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="经度" prop="longitude">
        <el-input v-model="searchForm.longitude" placeholder="请输入经度" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="维度" prop="latitude">
        <el-input v-model="searchForm.latitude" placeholder="请输入维度" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="编码方式 0自动编码 1手动编码" prop="noType">
        <el-input v-model="searchForm.noType" placeholder="请输入编码方式 0自动编码 1手动编码" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="编码前缀" prop="noPrefix">
        <el-input v-model="searchForm.noPrefix" placeholder="请输入编码前缀" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="编码位数" prop="noLength">
        <el-input v-model="searchForm.noLength" placeholder="请输入编码位数" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="起始编码" prop="noIndex">
        <el-input v-model="searchForm.noIndex" placeholder="请输入起始编码" @keypress.enter.native="search"></el-input>
      <el-form-item label="状态" prop="status">
        <el-select v-model="searchForm.status" placeholder="请选择" @change="search">
          <el-option label="全部" value=""></el-option>
          <el-option label="启用" :value="1"></el-option>
          <el-option label="禁用" :value="0"></el-option>
        </el-select>
      </el-form-item>
      <section>
        <el-button type="primary" @click="search">搜索</el-button>
        <el-button type="primary" :loading="isWorking.export" v-permissions="['business:jkcabinet:exportExcel']" @click="exportExcel">导出</el-button>
        <el-button @click="reset">重置</el-button>
      </section>
    </el-form>
    <!-- è¡¨æ ¼å’Œåˆ†é¡µ -->
    <template v-slot:table-wrap>
      <ul class="toolbar" v-permissions="['business:jkcabinet:create', 'business:jkcabinet:delete']">
        <li><el-button type="primary" @click="$refs.operaJkCabinetWindow.open('新建钥匙柜基本信息表')" icon="el-icon-plus" v-permissions="['business:jkcabinet:create']">新建</el-button></li>
        <li><el-button type="primary" @click="$refs.operaJkCabinetWindow.open('新建设备')" icon="el-icon-plus" v-permissions="['business:jkcabinet:create']">新建</el-button></li>
        <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:jkcabinet: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="id" label="主键" min-width="100px"></el-table-column>
        <el-table-column prop="creator" label="创建人编码" min-width="100px"></el-table-column>
        <el-table-column prop="createDate" label="创建时间" min-width="100px"></el-table-column>
        <el-table-column prop="editor" label="更新人编码" min-width="100px"></el-table-column>
        <el-table-column prop="editDate" label="更新时间" min-width="100px"></el-table-column>
        <el-table-column prop="isdeleted" label="是否删除0否 1是" min-width="100px"></el-table-column>
        <el-table-column prop="info" label="备注" min-width="100px"></el-table-column>
        <el-table-column prop="code" label="设备编号" min-width="100px"></el-table-column>
        <el-table-column prop="name" label="设备名称" min-width="100px"></el-table-column>
        <el-table-column prop="devId" label="设备ID" min-width="100px"></el-table-column>
        <el-table-column prop="serialNo" label="序列号" min-width="100px"></el-table-column>
        <el-table-column prop="linkAddr" label="通讯地址" min-width="100px"></el-table-column>
        <el-table-column prop="status" label="状态 0未绑定 1在位 2借出" min-width="100px"></el-table-column>
        <el-table-column prop="port" label="端口" min-width="100px"></el-table-column>
        <el-table-column prop="managerId" label="设备管理员编码（关联member)" min-width="100px"></el-table-column>
        <el-table-column prop="useTime" label="使用时长(秒)" min-width="100px"></el-table-column>
        <el-table-column prop="doubleAuth" label="是否双重验证 0否 1是" min-width="100px"></el-table-column>
        <el-table-column prop="authMemberId" label="验证人编码（关联member)" min-width="100px"></el-table-column>
        <el-table-column prop="rowNum" label="排数" min-width="100px"></el-table-column>
        <el-table-column prop="columnNum" label="列数" min-width="100px"></el-table-column>
        <el-table-column prop="haertTime" label="最后通讯时间" min-width="100px"></el-table-column>
        <el-table-column prop="port" label="端口号" min-width="100px"></el-table-column>
        <el-table-column prop="lacation" label="所在位置" min-width="100px"></el-table-column>
        <el-table-column prop="longitude" label="经度" min-width="100px"></el-table-column>
        <el-table-column prop="latitude" label="维度" min-width="100px"></el-table-column>
        <el-table-column prop="noType" label="编码方式 0自动编码 1手动编码" min-width="100px"></el-table-column>
        <el-table-column prop="noPrefix" label="编码前缀" min-width="100px"></el-table-column>
        <el-table-column prop="noLength" label="编码位数" min-width="100px"></el-table-column>
        <el-table-column prop="noIndex" label="起始编码" min-width="100px"></el-table-column>
        <el-table-column label="柜格数量" min-width="100px">
          <template slot-scope="{row}">
            <el-button @click="$refs.cabinetDetails.open(row.name + '-柜格信息', row.id)">{{row.gridNum}}</el-button>
          </template>
        </el-table-column>
        <el-table-column label="运行状态" min-width="100px">
          <template slot-scope="{row}">
            <el-link type="success" v-if="row.runStatus === 0">在线</el-link>
            <el-link type="danger" v-if="row.runStatus === 1">离线</el-link>
          </template>
        </el-table-column>
        <el-table-column label="状态" min-width="100px">
          <template slot-scope="{row}">
            <el-switch
              v-model="row.status"
              active-color="#13ce66"
              inactive-color="#ff4949"
              :active-value="0"
              :inactive-value="1">
            </el-switch>
          </template>
        </el-table-column>
        <el-table-column
          v-if="containPermissions(['business:jkcabinet:update', 'business:jkcabinet:delete'])"
          label="操作"
          min-width="120"
          min-width="200"
          fixed="right"
        >
          <template slot-scope="{row}">
            <el-button type="text" @click="$refs.operaJkCabinetWindow.open('编辑钥匙柜基本信息表', row)" icon="el-icon-edit" v-permissions="['business:jkcabinet:update']">编辑</el-button>
            <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:jkcabinet:delete']">删除</el-button>
            <el-button type="text">日志</el-button>
            <el-button type="text">绑定钥匙</el-button>
            <el-button type="text" @click="$refs.operaJkCabinetWindow.open('编辑钥匙柜基本信息表', row)" v-permissions="['business:jkcabinet:update']">编辑</el-button>
            <el-button type="text" @click="deleteById(row)" v-permissions="['business:jkcabinet:delete']">删除</el-button>
          </template>
        </el-table-column>
      </el-table>
@@ -154,6 +90,8 @@
    </template>
    <!-- æ–°å»º/修改 -->
    <OperaJkCabinetWindow ref="operaJkCabinetWindow" @success="handlePageChange"/>
    <!-- æŸœå­è¯¦æƒ… -->
    <CabinetDetails ref="cabinetDetails" />
  </TableLayout>
</template>

@@ -162,42 +100,19 @@
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import OperaJkCabinetWindow from '@/components/business/OperaJkCabinetWindow'
import CabinetDetails from '@/components/business/cabinetDetails'
export default {
  name: 'JkCabinet',
  extends: BaseTable,
  components: { TableLayout, Pagination, OperaJkCabinetWindow },
  components: { TableLayout, Pagination, OperaJkCabinetWindow, CabinetDetails },
  data () {
    return {
      // æœç´¢
      searchForm: {
        id: '',
        creator: '',
        createDate: '',
        editor: '',
        editDate: '',
        isdeleted: '',
        info: '',
        code: '',
        name: '',
        devId: '',
        serialNo: '',
        linkAddr: '',
        status: '',
        port: '',
        managerId: '',
        useTime: '',
        doubleAuth: '',
        authMemberId: '',
        rowNum: '',
        columnNum: '',
        haertTime: '',
        lacation: '',
        longitude: '',
        latitude: '',
        noType: '',
        noPrefix: '',
        noLength: '',
        noIndex: ''
        rumStatus: ''
      }
    }
  },

 admin/src/views/business/jkKeys.vue

@@ -2,77 +2,59 @@
  <TableLayout :permissions="['business:jkkeys:query']">
    <!-- æœç´¢è¡¨å• -->
    <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
      <el-form-item label="主键" prop="id">
        <el-input v-model="searchForm.id" placeholder="请输入主键" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="创建人编码" prop="creator">
        <el-input v-model="searchForm.creator" placeholder="请输入创建人编码" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="创建时间" prop="createDate">
        <el-date-picker v-model="searchForm.createDate" value-format="yyyy-MM-dd" placeholder="请输入创建时间" @change="search"/>
      </el-form-item>
      <el-form-item label="更新人编码" prop="editor">
        <el-input v-model="searchForm.editor" placeholder="请输入更新人编码" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="更新时间" prop="editDate">
        <el-date-picker v-model="searchForm.editDate" value-format="yyyy-MM-dd" placeholder="请输入更新时间" @change="search"/>
      </el-form-item>
      <el-form-item label="是否删除0否 1是" prop="isdeleted">
        <el-input v-model="searchForm.isdeleted" placeholder="请输入是否删除0否 1是" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="备注" prop="info">
        <el-input v-model="searchForm.info" placeholder="请输入备注" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="钥匙编号" prop="code">
        <el-input v-model="searchForm.code" placeholder="请输入钥匙编号" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="车牌号" prop="carCode">
        <el-input v-model="searchForm.carCode" placeholder="请输入车牌号" @keypress.enter.native="search"></el-input>
      <el-form-item label="所属车辆" prop="carCode">
        <el-input v-model="searchForm.carCode" placeholder="请输入所属车辆" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="所属车辆(关联cars)" prop="carId">
        <el-input v-model="searchForm.carId" placeholder="请输入所属车辆(关联cars)" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="RFID标签" prop="rfidLable">
        <el-input v-model="searchForm.rfidLable" placeholder="请输入RFID标签" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="领取规则 0随车 1随派车单" prop="roleType">
        <el-input v-model="searchForm.roleType" placeholder="请输入领取规则 0随车 1随派车单" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="状态 0未绑定 1在位 2借出" prop="status">
        <el-input v-model="searchForm.status" placeholder="请输入状态 0未绑定 1在位 2借出" @keypress.enter.native="search"></el-input>
      <el-form-item label="状态" prop="status">
        <el-select v-model="searchForm.status" placeholder="请选择" @change="search">
          <el-option label="全部" value=""></el-option>
          <el-option label="维修保养" :value="3"></el-option>
          <el-option label="借出" :value="2"></el-option>
          <el-option label="在位" :value="1"></el-option>
          <el-option label="未绑定" :value="0"></el-option>
        </el-select>
      </el-form-item>
      <section>
        <el-button type="primary" @click="search">搜索</el-button>
        <el-button type="primary" :loading="isWorking.export" v-permissions="['business:jkkeys:exportExcel']" @click="exportExcel">导出</el-button>
        <el-button @click="reset">重置</el-button>
      </section>
    </el-form>
    <!-- è¡¨æ ¼å’Œåˆ†é¡µ -->
    <template v-slot:table-wrap>
      <ul class="toolbar" v-permissions="['business:jkkeys:create', 'business:jkkeys:delete']">
        <li><el-button type="primary" @click="$refs.operaJkKeysWindow.open('新建钥匙基本信息表')" icon="el-icon-plus" v-permissions="['business:jkkeys:create']">新建</el-button></li>
        <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:jkkeys:delete']">删除</el-button></li>
        <li><el-button type="primary" @click="$refs.operaJkKeysWindow.open('新建钥匙信息')" icon="el-icon-plus" v-permissions="['business:jkkeys:create']">新建</el-button></li>
<!--        <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:jkkeys: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="id" label="主键" min-width="100px"></el-table-column>
        <el-table-column prop="creator" label="创建人编码" min-width="100px"></el-table-column>
        <el-table-column prop="createDate" label="创建时间" min-width="100px"></el-table-column>
        <el-table-column prop="editor" label="更新人编码" min-width="100px"></el-table-column>
        <el-table-column prop="editDate" label="更新时间" min-width="100px"></el-table-column>
        <el-table-column prop="isdeleted" label="是否删除0否 1是" min-width="100px"></el-table-column>
        <el-table-column prop="info" label="备注" min-width="100px"></el-table-column>
        <el-table-column prop="code" label="钥匙编号" min-width="100px"></el-table-column>
        <el-table-column prop="carCode" label="车牌号" min-width="100px"></el-table-column>
        <el-table-column prop="carId" label="所属车辆(关联cars)" min-width="100px"></el-table-column>
        <el-table-column prop="carName" label="所属车辆" min-width="100px"></el-table-column>
        <el-table-column prop="rfidLable" label="RFID标签" min-width="100px"></el-table-column>
        <el-table-column prop="roleType" label="领取规则 0随车 1随派车单" min-width="100px"></el-table-column>
        <el-table-column prop="status" label="状态 0未绑定 1在位 2借出" min-width="100px"></el-table-column>
        <el-table-column prop="rfidLable" label="绑定钥匙柜" min-width="100px"></el-table-column>
        <el-table-column prop="rfidLable" label="存放位置" min-width="100px"></el-table-column>
        <el-table-column label="绑定状态" min-width="100px">
          <template slot-scope="{row}">
            <span v-if="row.isBinding === 0">未绑定</span>
            <span v-if="row.isBinding === 1">已绑定</span>
          </template>
        </el-table-column>
        <el-table-column label="钥匙状态" min-width="100px">
          <template slot-scope="{row}">
            <span v-if="row.status === 0">未绑定</span>
            <span v-if="row.status === 1">在位</span>
            <span v-if="row.status === 2">借出</span>
            <span v-if="row.status === 3">维修保养</span>
          </template>
        </el-table-column>
        <el-table-column
          v-if="containPermissions(['business:jkkeys:update', 'business:jkkeys:delete'])"
          label="操作"
@@ -80,8 +62,9 @@
          fixed="right"
        >
          <template slot-scope="{row}">
            <el-button type="text" @click="$refs.operaJkKeysWindow.open('编辑钥匙基本信息表', row)" icon="el-icon-edit" v-permissions="['business:jkkeys:update']">编辑</el-button>
            <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:jkkeys:delete']">删除</el-button>
            <el-button type="text" @click="$refs.borrowingAndReturningRecords.open('借还记录', row)">领取记录</el-button>
            <el-button type="text" @click="$refs.operaJkKeysWindow.open('编辑钥匙基本信息表', row)" v-permissions="['business:jkkeys:update']">编辑</el-button>
            <el-button type="text" @click="deleteById(row)" v-permissions="['business:jkkeys:delete']">删除</el-button>
          </template>
        </el-table-column>
      </el-table>
@@ -94,6 +77,8 @@
    </template>
    <!-- æ–°å»º/修改 -->
    <OperaJkKeysWindow ref="operaJkKeysWindow" @success="handlePageChange"/>
    <!-- å€Ÿè¿˜è®°å½• -->
    <BorrowingAndReturningRecords ref="borrowingAndReturningRecords"/>
  </TableLayout>
</template>

@@ -102,26 +87,17 @@
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import OperaJkKeysWindow from '@/components/business/OperaJkKeysWindow'
import BorrowingAndReturningRecords from '@/components/business/BorrowingAndReturningRecords'
export default {
  name: 'JkKeys',
  extends: BaseTable,
  components: { TableLayout, Pagination, OperaJkKeysWindow },
  components: { TableLayout, Pagination, OperaJkKeysWindow, BorrowingAndReturningRecords },
  data () {
    return {
      // æœç´¢
      searchForm: {
        id: '',
        creator: '',
        createDate: '',
        editor: '',
        editDate: '',
        isdeleted: '',
        info: '',
        code: '',
        carCode: '',
        carId: '',
        rfidLable: '',
        roleType: '',
        status: ''
      }
    }