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

doum

3 天以前 dd6a43fdbadaaf6d646b3eb2ca0a63f58ed77ea4

 admin/src/components/business/cabinetDetails.vue

@@ -6,8 +6,8 @@
        :withFooter="false"
    >
        <el-form ref="searchForm" :model="searchForm" label-width="100px" inline>
            <el-form-item label="钥匙" prop="keyCode">
                <el-input v-model="searchForm.keyCode" placeholder="请输入钥匙编码或名称" @keypress.enter.native="getList"></el-input>
            <el-form-item label="钥匙编码" prop="keyCode">
                <el-input v-model="searchForm.keyCode" 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">
@@ -37,7 +37,9 @@
            v-loading="loading"
            :data="list"
            stripe
            @selection-change="handleSelectionChange"
        >
            <el-table-column type="selection" width="55"></el-table-column>
            <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">
@@ -104,6 +106,7 @@
      return {
        id: null,
        info: null,
        ids: [],
        searchForm: {
          keyCode: '',
          status: '',
@@ -118,9 +121,17 @@
      open (title, id) {
        this.title = title
        this.id = id
        this.searchForm = {
          keyCode: '',
          status: '',
          bindStatus: ''
        }
        this.getList()
        this.getKeysAll()
        this.visible = true
      },
      handleSelectionChange(e) {
        this.ids = e.map(item => item.id)
      },
      getKeysAll() {
        list({  })
@@ -135,8 +146,20 @@
        if (type === 1) {
          obj.keyId = row.keyId
        } else if (type === 2) {
          if (!row.boardCode) return
          if (!/^[1-9]\d*$/.test(row.boardCode)) {
            this.$message.warning('只能输入正整数')
            row.boardCode = ''
            return
          }
          obj.boardCode = row.boardCode
        } else if (type === 3) {
          if (!row.channelCode) return
          if (!/^[1-9]\d*$/.test(row.channelCode)) {
            this.$message.warning('只能输入正整数')
            row.channelCode = ''
            return
          }
          obj.channelCode = row.channelCode
        }
        updateById(obj)
@@ -153,7 +176,7 @@
          cancelButtonText: '取消',
          type: 'warning'
        }).then(() => {
          unBindKeys(this.list.map(item => item.id))
          unBindKeys(this.ids)
            .then(res => {
              this.getList()
            })
@@ -172,9 +195,9 @@
        this.getList()
      },
      reset() {
        this.searchForm.keyId = ''
        this.searchForm.keyCode = ''
        this.searchForm.status = ''
        this.searchForm.workingStatus = ''
        this.searchForm.bindStatus = ''
        this.getList()
      },
      getList() {
@@ -186,6 +209,7 @@
            cabinetId: this.id,
            keyId: this.searchForm.keyId,
            status: this.searchForm.status,
            bindStatus: this.searchForm.bindStatus,
            workingStatus: this.searchForm.workingStatus
          }
        }).then(res => {