提现记录审核

.gitignore

@@ -11,3 +11,4 @@ selenium-debug.log
 config/**
 **/dev.env.js
 /*.json
+

package-lock.json

@@ -295,11 +295,7 @@
     },
     "async-validator": {
       "version": "1.6.9",
-<<<<<<< HEAD
       "resolved": "https://registry.npm.taobao.org/async-validator/download/async-validator-1.6.9.tgz",
-=======
-      "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-1.6.9.tgz",
->>>>>>> base-modify
       "integrity": "sha1-qDCdqouDQhzb1GKOAm1quyUZLTQ="
     },
     "asynckit": {
@@ -2884,13 +2880,28 @@
       }
     },
     "echarts": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npm.taobao.org/echarts/download/echarts-3.6.2.tgz",
-      "integrity": "sha1-hilUyLWBC/+HpIsN4EFu2MS7HDY=",
+      "version": "3.8.5",
+      "resolved": "https://registry.npmjs.org/echarts/-/echarts-3.8.5.tgz",
+      "integrity": "sha512-E+nnROMfCeiLeoT/fZyX8SE8mKzwkTjyemyoBF543oqjRtjTSKQAVDEihMXy4oC6pJS0tYGdMqCA2ATk8onyRg==",
       "requires": {
-        "zrender": "^3.5.2"
+        "zrender": "3.7.4"
       }
     },
+    "echarts-amap": {
+      "version": "1.0.0-rc.6",
+      "resolved": "https://registry.npmjs.org/echarts-amap/-/echarts-amap-1.0.0-rc.6.tgz",
+      "integrity": "sha1-V4KnTa7lLtRM4/j2JXdWF4PwnhY="
+    },
+    "echarts-liquidfill": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/echarts-liquidfill/-/echarts-liquidfill-2.0.5.tgz",
+      "integrity": "sha512-3G19W5ngoh1L3BXYuD34g0Vd30ORWvQtyxRuL+7vmOZ3FkF6xkgD4pfcCL7QVAQOr+XZ4OiD2ot6dNGsRhflcg=="
+    },
+    "echarts-wordcloud": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/echarts-wordcloud/-/echarts-wordcloud-1.1.3.tgz",
+      "integrity": "sha512-Et8D5xEAoYkidmHun+hEH+2lF9dhCt6D0JJ390vlr2r/1zwhhZAbcL01CEvG93QcMcJpSvSPK8vRiGkTbMHRxg=="
+    },
     "editorconfig": {
       "version": "0.13.3",
       "resolved": "https://registry.npm.taobao.org/editorconfig/download/editorconfig-0.13.3.tgz",
@@ -2942,11 +2953,7 @@
     "element-ui": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-1.4.1.tgz",
-<<<<<<< HEAD
       "integrity": "sha1-9EccrbQ9x3nDCY3HNjSuqU0D8lU=",
-=======
-      "integrity": "sha512-4jZu41iMuV8Semz0MG7nd8HIicyXlMJY923NvuIXoM3Q3llnwpwBVBqaPAgL3VrRnwzLKxyR/GjxxQDBqf/bvQ==",
->>>>>>> base-modify
       "requires": {
         "async-validator": "1.6.9",
         "babel-helper-vue-jsx-merge-props": "^2.0.0",
@@ -7347,6 +7354,11 @@
       "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
       "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
     },
+    "numerify": {
+      "version": "1.2.9",
+      "resolved": "https://registry.npmjs.org/numerify/-/numerify-1.2.9.tgz",
+      "integrity": "sha512-X4QzQiytV5ZN3TVLhzbtFzjTarUNnaa1pgNDFqt7u7Nqhxe7FvY2eYrGt4WYHlYXDqgtfC/n/a5nJ2y0LijV8w=="
+    },
     "oauth-sign": {
       "version": "0.9.0",
       "resolved": "https://registry.npm.taobao.org/oauth-sign/download/oauth-sign-0.9.0.tgz",
@@ -11261,6 +11273,11 @@
       "integrity": "sha1-ihagXURWV6Oupe7MWxKk+lN5dyw=",
       "dev": true
     },
+    "utils-lite": {
+      "version": "0.1.10",
+      "resolved": "https://registry.npmjs.org/utils-lite/-/utils-lite-0.1.10.tgz",
+      "integrity": "sha512-jlHvdtI8MyWURF/3u+ufIjf1Cs5WjN6WZl9qO8dEkZsVjaI7X5YMUhaCFzkvB69ljt6fo4Dd7V/Oj2NJOFDFOQ=="
+    },
     "utils-merge": {
       "version": "1.0.1",
       "resolved": "https://registry.npm.taobao.org/utils-merge/download/utils-merge-1.0.1.tgz",
@@ -11272,6 +11289,18 @@
       "resolved": "https://registry.npm.taobao.org/uuid/download/uuid-3.3.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fuuid%2Fdownload%2Fuuid-3.3.2.tgz",
       "integrity": "sha1-G0r0lV6zB3xQHCOHL8ZROBFYcTE="
     },
+    "v-charts": {
+      "version": "1.19.0",
+      "resolved": "https://registry.npmjs.org/v-charts/-/v-charts-1.19.0.tgz",
+      "integrity": "sha512-vm2HBUmxAsXK0ivwce9LytcpqrItDA5JSPLYVxZXtiuoyhcn80XX1/3dPJd/1GqG1OYv3jfBo1s9ra4q8GowqA==",
+      "requires": {
+        "echarts-amap": "1.0.0-rc.6",
+        "echarts-liquidfill": "^2.0.2",
+        "echarts-wordcloud": "^1.1.3",
+        "numerify": "1.2.9",
+        "utils-lite": "0.1.10"
+      }
+    },
     "v-viewer": {
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/v-viewer/-/v-viewer-1.4.2.tgz",
@@ -12140,9 +12169,9 @@
       }
     },
     "zrender": {
-      "version": "3.6.3",
-      "resolved": "https://registry.npm.taobao.org/zrender/download/zrender-3.6.3.tgz",
-      "integrity": "sha1-46BroQXMRes2SSqBjnt66HmnsVs="
+      "version": "3.7.4",
+      "resolved": "https://registry.npmjs.org/zrender/-/zrender-3.7.4.tgz",
+      "integrity": "sha512-5Nz7+L1wIoL0+Pp/iOP56jD6eD017qC9VRSgUBheXBiAHgOBJZ4uh4/g6e83acIwa8RKSyZf/FlceKu5ntUuxQ=="
     }
   }
 }

package.json

@@ -16,7 +16,7 @@
     "axios": "0.16.2",
     "codemirror": "5.26.0",
     "dropzone": "5.1.0",
-    "echarts": "3.6.2",
+    "echarts": "^3.8.5",
     "element-ui": "^1.4.1",
     "file-saver": "1.3.3",
     "jquery": "^3.4.0",
@@ -31,6 +31,7 @@
     "showdown": "1.7.1",
     "simplemde": "1.11.2",
     "sortablejs": "1.5.1",
+    "v-charts": "^1.19.0",
     "v-viewer": "^1.4.2",
     "vue": "2.4.2",
     "vue-baidu-map": "^0.21.19",

src/api/order/rentVehicle.js

 import fetch from 'utils/fetch';
-
+//获取租车订单
 export function page(query) {
 	return fetch({
-    url: '/api/order/baseOrder/getOrderList',
+		url: '/api/order/baseOrder/getAll',
 		method: 'get',
-		params:query
+		params: query
 	});
 }
 
+//获取旅游订单
+export function getOrderList(query) {
+	return fetch({
+		url: '/api/order/baseOrder/getOrderList',
+		method: 'get',
+		params: query
+	});
+}
 /**
  * 获取所有分公司
  */
@@ -22,7 +30,7 @@ export function getAllBranchCompanyByZoneId(query) {
 	return fetch({
 		url: '/vehicle/branchCompany/app/unauth/getByZone',
 		method: 'get',
-		params:query
+		params: query
 	});
 }
 
@@ -30,7 +38,7 @@ export function getOrderVehicleCrosstown(query) {
 	return fetch({
 		url: '/api/order/orderVehicle/getByOrderId',
 		method: 'get',
-		params:query
+		params: query
 	});
 }
 
@@ -76,7 +84,7 @@ export function inquire(query) {
 	return fetch({
 		url: '/vehicle/vehicleInfo/rent/back-stage/usable-vehicle',
 		method: 'get',
-    params:query
+		params: query
 	});
 }
 
@@ -85,16 +93,16 @@ export function addIndent(params) {
 	return fetch({
 		url: '/api/order/orderRentVehicle/back-stage/add',
 		method: 'post',
-    data:params
+		data: params
 	});
 }
 
 //删除订单
 export function calculate(no, params) {
 	return fetch({
-    url: '/api/order/baseOrder/back-stage/cancel/'+ no,
+		url: '/api/order/baseOrder/back-stage/cancel/' + no,
 		method: 'post',
-    data:params
+		data: params
 	});
 }
 
@@ -104,7 +112,7 @@ export function calculate(no, params) {
  */
 export function getViolatePrice(no) {
 	return fetch({
-    url: '/api/order/orderRefund/bg-stage/getViolatePrice/'+ no,
+		url: '/api/order/orderRefund/bg-stage/getViolatePrice/' + no,
 		method: 'get',
 	});
 }
@@ -114,7 +122,7 @@ export function orderStatistics(params) {
 	return fetch({
 		url: 'api/order/orderStatistics/order',
 		method: 'post',
-    data:params
+		data: params
 	});
 }
 
@@ -154,3 +162,12 @@ export function user_info(id) {
 		method: 'get'
 	});
 }
+
+//获取订单详情
+export function orderDetail(query) {
+	return fetch({
+		url: '/api/order/baseOrder/orderDetail',
+		method: 'get',
+		params: query
+	});
+}

src/api/vehicleType.js

@@ -191,10 +191,13 @@ export function dayList(day) {
 }
 
 // 日历价格设置
-export function add_edit(params) {
+export function add_edit(params, date) {
   return fetch({
-    url: '/vehicle/admin/vehicle_model/calendar_price/add_edit',
+    url: '/vehicle/admin/vehicle_model/calendar_price/add_edit/' + date,
     method: 'post',
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    },
     data: params
   });
 }

src/main.js

@@ -14,7 +14,7 @@ import 'assets/iconfont/iconfont'; // iconfont 具体图标见https://github.com
 import * as filters from './filters'; // 全局vue filter
 import Multiselect from 'vue-multiselect';// 使用的一个多选框组件，element-ui的select不能满足所有需求
 import 'vue-multiselect/dist/vue-multiselect.min.css';// 多选框组件css
-import 'swiper/dist/css/swiper.css';//引入swiper样式
+import 'swiper/dist/css/swiper.css';// 引入swiper样式
 import Sticky from 'components/Sticky'; // 粘性header组件
 import IconSvg from 'components/Icon-svg';// svg 组件
 import vueWaves from './directive/waves';// 水波纹指令
@@ -71,6 +71,8 @@ Vue.use(Viewer, {
     zIndex: 9999
   }
 })
+import VCharts from 'v-charts'
+Vue.use(VCharts)
 // register globally
 Vue.component('multiselect', Multiselect);
 Vue.component('Sticky', Sticky);

src/router/index.js

@@ -551,9 +551,9 @@ export const asyncRouterMap = [{
       authority: 'memberEnter'
     },
     {
-      path:'imCustomerServiceManger',
+      path: 'imCustomerServiceManger',
       component: _import('userManagement/imCustomerServiceManger/cusomterServiceList'),
-      name:'客服列表',
+      name: '客服列表',
       authority: 'imCustomerServiceManger'
     },{
       path: 'employeesInput',
@@ -661,9 +661,8 @@ export const asyncRouterMap = [{
       authority: 'carApplyList'
     }
   ]
-}
-,
-  {
+},
+{
   path: '/xxOfficialWebsite',
   component: Layout,
   name: '欣新房车官网管理',
@@ -701,8 +700,8 @@ export const asyncRouterMap = [{
       authority: 'friendLinkList'
     }
   ]
-  },
-  {
+},
+{
   path: '/summit',
   component: Layout,
   name: '峰会管理',
@@ -716,5 +715,20 @@ export const asyncRouterMap = [{
       authority: 'summitList'
     }
   ]
+},
+{
+  path: '/statistics',
+  component: Layout,
+  name: '数据统计',
+  icon: 'setting',
+  authority: 'statistics',
+  children: [
+    {
+      path: 'orderStatistics',
+      component: _import('statistics/orderStatistics'),
+      name: '订单统计',
+      authority: 'orderStatistics'
     }
+  ]
+}
 ];

src/views/cunponManagements/conponList.vue

@@ -67,7 +67,7 @@
         </el-table-column>
         <el-table-column align="center" label="过期时间">
           <template scope="scope">
-            <span>{{scope.row.expireTimeStr}}</span>
+            <span>{{scope.row.validType == 3 ? '永久' : scope.row.expireTimeStr}}</span>
           </template>
         </el-table-column>
         <el-table-column align="center" label="状态">

src/views/discoveryModule/clapIndex.vue

@@ -54,9 +54,9 @@
         </el-form>
         <el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button>
         <el-button class="filter-item" type="primary" v-waves @click="reloadPage">重置</el-button>
-        <el-button class="filter-item" style="margin-left: 10px;" @click="handleCreate"
+        <!-- <el-button class="filter-item" style="margin-left: 10px;" @click="handleCreate"
                    type="primary" icon="edit">添加
-        </el-button>
+        </el-button> -->
       </div>
       <el-table :key='tableKey' :data="list" border fit highlight-current-row
                 style="width: 100%">
@@ -95,6 +95,11 @@
             <span>{{scope.row.count?scope.row.count.comment:0}}</span>
           </template>
         </el-table-column>
+        <el-table-column width="200" align="center" label="发布时间">
+          <template scope="scope">
+            <span>{{scope.row.body.timeStr}}</span>
+          </template>
+        </el-table-column>
         <el-table-column width="100" align="center" label="来源">
           <template scope="scope">
             <span>{{scope.row.source == 1? '后台创建':'app用户'}}</span>
@@ -104,7 +109,7 @@
           <template scope="scope">
             <el-button size="small"  class="el-button el-button--text el-button--small" @click="handleUpdate(scope.row)">编辑
             </el-button>
-            <el-button size="small"class="el-button el-button--text el-button--small" style="color: green;" v-if="scope.row.visible==2" @click="upStatus(scope.row)">设置为公开
+            <el-button size="small" class="el-button el-button--text el-button--small" style="color: green;" v-if="scope.row.visible==2" @click="upStatus(scope.row)">设置为公开
             </el-button>
             <el-button size="small" class="el-button el-button--text el-button--small" style="color: red" v-if="scope.row.visible==1" @click="upStatus(scope.row)">设置为保密
             </el-button>
@@ -664,17 +669,17 @@
         params.praise = this.listQuery.praise?this.listQuery.praise:undefined;
 
         if(this.listQuery.startTime  && (typeof this.listQuery.startTime == "object")){
-          params.startTime = this.listQuery.startTime.getTime()/1000;
+          params.startTime = this.listQuery.startTime.getTime();
         }
         if(this.listQuery.endTime  && (typeof this.listQuery.endTime == "object")){
-          params.endTime = this.listQuery.endTime.getTime()/1000;
+          params.endTime = this.listQuery.endTime.getTime();
         }
         page(params).then(response => {
           let totalCountRs = undefined;
           let listRs = undefined;
           if (!this.$utils.isEmpty(response.data.list) && this.$utils.isInteger(response.data.total)) {
             response.data.list.map(function(item){
-
+              item.body.timeStr = timestamp2Date(item.body.time);
             });
             listRs = response.data.list;
             totalCountRs = response.data.total;

src/views/discoveryModule/questionsAndAnswers.vue

@@ -54,9 +54,9 @@
         </el-form>
         <el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button>
         <el-button class="filter-item" type="primary" v-waves @click="reloadPage">重置</el-button>
-        <el-button class="filter-item" style="margin-left: 10px;" @click="handleCreate"
+        <!-- <el-button class="filter-item" style="margin-left: 10px;" @click="handleCreate"
                    type="primary" icon="edit">添加
-        </el-button>
+        </el-button> -->
       </div>
       <el-table :key='tableKey' :data="list" border fit highlight-current-row
                 style="width: 100%">
@@ -98,7 +98,7 @@
           <template scope="scope">
             <el-button size="small"  class="el-button el-button--text el-button--small" @click="handleUpdate(scope.row)">编辑
             </el-button>
-            <el-button size="small"class="el-button el-button--text el-button--small" style="color: green;" v-if="scope.row.visible==2" @click="upStatus(scope.row)">设置为公开
+            <el-button size="small" class="el-button el-button--text el-button--small" style="color: green;" v-if="scope.row.visible==2" @click="upStatus(scope.row)">设置为公开
             </el-button>
             <el-button size="small" class="el-button el-button--text el-button--small" style="color: red" v-if="scope.row.visible==1" @click="upStatus(scope.row)">设置为保密
             </el-button>

src/views/discoveryModule/shortVideo.vue

@@ -54,9 +54,9 @@
         </el-form>
         <el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button>
         <el-button class="filter-item" type="primary" v-waves @click="reloadPage">重置</el-button>
-        <el-button class="filter-item" style="margin-left: 10px;" @click="handleCreate"
+        <!-- <el-button class="filter-item" style="margin-left: 10px;" @click="handleCreate"
                    type="primary" icon="edit">添加
-        </el-button>
+        </el-button> -->
       </div>
       <el-table :key='tableKey' :data="list" border fit highlight-current-row
                 style="width: 100%">
@@ -95,6 +95,11 @@
             <span>{{scope.row.count?scope.row.count.comment:0}}</span>
           </template>
         </el-table-column>
+        <el-table-column width="200" align="center" label="发布时间">
+          <template scope="scope">
+            <span>{{scope.row.body.timeStr}}</span>
+          </template>
+        </el-table-column>
         <el-table-column width="100" align="center" label="来源">
           <template scope="scope">
             <span>{{scope.row.source == 1? '后台创建':'app用户'}}</span>
@@ -104,7 +109,7 @@
           <template scope="scope">
             <el-button size="small"  class="el-button el-button--text el-button--small" @click="handleUpdate(scope.row)">编辑
             </el-button>
-            <el-button size="small"class="el-button el-button--text el-button--small" style="color: green;" v-if="scope.row.visible==2" @click="upStatus(scope.row)">设置为公开
+            <el-button size="small" class="el-button el-button--text el-button--small" style="color: green;" v-if="scope.row.visible==2" @click="upStatus(scope.row)">设置为公开
             </el-button>
             <el-button size="small" class="el-button el-button--text el-button--small" style="color: red" v-if="scope.row.visible==1" @click="upStatus(scope.row)">设置为保密
             </el-button>
@@ -652,17 +657,17 @@
         params.praise = this.listQuery.praise?this.listQuery.praise:undefined;
 
         if(this.listQuery.startTime  && (typeof this.listQuery.startTime == "object")){
-          params.startTime = this.listQuery.startTime.getTime()/1000;
+          params.startTime = this.listQuery.startTime.getTime();
         }
         if(this.listQuery.endTime  && (typeof this.listQuery.endTime == "object")){
-          params.endTime = this.listQuery.endTime.getTime()/1000;
+          params.endTime = this.listQuery.endTime.getTime();
         }
         page(params).then(response => {
           let totalCountRs = undefined;
           let listRs = undefined;
           if (!this.$utils.isEmpty(response.data.list) && this.$utils.isInteger(response.data.total)) {
             response.data.list.map(function(item){
-
+              item.body.timeStr = timestamp2Date(item.body.time);
             });
             listRs = response.data.list;
             totalCountRs = response.data.total;

src/views/order/modal/rentOrderDetailModal.vue

 <template>
 	<el-dialog title="租车订单详情" :visible.sync="dialogVisible" class="order-details">
-		<el-form :model="form" ref="form" label-width="110px">
+		<el-form :model="orderDetailInfo" ref="orderDetailInfo" label-width="110px">
 			<el-row>
 				<el-col :span="8">
 					<el-form-item label="订单号:">
-						<span>{{form.no}}</span>
+						<span v-if="orderDetailInfo.no">{{orderDetailInfo.no}}</span>
 					</el-form-item>
 				</el-col>
 				<el-col :span="8">
 					<el-form-item label="创建订单时间:">
-						<span>{{form.crtTime}}</span>
+						<span v-if="orderDetailInfo.crtTime">{{orderDetailInfo.crtTime}}</span>
 					</el-form-item>
 				</el-col>
 
 				<el-col :span="8">
 					<el-form-item label="实际支付时间:">
-						<span>{{!!form.payTime ? timestamp(new Date(form.payTime)) : '无'}}</span>
+						<span>{{!!orderDetailInfo.payTime ? timestamp(new Date(orderDetailInfo.payTime)) : '无'}}</span>
 					</el-form-item>
 				</el-col>
 			</el-row>
 			<el-row>
 				<el-col :span="8">
 					<el-form-item label="订单状态:">
-						<span>{{form.ststusName}}</span>
+						<span>{{orderDetailInfo.ststusName}}</span>
 					</el-form-item>
 				</el-col>
 				<el-col :span="8">
 					<el-form-item label="姓名/手机号:">
-						<span v-if="form.realName">{{form.realName}}/{{form.telephone}}</span>
+						<span v-if="orderDetailInfo.username">{{orderDetailInfo.username}}/{{orderDetailInfo.telephone}}</span>
 						<span v-else>无</span>
 					</el-form-item>
 				</el-col>
 				<el-col :span="8">
 					<el-form-item label="会员等级/身份:">
-						<span v-if='form.memberName'>{{form.memberName}}/{{form. jobTitle}}</span>
+						<span v-if="orderDetailInfo != undefined && orderDetailInfo.memberLevel">{{orderDetailInfo.memberName}}/{{orderDetailInfo. jobTitle}}</span>
 						<span v-else>无</span>
 					</el-form-item>
 				</el-col>
-				<!-- <el-col :span="8">
-					<el-form-item label="配车:">
-						<span
-							style="margin-right: 10px;"
-						>{{form.vehicleNumberPlat?form.vehicleNumberPlat:form.vehicalNumberPlat}}</span>
-						<el-button
-							size="small"
-							type="primary"
-							icon="edit"
-							v-if="form.status==4"
-							@click="resetCar"
-						>重新配车</el-button>
-					</el-form-item>
-				</el-col>-->
 			</el-row>
-			<!-- <el-row>
-				<el-col :span="8">
-					<el-form-item label="取车:">
-						<span>{{form.orderRentVehicleDetail.startTime}}</span>
-					</el-form-item>
-				</el-col>
-				<el-col :span="8">
-					<el-form-item label label-width="10px">
-						<span>{{form.orderRentVehicleDetail.startAddr}}</span>
-					</el-form-item>
-				</el-col>
-				<el-col :span="8">
-					<el-form-item label="交车公司:">
-						<span>{{form.startCompanyName}}</span>
-					</el-form-item>
-				</el-col>
-			</el-row>-->
-			<!-- <el-row>
-				<el-col :span="8">
-					<el-form-item label="还车:">
-						<span>{{form.orderRentVehicleDetail.endTime}}</span>
-					</el-form-item>
-				</el-col>
-				<el-col :span="8">
-					<el-form-item label label-width="10px">
-						<span>{{form.orderRentVehicleDetail.endAddr}}</span>
-					</el-form-item>
-				</el-col>
-				<el-col :span="8">
-					<el-form-item label="还车公司:">
-						<span>{{form.endCompanyName}}</span>
-						<el-button
-							v-show="form.status == 4 || form.status == 5"
-							size="mini"
-							type="primary"
-							style="padding: 7px 9px;"
-							@click="resetReturn = true"
-						>更换</el-button>
-					</el-form-item>
-				</el-col>
-			</el-row>-->
 			<table class="orderDetail">
 				<tr>
 					<th>房车</th>
@@ -108,111 +53,97 @@
 					<th>专职司机服务费</th>
 				</tr>
 				<tr>
-					<td>{{form.name}}{{form.vehicleNumberPlat}}<span v-if="form.vehicleCode">({{form.vehicleCode}})</span><span v-else></span></td>
 					<td>
-						<p>取:{{form.orderRentVehicleDetail.startTime}}</p>
-						<p>还:{{form.orderRentVehicleDetail.endTime}}</p>
-						<p v-show="form.orderRentVehicleDetail.dayNum">租借天数{{form.orderRentVehicleDetail.dayNum}}天</p>
+						{{orderDetailInfo.name}}  </br>  {{orderDetailInfo.vehicalNumberPlat}}
+						<span v-if="orderDetailInfo.code">({{orderDetailInfo.code}})</span>
+						<span v-else></span>
 					</td>
-					<td>{{form.startCompanyName}}</td>
-					<td>{{form.endCompanyName}}</td>
-
-					
-
 					<td>
-						<p v-if="form.rentVehiclePriceVO">
-							<span v-if="form.rentVehiclePriceVO.freeDayNum == 0">
-								无
-							</span>
-							<span v-else>
-								会员特权{{form.rentVehiclePriceVO.freeDayNum}}天
-							</span>
+						<p>取:{{orderDetailInfo.orderRentVehicleDetail.startTime}}</p>
+						<p>还:{{orderDetailInfo.orderRentVehicleDetail.endTime}}</p>
+						<p v-show="orderDetailInfo.orderRentVehicleDetail.dayNum">租借天数{{orderDetailInfo.orderRentVehicleDetail.dayNum}}天</p>
+					</td>
+					<td>{{orderDetailInfo.startCompanyName}}</td>
+					<td>{{orderDetailInfo.endCompanyName}}</td>
 
+					<td>
+						<p v-if="orderDetailInfo.rentVehiclePriceVO">
+							<span v-if=" orderDetailInfo.rentVehiclePriceVO.freeDayNum && orderDetailInfo.rentVehiclePriceVO.freeDayNum > 0">会员特权{{orderDetailInfo.rentVehiclePriceVO.freeDayNum}}天</span>
+							<span v-else>无</span>
 						</p>
-						<p v-else>
-							{{orderInfo('免费天数')}}
-						</p>
+						<p v-else>无</p>
 					</td>
 
-
 					<td>
-						<p v-if="form.rentVehiclePriceVO && form.rentVehiclePriceVO.vehicleDayNum > 0">
-							¥{{form.rentVehiclePriceVO.modelAmount}}*{{form.rentVehiclePriceVO.vehicleNum}}/{{form.rentVehiclePriceVO.vehicleDayNum}}天
-						</p>
-						<p v-else>
-							{{orderInfo('车辆租赁费')}}
-						</p>
+						<p
+							v-if="orderDetailInfo.rentVehiclePriceVO && orderDetailInfo.rentVehiclePriceVO.vehicleDayNum > 0"
+						>¥{{orderDetailInfo.rentVehiclePriceVO.modelAmount}}*{{orderDetailInfo.rentVehiclePriceVO.vehicleNum}}/{{orderDetailInfo.rentVehiclePriceVO.vehicleDayNum}}天</p>
+						<p v-else>{{orderDetailInfo.costDetail.children[0].key}} : {{orderDetailInfo.costDetail.children[0].detail}}</p>
 					</td>
 
 					<td>
-						<p v-if="form.couponList">
-							<span
-								v-for="(item,index) in form.couponList"
-								:key="index"
-							>{{item.title}}-{{item.usedAmount}}元</span>
+						<p v-if="orderDetailInfo.rentVehiclePriceVO && orderDetailInfo.rentVehiclePriceVO.couponAmount > 0">
+							<span>{{orderDetailInfo.rentVehiclePriceVO.couponDesc}}-{{orderDetailInfo.rentVehiclePriceVO.couponAmount}}元</span>
 						</p>
+						<p v-else-if="orderDetailInfo.costDetail.children && orderDetailInfo.costDetail.children[2]">{{orderDetailInfo.costDetail.children[2].key}} : {{orderDetailInfo.costDetail.children[2].val}}</p>
 						<p v-else>无</p>
 					</td>
 					<td>
-						<p v-if="form.rentVehiclePriceVO && form.rentVehiclePriceVO.damageSafeAmount > 0">
-							¥{{form.rentVehiclePriceVO.damageSafePrice}}/{{form.rentVehiclePriceVO.dayNum}}天
-						</p>
-						<p v-else>
-							{{orderInfo('不计免赔')}}
-						</p>
+						<p
+							v-if="orderDetailInfo.rentVehiclePriceVO && orderDetailInfo.rentVehiclePriceVO.damageSafeAmount > 0"
+						>¥{{orderDetailInfo.rentVehiclePriceVO.damageSafePrice}}/{{orderDetailInfo.rentVehiclePriceVO.dayNum}}天</p>
+						<p v-else>无</p>
 					</td>
 					<td>
-						<p v-if='form.rentVehiclePriceVO'>
-							{{form.rentVehiclePriceVO.deposit}}
-						</p>
-						<p v-else>
-							{{orderInfo('租房车押金')}}
-						</p>
+						<p v-if="orderDetailInfo.rentVehiclePriceVO">{{orderDetailInfo.rentVehiclePriceVO.deposit}}</p>
+						<p v-else>{{orderDetailInfo.costDetail.children[1].key}} : {{orderDetailInfo.costDetail.children[1].val}}</p>
 					</td>
 					<td>
-						<p v-if='form.rentVehiclePriceVO && form.rentVehiclePriceVO.driverAmount > 0'>
-							¥{{form.rentVehiclePriceVO.driverPrice}}*{{form.rentVehiclePriceVO.driverNum}}/{{form.rentVehiclePriceVO.dayNum}}天
-						</p>
-						<p v-else>
-							{{orderInfo('专职司机服务费')}}
-						</p>
+						<p
+							v-if="orderDetailInfo.rentVehiclePriceVO && orderDetailInfo.rentVehiclePriceVO.driverAmount > 0"
+						>¥{{orderDetailInfo.rentVehiclePriceVO.driverPrice}}*{{orderDetailInfo.rentVehiclePriceVO.driverNum}}/{{orderDetailInfo.rentVehiclePriceVO.dayNum}}天</p>
+						<p v-else>无</p>
 					</td>
 				</tr>
 				<tr>
 					<td>
-						<el-button size="small" type="text" v-if="form.status==4" @click="resetCar">重新配车</el-button>
+						<el-button size="small" type="text" v-if="orderDetailInfo.status==4" @click="resetCar">重新配车</el-button>
 					</td>
 					<td></td>
 					<td></td>
 					<td>
 						<el-button
-							v-show="form.status == 4 || form.status == 5"
+							v-show="orderDetailInfo.status == 4 || orderDetailInfo.status == 5"
 							size="mini"
 							type="text"
 							@click="resetReturn = true"
 						>更换</el-button>
 					</td>
-					<td colspan="6">{{form.payWay == 1 ? '微信支付' : form.payWay == 2 ? '支付宝支付' : form.payWay == 3 ? '银联支付' : '微信支付'}} 共计:￥{{form.realAmount}}</td>
+					<td
+						colspan="6"
+					>{{orderDetailInfo.payWay == 1 ? '微信支付' : orderDetailInfo.payWay == 2 ? '支付宝支付' : orderDetailInfo.payWay == 3 ? '银联支付' : '微信支付'}} 共计:￥{{orderDetailInfo.realAmount}}</td>
 				</tr>
 			</table>
 
 			<p>
 				<b>额外随车物品:</b>
+				<span v-if="this.orderDetailInfo.carArticlesJson">
 					<span
-					v-for="(item,index) in JSON.parse(this.form.carArticlesJson)"
+						v-for="(item,index) in JSON.parse(this.orderDetailInfo.carArticlesJson)"
 						:key="index"
 						style="margin-right:10px"
 					>{{item.name || '无'}}</span>
+				</span>
 			</p>
 			<p>
 				<b>内部邀请人:</b>
-				<span>{{form.facilitatePhone || '无'}}</span>
+				<span>{{orderDetailInfo.facilitatePhone || '无'}}</span>
 			</p>
 			<p>
 				<b>驾驶证:</b>
 				<span
-					v-if="form.orderVehicleCrosstownDto"
-				>{{form.orderVehicleCrosstownDto.licenseName}} {{form.orderVehicleCrosstownDto.licensePhone}} {{form.orderVehicleCrosstownDto.licenseIdCard}}</span>
+					v-if="orderDetailInfo.orderVehicleCrosstownDto"
+				>{{orderDetailInfo.orderVehicleCrosstownDto.licenseName}} {{orderDetailInfo.orderVehicleCrosstownDto.licensePhone}} {{orderDetailInfo.orderVehicleCrosstownDto.licenseIdCard}}</span>
 				<span v-else>无</span>
 			</p>
 			<!-- <div v-if="form.orderVehicleCrosstownDto" style="margin: 20px 0;">
@@ -269,7 +200,7 @@ import ElForm from '../../../../node_modules/element-ui/packages/form/src/form.v
 import { editObj } from 'api/vehicle/vehicleInfo'
 import { getAll, updateEndCompany } from 'api/base_info/branch_company'
 export default {
-	props: ['form', 'rentCostDetail'],
+	props: ['orderDetailInfo'],
 	name: 'rentOrderDetailModal',
 	components: {
 		ElFormItem,
@@ -321,33 +252,17 @@ export default {
 		}
 	},
 	mounted() {
-		
 		this.dialogVisible = true
-		if (this.form.status == 2) {
-			this.form.ststusName = '取消'
-		}
-		if (this.form.status == 3) {
-			this.form.ststusName = '待付款'
-		}
-		if (this.form.status == 4) {
-			this.form.ststusName = '待出行'
-		}
-		if (this.form.status == 5) {
-			this.form.ststusName = '出行中'
-		}
-		if (this.form.status == 6) {
-			this.form.ststusName = '已完成'
-		}
 		this.getAllFn()
 	},
 	methods: {
-		orderInfo(val){
-			let info = this.form.detailsOfExpenses.filter(item=>item.key == val) 
-			if (info == '' || info < 0) {
-				return '无'
-			}else{
-				return info[0].detail || info[0].val
-			}
+		orderInfo(val) {
+			// let info = this.form.detailsOfExpenses.filter(item=>item.key == val)
+			// 	if (info == '' || info < 0) {
+			// 		return '无'
+			// 	}else{
+			// 		return info[0].detail || info[0].val
+			// 	}
 		},
 		timestamp(now) {
 			var year = now.getFullYear()
@@ -394,7 +309,7 @@ export default {
 					duration: 2000
 				})
 			} else {
-				this.returnForm.id = this.form.detailId
+				this.returnForm.id = this.orderDetailInfo.orderRentVehicleDetail.id
 				updateEndCompany(this.returnForm).then(data => {
 					if (data.status == 200) {
 						this.$notify({
@@ -420,7 +335,7 @@ export default {
 		resetCar() {
 			this.clearFrom()
 			this.resetCarVisible = true
-			this.resetCarForm.no = this.form.no
+			this.resetCarForm.no = this.orderDetailInfo.no
 		},
 		cancelResetCar() {
 			this.resetCarVisible = false
@@ -448,7 +363,7 @@ export default {
 								duration: 2000
 							})
 							this.resetCarVisible = false
-							this.form.vehicleNumberPlat = this.resetCarForm.numberPlate
+							this.orderDetailInfo.vehicleNumberPlat = this.resetCarForm.numberPlate
 							this.updateNumberPlat = true
 						} else {
 							this.$notify({
@@ -495,7 +410,7 @@ export default {
 	width: 50px;
 	height: 50px;
 }
-.order-details .el-dialog--small{
+.order-details .el-dialog--small {
 	width: 1100px !important;
 }
 .order-details .el-form-item {

src/views/order/rentVehicleInfo/index.vue

@@ -113,14 +113,14 @@
 			highlight-current-row
 			style="width: 100%"
 		>
-			<!-- <el-table-column align="center" label="ID" width="70">
+			<el-table-column align="center" label="ID" width="70">
 				<template scope="scope">
-					<span>{{scope.row.id}}</span>
+					<span>{{scope.row.orderId}}</span>
 				</template>
-			</el-table-column>-->
+			</el-table-column>
 			<el-table-column width="200" align="center" label="订单号/下单时间">
 				<template scope="scope">
-					<span>{{scope.row.no}}</span>
+					<span>{{scope.row.orderNo}}</span>
 					<br />
 					<span>{{scope.row.crtTime}}</span>
 				</template>
@@ -132,23 +132,23 @@
 			</el-table-column>
 			<el-table-column min-width="250" align="center" label="名称/车牌号">
 				<template scope="scope">
-					<span>{{scope.row.name}}</span>
+					<span>{{scope.row.vehicleName}}</span>
 					<br />
-					<span>{{scope.row.vehicleNumberPlat}}</span>
+					<span>{{scope.row.numberPlate}}</span>
 				</template>
 			</el-table-column>
 			<el-table-column width="150" align="center" label="姓名/手机号">
 				<template scope="scope">
-					<span>{{scope.row.realName}}</span>/
+					<span>{{scope.row.username}}</span>/
 					<span>{{scope.row.telephone}}</span>
 				</template>
 			</el-table-column>
 			<el-table-column width="200" align="center" label="取车时间/还车时间">
 				<template scope="scope">
 					取:
-					<span>{{dateFormat(scope.row.orderRentVehicleDetail.startTime)}}</span>
+					<span>{{dateFormat(scope.row.startTime)}}</span>
 					<br />还:
-					<span>{{dateFormat(scope.row.orderRentVehicleDetail.endTime)}}</span>
+					<span>{{dateFormat(scope.row.endTime)}}</span>
 				</template>
 			</el-table-column>
 			<el-table-column width="200" align="center" label="交车公司">
@@ -167,7 +167,7 @@
 			</el-table-column>
 			<el-table-column width="110" align="center" label="订单金额">
 				<template scope="scope">
-					<span>{{scope.row.orderAmount}}元</span>
+					<span>{{scope.row.realAmount}}元</span>
 				</template>
 			</el-table-column>
 			<el-table-column width="110" align="center" label="支付方式">
@@ -246,8 +246,7 @@
 
 		<!-- 订单详情 -->
 		<rentOrderDetailModal
-			:form="form"
-			:rentCostDetail="tourCostDetail"
+			:orderDetailInfo="orderDetailInfo"
 			v-if="rentDialogVisible"
 			v-on:rentOrderDetailDialogEvent="rentOrderDetailDialogEvent"
 		></rentOrderDetailModal>
@@ -259,7 +258,7 @@
 					<el-row :gutter="20">
 						<el-col :span="10">
 							<el-form-item label="客户姓名:">
-								<span>{{form.realName}}</span>
+								<span>{{form.username}}</span>
 							</el-form-item>
 						</el-col>
 						<el-col :span="10">
@@ -277,17 +276,36 @@
 
 				<div v-else-if="modalTitle=='还车记录'">
 					<el-form-item label="实退押金:">
-						<span>{{orderReturnVehicleCrosstown.restDeposit}}</span>
+						<span>{{orderReturnVehicleCrosstown.actualDeposit}}</span>
 					</el-form-item>
+					<!-- {{orderReturnVehicleCrosstown.violateDetailList != ''}} -->
 					<div v-show="orderReturnVehicleCrosstown.violateDetailList != ''">
+					<!-- <div> -->
 						<el-form-item label="消费超额:">
 							<span
 								v-for="(item,index) in orderReturnVehicleCrosstown.violateDetailList"
 								:key="index"
 							>{{item.excessCost}}</span>
 						</el-form-item>
-
-						<el-form-item label="违约赔款:" v-for="(item,index) in orderReturnVehicleCrosstown.violateDetailList" :key="index">
+						<!-- <el-form-item label="违约赔款:">
+							<span
+								v-for="(item,index) in orderReturnVehicleCrosstown.violateDetailList"
+								:key="index"
+							>{{item.cost}}</span>
+						</el-form-item>
+						<el-form-item label="违约类型:">
+							<span
+								v-for="(item,index) in orderReturnVehicleCrosstown.violateDetailList"
+								:key="index"
+							>{{item.statusName}}</span>
+						</el-form-item>
+						<el-form-item label="赔款备注:">
+							<span
+								v-for="(item,index) in orderReturnVehicleCrosstown.violateDetailList"
+								:key="index"
+							>{{item.deductions}}</span>
+						</el-form-item> -->
+						<el-form-item label="违约赔款.:" v-for="(item,index) in orderReturnVehicleCrosstown.violateDetailList" :key="index">
 							<span>{{item.statusName}}</span><span style="margin-left:10px">{{item.cost}}</span>元<br/>
 							<span style="color:#999">{{item.deductions}}</span>
 						</el-form-item>
@@ -295,7 +313,7 @@
 							<span
 								v-for="(item,index) in orderReturnVehicleCrosstown.backCoupons"
 								:key="index"
-							>{{item.title}} 价值{{item.usedAmount}}元</span>
+							>{{item.title}} {{item.usedAmount}}</span>
 						</el-form-item>
 					</div>
 				</div>
@@ -315,17 +333,18 @@
 						</viewer>
 					</el-form-item>
 					<el-form-item label="备注:">
-						<span>{{form.remak}}</span>
+						<span>{{orderReturnVehicleCrosstown.remak}}</span>
 					</el-form-item>
 				</div>
 				<div v-if="modalTitle=='交车记录'">
 					<el-row :gutter="20">
 						<el-col :span="10">
 							<el-form-item label="交车操作人:">
-								<!-- <span
+								<span
 									class="label-text"
-								>{{orderReturnVehicleCrosstown.operatorName}} {{orderReturnVehicleCrosstown.operatorPhone}}</span>-->
+								>{{checkUserInfo.length > 0 && checkUserInfo[0].username? checkUserInfo[0].username : ""}}  {{checkUserInfo.length > 0 && checkUserInfo[0].telephone? checkUserInfo[0].telephone : ""}}</span>
 							</el-form-item>
+							
 						</el-col>
 						<el-col :span="10">
 							<el-form-item label="交车时间:">
@@ -338,8 +357,8 @@
 				</div>
 				<div v-show="modalTitle=='还车记录'">
 					<div v-show="orderReturnVehicleCrosstown.type == 3">
-						<el-form-item label="定损类型:">
-							<span></span>
+						<!-- <el-form-item label="定损类型:">
+							<span></span> -->
 						</el-form-item>
 						<el-form-item label="定损总赔:">
 							<span>{{dedDetailDTOListAll}}</span>
@@ -365,9 +384,9 @@
 					<el-row :gutter="20">
 						<el-col :span="10">
 							<el-form-item label="收车操作人:">
-								<!-- <span
+								<span
 									class="label-text"
-								>{{orderReturnVehicleCrosstown.operatorName}} {{orderReturnVehicleCrosstown.operatorPhone}}</span>-->
+								>{{checkUserInfo.length > 0 && checkUserInfo[0].username? checkUserInfo[0].username : ""}}  {{checkUserInfo.length > 0 && checkUserInfo[0].telephone? checkUserInfo[0].telephone : ""}}</span>
 							</el-form-item>
 						</el-col>
 						<el-col :span="10">
@@ -411,7 +430,7 @@
 								<template v-if="item.status==2">
 									<div class="picBox">
 										<div v-show="item.iscomplete">退还押金{{item.restAmount}}(扣除{{item.amount}}元)</div>
-										<div v-show="!item.iscomplete">退还押金15000元</div>
+										<div v-show="!item.iscomplete">退还押金{{item.restAmount}}元</div>
 										<div style="color: #999" v-show="item.iscomplete">
 											{{item.updTimeStr}}
 											<span>
@@ -428,8 +447,8 @@
 								</template>
 								<template v-if="item.status==3">
 									<div class="picBox">
-										<div v-show="item.iscomplete">退还违章保证金{{item.restAmount}}元（扣除{{item.amount}}元）</div>
-										<div v-show="!item.iscomplete">退还押金5000元</div>
+										<div v-show="item.iscomplete">退还违章保证金{{activeRecord.refundOfRemainingDeposit}}元（扣除{{activeRecord.violationOfCharges}}元）</div>
+										<div v-show="!item.iscomplete">退还押金{{item.restAmount}}元</div>
 										<div style="color: #999" v-show="item.iscomplete">
 											{{item.updTimeStr}}
 											<span>
@@ -453,7 +472,7 @@
 								<template v-if="item.status==6">
 									<div class="picBox">
 										<div v-show="item.iscomplete">退还押金{{item.restAmount}}(扣除{{item.amount}}元)</div>
-										<div v-show="!item.iscomplete">退还押金15000元</div>
+										<div v-show="!item.iscomplete">退还押金{{item.restAmount}}元</div>
 										<div style="color: #999" v-show="item.iscomplete">
 											{{item.updTimeStr}}
 											<span>
@@ -553,7 +572,8 @@ import {
 	getOrderVehicleCrosstown,
 	getStep,
 	calculate,
-	getViolatePrice
+	getViolatePrice,
+	orderDetail
 } from 'api/order/rentVehicle'
 import {
 	toEast8Date,
@@ -565,6 +585,7 @@ import { mapGetters } from 'vuex'
 import rsCode from '../../../utils/rsCode'
 import { getSysRegionByIds } from 'api/vehicle/vehicleInfo/'
 import { getAllZone } from 'api/base_info/constant/'
+import { getAll,getAllCompany } from 'api/base_info/branch_company'
 import ElRow from 'element-ui/packages/row/src/row'
 import ElCol from 'element-ui/packages/col/src/col'
 import ElButton from '../../../../node_modules/element-ui/packages/button/src/button.vue'
@@ -581,6 +602,7 @@ export default {
 	},
 	data() {
 		return {
+			activeRecord:null,
 			isInline: false,
 			pictureList: [],
 			dedDetail: [],
@@ -605,10 +627,12 @@ export default {
 				hasDiscount: undefined,
 				hasMemberRight: undefined,
 				hasPay: undefined,
-				id: undefined,
+				orderId: undefined,
 				name: undefined,
-				realName: undefined,
-				no: undefined,
+				username: undefined,
+				orderNo: undefined,
+				startTime: undefined,
+				endTime: undefined,
 				orderAmount: undefined,
 				orderOrigin: undefined,
 				orderVehicleCrosstownDto: {
@@ -734,7 +758,8 @@ export default {
 				licenseIdCard: undefined,
 				licenseImg: undefined,
 				licenseName: undefined,
-				licensePhone: undefined
+				licensePhone: undefined,
+				checkUserInfo: undefined
 			}, //还车记录
 			tableKey: 0,
 			dedDetailDTOListAll: undefined,
@@ -745,6 +770,90 @@ export default {
 			vehicleDetail: false, //交还车信息，默认全部显示
 			order_btn_order_violcation_save: false,
 			depositDetail: false,
+			checkUserInfo: [],
+			orderDetailInfo: {
+				code: undefined,
+				couponAmount: undefined,
+				crtHost: undefined,
+				crtName: undefined,
+				crtTime: undefined,
+				crtUser: undefined,
+				damagesAmount: undefined,
+				dedDetailDTO: undefined,
+				detailId: undefined,
+				endCompanyName: undefined,
+				extraAmount: undefined,
+				goodsAmount: undefined,
+				hasDiscount: undefined,
+				hasMemberRight: undefined,
+				hasPay: undefined,
+				id: undefined,
+				illegalReserve: undefined,
+				items: [],
+				memberLevel: undefined,
+				memberName: undefined,
+				name: undefined,
+				no: undefined,
+				orderAmount: undefined,
+				orderOrigin: undefined,
+				orderRentVehicleDetail: {
+					bookRecordId: undefined,
+					costDetail: undefined,
+					crtTime: undefined,
+					damageSafe: undefined,
+					dayNum: 0,
+					deposit: undefined,
+					driverType: undefined,
+					endAddr: undefined,
+					endCity: undefined,
+					endCityName: undefined,
+					endCompanyId: undefined,
+					endTime: undefined,
+					fixedLossStatus: undefined,
+					freeDays: undefined,
+					handelViolation: undefined,
+					id: undefined,
+					modelId: undefined,
+					orderId: undefined,
+					rebate: undefined,
+					score: undefined,
+					startAddr: undefined,
+					startCity: undefined,
+					startCityName: undefined,
+					startCompanyId: undefined,
+					startTime: undefined,
+					stime: undefined,
+					suserid: undefined,
+					updTime: undefined,
+					usedDay: undefined,
+					vehicleId: undefined,
+					violateTrafficAmount: undefined
+				},
+				orderVehicleCrosstownDto: {
+					licenseIdCard: '',
+					licenseImg: '',
+					licenseName: '',
+					licensePhone: ''
+				},
+				outTradeNo: undefined,
+				payOrigin: undefined,
+				payTime: undefined,
+				picture: undefined,
+				realAmount: undefined,
+				refundStatus: undefined,
+				rentVehiclePriceVO: undefined,
+				startCompanyName: undefined,
+				status: undefined,
+				telephone: undefined,
+				type: undefined,
+				updTime: undefined,
+				userCompanyStatus: undefined,
+				userId: undefined,
+				username: undefined,
+				vehicalNumberPlat: undefined,
+				vehicleUserLicenses: undefined,
+				version: undefined,
+				violateAmount: undefined,
 				costDetail: {
 					key: undefined,
 					val: undefined,
@@ -756,6 +865,8 @@ export default {
 						}
 					]
 				}
+			},
+			
 		}
 	},
 	created() {
@@ -796,6 +907,10 @@ export default {
 			}
 		}
 		this.getList()
+		// this.getAllFn()
+		getAllCompany(codeAndBranchCompany => {
+			this.allBranchCompany = codeAndBranchCompany;
+		});
 		this.btn_del = this.elements['branchCompany/stockApply:btn_delete']
 		this.order_btn_order_violcation_save = this.elements[
 			'order:btn_order_violcation_save'
@@ -871,7 +986,7 @@ export default {
 						appUserId: row.userId,
 						changeViolateAmount: null
 					}
-					calculate(row.no, params).then(data => {
+					calculate(row.orderNo, params).then(data => {
 						if (data.status == 200) {
 							this.$notify({
 								title: '成功',
@@ -913,9 +1028,63 @@ export default {
 				that.row = row
 			}
 		},
+		getOrderDetail() {
+			if(this.form.orderNo) {
+				var param = {
+					"orderNo":this.form.orderNo,
+					"flag" : true
+				}
+				orderDetail(param).then(response => {
+				this.orderDetailInfo = response.data
+				if(this.orderDetailInfo && this.orderDetailInfo.memberLevel) {
+					if(this.orderDetailInfo.memberLevel == 1) {
+						this.orderDetailInfo.memberName = "普通会员"
+					}
+					if(this.orderDetailInfo.memberLevel == 2) {
+						this.orderDetailInfo.memberName = "黄金会员"
+					}
+					if(this.orderDetailInfo.memberLevel == 3) {
+						this.orderDetailInfo.memberName = "钻石会员"
+					}
+					if(this.orderDetailInfo.orderRentVehicleDetail.costDetail) {
+							this.orderDetailInfo.costDetail = JSON.parse(this.orderDetailInfo.orderRentVehicleDetail.costDetail)
+							
+					}
+					if(this.orderDetailInfo.costDetail.paramJson) {
+							this.orderDetailInfo.rentVehiclePriceVO = JSON.parse(this.orderDetailInfo.costDetail.paramJson)
+							
+					}
+					if(this.orderDetailInfo.items) {
+						for (var i = 0;i< this.orderDetailInfo.items.length;i++) {
+							if(this.orderDetailInfo.items[i].type == 104) {
+								this.orderDetailInfo.carArticlesJson = this.orderDetailInfo.items[i].detail
+							}
+						}
+					}
+					if (this.orderDetailInfo.status == 2) {
+						this.orderDetailInfo.ststusName = '取消'
+					}
+					if (this.orderDetailInfo.status == -1) {
+						this.orderDetailInfo.ststusName = '定损中'
+					}
+					if (this.orderDetailInfo.status == 3) {
+						this.orderDetailInfo.ststusName = '待付款'
+					}
+					if (this.orderDetailInfo.status == 4) {
+						this.orderDetailInfo.ststusName = '待出行'
+					}
+					if (this.orderDetailInfo.status == 5) {
+						this.orderDetailInfo.ststusName = '出行中'
+					}
+					if (this.orderDetailInfo.status == 6) {
+						this.orderDetailInfo.ststusName = '已完成'
+					}
+				}
+				this.rentDialogVisible = true
+			})
+			}
+		},
 		checkViolateAmount() {
-			console.log(this.topAmount)
-			console.log(this.violateAmount)
 			if (this.topAmount < this.violateAmount) {
 				this.$notify({
 					title: '失败',
@@ -931,7 +1100,7 @@ export default {
 				appUserId: this.row.userId,
 				changeViolateAmount: this.violateAmount
 			}
-			calculate(this.row.no, params).then(data => {
+			calculate(this.row.orderNo, params).then(data => {
 				if (data.status == 200) {
 					this.$notify({
 						title: '成功',
@@ -960,7 +1129,7 @@ export default {
 				cancelReason: '后台取消',
 				appUserId: row.userId
 			}
-			getViolatePrice(row.no).then(data => {
+			getViolatePrice(row.orderNo).then(data => {
 				if (data.status == 200) {
 					that.topAmount = data.data.topAmount
 					that.cancel(row, data.data.cutAmount)
@@ -994,37 +1163,15 @@ export default {
 			if (this.form.status == -1) {
 				this.form.ststusName = '定损中'
 			}
-			this.form.orderRentVehicleDetail.startTime = this.form
-				.orderRentVehicleDetail.startTime
-				? timestamp2Date(this.form.orderRentVehicleDetail.startTime)
+			this.form.startTime = this.form
+				.startTime
+				? timestamp2Date(this.form.startTime)
 				: ''
-			this.form.orderRentVehicleDetail.endTime = this.form
-				.orderRentVehicleDetail.endTime
-				? timestamp2Date(this.form.orderRentVehicleDetail.endTime)
+			this.form.endTime = this.form
+				.endTime
+				? timestamp2Date(this.form.endTime)
 				: ''
-			if (this.form.orderRentVehicleDetail.costDetail) {
-				try {
-					this.costDetail = JSON.parse(
-						this.form.orderRentVehicleDetail.costDetail
-					)
-					var cost = ''
-					// console.log(this.costDetail.children);
-					if (this.costDetail.children) {
-						this.costDetail.children.forEach(function(a) {
-							var detail = a.detail == undefined ? '' : a.detail
-							cost += a.key + ':' + detail + ' '
-						})
-					}
-				} catch (e) {
-					this.templateModel()
-				}
-			}
-			// console.log(cost);
-			this.tourCostDetail = cost
-			if (this.form.orderRentVehicleDetail.driverType == 1) {
-				this.serviceCost = this.form.orderRentVehicleDetail.dayNum * 600
-			}
-			this.rentDialogVisible = true
+			this.getOrderDetail();
 		},
 		/**
 		 * 租车订单详情弹框关闭
@@ -1056,7 +1203,6 @@ export default {
 		illegalEvent(params) {
 			this.illegalVisible = false
 			if (params) {
-				// console.log(params);
 			}
 		},
 		/**
@@ -1065,11 +1211,10 @@ export default {
 		detailEvent(params) {
 			this.detailVisible = false
 			if (params) {
-				// console.log(params);
 			}
 		},
 		handleHandoverOrderVehicle(row) {
-			// console.log(row);
+
 			this.modalTitle = '交车记录'
 			this.form = row
 			if (this.form.status == 2) {
@@ -1090,27 +1235,7 @@ export default {
 			if (this.form.status == -1) {
 				this.form.ststusName = '定损中'
 			}
-			this.form.orderRentVehicleDetail.startTime = timestamp2Date(
-				this.form.orderRentVehicleDetail.startTime
-			)
-			this.form.orderRentVehicleDetail.endTime = timestamp2Date(
-				this.form.orderRentVehicleDetail.endTime
-			)
-			this.costDetail = JSON.parse(
-				this.form.orderRentVehicleDetail.costDetail
-			)
-			var cost = ''
-			if (this.costDetail.children) {
-				this.costDetail.children.forEach(function(a) {
-					var detail = a.detail == undefined ? '' : a.detail
-					cost += a.key + ':' + detail + ' '
-				})
-			}
-			this.tourCostDetail = cost
-			if (this.form.orderRentVehicleDetail.driverType == 1) {
-				this.serviceCost = this.form.orderRentVehicleDetail.dayNum * 600
-			}
-			this.orderVehicleQuery.orderId = this.form.id
+			this.orderVehicleQuery.orderId = this.form.orderId
 			this.orderVehicleQuery.type = 1
 			this.orderVehicleQuery.types = null
 			this.getAllOrderVehicleCrosstown()
@@ -1135,6 +1260,11 @@ export default {
 						)
 						this.dedDetailDTOListAll = sum
 					}
+					if(this.orderReturnVehicleCrosstown.checkUserInfo) {
+						this.checkUserInfo = JSON.parse(this.orderReturnVehicleCrosstown.checkUserInfo);
+					} else {
+						this.checkUserInfo =[]
+					}
 					if (response.data[0].imgs) {
 						this.otherImg = response.data[0].imgs.split(',')
 					}
@@ -1143,7 +1273,6 @@ export default {
 		},
 
 		handleReturnOrderVehicle(row) {
-			// console.log(row);
 			this.modalTitle = '还车记录'
 			this.form = row
 			if (this.form.status == 2) {
@@ -1164,27 +1293,14 @@ export default {
 			if (this.form.status == -1) {
 				this.form.ststusName = '定损中'
 			}
-			this.form.orderRentVehicleDetail.startTime = timestamp2Date(
-				this.form.orderRentVehicleDetail.startTime
-			)
-			this.form.orderRentVehicleDetail.endTime = timestamp2Date(
-				this.form.orderRentVehicleDetail.endTime
+			this.form.startTime = timestamp2Date(
+				this.form.startTime
 			)
-			this.costDetail = JSON.parse(
-				this.form.orderRentVehicleDetail.costDetail
+			this.form.endTime = timestamp2Date(
+				this.form.endTime
 			)
-			var cost = ''
-			if (this.costDetail.children) {
-				this.costDetail.children.forEach(function(a) {
-					var detail = a.detail == undefined ? '' : a.detail
-					cost += a.key + ':' + detail + ' '
-				})
-			}
-			this.tourCostDetail = cost
-			if (this.form.orderRentVehicleDetail.driverType == 1) {
-				this.serviceCost = this.form.orderRentVehicleDetail.dayNum * 600
-			}
-			this.orderVehicleQuery.orderId = this.form.id
+			
+			this.orderVehicleQuery.orderId = this.form.orderId
 			this.orderVehicleQuery.types = '2,3'
 			this.orderVehicleQuery.type = null
 			this.getAllOrderVehicleCrosstown()
@@ -1194,7 +1310,6 @@ export default {
 			this.depositDetail = false
 		},
 		handleRefundVehicle(row) {
-			// console.log(row);
 			this.activeInfo = row
 			var that = this
 			that.pictureList = []
@@ -1202,8 +1317,10 @@ export default {
 			that.depositRefundRecord = []
 			that.dedTotal = 0
 			that.Tel = ''
-			getStep(row.no + '&address=1').then(response => {
+			getStep(row.orderNo + '&address=1').then(response => {
+					this.activeRecord = response.data[0]
 				response.data.forEach(function(item) {
+				
 					if (item.type != 1) {
 						that.Tel = item.customerPhone
 						that.type = item.type
@@ -1244,9 +1361,8 @@ export default {
 						} else {
 							var arr = item.depositRefundRecord
 						}
-
 						that.depositRefundRecord = arr
-						// console.log(that.depositRefundRecord);
+
 					}
 				})
 			})
@@ -1270,11 +1386,11 @@ export default {
 			if (this.form.status == -1) {
 				this.form.ststusName = '定损中'
 			}
-			this.form.orderRentVehicleDetail.startTime = timestamp2Date(
-				this.form.orderRentVehicleDetail.startTime
+			this.form.startTime = timestamp2Date(
+				this.form.startTime
 			)
-			this.form.orderRentVehicleDetail.endTime = timestamp2Date(
-				this.form.orderRentVehicleDetail.endTime
+			this.form.endTime = timestamp2Date(
+				this.form.endTime
 			)
 			this.orderVehicleCrosstownVisible = true
 			this.vehicleDetail = false
@@ -1284,10 +1400,12 @@ export default {
 		getProvinceRegions(item) {
 			this.listQuery.zoneId = item
 			this.baranchQuery.zoneId = item
-			this.listQuery.startCompanyId = undefined
-			getAllBranchCompanyByZoneId(this.baranchQuery).then(response => {
-				this.allBranchCompany = response.data
-			})
+
+
+			// this.listQuery.startCompanyId = undefined
+			// getAllBranchCompanyByZoneId(this.baranchQuery).then(response => {
+			// 	this.allBranchCompany = response.data
+			// })
 		},
 		getAllBranchCompanyChange(item) {
 			this.listQuery.startCompanyId = item
@@ -1379,7 +1497,6 @@ export default {
 			page(this.listQuery).then(response => {
 				if (response.data.data) {
 					response.data.data.map(function(el) {
-						// console.log(el);
 						if (el.status == 2) {
 							el.ststusName = '取消'
 						}

src/views/order/tourOrderInfo/index.vue

@@ -156,6 +156,7 @@
   import tourOrderDetailModal from "../modal/tourOrderDetailModal";//租车订单详情
   import {
     page,
+		getOrderList,
     getAllBranchCompany,
     getAllBranchCompanyByZoneId,
 		calculate,
@@ -173,6 +174,7 @@
     formatDate
   } from '../../../utils/dateFormattor';
 
+import {getAllCompany } from 'api/base_info/branch_company'
   export default {
     name: 'branchCompanyStock',
     components: {
@@ -348,6 +350,9 @@
         }
       }
       this.getList();
+      getAllCompany(codeAndBranchCompany => {
+        this.allBranchCompany = codeAndBranchCompany;
+      });
       this.btn_del = this.elements['branchCompany/stockApply:btn_delete'];
     },
     computed: {
@@ -524,11 +529,11 @@
       getProvinceRegions(item) {
         this.listQuery.zoneId = item
         this.baranchQuery.zoneId = item
-        this.listQuery.startCompanyId = undefined;
-        getAllBranchCompanyByZoneId(this.baranchQuery)
-          .then(response => {
-            this.allBranchCompany = response.data;
-          })
+        // this.listQuery.startCompanyId = undefined;
+        // getAllBranchCompanyByZoneId(this.baranchQuery)
+        //   .then(response => {
+        //     this.allBranchCompany = response.data;
+        //   })
       },
       getAllBranchCompanyChange(item) {
         this.listQuery.startCompanyId = item
@@ -610,7 +615,7 @@
         if(this.listQuery){
           localStorage.setItem("tourOrderInfo", JSON.stringify(this.listQuery));
         }
-        page(this.listQuery)
+        getOrderList(this.listQuery)
           .then(response => {
             this.list = response.data.data;
             this.total = response.data.totalCount;

src/views/purseManage/discountRecord.vue

@@ -58,7 +58,7 @@
 				</el-table-column>
 				<el-table-column align="center" label="收款账号">
 					<template scope="scope">
-						<span>{{scope.row.accountNumber}}</span>
+						<span>{{scope.row.accountName}}</span>
 					</template>
 				</el-table-column>
 

src/views/statistics/orderStatistics.vue

+<template>
+  <ve-line :data="chartData"></ve-line>
+</template>
+
+<script>
+  export default {
+    data: function () {
+      return {
+        chartData: {
+          columns: ['日期', '访问用户', '下单用户', '下单率'],
+          rows: [
+            { '日期': '1/0', '访问用户': 1393, '下单用户': 1093, '下单率': 0.32 },
+            { '日期': '1/1', '访问用户': 1393, '下单用户': 1093, '下单率': 0.32 },
+            { '日期': '1/2', '访问用户': 3530, '下单用户': 3230, '下单率': 0.26 },
+            { '日期': '1/3', '访问用户': 2923, '下单用户': 2623, '下单率': 0.76 },
+            { '日期': '1/4', '访问用户': 1723, '下单用户': 1423, '下单率': 0.49 },
+            { '日期': '1/5', '访问用户': 3792, '下单用户': 3492, '下单率': 0.323 },
+            { '日期': '1/6', '访问用户': 4593, '下单用户': 4293, '下单率': 0.78 }
+          ]
+        }
+      }
+    }
+  }
+</script>
\ No newline at end of file

src/views/userManagement/userList/index.vue

@@ -226,17 +226,17 @@
             <el-row>
               <el-col :span="6">
                 <el-form-item label="注册终端:">
-                  <span>{{userDetails.channel}}</span>
+                  <span>{{userDetails.channel == 1 ? 'app' : '小程序'}}</span>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="注册时间:">
-                  <span>{{userDetails.createTime}}</span>
+                  <span>{{!!userDetails.createTime ? timestamp(new Date(userDetails.createTime*1000)) : ''}}</span>
                 </el-form-item>
               </el-col>
               <el-col :span="9">
                 <el-form-item label="最近登录时间:">
-                  <span>{{userDetails.lastTime}}</span>
+                  <span>{{!!userDetails.lastTime ? timestamp(new Date(userDetails.lastTime)): ''}}</span>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -261,7 +261,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="性别: ">
-              <span>{{userDetails.sex}}</span>
+              <span>{{userDetails.sex == 1 ? '女' : '男'}}</span>
             </el-form-item>
           </el-col>
         </el-row>
@@ -276,17 +276,17 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="有效期:">
-              <span>{{userDetails.validTime}}</span>
+              <span>{{userDetails.validTime == '0' ? '永久' : '无'}}</span>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="充值次数:">
-              <span>{{userDetails.buyCount}}次</span>
+              <span>{{!!userDetails.buyCount ? userDetails.buyCount+'次' : ''}}</span>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="加入时间:">
-              <span>{{userDetails.timeOfMembership}}</span>
+             <span>{{!!userDetails.timeOfMembership ? timestamp(new Date(userDetails.timeOfMembership)) :''}}</span>
             </el-form-item>
           </el-col>
         </el-row>
@@ -314,7 +314,7 @@
         <el-row>
           <el-col :span="6">
             <el-form-item label="来源:">
-              <span>{{userDetails.source}}</span>
+              <span>{{userDetails.source == 0 ? '自来' : '用户邀请'}}</span>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -905,6 +905,21 @@
         this.setPop = true;
         this.activeId = val.userId;
       },
+      //时间戳转换
+      timestamp(now) { 
+        var year=now.getFullYear(); 
+        var month=now.getMonth()+1; 
+        var date=now.getDate(); 
+        var Hours = now.getHours();
+        var Minutes = now.getMinutes();
+        var Seconds = now.getSeconds();
+        month = month.toString().length == 1 ? '0'+ month : month;
+        date = date.toString().length == 1 ? '0'+ date : date;
+        Hours = Hours.toString().length == 1 ? '0'+ Hours : Hours;
+        Minutes = Minutes.toString().length == 1 ? '0'+ Minutes : Minutes;
+        Seconds = Seconds.toString().length == 1 ? '0'+ Seconds : Seconds;
+        return year+"-"+month+"-"+date+' '+ Hours+':'+Minutes+":"+Seconds
+      },
       //设置上级
       setHeighterBtn(){
         if (!!this.phone) {
@@ -1152,7 +1167,6 @@
           this.detailsDialogFormVisible = true
           this.getBoolean(this.userDetails.certificationStatus)
         })
-
       }
       ,
       /**

src/views/vehicle/bookRecord/index.vue

@@ -253,13 +253,13 @@
 							@click="illegalInquiry(scope.row)"
 					>违章记录</el-button>
 					<el-button
-							v-if="bookRecord_btn_prove&&scope.row.status==1"
+							v-if="bookRecord_btn_prove&&scope.row.status==1&&scope.row.bookType !=1"
 							size="small"
 							class="el-button el-button--text el-button--small"
 							@click="handleProve(scope.row)"
 					>通过</el-button>
 					<el-button
-							v-if="bookRecord_btn_reject&&scope.row.status==1"
+							v-if="bookRecord_btn_reject&&scope.row.status==1&&scope.row.bookType !=1"
 							size="small"
 							class="el-button el-button--text el-button--small"
 							style="color: red;"
@@ -267,7 +267,7 @@
 					>驳回</el-button>
 					<template v-if="scope.row.vehicleDepartureLogVo==undefined">
 						<el-button
-								v-if="bookRecord_btn_lift&&scope.row.liftStatus==1&&scope.row.status==2"
+								v-if="bookRecord_btn_lift&&scope.row.liftStatus==1&&scope.row.status==2&&scope.row.bookType !=1"
 								size="small"
 								class="el-button el-button--text el-button--small"
 								@click="handleLift(scope.row)"
@@ -275,7 +275,7 @@
 					</template>
 					<template v-if="scope.row.vehicleDepartureLogVo!=undefined">
 						<el-button
-								v-if="bookRecord_btn_ret&&scope.row.vehicleDepartureLogVo.state==0&&scope.row.retStatus==1"
+								v-if="bookRecord_btn_ret&&scope.row.vehicleDepartureLogVo.state==0&&scope.row.retStatus==1&&scope.row.bookType !=1"
 								size="small"
 								class="el-button el-button--text el-button--small"
 								@click="handleRet(scope.row)"
@@ -283,7 +283,7 @@
 					</template>
 					<template v-if="scope.row.vehicleDepartureLogVo==undefined">
 						<el-button
-								v-if="bookRecord_btn_unbook&&scope.row.status==2"
+								v-if="bookRecord_btn_unbook&&scope.row.status==2&&scope.row.bookType !=1"
 								size="small"
 								class="el-button el-button--text el-button--small"
 								style="color: red;"
@@ -1942,4 +1942,8 @@
 		background: #000;
 		z-index: 2001;
 	}
+	.voucher{
+		width: 100px;
+		height: 100px;
+	}
 </style>

src/views/vehicle/vehicleInfo/index.vue

@@ -9,17 +9,12 @@
 				label-width="100px"
 			>
 				<el-row>
-					<el-col :span="5">
 					<el-form-item label="车牌">
 						<el-input v-model="listQuery.numberPlate" placeholder="请输入车牌"></el-input>
 					</el-form-item>
-					</el-col>
-					<el-col :span="5">
 					<el-form-item label="车辆编码">
 						<el-input type="number" v-model.number="listQuery.code" placeholder="请输入车辆编码"></el-input>
 					</el-form-item>
-					</el-col>
-					<el-col :span="5">
 					<el-form-item label="车辆状态">
 						<el-select class="filter-item" v-model="listQuery.status" placeholder="请选择车辆状态">
 							<el-option :key="undefined" label="全部" :value="undefined"></el-option>
@@ -31,8 +26,6 @@
 							></el-option>
 						</el-select>
 					</el-form-item>
-					</el-col>
-					<el-col :span="5">
 					<el-form-item label="分公司" prop="subordinateBranch">
 						<el-autocomplete
 							class="inline-input"
@@ -42,10 +35,6 @@
 							@select="handleSelect"
 						></el-autocomplete>
 					</el-form-item>
-					</el-col>
-				</el-row>
-				<el-row>
-					<el-col :span="5">
 					<el-form-item label="区域" prop="zoneId">
 						<el-select
 							class="filter-item"
@@ -56,8 +45,6 @@
 							<el-option v-for="val in getAllZoneList" :key="val.id" :label="val.name" :value="val.id"></el-option>
 						</el-select>
 					</el-form-item>
-					</el-col>
-					<el-col :span="5">
 					<el-form-item label="省份" prop="addrProvince">
 						<el-autocomplete
 							class="inline-input"
@@ -73,8 +60,6 @@
 					<!--:value="item.id"></el-option>-->
 					<!--</el-select>-->
 					<!--</el-form-item>-->
-					</el-col>
-					<el-col :span="5">
 					<el-form-item label="城市" prop="addrCity">
 						<el-autocomplete
 							class="inline-input"
@@ -90,8 +75,6 @@
 					<!--:value="item.id"></el-option>-->
 					<!--</el-select>-->
 					<!--</el-form-item>-->
-					</el-col>
-					<el-col :span="5">
 					<el-form-item label="车型" prop="modelId">
 						<el-autocomplete
 							class="inline-input"
@@ -101,7 +84,6 @@
 							@select="handleVehicleModelSelect"
 						></el-autocomplete>
 					</el-form-item>
-					</el-col>
 				</el-row>
 				<el-button
 					class="filter-item"
@@ -538,6 +520,16 @@
 							<el-input v-model="form.manufacturer" placeholder="请输入生产商"></el-input>
 						</el-form-item>
 					</el-col>
+					<el-col :span="12">
+						<el-form-item label="年审日期" prop="manufacturer">
+							<el-date-picker
+								v-model="form.annualVerificationDate"
+								type="date"
+								placeholder="选择日期"
+								style="width:100%"
+							></el-date-picker>
+						</el-form-item>
+					</el-col>
 				</el-row>
 
 				<p style="border-bottom:1px solid #bfcbd9;padding-bottom:10px">用途、位置及里程</p>
@@ -733,13 +725,7 @@
 					<!--</el-col>-->
 				</el-row>
 				<p style="border-bottom:1px solid #bfcbd9;padding-bottom:10px">其他</p>
-				<el-row>
-					<el-col :span="24">
-						<el-form-item label="备注" prop="remark">
-							<el-input type="textarea" :rows="5" v-model="form.remark" placeholder="请输入备注信息"></el-input>
-						</el-form-item>
-					</el-col>
-				</el-row>
+
 				<el-row>
 					<el-col :span="24">
 						<el-form-item label="行驶证" prop="drivingLicensePath" :style="{display:'block'}">
@@ -750,7 +736,7 @@
 								:headers="getHeaderWithToken"
 								:on-success="handleAvatarSuccess"
 								:before-upload="beforeAvatarUpload"
-								:style="{display:'block'}"
+								:style="{display:'inline-block'}"
 							>
 								<img
 									v-if="$utils.isString(form.drivingLicensePath) && !$utils.isEmpty(form.drivingLicensePath)"
@@ -758,11 +744,52 @@
 									class="avatar"
 									:style="{display:'block'}"
 								/>
-								<i v-else class="el-icon-plus avatar-uploader-icon" :style="{lineHeight:'350px'}"></i>
+								<i
+									v-else
+									class="el-icon-plus avatar-uploader-icon"
+									:style="{lineHeight:'350px'}"
+									style="position: relative;"
+								>
+									<br />
+									<span class="driving-title">行驶证正面</span>
+								</i>
+							</el-upload>
+
+							<el-upload
+								class="avatar-uploader"
+								:action="BASE_API + '/vehicle/vehicleInfo/upload/drivingLicense'"
+								:show-file-list="false"
+								:headers="getHeaderWithToken"
+								:on-success="handleAvatarSuccessF"
+								:before-upload="beforeAvatarUpload"
+								:style="{display:'inline-block'}"
+							>
+								<img
+									v-if="$utils.isString(form.drivingLicenseDuplicatePath) && !$utils.isEmpty(form.drivingLicenseDuplicatePath)"
+									:src="getDrivingLicenseUrl(form.drivingLicenseDuplicatePath)"
+									class="avatar"
+									:style="{display:'block'}"
+								/>
+								<i
+									v-else
+									class="el-icon-plus avatar-uploader-icon"
+									:style="{lineHeight:'350px'}"
+									style="position: relative;"
+								>
+									<br />
+									<span class="driving-title">行驶证副本</span>
+								</i>
 							</el-upload>
 						</el-form-item>
 					</el-col>
 				</el-row>
+				<el-row>
+					<el-col :span="24">
+						<el-form-item label="备注" prop="remark">
+							<el-input type="textarea" :rows="5" v-model="form.remark" placeholder="请输入备注信息"></el-input>
+						</el-form-item>
+					</el-col>
+				</el-row>
 			</el-form>
 			<div slot="footer" class="dialog-footer">
 				<el-button @click="cancel('form')">取 消</el-button>
@@ -1026,7 +1053,7 @@ export default {
 			showLoadingBody: false,
 			allVehicleList: [], //全部车型
 			form: {
-				insuranceEndDate:null,//商业险日期
+				insuranceEndDate: null, //商业险日期
 				vehicleModelName: '', //车型
 				subordinateBranchName: '', //所属分公司
 				subordinateBranch: undefined,
@@ -2404,6 +2431,10 @@ export default {
 			this.form.drivingLicensePath = res.data
 			this.showLoadingBody = false
 		},
+		handleAvatarSuccessF(res, file) {
+			this.form.drivingLicenseDuplicatePath = res.data
+			this.showLoadingBody = false
+		},
 		beforeAvatarUpload(file) {
 			const isJPG =
 				file.type === 'image/jpeg' || file.type === 'image/gif'
@@ -2415,7 +2446,7 @@ export default {
 			if (!isLt2M) {
 				this.$message.error('上传图片大小不能超过 10MB!')
 			}
-			this.showLoadingBody = true
+			// this.showLoadingBody = true
 			return isJPG && isLt2M
 		},
 		accItemSelected(selected) {
@@ -2584,7 +2615,8 @@ export default {
 				VEHICLE_CONSTANT_VEHICLE_BRAND,
 				code
 			)
-				? getConstantByTypeAndCode(VEHICLE_CONSTANT_VEHICLE_BRAND, code).val
+				? getConstantByTypeAndCode(VEHICLE_CONSTANT_VEHICLE_BRAND, code)
+						.val
 				: '品牌不存在'
 		},
 		getAllBranch: () => {
@@ -2598,7 +2630,8 @@ export default {
 				return '未知'
 			}
 			return getConstantByTypeAndCode(VEHICLE_CONSTANT_VEHICLE_USE, code)
-				? getConstantByTypeAndCode(VEHICLE_CONSTANT_VEHICLE_USE, code).val
+				? getConstantByTypeAndCode(VEHICLE_CONSTANT_VEHICLE_USE, code)
+						.val
 				: '用途未知'
 		},
 		getAllUseType: () => {
@@ -2635,7 +2668,6 @@ export default {
 				this.listQuery.belongToName = undefined
 			}
 
-			
 			page(listQueryTemp).then(response => {
 				if (response.code == 1) {
 					let totalCountRs = undefined
@@ -2651,7 +2683,7 @@ export default {
 					// 	})
 					// }
 					this.listLoading = false
-					console.log(response.data.data);
+					console.log(response.data.data)
 
 					this.list = response.data.data
 					this.total = response.data.totalCount
@@ -3020,11 +3052,12 @@ export default {
 				mileageLastUpdate: undefined,
 				//          receiveTime: undefined,
 				drivingLicensePath: undefined,
+				drivingLicenseDuplicatePath: undefined,
 				remark: undefined,
 				strongInsuranceEndDate: undefined,
 				strongInsuranceNo: undefined,
 				strongInsuranceCompany: undefined,
-				insuranceEndDate:null
+				insuranceEndDate: null
 			}
 		},
 		resetTemp4Apply() {
@@ -3059,3 +3092,11 @@ export default {
 	}
 }
 </script>
+<style>
+.driving-title {
+	position: absolute;
+	top: 34px;
+	left: 140px;
+	font-size: 14px;
+}
+</style>
\ No newline at end of file

src/views/vehicle/vehicleSchedulManage/index.vue

@@ -161,7 +161,7 @@
     <vehiclePlanModal v-if="anpai" :currentItem="currentItem" v-on:anpaiDialogEvent = "anpaiDialogEvent"></vehiclePlanModal>
     <!--租车详情弹框-->
     <!--rentOrder-->
-    <rentOrderDetailModal :form="rentOrderInfo" :rentCostDetail="rentCostDetail" v-if="rentOrder" v-on:rentOrderDetailDialogEvent="rentOrderDetailDialogEvent"></rentOrderDetailModal>
+    <rentOrderDetailModal :orderDetailInfo="orderDetailInfo"  v-if="rentOrder" v-on:rentOrderDetailDialogEvent="rentOrderDetailDialogEvent"></rentOrderDetailModal>
     <!--旅游订单详情-->
     <tourOrderDetailModal :tourRow="tourRow" v-if="tourDialogVisible" v-on:tourOrderDetailDialogEvent="tourOrderDetailDialogEvent"></tourOrderDetailModal>
     <!--禁用弹框-->
@@ -358,7 +358,8 @@
     getAll
   } from 'api/base_info/branch_company/';
   import {
-    getAllBranchCompanyByZoneId
+    getAllBranchCompanyByZoneId,
+    orderDetail
   } from 'api/order/rentVehicle';
   import {
     formatDate
@@ -460,7 +461,7 @@
         anpai: false,//安排用车弹框
         jinyong: false,//禁用弹框
         currentItem: {},//待操作数据
-        rentOrderInfo: {},//租车订单详情
+        orderDetailInfo: {},//租车订单详情
         rentCostDetail: {},//租车订单费用明细
         tourDialogVisible: false,//旅游订单弹框
         tourRow: {},//旅游订单详情-当前行
@@ -685,50 +686,58 @@
        * 根据订单号获取订单详情
        * */
       getOneVechi: function(orderNo) {
-        let params = {
-          orderNo: orderNo
-        };
-        getVehicleOrderDetail(params).then(res => {
-          if (res.status == 200) {
-            let a = res.data;
-            let vehicleUserLicenses = {};
-//            if (a.status == 5) {
-//              vehicleUserLicenses = {
-//                name: a.orderVehicleCrosstownDto.licenseName,
-//                phone: a.orderVehicleCrosstownDto.licensePhone,
-//                idCard: a.orderVehicleCrosstownDto.licenseIdCard
-//              };
-//            } else {
-//              if (a.vehicleUserLicenses.length > 0) {
-//                vehicleUserLicenses = a.vehicleUserLicenses[0];
-//              }
-//            }
-            a.orderRentVehicleDetail.startTime = timestamp2Date(a.orderRentVehicleDetail.startTime);
-            a.orderRentVehicleDetail.endTime = timestamp2Date(a.orderRentVehicleDetail.endTime);
-            let arr = a.picture ? a.picture.split(",") : [];
-            a.picture = arr.length > 0 ? arr[0] : "";
-            a.payTime = timestamp2Date(a.payTime);
-            this.rentOrderInfo = a;
+       	var param = {
+       		"orderNo":orderNo,
+       		"flag" : true
+       	}
+       	orderDetail(param).then(response => {
+       	this.orderDetailInfo = response.data
+       	if(this.orderDetailInfo && this.orderDetailInfo.memberLevel) {
+       		if(this.orderDetailInfo.memberLevel == 1) {
+       			this.orderDetailInfo.memberName = "普通会员"
+       		}
+       		if(this.orderDetailInfo.memberLevel == 2) {
+       			this.orderDetailInfo.memberName = "黄金会员"
+       		}
+       		if(this.orderDetailInfo.memberLevel == 3) {
+       			this.orderDetailInfo.memberName = "钻石会员"
+       		}
+       		if(this.orderDetailInfo.orderRentVehicleDetail.costDetail) {
+       				this.orderDetailInfo.costDetail = JSON.parse(this.orderDetailInfo.orderRentVehicleDetail.costDetail)
        				
-            this.costDetail = JSON.parse(this.rentOrderInfo.orderRentVehicleDetail.costDetail);
-            var cost = '';
-            this.costDetail.children.map(function(a) {
-              cost += a.key + ":" +a.detail+" ";
-            });
-            this.rentCostDetail = cost;
-            if(this.rentOrderInfo.orderRentVehicleDetail.driverType==1) {
-              this.serviceCost = this.rentOrderInfo.orderRentVehicleDetail.dayNum * 600
        		}
-            this.rentOrder = true;
-          } else {
-            this.$notify({
-              title: '失败',
-              message: '操作失败！',
-              type: 'error',
-              duration: 2000
-            });
+       		if(this.orderDetailInfo.costDetail.paramJson) {
+       				this.orderDetailInfo.rentVehiclePriceVO = JSON.parse(this.orderDetailInfo.costDetail.paramJson)
+       				
        		}
-        });
+       		if(this.orderDetailInfo.items) {
+       			for (var i = 0;i< this.orderDetailInfo.items.length;i++) {
+       				if(this.orderDetailInfo.items[i].type == 104) {
+       					this.orderDetailInfo.carArticlesJson = this.orderDetailInfo.items[i].detail
+       				}
+       			}
+       		}
+       		if (this.orderDetailInfo.status == 2) {
+       			this.orderDetailInfo.ststusName = '取消'
+       		}
+       		if (this.orderDetailInfo.status == -1) {
+       			this.orderDetailInfo.ststusName = '定损中'
+       		}
+       		if (this.orderDetailInfo.status == 3) {
+       			this.orderDetailInfo.ststusName = '待付款'
+       		}
+       		if (this.orderDetailInfo.status == 4) {
+       			this.orderDetailInfo.ststusName = '待出行'
+       		}
+       		if (this.orderDetailInfo.status == 5) {
+       			this.orderDetailInfo.ststusName = '出行中'
+       		}
+       		if (this.orderDetailInfo.status == 6) {
+       			this.orderDetailInfo.ststusName = '已完成'
+       		}
+       	}
+       	this.rentOrder = true
+       })
       },
       /**
        * 关闭保养弹框后逻辑处理

src/views/vehicleType/priceList.vue

@@ -366,15 +366,22 @@ export default {
 					}
 				})
 			}
-
 			if (params == '') {
-				this.$message.error('请设置不同车型不同价格4')
-				return false
+				add_edit('',this.activeTime).then(data => {
+					if (data.status == 200) {
+						this.$message.success('设置成功')
+						this.chooseData = []
+						this.getList()
+					} else {
+						this.$message.error(data.message)
+					}
+				})
 			} else {
-				add_edit(params).then(data => {
+				add_edit(params,this.activeTime).then(data => {
 					if (data.status == 200) {
 						this.$message.success('设置成功')
 						this.chooseData = []
+						this.changeIsGlobal(0)
 						this.getList()
 					} else {
 						this.$message.error(data.message)
@@ -398,8 +405,8 @@ export default {
 						data.data.forEach(element => {
 							element.multiple = element.multiple || ''
 							element.price = element.price || ''
-							element.level = element.level||''
-							element.freeDays = element.freeDays||''
+							element.level = element.level || ''
+							element.freeDays = element.freeDays || ''
 						})
 						this.dayListData = data.data
 						this.setMultiplePop = true