Skip to content

C
cloud-platform-ui
Commit 0e46cb4b authored by xiaosl's avatar xiaosl
Browse files
Options

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

parents e002ad02 8f17505d
Hide whitespace changes
Inline Side-by-side
Showing with 698 additions and 232 deletions
src/api/admin/member/index.js
View file @ 0e46cb4b
...@@ -20,3 +20,10 @@ export function addMembershipGrade(obj) { ...@@ -20,3 +20,10 @@ export function addMembershipGrade(obj) {
data:obj data:obj
}); });
} }
export function update(params) {
return fetch({
url: 'api/admin/member/update',
method: 'PUT',
data:params
});
}
\ No newline at end of file
src/api/vehicle/vehicleCount/index.js 0 → 100644
View file @ 0e46cb4b
import fetch from 'utils/fetch';
export function get(query) {
return fetch({
url: '/vehicle/vehicleCount/app/unauth/get',
method: 'get',
params: query
});
}
export function excelExport(query) {
return fetch({
url: '/vehicle/vehicleCount/app/unauth/export',
method: 'post',
data: query
});
}
export function excelDownload(query) {
return fetch({
url: '/vehicle/vehicleCount/app/unauth/download',
method: 'get',
params: query
});
}
src/router/index.js
View file @ 0e46cb4b
...@@ -373,6 +373,12 @@ export const asyncRouterMap = [{ ...@@ -373,6 +373,12 @@ export const asyncRouterMap = [{
name: '车辆排班记录', name: '车辆排班记录',
authority: 'vehicleRecords' authority: 'vehicleRecords'
}, },
{
path: 'vehicleCount',
component: _import('vehicle/vehicleCount/index'),
name: '车辆出行统计',
authority: 'vehicleCount'
},
// { // {
// path: 'dispatchApply', // path: 'dispatchApply',
// component: _import('vehicle/dispatchApply/index'), // component: _import('vehicle/dispatchApply/index'),
...@@ -427,12 +433,12 @@ export const asyncRouterMap = [{ ...@@ -427,12 +433,12 @@ export const asyncRouterMap = [{
name: '会员订单管理', name: '会员订单管理',
authority: 'memberOrderInfo' authority: 'memberOrderInfo'
}, },
// { {
// path: 'orderStatistics', path: 'orderStatistics',
// component: _import('order/orderStatistics/index'), component: _import('order/orderStatistics/index'),
// name: '会员订单统计', name: '会员订单统计',
// authority: 'orderStatistics' authority: 'orderStatistics'
// }, },
{ {
path: 'createOrder', path: 'createOrder',
component: _import('order/createOrder/index'), component: _import('order/createOrder/index'),
......
src/utils/dateUtils.js
View file @ 0e46cb4b
...@@ -98,3 +98,7 @@ export function getYMD(timestamp) { ...@@ -98,3 +98,7 @@ export function getYMD(timestamp) {
let date = new Date(timestamp);//时间戳为10位需*1000，时间戳为13位的话不需乘1000 let date = new Date(timestamp);//时间戳为10位需*1000，时间戳为13位的话不需乘1000
return formatDate(date, 'yyyy-MM-dd'); return formatDate(date, 'yyyy-MM-dd');
} }
export function getYMD_date(date) {
return formatDate(date, 'yyyy-MM-dd');
}
src/views/order/createOrder/index.vue
View file @ 0e46cb4b
...@@ -122,6 +122,7 @@ export default { ...@@ -122,6 +122,7 @@ export default {
endCompanyId: null, endCompanyId: null,
startCompanyIds: null, startCompanyIds: null,
endCompanyIds: null, endCompanyIds: null,
// time: [new Date(2019, 10, 10, 9, 0), new Date(2019, 10, 11, 18, 0)],
time: [], time: [],
limit: 100, limit: 100,
page: 1, page: 1,
...@@ -243,7 +244,7 @@ export default { ...@@ -243,7 +244,7 @@ export default {
var nTime = var nTime =
this.listQuery.time[1].getTime() - this.listQuery.time[0].getTime(); this.listQuery.time[1].getTime() - this.listQuery.time[0].getTime();
let params = { let params = {
dayNum: nTime / (24 * 60 * 60 * 1000), //天数 dayNum: (nTime / (24 * 60 * 60 * 1000)) + 1, //天数
endAddr: this.listQuery.startEndAddr, //还车地点 endAddr: this.listQuery.startEndAddr, //还车地点
endCity: this.listQuery.startAddrCity, //还车城市编号 endCity: this.listQuery.startAddrCity, //还车城市编号
endCityName: this.listQuery.startCityName, //还车城市名称 endCityName: this.listQuery.startCityName, //还车城市名称
...@@ -260,7 +261,7 @@ export default { ...@@ -260,7 +261,7 @@ export default {
damageSafe: this.listQuery.damageSafe == "需要" ? 1 : 0, //是否购买免赔 damageSafe: this.listQuery.damageSafe == "需要" ? 1 : 0, //是否购买免赔
rentFreeDay: this.listQuery.rentFreeDay == "使用" ? 1 : 0, //是否使用出租免费天数 rentFreeDay: this.listQuery.rentFreeDay == "使用" ? 1 : 0, //是否使用出租免费天数
orderOrigin: 3, //订车来源 orderOrigin: 3, //订车来源
appUserId: 334 appUserId: this.appUserId
}; };
addIndent(params).then(data => { addIndent(params).then(data => {
console.log(data); console.log(data);
...@@ -301,7 +302,9 @@ export default { ...@@ -301,7 +302,9 @@ export default {
username(this.listQuery.tel).then(data => { username(this.listQuery.tel).then(data => {
if (data.status == 200) { if (data.status == 200) {
if (!!data.data) { if (!!data.data) {
console.log(!!data.data.rentFreeDays); // console.log(!!data.data.rentFreeDays);
// console.log(data.data);
// console.log(data.data.userid);
this.appUserId = data.data.userid; this.appUserId = data.data.userid;
if (!!data.data.rentFreeDays) { if (!!data.data.rentFreeDays) {
if (data.data.rentFreeDays >= 1) { if (data.data.rentFreeDays >= 1) {
......
src/views/order/orderStatistics/index.vue
View file @ 0e46cb4b
...@@ -31,8 +31,14 @@ ...@@ -31,8 +31,14 @@
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<el-table
<el-table :data="list" border fit highlight-current-row style="width: 100%"> :data="list"
border
fit
highlight-current-row
style="width: 100%"
v-loading="loading"
>
<el-table-column align="center" label="时间"> <el-table-column align="center" label="时间">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.timeSlot}}</span> <span>{{scope.row.timeSlot}}</span>
...@@ -40,32 +46,32 @@ ...@@ -40,32 +46,32 @@
</el-table-column> </el-table-column>
<el-table-column align="center" label="普通会员购买量"> <el-table-column align="center" label="普通会员购买量">
<template scope="scope"> <template scope="scope">
<span v-if="scope.row.members[0].level == 1">{{scope.row.members[0].number || 0}}</span> <span>{{scope.row.pNumber}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="支付金额(普通会员)"> <el-table-column align="center" label="支付金额(普通会员)">
<template scope="scope"> <template scope="scope">
<span v-if="scope.row.members[0].level == 1">{{scope.row.members[0].amount || 0}}</span> <span>{{scope.row.pAmount}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="黄金会员购买量"> <el-table-column align="center" label="黄金会员购买量">
<template scope="scope"> <template scope="scope">
<span v-if="scope.row.members[0].level == 2">{{scope.row.members[0].number || 0}}</span> <span>{{scope.row.goldNumber}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="支付金额(黄金会员)"> <el-table-column align="center" label="支付金额(黄金会员)">
<template scope="scope"> <template scope="scope">
<span v-if="scope.row.members[0].level == 2">{{scope.row.members[0].amount || 0}}</span> <span>{{scope.row.goldAmount}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="钻石会员购买量"> <el-table-column align="center" label="钻石会员购买量">
<template scope="scope"> <template scope="scope">
<span v-if="scope.row.members[0].level == 3">{{scope.row.members[0].number || 0}}</span> <span>{{scope.row.hNumber}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="支付金额(钻石会员)"> <el-table-column align="center" label="支付金额(钻石会员)">
<template scope="scope"> <template scope="scope">
<span v-if="scope.row.members[0].level == 3">{{scope.row.members[0].amount || 0}}</span> <span>{{scope.row.hAmount}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="总支付金额"> <el-table-column align="center" label="总支付金额">
...@@ -85,6 +91,7 @@ export default { ...@@ -85,6 +91,7 @@ export default {
}, },
data() { data() {
return { return {
loading: false,
list: [], list: [],
// 统计时间筛选 // 统计时间筛选
listQuery: { listQuery: {
...@@ -152,11 +159,36 @@ export default { ...@@ -152,11 +159,36 @@ export default {
}, },
//列表 //列表
getList() { getList() {
let params = {};
this.loading = true;
orderStatistics(this.listQuery).then(data => { orderStatistics(this.listQuery).then(data => {
console.log(data); console.log(data);
if (data.status == 200) { if (data.status == 200) {
data.data.forEach(element => {
for (let i in element.members) {
if (element.members[i].level == 1) {
element.pAmount = element.members[i].amount;
element.plevel = element.members[i].level;
element.pMemberName = element.members[i].memberName;
element.pNumber = element.members[i].number;
} else if (element.members[i].level == 2) {
element.goldAmount = element.members[i].amount;
element.goldlevel = element.members[i].level;
element.goldMemberName = element.members[i].memberName;
element.goldNumber = element.members[i].number;
} else if (element.members[i].level == 3) {
element.hAmount = element.members[i].amount;
element.hlevel = element.members[i].level;
element.hMemberName = element.members[i].memberName;
element.hNumber = element.members[i].number;
}
}
});
this.list = data.data; this.list = data.data;
} }
setTimeout(() => {
this.loading = false;
}, 300);
}); });
} }
} }
......
src/views/order/rentVehicleInfo/detail.vue
View file @ 0e46cb4b
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
<span v-if="row.status == '4'">待出行</span> <span v-if="row.status == '4'">待出行</span>
<span v-if="row.status == '5'">出行中</span> <span v-if="row.status == '5'">出行中</span>
<span v-if="row.status == '6'">已完成</span> <span v-if="row.status == '6'">已完成</span>
<span v-if="row.status == '-1'">定损中</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
......
src/views/order/rentVehicleInfo/index.vue
View file @ 0e46cb4b
...@@ -71,6 +71,7 @@ ...@@ -71,6 +71,7 @@
<el-option :key="5" label="出行中" :value="5"></el-option> <el-option :key="5" label="出行中" :value="5"></el-option>
<el-option :key="6" label="已完成" :value="6"></el-option> <el-option :key="6" label="已完成" :value="6"></el-option>
<el-option :key="2" label="已取消" :value="2"></el-option> <el-option :key="2" label="已取消" :value="2"></el-option>
<el-option :key="-1" label="定损中" :value="-1"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -696,6 +697,7 @@ export default { ...@@ -696,6 +697,7 @@ export default {
}); });
}, },
handleOrderDetail(row) { handleOrderDetail(row) {
debugger
this.form = row; this.form = row;
if (this.form.status == 2) { if (this.form.status == 2) {
this.form.ststusName = "取消"; this.form.ststusName = "取消";
...@@ -712,6 +714,9 @@ export default { ...@@ -712,6 +714,9 @@ export default {
if (this.form.status == 6) { if (this.form.status == 6) {
this.form.ststusName = "已完成"; this.form.ststusName = "已完成";
} }
if (this.form.status == -1) {
this.form.ststusName = "定损中";
}
this.form.orderRentVehicleDetail.startTime = this.form this.form.orderRentVehicleDetail.startTime = this.form
.orderRentVehicleDetail.startTime .orderRentVehicleDetail.startTime
? timestamp2Date(this.form.orderRentVehicleDetail.startTime) ? timestamp2Date(this.form.orderRentVehicleDetail.startTime)
...@@ -802,6 +807,9 @@ export default { ...@@ -802,6 +807,9 @@ export default {
if (this.form.status == 6) { if (this.form.status == 6) {
this.form.ststusName = "已完成"; this.form.ststusName = "已完成";
} }
if (this.form.status == -1) {
this.form.ststusName = "定损中";
}
this.form.orderRentVehicleDetail.startTime = timestamp2Date( this.form.orderRentVehicleDetail.startTime = timestamp2Date(
this.form.orderRentVehicleDetail.startTime this.form.orderRentVehicleDetail.startTime
); );
...@@ -862,6 +870,9 @@ export default { ...@@ -862,6 +870,9 @@ export default {
if (this.form.status == 6) { if (this.form.status == 6) {
this.form.ststusName = "已完成"; this.form.ststusName = "已完成";
} }
if (this.form.status == -1) {
this.form.ststusName = "定损中";
}
this.form.orderRentVehicleDetail.startTime = timestamp2Date( this.form.orderRentVehicleDetail.startTime = timestamp2Date(
this.form.orderRentVehicleDetail.startTime this.form.orderRentVehicleDetail.startTime
); );
...@@ -958,6 +969,9 @@ export default { ...@@ -958,6 +969,9 @@ export default {
if (this.form.status == 6) { if (this.form.status == 6) {
this.form.ststusName = "已完成"; this.form.ststusName = "已完成";
} }
if (this.form.status == -1) {
this.form.ststusName = "定损中";
}
this.form.orderRentVehicleDetail.startTime = timestamp2Date( this.form.orderRentVehicleDetail.startTime = timestamp2Date(
this.form.orderRentVehicleDetail.startTime this.form.orderRentVehicleDetail.startTime
); );
...@@ -1071,6 +1085,9 @@ export default { ...@@ -1071,6 +1085,9 @@ export default {
if (el.status == 6) { if (el.status == 6) {
el.ststusName = "已完成"; el.ststusName = "已完成";
} }
if (el.status == -1) {
el.ststusName = "定损中";
}
}); });
} }
this.list = response.data.data; this.list = response.data.data;
......
src/views/userManagement/memberManagement/index.vue
View file @ 0e46cb4b
<template> <template>
<div class="app-container calendar-list-container"> <div class="app-container calendar-list-container">
<div> <div>
<el-button class="filter-item" style="margin-bottom: 10px;" @click="newMembershipGrade" <el-button
type="primary" icon="edit" v-if="memberManagement_btn_add">添加会员等级 class="filter-item"
</el-button> style="margin-bottom: 10px;"
@click="newMembershipGrade"
type="primary"
icon="edit"
v-if="memberManagement_btn_add"
>添加会员等级</el-button>
</div> </div>
<el-table :key='tableKey' :data="list" v-loading.body="listLoading" border fit highlight-current-row <el-table
style="width: 100%"> :key="tableKey"
<el-table-column width="205" align="center" label="等级序号"> :data="list"
v-loading.body="listLoading"
border
fit
highlight-current-row
style="width: 100%"
>
<el-table-column align="center" label="等级序号">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.level}}</span> <span>{{scope.row.level}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="205" align="center" label="名称"> <el-table-column align="center" label="名称">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.name}}</span> <span>{{scope.row.name}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="205" align="center" label="图标"> <el-table-column align="center" label="图标">
<template scope="scope"> <template scope="scope">
<span> <img class="image" :src="scope.row.icon"/></span> <span>
<img class="image" :src="scope.row.icon" />
</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="205" align="center" label="折扣"> <el-table-column align="center" label="大图标">
<template scope="scope">
<span>
<img class="image" :src="scope.row.bigIcon" />
</span>
</template>
</el-table-column>
<el-table-column align="center" label="折扣">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.discount}}</span> <span>{{scope.row.discount}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="205" align="center" label="免费天数"> <el-table-column align="center" label="免费天数">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.number}}</span> <span>{{scope.row.number}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="205" align="center" label="价格"> <el-table-column align="center" label="价格">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.price}}</span> <span>{{scope.row.price}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="有效期"> <el-table-column align="center" label="有效期">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.endDate}}</span> <span>{{scope.row.endDate}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="操作" width="65" fixed="right"> <el-table-column align="center" label="操作" fixed="right">
<template scope="scope"> <template scope="scope">
<el-button size="small" class="el-button el-button--text el-button--small" style="color:red" @click="delMembership(scope.row)" v-if="memberManagement_btn_del">删除 <el-button
</el-button> size="small"
class="el-button el-button--text el-button--small"
style="color:red"
@click="delMembership(scope.row)"
v-if="memberManagement_btn_del"
>删除</el-button>
<el-button
size="small"
class="el-button el-button--text el-button--small"
@click="compileShip(scope.row)"
>编辑</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div> <div>
<el-dialog title="增加会员等级" :visible.sync="addMembershipGrade" class="mGrade"> <el-dialog :title="vipTitle" :visible.sync="addMembershipGrade" class="mGrade" @close='cllsePop'>
<el-form :model="add" :rules="rules" ref="membershipGrade" label-width="100px"> <el-form :model="add" :rules="rules" ref="membershipGrade" label-width="110px">
<el-row> <el-row>
<el-col :span="16"> <el-col :span="16">
<el-form-item label="会员等级名称" prop="name"> <el-form-item label="会员等级名称" prop="name">
<el-input type="text" v-model="add.name" <el-input type="text" v-model="add.name" placeholder="请填写会员等级名称"></el-input>
placeholder="请填写会员等级名称"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="16"> <el-col :span="16">
<el-form-item label="等级" prop="level"> <el-form-item label="等级" prop="level">
<el-input type="number" min="0" v-model="add.level" placeholder="请填会员等级" v-enterNumber></el-input> <el-input
type="number"
min="0"
v-model="add.level"
placeholder="请填会员等级"
v-enterNumber
:disabled="forbid"
></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="有效期" prop="endDate"> <el-form-item label="有效期" prop="endDate">
<el-select class="filter-item" v-model="add.endDate" placeholder="请选择有效期"> <el-select
<el-option v-for="(val, key, index) in endDatelist " :key="val.id" :label="val.name" class="filter-item"
:value="val.id"></el-option> v-model="add.endDate"
placeholder="请选择有效期"
:disabled="forbid"
>
<el-option
v-for="(val, key, index) in endDatelist "
:key="val.id"
:label="val.name"
:value="val.id"
></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -82,22 +127,40 @@ ...@@ -82,22 +127,40 @@
<el-row> <el-row>
<el-col :span="16"> <el-col :span="16">
<el-form-item label="折扣" prop="discount"> <el-form-item label="折扣" prop="discount">
<el-input type="number" min="0" v-model="add.discount" <el-input
placeholder="请填写折扣"></el-input> type="number"
min="0"
v-model="add.discount"
placeholder="请填写折扣"
:disabled="forbid"
></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="16"> <el-col :span="16">
<el-form-item label="免费天数" prop="number"> <el-form-item label="免费天数" prop="number">
<el-input type="number" min="0" v-model="add.number" placeholder="请填免费天数" v-enterNumber></el-input> <el-input
type="number"
min="0"
v-model="add.number"
placeholder="请填免费天数"
v-enterNumber
:disabled="forbid"
></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="16"> <el-col :span="16">
<el-form-item label="价格" prop="price"> <el-form-item label="价格" prop="price">
<el-input type="number" min="0" v-model="add.price" placeholder="请填价格"></el-input> <el-input
type="number"
min="0"
v-model="add.price"
placeholder="请填价格"
:disabled="forbid"
></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -109,222 +172,296 @@ ...@@ -109,222 +172,296 @@
:action="BASE_API+'/api/universal/file/app/unauth/admin/upload'" :action="BASE_API+'/api/universal/file/app/unauth/admin/upload'"
:show-file-list="false" :show-file-list="false"
:on-success="handleAvatarSuccess" :on-success="handleAvatarSuccess"
list-type="picture"> list-type="picture"
<img v-if="$utils.isString(add.icon) && !$utils.isEmpty(add.icon)" :src="add.icon" >
style="width:300px;max-height:300px;"> <img
<i v-else class="el-icon-plus avatar-uploader-icon" v-if="$utils.isString(add.icon) && !$utils.isEmpty(add.icon)"
style="lineHeight:100px;width:300px;height: 100px;border: 1px dashed #ccc;"></i> :src="add.icon"
style="width:300px;max-height:300px;"
/>
<i
v-else
class="el-icon-plus avatar-uploader-icon"
style="lineHeight:100px;width:300px;height: 100px;border: 1px dashed #ccc;"
></i>
</el-upload>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="大图标" :style="{display:'block'}">
<el-upload
class="upload-demo"
:headers="getHeaderWithToken"
:action="BASE_API+'/api/universal/file/app/unauth/admin/upload'"
:show-file-list="false"
:on-success="handleAvatarSuccessBig"
list-type="picture"
>
<img
v-if="$utils.isString(add.bigIcon) && !$utils.isEmpty(add.bigIcon)"
:src="add.bigIcon"
style="width:300px;max-height:300px;"
/>
<i
v-else
class="el-icon-plus avatar-uploader-icon"
style="lineHeight:100px;width:300px;height: 100px;border: 1px dashed #ccc;"
></i>
</el-upload> </el-upload>
</el-form-item> </el-form-item>
</el-row> </el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="cancelSetMemberArea('membershipGrade')">取消</el-button> <el-button @click="cancelSetMemberArea('membershipGrade')">取消</el-button>
<el-button type="primary" @click="save('membershipGrade')">确 定</el-button> <el-button type="primary" @click="save('membershipGrade')">确 定</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import {getMembers, delMembershipGrade, addMembershipGrade} from 'src/api/admin/member/index' import {
import {mapGetters} from 'vuex'; getMembers,
import {getToken} from 'src/utils/auth'; delMembershipGrade,
addMembershipGrade,
update
} from "src/api/admin/member/index";
import { mapGetters } from "vuex";
import { getToken } from "src/utils/auth";
export default { export default {
name: 'membershipGrade', name: "membershipGrade",
data() { data() {
return { return {
BASE_API: process.env.BASE_API, forbid: false,
list: [], vipTitle: "增加会员等级",
listLoading: true, BASE_API: process.env.BASE_API,
tableKey: 0, list: [],
addMembershipGrade: false, listLoading: true,
add: { tableKey: 0,
level: undefined, addMembershipGrade: false,
name: undefined, activeId:'',
discount: undefined, add: {
number: undefined, level: undefined,
price: undefined, name: undefined,
endDate: undefined, discount: undefined,
icon: undefined number: undefined,
}, price: undefined,
endDatelist: [ endDate: undefined,
{id: 0, name: '永久'}, icon: undefined,
{id: 1, name: '半年'}, bigIcon: null
{id: 2, name: '一年'}, },
{id: 3, name: '二年'}, endDatelist: [
{id: 4, name: '三年'}, { id: 0, name: "永久" },
{id: 5, name: '四年'}, { id: 1, name: "半年" },
{id: 6, name: '五年'}, { id: 2, name: "一年" },
{ id: 3, name: "二年" },
{ id: 4, name: "三年" },
{ id: 5, name: "四年" },
{ id: 6, name: "五年" }
],
year: {
"-1": "永久",
"0": "半年",
"1": "一年",
"2": "二年",
"3": "三年",
"4": "四年",
"5": "五年"
},
rules: {
name: [
{
type: "string",
required: true,
message: "请输入消息内容",
trigger: "blur"
},
{
min: 0,
max: 50,
message: "长度小于 50个字符",
trigger: "blur"
}
], ],
year: { level: [
'-1': '永久', {
'0': '半年', required: true,
'1': '一年', message: "请输入消息内容",
'2': '二年', trigger: "blur"
'3': '三年', },
'4': '四年', {
'5': '五年', min: 0,
}, max: 20,
rules: { message: "长度小于 20个字符",
name: [ trigger: "blur"
{ }
type: 'string', ]
required: true,
message: '请输入消息内容',
trigger: 'blur'
},
{
min: 0,
max: 50,
message: '长度小于 50个字符',
trigger: 'blur'
}
],
level: [
{
required: true,
message: '请输入消息内容',
trigger: 'blur'
},
{
min: 0,
max: 20,
message: '长度小于 20个字符',
trigger: 'blur'
}
]
},
memberManagement_btn_add: false,//添加
memberManagement_btn_del: false,//删除
}
},
created() {
this.memberManagement_btn_add=this.elements['memberManagement:btn_add'];//添加
this.memberManagement_btn_del=this.elements['memberManagement:btn_del'];//删除
this.getList();
}
,
computed: {
...
mapGetters([
'elements'
]),
/**
* 获取token
*/
getHeaderWithToken() {
return {Authorization: getToken()};
}, },
memberManagement_btn_add: false, //添加
memberManagement_btn_del: false //删除
};
},
created() {
this.memberManagement_btn_add = this.elements["memberManagement:btn_add"]; //添加
this.memberManagement_btn_del = this.elements["memberManagement:btn_del"]; //删除
this.getList();
},
computed: {
...mapGetters(["elements"]),
/**
* 获取token
*/
getHeaderWithToken() {
return { Authorization: getToken() };
}
},
methods: {
cllsePop(){
// console.log('0000');
this.cancelSetMemberArea('membershipGrade')
}, },
methods: { //编辑
getList() { compileShip(row) {
this.listLoading= true console.log(row);
getMembers().then( this.vipTitle = "编辑会员等级";
res => { this.forbid = true;
for (let dataKey of res.data) { this.addMembershipGrade = true;
if (dataKey.endDate == 0) { this.add = {
dataKey.endDate = '半年' level: row.level,
} else { name: row.name,
dataKey.endDate = dataKey.endDate ? this.year[dataKey.endDate] : '' discount: row.discount,
} number: row.number,
price: row.price,
} endDate: row.endDate,
this.list = res.data icon: row.icon,
this.listLoading = false; bigIcon: row.bigIcon
};
this.activeId = row.id
},
getList() {
this.listLoading = true;
getMembers().then(res => {
for (let dataKey of res.data) {
if (dataKey.endDate == 0) {
dataKey.endDate = "半年";
} else {
dataKey.endDate = dataKey.endDate ? this.year[dataKey.endDate] : "";
} }
) }
}, this.list = res.data;
/** this.listLoading = false;
* 删除会员等级 });
* */ },
delMembership(row) { /**
delMembershipGrade(row.id).then(res => { * 删除会员等级
* */
if (res.rel) { delMembership(row) {
delMembershipGrade(row.id).then(res => {
if (res.rel) {
this.$notify.success({
title: "成功",
message: `success`
});
} else {
this.$notify.warning({
title: "失败",
message: `failed`
});
}
this.getList();
});
},
/**
* 关闭清除
* */
cancelSetMemberArea(refName) {
this.addMembershipGrade = false;
this.$refs[refName].resetFields();
this.add = {};
},
/**
* 显示添加窗
* */
newMembershipGrade() {
this.forbid = false;
this.addMembershipGrade = true;
},
/**
* 新建会员等级
* **/
save(refName) {
let membership = JSON.parse(JSON.stringify(this.add));
membership.endDate = membership.endDate - 1;
membership.id = this.activeId
if (this.vipTitle == "增加会员等级") {
addMembershipGrade(membership).then(res => {
if (!res.rel) {
this.$notify.success({ this.$notify.success({
title: '成功', title: "成功",
message: `success` message: `success`
}) });
} else { } else {
this.$notify.warning({ this.$notify.warning({
title: '失败', title: "失败",
message: `failed` message: `failed`
}) });
} }
this.getList() this.getList();
if (this.$refs[refName]) {
}) this.$refs[refName].resetFields();
}, }
/** this.addMembershipGrade = false;
* 关闭清除 });
* */ } else {
cancelSetMemberArea(refName) { update(membership).then(data => {
this.addMembershipGrade = false if (data.status == 200) {
this.$refs[refName].resetFields() this.$notify.success({
this.add={} title: "成功",
console.log(JSON.stringify(this.add)) message: `success`
}, });
/** } else {
* 显示添加窗 this.$notify.warning({
* */ title: "失败",
newMembershipGrade() { message: `failed`
this.addMembershipGrade = true });
}, }
/** this.getList();
* 新建会员等级 if (this.$refs[refName]) {
* **/ this.$refs[refName].resetFields();
save(refName) { }
let membership = JSON.parse(JSON.stringify(this.add)) this.addMembershipGrade = false;
membership.endDate = membership.endDate - 1 });
addMembershipGrade(membership).then( }
res => { },
/**
if (!res.rel) { * 封面图上传
this.$notify.success({ * **/
title: '成功', handleAvatarSuccess(res, file) {
message: `success` this.add.icon = res.data;
}) },
} else {
this.$notify.warning({
title: '失败',
message: `failed`
})
}
this.getList()
if (this.$refs[refName]) {
this.$refs[refName].resetFields()
}
this.addMembershipGrade = false
})
},
/**
* 封面图上传
* **/
handleAvatarSuccess(res, file) {
this.add.icon = res.data; //大图标
}, handleAvatarSuccessBig(res) {
this.add.bigIcon = res.data;
} }
} }
};
</script> </script>
<style> <style>
textarea { textarea {
display: none; display: none;
} }
.image { .image {
width: 50px; width: 50px;
height: 50px; height: 50px;
} }
.mGrade .el-dialog--small { .mGrade .el-dialog--small {
width: 500px; width: 500px;
} }
</style> </style>
src/views/vehicle/vehicleCount/index.vue 0 → 100644
View file @ 0e46cb4b
<template>
<div class="app-container calendar-list-container">
<div class="filter-container" ref="filter-container">
<el-form ref="queryForm" :model="listQuery" label-width="100px">
<el-row>
<el-col :span="5">
<el-form-item label="类型">
<el-select
class="filter-item"
v-model="listQuery.type"
placeholder="请选择"
>
<el-option :key="undefined" label="无" :value="undefined"></el-option>
<el-option
v-for="val in typeList"
: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>
<el-date-picker
v-model="listQuery.startTime"
type="date"
:editable="false"
format="yyyy-MM-dd"
prop="startTime"
placeholder="请选择日期">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-button class="filter-item" type="primary" @click="handlerSearch">
查询
</el-button>
<el-button class="filter-item" type="primary" @click="downloadExcel">
导出
</el-button>
</el-row>
</el-form>
<el-table id = "out-table" :key='tableKey' :data="list" border fit highlight-current-row style="width: 100%">
<el-table-column
type="index"
align="center" label="序号" width="117">
</el-table-column>
<el-table-column width="150" align="center" label="类型">
<template scope="scope">
<span>{{getType(scope.row.type)}}</span>
</template>
</el-table-column>
<el-table-column width="150" align="center" label="应交车">
<template scope="scope">
<span>{{scope.row.departureNum}}</span>
</template>
</el-table-column>
<el-table-column width="150" align="center" label="提前交车">
<template scope="scope">
<span>{{scope.row.beforeDepartureNum}}</span>
</template>
</el-table-column>
<el-table-column width="150" align="center" label="正常交车">
<template scope="scope">
<span>{{scope.row.actualDepartureNum}}</span>
</template>
</el-table-column>
<el-table-column width="150" align="center" label="延后交车">
<template scope="scope">
<span>{{scope.row.afterDepartureNum}}</span>
</template>
</el-table-column>
<el-table-column width="150" align="center" label="应收车">
<template scope="scope">
<span>{{scope.row.arrivalNum}}</span>
</template>
</el-table-column>
<el-table-column width="150" align="center" label="提前收车">
<template scope="scope">
<span>{{scope.row.beforeArrivalNum}}</span>
</template>
</el-table-column>
<el-table-column width="150" align="center" label="正常收车">
<template scope="scope">
<span>{{scope.row.actualArrivalNum}}</span>
</template>
</el-table-column>
<el-table-column width="150" align="center" label="延后收车">
<template scope="scope">
<span>{{scope.row.afterArrivalNum}}</span>
</template>
</el-table-column>
<el-table-column width="200" align="center" label="日期">
<template scope="scope">
<span>{{scope.row.countDate}}</span>
</template>
</el-table-column>
</el-table>
</div>
</div>
</template>
<script>
import FileSaver from 'file-saver'
import XLSX from 'xlsx'
import {
get,excelExport,excelDownload
} from 'api/vehicle/vehicleCount';
import { formatDate,deepCopyDate,getYMD_date } from "../../../utils/dateUtils";
export default {
name: 'vehicleInfo',
data() {
return {
listQuery: {
type: null,
startTime: new Date()
},
tableKey: 0,
typeList: [
{'id':1, "name":"用户租车"},
{'id':2, "name":"用户旅游"},
{'id':3, "name":"内部用车"}
],
list : [],
header : ['序号','类型','应交车','提前交车','正常交车','延期交车','应还车','提前还车','正常还车','延期还车','日期'],
name: 'export'
}
},
created() {
this.handlerSearch()
},
computed: {
},
methods: {
handlerSearch() {
this.listQuery.startTime = getYMD_date(this.listQuery.startTime);
get(this.listQuery).then(response => {
if (response.status === 200) {
this.list = response.data
} else {
this.$notify({
title: "失败",
message: response.message,
type: "error",
duration: 2000
});
}
})
},
getType(item) {
if (item == 1) {
return '用户租车';
}
if (item == 2) {
return '用户旅游';
}
if (item == 3) {
return '内部用车';
}
return '';
},
downloadExcel() {
var valueList = []
var mapList = []
this.list.forEach(v=>{
for(let key in v) {
if(key == 'type') {
if(v[key] == 1) {
mapList.push('用户租车')
}
if(v[key] == 2) {
mapList.push('用户旅游')
}
if(v[key] == 3) {
mapList.push('内部用车')
}
} else {
mapList.push(v[key])
}
}
valueList.push(mapList)
mapList = []
})
let param = {
"data": valueList,
"header":this.header,
"name":this.name
}
let fileName = null;
excelExport(param).then(response => {
if (response.status === 200) {
this.$notify({
title: "成功",
message: this.name + "导出成功！",
type: "success",
duration: 3000
});
console.log(response)
fileName = response.data
} else {
this.$notify({
title: "失败",
message: response.message,
type: "error",
duration: 2000
});
}
})
this.$confirm('确定导出吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
var domain = document.domain;
console.log(domain)
window.location.href="https://"+domain+"/vehicle/vehicleCount/app/unauth/download?path="+fileName;
})
},
}
}
</script>
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