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

doum

2 天以前 dd6a43fdbadaaf6d646b3eb2ca0a63f58ed77ea4

 admin/src/components/business/OperaJkKeysWindow.vue

@@ -11,11 +11,11 @@
        <el-input v-model="form.code" placeholder="请输入钥匙编号" v-trim/>
      </el-form-item>
      <el-form-item label="所属车辆" prop="carId">
        <el-select v-model="form.carId" placeholder="请选择">
        <el-select v-model="form.carId" filterable placeholder="请选择">
          <el-option
            v-for="item in carAll"
            :key="item.id"
            :label="item.name"
            :label="item.code"
            :value="item.id">
          </el-option>
        </el-select>
@@ -78,9 +78,9 @@
  },
  methods: {
    getCars() {
      allList({ type: 0 })
      allList({  })
        .then(res => {
          console.log(res)
          this.carAll = res
        })
    }
  }