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

doum

2025-10-15 2b287056e2f59518888d05a1bbc7e5a55fbd84d5

 admin/src/views/business/jkKeys.vue

@@ -5,8 +5,15 @@
      <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="carId">
        <el-select v-model="searchForm.carId" placeholder="请选择" @change="search">
          <el-option
            v-for="item in carAll"
            :key="item.id"
            :label="item.code"
            :value="item.id">
          </el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="状态" prop="status">
        <el-select v-model="searchForm.status" placeholder="请选择" @change="search">
@@ -37,10 +44,10 @@
      >
        <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="carName" label="所属车辆" min-width="100px"></el-table-column>
        <el-table-column prop="carCode" label="所属车辆" min-width="100px"></el-table-column>
        <el-table-column prop="rfidLable" label="RFID标签" 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 prop="cabinetName" label="绑定钥匙柜" min-width="100px"></el-table-column>
        <el-table-column prop="gridCode" 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>
@@ -58,12 +65,12 @@
        <el-table-column
          v-if="containPermissions(['business:jkkeys:update', 'business:jkkeys:delete'])"
          label="操作"
          min-width="120"
          min-width="150"
          fixed="right"
        >
          <template slot-scope="{row}">
            <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="$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>
@@ -88,6 +95,7 @@
import Pagination from '@/components/common/Pagination'
import OperaJkKeysWindow from '@/components/business/OperaJkKeysWindow'
import BorrowingAndReturningRecords from '@/components/business/BorrowingAndReturningRecords'
import { allList } from '@/api/business/cars'
export default {
  name: 'JkKeys',
  extends: BaseTable,
@@ -97,9 +105,10 @@
      // 搜索
      searchForm: {
        code: '',
        carCode: '',
        carId: '',
        status: ''
      }
      },
      carAll: []
    }
  },
  created () {
@@ -110,6 +119,15 @@
      'field.main': 'id'
    })
    this.search()
    this.getCars()
  },
  methods: {
    getCars() {
      allList({ type: 0 })
        .then(res => {
          this.carAll = res
        })
    }
  }
}
</script>