Skip to content

C
cloud-platform-ui
Commit fcc18186 authored by guoyou's avatar guoyou
Browse files
Options

租车订单管理增加订单id,车辆排班表详情修改

parent 00e321f0
Hide whitespace changes
Inline Side-by-side
Showing with 192 additions and 134 deletions
package-lock.json
View file @ fcc18186
......@@ -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
View file @ fcc18186
......@@ -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/main.js
View file @ fcc18186
......@@ -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
View file @ fcc18186
......@@ -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,60 +661,74 @@ export const asyncRouterMap = [{
authority: 'carApplyList'
}
]
},
{
path: '/xxOfficialWebsite',
component: Layout,
name: '欣新房车官网管理',
icon: 'setting',
authority: 'xxOfficialWebsite',
children: [
{
path: 'activityList',
component: _import('xxOfficialWebsite/activityList'),
name: '活动管理',
authority: 'activityList'
},
{
path: 'newsList',
component: _import('xxOfficialWebsite/newsList'),
name: '新闻管理',
authority: 'newsList'
},
{
path: 'bannerList',
component: _import('xxOfficialWebsite/bannerList'),
name: 'banner管理',
authority: 'bannerList'
},
{
path: 'seoList',
component: _import('xxOfficialWebsite/seoList'),
name: 'SEO管理',
authority: 'seoList'
},
{
path: 'friendLinkList',
component: _import('xxOfficialWebsite/friendLinkList'),
name: '友情连接',
authority: 'friendLinkList'
}
]
},
{
path: '/summit',
component: Layout,
name: '峰会管理',
icon: 'setting',
authority: 'summit',
children: [
{
path: 'summitList',
component: _import('summit/index'),
name: '峰会列表',
authority: 'summitList'
}
]
},
{
path: '/statistics',
component: Layout,
name: '数据统计',
icon: 'setting',
authority: 'statistics',
children: [
{
path: 'orderStatistics',
component: _import('statistics/orderStatistics'),
name: '订单统计',
authority: 'orderStatistics'
}
]
}
,
{
path: '/xxOfficialWebsite',
component: Layout,
name: '欣新房车官网管理',
icon: 'setting',
authority: 'xxOfficialWebsite',
children: [
{
path: 'activityList',
component: _import('xxOfficialWebsite/activityList'),
name: '活动管理',
authority: 'activityList'
},
{
path: 'newsList',
component: _import('xxOfficialWebsite/newsList'),
name: '新闻管理',
authority: 'newsList'
},
{
path: 'bannerList',
component: _import('xxOfficialWebsite/bannerList'),
name: 'banner管理',
authority: 'bannerList'
},
{
path: 'seoList',
component: _import('xxOfficialWebsite/seoList'),
name: 'SEO管理',
authority: 'seoList'
},
{
path: 'friendLinkList',
component: _import('xxOfficialWebsite/friendLinkList'),
name: '友情连接',
authority: 'friendLinkList'
}
]
},
{
path: '/summit',
component: Layout,
name: '峰会管理',
icon: 'setting',
authority: 'summit',
children: [
{
path: 'summitList',
component: _import('summit/index'),
name: '峰会列表',
authority: 'summitList'
}
]
}
];
src/views/order/modal/rentOrderDetailModal.vue
View file @ fcc18186
......@@ -33,7 +33,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="会员等级/身份:">
<span v-if='form.memberName'>{{form.memberName}}/{{form. jobTitle}}</span>
<span v-if="form.memberName">{{form.memberName}}/{{form. jobTitle}}</span>
<span v-else>无</span>
</el-form-item>
</el-col>
......@@ -108,7 +108,11 @@
<th>专职司机服务费</th>
</tr>
<tr>
<td>{{form.name}}{{form.vehicleNumberPlat}}<span v-if="form.vehicleCode">({{form.vehicleCode}})</span><span v-else></span></td>
<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>
......@@ -117,31 +121,19 @@
<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>
<p v-else>
{{orderInfo('免费天数')}}
<span v-if="form.rentVehiclePriceVO.freeDayNum == 0">无</span>
<span v-else>会员特权{{form.rentVehiclePriceVO.freeDayNum}}天</span>
</p>
<p v-else>{{orderInfo('免费天数')}}</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="form.rentVehiclePriceVO && form.rentVehiclePriceVO.vehicleDayNum > 0"
>¥{{form.rentVehiclePriceVO.modelAmount}}*{{form.rentVehiclePriceVO.vehicleNum}}/{{form.rentVehiclePriceVO.vehicleDayNum}}天</p>
<p v-else>{{orderInfo('车辆租赁费')}}</p>
</td>
<td>
......@@ -154,28 +146,20 @@
<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="form.rentVehiclePriceVO && form.rentVehiclePriceVO.damageSafeAmount > 0"
>¥{{form.rentVehiclePriceVO.damageSafePrice}}/{{form.rentVehiclePriceVO.dayNum}}天</p>
<p v-else>{{orderInfo('不计免赔')}}</p>
</td>
<td>
<p v-if='form.rentVehiclePriceVO'>
{{form.rentVehiclePriceVO.deposit}}
</p>
<p v-else>
{{orderInfo('租房车押金')}}
</p>
<p v-if="form.rentVehiclePriceVO">{{form.rentVehiclePriceVO.deposit}}</p>
<p v-else>{{orderInfo('租房车押金')}}</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="form.rentVehiclePriceVO && form.rentVehiclePriceVO.driverAmount > 0"
>¥{{form.rentVehiclePriceVO.driverPrice}}*{{form.rentVehiclePriceVO.driverNum}}/{{form.rentVehiclePriceVO.dayNum}}天</p>
<p v-else>{{orderInfo('专职司机服务费')}}</p>
</td>
</tr>
<tr>
......@@ -192,17 +176,21 @@
@click="resetReturn = true"
>更换</el-button>
</td>
<td colspan="6">{{form.payWay == 1 ? '微信支付' : form.payWay == 2 ? '支付宝支付' : form.payWay == 3 ? '银联支付' : '微信支付'}} 共计:￥{{form.realAmount}}</td>
<td
colspan="6"
>{{form.payWay == 1 ? '微信支付' : form.payWay == 2 ? '支付宝支付' : form.payWay == 3 ? '银联支付' : '微信支付'}} 共计:￥{{form.realAmount}}</td>
</tr>
</table>
<p>
<b>额外随车物品:</b>
<span
v-for="(item,index) in JSON.parse(this.form.carArticlesJson)"
:key="index"
style="margin-right:10px"
>{{item.name || '无'}}</span>
<span v-if="this.form.carArticlesJson">
<span
v-for="(item,index) in JSON.parse(this.form.carArticlesJson)"
:key="index"
style="margin-right:10px"
>{{item.name || '无'}}</span>
</span>
</p>
<p>
<b>内部邀请人:</b>
......@@ -321,7 +309,6 @@ export default {
}
},
mounted() {
this.dialogVisible = true
if (this.form.status == 2) {
this.form.ststusName = '取消'
......@@ -341,13 +328,13 @@ export default {
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()
......@@ -495,7 +482,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
View file @ fcc18186
......@@ -113,11 +113,11 @@
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>
</template>
</el-table-column>-->
</el-table-column>
<el-table-column width="200" align="center" label="订单号/下单时间">
<template scope="scope">
<span>{{scope.row.no}}</span>
......
src/views/statistics/orderStatistics.vue 0 → 100644
View file @ fcc18186
<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/vehicle/vehicleSchedulManage/index.vue
View file @ fcc18186
......@@ -358,7 +358,8 @@
getAll
} from 'api/base_info/branch_company/';
import {
getAllBranchCompanyByZoneId
getAllBranchCompanyByZoneId,
page
} from 'api/order/rentVehicle';
import {
formatDate
......@@ -686,11 +687,11 @@
* */
getOneVechi: function(orderNo) {
let params = {
orderNo: orderNo
oneNo: orderNo
};
getVehicleOrderDetail(params).then(res => {
page(params).then(res => {
if (res.status == 200) {
let a = res.data;
let a = res.data.data[0];
let vehicleUserLicenses = {};
// if (a.status == 5) {
// vehicleUserLicenses = {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment