Skip to content

C
cloud-platform-ui
Commit 85ff72ad authored by rencs's avatar rencs
Browse files
Options

9.11 营收统计（部分）首页统计

parent be01414f
Show whitespace changes
Inline Side-by-side
Showing with 1409 additions and 931 deletions
src/api/company.js
View file @ 85ff72ad
...@@ -107,3 +107,20 @@ export function update_store(id, query) { ...@@ -107,3 +107,20 @@ export function update_store(id, query) {
data: query, data: query,
}); });
} }
//营收统计列表
export function revenue_sum_list(query) {
return fetch({
url: "/api/order/admin/wallet/selectList",
method: "get",
params: query,
});
}
//营收统计合计
export function revenue_sum_count(query) {
return fetch({
url: "/api/order/admin/wallet/sumAmount",
method: "get",
params: query,
});
}
src/api/vehicle/vehicleSchedulManage.js
View file @ 85ff72ad
...@@ -41,7 +41,7 @@ export function cancleBook(obj) { ...@@ -41,7 +41,7 @@ export function cancleBook(obj) {
return fetch({ return fetch({
url: '/vehicle/vehicleInfo/unbook/4employee', url: '/vehicle/vehicleInfo/unbook/4employee',
method: 'delete', method: 'delete',
data:obj data: obj
}); });
} }
...@@ -87,6 +87,15 @@ export function orderStatistics(type) { ...@@ -87,6 +87,15 @@ export function orderStatistics(type) {
method: 'get', method: 'get',
}); });
} }
/**
* 首页统计
*/
export function getIndexAllcounts() {
return fetch({
url: '/api/order/background/statistics/indexOrder',
method: 'get',
});
}
/** /**
...@@ -102,12 +111,12 @@ export function getUpkeepAll() { ...@@ -102,12 +111,12 @@ export function getUpkeepAll() {
//获取旅游路线 //获取旅游路线
export function getTourList(param) { export function getTourList(param) {
if(param){ if (param) {
return fetch({ return fetch({
url: '/api/tour/verfication/getList?'+param, url: '/api/tour/verfication/getList?' + param,
method: 'get', method: 'get',
}); });
}else{ } else {
return fetch({ return fetch({
url: '/api/tour/verfication/getList', url: '/api/tour/verfication/getList',
method: 'get', method: 'get',
...@@ -118,7 +127,7 @@ export function getTourList(param) { ...@@ -118,7 +127,7 @@ export function getTourList(param) {
//获取核销路线id信息 //获取核销路线id信息
export function getTourInfor(id) { export function getTourInfor(id) {
return fetch({ return fetch({
url: '/api/tour/verfication/info/'+id, url: '/api/tour/verfication/info/' + id,
method: 'get', method: 'get',
}); });
} }
src/views/index/index.vue
View file @ 85ff72ad
<template> <template>
<div class="app-container calendar-list-container" v-loading.body="showLoadingBody"> <div class="app-container calendar-list-container" v-loading.body="showLoadingBody">
<div > <div>
<div class="statisticsBox"> <div class="statisticsBox">
<!-- <div class="statisticsItem"> <!-- <div class="statisticsItem">
<div class="colorbg1"></div> <div class="colorbg1"></div>
...@@ -8,27 +8,41 @@ ...@@ -8,27 +8,41 @@
<div class="detail-title">今日收益（不含押金）</div> <div class="detail-title">今日收益（不含押金）</div>
<div class="detail-money">￥ 6,666,66</div> <div class="detail-money">￥ 6,666,66</div>
</div> </div>
</div> --> </div>-->
<div class="statisticsItem"> <div class="statisticsItem">
<div class="colorbg2"></div> <div class="colorbg2"></div>
<div class="detail"> <div class="detail">
<!-- （不含押金）--> <!-- （不含押金）-->
<div class="detail-title">订单总额</div> <div class="detail-title">本日新增订单总额</div>
<div class="detail-money">￥ {{totalGmv|NumFormat}}</div> <div class="detail-money">￥ {{currDayOrderAmount|NumFormat}}</div>
</div> </div>
</div> </div>
<div class="statisticsItem"> <div class="statisticsItem">
<div class="colorbg3"></div> <div class="colorbg1"></div>
<div class="detail"> <div class="detail">
<div class="detail-title">未退还押金总额</div> <div class="detail-title">本日新增订单数</div>
<div class="detail-money">￥ {{totalSecurityDeposit|NumFormat}}</div> <div class="detail-money">{{currDayOrderNum|NumFormat}}</div>
</div> </div>
</div> </div>
<div class="statisticsItem"> <div class="statisticsItem">
<div class="colorbg4"></div> <div class="colorbg4"></div>
<div class="detail"> <div class="detail">
<div class="detail-title">额外赔款（取消损坏违章等）</div> <div class="detail-title">今日需出车订单数</div>
<div class="detail-money">￥ {{peichang|NumFormat}}</div> <div class="detail-money">{{currDayToLiftVehicleNum|NumFormat}}</div>
</div>
</div>
<div class="statisticsItem">
<div class="colorbg5"></div>
<div class="detail">
<div class="detail-title">今日需收车订单数</div>
<div class="detail-money">{{currDayToReturnVehicleNum|NumFormat}}</div>
</div>
</div>
<div class="statisticsItem">
<div class="colorbg3"></div>
<div class="detail">
<div class="detail-title">违章待处理订单数</div>
<div class="detail-money">{{toDealTrafficPay|NumFormat}}</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -36,7 +50,12 @@ ...@@ -36,7 +50,12 @@
<div class="carDetailBoxTitle">车辆概况</div> <div class="carDetailBoxTitle">车辆概况</div>
<div class="carDetailBox"> <div class="carDetailBox">
<div class="carDetailItem" v-for="(item, index) in countTJ" :key="item.id"> <div class="carDetailItem" v-for="(item, index) in countTJ" :key="item.id">
<div class="detail-num"><span style="position: relative;">{{item.total}}<span class="unit">辆</span></span></div> <div class="detail-num">
<span style="position: relative;">
{{item.total}}
<span class="unit">辆</span>
</span>
</div>
<div class="carDetail-title" v-if="item.travelStatus == 0">车辆总额</div> <div class="carDetail-title" v-if="item.travelStatus == 0">车辆总额</div>
<div class="carDetail-title" v-if="item.travelStatus == 4">出行中</div> <div class="carDetail-title" v-if="item.travelStatus == 4">出行中</div>
<div class="carDetail-title" v-if="item.travelStatus == 1">空闲</div> <div class="carDetail-title" v-if="item.travelStatus == 1">空闲</div>
...@@ -48,47 +67,106 @@ ...@@ -48,47 +67,106 @@
<!--车辆预警--> <!--车辆预警-->
<div class="carEarlyWarning"> <div class="carEarlyWarning">
<div class="carEarlyWarningTitle">车辆预警</div> <div class="carEarlyWarningTitle">车辆预警</div>
<div class="marquee_box" v-if="marqueeList.length>0" @mouseenter="handelOver" @mouseleave="handelOut"> <div
class="marquee_box"
v-if="marqueeList.length>0"
@mouseenter="handelOver"
@mouseleave="handelOut"
>
<ul class="marquee_list" :class="{marquee_top:animate}"> <ul class="marquee_list" :class="{marquee_top:animate}">
<li v-for="(item,index) in marqueeList" ><i class="el-icon-warning" :class="item.color" style="padding-left:30px;padding-right:20px"></i>{{item.msg}} <span style="text-decoration:underline">立即处理</span></li> <li v-for="(item,index) in marqueeList">
<i
class="el-icon-warning"
:class="item.color"
style="padding-left:30px;padding-right:20px"
></i>
{{item.msg}}
<span style="text-decoration:underline">立即处理</span>
</li>
</ul> </ul>
</div> </div>
</div> </div>
<!--车辆排班--> <!--车辆排班-->
<div class="carEarlyWarning" style="padding-bottom:30px"> <div class="carEarlyWarning" style="padding-bottom:30px">
<div class="carEarlyWarningTitle" style="display: flex;justify-content: space-between;margin-bottom:20px"> <div
class="carEarlyWarningTitle"
style="display: flex;justify-content: space-between;margin-bottom:20px"
>
<div style="flex:1">车辆排班</div> <div style="flex:1">车辆排班</div>
<!--bookType 1-租车、2-分公司使用、3-维修、4、展览、5、旅游、6、保养、7、预约中、8、禁用、9、客户用车、10、其他--> <!--bookType 1-租车、2-分公司使用、3-维修、4、展览、5、旅游、6、保养、7、预约中、8、禁用、9、客户用车、10、其他-->
<div style="color: rgb(87, 81, 96);font-family: 微软雅黑;font-weight: 400;font-style: normal;font-size: 14px;"> <div
<span class="tip-co bg-1"></span><span>租房车/客户用车</span> style="color: rgb(87, 81, 96);font-family: 微软雅黑;font-weight: 400;font-style: normal;font-size: 14px;"
<span class="tip-co bg-5"></span><span>房车游</span> >
<span class="tip-co bg-4"></span><span>展览</span> <span class="tip-co bg-1"></span>
<span class="tip-co bg-6"></span><span>保养/维修</span> <span>租房车/客户用车</span>
<span class="tip-co bg-10"></span><span>其他</span> <span class="tip-co bg-5"></span>
<span class="tip-co bg-7"></span><span>预约中</span> <span>房车游</span>
<span class="tip-co bg-8"></span><span>禁用</span> <span class="tip-co bg-4"></span>
<span>展览</span>
<span class="tip-co bg-6"></span>
<span>保养/维修</span>
<span class="tip-co bg-10"></span>
<span>其他</span>
<span class="tip-co bg-7"></span>
<span>预约中</span>
<span class="tip-co bg-8"></span>
<span>禁用</span>
</div> </div>
</div> </div>
<el-table :key='tableKey' :data="list" v-loading.body="listLoading" border fit highlight-current-row <el-table
style="width: 100%;cursor: pointer;" class="schedul-tb"> :key="tableKey"
:data="list"
v-loading.body="listLoading"
border
fit
highlight-current-row
style="width: 100%;cursor: pointer;"
class="schedul-tb"
>
<el-table-column width="220" align="center" :label="firstTime" fixed> <el-table-column width="220" align="center" :label="firstTime" fixed>
<template slot-scope="scope"> <template slot-scope="scope">
<div> <div>
<div style="color: #bfcbd9;font-size: 14px;"> <div style="color: #bfcbd9;font-size: 14px;">现在位置：{{scope.row.parkCompanyName}}</div>
现在位置：{{scope.row.parkCompanyName}} <div>
{{scope.row.numberPlate}}
<img
src="../../assets/images/detail.png"
style="width: 15px;margin-left: 10px;"
/>
</div> </div>
<div>{{scope.row.numberPlate}}<img src="../../assets/images/detail.png" style="width: 15px;margin-left: 10px;"/></div> <div
<div style="color: #bfcbd9;font-size: 14px;">{{scope.row.vehicleModel?scope.row.vehicleModel.name:''}}</div> style="color: #bfcbd9;font-size: 14px;"
>{{scope.row.vehicleModel?scope.row.vehicleModel.name:''}}</div>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="60" align="center" :label="item.day" v-for="item in tempDayList" :key="item.day"> <el-table-column
width="60"
align="center"
:label="item.day"
v-for="item in tempDayList"
:key="item.day"
>
<template slot-scope="scope"> <template slot-scope="scope">
<div v-for="iitem in scope.row.temp" :key="iitem.day" v-if="iitem.time == item.time"> <div v-for="iitem in scope.row.temp" :key="iitem.day" v-if="iitem.time == item.time">
<div v-for="ii in iitem.children" :key="ii.time" :data-ii="ii.time" :data-endhour="ii.endhour" class="ii-day" :class="ii.bg" @click="toShowDialog(scope.row, iitem, ii)"> <div
<span v-if="ii.timeEtr == '00'" style="position: absolute;color: #fff;left: -20px;bottom: 0">{{ii.timeEtr}}</span> v-for="ii in iitem.children"
<span v-else style="position: relative;color: #fff;top: -24px;right: -20px;">{{ii.timeEtr}}</span> :key="ii.time"
:data-ii="ii.time"
:data-endhour="ii.endhour"
class="ii-day"
:class="ii.bg"
@click="toShowDialog(scope.row, iitem, ii)"
>
<span
v-if="ii.timeEtr == '00'"
style="position: absolute;color: #fff;left: -20px;bottom: 0"
>{{ii.timeEtr}}</span>
<span
v-else
style="position: relative;color: #fff;top: -24px;right: -20px;"
>{{ii.timeEtr}}</span>
<span style="position: absolute;color: #fff;z-index: 11;left: 0;">{{ii.timeStr}}</span> <span style="position: absolute;color: #fff;z-index: 11;left: 0;">{{ii.timeStr}}</span>
</div> </div>
</div> </div>
...@@ -96,14 +174,18 @@ ...@@ -96,14 +174,18 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<div v-show="!listLoading" class="pagination-container"> <div v-show="!listLoading" class="pagination-container">
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" <el-pagination
:current-page.sync="listQuery.page" :page-sizes="[10,20,30, 50]" :page-size="listQuery.limit" @size-change="handleSizeChange"
layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination> @current-change="handleCurrentChange"
:current-page.sync="listQuery.page"
:page-sizes="[10,20,30, 50]"
:page-size="listQuery.limit"
layout="total, sizes, prev, pager, next, jumper"
:total="total"
></el-pagination>
</div> </div>
</div> </div>
<!-- <div style="position: relative;padding: 10px;padding-left: 0;width: 100%;overflow-x:auto;" v-if="currentMonth"> <!-- <div style="position: relative;padding: 10px;padding-left: 0;width: 100%;overflow-x:auto;" v-if="currentMonth">
<div style="display: flex;"> <div style="display: flex;">
<div class="day-title" style="min-width: 200px;max-width:200px;background: #eef1f6;">日期（{{currentMonth}}~{{nextMonth}}月）</div> <div class="day-title" style="min-width: 200px;max-width:200px;background: #eef1f6;">日期（{{currentMonth}}~{{nextMonth}}月）</div>
...@@ -125,140 +207,318 @@ ...@@ -125,140 +207,318 @@
</div> </div>
</div> </div>
</div> </div>
</div> --> </div>-->
</div> </div>
<!--保养弹框--> <!--保养弹框-->
<vehicleMaintenanceModal v-if="baoyang" :currentItem="currentItem" v-on:baoyangDialogEvent = "baoyangDialogEvent"></vehicleMaintenanceModal> <vehicleMaintenanceModal
v-if="baoyang"
:currentItem="currentItem"
v-on:baoyangDialogEvent="baoyangDialogEvent"
></vehicleMaintenanceModal>
<!--展览、预定用车弹框--> <!--展览、预定用车弹框-->
<vehicleExhibitionModal v-if="zhanlan" :currentItem="currentItem" v-on:zhanlanDialogEvent = "zhanlanDialogEvent"></vehicleExhibitionModal> <vehicleExhibitionModal
v-if="zhanlan"
:currentItem="currentItem"
v-on:zhanlanDialogEvent="zhanlanDialogEvent"
></vehicleExhibitionModal>
<!--安排用车弹框--> <!--安排用车弹框-->
<vehiclePlanModal v-if="anpai" :currentItem="currentItem" v-on:anpaiDialogEvent = "anpaiDialogEvent"></vehiclePlanModal> <vehiclePlanModal
v-if="anpai"
:currentItem="currentItem"
v-on:anpaiDialogEvent="anpaiDialogEvent"
></vehiclePlanModal>
<!--租车详情弹框--> <!--租车详情弹框-->
<!--rentOrder--> <!--rentOrder-->
<rentOrderDetailModal :form="rentOrderInfo" :rentCostDetail="rentCostDetail" v-if="rentOrder" v-on:rentOrderDetailDialogEvent="rentOrderDetailDialogEvent"></rentOrderDetailModal> <rentOrderDetailModal
:form="rentOrderInfo"
:rentCostDetail="rentCostDetail"
v-if="rentOrder"
v-on:rentOrderDetailDialogEvent="rentOrderDetailDialogEvent"
></rentOrderDetailModal>
<!--旅游订单详情--> <!--旅游订单详情-->
<tourOrderDetailModal :tourRow="tourRow" v-if="tourDialogVisible" v-on:tourOrderDetailDialogEvent="tourOrderDetailDialogEvent"></tourOrderDetailModal> <tourOrderDetailModal
:tourRow="tourRow"
v-if="tourDialogVisible"
v-on:tourOrderDetailDialogEvent="tourOrderDetailDialogEvent"
></tourOrderDetailModal>
<!--禁用弹框--> <!--禁用弹框-->
<disableModal v-if="jinyong" :currentItem="currentItem" v-on:jinyongDialogEvent = "jinyongDialogEvent"></disableModal> <disableModal
v-if="jinyong"
:currentItem="currentItem"
v-on:jinyongDialogEvent="jinyongDialogEvent"
></disableModal>
</div> </div>
</template> </template>
<style scoped> <style scoped>
.app-container{background-color: rgba(245, 245, 245, 1);} .app-container {
.statisticsBox{width: 100%;display: flex;justify-content: space-between;margin-bottom: 40px;} background-color: rgba(245, 245, 245, 1);
.statisticsItem{flex: 1;background-color: #fff;-moz-box-shadow:1px 1px 3px #ccc; -webkit-box-shadow:1px 1px 3px #ccc; box-shadow:1px 1px 3px #ccc;border-radius: 4px;max-width: calc(33.3% - 40px)} }
.colorbg1{width: 100%;height: 6px;border-radius: 4px 4px 0 0;background:-webkit-linear-gradient(left, #1c9fff, #70d1fc);background:-o-linear-gradient(right, #1c9fff, #70d1fc);background:-moz-linear-gradient(right, #1c9fff, #70d1fc);background:linear-gradient(to right, #1c9fff, #70d1fc);} .statisticsBox {
.colorbg2{width: 100%;height: 6px;border-radius: 4px 4px 0 0;background:-webkit-linear-gradient(left, #1f51fc, #70a0fc);background:-o-linear-gradient(right, #1f51fc, #70a0fc);background:-moz-linear-gradient(right, #1f51fc, #70a0fc);background:linear-gradient(to right, #1f51fc, #70a0fc);} width: 100%;
.colorbg3{width: 100%;height: 6px;border-radius: 4px 4px 0 0;background:-webkit-linear-gradient(left, #fc201f, #fb6b5b);background:-o-linear-gradient(right, #fc201f, #fb6b5b);background:-moz-linear-gradient(right, #fc201f, #fb6b5b);background:linear-gradient(to right, #fc201f, #fb6b5b);} display: flex;
.colorbg4{width: 100%;height: 6px;border-radius: 4px 4px 0 0;background:-webkit-linear-gradient(left, #ff6a05, #ffc671);background:-o-linear-gradient(right, #ff6a05, #ffc671);background:-moz-linear-gradient(right, #ff6a05, #ffc671);background:linear-gradient(to right, #ff6a05, #ffc671);} justify-content: space-between;
.statisticsItem .detail{width: 100%;background: #fff;padding: 40px;border-radius: 0 0 4px 4px;} margin-bottom: 40px;
.detail-title{font-size: 16px;color: rgb(107, 107, 107); font-family: 微软雅黑;font-weight: 400;font-style: normal;padding-bottom: 10px} }
.detail-money{font-family: 'Arial Normal', 'Arial';font-weight: 400;font-style: normal;font-size: 28px;color: #000000;} .statisticsItem {
.carDetail{width: 100%;margin-bottom: 40px;padding: 0 20px;-moz-box-shadow:1px 1px 3px #ccc; -webkit-box-shadow:1px 1px 3px #ccc; box-shadow:1px 1px 3px #ccc;border-radius: 4px;background: #fff;} margin: 10px;
.carDetailBox{width: 100%;display: flex;justify-content: space-between;padding: 30px 0 15px 0} justify-content: center;
.carDetailItem{flex: 1;background-color: #fff;text-align: center;border-right: 1px solid rgba(240, 240, 240, 1);} flex: 1;
.carDetailBox .carDetailItem:last-child{border-right: none;} background-color: #fff;
.carDetailBoxTitle{display: block;font-family: "微软雅黑 Bold", "微软雅黑 Regular", 微软雅黑;font-weight: 700;font-style: normal;font-size: 18px;color: rgb(81, 81, 81);padding: 20px 0;border-bottom: 1px solid rgba(240, 240, 240, 1);} -moz-box-shadow: 1px 1px 3px #ccc;
.detail-num{font-family: 'Arial Normal', 'Arial';font-weight: 400;font-style: normal;font-size: 28px;color: #000000;padding-top: 20px;} -webkit-box-shadow: 1px 1px 3px #ccc;
.detail-num .unit{position: absolute;font-family: 微软雅黑;font-weight: 400;font-style: normal;color: rgb(107, 107, 107);font-size: 13px;right: -20px;} box-shadow: 1px 1px 3px #ccc;
.carDetail-title{ font-family: 微软雅黑;font-weight: 400;font-style: normal;font-size: 18px;color: rgb(78, 75, 86);padding: 10px 0 20px 0;} border-radius: 4px;
.carEarlyWarning{width: 100%;margin-bottom: 40px;padding: 0 20px;-moz-box-shadow:1px 1px 3px #ccc; -webkit-box-shadow:1px 1px 3px #ccc; box-shadow:1px 1px 3px #ccc;border-radius: 4px;background: #fff;} max-width: calc(33.3% - 40px);
.carEarlyWarningTitle{display: block;font-family: "微软雅黑 Bold", "微软雅黑 Regular", 微软雅黑;font-weight: 700;font-style: normal;font-size: 18px;color: rgb(81, 81, 81);padding: 20px 0;border-bottom: 1px solid rgba(240, 240, 240, 1);} }
.flex-jca-fdc{ .colorbg1 {
width: 100%;
height: 6px;
border-radius: 4px 4px 0 0;
background: -webkit-linear-gradient(left, #1c9fff, #70d1fc);
background: -o-linear-gradient(right, #1c9fff, #70d1fc);
background: -moz-linear-gradient(right, #1c9fff, #70d1fc);
background: linear-gradient(to right, #1c9fff, #70d1fc);
}
.colorbg2 {
width: 100%;
height: 6px;
border-radius: 4px 4px 0 0;
background: -webkit-linear-gradient(left, #1f51fc, #70a0fc);
background: -o-linear-gradient(right, #1f51fc, #70a0fc);
background: -moz-linear-gradient(right, #1f51fc, #70a0fc);
background: linear-gradient(to right, #1f51fc, #70a0fc);
}
.colorbg3 {
width: 100%;
height: 6px;
border-radius: 4px 4px 0 0;
background: -webkit-linear-gradient(left, #fc201f, #fb6b5b);
background: -o-linear-gradient(right, #fc201f, #fb6b5b);
background: -moz-linear-gradient(right, #fc201f, #fb6b5b);
background: linear-gradient(to right, #fc201f, #fb6b5b);
}
.colorbg5 {
width: 100%;
height: 6px;
border-radius: 4px 4px 0 0;
background: -webkit-linear-gradient(left, #ffea00, #fff480);
background: -o-linear-gradient(right, #ffea00, #fff480);
background: -moz-linear-gradient(right, #ffea00, #fff480);
background: linear-gradient(to right, #ffea00, #fff480);
}
.colorbg4 {
width: 100%;
height: 6px;
border-radius: 4px 4px 0 0;
background: -webkit-linear-gradient(left, #ff6a05, #ffc671);
background: -o-linear-gradient(right, #ff6a05, #ffc671);
background: -moz-linear-gradient(right, #ff6a05, #ffc671);
background: linear-gradient(to right, #ff6a05, #ffc671);
}
.statisticsItem .detail {
width: 100%;
background: #fff;
padding: 40px 20px;
border-radius: 0 0 4px 4px;
}
.detail-title {
font-size: 16px;
color: rgb(107, 107, 107);
font-family: 微软雅黑;
font-weight: 400;
font-style: normal;
padding-bottom: 10px;
display: flex;
align-items: center;
justify-content: center;
}
.detail-money {
font-family: "Arial Normal", "Arial";
font-weight: 400;
font-style: normal;
display: flex;
align-items: center;
justify-content: center;
font-size: 28px;
color: #000000;
flex-wrap: nowrap;
white-space: nowrap;
}
.carDetail {
width: 100%;
margin-bottom: 40px;
padding: 0 20px;
-moz-box-shadow: 1px 1px 3px #ccc;
-webkit-box-shadow: 1px 1px 3px #ccc;
box-shadow: 1px 1px 3px #ccc;
border-radius: 4px;
background: #fff;
}
.carDetailBox {
width: 100%;
display: flex;
justify-content: space-between;
padding: 30px 0 15px 0;
}
.carDetailItem {
flex: 1;
background-color: #fff;
text-align: center;
border-right: 1px solid rgba(240, 240, 240, 1);
}
.carDetailBox .carDetailItem:last-child {
border-right: none;
}
.carDetailBoxTitle {
display: block;
font-family: "微软雅黑 Bold", "微软雅黑 Regular", 微软雅黑;
font-weight: 700;
font-style: normal;
font-size: 18px;
color: rgb(81, 81, 81);
padding: 20px 0;
border-bottom: 1px solid rgba(240, 240, 240, 1);
}
.detail-num {
font-family: "Arial Normal", "Arial";
font-weight: 400;
font-style: normal;
font-size: 28px;
color: #000000;
padding-top: 20px;
}
.detail-num .unit {
position: absolute;
font-family: 微软雅黑;
font-weight: 400;
font-style: normal;
color: rgb(107, 107, 107);
font-size: 13px;
right: -20px;
}
.carDetail-title {
font-family: 微软雅黑;
font-weight: 400;
font-style: normal;
font-size: 18px;
color: rgb(78, 75, 86);
padding: 10px 0 20px 0;
}
.carEarlyWarning {
width: 100%;
margin-bottom: 40px;
padding: 0 20px;
-moz-box-shadow: 1px 1px 3px #ccc;
-webkit-box-shadow: 1px 1px 3px #ccc;
box-shadow: 1px 1px 3px #ccc;
border-radius: 4px;
background: #fff;
}
.carEarlyWarningTitle {
display: block;
font-family: "微软雅黑 Bold", "微软雅黑 Regular", 微软雅黑;
font-weight: 700;
font-style: normal;
font-size: 18px;
color: rgb(81, 81, 81);
padding: 20px 0;
border-bottom: 1px solid rgba(240, 240, 240, 1);
}
.flex-jca-fdc {
display: flex !important; display: flex !important;
flex-direction: column; flex-direction: column;
justify-content: space-around; justify-content: space-around;
} }
.schedul-tb .el-table .cell{ .schedul-tb .el-table .cell {
padding: 0; padding: 0;
} }
.tip-co{ .tip-co {
padding: 0 15px; padding: 0 15px;
margin-right: 10px; margin-right: 10px;
margin-left: 20px; margin-left: 20px;
} }
.tip-co:first-child{ .tip-co:first-child {
margin-left: 0; margin-left: 0;
} }
/* 1-租车、2-分公司使用、3-维修、4、展览、5、旅游、6、保养、7、预约中、8、禁用、9、客户用车、10、其他 */ /* 1-租车、2-分公司使用、3-维修、4、展览、5、旅游、6、保养、7、预约中、8、禁用、9、客户用车、10、其他 */
.bg-1{ .bg-1 {
background: #20a0ff; background: #20a0ff;
} }
.bg-9{ .bg-9 {
background: #20a0ff; background: #20a0ff;
} }
.bg-5{ .bg-5 {
background: #6633cc; background: #6633cc;
} }
.bg-4{ .bg-4 {
background: #00cc66; background: #00cc66;
} }
.bg-3{ .bg-3 {
background: #ff6633; background: #ff6633;
} }
.bg-6{ .bg-6 {
background: #ff6633; background: #ff6633;
} }
.bg-7{ .bg-7 {
background: #ffcc00; background: #ffcc00;
} }
.bg-8{ .bg-8 {
background: #868686; background: #868686;
} }
.bg-10{ .bg-10 {
background: #ff6699; background: #ff6699;
} }
.ii-day{ .ii-day {
height: 3px; height: 3px;
width: 60px; width: 60px;
margin-left: -19px; margin-left: -19px;
} }
.day-title{ .day-title {
border-right:1px solid #bfcbd9; border-right: 1px solid #bfcbd9;
border-bottom:1px solid #bfcbd9; border-bottom: 1px solid #bfcbd9;
padding: 10px; padding: 10px;
min-width: 45px; min-width: 45px;
max-width: 45px; max-width: 45px;
display: inline-block; display: inline-block;
cursor: pointer; cursor: pointer;
} }
.v-list{ .v-list {
padding: 10px; padding: 10px;
min-width: 200px; min-width: 200px;
max-width: 200px; max-width: 200px;
border-bottom:1px solid #bfcbd9; border-bottom: 1px solid #bfcbd9;
border-right:1px solid #bfcbd9; border-right: 1px solid #bfcbd9;
} }
.zzui-broadcast-window{ .zzui-broadcast-window {
height: 180px !important; height: 180px !important;
background: #ccc; background: #ccc;
} }
.el-col { .el-col {
border-radius: 4px; border-radius: 4px;
} }
.bg-purple-dark { .bg-purple-dark {
background: #99a9bf; background: #99a9bf;
} }
.bg-purple { .bg-purple {
background: #eef1f6; background: #eef1f6;
} }
.bg-purple-light { .bg-purple-light {
background: #e5e9f2; background: #e5e9f2;
} }
.grid-content { .grid-content {
border-radius: 4px; border-radius: 4px;
min-height: 36px; min-height: 36px;
} }
.grid-content .text{ .grid-content .text {
text-align: center; text-align: center;
line-height: 35px; line-height: 35px;
} }
.row-bg { .row-bg {
padding: 10px 0; padding: 10px 0;
background-color: #f9fafc; background-color: #f9fafc;
} }
.marquee { .marquee {
width: 100%; width: 100%;
height: 50px; height: 50px;
...@@ -274,9 +534,9 @@ ...@@ -274,9 +534,9 @@
box-sizing: border-box; box-sizing: border-box;
overflow: hidden; overflow: hidden;
} }
.marquee_title { .marquee_title {
padding: 0 20px; padding: 0 20px;
height: 21px; height: 21px;
...@@ -286,9 +546,9 @@ ...@@ -286,9 +546,9 @@
border-right: 1px solid #d8d8d8; border-right: 1px solid #d8d8d8;
align-items: center; align-items: center;
} }
.marquee_box { .marquee_box {
display: block; display: block;
position: relative; position: relative;
width: 100%; width: 100%;
...@@ -296,9 +556,9 @@ ...@@ -296,9 +556,9 @@
overflow: hidden; overflow: hidden;
margin: 0; margin: 0;
background: #fff; background: #fff;
} }
.marquee_list { .marquee_list {
display: block; display: block;
position: absolute; position: absolute;
...@@ -307,66 +567,55 @@ ...@@ -307,66 +567,55 @@
left: 0; left: 0;
padding-left: 0px; padding-left: 0px;
} }
.marquee_top { .marquee_top {
transition: all 0.5s; transition: all 0.5s;
} }
.marquee_list li { .marquee_list li {
height: 31px; height: 31px;
line-height: 31px; line-height: 31px;
font-size: 14px; font-size: 14px;
list-style-type:none; list-style-type: none;
color: rgb(87, 81, 96); color: rgb(87, 81, 96);
font-family: 微软雅黑; font-family: 微软雅黑;
font-weight: 400; font-weight: 400;
font-style: normal; font-style: normal;
font-size: 14px; font-size: 14px;
} }
.marquee_list li span { .marquee_list li span {
padding: 0 2px; padding: 0 2px;
} }
.warn-1{ .warn-1 {
color: #1c9fff; color: #1c9fff;
} }
.warn-2{ .warn-2 {
color: #20a0ff; color: #20a0ff;
} }
.warn-3{ .warn-3 {
color: #ff9900; color: #ff9900;
} }
</style> </style>
<script> <script>
import 'static/css/uploadImg.css';// 引入图片上传组件对话框 import "static/css/uploadImg.css"; // 引入图片上传组件对话框
import vehicleMaintenanceModal from './vehicleMaintenanceModal';//车辆保养弹框 import vehicleMaintenanceModal from "./vehicleMaintenanceModal"; //车辆保养弹框
import vehicleExhibitionModal from './vehicleExhibitionModal';//车辆展览弹框 import vehicleExhibitionModal from "./vehicleExhibitionModal"; //车辆展览弹框
import vehiclePlanModal from './vehiclePlanModal';//安排用车 import vehiclePlanModal from "./vehiclePlanModal"; //安排用车
import rentOrderDetailModal from "../order/modal/rentOrderDetailModal";//租车订单详情 import rentOrderDetailModal from "../order/modal/rentOrderDetailModal"; //租车订单详情
import tourOrderDetailModal from "../order/modal/tourOrderDetailModal";//房车游订单详情 import tourOrderDetailModal from "../order/modal/tourOrderDetailModal"; //房车游订单详情
import disableModal from "./disableModal";//禁用弹框 import disableModal from "./disableModal"; //禁用弹框
import { import { getSysRegionByIds } from "api/vehicle/vehicleInfo/";
getSysRegionByIds import { getAllZone } from "api/base_info/constant/";
} from 'api/vehicle/vehicleInfo/'; import { getAllCompany, getAll } from "api/base_info/branch_company/";
import { import { getAllBranchCompanyByZoneId } from "api/order/rentVehicle";
getAllZone import { formatDate } from "utils/dateFormattor";
} from 'api/base_info/constant/';
import {
getAllCompany,
getAll
} from 'api/base_info/branch_company/';
import {
getAllBranchCompanyByZoneId
} from 'api/order/rentVehicle';
import {
formatDate
} from 'utils/dateFormattor';
import { import {
toEast8Date, toEast8Date,
deepCopyDate, deepCopyDate,
newEast8Date, newEast8Date,
...@@ -376,26 +625,25 @@ ...@@ -376,26 +625,25 @@
getCurrentMonth, getCurrentMonth,
getMonth, getMonth,
getymdTimeByDay, getymdTimeByDay,
getCurrentYearMonth getCurrentYearMonth,
} from 'utils/dateUtils'; } from "utils/dateUtils";
import rsCode from '../../utils/rsCode'; import rsCode from "../../utils/rsCode";
import {mapGetters} from 'vuex'; import { mapGetters } from "vuex";
import { import { getToken } from "utils/auth";
getToken import {
} from 'utils/auth';
import {
getVehiclePlanList, getVehiclePlanList,
getVehicleOrderDetail, getVehicleOrderDetail,
orderStatistics orderStatistics,
} from 'api/vehicle/vehicleSchedulManage'; getIndexAllcounts,
import Element1 from "../admin/menu/components/element"; } from "api/vehicle/vehicleSchedulManage";
import ElRow from "element-ui/packages/row/src/row"; import Element1 from "../admin/menu/components/element";
import ElCol from "element-ui/packages/col/src/col"; import ElRow from "element-ui/packages/row/src/row";
import ElCol from "element-ui/packages/col/src/col";
export default { export default {
name: 'vehicleSchedulManage', name: "vehicleSchedulManage",
components: { components: {
ElCol, ElCol,
ElRow, ElRow,
...@@ -405,133 +653,160 @@ ...@@ -405,133 +653,160 @@
vehiclePlanModal, vehiclePlanModal,
rentOrderDetailModal, rentOrderDetailModal,
tourOrderDetailModal, tourOrderDetailModal,
disableModal disableModal,
}, },
data() { data() {
return { return {
animate: false, animate: false,
firstTime: "",//排期表-第一个字段名称 firstTime: "", //排期表-第一个字段名称
marqueeList: [], marqueeList: [],
modalTitle: "创建", modalTitle: "创建",
BASE_API: process.env.BASE_API, BASE_API: process.env.BASE_API,
oneCampsiteDialogVisible: false,//添加、编辑弹框 oneCampsiteDialogVisible: false, //添加、编辑弹框
showLoadingBody: false, showLoadingBody: false,
countTJ: undefined,//车辆概况 countTJ: undefined, //车辆概况
form: { form: {
tagNames:"",//标签 tagNames: "", //标签
name: undefined,//旅游名称 name: undefined, //旅游名称
saleCount: undefined,//销量 saleCount: undefined, //销量
stock: undefined,//总数量 stock: undefined, //总数量
status: undefined, status: undefined,
}, },
list: null, list: null,
total: null, total: null,
listLoading: true, listLoading: true,
endTime: "",//结束时间为0点时有值 endTime: "", //结束时间为0点时有值
listQuery: { listQuery: {
page: 1, page: 1,
limit: 10, limit: 10,
parkBranchCompanyId: undefined,//停靠分公司id parkBranchCompanyId: undefined, //停靠分公司id
parkBranchCompanyName: undefined,//停靠分公司名称 parkBranchCompanyName: undefined, //停靠分公司名称
subordinateBranch: undefined,//所属分公司 subordinateBranch: undefined, //所属分公司
subordinateBranchName: undefined,//所属分公司名称 subordinateBranchName: undefined, //所属分公司名称
zoneId: undefined,//所属片区 zoneId: undefined, //所属片区
startTime: undefined, startTime: undefined,
endTime:undefined, endTime: undefined,
status: undefined,//车辆状态 status: undefined, //车辆状态
}, },
inline: true, inline: true,
mar: null,//滚屏 mar: null, //滚屏
textMap: { textMap: {
update: '编辑', update: "编辑",
create: '创建' create: "创建",
}, },
tableKey: 0, tableKey: 0,
tempDayList: [],//日期 tempDayList: [], //日期
currentMonth: undefined,//当前月份 currentMonth: undefined, //当前月份
nextMonth: undefined,//下月 nextMonth: undefined, //下月
allBranchCompany: [],//所有分公司列表 allBranchCompany: [], //所有分公司列表
baoyang: false,//保养弹框, baoyang: false, //保养弹框,
zhanlan: false,//展览弹框 zhanlan: false, //展览弹框
rentOrder: false,//租车订单详情 rentOrder: false, //租车订单详情
anpai: false,//安排用车弹框 anpai: false, //安排用车弹框
jinyong: false,//禁用弹框 jinyong: false, //禁用弹框
currentItem: {},//待操作数据 currentItem: {}, //待操作数据
rentOrderInfo: {},//租车订单详情 rentOrderInfo: {}, //租车订单详情
rentCostDetail: {},//租车订单费用明细 rentCostDetail: {}, //租车订单费用明细
tourDialogVisible: false,//旅游订单弹框 tourDialogVisible: false, //旅游订单弹框
tourRow: {},//旅游订单详情-当前行 tourRow: {}, //旅游订单详情-当前行
totalGmv:0, totalGmv: 0,
totalSecurityDeposit:0, totalSecurityDeposit: 0,
peichang:0, peichang: 0,
} currDayOrderAmount: undefined,
currDayOrderNum: undefined,
currDayToLiftVehicleNum: undefined,
currDayToReturnVehicleNum: undefined,
toDealTrafficPay: undefined,
};
}, },
created() { created() {
this.getList(); this.getList();
this.getOrderStatistics(); // this.getOrderStatistics();
this.getindexCounts();
let currentMonth = getCurrentMonth(); let currentMonth = getCurrentMonth();
this.currentMonth = parseInt(currentMonth); this.currentMonth = parseInt(currentMonth);
if(this.currentMonth < 12){ if (this.currentMonth < 12) {
this.nextMonth = this.currentMonth + 1; this.nextMonth = this.currentMonth + 1;
} else { } else {
this.nextMonth = 1; this.nextMonth = 1;
} }
this.firstTime = "日期("+this.currentMonth+"~"+this.nextMonth+")" this.firstTime = "日期(" + this.currentMonth + "~" + this.nextMonth + ")";
this.getTempDayList(); this.getTempDayList();
this.mar = setInterval(this.showMarquee, 2000); this.mar = setInterval(this.showMarquee, 2000);
getAll() getAll().then((response) => {
.then(response => {
this.allCompaniesArr = response.data; this.allCompaniesArr = response.data;
}) });
getAllCompany(codeAndBranchCompany => { getAllCompany((codeAndBranchCompany) => {
this.allCompanies = codeAndBranchCompany; this.allCompanies = codeAndBranchCompany;
}); });
}, },
filters: { filters: {
NumFormat: function (value) { NumFormat: function (value) {
if(!value) return '0.00'; if (!value) return "0.00";
var intPart = Number(value)|0; //获取整数部分 var intPart = Number(value) | 0; //获取整数部分
var intPartFormat = intPart.toString().replace(/(\d)(?=(?:\d{3})+$)/g, '$1,'); //将整数部分逢三一断 var intPartFormat = intPart
.toString()
.replace(/(\d)(?=(?:\d{3})+$)/g, "$1,"); //将整数部分逢三一断
var floatPart = ".00"; //预定义小数部分 var floatPart = ".00"; //预定义小数部分
var value2Array = String(value).split("."); var value2Array = String(value).split(".");
//=2表示数据有小数位 //=2表示数据有小数位
if(value2Array.length == 2) { if (value2Array.length == 2) {
floatPart = value2Array[1].toString(); //拿到小数部分 floatPart = value2Array[1].toString(); //拿到小数部分
if(floatPart.length == 1) { //补0,实际上用不着 if (floatPart.length == 1) {
return intPartFormat + "." + floatPart + '0'; //补0,实际上用不着
return intPartFormat + "." + floatPart + "0";
} else { } else {
return intPartFormat + "." + floatPart; return intPartFormat + "." + floatPart;
} }
} else { } else {
return intPartFormat + floatPart; return intPartFormat + floatPart;
} }
} },
}, },
computed: { computed: {
...mapGetters([ ...mapGetters(["elements", "vehicleStatus"]),
'elements',
'vehicleStatus'
]),
//获取大区列表 //获取大区列表
getAllZoneList(){ getAllZoneList() {
this.allZoneArr = getAllZone(); this.allZoneArr = getAllZone();
return getAllZone(); return getAllZone();
}, },
}, },
methods: { methods: {
getOrderStatistics(){ getindexCounts() {
var that = this; var that = this;
orderStatistics(4).then(res => { getIndexAllcounts().then((res) => {
if (res.status == 200) {
that.currDayOrderAmount = res.data.currDayOrderAmount;
that.currDayOrderNum = res.data.currDayOrderNum;
that.currDayToLiftVehicleNum = res.data.currDayToLiftVehicleNum;
that.currDayToReturnVehicleNum = res.data.currDayToReturnVehicleNum;
that.toDealTrafficPay = res.data.toDealTrafficPay;
// that.totalGmv = res.data.totalOrders;
// that.totalSecurityDeposit = res.data.totalOutstandingDeposit;
// that.peichang = res.data.additionalIndemnity;
} else {
this.$notify({
title: "失败",
message: "操作失败！",
type: "error",
duration: 2000,
});
}
});
},
getOrderStatistics() {
var that = this;
orderStatistics(4).then((res) => {
if (res.status == 200) { if (res.status == 200) {
that.totalGmv = res.data.totalOrders; that.totalGmv = res.data.totalOrders;
that.totalSecurityDeposit = res.data.totalOutstandingDeposit; that.totalSecurityDeposit = res.data.totalOutstandingDeposit;
that.peichang = res.data.additionalIndemnity; that.peichang = res.data.additionalIndemnity;
} else { } else {
this.$notify({ this.$notify({
title: '失败', title: "失败",
message: '操作失败！', message: "操作失败！",
type: 'error', type: "error",
duration: 2000 duration: 2000,
}); });
} }
}); });
...@@ -539,60 +814,101 @@ ...@@ -539,60 +814,101 @@
/** /**
* 旅游订单详情弹框关闭 * 旅游订单详情弹框关闭
* */ * */
tourOrderDetailDialogEvent(e){ tourOrderDetailDialogEvent(e) {
this.tourDialogVisible = false; this.tourDialogVisible = false;
}, },
/** /**
* 点击事件 * 点击事件
* */ * */
toShowDialog(item, iitem, ii){ toShowDialog(item, iitem, ii) {
// <!--bookType 1-租车、2-分公司使用、3-维修、4、展览、5、旅游、6、保养、7、预约中、8、禁用、9、客户用车、10、其他--> // <!--bookType 1-租车、2-分公司使用、3-维修、4、展览、5、旅游、6、保养、7、预约中、8、禁用、9、客户用车、10、其他-->
if(!ii.bg){ if (!ii.bg) {
//空白-可安排用车 //空白-可安排用车
// this.anpai = true; // this.anpai = true;
// let arr = item.vehicleModel.keyword.split(","); // let arr = item.vehicleModel.keyword.split(",");
// item.vehicleModel.keyword = arr.join(" | "); // item.vehicleModel.keyword = arr.join(" | ");
// this.currentItem = {item: item, iitem: iitem, ii: ii}; // this.currentItem = {item: item, iitem: iitem, ii: ii};
} else { } else {
if(ii.vehicleBookRecord.status == 1){//审核中的显示预约弹框 if (ii.vehicleBookRecord.status == 1) {
//审核中的显示预约弹框
this.zhanlan = true; this.zhanlan = true;
this.currentItem = {item: item, iitem: iitem, ii: ii, title: "预定用车"}; this.currentItem = {
}else{ item: item,
if(ii.bookType == 6){ iitem: iitem,
ii: ii,
title: "预定用车",
};
} else {
if (ii.bookType == 6) {
//保养 //保养
this.baoyang = true; this.baoyang = true;
this.currentItem = {item: item, iitem: iitem, ii: ii}; this.currentItem = { item: item, iitem: iitem, ii: ii };
} else if(ii.bookType == 3){ } else if (ii.bookType == 3) {
//维修 //维修
this.zhanlan = true; this.zhanlan = true;
this.currentItem = {item: item, iitem: iitem, ii: ii,title: "维修",upkeepName:'维修'}; this.currentItem = {
} else if(ii.bookType == 4){ item: item,
iitem: iitem,
ii: ii,
title: "维修",
upkeepName: "维修",
};
} else if (ii.bookType == 4) {
//展览 //展览
this.zhanlan = true; this.zhanlan = true;
this.currentItem = {item: item, iitem: iitem, ii: ii, title: "展览用车",upkeepName:'展览'}; this.currentItem = {
} else if(ii.bookType == 7){ item: item,
iitem: iitem,
ii: ii,
title: "展览用车",
upkeepName: "展览",
};
} else if (ii.bookType == 7) {
this.zhanlan = true; this.zhanlan = true;
this.currentItem = {item: item, iitem: iitem, ii: ii, title: "预定用车",upkeepName:'预定'}; this.currentItem = {
} else if(ii.bookType == 1){ item: item,
if(!ii.vehicleBookRecord.orderNo){ iitem: iitem,
ii: ii,
title: "预定用车",
upkeepName: "预定",
};
} else if (ii.bookType == 1) {
if (!ii.vehicleBookRecord.orderNo) {
this.$notify({ this.$notify({
title: '警告', title: "警告",
message: '订单号缺失', message: "订单号缺失",
type: 'warning', type: "warning",
duration: 2000 duration: 2000,
}); });
return false; return false;
} else{ } else {
this.getOneVechi(ii.vehicleBookRecord.orderNo); this.getOneVechi(ii.vehicleBookRecord.orderNo);
} }
this.currentItem = {item: item, iitem: iitem, ii: ii, title: "租车订单"}; this.currentItem = {
} else if(ii.bookType == 9){ item: item,
iitem: iitem,
ii: ii,
title: "租车订单",
};
} else if (ii.bookType == 9) {
this.zhanlan = true; this.zhanlan = true;
this.currentItem = {item: item, iitem: iitem, ii: ii,title: "客户用车",upkeepName:'客户用车'}; this.currentItem = {
} else if(ii.bookType == 5) { item: item,
iitem: iitem,
ii: ii,
title: "客户用车",
upkeepName: "客户用车",
};
} else if (ii.bookType == 5) {
//房车游订单详情 //房车游订单详情
this.zhanlan = true; this.zhanlan = true;
this.currentItem = {item: item, iitem: iitem, ii: ii, title: "房车游",upkeepName:'房车游'}; this.currentItem = {
item: item,
iitem: iitem,
ii: ii,
title: "房车游",
upkeepName: "房车游",
};
// if(!ii.vehicleBookRecord.orderNo){ // if(!ii.vehicleBookRecord.orderNo){
// this.$notify({ // this.$notify({
// title: '警告', // title: '警告',
...@@ -605,13 +921,24 @@ ...@@ -605,13 +921,24 @@
// this.tourRow = {no: ii.vehicleBookRecord.orderNo}; // this.tourRow = {no: ii.vehicleBookRecord.orderNo};
// this.tourDialogVisible = true // this.tourDialogVisible = true
// } // }
} else if(ii.bookType == 8) { } else if (ii.bookType == 8) {
//禁用 //禁用
this.jinyong = true; this.jinyong = true;
this.currentItem = {item: item, iitem: iitem, ii: ii, title: "禁用"}; this.currentItem = {
} else if(ii.bookType == 10) { item: item,
iitem: iitem,
ii: ii,
title: "禁用",
};
} else if (ii.bookType == 10) {
this.zhanlan = true; this.zhanlan = true;
this.currentItem = {item: item, iitem: iitem, ii: ii,title: "其他",upkeepName:'其他'}; this.currentItem = {
item: item,
iitem: iitem,
ii: ii,
title: "其他",
upkeepName: "其他",
};
} }
} }
} }
...@@ -619,48 +946,55 @@ ...@@ -619,48 +946,55 @@
/** /**
* 根据订单号获取订单详情 * 根据订单号获取订单详情
* */ * */
getOneVechi: function(orderNo) { getOneVechi: function (orderNo) {
let params = { let params = {
orderNo: orderNo orderNo: orderNo,
}; };
getVehicleOrderDetail(params).then(res => { getVehicleOrderDetail(params).then((res) => {
if (res.status == 200) { if (res.status == 200) {
let a = res.data; let a = res.data;
let vehicleUserLicenses = {}; let vehicleUserLicenses = {};
// if (a.status == 5) { // if (a.status == 5) {
// vehicleUserLicenses = { // vehicleUserLicenses = {
// name: a.orderVehicleCrosstownDto.licenseName, // name: a.orderVehicleCrosstownDto.licenseName,
// phone: a.orderVehicleCrosstownDto.licensePhone, // phone: a.orderVehicleCrosstownDto.licensePhone,
// idCard: a.orderVehicleCrosstownDto.licenseIdCard // idCard: a.orderVehicleCrosstownDto.licenseIdCard
// }; // };
// } else { // } else {
// if (a.vehicleUserLicenses.length > 0) { // if (a.vehicleUserLicenses.length > 0) {
// vehicleUserLicenses = a.vehicleUserLicenses[0]; // vehicleUserLicenses = a.vehicleUserLicenses[0];
// } // }
// } // }
a.orderRentVehicleDetail.startTime = timestamp2Date(a.orderRentVehicleDetail.startTime); a.orderRentVehicleDetail.startTime = timestamp2Date(
a.orderRentVehicleDetail.endTime = timestamp2Date(a.orderRentVehicleDetail.endTime); a.orderRentVehicleDetail.startTime
);
a.orderRentVehicleDetail.endTime = timestamp2Date(
a.orderRentVehicleDetail.endTime
);
let arr = a.picture ? a.picture.split(",") : []; let arr = a.picture ? a.picture.split(",") : [];
a.picture = arr.length > 0 ? arr[0] : ""; a.picture = arr.length > 0 ? arr[0] : "";
a.payTime = timestamp2Date(a.payTime); a.payTime = timestamp2Date(a.payTime);
this.rentOrderInfo = a; this.rentOrderInfo = a;
this.costDetail = JSON.parse(this.rentOrderInfo.orderRentVehicleDetail.costDetail); this.costDetail = JSON.parse(
var cost = ''; this.rentOrderInfo.orderRentVehicleDetail.costDetail
this.costDetail.children.map(function(a) { );
cost += a.key + ":" +a.detail+" "; var cost = "";
this.costDetail.children.map(function (a) {
cost += a.key + ":" + a.detail + " ";
}); });
this.rentCostDetail = cost; this.rentCostDetail = cost;
if(this.rentOrderInfo.orderRentVehicleDetail.driverType==1) { if (this.rentOrderInfo.orderRentVehicleDetail.driverType == 1) {
this.serviceCost = this.rentOrderInfo.orderRentVehicleDetail.dayNum * 600 this.serviceCost =
this.rentOrderInfo.orderRentVehicleDetail.dayNum * 600;
} }
this.rentOrder = true; this.rentOrder = true;
} else { } else {
this.$notify({ this.$notify({
title: '失败', title: "失败",
message: '操作失败！', message: "操作失败！",
type: 'error', type: "error",
duration: 2000 duration: 2000,
}); });
} }
}); });
...@@ -668,9 +1002,10 @@ ...@@ -668,9 +1002,10 @@
/** /**
* 关闭保养弹框后逻辑处理 * 关闭保养弹框后逻辑处理
* */ * */
baoyangDialogEvent(e){ baoyangDialogEvent(e) {
this.baoyang = false; this.baoyang = false;
if(e){//关闭编辑 if (e) {
//关闭编辑
//编辑成功-重新加载列表 //编辑成功-重新加载列表
this.getList(); this.getList();
} }
...@@ -678,9 +1013,10 @@ ...@@ -678,9 +1013,10 @@
/** /**
* 关闭展览弹框后逻辑处理 * 关闭展览弹框后逻辑处理
* */ * */
zhanlanDialogEvent(e){ zhanlanDialogEvent(e) {
this.zhanlan = false; this.zhanlan = false;
if(e){//关闭编辑 if (e) {
//关闭编辑
//编辑成功-重新加载列表 //编辑成功-重新加载列表
this.getList(); this.getList();
} }
...@@ -688,9 +1024,10 @@ ...@@ -688,9 +1024,10 @@
/** /**
* 禁用弹框关闭后逻辑处理 * 禁用弹框关闭后逻辑处理
* */ * */
jinyongDialogEvent(e){ jinyongDialogEvent(e) {
this.jinyong = false; this.jinyong = false;
if(e){//关闭编辑 if (e) {
//关闭编辑
//编辑成功-重新加载列表 //编辑成功-重新加载列表
this.getList(); this.getList();
} }
...@@ -698,9 +1035,10 @@ ...@@ -698,9 +1035,10 @@
/** /**
* 安排用车弹框关闭逻辑处理 * 安排用车弹框关闭逻辑处理
* */ * */
anpaiDialogEvent(e){ anpaiDialogEvent(e) {
this.anpai = false; this.anpai = false;
if(e){//关闭编辑 if (e) {
//关闭编辑
//编辑成功-重新加载列表 //编辑成功-重新加载列表
this.getList(); this.getList();
} }
...@@ -708,7 +1046,7 @@ ...@@ -708,7 +1046,7 @@
/** /**
* 租车订单详情弹框关闭 * 租车订单详情弹框关闭
* */ * */
rentOrderDetailDialogEvent(e){ rentOrderDetailDialogEvent(e) {
this.rentOrder = false; this.rentOrder = false;
}, },
/** /**
...@@ -717,36 +1055,35 @@ ...@@ -717,36 +1055,35 @@
getProvinceRegions(item) { getProvinceRegions(item) {
this.listQuery.zoneId = item; this.listQuery.zoneId = item;
this.listQuery.subordinateBranch = undefined; this.listQuery.subordinateBranch = undefined;
getAllBranchCompanyByZoneId({zoneId: item}) getAllBranchCompanyByZoneId({ zoneId: item }).then((response) => {
.then(response => {
this.allBranchCompany = response.data; this.allBranchCompany = response.data;
}) });
}, },
/** /**
* 选择分公司 * 选择分公司
* */ * */
getAllBranchCompanyChange(item) { getAllBranchCompanyChange(item) {
this.listQuery.subordinateBranch = item this.listQuery.subordinateBranch = item;
}, },
/** /**
* 鼠标移入 * 鼠标移入
* */ * */
handelOver(){ handelOver() {
clearInterval(this.mar); clearInterval(this.mar);
}, },
/** /**
* 鼠标移出 * 鼠标移出
* */ * */
handelOut(){ handelOut() {
this.mar = setInterval(this.showMarquee, 2000); this.mar = setInterval(this.showMarquee, 2000);
}, },
/** /**
* 立即处理 * 立即处理
* */ * */
toVehicleWarningMsg(){ toVehicleWarningMsg() {
this.$router.push({path: '/vehicle/vehicleWarningMsg'}); this.$router.push({ path: "/vehicle/vehicleWarningMsg" });
}, },
showMarquee: function() { showMarquee: function () {
this.animate = true; this.animate = true;
setTimeout(() => { setTimeout(() => {
this.marqueeList.push(this.marqueeList[0]); this.marqueeList.push(this.marqueeList[0]);
...@@ -760,8 +1097,8 @@ ...@@ -760,8 +1097,8 @@
/** /**
* 所属分公司 * 所属分公司
* */ * */
handleSelectSubordinate(item){ handleSelectSubordinate(item) {
if(item.value == "无"){ if (item.value == "无") {
this.listQuery.subordinateBranch = undefined; this.listQuery.subordinateBranch = undefined;
this.listQuery.subordinateBranchName = "无"; this.listQuery.subordinateBranchName = "无";
} else { } else {
...@@ -772,8 +1109,8 @@ ...@@ -772,8 +1109,8 @@
/** /**
* 停靠分公司 * 停靠分公司
* */ * */
handleSelectPark(item){ handleSelectPark(item) {
if(item.value == "无"){ if (item.value == "无") {
this.listQuery.parkBranchCompanyId = undefined; this.listQuery.parkBranchCompanyId = undefined;
this.listQuery.parkBranchCompanyName = "无"; this.listQuery.parkBranchCompanyName = "无";
} else { } else {
...@@ -785,21 +1122,23 @@ ...@@ -785,21 +1122,23 @@
let selectArry = []; let selectArry = [];
let iitem = { let iitem = {
value: "无", value: "无",
name: "无" name: "无",
}; };
selectArry.push(iitem); selectArry.push(iitem);
this.allCompaniesArr.map(function(item){ this.allCompaniesArr.map(function (item) {
item.value = item.name; item.value = item.name;
selectArry.push(item); selectArry.push(item);
}); });
this.selectArry = selectArry; this.selectArry = selectArry;
var results = queryString ? selectArry.filter(this.createFilter(queryString)) : selectArry; var results = queryString
? selectArry.filter(this.createFilter(queryString))
: selectArry;
// 调用 callback 返回建议列表的数据 // 调用 callback 返回建议列表的数据
cb(results); cb(results);
}, },
createFilter(queryString) { createFilter(queryString) {
return (restaurant) => { return (restaurant) => {
return (restaurant.name.indexOf(queryString.toLowerCase()) != -1); return restaurant.name.indexOf(queryString.toLowerCase()) != -1;
}; };
}, },
/** /**
...@@ -808,67 +1147,73 @@ ...@@ -808,67 +1147,73 @@
getList() { getList() {
let _this = this; let _this = this;
this.listLoading = true; this.listLoading = true;
if(this.listQuery.startTime && (typeof this.listQuery.startTime == "object")){ if (
this.listQuery.startTime &&
typeof this.listQuery.startTime == "object"
) {
this.listQuery.startTime = this.listQuery.startTime.getTime(); this.listQuery.startTime = this.listQuery.startTime.getTime();
} }
if(this.listQuery.endTime && (typeof this.listQuery.endTime == "object")){ if (this.listQuery.endTime && typeof this.listQuery.endTime == "object") {
this.listQuery.endTime = this.listQuery.endTime.getTime(); this.listQuery.endTime = this.listQuery.endTime.getTime();
} }
getVehiclePlanList(this.listQuery).then(response => { getVehiclePlanList(this.listQuery).then((response) => {
this.countTJ = response.data.vehicleCountVos; this.countTJ = response.data.vehicleCountVos;
let totalCountRs = undefined; let totalCountRs = undefined;
let listRs = undefined; let listRs = undefined;
if (!this.$utils.isEmpty(response.data.vehicleAndModelInfoVo) && this.$utils.isInteger(response.data.vehicleAndModelInfoVo.totalCount)) { if (
!this.$utils.isEmpty(response.data.vehicleAndModelInfoVo) &&
this.$utils.isInteger(response.data.vehicleAndModelInfoVo.totalCount)
) {
listRs = response.data.vehicleAndModelInfoVo.data; listRs = response.data.vehicleAndModelInfoVo.data;
totalCountRs = response.data.vehicleAndModelInfoVo.totalCount; totalCountRs = response.data.vehicleAndModelInfoVo.totalCount;
listRs.map(function(item){ listRs.map(function (item) {
item.visible2 = false; item.visible2 = false;
item.crtTimeStr = timestamp2Date(item.crtTime); item.crtTimeStr = timestamp2Date(item.crtTime);
if(item.storeTypeName){ if (item.storeTypeName) {
item.storeTypeName = item.storeTypeName.join("|"); item.storeTypeName = item.storeTypeName.join("|");
} }
// 解析开始时间-结束时间 // 解析开始时间-结束时间
// item.vehicleBookRecord.map(function (iitem) { // item.vehicleBookRecord.map(function (iitem) {
// let bookStartDate = iitem.bookStartDate.substring(0,10); // let bookStartDate = iitem.bookStartDate.substring(0,10);
// let bookEndDate = iitem.bookEndDate.substring(0,10); // let bookEndDate = iitem.bookEndDate.substring(0,10);
// iitem.startHourList = ["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"]; // iitem.startHourList = ["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"];
// if(iitem.startHour){ // if(iitem.startHour){
// for(let i = 0; i < iitem.startHour.length;i++){ // for(let i = 0; i < iitem.startHour.length;i++){
// iitem.startHourList[i] = iitem.startHour[i] // iitem.startHourList[i] = iitem.startHour[i]
// } // }
// } // }
// iitem.startHourList = iitem.startHourList?iitem.startHourList.reverse(): ["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"]; // iitem.startHourList = iitem.startHourList?iitem.startHourList.reverse(): ["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"];
// let flag = false;//开始时间标识，查找第一个1 // let flag = false;//开始时间标识，查找第一个1
// let flagE = false;//结束时间标识，查找第一个0 // let flagE = false;//结束时间标识，查找第一个0
// let sStart = "00";//开始时间 // let sStart = "00";//开始时间
// let sEnd= "00";//结束时间 // let sEnd= "00";//结束时间
// iitem.startHourList.map(function(ic, index){ // iitem.startHourList.map(function(ic, index){
// let c = index +1; // let c = index +1;
// if(ic == 1 && !flag){ // if(ic == 1 && !flag){
// if(c<10){ // if(c<10){
// sStart = "0"+c; // sStart = "0"+c;
// } else { // } else {
// sStart = c // sStart = c
// } // }
// flag = true; // flag = true;
// } // }
// }); // });
// if(iitem.endHour){ // if(iitem.endHour){
// if(iitem.endHour.length>=10){ // if(iitem.endHour.length>=10){
// sEnd = iitem.endHour.length; // sEnd = iitem.endHour.length;
// } else { // } else {
// sEnd = "0" + iitem.endHour.length; // sEnd = "0" + iitem.endHour.length;
// } // }
// } // }
// iitem.bookStartDate = iitem.bookStartDate.substring(0,10) + " " +sStart + ":00:00"; // iitem.bookStartDate = iitem.bookStartDate.substring(0,10) + " " +sStart + ":00:00";
// iitem.bookEndDate = iitem.bookEndDate.substring(0,10) + " " +sEnd + ":00:00"; // iitem.bookEndDate = iitem.bookEndDate.substring(0,10) + " " +sEnd + ":00:00";
// }); // });
// item.temp = _this.getDayList(item);//获取车辆30天排期 // item.temp = _this.getDayList(item);//获取车辆30天排期
item.temp = _this.getMonthDayList(item);//获取车辆30天排期 item.temp = _this.getMonthDayList(item); //获取车辆30天排期
}); });
} }
if (!this.$utils.isEmpty(response.data.vehicleWarningMsgs)) { if (!this.$utils.isEmpty(response.data.vehicleWarningMsgs)) {
response.data.vehicleWarningMsgs.map(function(ii){ response.data.vehicleWarningMsgs.map(function (ii) {
ii.color = "warn-" + ii.colorType; ii.color = "warn-" + ii.colorType;
}); });
this.marqueeList = response.data.vehicleWarningMsgs; this.marqueeList = response.data.vehicleWarningMsgs;
...@@ -878,11 +1223,11 @@ ...@@ -878,11 +1223,11 @@
//渲染颜色 //渲染颜色
this.setColor(); this.setColor();
this.total = totalCountRs; this.total = totalCountRs;
}) });
}, },
handleFilter() { handleFilter() {
this.listQuery.page = 1; this.listQuery.page = 1;
this.$refs.queryForm.validate(valid => { this.$refs.queryForm.validate((valid) => {
if (valid) { if (valid) {
this.getList(); this.getList();
} else { } else {
...@@ -901,32 +1246,32 @@ ...@@ -901,32 +1246,32 @@
/** /**
* 获取未来30天日历表 * 获取未来30天日历表
* */ * */
getMonthDayList(item){ getMonthDayList(item) {
let temp = []; let temp = [];
let list = this.list; let list = this.list;
for(let i = 0; i < 30; i++){ for (let i = 0; i < 30; i++) {
let t = []; let t = [];
let tymd = getymdTimeByDay(i); let tymd = getymdTimeByDay(i);
temp.push({day: getTimeByDay(i), month: getMonth(i), time: tymd}); temp.push({ day: getTimeByDay(i), month: getMonth(i), time: tymd });
} }
return temp; return temp;
}, },
/** /**
* 渲染颜色 * 渲染颜色
* */ * */
getDayList(item){ getDayList(item) {
let temp = []; let temp = [];
let list = this.list; let list = this.list;
for(let i = 0; i < 30; i++){ for (let i = 0; i < 30; i++) {
let t = []; let t = [];
let tymd = getymdTimeByDay(i); let tymd = getymdTimeByDay(i);
let children = []; let children = [];
let tt = "";//yyyy-MM-dd hh:mm:ss let tt = ""; //yyyy-MM-dd hh:mm:ss
let h = ""; let h = "";
let bookType = undefined;//当前车辆状态 let bookType = undefined; //当前车辆状态
let vehicleBookRecord = {};//车辆排班信息 let vehicleBookRecord = {}; //车辆排班信息
for(let ii = 0; ii < 24; ii ++) { for (let ii = 0; ii < 24; ii++) {
if (ii < 10) { if (ii < 10) {
h = "0" + ii; h = "0" + ii;
tt = tymd + " 0" + ii + ":00:00"; tt = tymd + " 0" + ii + ":00:00";
...@@ -934,26 +1279,37 @@ ...@@ -934,26 +1279,37 @@
tt = tymd + " " + ii + ":00:00"; tt = tymd + " " + ii + ":00:00";
h = ii; h = ii;
} }
let bg = "";//背景色 let bg = ""; //背景色
let pp = {}; let pp = {};
pp.time = tt; pp.time = tt;
pp.h = h; pp.h = h;
item.vehicleBookRecord.map(function (iitem) { item.vehicleBookRecord.map(function (iitem) {
if (iitem.bookStartDate <= tt && iitem.bookEndDate >=tt) { if (iitem.bookStartDate <= tt && iitem.bookEndDate >= tt) {
// <!--bookType 2-分公司使用、1-租车、3-维修、4、展览、5、旅游、6、保养、7、预约中、8、禁用--> // <!--bookType 2-分公司使用、1-租车、3-维修、4、展览、5、旅游、6、保养、7、预约中、8、禁用-->
if(iitem.bookStartDate == tt && (iitem.bookType == 1 || iitem.bookType == 5 || iitem.bookType == 4) && iitem.status == 2){//租车、旅游、展览显示起止时间 if (
iitem.bookStartDate == tt &&
(iitem.bookType == 1 ||
iitem.bookType == 5 ||
iitem.bookType == 4) &&
iitem.status == 2
) {
//租车、旅游、展览显示起止时间
pp.timeStr = h; pp.timeStr = h;
} }
if(iitem.status == 1){ if (iitem.status == 1) {
//审核中 //审核中
pp.bg = "bg-7"; pp.bg = "bg-7";
} else { } else {
pp.bg = "bg-"+ iitem.bookType; pp.bg = "bg-" + iitem.bookType;
} }
pp.vehicleBookRecord = iitem; pp.vehicleBookRecord = iitem;
pp.bookType = iitem.bookType; pp.bookType = iitem.bookType;
if(iitem.bookEndDate == tt && iitem.status == 2){ if (iitem.bookEndDate == tt && iitem.status == 2) {
if (iitem.bookType == 1 || iitem.bookType == 5 || iitem.bookType == 4){ if (
iitem.bookType == 1 ||
iitem.bookType == 5 ||
iitem.bookType == 4
) {
pp.timeEtr = h; pp.timeEtr = h;
} }
pp.bg = ""; pp.bg = "";
...@@ -962,25 +1318,29 @@ ...@@ -962,25 +1318,29 @@
}); });
children.push(pp); children.push(pp);
} }
temp.push({day: getTimeByDay(i), month: getMonth(i), children: children}); temp.push({
day: getTimeByDay(i),
month: getMonth(i),
children: children,
});
} }
return temp; return temp;
}, },
/** /**
* 获取日期数组 * 获取日期数组
* */ * */
setColor(){ setColor() {
let temp = []; let temp = [];
this.list.map(function(item){ this.list.map(function (item) {
let endTime = ''; let endTime = "";
item.temp.map(function(ttemp){ item.temp.map(function (ttemp) {
let children = []; let children = [];
let tt = "";//yyyy-MM-dd hh:mm:ss let tt = ""; //yyyy-MM-dd hh:mm:ss
let h = ""; let h = "";
let bookType = undefined;//当前车辆状态 let bookType = undefined; //当前车辆状态
let vehicleBookRecord = {};//车辆排班信息 let vehicleBookRecord = {}; //车辆排班信息
for(let ii = 0; ii < 24; ii ++) { for (let ii = 0; ii < 24; ii++) {
if (ii < 10) { if (ii < 10) {
h = "0" + ii; h = "0" + ii;
tt = ttemp.time + " 0" + ii + ":00:00"; tt = ttemp.time + " 0" + ii + ":00:00";
...@@ -988,32 +1348,43 @@ ...@@ -988,32 +1348,43 @@
tt = ttemp.time + " " + ii + ":00:00"; tt = ttemp.time + " " + ii + ":00:00";
h = ii; h = ii;
} }
let bg = "";//背景色 let bg = ""; //背景色
let pp = {}; let pp = {};
pp.time =tt; pp.time = tt;
pp.h = h; pp.h = h;
item.vehicleBookRecord.map(function (iitem) { item.vehicleBookRecord.map(function (iitem) {
if (iitem.bookStartDate <= tt && iitem.bookEndDate >=tt) { if (iitem.bookStartDate <= tt && iitem.bookEndDate >= tt) {
// <!--bookType 2-分公司使用、1-租车、3-维修、4、展览、5、旅游、6、保养、7、预约中、8、禁用--> // <!--bookType 2-分公司使用、1-租车、3-维修、4、展览、5、旅游、6、保养、7、预约中、8、禁用-->
if(iitem.bookStartDate == tt && (iitem.bookType == 1 || iitem.bookType == 5 || iitem.bookType == 4) && iitem.status == 2){//租车、旅游、展览显示起止时间 if (
iitem.bookStartDate == tt &&
(iitem.bookType == 1 ||
iitem.bookType == 5 ||
iitem.bookType == 4) &&
iitem.status == 2
) {
//租车、旅游、展览显示起止时间
pp.timeStr = h; pp.timeStr = h;
} }
if(iitem.status == 1){ if (iitem.status == 1) {
//审核中 //审核中
pp.bg = "bg-7"; pp.bg = "bg-7";
} else { } else {
pp.bg = "bg-"+ iitem.bookType; pp.bg = "bg-" + iitem.bookType;
} }
pp.vehicleBookRecord = iitem; pp.vehicleBookRecord = iitem;
pp.bookType = iitem.bookType; pp.bookType = iitem.bookType;
if(iitem.bookEndDate == tt && iitem.status == 2){ if (iitem.bookEndDate == tt && iitem.status == 2) {
if (iitem.bookType == 1 || iitem.bookType == 5 || iitem.bookType == 4){ if (
iitem.bookType == 1 ||
iitem.bookType == 5 ||
iitem.bookType == 4
) {
pp.timeEtr = h; pp.timeEtr = h;
if(h == "00"){ if (h == "00") {
let cc = new Date(tt); let cc = new Date(tt);
console.log(cc); console.log(cc);
let te = cc.getTime()-24*60*60; let te = cc.getTime() - 24 * 60 * 60;
endTime = timestamp2Date(te).substring(0, 13) +":00:00"; endTime = timestamp2Date(te).substring(0, 13) + ":00:00";
console.log(endTime); console.log(endTime);
} }
} }
...@@ -1023,7 +1394,7 @@ ...@@ -1023,7 +1394,7 @@
}); });
children.push(pp); children.push(pp);
} }
ttemp.children = children ttemp.children = children;
}); });
}); });
console.log(this.list); console.log(this.list);
...@@ -1031,22 +1402,28 @@ ...@@ -1031,22 +1402,28 @@
/** /**
* tempDayList * tempDayList
**/ **/
getTempDayList(){ getTempDayList() {
let temp = []; let temp = [];
for(let i = 0; i < 30; i++){ for (let i = 0; i < 30; i++) {
let t = []; let t = [];
let tymd = getymdTimeByDay(i); let tymd = getymdTimeByDay(i);
temp.push({day: getTimeByDay(i), month: getMonth(i), time: tymd}); temp.push({ day: getTimeByDay(i), month: getMonth(i), time: tymd });
} }
this.tempDayList = temp; this.tempDayList = temp;
}, },
/** /**
* 排版记录 * 排版记录
*/ */
toVehicleRecords(item){ toVehicleRecords(item) {
let selectedMonth = getCurrentYearMonth(); let selectedMonth = getCurrentYearMonth();
this.$router.push({path: '/vehicle/vehicleRecords?selectedMonth='+selectedMonth+"&numberPlate="+item.numberPlate}); this.$router.push({
} path:
} "/vehicle/vehicleRecords?selectedMonth=" +
} selectedMonth +
"&numberPlate=" +
item.numberPlate,
});
},
},
};
</script> </script>
src/views/revenue/revenue_sum.vue
View file @ 85ff72ad
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<el-form ref="queryForm" :inline="inline" :model="listQuery" label-width="80px"> <el-form ref="queryForm" :inline="inline" :model="listQuery" label-width="80px">
<el-row> <el-row>
<el-form-item label="所属公司"> <el-form-item label="所属公司">
<el-select v-model="listQuery.corporationId" placeholder="请选择"> <el-select v-model="listQuery.branchId" placeholder="请选择">
<el-option label="全部" :key="undefined" :value="undefined"></el-option> <el-option label="全部" :key="undefined" :value="undefined"></el-option>
<el-option <el-option
v-for="val in companys_list" v-for="val in companys_list"
...@@ -45,35 +45,41 @@ ...@@ -45,35 +45,41 @@
<div class="label_box"> <div class="label_box">
<div class="label_item top_color_bule"> <div class="label_item top_color_bule">
<p class="money_p"> <p class="money_p">
<span>￥</span>1,000,000.00 <span>￥</span>
{{all_amount}}
</p> </p>
<p class="money_label">总营收金额</p> <p class="money_label">总营收金额</p>
</div> </div>
<div class="label_item top_color_bule2"> <div class="label_item top_color_bule2">
<p class="money_p"> <p class="money_p">
<span>￥</span>1,000,000.00 <span>￥</span>
{{orderAmount}}
</p> </p>
<p class="money_label">订单&服务营收</p> <p class="money_label">订单&服务营收</p>
</div> </div>
<div class="label_item top_color_origin"> <div class="label_item top_color_origin">
<p class="money_p"> <p class="money_p">
<span>￥</span>1,000,000.00 <span>￥</span>
{{otherAmount}}
</p> </p>
<p class="money_label">额外赔偿(违约金等)</p> <p class="money_label">额外赔偿(违约金等)</p>
</div> </div>
<div class="label_item top_color_yellow"> <div class="label_item top_color_yellow">
<p class="money_p"> <p class="money_p">
<span>￥</span>1,000,000.00 <span>￥</span>
{{withdrawals}}
</p> </p>
<p class="money_label">已提现金额</p> <p class="money_label">已提现金额</p>
</div> </div>
<div class="label_item top_color_red"> <div class="label_item top_color_red">
<p class="money_p"> <p class="money_p">
<span>￥</span>1,000,000.00 <span>￥</span>
{{balance}}
</p> </p>
<p class="money_label"> <p class="money_label">
可提现金额， 可提现金额，
<a>立即提现 ></a> <a @click="company_withdraw" v-show="elements['company_with']">立即提现 ></a>
<a @click="mendian_withdraw" v-show="elements['store_with']">立即提现 ></a>
</p> </p>
</div> </div>
</div> </div>
...@@ -85,13 +91,15 @@ ...@@ -85,13 +91,15 @@
<el-date-picker <el-date-picker
type="date" type="date"
placeholder="开始时间" placeholder="开始时间"
v-model="listQuery.daystart" v-model="startTime"
format="yyyy-MM-dd"
style="width: 40%;" style="width: 40%;"
></el-date-picker>&nbsp;— ></el-date-picker>&nbsp;—
<el-date-picker <el-date-picker
type="date" type="date"
placeholder="结束时间" placeholder="结束时间"
v-model="listQuery.dayend" v-model="endTime"
format="yyyy-MM-dd"
style="width: 40%;" style="width: 40%;"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
...@@ -100,20 +108,13 @@ ...@@ -100,20 +108,13 @@
</div> </div>
</div> </div>
<el-table :key="tableKey" :data="list" border fit highlight-current-row style="width: 100%;"> <el-table :key="tableKey" :data="list" border fit highlight-current-row style="width: 100%;">
<el-table-column align="center" label="公司名称" prop="name"></el-table-column> <el-table-column align="center" label="类型" prop="typeName"></el-table-column>
<el-table-column align="center" label="联系人/电话"> <el-table-column align="center" label="订单号/提现号" prop="cono"></el-table-column>
<template slot-scope="{row}"> <el-table-column align="center" label="收支说明" prop="sourceName"></el-table-column>
<span>{{row.contact}}/{{row.mobile}}</span> <el-table-column align="center" label="所属公司" prop="branchName"></el-table-column>
</template> <el-table-column align="center" label="所属门店" prop="companyName"></el-table-column>
</el-table-column> <el-table-column align="center" label="金额" prop="amount"></el-table-column>
<el-table-column align="center" label="法人姓名" prop="legalPerson"></el-table-column> <el-table-column align="center" label="剩余金额" prop="samount"></el-table-column>
<el-table-column align="center" label="法人身份证" prop="legalIdNumber"></el-table-column>
<el-table-column align="center" label="操作">
<template slot-scope="{row}">
<el-button type="text" @click="withdraw(row)">提现</el-button>
</template>
</el-table-column>
</el-table> </el-table>
<div v-show="!listLoading" class="pagination-container"> <div v-show="!listLoading" class="pagination-container">
<el-pagination <el-pagination
...@@ -127,6 +128,44 @@ ...@@ -127,6 +128,44 @@
></el-pagination> ></el-pagination>
</div> </div>
</div> </div>
<el-dialog title="公司提现" :visible.sync="c_w_dialog" width="40%" @close="c_w_dialog=false">
<el-form>
<div style="display:flex;justify-content: space-between;">
<el-col :span="10">
<el-form-item label="银行账号">
<el-input style="width:70%"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="全部提现">
<el-switch active-color="#13ce66" inactive-color="#ff4949"></el-switch>
</el-form-item>
</el-col>
</div>
<el-table></el-table>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="c_w_dialog = false">取 消</el-button>
<el-button type="primary">确 定</el-button>
</span>
</el-dialog>
<el-dialog title="门店提现" :visible.sync="m_w_dialog" width="30%" @close="m_w_dialog=false">
<el-form ref="form" :model="form" label-width="80px">
<el-form-item label="剩余金额">
<el-input style="width:60%"></el-input>
</el-form-item>
<el-form-item label="提现金额">
<el-input style="width:60%"></el-input>
</el-form-item>
<el-form-item label="银行账号">
<el-input style="width:60%"></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="m_w_dialog = false">取 消</el-button>
<el-button type="primary">确 定</el-button>
</span>
</el-dialog>
</div> </div>
</template> </template>
...@@ -154,7 +193,12 @@ import Element1 from "../admin/menu/components/element"; ...@@ -154,7 +193,12 @@ import Element1 from "../admin/menu/components/element";
import ElRow from "element-ui/packages/row/src/row"; import ElRow from "element-ui/packages/row/src/row";
import ElCol from "element-ui/packages/col/src/col"; import ElCol from "element-ui/packages/col/src/col";
import { getToken } from "utils/auth"; import { getToken } from "utils/auth";
import { company_all_list, branchCompany_all_list } from "api/company.js"; import {
company_all_list,
branchCompany_all_list,
revenue_sum_list,
revenue_sum_count,
} from "api/company.js";
export default { export default {
name: "carApplyList", name: "carApplyList",
...@@ -171,19 +215,28 @@ export default { ...@@ -171,19 +215,28 @@ export default {
list: null, list: null,
total: null, total: null,
listLoading: true, listLoading: true,
startTime: undefined,
endTime: undefined,
listQuery: { listQuery: {
page: 1, page: 1,
limit: 10, limit: 10,
companyId: undefined, companyId: undefined,
corporationId: undefined, branchId: undefined,
daystart: "", startTime: undefined,
dayend: "", endTime: undefined,
}, },
inline: true, inline: true,
tableKey: 0, tableKey: 0,
btn_disable: null, btn_disable: null,
companys_list: [], companys_list: [],
branchCompany_list: [], branchCompany_list: [],
c_w_dialog: false,
m_w_dialog: false,
balance: undefined,
orderAmount: undefined,
otherAmount: undefined,
withdrawals: undefined,
all_amount: undefined,
}; };
}, },
created() { created() {
...@@ -223,10 +276,25 @@ export default { ...@@ -223,10 +276,25 @@ export default {
* */ * */
getList() { getList() {
this.listLoading = true; this.listLoading = true;
company_list(this.listQuery).then((response) => { if (this.startTime) {
console.log(response); this.listQuery.startTime = Date.parse(this.startTime);
}
if (this.endTime) {
this.listQuery.endTime = Date.parse(this.endTime);
}
revenue_sum_count(this.listQuery).then((res) => {
this.balance = res.data.balance;
this.orderAmount = res.data.orderAmount;
this.otherAmount = res.data.otherAmount;
this.withdrawals = res.data.withdrawals;
this.all_amount = (
Number(res.data.otherAmount) + Number(res.data.orderAmount)
).toFixed(2);
});
revenue_sum_list(this.listQuery).then((response) => {
let totalCountRs = undefined; let totalCountRs = undefined;
let listRs = undefined; let listRs = undefined;
if ( if (
!this.$utils.isEmpty(response.data.data) && !this.$utils.isEmpty(response.data.data) &&
this.$utils.isInteger(response.data.totalCount) this.$utils.isInteger(response.data.totalCount)
...@@ -236,6 +304,7 @@ export default { ...@@ -236,6 +304,7 @@ export default {
} }
this.listLoading = false; this.listLoading = false;
this.list = listRs; this.list = listRs;
console.log(response.data.data);
this.total = totalCountRs; this.total = totalCountRs;
}); });
}, },
...@@ -254,10 +323,12 @@ export default { ...@@ -254,10 +323,12 @@ export default {
page: 1, page: 1,
limit: 10, limit: 10,
companyId: undefined, companyId: undefined,
corporationId: undefined, branchId: undefined,
daystart: "", startTime: undefined,
dayend: "", endTime: undefined,
}; };
this.startTime = undefined;
this.endTime = undefined;
this.getList(); this.getList();
}, },
handleSizeChange(val) { handleSizeChange(val) {
...@@ -268,6 +339,12 @@ export default { ...@@ -268,6 +339,12 @@ export default {
this.listQuery.page = val; this.listQuery.page = val;
this.getList(); this.getList();
}, },
company_withdraw() {
this.c_w_dialog = true;
},
mendian_withdraw() {
this.m_w_dialog = true;
},
}, },
}; };
</script> </script>
...@@ -337,10 +414,8 @@ export default { ...@@ -337,10 +414,8 @@ export default {
color: rgba(189, 189, 189, 1); color: rgba(189, 189, 189, 1);
font-size: 14px; font-size: 14px;
a { a {
&:first-child {
color: blue; color: blue;
} }
}
} }
.label_filter { .label_filter {
div { div {
......
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