Commit c975878a authored by guoyou's avatar guoyou

解决冲突

parents b4f0e88c 8d765894
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<el-form-item label="车辆状态"> <el-form-item label="车辆状态">
<el-select class="filter-item" v-model="listQuery.status" placeholder="请选择车辆状态"> <el-select class="filter-item" v-model="listQuery.status" placeholder="请选择车辆状态">
<el-option :key="undefined" label="无" :value="undefined"></el-option> <el-option :key="undefined" label="无" :value="undefined"></el-option>
<el-option v-for="(val, key, index) in getAllVehicleStatus() " :key="val.code" :label="val.val" <el-option v-for="(val,index) in getAllVehicleStatus() " :key="index" :label="val.val"
:value="val.code"></el-option> :value="val.code"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
<el-form-item label="保险公司" prop="insuranceCompany"> <el-form-item label="保险公司" prop="insuranceCompany">
<el-select class="filter-item" v-model="listQuery.insuranceCompany" placeholder="请选择保险公司"> <el-select class="filter-item" v-model="listQuery.insuranceCompany" placeholder="请选择保险公司">
<el-option :key="undefined" label="无" :value="undefined"></el-option> <el-option :key="undefined" label="无" :value="undefined"></el-option>
<el-option v-for="(val, key, index) in getAllInsuranceCompany() " :key="val.code" :label="val.val" <el-option v-for="(val, index ) in getAllInsuranceCompany() " :key="index" :label="val.val"
:value="val.code"></el-option> :value="val.code"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -369,7 +369,7 @@ ...@@ -369,7 +369,7 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="车辆状态" prop="status"> <el-form-item label="车辆状态" prop="status">
<el-select class="filter-item" v-model="form.status" placeholder="请选择车辆状态"> <el-select class="filter-item" v-model="form.status" placeholder="请选择车辆状态">
<el-option v-for="(val, key, index) in getAllVehicleStatus() " :key="val.code" :label="val.val" <el-option v-for="(val,index ) in getAllVehicleStatus() " :key="index" :label="val.val"
:value="val.code"></el-option> :value="val.code"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -396,7 +396,7 @@ ...@@ -396,7 +396,7 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="所属人"> <el-form-item label="所属人">
<el-select v-model.number="form.belongTo" placeholder="请选择所属人"> <el-select v-model.number="form.belongTo" placeholder="请选择所属人">
<el-option v-for="(val, key, index) in getAllBelong2Type() " :key="val.code" :label="val.val" <el-option v-for="(val,index ) in getAllBelong2Type() " :key="index" :label="val.val"
:value="val.code"></el-option> :value="val.code"></el-option>
</el-select> </el-select>
<el-input v-if="typeof(form.belongTo) !== 'undefined' && form.belongTo != 1" v-model="form.belongToName" <el-input v-if="typeof(form.belongTo) !== 'undefined' && form.belongTo != 1" v-model="form.belongToName"
...@@ -409,7 +409,7 @@ ...@@ -409,7 +409,7 @@
<el-form-item label="保险公司" prop="insuranceCompany"> <el-form-item label="保险公司" prop="insuranceCompany">
<el-select class="filter-item" v-model="form.insuranceCompany" placeholder="请选择保险公司"> <el-select class="filter-item" v-model="form.insuranceCompany" placeholder="请选择保险公司">
<el-option :key="undefined" label="无" :value="undefined"></el-option> <el-option :key="undefined" label="无" :value="undefined"></el-option>
<el-option v-for="(val, key, index) in getAllInsuranceCompany() " :key="val.code" :label="val.val" <el-option v-for="(val, index) in getAllInsuranceCompany() " :key="index" :label="val.val"
:value="val.code"></el-option> :value="val.code"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -638,7 +638,7 @@ ...@@ -638,7 +638,7 @@
<el-form-item label="用途" prop="bookType"> <el-form-item label="用途" prop="bookType">
<el-select class="filter-item" v-model="form4Apply.bookType" placeholder="请选择用途"> <el-select class="filter-item" v-model="form4Apply.bookType" placeholder="请选择用途">
<el-option :key="undefined" label="" :value="undefined"></el-option> <el-option :key="undefined" label="" :value="undefined"></el-option>
<el-option v-for="(val, key, index) in book_type_list " :key="val.id" :label="val.name" <el-option v-for="(val, index) in book_type_list " :key="index" :label="val.name"
:value="val.id"></el-option> :value="val.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -894,7 +894,7 @@ ...@@ -894,7 +894,7 @@
return callback(new Error('编码合法范围:[1 - 9999999999]')); return callback(new Error('编码合法范围:[1 - 9999999999]'));
} }
//检验code码 //检验code码
checkCode(value, this.form.id).then(response => { checkCode(value, this.form.code).then(response => {
if (response.data === true) { if (response.data === true) {
return callback(new Error("该车辆编码已经被占用,请重新输入")); return callback(new Error("该车辆编码已经被占用,请重新输入"));
} else { } else {
...@@ -911,15 +911,16 @@ ...@@ -911,15 +911,16 @@
min: 0, min: 0,
max: 200, max: 200,
message: '长度小于 200 个字符', message: '长度小于 200 个字符',
trigger: 'blur' trigger: 'blur',
} }
], ],
numberPlate: [ numberPlate: [
{ {
min: 0, min: 0,
max: 20, max: 20,
message: '长度小于 20 个字符', trigger: 'blur',
trigger: 'blur' message: '车牌不能为空且长度小于20个字符',
required: true
} }
], ],
remark: [ remark: [
...@@ -1241,7 +1242,8 @@ ...@@ -1241,7 +1242,8 @@
return getSonRegionByCodes(this.listQuery.addrProvince); return getSonRegionByCodes(this.listQuery.addrProvince);
}, },
getAllZoneList() { getAllZoneList() {
this.allZoneArr = getAllZone(); let that = this;
that.allZoneArr = getAllZone();
return getAllZone(); return getAllZone();
}, },
townRegions4Query() { townRegions4Query() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment