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

src/api/admin/member/index.js

@@ -20,3 +20,10 @@ export function addMembershipGrade(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

+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

@@ -373,6 +373,12 @@ export const asyncRouterMap = [{
       name: '车辆排班记录',
       authority: 'vehicleRecords'
     },
+		{
+		  path: 'vehicleCount',
+		  component: _import('vehicle/vehicleCount/index'),
+		  name: '车辆出行统计',
+		  authority: 'vehicleCount'
+		},
     // {
     //   path: 'dispatchApply',
     //   component: _import('vehicle/dispatchApply/index'),
@@ -427,12 +433,12 @@ export const asyncRouterMap = [{
       name: '会员订单管理',
       authority: 'memberOrderInfo'
     },
-    // {
-    //   path: 'orderStatistics',
-    //   component: _import('order/orderStatistics/index'),
-    //   name: '会员订单统计',
-    //   authority: 'orderStatistics'
-    // },
+    {
+      path: 'orderStatistics',
+      component: _import('order/orderStatistics/index'),
+      name: '会员订单统计',
+      authority: 'orderStatistics'
+    },
     {
       path: 'createOrder',
       component: _import('order/createOrder/index'),

src/utils/dateUtils.js

@@ -98,3 +98,7 @@ export function getYMD(timestamp) {
   let date = new Date(timestamp);//时间戳为10位需*1000，时间戳为13位的话不需乘1000
   return formatDate(date, 'yyyy-MM-dd');
 }
+
+export function getYMD_date(date) {
+  return formatDate(date, 'yyyy-MM-dd');
+}

src/views/order/createOrder/index.vue

@@ -122,6 +122,7 @@ export default {
         endCompanyId: null,
         startCompanyIds: null,
         endCompanyIds: null,
+        // time: [new Date(2019, 10, 10, 9, 0), new Date(2019, 10, 11, 18, 0)],
         time: [],
         limit: 100,
         page: 1,
@@ -243,7 +244,7 @@ export default {
         var nTime =
           this.listQuery.time[1].getTime() - this.listQuery.time[0].getTime();
         let params = {
-          dayNum: nTime / (24 * 60 * 60 * 1000), //天数
+          dayNum: (nTime / (24 * 60 * 60 * 1000)) + 1, //天数
           endAddr: this.listQuery.startEndAddr, //还车地点
           endCity: this.listQuery.startAddrCity, //还车城市编号
           endCityName: this.listQuery.startCityName, //还车城市名称
@@ -260,7 +261,7 @@ export default {
           damageSafe: this.listQuery.damageSafe == "需要" ? 1 : 0, //是否购买免赔
           rentFreeDay: this.listQuery.rentFreeDay == "使用" ? 1 : 0, //是否使用出租免费天数
           orderOrigin: 3, //订车来源
-          appUserId: 334
+          appUserId: this.appUserId
         };
         addIndent(params).then(data => {
           console.log(data);
@@ -301,7 +302,9 @@ export default {
       username(this.listQuery.tel).then(data => {
         if (data.status == 200) {
           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;
             if (!!data.data.rentFreeDays) {
               if (data.data.rentFreeDays >= 1) {

src/views/order/orderStatistics/index.vue

@@ -31,8 +31,14 @@
           </el-col>
         </el-row>
       </el-form>
-
-      <el-table :data="list" border fit highlight-current-row style="width: 100%">
+      <el-table
+        :data="list"
+        border
+        fit
+        highlight-current-row
+        style="width: 100%"
+        v-loading="loading"
+      >
         <el-table-column align="center" label="时间">
           <template scope="scope">
             <span>{{scope.row.timeSlot}}</span>
@@ -40,32 +46,32 @@
         </el-table-column>
         <el-table-column align="center" label="普通会员购买量">
           <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>
         </el-table-column>
         <el-table-column align="center" label="支付金额(普通会员)">
           <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>
         </el-table-column>
         <el-table-column align="center" label="黄金会员购买量">
           <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>
         </el-table-column>
         <el-table-column align="center" label="支付金额(黄金会员)">
           <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>
         </el-table-column>
         <el-table-column align="center" label="钻石会员购买量">
           <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>
         </el-table-column>
         <el-table-column align="center" label="支付金额(钻石会员)">
           <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>
         </el-table-column>
         <el-table-column align="center" label="总支付金额">
@@ -85,6 +91,7 @@ export default {
   },
   data() {
     return {
+      loading: false,
       list: [],
       // 统计时间筛选
       listQuery: {
@@ -152,11 +159,36 @@ export default {
     },
     //列表
     getList() {
+      let params = {};
+      this.loading = true;
       orderStatistics(this.listQuery).then(data => {
         console.log(data);
         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;
         }
+        setTimeout(() => {
+          this.loading = false;
+        }, 300);
       });
     }
   }

src/views/order/rentVehicleInfo/detail.vue

@@ -21,6 +21,7 @@
 			<span v-if="row.status == '4'">待出行</span>
 			<span v-if="row.status == '5'">出行中</span>
 			<span v-if="row.status == '6'">已完成</span>
+			<span v-if="row.status == '-1'">定损中</span>
           </el-form-item>
         </el-col>
       </el-row>

src/views/order/rentVehicleInfo/index.vue

@@ -71,6 +71,7 @@
                 <el-option :key="5" label="出行中" :value="5"></el-option>
                 <el-option :key="6" label="已完成" :value="6"></el-option>
                 <el-option :key="2" label="已取消" :value="2"></el-option>
+								<el-option :key="-1" label="定损中" :value="-1"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -696,6 +697,7 @@ export default {
       });
     },
     handleOrderDetail(row) {
+			debugger
       this.form = row;
       if (this.form.status == 2) {
         this.form.ststusName = "取消";
@@ -712,6 +714,9 @@ export default {
       if (this.form.status == 6) {
         this.form.ststusName = "已完成";
       }
+			 if (this.form.status == -1) {
+			  this.form.ststusName = "定损中";
+			}
       this.form.orderRentVehicleDetail.startTime = this.form
         .orderRentVehicleDetail.startTime
         ? timestamp2Date(this.form.orderRentVehicleDetail.startTime)
@@ -802,6 +807,9 @@ export default {
       if (this.form.status == 6) {
         this.form.ststusName = "已完成";
       }
+			 if (this.form.status == -1) {
+			  this.form.ststusName = "定损中";
+			}
       this.form.orderRentVehicleDetail.startTime = timestamp2Date(
         this.form.orderRentVehicleDetail.startTime
       );
@@ -862,6 +870,9 @@ export default {
       if (this.form.status == 6) {
         this.form.ststusName = "已完成";
       }
+			 if (this.form.status == -1) {
+			  this.form.ststusName = "定损中";
+			}
       this.form.orderRentVehicleDetail.startTime = timestamp2Date(
         this.form.orderRentVehicleDetail.startTime
       );
@@ -958,6 +969,9 @@ export default {
       if (this.form.status == 6) {
         this.form.ststusName = "已完成";
       }
+			 if (this.form.status == -1) {
+			  this.form.ststusName = "定损中";
+			}
       this.form.orderRentVehicleDetail.startTime = timestamp2Date(
         this.form.orderRentVehicleDetail.startTime
       );
@@ -1071,6 +1085,9 @@ export default {
             if (el.status == 6) {
               el.ststusName = "已完成";
             }
+						 if (el.status == -1) {
+						  el.ststusName = "定损中";
+						}
           });
         }
         this.list = response.data.data;

src/views/vehicle/vehicleCount/index.vue

+<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>