Skip to content

C
cloud-platform-ui
Commit b90ecf53 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 1660e616 a71f356d
Hide whitespace changes
Inline Side-by-side
Showing with 425 additions and 332 deletions
src/api/order/rentVehicle.js
View file @ b90ecf53
......@@ -123,7 +123,7 @@ export function downloadExcel(params) {
return fetch({
url: '/api/order/orderStatistics/excel',
method: 'post',
data:params,
data: params,
responseType: 'blob'
});
}
......@@ -140,7 +140,7 @@ export function pageList(params) {
//会员订单管理导出
export function orderMemberExcel(params) {
return fetch({
url: '/api/order/orderMember/page',
url: '/api/order/orderMember/export',
method: 'post',
data: params,
responseType: 'blob'
......
src/views/order/memberOrderInfo/index.vue
View file @ b90ecf53
......@@ -30,24 +30,24 @@
</el-col>
<el-col :span="5">
<el-form-item label="创建时间">
<el-date-picker
v-model="createTime"
type="daterange"
@change="changeCreate"
placeholder="选择日期范围">
</el-date-picker>
<el-date-picker
v-model="createTime"
type="daterange"
@change="changeCreate"
placeholder="选择日期范围">
</el-date-picker>
<!-- <el-date-picker v-model="createTime" type="datetimerange" placeholder="选择时间范围" @change="changeCreate"></el-date-picker> -->
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="支付时间">
<!-- <el-date-picker v-model="aplyTime" type="datetimerange" placeholder="选择支付时间范围" @change="changePay"></el-date-picker> -->
<el-date-picker
v-model="aplyTime"
type="daterange"
@change="changeCreate"
placeholder="选择支付时间范围">
</el-date-picker>
<el-date-picker
v-model="aplyTime"
type="daterange"
@change="changeCreate"
placeholder="选择支付时间范围">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="5">
......@@ -141,7 +141,7 @@
<p>{{scope.row.creatTime}}</p>
</template>
</el-table-column>
<el-table-column width="110" align="center" label="订单状态">
<el-table-column width="90" align="center" label="订单状态">
<template scope="scope">
<span v-if="scope.row.status == '2'">取消</span>
<span v-if="scope.row.status == '3'">待付款</span>
......@@ -197,12 +197,11 @@
<span>{{!!scope.row.payTime ? timestamp(new Date(scope.row.payTime)) : ''}}</span>
</template>
</el-table-column>
<!-- <el-table-column align="center" label="操作" width="150">
<template scope="scope">
<el-button v-if="btn_buy && scope.row.state == 0" size="small" type="success" @click="handleBuy(scope.row)">订单详情</el-button>
<el-button v-if="btn_buy && scope.row.state == 0" size="small" type="success" @click="handleBuy(scope.row)">操作</el-button>
</template>
</el-table-column>-->
<el-table-column align="center" label="操作" >
<template scope="scope">
<el-button size="small" type="text" @click="handleBuy(scope.row)">订单详情</el-button>
</template>
</el-table-column>
</el-table>
<div v-show="!listLoading" class="pagination-container">
......@@ -216,6 +215,157 @@
:total="total"
></el-pagination>
</div>
<!-- 用户详细信息窗口-->
<el-dialog title="用户详情" :visible.sync="detailsDialogFormVisible" type="text" label-width="95px"
class="user-list-dialog">
<el-form>
<el-row>
<el-form-item label="基础信息">
<span v-if="userDetails.status!=1">(状态-正常)</span>
<span v-if="userDetails.status==1">(状态-已禁用)</span>
</el-form-item>
</el-row>
<el-row style="border-bottom: 1px dashed #ccc;padding: 10px 0;">
<el-col :span="3">
<div class="demo-type">
<img :src="userDetails.headimgurl" style="width: 80px;border-radius: 50%;"/>
</div>
</el-col>
<el-col :span="18">
<el-row>
<el-col :span="6">
<el-form-item label="用户Id:">
<span>{{userDetails.userId}}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="昵称:">
<span>{{userDetails.nickName}}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="手机号:">
<span>{{userDetails.username}}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="注册终端:">
<span>{{userDetails.channel}}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="注册时间:">
<span>{{userDetails.createTime}}</span>
</el-form-item>
</el-col>
<el-col :span="9">
<el-form-item label="最近登录时间:">
<span>{{userDetails.lastTime}}</span>
</el-form-item>
</el-col>
</el-row>
</el-col>
</el-row>
<el-row>
<el-form-item label="实名认证状态">
<span v-if="!statusBoolean">(状态-未认证)</span>
<span v-if="statusBoolean">(状态-已认证)</span>
</el-form-item>
</el-row>
<el-row style="border-bottom: 1px dashed #ccc;padding-bottom: 10px;">
<el-col :span="6">
<el-form-item label="真实姓名: ">
<span>{{userDetails.realName}}</span>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="身份证号: ">
<span>{{userDetails.idNumber}}</span>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="性别: ">
<span>{{userDetails.sex}}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<div style="margin: 20px 0;"><span style="font-size: 16px;font-weight: bold;">会员信息</span></div>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="会员类型:">
<span>{{userDetails.memberName}}</span>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="有效期:">
<span>{{userDetails.validTime}}</span>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="充值次数:">
<span>{{userDetails.buyCount}}次</span>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="加入时间:">
<span>{{userDetails.timeOfMembership}}</span>
</el-form-item>
</el-col>
</el-row>
<el-row style="border-bottom: 1px dashed #ccc;padding-bottom: 10px;">
<el-col :span="12">
<el-form-item label="最近充值时间:">
<span>{{userDetails.recentRecharge}}</span>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="赠送总天数:">
<span>{{userDetails.totalNumber}}</span>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="剩余总天数:">
<span>{{userDetails.rentFreeDays}}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<div style="margin: 20px 0;"><span style="font-size: 16px;font-weight: bold;">用户来源</span></div>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="来源:">
<span>{{userDetails.source}}</span>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="邀请人账号:">
<span>{{userDetails.inviter}}</span>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="所属地区:">
<span>{{userDetails.cityName}}</span>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="上级:">
<span>{{getSuperiorInformation(userDetails.nameOfSuperior,userDetails.superiorMobileNumber,2)}}</span>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="detailsDialogFormVisible = false">关 闭</el-button>
</div>
</el-dialog>
</div>
</template>
......@@ -230,6 +380,9 @@ export default {
name: 'branchCompanyStock',
data() {
return {
detailsDialogFormVisible:false,//用户信息弹窗
userDetails:{},//用户信息
statusBoolean:false,//实名认证
form: {
id: null,
companyId: null,
......@@ -349,32 +502,43 @@ export default {
}
},
methods: {
changeCreate(val){
!val ? this.clearSearch() :''
},
changePay(val){
!val ? this.clearSearch() :''
},
timestamp(now) {
var year=now.getFullYear();
var month=now.getMonth()+1;
var date=now.getDate();
var Hours = now.getHours();
var Minutes = now.getMinutes();
var Seconds = now.getSeconds();
month = month.toString().length == 1 ? '0'+ month : month;
date = date.toString().length == 1 ? '0'+ date : date;
Hours = Hours.toString().length == 1 ? '0'+ Hours : Hours;
Minutes = Minutes.toString().length == 1 ? '0'+ Minutes : Minutes;
Seconds = Seconds.toString().length == 1 ? '0'+ Seconds : Seconds;
return year+"-"+month+"-"+date+' '+ Hours+':'+Minutes+":"+Seconds
},
//上级信息
getSuperiorInformation(name,mobile,type){
if (type==1&&name && mobile) {
return name+'/'+mobile;
}
if (type==2&&name && mobile) {
return name+' '+mobile;
}
return '';
},
changeCreate(val){
!val ? this.clearSearch() :''
},
changePay(val){
!val ? this.clearSearch() :''
},
timestamp(now) {
var year=now.getFullYear();
var month=now.getMonth()+1;
var date=now.getDate();
var Hours = now.getHours();
var Minutes = now.getMinutes();
var Seconds = now.getSeconds();
month = month.toString().length == 1 ? '0'+ month : month;
date = date.toString().length == 1 ? '0'+ date : date;
Hours = Hours.toString().length == 1 ? '0'+ Hours : Hours;
Minutes = Minutes.toString().length == 1 ? '0'+ Minutes : Minutes;
Seconds = Seconds.toString().length == 1 ? '0'+ Seconds : Seconds;
return year+"-"+month+"-"+date+' '+ Hours+':'+Minutes+":"+Seconds
},
excel() {
this.listQuery.isExport = true
this.listQuery.isExport = true;
orderMemberExcel(this.listQuery).then(res => {
this.listQuery.isExport = false;
const content = res
const blob = new Blob([content])
const fileName = this.timestamp(new Date())
const fileName = this.timestamp(new Date())+'.xlsx'
if ('download' in document.createElement('a')) {
// 非IE下载
const elink = document.createElement('a')
......@@ -392,63 +556,13 @@ export default {
})
},
handleBuy(row) {
this.$confirm('此操作将确认购买, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
buyStock(row.id).then(() => {
this.$notify({
title: '成功',
message: '操作成功',
type: 'success',
duration: 2000
})
this.getList()
})
})
},
handleCancel(row) {
this.$confirm('此操作将放弃购买, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
cancelApply(row.id).then(() => {
this.$notify({
title: '成功',
message: '操作成功',
type: 'success',
duration: 2000
})
this.getList()
})
})
},
handleDelete(row) {
this.$confirm('此操作将永久删除, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
delObj(row.id).then(() => {
this.$notify({
title: '成功',
message: '删除成功',
type: 'success',
duration: 2000
})
const index = this.list.indexOf(row)
this.list.splice(index, 1)
})
})
console.log(row);
},
handleFilter() {
this.listQuery.page = 1
this.$refs.queryForm.validate(valid => {
if (valid) {
this.getList()
this.getList()
} else {
return false
}
......@@ -517,6 +631,12 @@ export default {
}
</script>
<style>
.member .el-dialog--small {
width: 500px;
}
.user-list-dialog .el-form-item {
margin-bottom: 0px;
}
.el-card__body {
overflow: hidden;
padding: 0;
......
src/views/purseManage/gainRecord.vue
View file @ b90ecf53
......@@ -32,7 +32,7 @@
<el-table-column align="center" label="流水类型">
<template scope="scope">
<span v-if="scope.row.source==0">活动奖励</span>
<!-- <span v-if="scope.row.source==1">一级提成</span> -->
<span v-if="scope.row.source==1">一级提成</span>
<span v-if="scope.row.source==2">会员充值</span>
<span v-if="scope.row.source==10">成功提现</span>
<span v-if="scope.row.source==11">转账</span>
......@@ -55,7 +55,7 @@
<el-table-column align="center" label="来源">
<template scope="scope">
<span>{{scope.row.sourceName || '-'}}</span>
<span>{{scope.row.sourceUserName || '-'}}</span>
</template>
</el-table-column>
......
src/views/purseManage/incomeOverview.vue
View file @ b90ecf53
......@@ -4,17 +4,18 @@
<div class="filter-container" ref="filter-container">
<el-form ref="queryForm" :inline="inline" :model="listQuery" label-width="100px">
<el-row>
<el-col :span="8">
<el-col :span="5">
<el-form-item label="姓名">
<el-input v-model="listQuery.username" placeholder="请输入姓名"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="5">
<el-form-item label="手机号">
<el-input v-model.number="listQuery.phone" placeholder="请输入手机号"></el-input>
</el-form-item>
</el-col>
<el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button>
<el-button class="filter-item" type="primary" v-waves icon="search" @click="clearFilter">清除搜索</el-button>
</el-row>
</el-form>
</div>
......@@ -31,11 +32,11 @@
</template>
</el-table-column>
<el-table-column width="200" align="center" label="佣金比例">
<!-- <el-table-column width="200" align="center" label="佣金比例">
<template scope="scope">
<span>{{scope.row.commissionRate+'%'}}</span>
</template>
</el-table-column>
</el-table-column> -->
<el-table-column width="200" align="center" label="总收益">
<template scope="scope">
......@@ -71,7 +72,7 @@
<span>{{scope.row.balance}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="操作" fixed="right">
<!-- <el-table-column align="center" label="操作" fixed="right">
<template scope="scope">
<el-button
size="small"
......@@ -79,7 +80,7 @@
@click="deposit(scope.row)"
>{{scope.row.isFrozen == 0 ? '禁止提现' : '允许提现'}}</el-button>
</template>
</el-table-column>
</el-table-column> -->
</el-table>
<div v-show="!listLoading" class="pagination-container">
<el-pagination
......@@ -149,6 +150,11 @@ export default {
...mapGetters(['elements'])
},
methods: {
//清除搜索
clearFilter(){
this.listQuery.username = this.listQuery.phone = null;
this.getList()
},
//提现
deposit(row) {
let titleMsg =
......
src/views/userManagement/userList/index.vue
View file @ b90ecf53
......@@ -9,21 +9,21 @@
<el-form-item label="注册终端">
<el-select class="filter-item" v-model="listQuery.channel" placeholder="请选注册终端">
<el-option :key="undefined" label="全部" :value="undefined"></el-option>
<el-option v-for="(val, key, index) in mobileList " :key="val.id" :label="val.name"
<el-option v-for="(val,index) in mobileList " :key="index" :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.memberLevel" placeholder="请选会员类型">
<el-option :key="undefined" label="全部用户" :value="undefined"></el-option>
<el-option v-for="(val, key, index) in queryMemberLevelList " :key="val.id" :label="val.name"
<el-option v-for="(val,index) in queryMemberLevelList " :key="index" :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.postionState" placeholder="选择会员身份">
<el-option :key="undefined" label="全部" :value="undefined"></el-option>
<el-option v-for="(val, key, index) in postionStatelList " :key="val.id" :label="val.name"
<el-option v-for="(val,index) in postionStatelList " :key="index" :label="val.name"
:value="val.id"></el-option>
</el-select>
</el-form-item>
......@@ -59,7 +59,7 @@
<el-form-item label="用户来源">
<el-select class="filter-item" v-model="listQuery.source" placeholder="请选用户来源">
<el-option :key="undefined" label="全部" :value="undefined"></el-option>
<el-option v-for="(val, key, index) in sourceList" :key="val.id" :label="val.name"
<el-option v-for="(val,index) in sourceList" :key="index" :label="val.name"
:value="val.id"></el-option>
</el-select>
</el-form-item>
......@@ -332,7 +332,7 @@
<el-form-item label="会员等级" prop="memberLevel">
<el-select class="filter-item" v-model="userMembershipInformation.memberLevel" placeholder="请选择会员等级">
<!-- <el-option :key="undefined" label="无" :value="undefined"></el-option>-->
<el-option v-for="(val, key, index) in setMemberLevelList " :key="val.id" :label="val.name"
<el-option v-for="(val,index) in setMemberLevelList " :key="index" :label="val.name"
:value="val.id"></el-option>
</el-select>
</el-form-item>
......@@ -409,7 +409,7 @@
<el-form-item label="会员等级">
<el-select class="filter-item" v-model="newMemberObject.memberLevel" placeholder="选择会员等级">
<el-option :key="undefined" label="无" :value="undefined"></el-option>
<el-option v-for="(val, key, index) in setMemberLevelList " :key="val.id" :label="val.name"
<el-option v-for="(val,index) in setMemberLevelList " :key="index" :label="val.name"
:value="val.id"></el-option>
</el-select>
</el-form-item>
......@@ -439,7 +439,7 @@
<el-form-item label="订单类型">
<el-select class="filter-item" v-model="orderQuery.type" placeholder="请选订单状态">
<el-option :key="undefined" label="所有订单" :value="undefined"></el-option>
<el-option v-for="(val, key, index) in orderTypeList " :key="val.id" :label="val.name"
<el-option v-for="(val,index) in orderTypeList " :key="index" :label="val.name"
:value="val.id"></el-option>
</el-select>
</el-form-item>
......@@ -448,7 +448,7 @@
<el-form-item label="订单状态">
<el-select class="filter-item" v-model="orderQuery.status" placeholder="请选会员类型">
<el-option :key="undefined" label="所有订单" :value="undefined"></el-option>
<el-option v-for="(val, key, index) in orderStatusList " :key="val.id" :label="val.name"
<el-option v-for="(val,index) in orderStatusList " :key="index" :label="val.name"
:value="val.id"></el-option>
</el-select>
</el-form-item>
......
src/views/vehicle/bookRecord/index.vue
View file @ b90ecf53
......@@ -2,92 +2,74 @@
<div class="app-container calendar-list-container">
<div class="filter-container" ref="filter-container">
<el-form :rules="rules4Query" ref="queryForm" :inline="inline" :model="listQuery">
<el-row>
<el-col :span="5">
<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 v-for="val in bookTypeList" :key="val.id" :label="val.name" :value="val.id"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="车辆编码">
<el-input type="number" v-model.number="listQuery.code" placeholder="请输入车辆编码"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="车牌号">
<el-input v-model="listQuery.numberPlate" placeholder="请输入车牌号"></el-input>
</el-form-item>
</el-col>
<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 v-for="(val, key, index) in statusList " :key="val.code" :label="val.val"
:value="val.code"></el-option>-->
<el-option
v-for="(val, index) in statusList "
:key="index"
:label="val.val"
:value="val.code"
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
</el-col>
<el-col :span="5">
<el-form-item label="所属大区">
<el-select
class="filter-item"
v-model="listQuery.zoneId"
placeholder="请选择"
@change="getProvinceRegions"
>
<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-col>
<el-col :span="5">
<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-col>
<el-col :span="5">
<el-form-item label="提车时间" prop="bookStartDate4Query">
<el-date-picker
v-model="bookStartDate4Query"
type="month"
:editable="true"
format="yyyy-MM"
placeholder="请选择预约提车时间"
></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="还车时间" prop="bookEndDate4Query">
<el-date-picker
v-model="bookEndDate4Query"
type="month"
:editable="true"
format="yyyy-MM"
placeholder="请选择预约还车时间"
></el-date-picker>
</el-form-item>
</el-col>
</el-row>
<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 v-for="(val, key, index) in statusList " :key="val.code" :label="val.val"
:value="val.code"></el-option>-->
<el-option
v-for="(val, index) in statusList "
:key="index"
:label="val.val"
:value="val.code"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="车辆编码">
<el-input type="number" v-model.number="listQuery.code" placeholder="请输入车辆编码"></el-input>
</el-form-item>
<el-form-item label="车牌号">
<el-input v-model="listQuery.numberPlate" placeholder="请输入车牌号"></el-input>
</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 v-for="val in bookTypeList" :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.zoneId"
placeholder="请选择"
@change="getProvinceRegions"
>
<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="提车公司" 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"
type="month"
:editable="true"
format="yyyy-MM"
placeholder="请选择预订月份"
></el-date-picker>
</el-form-item>
<el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button>
<el-button class="filter-item" type="primary" v-waves @click="reloadPage">重置</el-button>
<el-button class="filter-item" type="primary" v-waves @click="reloadPage">重置</el-button>
</el-form>
</div>
......@@ -133,13 +115,17 @@
</el-table-column>
<el-table-column align="center" label="预定取/还时间" width="200">
<template scope="scope">
<span>{{scope.row.bookStartDate}}</span> <br/><span>{{scope.row.bookEndDate}}</span>
<span>{{scope.row.bookStartDate}}</span>
<br />
<span>{{scope.row.bookEndDate}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="实际取/还时间" width="200">
<template scope="scope">
<span>{{scope.row.actualStartDate}}</span> <br/><span>{{scope.row.actualEndDate}}</span>
</template>
<el-table-column align="center" label="实际取/还时间" width="200">
<template scope="scope">
<span>{{scope.row.actualStartDate}}</span>
<br />
<span>{{scope.row.actualEndDate}}</span>
</template>
</el-table-column>
<!-- <el-table-column align="center" label="预定时间" width="220">
<template scope="scope">
......@@ -421,7 +407,7 @@
</el-col>
</el-row>
<el-row style="margin-left: 20px;" v-if="departurePicList.length>0">
<el-col
<!-- <el-col
:span="3"
v-for="(item, index) in departurePicList"
:key="index"
......@@ -429,9 +415,13 @@
style="margin-bottom:10px"
>
<el-card>
<img :src="item" class="image" />
<img :src="item" class="image" @click="lookPic(item)" />
</el-card>
</el-col>
</el-col> -->
<viewer :images="departurePicList">
<img v-for="src in departurePicList" :src="src" :key="src" style="width: 100px; height: 100px;margin-right:30px;">
</viewer>
</el-row>
<hr />
<el-row>
......@@ -443,7 +433,14 @@
type="primary"
style="padding: 7px 9px;"
@click="resetReturn = true"
v-show="detailItem.status == 2 || detailItem.status == 5"
v-if="detailItem.status == 2 && !detailItem.vehicleDepartureLogVo"
>更换</el-button>
<el-button
size="mini"
type="primary"
style="padding: 7px 9px;"
@click="resetReturn = true"
v-if="detailItem.status == 2 && !!detailItem.vehicleDepartureLogVo && detailItem.vehicleDepartureLogVo.state == 0"
>更换</el-button>
</el-form-item>
</el-col>
......@@ -470,7 +467,7 @@
</el-col>
</el-row>
<el-row style="margin-left: 20px;" v-if="arrivalPicList.length>0">
<el-col
<!-- <el-col
:span="3"
v-for="(item, index) in arrivalPicList"
:key="index"
......@@ -478,9 +475,12 @@
style="margin-bottom:10px"
>
<el-card>
<img :src="item" class="image" />
<img :src="item" class="image" @click="lookPic(item)" />
</el-card>
</el-col>
</el-col> -->
<viewer :images="arrivalPicList">
<img v-for="src in arrivalPicList" :src="src" :key="src" style="width: 100px; height: 100px;margin-right:30px;">
</viewer>
</el-row>
<hr />
<el-row>
......@@ -947,13 +947,11 @@ export default {
flag: false,
zoneId: undefined,
liftCompany: undefined,
liftCompanyName: "",
liftCompanyName: '',
numberPlate: undefined,
selectedMonth: undefined,
status: undefined,
bookType: undefined,
bookStartDate: undefined,
bookEndDate: undefined
bookType: undefined
},
inline: true,
dialogFormVisible: false,
......@@ -1081,56 +1079,56 @@ export default {
}
},
created() {
let t = this;
let t = this
getAll().then(response => {
this.allCompaniesArr = response.data;
let query = localStorage.getItem("bookRecord");
if(query !="null" && query){
let queryJson = JSON.parse(query);
if(queryJson.page){
t.listQuery.page = queryJson.page;
}
if(queryJson.limit){
t.listQuery.limit = queryJson.limit;
}
if(queryJson.flag){
t.listQuery.flag = queryJson.flag;
}
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;
}
if(queryJson.selectedMonth){
t.listQuery.selectedMonth = queryJson.selectedMonth;
}
if(queryJson.status){
t.listQuery.status = queryJson.status;
}
if(queryJson.bookType){
t.listQuery.bookType = queryJson.bookType;
}
// if(queryJson.liftCompany){
// t.allCompaniesArr.map(function (item) {
// if(item.id == queryJson.liftCompany){
// t.listQuery.liftCompanyName = item.name;
// }
// });
// }
}
this.getList()
});
this.allCompaniesArr = response.data
let query = localStorage.getItem('bookRecord')
if (query != 'null' && query) {
let queryJson = JSON.parse(query)
if (queryJson.page) {
t.listQuery.page = queryJson.page
}
if (queryJson.limit) {
t.listQuery.limit = queryJson.limit
}
if (queryJson.flag) {
t.listQuery.flag = queryJson.flag
}
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
}
if (queryJson.selectedMonth) {
t.listQuery.selectedMonth = queryJson.selectedMonth
}
if (queryJson.status) {
t.listQuery.status = queryJson.status
}
if (queryJson.bookType) {
t.listQuery.bookType = queryJson.bookType
}
// if(queryJson.liftCompany){
// t.allCompaniesArr.map(function (item) {
// if(item.id == queryJson.liftCompany){
// t.listQuery.liftCompanyName = item.name;
// }
// });
// }
}
this.getList()
})
getAllCompany(codeAndBranchCompany => {
//初始化公司列表
this.allCompanies = codeAndBranchCompany
});
})
this.bookRecord_btn_prove = this.elements['bookRecord:btn_prove']
this.bookRecord_btn_reject = this.elements['bookRecord:btn_reject']
this.bookRecord_btn_unbook = this.elements['bookRecord:btn_unbook']
......@@ -1163,68 +1161,33 @@ export default {
this.listQuery.selectedMonth = undefined
}
}
},
bookStartDate4Query: {
get: function() {
if (
this.$utils.isString(this.listQuery.bookStartDate) &&
this.listQuery.bookStartDate !== ''
) {
return toEast8Date(this.listQuery.bookStartDate)
}
return undefined
},
set: function(date) {
if (this.$utils.isDate(date)) {
this.listQuery.bookStartDate = formatDate(date, 'yyyy-MM')
} else {
this.listQuery.bookStartDate = undefined
}
}
},
bookEndDate4Query: {
get: function() {
if (
this.$utils.isString(this.listQuery.bookEndDate) &&
this.listQuery.bookEndDate !== ''
) {
return toEast8Date(this.listQuery.bookEndDate)
}
return undefined
},
set: function(date) {
if (this.$utils.isDate(date)) {
this.listQuery.bookEndDate = formatDate(date, 'yyyy-MM')
} else {
this.listQuery.bookEndDate = undefined
}
}
}
},
methods: {
/**
* 重置
* */
reloadPage() {
this.listQuery = {
page: 1,
limit: 20,
flag: false,
zoneId: undefined,
liftCompany: undefined,
liftCompanyName: "",
numberPlate: undefined,
selectedMonth: undefined,
status: undefined,
bookType: undefined,
bookStartDate: undefined,
bookEndDate: undefined
};
if(this.listQuery){
localStorage.setItem("bookRecord", JSON.stringify(this.listQuery));
}
this.getList();
},
/**
* 重置
* */
reloadPage() {
this.listQuery = {
page: 1,
limit: 20,
flag: false,
zoneId: undefined,
liftCompany: undefined,
liftCompanyName: '',
numberPlate: undefined,
selectedMonth: undefined,
status: undefined,
bookType: undefined
}
if (this.listQuery) {
localStorage.setItem(
'bookRecord',
JSON.stringify(this.listQuery)
)
}
this.getList()
},
confirm() {
if (this.returnForm.retCompany == '') {
this.$notify({
......@@ -1243,9 +1206,9 @@ export default {
type: 'success',
duration: 2000
})
this.resetReturn = false;
this.dialogDetailVisible = false;
this.getList();
this.resetReturn = false
this.dialogDetailVisible = false
this.getList()
} else {
this.$notify({
title: '失败',
......@@ -1406,10 +1369,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
......@@ -1441,11 +1404,12 @@ export default {
* 提车分公司
* */
handleSelect(item) {
if (item.value == "全部") {
this.listQuery.liftCompany = undefined;
} else {
this.listQuery.liftCompany = item.id;
}
if (item.value == '全部') {
this.listQuery.liftCompany = undefined
} else {
this.listQuery.liftCompany = item.id
}
console.log(item)
},
cancelDialog4Lift(formName) {
this.dialogForm4LiftVisible = false
......@@ -1654,9 +1618,12 @@ export default {
this.listQuery.page = 1
this.$refs.queryForm.validate(valid => {
if (valid) {
if(this.listQuery){
localStorage.setItem("bookRecord", JSON.stringify(this.listQuery));
}
if (this.listQuery) {
localStorage.setItem(
'bookRecord',
JSON.stringify(this.listQuery)
)
}
this.getList()
} else {
return false
......
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