Skip to content

C
cloud-platform-ui
Commit 14db2a57 authored by jiaorz's avatar jiaorz
Browse files
Options

Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform-ui into base-modify

parents b0a40cc4 4db22e90
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2243 additions and 447 deletions
src/views/order/orderStatistics/index.vue
View file @ 14db2a57
...@@ -135,13 +135,15 @@ export default { ...@@ -135,13 +135,15 @@ export default {
: (this.listQuery.startTime = null) : (this.listQuery.startTime = null)
!!this.listQuery.time[1] !!this.listQuery.time[1]
? (this.listQuery.endTime = this.listQuery.time[1].getTime()) ? (this.listQuery.endTime = this.listQuery.time[1].getTime())
: (this.listQuery.endTime = null) : (this.listQuery.endTime = null);
this.listQuery.page = 1;
this.getList() this.getList()
}, },
//统计方式筛选 //统计方式筛选
changeWay(val) { changeWay(val) {
this.isactive = val.label this.isactive = val.label
this.listQuery.type = val.id this.listQuery.type = val.id;
this.listQuery.page = 1;
this.getList() this.getList()
}, },
//导出 //导出
...@@ -223,4 +225,4 @@ export default { ...@@ -223,4 +225,4 @@ export default {
color: #409eff; color: #409eff;
font-weight: bold; font-weight: bold;
} }
</style> </style>
\ No newline at end of file
src/views/userManagement/employeesInput.vue
View file @ 14db2a57
...@@ -449,6 +449,7 @@ export default { ...@@ -449,6 +449,7 @@ export default {
}, },
//搜索 //搜索
handleFilter() { handleFilter() {
this.listQuery.page = 1;
if(this.listQuery){ if(this.listQuery){
localStorage.setItem("employeesInput", JSON.stringify(this.listQuery)); localStorage.setItem("employeesInput", JSON.stringify(this.listQuery));
} }
......
src/views/userManagement/memberEnter.vue
View file @ 14db2a57
...@@ -495,6 +495,7 @@ ...@@ -495,6 +495,7 @@
* 搜索 * 搜索
*/ */
handleFilter() { handleFilter() {
this.listQuery.page = 1;
this.getList(); this.getList();
}, },
handleSizeChange(val) { handleSizeChange(val) {
......
src/views/userManagement/userList/index.vue
View file @ 14db2a57
...@@ -820,7 +820,6 @@ ...@@ -820,7 +820,6 @@
if(queryJson.limit){ if(queryJson.limit){
t.listQuery.limit = queryJson.limit; t.listQuery.limit = queryJson.limit;
} }
if(queryJson.mobileList){ if(queryJson.mobileList){
t.listQuery.mobileList = queryJson.mobileList; t.listQuery.mobileList = queryJson.mobileList;
} }
...@@ -1062,6 +1061,7 @@ ...@@ -1062,6 +1061,7 @@
*查询 *查询
*/ */
handleFilter() { handleFilter() {
this.listQuery.page = 1;
if(this.listQuery){ if(this.listQuery){
localStorage.setItem("userList", JSON.stringify(this.listQuery)); localStorage.setItem("userList", JSON.stringify(this.listQuery));
} }
......
src/views/vehicle/bookRecord/index.vue
View file @ 14db2a57
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<el-form :rules="rules4Query" ref="queryForm" :inline="inline" :model="listQuery"> <el-form :rules="rules4Query" ref="queryForm" :inline="inline" :model="listQuery">
<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 statusList " :key="val.code" :label="val.val" <!-- <el-option v-for="(val, key, index) in statusList " :key="val.code" :label="val.val"
:value="val.code"></el-option>--> :value="val.code"></el-option>-->
<el-option <el-option
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
</el-form-item> </el-form-item>
<el-form-item label="用途"> <el-form-item label="用途">
<el-select class="filter-item" v-model="listQuery.bookType" placeholder="请选择"> <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-option v-for="val in bookTypeList" :key="val.id" :label="val.name" :value="val.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -35,22 +35,30 @@ ...@@ -35,22 +35,30 @@
placeholder="请选择" placeholder="请选择"
@change="getProvinceRegions" @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-option v-for="val in getAllZoneList" :key="val.id" :label="val.name" :value="val.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="提车公司" prop="subordinateBranch">
<el-form-item label="提车公司"> <el-autocomplete
<el-select class="inline-input"
class="filter-item" v-model="listQuery.liftCompanyName"
v-model="listQuery.liftCompany" :fetch-suggestions="querySearch"
placeholder="请选择" placeholder="请输入内容"
@change="getAllBranchCompanyChange" @select="handleSelect"
> ></el-autocomplete>
<el-option :key="undefined" label="无" :value="undefined"></el-option> </el-form-item>
<el-option v-for="val in allBranchCompany" :key="val.id" :label="val.name" :value="val.id"></el-option> <!--<el-form-item label="提车公司">-->
</el-select> <!--<el-select-->
</el-form-item> <!--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-form-item label="预订月份" prop="selectedMonth4Query">
<el-date-picker <el-date-picker
v-model="selectedMonth4Query" v-model="selectedMonth4Query"
...@@ -921,6 +929,7 @@ export default { ...@@ -921,6 +929,7 @@ export default {
flag: false, flag: false,
zoneId: undefined, zoneId: undefined,
liftCompany: undefined, liftCompany: undefined,
liftCompanyName: "",
numberPlate: undefined, numberPlate: undefined,
selectedMonth: undefined, selectedMonth: undefined,
status: undefined, status: undefined,
...@@ -1067,9 +1076,15 @@ export default { ...@@ -1067,9 +1076,15 @@ export default {
if(queryJson.flag){ if(queryJson.flag){
t.listQuery.flag = queryJson.flag; t.listQuery.flag = queryJson.flag;
} }
// if(queryJson.liftCompany){ if(queryJson.zoneId){
// t.listQuery.liftCompany = queryJson.liftCompany; t.listQuery.zoneId = queryJson.zoneId;
// } }
if(queryJson.liftCompany){
t.listQuery.liftCompany = queryJson.liftCompany;
}
if(queryJson.liftCompanyName){
t.listQuery.liftCompanyName = queryJson.liftCompanyName;
}
if(queryJson.numberPlate){ if(queryJson.numberPlate){
t.listQuery.numberPlate = queryJson.numberPlate; t.listQuery.numberPlate = queryJson.numberPlate;
} }
...@@ -1141,6 +1156,7 @@ export default { ...@@ -1141,6 +1156,7 @@ export default {
flag: false, flag: false,
zoneId: undefined, zoneId: undefined,
liftCompany: undefined, liftCompany: undefined,
liftCompanyName: "",
numberPlate: undefined, numberPlate: undefined,
selectedMonth: undefined, selectedMonth: undefined,
status: undefined, status: undefined,
...@@ -1332,10 +1348,10 @@ export default { ...@@ -1332,10 +1348,10 @@ export default {
getProvinceRegions(item) { getProvinceRegions(item) {
this.listQuery.zoneId = item this.listQuery.zoneId = item
this.baranchQuery.zoneId = item this.baranchQuery.zoneId = item
this.listQuery.liftCompany = undefined // this.listQuery.liftCompany = undefined
getAllBranchCompanyByZoneId(this.baranchQuery).then(response => { // getAllBranchCompanyByZoneId(this.baranchQuery).then(response => {
this.allBranchCompany = response.data // this.allBranchCompany = response.data
}) // })
}, },
getAllBranchCompanyChange(item) { getAllBranchCompanyChange(item) {
this.listQuery.liftCompany = item this.listQuery.liftCompany = item
...@@ -1363,19 +1379,16 @@ export default { ...@@ -1363,19 +1379,16 @@ export default {
return restaurant.name.indexOf(queryString.toLowerCase()) != -1 return restaurant.name.indexOf(queryString.toLowerCase()) != -1
} }
}, },
/**
* 分公司搜索
* */
handleSelect2(item) {
this.listQuery.subordinateBranch = item.id
console.log(item)
},
/** /**
* 提车分公司 * 提车分公司
* */ * */
handleSelect1(item) { handleSelect(item) {
this.form4Lift.liftCompany = item.id if (item.value == "全部") {
console.log(item) this.listQuery.liftCompany = undefined;
} else {
this.listQuery.liftCompany = item.id;
}
console.log(item);
}, },
cancelDialog4Lift(formName) { cancelDialog4Lift(formName) {
this.dialogForm4LiftVisible = false this.dialogForm4LiftVisible = false
......
src/views/vehicle/vehicleDepartureLog/index.vue
View file @ 14db2a57
...@@ -345,6 +345,7 @@ ...@@ -345,6 +345,7 @@
this.handleFilter(); this.handleFilter();
}, },
handleFilter() { handleFilter() {
this.listQuery.page = 1
if(this.listQuery){ if(this.listQuery){
localStorage.setItem("vehicleDepartureLog", JSON.stringify(this.listQuery)); localStorage.setItem("vehicleDepartureLog", JSON.stringify(this.listQuery));
} }
......
src/views/vehicle/vehicleInfo/index.vue
View file @ 14db2a57
This diff is collapsed.
src/views/vehicle/vehicleSchedulManage/vehicleExhibitionModal.vue
View file @ 14db2a57
...@@ -31,7 +31,8 @@ ...@@ -31,7 +31,8 @@
<span>{{currentItem.ii.vehicleBookRecord.remark}}</span> <span>{{currentItem.ii.vehicleBookRecord.remark}}</span>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" v-if='currentItem.ii.vehicleBookRecord.status==2&&bookRecord_btn_unbook&&currentItem.ii.vehicleBookRecord.vehicleDepartureLogVo!=undefined' class="dialog-footer"> <!--客户租车-已审核过-取消按钮权限-未出行-->
<div slot="footer" v-if='currentItem.ii.vehicleBookRecord.status==2 && currentItem.ii.bookType==9 &&bookRecord_btn_unbook && !currentItem.ii.vehicleBookRecord.vehicleDepartureLogVo' class="dialog-footer">
<el-button @click="cancel()">取消用车</el-button> <el-button @click="cancel()">取消用车</el-button>
</div> </div>
<div slot="footer" v-if='currentItem.ii.vehicleBookRecord.status==1' class="dialog-footer"> <div slot="footer" v-if='currentItem.ii.vehicleBookRecord.status==1' class="dialog-footer">
...@@ -91,21 +92,28 @@ ...@@ -91,21 +92,28 @@
* 弹框-取消 * 弹框-取消
* */ * */
cancel() { cancel() {
console.log("展览取消用车");
var obj = { var obj = {
vehicleBookRecordId:this.currentItem.ii.vehicleBookRecord.id vehicleBookRecordId:this.currentItem.ii.vehicleBookRecord.id
} };
cancleBook(obj).then(response => { this.$confirm('确定取消吗?', '提示', {
if(response.code==1){ confirmButtonText: '确定',
this.$emit("zhanlanDialogEvent", true); cancelButtonText: '取消',
}else{ type: 'warning'
this.$notify({ }).then(() => {
title: '失败', cancleBook(obj).then(response => {
message: response.message, if(response.code==1){
type: 'error', this.$emit("zhanlanDialogEvent", true);
duration: 2000 }else{
}); this.$notify({
} title: '失败',
message: response.message,
type: 'error',
duration: 2000
});
}
});
}).catch(() => {
console.log("cancel");
}); });
}, },
/** /**
......
src/views/vehicle/vehicleSchedulManage/vehicleRecords.vue
View file @ 14db2a57
...@@ -224,6 +224,7 @@ ...@@ -224,6 +224,7 @@
this.getList(); this.getList();
}, },
handleFilter() { handleFilter() {
this.listQuery.page = 1;
if(this.listQuery){ if(this.listQuery){
localStorage.setItem("vehicleRecords", JSON.stringify(this.listQuery)); localStorage.setItem("vehicleRecords", JSON.stringify(this.listQuery));
} }
......
src/views/vehicle/vehicleUpkeepLog/index.vue
View file @ 14db2a57
...@@ -149,6 +149,7 @@ ...@@ -149,6 +149,7 @@
this.handleFilter(); this.handleFilter();
}, },
handleFilter() { handleFilter() {
this.listQuery.page = 1;
if(this.listQuery){ if(this.listQuery){
localStorage.setItem("vehicleUpkeepLog", JSON.stringify(this.listQuery)); localStorage.setItem("vehicleUpkeepLog", JSON.stringify(this.listQuery));
} }
......
src/views/vehicle/vehicleWarningMsg/index.vue
View file @ 14db2a57
...@@ -300,6 +300,7 @@ ...@@ -300,6 +300,7 @@
}, },
handleFilter() { handleFilter() {
let t = this; let t = this;
this.listQuery.page = 1
this.$refs.queryForm.validate(valid => { this.$refs.queryForm.validate(valid => {
if (valid) { if (valid) {
if(t.listQuery){ if(t.listQuery){
......
static/city.json 0 → 100644
View file @ 14db2a57
This diff is collapsed.
static/province.json 0 → 100644
View file @ 14db2a57
{
"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