Skip to content

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

00

parents 3c5f2b42 7aae60eb
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 7748 additions and 3417 deletions
.gitignore
View file @ 661bbddf
......@@ -8,5 +8,8 @@ test/unit/coverage
test/e2e/reports
selenium-debug.log
.idea
config/dev.env.js
config/**
**/dev.env.js
/*.json
/.gitignore
config/dev.env.js
View file @ 661bbddf
module.exports = {
NODE_ENV: '"development"',
BASE_API:'"https://xxtest.upyuns.com"',//'"https://dev.dfangche.com"',//'"https://xxfcmgmt.upyuns.com"（正）',//http://10.1.37.192:9527（何）, //https://xxtest.upyuns.com（测）,10.1.37.246:9527(韩), 10.1.37.244(李斌)10.1.37.248:8765(小威)
NODE_ENV: '"development"',
BASE_API:'"https://xxtest.upyuns.com"',//'"https://dev.dfangche.com"',//'"https://xxtest.upyuns.com"',//'"https://xxtest.upyuns.com"',//'"https://xxfcmgmt.upyuns.com"（正）',//http://10.1.37.192:9527（何）, //https://xxtest.upyuns.com（测）,10.1.37.246:9527(韩), 10.1.37.244(李斌)10.1.37.248:8765(小威)
APP_ORIGIN: '"https://wallstreetcn.com"'
}
config/sit.env.js
View file @ 661bbddf
module.exports = {
NODE_ENV: '"sit"',
BASE_API: '"https://dev.dfangche.com"',
BASE_API: '"https://xxtest.upyuns.com"',
APP_ORIGIN: '"https://wallstreetcn.com"'
};
package-lock.json
View file @ 661bbddf
......@@ -2880,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",
......@@ -7339,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",
......@@ -11253,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",
......@@ -11264,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",
......@@ -12132,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 @ 661bbddf
......@@ -16,8 +16,8 @@
"axios": "0.16.2",
"codemirror": "5.26.0",
"dropzone": "5.1.0",
"echarts": "3.6.2",
"element-ui": "1.4.1",
"echarts": "^3.8.5",
"element-ui": "^1.4.1",
"file-saver": "1.3.3",
"jquery": "^3.4.0",
"js-cookie": "2.1.4",
......@@ -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/admin/member/index.js
View file @ 661bbddf
......@@ -26,4 +26,11 @@ export function update(params) {
method: 'PUT',
data:params
});
}
export function setBind(params) {
return fetch({
url: 'api/admin/relation/admin/bind',
method: 'post',
data: params
});
}
\ No newline at end of file
src/api/admin/userManagement/index.js
View file @ 661bbddf
......@@ -4,6 +4,7 @@ export function appPage(obj) {
return fetch({
url: '/api/admin/appUsersManage/findAll',
method: 'post',
timeout: '30000',
data: obj
});
}
......@@ -147,4 +148,15 @@ export function username(id) {
url: 'api/admin/public/app/userinfo-by-username?name='+id,
method: 'get'
});
}
\ No newline at end of file
}
/**
* 用户详情
* @param obj
*/
export function getOne(id) {
return fetch({
url: '/api/admin/appUsersManage/user_info/'+id,
method: 'get',
});
}
src/api/discoveryModule.js 0 → 100644
View file @ 661bbddf
import fetch from 'utils/fetch';
/**
* 获取消息列表
* @param query
*/
export function page(query) {
return fetch({
url: '/api/im/msg/bg/app/unauth/list',
method: 'post',
data: query
});
}
/**
* 获取更新
* @param query
*/
export function updateMsg(params) {
return fetch({
url: '/api/im/msg/bg/app/unauth/update',
method: 'post',
data: params
});
}
/**
* 删除消息
*/
export function delMsg(query) {
return fetch({
url: '/api/im/msg/bg/app/unauth/delete',
method: 'get',
params: query
});
}
/**
* 获取问答列表
*/
export function geImQuestionList(query) {
return fetch({
url: '/api/im/imQuestion/list',
method: 'get',
params: query
});
}
/**
* 更新问答
* @param query
*/
export function updateImQuestion(params) {
return fetch({
url: '/api/im/imQuestion/bg/app/unauth/update',
method: 'post',
data: params
});
}
/**
* 删除消息
*/
export function delQuestion(query) {
return fetch({
url: '/api/im/imQuestion/bg/app/unauth/delete',
method: 'get',
params: query
});
}
src/api/order/rentVehicle.js
View file @ 661bbddf
import fetch from 'utils/fetch';
//获取租车订单
export function page(query) {
return fetch({
url: '/api/order/baseOrder/getOrderList',
method: 'get',
params:query
});
return fetch({
url: '/api/order/baseOrder/getAll',
method: 'get',
params: query
});
}
//获取旅游订单
export function getOrderList(query) {
return fetch({
url: '/api/order/baseOrder/getOrderList',
method: 'get',
params: query
});
}
/**
* 获取所有分公司
*/
export function getAllBranchCompany() {
return fetch({
url: '/vehicle/branchCompany',
method: 'get'
});
return fetch({
url: '/vehicle/branchCompany',
method: 'get'
});
}
//根据大区Id获取分公司列表
export function getAllBranchCompanyByZoneId(query) {
return fetch({
url: '/vehicle/branchCompany/app/unauth/getByZone',
method: 'get',
params:query
});
return fetch({
url: '/vehicle/branchCompany/app/unauth/getByZone',
method: 'get',
params: query
});
}
export function getOrderVehicleCrosstown(query) {
return fetch({
url: '/api/order/orderVehicle/getByOrderId',
method: 'get',
params:query
});
return fetch({
url: '/api/order/orderVehicle/getByOrderId',
method: 'get',
params: query
});
}
/**
......@@ -39,10 +47,10 @@ export function getOrderVehicleCrosstown(query) {
* @param query
*/
export function getOneIllegalRow(id) {
return fetch({
url: '/api/order/orderViolation/getOne/' + id,
method: 'get'
});
return fetch({
url: '/api/order/orderViolation/getOne/' + id,
method: 'get'
});
}
/**
......@@ -54,11 +62,11 @@ detailId:租车订单id
}
*/
export function saveOrderViolation(params) {
return fetch({
url: '/api/order/orderViolation/saveOrderViolation',
method: 'post',
data: params
});
return fetch({
url: '/api/order/orderViolation/saveOrderViolation',
method: 'post',
data: params
});
}
/**
......@@ -66,36 +74,36 @@ export function saveOrderViolation(params) {
* @param query
*/
export function getStep(orderNo) {
return fetch({
url: '/api/order/orderVehicle/getByOrderId?orderNo=' + orderNo,
method: 'get'
});
return fetch({
url: '/api/order/orderVehicle/getByOrderId?orderNo=' + orderNo,
method: 'get'
});
}
export function inquire(query) {
return fetch({
url: '/vehicle/vehicleInfo/rent/back-stage/usable-vehicle',
method: 'get',
params:query
});
return fetch({
url: '/vehicle/vehicleInfo/rent/back-stage/usable-vehicle',
method: 'get',
params: query
});
}
//创建订单
export function addIndent(params) {
return fetch({
url: '/api/order/orderRentVehicle/back-stage/add',
method: 'post',
data:params
});
return fetch({
url: '/api/order/orderRentVehicle/back-stage/add',
method: 'post',
data: params
});
}
//删除订单
export function calculate(no, params) {
return fetch({
url: '/api/order/baseOrder/back-stage/cancel/'+ no,
method: 'post',
data:params
});
return fetch({
url: '/api/order/baseOrder/back-stage/cancel/' + no,
method: 'post',
data: params
});
}
/**
......@@ -103,54 +111,63 @@ export function calculate(no, params) {
* @param {Object} params计算违约价格
*/
export function getViolatePrice(no) {
return fetch({
url: '/api/order/orderRefund/bg-stage/getViolatePrice/'+ no,
method: 'get',
});
return fetch({
url: '/api/order/orderRefund/bg-stage/getViolatePrice/' + no,
method: 'get',
});
}
//创建订单
export function orderStatistics(params) {
return fetch({
url: 'api/order/orderStatistics/order',
method: 'post',
data:params
});
return fetch({
url: 'api/order/orderStatistics/order',
method: 'post',
data: params
});
}
//订单下载
export function downloadExcel(params) {
return fetch({
url: '/api/order/orderStatistics/excel',
method: 'post',
data: params,
responseType: 'blob'
});
return fetch({
url: '/api/order/orderStatistics/excel',
method: 'post',
data: params,
responseType: 'blob'
});
}
//会员订单管理列表
export function pageList(params) {
return fetch({
url: '/api/order/orderMember/page',
method: 'post',
data: params
});
return fetch({
url: '/api/order/orderMember/page',
method: 'post',
data: params
});
}
//会员订单管理导出
export function orderMemberExcel(params) {
return fetch({
url: '/api/order/orderMember/export',
method: 'post',
data: params,
responseType: 'blob'
});
return fetch({
url: '/api/order/orderMember/export',
method: 'post',
data: params,
responseType: 'blob'
});
}
//用户信息
export function user_info(id) {
return fetch({
url: '/api/admin/appUsersManage/user_info/' + id,
method: 'get'
});
}
\ No newline at end of file
return fetch({
url: '/api/admin/appUsersManage/user_info/' + id,
method: 'get'
});
}
//获取订单详情
export function orderDetail(query) {
return fetch({
url: '/api/order/baseOrder/orderDetail',
method: 'get',
params: query
});
}
src/api/statistics.js 0 → 100644
View file @ 661bbddf
import fetch from 'utils/fetch';
export function getDate(query) {
return fetch({
url: 'api/admin/staff_statistics/page',
method: 'post',
data: query
});
}
src/api/statistics/vehicleStatistics.js 0 → 100644
View file @ 661bbddf
import fetch from 'utils/fetch';
//车辆统计信息列表
export function pageList(params) {
return fetch({
url: '/vehicle/bg-vehicle/count/getAll',
method: 'get',
params: params
});
}
//车辆统计信息导出
export function vehicleInfoExcel(params) {
return fetch({
url: '/vehicle/bg-vehicle/count/app/unauth/export',
method: 'get',
params: params,
responseType: 'blob'
});
}
\ No newline at end of file
src/api/tourManage.js
View file @ 661bbddf
......@@ -31,7 +31,6 @@ export function getOneGoodsById(query) {
}
/**
* 获取bannerList
// url: '/api/tour/admin/tourBanner/page',
*/
export function getBannerList(query) {
return fetch({
......@@ -41,7 +40,7 @@ export function getBannerList(query) {
});
}
/**
* 添加banner '/api/tour/admin/tourBanner',
* 添加banner
*/
export function addBanner(params) {
return fetch({
......
src/api/vehicle/vehicleInfo/index.js
View file @ 661bbddf
......@@ -123,3 +123,11 @@ export function downloadExcel(query) {
responseType: 'blob'
});
}
export function exportExcel(query) {
return fetch({
url: '/vehicle/VehicleInformationDownload/app/unauth/export',
method: 'get',
responseType: 'blob'
});
}
src/api/vehicleType.js
View file @ 661bbddf
......@@ -143,6 +143,17 @@ export function addVehicleModel(params) {
});
}
/**
* App是否展示
* @param {Object} params
*/
export function updateAppShow(params) {
return fetch({
url: '/vehicle/vehicleModel/bg/updateAppShow',
method: 'post',
data: params
});
}
/*
* 删除一条车型数据
* */
......@@ -180,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
View file @ 661bbddf
......@@ -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 @ 661bbddf
......@@ -309,6 +309,33 @@ export const asyncRouterMap = [{
}
]
},
{
path: '/discoveryModule',
component: Layout,
name: '发现模块',
icon: 'setting',
authority: 'discoveryModule',
children: [
{
path: 'clapIndex',
component: _import('discoveryModule/clapIndex'),
name: '拍拍',
authority: 'clapIndex'
},
{
path: 'shortVideo',
component: _import('discoveryModule/shortVideo'),
name: '短视频',
authority: 'shortVideo'
},
{
path: 'questionsAndAnswers',
component: _import('discoveryModule/questionsAndAnswers'),
name: '问答',
authority: 'questionsAndAnswers'
}
]
},
{
path: '/campsiteManage',
component: Layout,
......@@ -524,9 +551,9 @@ export const asyncRouterMap = [{
authority: 'memberEnter'
},
{
path:'imCustomerServiceManger',
path: 'imCustomerServiceManger',
component: _import('userManagement/imCustomerServiceManger/cusomterServiceList'),
name:'客服列表',
name: '客服列表',
authority: 'imCustomerServiceManger'
},{
path: 'employeesInput',
......@@ -634,60 +661,99 @@ 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: 'vehicleStatistics',
component: _import('statistics/vehicleStatistics'),
name: '车辆统计',
authority: 'vehicleStatistics'
}
]
},
{
path: '/financial',
component: Layout,
name: '财务报表',
icon: 'setting',
authority: 'financial',
children: [
{
path: 'staffPerformance',
component: _import('financial/staffPerformance'),
name: '员工业绩报表',
authority: 'staffPerformance'
}, {
path: 'memberPerformance',
component: _import('financial/memberPerformance'),
name: '总公司报表',
authority: 'memberPerformance'
}
]
}
,
{
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/utils/index.js
View file @ 661bbddf
......@@ -268,3 +268,15 @@
}
return targetObj;
}
/**
* 深拷贝
*/
export function objDeepCopy(source) {
const sourceCopy = source instanceof Array ? [] : {};
for (const item in source) {
sourceCopy[item] = typeof source[item] === 'object' ? objDeepCopy(source[item]) : source[item];
}
return sourceCopy;
}
src/views/appManagement/modalManagement/index.vue
View file @ 661bbddf
......@@ -3,7 +3,7 @@
<div class="filter-container" ref="filter-container">
<el-form ref="queryForm" :inline="inline" :model="listQuery" label-width="60px">
<el-row>
<el-col :span="4">
<el-col :span="6">
<el-form-item label="描述">
<el-input v-model.number="listQuery.popupName" placeholder="请输入描述"></el-input>
</el-form-item>
......
src/views/appManagement/selectedActivities/index.vue
View file @ 661bbddf
......@@ -3,7 +3,7 @@
<div class="filter-container" ref="filter-container">
<el-form ref="queryForm" :inline="inline" :model="listQuery" label-width="60px">
<el-row>
<el-col :span="4">
<el-col :span="6">
<el-form-item label="描述">
<el-input v-model.number="listQuery.activitiesName" placeholder="请输入描述"></el-input>
</el-form-item>
......
src/views/cunponManagements/conponList.vue
View file @ 661bbddf
This diff is collapsed.
src/views/discoveryModule/clapIndex.vue 0 → 100644
View file @ 661bbddf
This diff is collapsed.
src/views/discoveryModule/modal/addressModal.vue 0 → 100644
View file @ 661bbddf
This diff is collapsed.
src/views/discoveryModule/questionsAndAnswers.vue 0 → 100644
View file @ 661bbddf
This diff is collapsed.
src/views/discoveryModule/shortVideo.vue 0 → 100644
View file @ 661bbddf
This diff is collapsed.
src/views/financial/memberPerformance.vue 0 → 100644
View file @ 661bbddf
This diff is collapsed.
src/views/financial/staffPerformance.vue 0 → 100644
View file @ 661bbddf
This diff is collapsed.
src/views/order/memberOrderInfo/index.vue
View file @ 661bbddf
......@@ -28,7 +28,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="5">
<el-col :span="6">
<el-form-item label="创建时间">
<el-date-picker
v-model="createTime"
......@@ -39,7 +39,7 @@
<!-- <el-date-picker v-model="createTime" type="datetimerange" placeholder="选择时间范围" @change="changeCreate"></el-date-picker> -->
</el-form-item>
</el-col>
<el-col :span="5">
<el-col :span="6">
<el-form-item label="支付时间">
<!-- <el-date-picker v-model="aplyTime" type="datetimerange" placeholder="选择支付时间范围" @change="changePay"></el-date-picker> -->
<el-date-picker
......
src/views/order/orderStatistics/index.vue
View file @ 661bbddf
......@@ -4,7 +4,7 @@
<div class="filter-container">
<el-form ref="queryForm" :model="listQuery" label-width="100px">
<el-row>
<el-col :span="5">
<el-col :span="6">
<el-form-item label="统计时间:">
<el-date-picker
v-model="listQuery.time"
......@@ -17,7 +17,7 @@
></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="5">
<el-col :span="6">
<el-form-item label="统计方式:" class="wayMsg">
<span
v-for="(item,index) in way"
......@@ -32,7 +32,7 @@
</el-col>
</el-row>
</el-form>
<el-table :data="list" border fit highlight-current-row style="width: 100%" v-loading="loading">
<el-table :data="list" border fit highlight-current-row v-loading="loading">
<el-table-column align="center" label="时间">
<template scope="scope">
<span>{{scope.row.timeSlot}}</span>
......@@ -99,6 +99,7 @@ export default {
loading: false,
total: null,
list: [],
scrollTop: '',
// 统计时间筛选
listQuery: {
time: 'null',
......@@ -211,6 +212,7 @@ export default {
setTimeout(() => {
this.loading = false
}, 300)
document.documentElement.scrollTop = 0
})
}
}
......
src/views/order/rentVehicleInfo/index.vue
View file @ 661bbddf
This diff is collapsed.
src/views/order/tourOrderInfo/index.vue
View file @ 661bbddf
......@@ -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
View file @ 661bbddf
This diff is collapsed.
src/views/purseManage/incomeOverview.vue
View file @ 661bbddf
......@@ -5,11 +5,14 @@
<div class="filter-container" ref="filter-container">
<el-form ref="queryForm" :inline="inline" :model="listQuery" label-width="100px">
<el-row>
<el-col :span="10">
<el-input v-model="listQuery.username" placeholder="请输入姓名" style="width:200px"></el-input>
<el-input v-model.number="listQuery.phone" placeholder="请输入手机号" style="width:200px"></el-input>
</el-col>
<el-form-item label="姓名">
<el-input v-model="listQuery.username" placeholder="请输入姓名"></el-input>
</el-form-item>
<el-form-item label="手机号">
<el-input v-model.number="listQuery.phone" placeholder="请输入手机号"></el-input>
</el-form-item>
<el-col :span="5"></el-col>
<el-col :span="5"></el-col>
<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="clearFilter">清除搜索</el-button>
</el-row>
......@@ -29,12 +32,6 @@
</template>
</el-table-column>
<el-table-column width="250" align="center" label="身份/公司">
<template scope="scope">
<span>{{scope.row.phone}}</span>
</template>
</el-table-column>
<!-- <el-table-column width="200" align="center" label="佣金比例">
<template scope="scope">
<span>{{scope.row.commissionRate+'%'}}</span>
......@@ -83,8 +80,8 @@
<span>{{scope.row.balance}}</span>
</template>
</el-table-column>-->
<el-table-column align="center" label="操作" fixed="right">
<!-- <template scope="scope">
<!-- <el-table-column align="center" label="操作" fixed="right">
<template scope="scope">
<el-button
size="small"
class="el-button el-button--text el-button--small"
......@@ -98,7 +95,7 @@
@click="detailed(scope.row)"
>收益明细</el-button>
</template>
</el-table-column>
</el-table-column>-->
</el-table>
<!-- 分页 -->
......
src/views/statistics/orderStatistics.vue 0 → 100644
View file @ 661bbddf
This diff is collapsed.
src/views/statistics/vehicleStatistics.vue 0 → 100644
View file @ 661bbddf
This diff is collapsed.
src/views/tourManage/index.vue
View file @ 661bbddf
......@@ -55,7 +55,7 @@
<span>{{scope.row.saleCount}}</span>
</template>
</el-table-column>
<el-table-column align="center" width="150" fixed="right" label="操作">
<el-table-column align="center" width="150" label="操作">
<template scope="scope">
<el-button size="small" class="el-button el-button--text el-button--small" @click="handleUpdate(scope.row)">{{good_btn_update?'编辑':'查看'}}
</el-button>
......
src/views/userManagement/memberEnter.vue
View file @ 661bbddf
......@@ -3,12 +3,12 @@
<div class="filter-container">
<el-form ref="queryForm" :model="listQuery" label-width="100px">
<el-row>
<el-col :span="4">
<el-col :span="6">
<el-form-item label="手机号">
<el-input v-model.number="listQuery.username" placeholder="请输入手机号"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="16">
<el-form-item label="导入时间">
<el-date-picker
v-model="listQuery.startTime"
......
src/views/userManagement/userList/index.vue
View file @ 661bbddf
This diff is collapsed.
src/views/vehicle/bookRecord/index.vue
View file @ 661bbddf
This diff is collapsed.
src/views/vehicle/vehicleInfo/index.vue
View file @ 661bbddf
This diff is collapsed.
src/views/vehicleType/index.vue
View file @ 661bbddf
This diff is collapsed.
src/views/vehicleType/priceList.vue
View file @ 661bbddf
This diff is collapsed.
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