Skip to content

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

提现记录审核

parents 151e1a56 77bd3db7
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 871 additions and 658 deletions
.gitignore
View file @ 56f7ca0c
...@@ -11,3 +11,4 @@ selenium-debug.log ...@@ -11,3 +11,4 @@ selenium-debug.log
config/** config/**
**/dev.env.js **/dev.env.js
/*.json /*.json
package-lock.json
View file @ 56f7ca0c
...@@ -295,11 +295,7 @@ ...@@ -295,11 +295,7 @@
}, },
"async-validator": { "async-validator": {
"version": "1.6.9", "version": "1.6.9",
<<<<<<< HEAD
"resolved": "https://registry.npm.taobao.org/async-validator/download/async-validator-1.6.9.tgz", "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=" "integrity": "sha1-qDCdqouDQhzb1GKOAm1quyUZLTQ="
}, },
"asynckit": { "asynckit": {
...@@ -2884,13 +2880,28 @@ ...@@ -2884,13 +2880,28 @@
} }
}, },
"echarts": { "echarts": {
"version": "3.6.2", "version": "3.8.5",
"resolved": "https://registry.npm.taobao.org/echarts/download/echarts-3.6.2.tgz", "resolved": "https://registry.npmjs.org/echarts/-/echarts-3.8.5.tgz",
"integrity": "sha1-hilUyLWBC/+HpIsN4EFu2MS7HDY=", "integrity": "sha512-E+nnROMfCeiLeoT/fZyX8SE8mKzwkTjyemyoBF543oqjRtjTSKQAVDEihMXy4oC6pJS0tYGdMqCA2ATk8onyRg==",
"requires": { "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": { "editorconfig": {
"version": "0.13.3", "version": "0.13.3",
"resolved": "https://registry.npm.taobao.org/editorconfig/download/editorconfig-0.13.3.tgz", "resolved": "https://registry.npm.taobao.org/editorconfig/download/editorconfig-0.13.3.tgz",
...@@ -2942,11 +2953,7 @@ ...@@ -2942,11 +2953,7 @@
"element-ui": { "element-ui": {
"version": "1.4.1", "version": "1.4.1",
"resolved": "https://registry.npmjs.org/element-ui/-/element-ui-1.4.1.tgz", "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-1.4.1.tgz",
<<<<<<< HEAD
"integrity": "sha1-9EccrbQ9x3nDCY3HNjSuqU0D8lU=", "integrity": "sha1-9EccrbQ9x3nDCY3HNjSuqU0D8lU=",
=======
"integrity": "sha512-4jZu41iMuV8Semz0MG7nd8HIicyXlMJY923NvuIXoM3Q3llnwpwBVBqaPAgL3VrRnwzLKxyR/GjxxQDBqf/bvQ==",
>>>>>>> base-modify
"requires": { "requires": {
"async-validator": "1.6.9", "async-validator": "1.6.9",
"babel-helper-vue-jsx-merge-props": "^2.0.0", "babel-helper-vue-jsx-merge-props": "^2.0.0",
...@@ -7347,6 +7354,11 @@ ...@@ -7347,6 +7354,11 @@
"resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" "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": { "oauth-sign": {
"version": "0.9.0", "version": "0.9.0",
"resolved": "https://registry.npm.taobao.org/oauth-sign/download/oauth-sign-0.9.0.tgz", "resolved": "https://registry.npm.taobao.org/oauth-sign/download/oauth-sign-0.9.0.tgz",
...@@ -11261,6 +11273,11 @@ ...@@ -11261,6 +11273,11 @@
"integrity": "sha1-ihagXURWV6Oupe7MWxKk+lN5dyw=", "integrity": "sha1-ihagXURWV6Oupe7MWxKk+lN5dyw=",
"dev": true "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": { "utils-merge": {
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npm.taobao.org/utils-merge/download/utils-merge-1.0.1.tgz", "resolved": "https://registry.npm.taobao.org/utils-merge/download/utils-merge-1.0.1.tgz",
...@@ -11272,6 +11289,18 @@ ...@@ -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", "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=" "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": { "v-viewer": {
"version": "1.4.2", "version": "1.4.2",
"resolved": "https://registry.npmjs.org/v-viewer/-/v-viewer-1.4.2.tgz", "resolved": "https://registry.npmjs.org/v-viewer/-/v-viewer-1.4.2.tgz",
...@@ -12140,9 +12169,9 @@ ...@@ -12140,9 +12169,9 @@
} }
}, },
"zrender": { "zrender": {
"version": "3.6.3", "version": "3.7.4",
"resolved": "https://registry.npm.taobao.org/zrender/download/zrender-3.6.3.tgz", "resolved": "https://registry.npmjs.org/zrender/-/zrender-3.7.4.tgz",
"integrity": "sha1-46BroQXMRes2SSqBjnt66HmnsVs=" "integrity": "sha512-5Nz7+L1wIoL0+Pp/iOP56jD6eD017qC9VRSgUBheXBiAHgOBJZ4uh4/g6e83acIwa8RKSyZf/FlceKu5ntUuxQ=="
} }
} }
} }
package.json
View file @ 56f7ca0c
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
"axios": "0.16.2", "axios": "0.16.2",
"codemirror": "5.26.0", "codemirror": "5.26.0",
"dropzone": "5.1.0", "dropzone": "5.1.0",
"echarts": "3.6.2", "echarts": "^3.8.5",
"element-ui": "^1.4.1", "element-ui": "^1.4.1",
"file-saver": "1.3.3", "file-saver": "1.3.3",
"jquery": "^3.4.0", "jquery": "^3.4.0",
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
"showdown": "1.7.1", "showdown": "1.7.1",
"simplemde": "1.11.2", "simplemde": "1.11.2",
"sortablejs": "1.5.1", "sortablejs": "1.5.1",
"v-charts": "^1.19.0",
"v-viewer": "^1.4.2", "v-viewer": "^1.4.2",
"vue": "2.4.2", "vue": "2.4.2",
"vue-baidu-map": "^0.21.19", "vue-baidu-map": "^0.21.19",
......
src/api/order/rentVehicle.js
View file @ 56f7ca0c
import fetch from 'utils/fetch'; import fetch from 'utils/fetch';
//获取租车订单
export function page(query) { export function page(query) {
return fetch({ return fetch({
url: '/api/order/baseOrder/getOrderList', url: '/api/order/baseOrder/getAll',
method: 'get', method: 'get',
params:query params: query
}); });
} }
//获取旅游订单
export function getOrderList(query) {
return fetch({
url: '/api/order/baseOrder/getOrderList',
method: 'get',
params: query
});
}
/** /**
* 获取所有分公司 * 获取所有分公司
*/ */
export function getAllBranchCompany() { export function getAllBranchCompany() {
return fetch({ return fetch({
url: '/vehicle/branchCompany', url: '/vehicle/branchCompany',
method: 'get' method: 'get'
}); });
} }
//根据大区Id获取分公司列表 //根据大区Id获取分公司列表
export function getAllBranchCompanyByZoneId(query) { export function getAllBranchCompanyByZoneId(query) {
return fetch({ return fetch({
url: '/vehicle/branchCompany/app/unauth/getByZone', url: '/vehicle/branchCompany/app/unauth/getByZone',
method: 'get', method: 'get',
params:query params: query
}); });
} }
export function getOrderVehicleCrosstown(query) { export function getOrderVehicleCrosstown(query) {
return fetch({ return fetch({
url: '/api/order/orderVehicle/getByOrderId', url: '/api/order/orderVehicle/getByOrderId',
method: 'get', method: 'get',
params:query params: query
}); });
} }
/** /**
...@@ -39,10 +47,10 @@ export function getOrderVehicleCrosstown(query) { ...@@ -39,10 +47,10 @@ export function getOrderVehicleCrosstown(query) {
* @param query * @param query
*/ */
export function getOneIllegalRow(id) { export function getOneIllegalRow(id) {
return fetch({ return fetch({
url: '/api/order/orderViolation/getOne/' + id, url: '/api/order/orderViolation/getOne/' + id,
method: 'get' method: 'get'
}); });
} }
/** /**
...@@ -54,11 +62,11 @@ detailId:租车订单id ...@@ -54,11 +62,11 @@ detailId:租车订单id
} }
*/ */
export function saveOrderViolation(params) { export function saveOrderViolation(params) {
return fetch({ return fetch({
url: '/api/order/orderViolation/saveOrderViolation', url: '/api/order/orderViolation/saveOrderViolation',
method: 'post', method: 'post',
data: params data: params
}); });
} }
/** /**
...@@ -66,36 +74,36 @@ export function saveOrderViolation(params) { ...@@ -66,36 +74,36 @@ export function saveOrderViolation(params) {
* @param query * @param query
*/ */
export function getStep(orderNo) { export function getStep(orderNo) {
return fetch({ return fetch({
url: '/api/order/orderVehicle/getByOrderId?orderNo=' + orderNo, url: '/api/order/orderVehicle/getByOrderId?orderNo=' + orderNo,
method: 'get' method: 'get'
}); });
} }
export function inquire(query) { export function inquire(query) {
return fetch({ return fetch({
url: '/vehicle/vehicleInfo/rent/back-stage/usable-vehicle', url: '/vehicle/vehicleInfo/rent/back-stage/usable-vehicle',
method: 'get', method: 'get',
params:query params: query
}); });
} }
//创建订单 //创建订单
export function addIndent(params) { export function addIndent(params) {
return fetch({ return fetch({
url: '/api/order/orderRentVehicle/back-stage/add', url: '/api/order/orderRentVehicle/back-stage/add',
method: 'post', method: 'post',
data:params data: params
}); });
} }
//删除订单 //删除订单
export function calculate(no, params) { export function calculate(no, params) {
return fetch({ return fetch({
url: '/api/order/baseOrder/back-stage/cancel/'+ no, url: '/api/order/baseOrder/back-stage/cancel/' + no,
method: 'post', method: 'post',
data:params data: params
}); });
} }
/** /**
...@@ -103,54 +111,63 @@ export function calculate(no, params) { ...@@ -103,54 +111,63 @@ export function calculate(no, params) {
* @param {Object} params计算违约价格 * @param {Object} params计算违约价格
*/ */
export function getViolatePrice(no) { export function getViolatePrice(no) {
return fetch({ return fetch({
url: '/api/order/orderRefund/bg-stage/getViolatePrice/'+ no, url: '/api/order/orderRefund/bg-stage/getViolatePrice/' + no,
method: 'get', method: 'get',
}); });
} }
//创建订单 //创建订单
export function orderStatistics(params) { export function orderStatistics(params) {
return fetch({ return fetch({
url: 'api/order/orderStatistics/order', url: 'api/order/orderStatistics/order',
method: 'post', method: 'post',
data:params data: params
}); });
} }
//订单下载 //订单下载
export function downloadExcel(params) { export function downloadExcel(params) {
return fetch({ return fetch({
url: '/api/order/orderStatistics/excel', url: '/api/order/orderStatistics/excel',
method: 'post', method: 'post',
data: params, data: params,
responseType: 'blob' responseType: 'blob'
}); });
} }
//会员订单管理列表 //会员订单管理列表
export function pageList(params) { export function pageList(params) {
return fetch({ return fetch({
url: '/api/order/orderMember/page', url: '/api/order/orderMember/page',
method: 'post', method: 'post',
data: params data: params
}); });
} }
//会员订单管理导出 //会员订单管理导出
export function orderMemberExcel(params) { export function orderMemberExcel(params) {
return fetch({ return fetch({
url: '/api/order/orderMember/export', url: '/api/order/orderMember/export',
method: 'post', method: 'post',
data: params, data: params,
responseType: 'blob' responseType: 'blob'
}); });
} }
//用户信息 //用户信息
export function user_info(id) { export function user_info(id) {
return fetch({ return fetch({
url: '/api/admin/appUsersManage/user_info/' + id, url: '/api/admin/appUsersManage/user_info/' + id,
method: 'get' method: 'get'
}); });
} }
\ No newline at end of file
//获取订单详情
export function orderDetail(query) {
return fetch({
url: '/api/order/baseOrder/orderDetail',
method: 'get',
params: query
});
}
src/api/vehicleType.js
View file @ 56f7ca0c
...@@ -191,10 +191,13 @@ export function dayList(day) { ...@@ -191,10 +191,13 @@ export function dayList(day) {
} }
// 日历价格设置 // 日历价格设置
export function add_edit(params) { export function add_edit(params, date) {
return fetch({ return fetch({
url: '/vehicle/admin/vehicle_model/calendar_price/add_edit', url: '/vehicle/admin/vehicle_model/calendar_price/add_edit/' + date,
method: 'post', method: 'post',
headers: {
'Content-Type': 'application/json;charset=UTF-8'
},
data: params data: params
}); });
} }
......
src/main.js
View file @ 56f7ca0c
...@@ -14,7 +14,7 @@ import 'assets/iconfont/iconfont'; // iconfont 具体图标见https://github.com ...@@ -14,7 +14,7 @@ import 'assets/iconfont/iconfont'; // iconfont 具体图标见https://github.com
import * as filters from './filters'; // 全局vue filter import * as filters from './filters'; // 全局vue filter
import Multiselect from 'vue-multiselect';// 使用的一个多选框组件，element-ui的select不能满足所有需求 import Multiselect from 'vue-multiselect';// 使用的一个多选框组件，element-ui的select不能满足所有需求
import 'vue-multiselect/dist/vue-multiselect.min.css';// 多选框组件css 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 Sticky from 'components/Sticky'; // 粘性header组件
import IconSvg from 'components/Icon-svg';// svg 组件 import IconSvg from 'components/Icon-svg';// svg 组件
import vueWaves from './directive/waves';// 水波纹指令 import vueWaves from './directive/waves';// 水波纹指令
...@@ -71,6 +71,8 @@ Vue.use(Viewer, { ...@@ -71,6 +71,8 @@ Vue.use(Viewer, {
zIndex: 9999 zIndex: 9999
} }
}) })
import VCharts from 'v-charts'
Vue.use(VCharts)
// register globally // register globally
Vue.component('multiselect', Multiselect); Vue.component('multiselect', Multiselect);
Vue.component('Sticky', Sticky); Vue.component('Sticky', Sticky);
......
src/router/index.js
View file @ 56f7ca0c
...@@ -551,9 +551,9 @@ export const asyncRouterMap = [{ ...@@ -551,9 +551,9 @@ export const asyncRouterMap = [{
authority: 'memberEnter' authority: 'memberEnter'
}, },
{ {
path:'imCustomerServiceManger', path: 'imCustomerServiceManger',
component: _import('userManagement/imCustomerServiceManger/cusomterServiceList'), component: _import('userManagement/imCustomerServiceManger/cusomterServiceList'),
name:'客服列表', name: '客服列表',
authority: 'imCustomerServiceManger' authority: 'imCustomerServiceManger'
},{ },{
path: 'employeesInput', path: 'employeesInput',
...@@ -661,60 +661,74 @@ export const asyncRouterMap = [{ ...@@ -661,60 +661,74 @@ export const asyncRouterMap = [{
authority: 'carApplyList' 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/cunponManagements/conponList.vue
View file @ 56f7ca0c
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
</el-table-column> </el-table-column>
<el-table-column align="center" label="过期时间"> <el-table-column align="center" label="过期时间">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.expireTimeStr}}</span> <span>{{scope.row.validType == 3 ? '永久' : scope.row.expireTimeStr}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="状态"> <el-table-column align="center" label="状态">
......
src/views/discoveryModule/clapIndex.vue
View file @ 56f7ca0c
...@@ -54,9 +54,9 @@ ...@@ -54,9 +54,9 @@
</el-form> </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 icon="search" @click="handleFilter">搜索</el-button>
<el-button class="filter-item" type="primary" v-waves @click="reloadPage">重置</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">添加 type="primary" icon="edit">添加
</el-button> </el-button> -->
</div> </div>
<el-table :key='tableKey' :data="list" border fit highlight-current-row <el-table :key='tableKey' :data="list" border fit highlight-current-row
style="width: 100%"> style="width: 100%">
...@@ -95,6 +95,11 @@ ...@@ -95,6 +95,11 @@
<span>{{scope.row.count?scope.row.count.comment:0}}</span> <span>{{scope.row.count?scope.row.count.comment:0}}</span>
</template> </template>
</el-table-column> </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="来源"> <el-table-column width="100" align="center" label="来源">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.source == 1? '后台创建':'app用户'}}</span> <span>{{scope.row.source == 1? '后台创建':'app用户'}}</span>
...@@ -104,7 +109,7 @@ ...@@ -104,7 +109,7 @@
<template scope="scope"> <template scope="scope">
<el-button size="small" class="el-button el-button--text el-button--small" @click="handleUpdate(scope.row)">编辑 <el-button size="small" class="el-button el-button--text el-button--small" @click="handleUpdate(scope.row)">编辑
</el-button> </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>
<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 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> </el-button>
...@@ -664,17 +669,17 @@ ...@@ -664,17 +669,17 @@
params.praise = this.listQuery.praise?this.listQuery.praise:undefined; params.praise = this.listQuery.praise?this.listQuery.praise:undefined;
if(this.listQuery.startTime && (typeof this.listQuery.startTime == "object")){ 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")){ 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 => { page(params).then(response => {
let totalCountRs = undefined; let totalCountRs = undefined;
let listRs = undefined; let listRs = undefined;
if (!this.$utils.isEmpty(response.data.list) && this.$utils.isInteger(response.data.total)) { if (!this.$utils.isEmpty(response.data.list) && this.$utils.isInteger(response.data.total)) {
response.data.list.map(function(item){ response.data.list.map(function(item){
item.body.timeStr = timestamp2Date(item.body.time);
}); });
listRs = response.data.list; listRs = response.data.list;
totalCountRs = response.data.total; totalCountRs = response.data.total;
......
src/views/discoveryModule/questionsAndAnswers.vue
View file @ 56f7ca0c
...@@ -54,9 +54,9 @@ ...@@ -54,9 +54,9 @@
</el-form> </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 icon="search" @click="handleFilter">搜索</el-button>
<el-button class="filter-item" type="primary" v-waves @click="reloadPage">重置</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">添加 type="primary" icon="edit">添加
</el-button> </el-button> -->
</div> </div>
<el-table :key='tableKey' :data="list" border fit highlight-current-row <el-table :key='tableKey' :data="list" border fit highlight-current-row
style="width: 100%"> style="width: 100%">
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
<template scope="scope"> <template scope="scope">
<el-button size="small" class="el-button el-button--text el-button--small" @click="handleUpdate(scope.row)">编辑 <el-button size="small" class="el-button el-button--text el-button--small" @click="handleUpdate(scope.row)">编辑
</el-button> </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>
<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 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> </el-button>
......
src/views/discoveryModule/shortVideo.vue
View file @ 56f7ca0c
...@@ -54,9 +54,9 @@ ...@@ -54,9 +54,9 @@
</el-form> </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 icon="search" @click="handleFilter">搜索</el-button>
<el-button class="filter-item" type="primary" v-waves @click="reloadPage">重置</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">添加 type="primary" icon="edit">添加
</el-button> </el-button> -->
</div> </div>
<el-table :key='tableKey' :data="list" border fit highlight-current-row <el-table :key='tableKey' :data="list" border fit highlight-current-row
style="width: 100%"> style="width: 100%">
...@@ -95,6 +95,11 @@ ...@@ -95,6 +95,11 @@
<span>{{scope.row.count?scope.row.count.comment:0}}</span> <span>{{scope.row.count?scope.row.count.comment:0}}</span>
</template> </template>
</el-table-column> </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="来源"> <el-table-column width="100" align="center" label="来源">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.source == 1? '后台创建':'app用户'}}</span> <span>{{scope.row.source == 1? '后台创建':'app用户'}}</span>
...@@ -104,7 +109,7 @@ ...@@ -104,7 +109,7 @@
<template scope="scope"> <template scope="scope">
<el-button size="small" class="el-button el-button--text el-button--small" @click="handleUpdate(scope.row)">编辑 <el-button size="small" class="el-button el-button--text el-button--small" @click="handleUpdate(scope.row)">编辑
</el-button> </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>
<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 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> </el-button>
...@@ -652,17 +657,17 @@ ...@@ -652,17 +657,17 @@
params.praise = this.listQuery.praise?this.listQuery.praise:undefined; params.praise = this.listQuery.praise?this.listQuery.praise:undefined;
if(this.listQuery.startTime && (typeof this.listQuery.startTime == "object")){ 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")){ 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 => { page(params).then(response => {
let totalCountRs = undefined; let totalCountRs = undefined;
let listRs = undefined; let listRs = undefined;
if (!this.$utils.isEmpty(response.data.list) && this.$utils.isInteger(response.data.total)) { if (!this.$utils.isEmpty(response.data.list) && this.$utils.isInteger(response.data.total)) {
response.data.list.map(function(item){ response.data.list.map(function(item){
item.body.timeStr = timestamp2Date(item.body.time);
}); });
listRs = response.data.list; listRs = response.data.list;
totalCountRs = response.data.total; totalCountRs = response.data.total;
......
src/views/order/rentVehicleInfo/index.vue
View file @ 56f7ca0c
This diff is collapsed.
src/views/order/tourOrderInfo/index.vue
View file @ 56f7ca0c
...@@ -156,6 +156,7 @@ ...@@ -156,6 +156,7 @@
import tourOrderDetailModal from "../modal/tourOrderDetailModal";//租车订单详情 import tourOrderDetailModal from "../modal/tourOrderDetailModal";//租车订单详情
import { import {
page, page,
getOrderList,
getAllBranchCompany, getAllBranchCompany,
getAllBranchCompanyByZoneId, getAllBranchCompanyByZoneId,
calculate, calculate,
...@@ -173,6 +174,7 @@ ...@@ -173,6 +174,7 @@
formatDate formatDate
} from '../../../utils/dateFormattor'; } from '../../../utils/dateFormattor';
import {getAllCompany } from 'api/base_info/branch_company'
export default { export default {
name: 'branchCompanyStock', name: 'branchCompanyStock',
components: { components: {
...@@ -348,6 +350,9 @@ ...@@ -348,6 +350,9 @@
} }
} }
this.getList(); this.getList();
getAllCompany(codeAndBranchCompany => {
this.allBranchCompany = codeAndBranchCompany;
});
this.btn_del = this.elements['branchCompany/stockApply:btn_delete']; this.btn_del = this.elements['branchCompany/stockApply:btn_delete'];
}, },
computed: { computed: {
...@@ -524,11 +529,11 @@ ...@@ -524,11 +529,11 @@
getProvinceRegions(item) { getProvinceRegions(item) {
this.listQuery.zoneId = item this.listQuery.zoneId = item
this.baranchQuery.zoneId = item this.baranchQuery.zoneId = item
this.listQuery.startCompanyId = undefined; // this.listQuery.startCompanyId = undefined;
getAllBranchCompanyByZoneId(this.baranchQuery) // getAllBranchCompanyByZoneId(this.baranchQuery)
.then(response => { // .then(response => {
this.allBranchCompany = response.data; // this.allBranchCompany = response.data;
}) // })
}, },
getAllBranchCompanyChange(item) { getAllBranchCompanyChange(item) {
this.listQuery.startCompanyId = item this.listQuery.startCompanyId = item
...@@ -610,7 +615,7 @@ ...@@ -610,7 +615,7 @@
if(this.listQuery){ if(this.listQuery){
localStorage.setItem("tourOrderInfo", JSON.stringify(this.listQuery)); localStorage.setItem("tourOrderInfo", JSON.stringify(this.listQuery));
} }
page(this.listQuery) getOrderList(this.listQuery)
.then(response => { .then(response => {
this.list = response.data.data; this.list = response.data.data;
this.total = response.data.totalCount; this.total = response.data.totalCount;
......
src/views/purseManage/discountRecord.vue
View file @ 56f7ca0c
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
</el-table-column> </el-table-column>
<el-table-column align="center" label="收款账号"> <el-table-column align="center" label="收款账号">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.accountNumber}}</span> <span>{{scope.row.accountName}}</span>
</template> </template>
</el-table-column> </el-table-column>
......
src/views/statistics/orderStatistics.vue 0 → 100644
View file @ 56f7ca0c
<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
View file @ 56f7ca0c
...@@ -226,17 +226,17 @@ ...@@ -226,17 +226,17 @@
<el-row> <el-row>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="注册终端:"> <el-form-item label="注册终端:">
<span>{{userDetails.channel}}</span> <span>{{userDetails.channel == 1 ? 'app' : '小程序'}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="注册时间:"> <el-form-item label="注册时间:">
<span>{{userDetails.createTime}}</span> <span>{{!!userDetails.createTime ? timestamp(new Date(userDetails.createTime*1000)) : ''}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="9"> <el-col :span="9">
<el-form-item label="最近登录时间:"> <el-form-item label="最近登录时间:">
<span>{{userDetails.lastTime}}</span> <span>{{!!userDetails.lastTime ? timestamp(new Date(userDetails.lastTime)): ''}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -261,7 +261,7 @@ ...@@ -261,7 +261,7 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="性别: "> <el-form-item label="性别: ">
<span>{{userDetails.sex}}</span> <span>{{userDetails.sex == 1 ? '女' : '男'}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -276,17 +276,17 @@ ...@@ -276,17 +276,17 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="有效期:"> <el-form-item label="有效期:">
<span>{{userDetails.validTime}}</span> <span>{{userDetails.validTime == '0' ? '永久' : '无'}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="充值次数:"> <el-form-item label="充值次数:">
<span>{{userDetails.buyCount}}次</span> <span>{{!!userDetails.buyCount ? userDetails.buyCount+'次' : ''}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="加入时间:"> <el-form-item label="加入时间:">
<span>{{userDetails.timeOfMembership}}</span> <span>{{!!userDetails.timeOfMembership ? timestamp(new Date(userDetails.timeOfMembership)) :''}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -314,7 +314,7 @@ ...@@ -314,7 +314,7 @@
<el-row> <el-row>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="来源:"> <el-form-item label="来源:">
<span>{{userDetails.source}}</span> <span>{{userDetails.source == 0 ? '自来' : '用户邀请'}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
...@@ -905,6 +905,21 @@ ...@@ -905,6 +905,21 @@
this.setPop = true; this.setPop = true;
this.activeId = val.userId; 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(){ setHeighterBtn(){
if (!!this.phone) { if (!!this.phone) {
...@@ -1152,7 +1167,6 @@ ...@@ -1152,7 +1167,6 @@
this.detailsDialogFormVisible = true this.detailsDialogFormVisible = true
this.getBoolean(this.userDetails.certificationStatus) this.getBoolean(this.userDetails.certificationStatus)
}) })
} }
, ,
/** /**
......
src/views/vehicle/bookRecord/index.vue
View file @ 56f7ca0c
...@@ -253,13 +253,13 @@ ...@@ -253,13 +253,13 @@
@click="illegalInquiry(scope.row)" @click="illegalInquiry(scope.row)"
>违章记录</el-button> >违章记录</el-button>
<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" size="small"
class="el-button el-button--text el-button--small" class="el-button el-button--text el-button--small"
@click="handleProve(scope.row)" @click="handleProve(scope.row)"
>通过</el-button> >通过</el-button>
<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" size="small"
class="el-button el-button--text el-button--small" class="el-button el-button--text el-button--small"
style="color: red;" style="color: red;"
...@@ -267,7 +267,7 @@ ...@@ -267,7 +267,7 @@
>驳回</el-button> >驳回</el-button>
<template v-if="scope.row.vehicleDepartureLogVo==undefined"> <template v-if="scope.row.vehicleDepartureLogVo==undefined">
<el-button <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" size="small"
class="el-button el-button--text el-button--small" class="el-button el-button--text el-button--small"
@click="handleLift(scope.row)" @click="handleLift(scope.row)"
...@@ -275,7 +275,7 @@ ...@@ -275,7 +275,7 @@
</template> </template>
<template v-if="scope.row.vehicleDepartureLogVo!=undefined"> <template v-if="scope.row.vehicleDepartureLogVo!=undefined">
<el-button <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" size="small"
class="el-button el-button--text el-button--small" class="el-button el-button--text el-button--small"
@click="handleRet(scope.row)" @click="handleRet(scope.row)"
...@@ -283,7 +283,7 @@ ...@@ -283,7 +283,7 @@
</template> </template>
<template v-if="scope.row.vehicleDepartureLogVo==undefined"> <template v-if="scope.row.vehicleDepartureLogVo==undefined">
<el-button <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" size="small"
class="el-button el-button--text el-button--small" class="el-button el-button--text el-button--small"
style="color: red;" style="color: red;"
...@@ -1942,4 +1942,8 @@ ...@@ -1942,4 +1942,8 @@
background: #000; background: #000;
z-index: 2001; z-index: 2001;
} }
.voucher{
width: 100px;
height: 100px;
}
</style> </style>
src/views/vehicle/vehicleInfo/index.vue
View file @ 56f7ca0c
This diff is collapsed.
src/views/vehicle/vehicleSchedulManage/index.vue
View file @ 56f7ca0c
...@@ -161,7 +161,7 @@ ...@@ -161,7 +161,7 @@
<vehiclePlanModal v-if="anpai" :currentItem="currentItem" v-on:anpaiDialogEvent = "anpaiDialogEvent"></vehiclePlanModal> <vehiclePlanModal v-if="anpai" :currentItem="currentItem" v-on:anpaiDialogEvent = "anpaiDialogEvent"></vehiclePlanModal>
<!--租车详情弹框--> <!--租车详情弹框-->
<!--rentOrder--> <!--rentOrder-->
<rentOrderDetailModal :form="rentOrderInfo" :rentCostDetail="rentCostDetail" v-if="rentOrder" v-on:rentOrderDetailDialogEvent="rentOrderDetailDialogEvent"></rentOrderDetailModal> <rentOrderDetailModal :orderDetailInfo="orderDetailInfo" v-if="rentOrder" v-on:rentOrderDetailDialogEvent="rentOrderDetailDialogEvent"></rentOrderDetailModal>
<!--旅游订单详情--> <!--旅游订单详情-->
<tourOrderDetailModal :tourRow="tourRow" v-if="tourDialogVisible" v-on:tourOrderDetailDialogEvent="tourOrderDetailDialogEvent"></tourOrderDetailModal> <tourOrderDetailModal :tourRow="tourRow" v-if="tourDialogVisible" v-on:tourOrderDetailDialogEvent="tourOrderDetailDialogEvent"></tourOrderDetailModal>
<!--禁用弹框--> <!--禁用弹框-->
...@@ -358,7 +358,8 @@ ...@@ -358,7 +358,8 @@
getAll getAll
} from 'api/base_info/branch_company/'; } from 'api/base_info/branch_company/';
import { import {
getAllBranchCompanyByZoneId getAllBranchCompanyByZoneId,
orderDetail
} from 'api/order/rentVehicle'; } from 'api/order/rentVehicle';
import { import {
formatDate formatDate
...@@ -460,7 +461,7 @@ ...@@ -460,7 +461,7 @@
anpai: false,//安排用车弹框 anpai: false,//安排用车弹框
jinyong: false,//禁用弹框 jinyong: false,//禁用弹框
currentItem: {},//待操作数据 currentItem: {},//待操作数据
rentOrderInfo: {},//租车订单详情 orderDetailInfo: {},//租车订单详情
rentCostDetail: {},//租车订单费用明细 rentCostDetail: {},//租车订单费用明细
tourDialogVisible: false,//旅游订单弹框 tourDialogVisible: false,//旅游订单弹框
tourRow: {},//旅游订单详情-当前行 tourRow: {},//旅游订单详情-当前行
...@@ -685,50 +686,58 @@ ...@@ -685,50 +686,58 @@
* 根据订单号获取订单详情 * 根据订单号获取订单详情
* */ * */
getOneVechi: function(orderNo) { getOneVechi: function(orderNo) {
let params = { var param = {
orderNo: orderNo "orderNo":orderNo,
}; "flag" : true
getVehicleOrderDetail(params).then(res => { }
if (res.status == 200) { orderDetail(param).then(response => {
let a = res.data; this.orderDetailInfo = response.data
let vehicleUserLicenses = {}; if(this.orderDetailInfo && this.orderDetailInfo.memberLevel) {
// if (a.status == 5) { if(this.orderDetailInfo.memberLevel == 1) {
// vehicleUserLicenses = { this.orderDetailInfo.memberName = "普通会员"
// name: a.orderVehicleCrosstownDto.licenseName, }
// phone: a.orderVehicleCrosstownDto.licensePhone, if(this.orderDetailInfo.memberLevel == 2) {
// idCard: a.orderVehicleCrosstownDto.licenseIdCard this.orderDetailInfo.memberName = "黄金会员"
// }; }
// } else { if(this.orderDetailInfo.memberLevel == 3) {
// if (a.vehicleUserLicenses.length > 0) { this.orderDetailInfo.memberName = "钻石会员"
// vehicleUserLicenses = a.vehicleUserLicenses[0]; }
// } if(this.orderDetailInfo.orderRentVehicleDetail.costDetail) {
// } this.orderDetailInfo.costDetail = JSON.parse(this.orderDetailInfo.orderRentVehicleDetail.costDetail)
a.orderRentVehicleDetail.startTime = timestamp2Date(a.orderRentVehicleDetail.startTime);
a.orderRentVehicleDetail.endTime = timestamp2Date(a.orderRentVehicleDetail.endTime); }
let arr = a.picture ? a.picture.split(",") : []; if(this.orderDetailInfo.costDetail.paramJson) {
a.picture = arr.length > 0 ? arr[0] : ""; this.orderDetailInfo.rentVehiclePriceVO = JSON.parse(this.orderDetailInfo.costDetail.paramJson)
a.payTime = timestamp2Date(a.payTime);
this.rentOrderInfo = a; }
if(this.orderDetailInfo.items) {
this.costDetail = JSON.parse(this.rentOrderInfo.orderRentVehicleDetail.costDetail); for (var i = 0;i< this.orderDetailInfo.items.length;i++) {
var cost = ''; if(this.orderDetailInfo.items[i].type == 104) {
this.costDetail.children.map(function(a) { this.orderDetailInfo.carArticlesJson = this.orderDetailInfo.items[i].detail
cost += a.key + ":" +a.detail+" "; }
}); }
this.rentCostDetail = cost; }
if(this.rentOrderInfo.orderRentVehicleDetail.driverType==1) { if (this.orderDetailInfo.status == 2) {
this.serviceCost = this.rentOrderInfo.orderRentVehicleDetail.dayNum * 600 this.orderDetailInfo.ststusName = '取消'
} }
this.rentOrder = true; if (this.orderDetailInfo.status == -1) {
} else { this.orderDetailInfo.ststusName = '定损中'
this.$notify({ }
title: '失败', if (this.orderDetailInfo.status == 3) {
message: '操作失败！', this.orderDetailInfo.ststusName = '待付款'
type: 'error', }
duration: 2000 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
View file @ 56f7ca0c
...@@ -366,15 +366,22 @@ export default { ...@@ -366,15 +366,22 @@ export default {
} }
}) })
} }
if (params == '') { if (params == '') {
this.$message.error('请设置不同车型不同价格4') add_edit('',this.activeTime).then(data => {
return false if (data.status == 200) {
this.$message.success('设置成功')
this.chooseData = []
this.getList()
} else {
this.$message.error(data.message)
}
})
} else { } else {
add_edit(params).then(data => { add_edit(params,this.activeTime).then(data => {
if (data.status == 200) { if (data.status == 200) {
this.$message.success('设置成功') this.$message.success('设置成功')
this.chooseData = [] this.chooseData = []
this.changeIsGlobal(0)
this.getList() this.getList()
} else { } else {
this.$message.error(data.message) this.$message.error(data.message)
...@@ -398,8 +405,8 @@ export default { ...@@ -398,8 +405,8 @@ export default {
data.data.forEach(element => { data.data.forEach(element => {
element.multiple = element.multiple || '' element.multiple = element.multiple || ''
element.price = element.price || '' element.price = element.price || ''
element.level = element.level||'' element.level = element.level || ''
element.freeDays = element.freeDays||'' element.freeDays = element.freeDays || ''
}) })
this.dayListData = data.data this.dayListData = data.data
this.setMultiplePop = true this.setMultiplePop = true
......
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