Skip to content

C
cloud-platform-ui
Commit 4db22e90 authored by lixy's avatar lixy
Browse files
Options

后台优化验收前端问题修复

parent 0dd99774
Show whitespace changes
Inline Side-by-side
Showing with 1457 additions and 25956 deletions
src/views/vehicle/bookRecord/index.vue
View file @ 4db22e90
......@@ -4,7 +4,7 @@
<el-form :rules="rules4Query" ref="queryForm" :inline="inline" :model="listQuery">
<el-form-item label="申请状态">
<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 statusList " :key="val.code" :label="val.val"
:value="val.code"></el-option>-->
<el-option
......@@ -23,7 +23,7 @@
</el-form-item>
<el-form-item label="用途">
<el-select class="filter-item" v-model="listQuery.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 in bookTypeList" :key="val.id" :label="val.name" :value="val.id"></el-option>
</el-select>
</el-form-item>
......@@ -35,22 +35,30 @@
placeholder="请选择"
@change="getProvinceRegions"
>
<el-option :key="undefined" label="无" :value="undefined"></el-option>
<el-option :key="undefined" label="全部" :value="undefined"></el-option>
<el-option v-for="val in getAllZoneList" :key="val.id" :label="val.name" :value="val.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="提车公司">
<el-select
class="filter-item"
v-model="listQuery.liftCompany"
placeholder="请选择"
@change="getAllBranchCompanyChange"
>
<el-option :key="undefined" label="无" :value="undefined"></el-option>
<el-option v-for="val in allBranchCompany" :key="val.id" :label="val.name" :value="val.id"></el-option>
</el-select>
<el-form-item label="提车公司" prop="subordinateBranch">
<el-autocomplete
class="inline-input"
v-model="listQuery.liftCompanyName"
:fetch-suggestions="querySearch"
placeholder="请输入内容"
@select="handleSelect"
></el-autocomplete>
</el-form-item>
<!--<el-form-item label="提车公司">-->
<!--<el-select-->
<!--class="filter-item"-->
<!--v-model="listQuery.liftCompany"-->
<!--placeholder="请选择"-->
<!--@change="getAllBranchCompanyChange"-->
<!--&gt;-->
<!--<el-option :key="undefined" label="全部" :value="undefined"></el-option>-->
<!--<el-option v-for="val in allBranchCompany" :key="val.id" :label="val.name" :value="val.id"></el-option>-->
<!--</el-select>-->
<!--</el-form-item>-->
<el-form-item label="预订月份" prop="selectedMonth4Query">
<el-date-picker
v-model="selectedMonth4Query"
......@@ -921,6 +929,7 @@ export default {
flag: false,
zoneId: undefined,
liftCompany: undefined,
liftCompanyName: "",
numberPlate: undefined,
selectedMonth: undefined,
status: undefined,
......@@ -1067,9 +1076,15 @@ export default {
if(queryJson.flag){
t.listQuery.flag = queryJson.flag;
}
// if(queryJson.liftCompany){
// t.listQuery.liftCompany = queryJson.liftCompany;
// }
if(queryJson.zoneId){
t.listQuery.zoneId = queryJson.zoneId;
}
if(queryJson.liftCompany){
t.listQuery.liftCompany = queryJson.liftCompany;
}
if(queryJson.liftCompanyName){
t.listQuery.liftCompanyName = queryJson.liftCompanyName;
}
if(queryJson.numberPlate){
t.listQuery.numberPlate = queryJson.numberPlate;
}
......@@ -1141,6 +1156,7 @@ export default {
flag: false,
zoneId: undefined,
liftCompany: undefined,
liftCompanyName: "",
numberPlate: undefined,
selectedMonth: undefined,
status: undefined,
......@@ -1332,10 +1348,10 @@ export default {
getProvinceRegions(item) {
this.listQuery.zoneId = item
this.baranchQuery.zoneId = item
this.listQuery.liftCompany = undefined
getAllBranchCompanyByZoneId(this.baranchQuery).then(response => {
this.allBranchCompany = response.data
})
// this.listQuery.liftCompany = undefined
// getAllBranchCompanyByZoneId(this.baranchQuery).then(response => {
// this.allBranchCompany = response.data
// })
},
getAllBranchCompanyChange(item) {
this.listQuery.liftCompany = item
......@@ -1363,19 +1379,16 @@ export default {
return restaurant.name.indexOf(queryString.toLowerCase()) != -1
}
},
/**
* 分公司搜索
* */
handleSelect2(item) {
this.listQuery.subordinateBranch = item.id
console.log(item)
},
/**
* 提车分公司
* */
handleSelect1(item) {
this.form4Lift.liftCompany = item.id
console.log(item)
handleSelect(item) {
if (item.value == "全部") {
this.listQuery.liftCompany = undefined;
} else {
this.listQuery.liftCompany = item.id;
}
console.log(item);
},
cancelDialog4Lift(formName) {
this.dialogForm4LiftVisible = false
......
src/views/vehicle/vehicleInfo/index.vue
View file @ 4db22e90
......@@ -16,7 +16,7 @@
<el-col :span="5">
<el-form-item label="车辆状态">
<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,index) in getAllVehicleStatus() " :key="index" :label="val.val"
:value="val.code"></el-option>
</el-select>
......@@ -28,7 +28,7 @@
class="inline-input"
v-model="state1"
:fetch-suggestions="querySearch"
placeholder="请输入内容"
placeholder="请输入分公司"
@select="handleSelect"
></el-autocomplete>
</el-form-item>
......@@ -44,19 +44,37 @@
</el-col>
<el-col :span="5">
<el-form-item label="省份" prop="addrProvince">
<el-select class="filter-item" v-model="listQuery.addrProvince" placeholder="请选择省份（直辖市）" @change="cityRegions4Query()">
<el-option v-for="item in provinceRegions" :key="item.id" :label="item.name"
:value="item.id"></el-option>
</el-select>
<el-autocomplete
class="inline-input"
v-model="listQuery.addrProvinceName"
:fetch-suggestions="querySearchProvinceName"
placeholder="请输入省份（直辖市）"
@select="handleSelectProvince"
></el-autocomplete>
</el-form-item>
<!--<el-form-item label="省份" prop="addrProvince">-->
<!--<el-select class="filter-item" v-model="listQuery.addrProvince" placeholder="请选择省份（直辖市）" @change="cityRegions4Query()">-->
<!--<el-option v-for="item in provinceArr" :key="item.id" :label="item.name"-->
<!--:value="item.id"></el-option>-->
<!--</el-select>-->
<!--</el-form-item>-->
</el-col>
<el-col :span="5">
<el-form-item label="城市" prop="addrCity">
<el-select class="filter-item" v-model="listQuery.addrCity" placeholder="请选择城市">
<el-option v-for="item in cityRegions4Query()" :key="item.id" :label="item.name"
:value="item.id"></el-option>
</el-select>
<el-autocomplete
class="inline-input"
v-model="listQuery.addrCityName"
:fetch-suggestions="querySearchCityName"
placeholder="请输入城市"
@select="handleSelectCity"
></el-autocomplete>
</el-form-item>
<!--<el-form-item label="城市" prop="addrCity">-->
<!--<el-select class="filter-item" v-model="listQuery.addrCity" placeholder="请选择城市">-->
<!--<el-option v-for="item in cityArr" :key="item.id" :label="item.name"-->
<!--:value="item.id"></el-option>-->
<!--</el-select>-->
<!--</el-form-item>-->
</el-col>
<el-col :span="5">
<el-form-item label="车型" prop="modelId">
......@@ -734,6 +752,7 @@
</template>
<script>
import axios from 'axios'
import upkeepDialog from '../../modal/upkeepDialogVisible'// 保养弹框
import departureDialog from '../../modal/departureDialog'// 出车弹框
import 'static/css/uploadImg.css';// 引入图片上传组件对话框
......@@ -748,6 +767,7 @@
delObj,
getSysRegionByIds,
checkCode,
getArea,
checkVin,
checkEngineNum
} from '../../../api/vehicle/vehicleInfo/';
......@@ -977,8 +997,7 @@
message: '长度小于 2000 个字符',
trigger: 'blur'
}
]
},
]},
book_type_list: [
{
name: '维修',
......@@ -1171,8 +1190,10 @@
page: 1,
limit: 20,
zoneId: undefined,
addrProvince: undefined,
addrCity: undefined,
addrProvince: undefined,//省份编号
addrProvinceName: '',//省份名称
addrCity: undefined,//城市编号
addrCityName:'',//城市名称
addrTown: undefined,
vin: undefined,
insuranceCompany: undefined,
......@@ -1246,10 +1267,18 @@
vehicleInfo_btn_apply: false,//申请预定
vehicleInfo_btn_ride: false,//出车
vehicleInfo_btn_ret: false,//删除
cityArr:[],//城市编码
provinceArr:[],//省份编码
}
},
created() {
let t = this;
axios.get('../../static/city.json').then((response) => {
t.cityArr = response.data.RECORDS;
});
axios.get('../../static/province.json').then((response) => {
t.provinceArr = response.data.RECORDS;
});
getAll().then(response => {
this.allCompaniesArr = response.data;
let query = localStorage.getItem("vehicleInfo");
......@@ -1261,6 +1290,23 @@
if(queryJson.limit){
t.listQuery.limit = queryJson.limit;
}
if(queryJson.addrCityName){
t.listQuery.addrCityName = queryJson.addrCityName;
}
if(queryJson.addrProvinceName){
t.listQuery.addrProvinceName = queryJson.addrProvinceName;
}
if(queryJson.addrCity){
t.listQuery.addrCity = queryJson.addrCity;
} else {
t.listQuery.addrCityName = '';
}
if(queryJson.addrProvince){
t.listQuery.addrProvince = queryJson.addrProvince;
} else {
t.listQuery.addrProvinceName = '';
}
if(queryJson.vin){
t.listQuery.vin = queryJson.vin;
}
......@@ -1316,6 +1362,14 @@
}
});
}
if(queryJson.useType){
t.listQuery.useType = queryJson.useType;
}
if(queryJson.belongToName){
t.listQuery.belongToName = queryJson.belongToName;
} else {
t.listQuery.belongToName = undefined;
}
}
t.getAllVehicleType();//获取全部车型
});
......@@ -1563,6 +1617,8 @@
zoneId: undefined,
addrProvince: undefined,
addrCity: undefined,
addrProvinceName: '',
addrCityName: '',
addrTown: undefined,
vin: undefined,
insuranceCompany: undefined,
......@@ -1581,6 +1637,12 @@
code: undefined
};
if(this.listQuery){
if(!this.listQuery.addrProvince){
this.listQuery.addrProvinceName = '';
}
if(!this.listQuery.addrCity){
this.listQuery.addrCityName = '';
}
localStorage.setItem("vehicleInfo", JSON.stringify(this.listQuery));
}
this.getList();
......@@ -1603,6 +1665,47 @@
}
this.upkeepDialogVisible = false;
},
/**
* 城市模糊查询
* */
querySearchCityName(queryString, cb) {
let selectArry = [];
let iitem = {
value: "全部",
name: "全部"
};
selectArry.push(iitem);
this.cityArr.map(function (item) {
item.value = item.name;
selectArry.push(item);
});
this.selectArry = selectArry;
var results = queryString ? selectArry.filter(this.createFilter(queryString)) : selectArry;
// 调用 callback 返回建议列表的数据
cb(results);
},
/**
* 省份模糊查询
* */
querySearchProvinceName(queryString, cb) {
let selectArry = [];
let iitem = {
value: "全部",
name: "全部"
};
selectArry.push(iitem);
this.provinceArr.map(function (item) {
item.value = item.name;
selectArry.push(item);
});
this.selectArry = selectArry;
var results = queryString ? selectArry.filter(this.createFilter(queryString)) : selectArry;
// 调用 callback 返回建议列表的数据
cb(results);
},
/**
* 分公司模糊查询
* */
querySearch(queryString, cb) {
let selectArry = [];
let iitem = {
......@@ -1728,6 +1831,26 @@
}
console.log(item);
},
/**
* 选择省份
*/
handleSelectProvince(item){
if (item.value == "全部") {
this.listQuery.addrProvince = undefined;
} else {
this.listQuery.addrProvince = item.code;
}
},
/**
* 选择城市
*/
handleSelectCity(item){
if (item.value == "全部") {
this.listQuery.addrCity = undefined;
} else {
this.listQuery.addrCity = item.code;
}
},
handleSelect(item) {
if (item.value == "全部") {
this.listQuery.subordinateBranch = undefined;
......@@ -2046,6 +2169,9 @@
if (!this.vehicleArr) {
listQueryTemp.modelId = undefined;
}
if(!this.listQuery.belongToName){
this.listQuery.belongToName = undefined;
}
page(listQueryTemp).then(response => {
if (response.code == 1) {
let totalCountRs = undefined;
......
static/city.json
View file @ 4db22e90
This source diff could not be displayed because it is too large. You can view the blob instead.
static/province.json 0 → 100644
View file @ 4db22e90
{
"RECORDS": [
{
"code": "110000",
"name": "北京"
},
{
"code": "120000",
"name": "天津"
},
{
"code": "130000",
"name": "河北省"
},
{
"code": "140000",
"name": "山西省"
},
{
"code": "150000",
"name": "内蒙古自治区"
},
{
"code": "210000",
"name": "辽宁省"
},
{
"code": "220000",
"name": "吉林省"
},
{
"code": "230000",
"name": "黑龙江省"
},
{
"code": "310000",
"name": "上海"
},
{
"code": "320000",
"name": "江苏省"
},
{
"code": "330000",
"name": "浙江省"
},
{
"code": "340000",
"name": "安徽省"
},
{
"code": "350000",
"name": "福建省"
},
{
"code": "360000",
"name": "江西省"
},
{
"code": "370000",
"name": "山东省"
},
{
"code": "410000",
"name": "河南省"
},
{
"code": "420000",
"name": "湖北省"
},
{
"code": "430000",
"name": "湖南省"
},
{
"code": "440000",
"name": "广东省"
},
{
"code": "450000",
"name": "广西壮族自治区"
},
{
"code": "460000",
"name": "海南省"
},
{
"code": "500000",
"name": "重庆"
},
{
"code": "510000",
"name": "四川省"
},
{
"code": "520000",
"name": "贵州省"
},
{
"code": "530000",
"name": "云南省"
},
{
"code": "540000",
"name": "西藏自治区"
},
{
"code": "610000",
"name": "陕西省"
},
{
"code": "620000",
"name": "甘肃省"
},
{
"code": "630000",
"name": "青海省"
},
{
"code": "640000",
"name": "宁夏回族自治区"
},
{
"code": "650000",
"name": "新疆维吾尔自治区"
},
{
"code": "710000",
"name": "台湾"
},
{
"code": "810000",
"name": "香港特别行政区"
},
{
"code": "820000",
"name": "澳门特别行政区"
},
{
"code": "900000",
"name": "钓鱼岛"
}
]
}
\ No newline at end of file
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