Skip to content

X
xoadoPlatform
Commit 829d06a0 by 吕海涛
Options

新品牌入驻

parent 1e6dee1e
Showing with 506 additions and 137 deletions
.env.development
...@@ -4,17 +4,17 @@ VUE_APP_BASE_API1 = 'https://apps.xoado.com' ...@@ -4,17 +4,17 @@ VUE_APP_BASE_API1 = 'https://apps.xoado.com'
VUE_APP_BASE_API2 = 'https://core.xoado.com' VUE_APP_BASE_API2 = 'https://core.xoado.com'
VUE_APP_BASE_API2_ = 'https://core.xoado.com' VUE_APP_BASE_API2_ = 'https://core.xoado.com'
VUE_APP_BASE_API3 = 'https://api.xoado.com' VUE_APP_BASE_API3 = 'https://api.xoado.com'
VUE_APP_BASE_API4 = 'https://hgxd.99zcx.com' VUE_APP_BASE_API4 = 'http://aitransport.xoado.com'
VUE_APP_BASE_API5 = 'hhttp://xoado.tpddns.net:10001/brand' VUE_APP_BASE_API5 = 'http://aitransport.xoado.com/brand'
VUE_APP_BASE_API6 = 'http://xoado.tpddns.net:10001/transport' VUE_APP_BASE_API6 = 'https://projects.xoado.com/transport'
VUE_APP_BASE_API7 = 'http://xoado.tpddns.net:10001/operate' VUE_APP_BASE_API7 = 'https://projects.xoado.com/operate'
VUE_APP_BASE_API8 = 'http://xoado.tpddns.net:10001/trace' VUE_APP_BASE_API8 = 'https://projects.xoado.com/trace'
VUE_APP_BASE_API9 = 'http://xoado.tpddns.net:10001/payment/' VUE_APP_BASE_API9 = 'https://account.xoado.com/payment/'
VUE_APP_BASE_API10 = 'http://192.168.0.251:8195/payment/v1/' VUE_APP_BASE_API10 = 'https://account.xoado.com/payment/v1/'
VUE_APP_BASE_API11 = 'https://oss.xoado.com/v1/' VUE_APP_BASE_API11 = 'https://oss.xoado.com/v1/'
VUE_APP_BASE_API12 = 'http://xoado.tpddns.net:10001' VUE_APP_BASE_API12 = 'https://payment.sdk.xoado.com'
VUE_APP_BASE_API13 = 'https://projects.xoado.com/invoice' VUE_APP_BASE_API13 = 'https://projects.xoado.com/invoice'
VUE_APP_BASE_API14 = 'https://projects.xoado.com/message' VUE_APP_BASE_API14 = 'https://projects.xoado.com/message'
VUE_APP_BASE_API15 = 'http://xoado.tpddns.net:10001/smart' VUE_APP_BASE_API15 = 'https://aitransport.xoado.com/smart'
VUE_APP_BASE_API16 = 'http://xoado.tpddns.net:10001/anc' VUE_APP_BASE_API16 = 'https://proclamations.xoado.com/anc'
.env.production
...@@ -5,16 +5,16 @@ VUE_APP_BASE_API1 = 'https://apps.xoado.com' ...@@ -5,16 +5,16 @@ VUE_APP_BASE_API1 = 'https://apps.xoado.com'
VUE_APP_BASE_API2 = 'https://core.xoado.com' VUE_APP_BASE_API2 = 'https://core.xoado.com'
VUE_APP_BASE_API2_ = 'https://core.xoado.com' VUE_APP_BASE_API2_ = 'https://core.xoado.com'
VUE_APP_BASE_API3 = 'https://api.xoado.com' VUE_APP_BASE_API3 = 'https://api.xoado.com'
VUE_APP_BASE_API4 = 'https://hgxd.99zcx.com' VUE_APP_BASE_API4 = 'http://aitransport.xoado.com'
VUE_APP_BASE_API5 = 'hhttp://xoado.tpddns.net:10001/brand' VUE_APP_BASE_API5 = 'http://aitransport.xoado.com/brand'
VUE_APP_BASE_API6 = 'http://xoado.tpddns.net:10001/transport' VUE_APP_BASE_API6 = 'https://projects.xoado.com/transport'
VUE_APP_BASE_API7 = 'http://xoado.tpddns.net:10001/operate' VUE_APP_BASE_API7 = 'https://projects.xoado.com/operate'
VUE_APP_BASE_API8 = 'http://xoado.tpddns.net:10001/trace' VUE_APP_BASE_API8 = 'https://projects.xoado.com/trace'
VUE_APP_BASE_API9 = 'http://xoado.tpddns.net:10001/payment/' VUE_APP_BASE_API9 = 'https://account.xoado.com/payment/'
VUE_APP_BASE_API10 = 'http://192.168.0.251:8195/payment/v1/' VUE_APP_BASE_API10 = 'https://account.xoado.com/payment/v1/'
VUE_APP_BASE_API11 = 'https://oss.xoado.com/v1/' VUE_APP_BASE_API11 = 'https://oss.xoado.com/v1/'
VUE_APP_BASE_API12 = 'http://xoado.tpddns.net:10001' VUE_APP_BASE_API12 = 'https://payment.sdk.xoado.com'
VUE_APP_BASE_API13 = 'https://projects.xoado.com/invoice' VUE_APP_BASE_API13 = 'https://projects.xoado.com/invoice'
VUE_APP_BASE_API14 = 'https://projects.xoado.com/message' VUE_APP_BASE_API14 = 'https://projects.xoado.com/message'
VUE_APP_BASE_API15 = 'http://xoado.tpddns.net:10001/smart' VUE_APP_BASE_API15 = 'https://aitransport.xoado.com/smart'
VUE_APP_BASE_API16 = 'http://xoado.tpddns.net:10001/anc' VUE_APP_BASE_API16 = 'https://proclamations.xoado.com/anc'
\ No newline at end of file \ No newline at end of file
ip.js
...@@ -18,7 +18,7 @@ VUE_APP_BASE_API13 = 'https://projects.xoado.com/invoice' ...@@ -18,7 +18,7 @@ VUE_APP_BASE_API13 = 'https://projects.xoado.com/invoice'
VUE_APP_BASE_API14 = 'https://projects.xoado.com/message' VUE_APP_BASE_API14 = 'https://projects.xoado.com/message'
VUE_APP_BASE_API15 = 'http://192.168.0.251:8199/smart' VUE_APP_BASE_API15 = 'http://192.168.0.251:8199/smart'
VUE_APP_BASE_API16 = 'http://xoado.tpddns.net:10001/anc' VUE_APP_BASE_API16 = 'http://xoado.tpddns.net:10001/anc'
// 线上
VUE_APP_BASE_API1 = 'https://apps.xoado.com' VUE_APP_BASE_API1 = 'https://apps.xoado.com'
VUE_APP_BASE_API2 = 'https://core.xoado.com' VUE_APP_BASE_API2 = 'https://core.xoado.com'
VUE_APP_BASE_API2_ = 'https://core.xoado.com' VUE_APP_BASE_API2_ = 'https://core.xoado.com'
...@@ -36,22 +36,21 @@ VUE_APP_BASE_API13 = 'https://projects.xoado.com/invoice' ...@@ -36,22 +36,21 @@ VUE_APP_BASE_API13 = 'https://projects.xoado.com/invoice'
VUE_APP_BASE_API14 = 'https://projects.xoado.com/message' VUE_APP_BASE_API14 = 'https://projects.xoado.com/message'
VUE_APP_BASE_API15 = 'https://aitransport.xoado.com/smart' VUE_APP_BASE_API15 = 'https://aitransport.xoado.com/smart'
VUE_APP_BASE_API16 = 'https://proclamations.xoado.com/anc' VUE_APP_BASE_API16 = 'https://proclamations.xoado.com/anc'
// 测试
VUE_APP_BASE_API1 = 'https://apps.xoado.com' VUE_APP_BASE_API1 = 'https://apps.xoado.com'
VUE_APP_BASE_API2 = 'https://core.xoado.com' VUE_APP_BASE_API2 = 'https://core.xoado.com'
VUE_APP_BASE_API2_ = 'https://core.xoado.com' VUE_APP_BASE_API2_ = 'https://core.xoado.com'
VUE_APP_BASE_API3 = 'https://api.xoado.com' VUE_APP_BASE_API3 = 'https://api.xoado.com'
VUE_APP_BASE_API4 = 'https://hgxd.99zcx.com' VUE_APP_BASE_API4 = 'http://aitransport.xoado.com'
VUE_APP_BASE_API5 = 'hhttp://xoado.tpddns.net:10001/brand' VUE_APP_BASE_API5 = 'http://aitransport.xoado.com/brand'
VUE_APP_BASE_API6 = 'http://xoado.tpddns.net:10001/transport' VUE_APP_BASE_API6 = 'http://xoado.tpddns.net:10001/transport'
VUE_APP_BASE_API7 = 'http://xoado.tpddns.net:10001/operate' VUE_APP_BASE_API7 = 'http://xoado.tpddns.net:10001/operate'
VUE_APP_BASE_API8 = 'http://xoado.tpddns.net:10001/trace' VUE_APP_BASE_API8 = 'http://xoado.tpddns.net:10001/trace'
VUE_APP_BASE_API9 = 'http://xoado.tpddns.net:10001/payment/' VUE_APP_BASE_API9 = 'https://account.xoado.com/payment/'
VUE_APP_BASE_API10 = 'http://192.168.0.251:8195/payment/v1/' VUE_APP_BASE_API10 = 'https://account.xoado.com/payment/v1/'
VUE_APP_BASE_API11 = 'https://oss.xoado.com/v1/' VUE_APP_BASE_API11 = 'https://oss.xoado.com/v1/'
VUE_APP_BASE_API12 = 'http://xoado.tpddns.net:10001' VUE_APP_BASE_API12 = 'https://payment.sdk.xoado.com'
VUE_APP_BASE_API13 = 'https://projects.xoado.com/invoice' VUE_APP_BASE_API13 = 'https://projects.xoado.com/invoice'
VUE_APP_BASE_API14 = 'https://projects.xoado.com/message' VUE_APP_BASE_API14 = 'https://projects.xoado.com/message'
VUE_APP_BASE_API15 = 'http://xoado.tpddns.net:10001/smart' VUE_APP_BASE_API15 = 'http://xoado.tpddns.net:10001/smart'
VUE_APP_BASE_API16 = 'http://xoado.tpddns.net:10001/anc' VUE_APP_BASE_API16 = 'https://proclamations.xoado.com/anc'
\ No newline at end of file \ No newline at end of file
src/App.vue
...@@ -60,14 +60,16 @@ export default { ...@@ -60,14 +60,16 @@ export default {
await getCarTypeList(params).then((res) => { await getCarTypeList(params).then((res) => {
if (res.status === 200) { if (res.status === 200) {
let list = []; let list = [];
let list2=[];
res.data.content.forEach((item) => { res.data.content.forEach((item) => {
list.push({ list.push({
id: item.vehicleFlag, id: item.vehicleFlag,
name: item.vehicleName, name: item.vehicleName,
type:item.type type:item.type
}); });
list2.push(item.vehicleFlag)
}); });
dataSource.driverTypeListABC = list2;
dataSource.CarType = list; dataSource.CarType = list;
} }
}); });
......
src/components/SelectsNew/index.vue 0 → 100644
<template>
<div>
<span :class="typeMinwidth ? 'item-title-select-S' : ''">{{ selectName }}</span>
<el-select :size="sizeType" v-model="selectList" filterable multiple collapse-tags @change="selectAll"
placeholder="请选择">
<el-option label="全选" value="999"></el-option>
<el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</div>
</template>
<script>
export default {
name: "index",
props: {
type: {
type: String, //用于区分当前类型 方便后续调用
required: true
},
typeMinwidth: {
type: Boolean,
default: false
},
options: {
type: Array,
required: true
},
sizeType: {
type: String,
default: 'small'
},
selectName: {
type: String,
default: ""
},
selectList: {
type: Array,
required: true
}
},
data() {
return {
oldOptionsObj: []
};
},
created() {
this.init();
},
watch: {
options() {
this.init();
}
},
methods: {
init() {
let options = this.options;
// let list = ["999"];
// options.forEach(function (item, index) {
// list.push(item.id);
// });
// this.selectList = list;
},
selectAll(val) {
let allValues = [];
let dataSource = this.options;
let oldOptions = this.oldOptionsObj;
let Select = this.selectList;
//保留所有值
for (let item of dataSource) {
allValues.push(item.id);
}
// 用来储存上一次的值，可以进行对比
const oldVal = oldOptions.length === 1 ? [] : oldOptions[1];
// 若是全部选择 // 取消全部选中 上次有 当前没有 表示取消全选
if (val.includes("999")) {
if (oldVal.length > 0 && !oldVal.includes("999")) {
Select = ["999"].concat(allValues);
} else if (val.length === 1) {
Select = ["999"].concat(allValues);
} else {
const index = val.indexOf("999");
val.splice(index, 1); // 排除全选选项
Select = val;
}
} else if (!val.includes("999")) {
// console.log("------取消全选----");
if (val.length === dataSource.length) {
if (oldVal.length === dataSource.length - 1) {
Select = ["999"].concat(allValues);
} else {
Select = [];
}
} else {
Select = val;
}
}
// 点击非全部选中 需要排除全部选中 以及 当前点击的选项
// 新老数据都有全部选中
// if (oldVal.includes('999') && val.includes('999')) {
// const index = val.indexOf('999')
// val.splice(index, 1) // 排除全选选项
// Select = val
// }
// //全选未选 但是其他选项全部选上 则全选选上 上次和当前 都没有全选
// if (!oldVal.includes('999') && !val.includes('999')) {
// if (val.length === allValues.length - 1) Select = ['999'].concat(val)
// }
//储存当前最后的结果 作为下次的老数据
this.oldOptionsObj[1] = Select;
this.selectList = Select;
let obj = { type: this.type, data: this.selectList };
this.$emit("changeList", obj);
}
}
};
</script>
<style scoped lang="scss">
div {
display: inline-block;
&>span {
display: inline-block;
margin-right: 15px;
font-size: 14px;
}
}
.item-title-select-S {
min-width: 100px;
text-align: right;
white-space: nowrap;
}
</style>
src/libs/screen.js
...@@ -267,10 +267,14 @@ const dataSource = { ...@@ -267,10 +267,14 @@ const dataSource = {
'id': '2', 'id': '2',
'name': '已支付' 'name': '已支付'
}, },
// { {
// 'id': '3', 'id': '3',
// 'name': '已退款' 'name': '全额退款'
// } },
{
'id': '4',
'name': '有责退款'
}
], ],
'hotType': [{ 'hotType': [{
'id': '1', 'id': '1',
...@@ -633,11 +637,11 @@ const dataSource = { ...@@ -633,11 +637,11 @@ const dataSource = {
name: "客车", name: "客车",
}, },
{ {
id: '2', id: '3',
name: "货车", name: "货车",
}, },
{ {
id: '3', id: '2',
name: "巴士型", name: "巴士型",
} }
......
src/mixins/judgeType.js
...@@ -513,6 +513,10 @@ export default { ...@@ -513,6 +513,10 @@ export default {
return "订单信息变更"; return "订单信息变更";
case 15: case 15:
return "订单价格更改"; return "订单价格更改";
case 16:
return "退款";
case 17:
return "开发票";
default: default:
} }
}, },
...@@ -855,9 +859,9 @@ export default { ...@@ -855,9 +859,9 @@ export default {
switch (type) { switch (type) {
case 1: case 1:
return '客车' return '客车'
case 2:
return '货车'
case 3: case 3:
return '货车'
case 2:
return '巴士型' return '巴士型'
default: default:
return '/' return '/'
......
src/port/carOrDriver/carOrDriver.js
import {get, post, put, deletes } from '@/request/http' import {get, post, put, deletes, postblob } from '@/request/http'
export function carQuery(data) { export function carQuery(data) {
const url = process.env.VUE_APP_BASE_API6 + '/vehicle/manage/query'; const url = process.env.VUE_APP_BASE_API6 + '/vehicle/manage/query';
return post(url, data) return post(url, data)
...@@ -14,4 +14,13 @@ export function getAllTransport(data) { ...@@ -14,4 +14,13 @@ export function getAllTransport(data) {
export function delDriver(data) { export function delDriver(data) {
const url = process.env.VUE_APP_BASE_API6 + `/driver?userId=${data.userId}&phoneNumber=${data.driverMobile}`; const url = process.env.VUE_APP_BASE_API6 + `/driver?userId=${data.userId}&phoneNumber=${data.driverMobile}`;
return deletes(url, {}) return deletes(url, {})
}
export function downLoadVehicle(data) {
const url = process.env.VUE_APP_BASE_API6 + '/vehicle/downLoadVehicle';
return postblob(url, data)
}
export function downLoadDriver(data) {
const url = process.env.VUE_APP_BASE_API6 + '/driver/downLoadDriver';
return postblob(url, data)
} }
\ No newline at end of file
src/port/order-select.js
...@@ -596,7 +596,10 @@ export function driverDims(val, platformId) { ...@@ -596,7 +596,10 @@ export function driverDims(val, platformId) {
const url = process.env.VUE_APP_BASE_API6 + `/driver/dimV2/${val}` const url = process.env.VUE_APP_BASE_API6 + `/driver/dimV2/${val}`
return get(url, {}) return get(url, {})
} }
export function driverinsurance(para) {
const url = process.env.VUE_APP_BASE_API6 + `/vehicle/insurance?plateNumber=${para}`
return get(url)
}
/* 运力方费用单添加接口 */ /* 运力方费用单添加接口 */
export function SettlementCost(data = {}) { export function SettlementCost(data = {}) {
const url = process.env.VUE_APP_BASE_API6 + `/settlementCost/add` const url = process.env.VUE_APP_BASE_API6 + `/settlementCost/add`
......
src/port/statistical.js
...@@ -8,8 +8,7 @@ ...@@ -8,8 +8,7 @@
import {get, post, put, deletes, postblob } from '@/request/http' import {get, post, put, deletes, postblob } from '@/request/http'
const targetBaseUrl = process.env.VUE_APP_BASE_API5 const targetBaseUrl = process.env.VUE_APP_BASE_API5
/* 订单概览 */
/* 订单概览 */
export function overviewInfo(data) { export function overviewInfo(data) {
const url = targetBaseUrl + `/brandSide/statistics/orderOverview`; const url = targetBaseUrl + `/brandSide/statistics/orderOverview`;
return post(url, data) return post(url, data)
...@@ -40,4 +39,4 @@ export function exportAllOrderList(data) { ...@@ -40,4 +39,4 @@ export function exportAllOrderList(data) {
export function getAllTransport(platformId) { export function getAllTransport(platformId) {
const url = targetBaseUrl + `/transport?platformId=${platformId}&page=1&rows=60` const url = targetBaseUrl + `/transport?platformId=${platformId}&page=1&rows=60`
return get(url, {}) return get(url, {})
} }
\ No newline at end of file
src/router/index.js
...@@ -381,7 +381,14 @@ export const routes = [{ ...@@ -381,7 +381,14 @@ export const routes = [{
name: 'pushNoticeList', name: 'pushNoticeList',
component: () => component: () =>
import ('@/views/notice/noticeList.vue'), import ('@/views/notice/noticeList.vue'),
meta: { title: '公告列表', icon: 'el-icon-s-order' } meta: { title: '已发布公告', icon: 'el-icon-s-order' }
},
{
path: 'push-notice-list1',
name: 'pushNoticeList1',
component: () =>
import ('@/views/notice/noticeList.vue'),
meta: { title: '已接收公告', icon: 'el-icon-s-order' }
}, },
{ {
path: 'notice-add', path: 'notice-add',
......
src/store/modules/business.js
...@@ -62,25 +62,26 @@ const actions = { ...@@ -62,25 +62,26 @@ const actions = {
await getplatformList() await getplatformList()
.then((res) => { .then((res) => {
if (res.status === 200) { if (res.status === 200) {
console.log(res.data);
/** 正式环境注释 */ /** 正式环境注释 */
// res.data.forEach(item => {
// if (item.brandName.indexOf('玖玖') !== -1) {
// item.brandUrl = 'http://xoado.tpddns.net:10001/brand';
// }
// if (item.brandName.indexOf('江南') !== -1) {
// item.brandUrl = 'http://xoado.tpddns.net:10001/brandjn';
// }
// if (item.brandName.indexOf('妥妥') !== -1) {
// item.brandUrl = 'http://xoado.tpddns.net:10001/brandtt';
// }
// })
debugger
/** 测试环境注释 */
res.data.forEach(item => { res.data.forEach(item => {
if (item.brandName.indexOf('玖玖') !== -1) { item.brandUrl = item.brandUrl + '/brand';
item.brandUrl = 'http://xoado.tpddns.net:10001/brand';
}
if (item.brandName.indexOf('江南') !== -1) {
item.brandUrl = 'http://xoado.tpddns.net:10001/brandjn';
}
if (item.brandName.indexOf('妥妥') !== -1) {
item.brandUrl = 'http://xoado.tpddns.net:10001/brandtt';
}
}) })
console.log(res.data);
/** 测试环境注释 */
// res.data.forEach(item => {
// item.brandUrl = item.brandUrl + '/brand';
// })
// console.log(res.data);
let data = res.data; let data = res.data;
commit('SET_BRANDLIST', JSON.stringify(data)) commit('SET_BRANDLIST', JSON.stringify(data))
......
src/views/business/waybillManagement/index.vue
...@@ -218,7 +218,7 @@ ...@@ -218,7 +218,7 @@
</div> </div>
</el-card> </el-card>
<el-dialog title="高级搜索" :visible.sync="dialogVisibleSTATUS" width="60%" :close-on-click-modal="false" <el-dialog title="高级搜索" :visible.sync="dialogVisibleSTATUS" width="60%" :close-on-click-modal="false"
:close-on-press-escape="false"> :close-on-press-escape="false" style="padding:10px">
<div> <div>
<el-row type="flex" class="row-bg item-bg-ma"> <el-row type="flex" class="row-bg item-bg-ma">
<el-col :span="8"> <el-col :span="8">
...@@ -498,9 +498,10 @@ export default { ...@@ -498,9 +498,10 @@ export default {
transportIdList: [], transportIdList: [],
areaCodeList: [], // 运力区域 areaCodeList: [], // 运力区域
runTypeList: ['1'], // 业务类型选择 runTypeList: ['1'], // 业务类型选择
orderSourceList: dataSource.applyOrderSourceList, // 订单来源 // orderSourceList: dataSource.applyOrderSourceList, // 订单来源
waybillStatusList: ['0', '1', '2', '3', '4', '6', '11', '12', '13', '14', '15', '16'], // 订单状态 orderSourceList:[],
paymentStatusList: ['1', '2'], // 支付状态 waybillStatusList: [], // 订单状态
paymentStatusList: [], // 支付状态
placeOrderTimeList: [], // 下单时间 默认显示当前时间到一周前 placeOrderTimeList: [], // 下单时间 默认显示当前时间到一周前
useCarTimeList: [], // 用车时间 默认显示当前时间到一周后 useCarTimeList: [], // 用车时间 默认显示当前时间到一周后
searchStr: '', // 搜索内容 searchStr: '', // 搜索内容
...@@ -509,7 +510,7 @@ export default { ...@@ -509,7 +510,7 @@ export default {
orderId: '',//订单号 orderId: '',//订单号
channelNumber: '',//渠道单号 channelNumber: '',//渠道单号
reserveTypeList: [1, 2],//服务类型 reserveTypeList: [],//服务类型
vehicleTypes: [],//接单车型 vehicleTypes: [],//接单车型
plateNumber: '',//车牌号 plateNumber: '',//车牌号
driverPhone: '',//司机电话 driverPhone: '',//司机电话
...@@ -872,6 +873,7 @@ export default { ...@@ -872,6 +873,7 @@ export default {
copy: 'channelNumber', copy: 'channelNumber',
renderFun: row => this.orderSourcefun(row) renderFun: row => this.orderSourcefun(row)
}, },
{ {
prop: 'orderId', prop: 'orderId',
attrs: { width: 160 }, attrs: { width: 160 },
...@@ -981,7 +983,7 @@ export default { ...@@ -981,7 +983,7 @@ export default {
this.dataSource.localTransportId = data.localTransportId//承接运力 this.dataSource.localTransportId = data.localTransportId//承接运力
this.OperationalData = this.dataSource.OperationalData//运营区域 this.OperationalData = this.dataSource.OperationalData//运营区域
this.OperationalDataType = [{ id: 1, name: '实时单' }, { id: 2, name: '预约单' }];//运单类型 this.OperationalDataType = [{ id: 1, name: '实时单' }, { id: 2, name: '预约单' }];//运单类型
this.dataSource.waybillStatusList = data.waybillStatusList//运单状态 // this.dataSource.waybillStatusList = data.waybillStatusList//运单状态
this.carTypeList = data.vehicleTypes//接单车型 this.carTypeList = data.vehicleTypes//接单车型
this.OperationalData = data.OperationalData; this.OperationalData = data.OperationalData;
this.selectResult.weybillFlag = 'createTime' this.selectResult.weybillFlag = 'createTime'
...@@ -1001,7 +1003,7 @@ export default { ...@@ -1001,7 +1003,7 @@ export default {
//车型默认 vehicleTypes //车型默认 vehicleTypes
let selectIndex = []; let selectIndex = [];
data.vehicleTypes.forEach((item, index) => { selectIndex.push(item.id) }) data.vehicleTypes.forEach((item, index) => { selectIndex.push(item.id) })
this.selectResult.vehicleTypes = selectIndex // this.selectResult.vehicleTypes = selectIndex
}, },
getDATAlIST() { getDATAlIST() {
this.dialogVisibleSTATUS = false this.dialogVisibleSTATUS = false
...@@ -1060,7 +1062,7 @@ export default { ...@@ -1060,7 +1062,7 @@ export default {
let json = { let json = {
platformId: JSON.parse(this.platformId).platformId, platformId: JSON.parse(this.platformId).platformId,
page: 1, page: 1,
rows: 50 rows: 999
} }
await getAllTransport(json, this.brandUrl).then(res => { await getAllTransport(json, this.brandUrl).then(res => {
if (res.status == 200) { if (res.status == 200) {
...@@ -1498,7 +1500,7 @@ export default { ...@@ -1498,7 +1500,7 @@ export default {
}, },
DateChange(val, type) { DateChange(val, type) {
if (type == 1) { if (type == 1) {
this.selectResult.useCarTimeList = [] // this.selectResult.useCarTimeList = []
if (!!this.selectResult.placeOrderTimeList && this.selectResult.placeOrderTimeList.length > 0) { if (!!this.selectResult.placeOrderTimeList && this.selectResult.placeOrderTimeList.length > 0) {
let end = this.selectResult.placeOrderTimeList[1] let end = this.selectResult.placeOrderTimeList[1]
this.selectResult.placeOrderTimeList[1] = end + 8.64e7 - 1000 this.selectResult.placeOrderTimeList[1] = end + 8.64e7 - 1000
...@@ -1506,7 +1508,7 @@ export default { ...@@ -1506,7 +1508,7 @@ export default {
this.selectResult.placeOrderTimeList = [] this.selectResult.placeOrderTimeList = []
} }
} else { } else {
this.selectResult.placeOrderTimeList = [] // this.selectResult.placeOrderTimeList = []
if (!!this.selectResult.useCarTimeList && this.selectResult.useCarTimeList.length > 0) { if (!!this.selectResult.useCarTimeList && this.selectResult.useCarTimeList.length > 0) {
let end = this.selectResult.useCarTimeList[1] let end = this.selectResult.useCarTimeList[1]
this.selectResult.useCarTimeList[1] = end + 8.64e7 - 1000 this.selectResult.useCarTimeList[1] = end + 8.64e7 - 1000
...@@ -1665,8 +1667,9 @@ export default { ...@@ -1665,8 +1667,9 @@ export default {
return code return code
}, },
orderSourcefun({ data }) { orderSourcefun({ data }) {
// return data.detail.orderSource
let code = '' let code = ''
let orderSourcesText = this.orderSourcefun(data.detail.orderSource) let orderSourcesText = this.orderSourcesNew(data.detail.orderSource)
code = `<div>${orderSourcesText}</div>` code = `<div>${orderSourcesText}</div>`
return code return code
}, },
...@@ -1749,6 +1752,12 @@ export default { ...@@ -1749,6 +1752,12 @@ export default {
.el-card__body { .el-card__body {
padding: 10px 20px; padding: 10px 20px;
} }
.el-dialog__header{
padding: 20px 20px 10px;
}
.el-dialog__body{
padding: 30px 20px;
}
} }
} }
......
src/views/notice/noticeList.vue
...@@ -3,11 +3,11 @@ ...@@ -3,11 +3,11 @@
<el-row v-if="isAll"> <el-row v-if="isAll">
<el-row type="flex" justify="space-between"> <el-row type="flex" justify="space-between">
<div class="top-title"> <div class="top-title">
全部公告 已接收公告
</div> </div>
<el-button style="margin-left: 10px;padding: 7px 15px;border-color: #3C6CF1;color: #3C6CF1;" @click="() => isAll = !isAll"> <!-- <el-button style="margin-left: 10px;padding: 7px 15px;border-color: #3C6CF1;color: #3C6CF1;" @click="() => isAll = !isAll">
已发布公告 已发布公告
</el-button> </el-button> -->
</el-row> </el-row>
<all-notice-list></all-notice-list> <all-notice-list></all-notice-list>
</el-row> </el-row>
...@@ -16,9 +16,9 @@ ...@@ -16,9 +16,9 @@
<div class="top-title"> <div class="top-title">
已发布公告 已发布公告
</div> </div>
<el-button style="margin-left: 10px;padding: 7px 15px;border-color: #3C6CF1;color: #3C6CF1;" @click="() => isAll = !isAll"> <!-- <el-button style="margin-left: 10px;padding: 7px 15px;border-color: #3C6CF1;color: #3C6CF1;" @click="() => isAll = !isAll">
全部公告 全部公告
</el-button> </el-button> -->
</el-row> </el-row>
<push-notice-list></push-notice-list> <push-notice-list></push-notice-list>
</el-row> </el-row>
...@@ -34,6 +34,21 @@ export default { ...@@ -34,6 +34,21 @@ export default {
pushNoticeList, pushNoticeList,
allNoticeList allNoticeList
}, },
watch: {
'$route': { // $route可以用引号，也可以不用引号 监听的对象
handler(to, from) {
if (to.path == "/notice/push-notice-list") {
this.isAll = false
} else {
this.isAll = true
}
},
deep: true, // 深度观察监听 设置为 true
immediate: true, // 第一次初始化渲染就可以监听到
}
},
data() { data() {
return { return {
isAll: true isAll: true
......
src/views/platform/regionManage.vue
...@@ -146,11 +146,12 @@ export default { ...@@ -146,11 +146,12 @@ export default {
} }
}, },
async created() { async created() {
await this.getPCAInfo();
if (this.brandLists.length > 0) { if (this.brandLists.length > 0) {
this.getPlatformInfo(); await this.getPlatformInfo();
await this.getTableList(); await this.getTableList();
} }
await this.getPCAInfo();
// await this.getPlatformList(); // await this.getPlatformList();
}, },
computed: { computed: {
......
src/views/transports/car.vue
...@@ -58,6 +58,7 @@ ...@@ -58,6 +58,7 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-button type="primary" size="mini" @click="searchByInfo">查询</el-button> <el-button type="primary" size="mini" @click="searchByInfo">查询</el-button>
<el-button type="primary" size="mini" @click="ListToExcel">导出</el-button>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
...@@ -150,12 +151,14 @@ ...@@ -150,12 +151,14 @@
import Selects from '@/components/Selects'; import Selects from '@/components/Selects';
import dataSource from "@/libs/screen"; import dataSource from "@/libs/screen";
import JudgeType from "@/mixins/judgeType"; import JudgeType from "@/mixins/judgeType";
import { Loading } from 'element-ui'
import { import {
getAllprovinceAndCity, delcar getAllprovinceAndCity, delcar
} from "@/port/set-request"; } from "@/port/set-request";
import { import {
carQuery, carQuery,
getAllTransport getAllTransport,
downLoadVehicle
} from "@/port/carOrDriver/carOrDriver"; } from "@/port/carOrDriver/carOrDriver";
export default { export default {
...@@ -205,7 +208,7 @@ export default { ...@@ -205,7 +208,7 @@ export default {
// 参数集合 // 参数集合
selectResult: { selectResult: {
transportList: [], transportList: [],
driverTypeList: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17], driverTypeList: dataSource.driverTypeListABC,
auditStatusList: [1, 2], auditStatusList: [1, 2],
serviceStatusList: [1, 2, 3], serviceStatusList: [1, 2, 3],
runStatus: [1, 2, 3, 4], runStatus: [1, 2, 3, 4],
...@@ -223,16 +226,53 @@ export default { ...@@ -223,16 +226,53 @@ export default {
await this.initTable(); await this.initTable();
}, },
methods: { methods: {
ListToExcel(){
if (this.total <= 0) {
this.$message.error("导出的数据不存在")
return
}
if (this.total >= 15000) {
this.$message.error("导出的数据量超过15000条会导致服务器带宽异常,请分批导出")
return
}
let json = {
commercialTypeList: this.selectResult.auditStatusList,
operateOrgIdList: this.selectResult.transportList,
runStatus: this.selectResult.serviceStatusList,
serviceStatus: this.selectResult.runStatus,
vehicleTypeList: this.selectResult.driverTypeList,
searchStr: this.selectResult.searchStr,
pageVo: {
page: this.page,
rows: this.size
},
platformId: this.$store.getters.platformId,
regionCode: this.selectResult.areaCodeList.length > 0 ? this.selectResult.areaCodeList[this.selectResult.areaCodeList.length - 1] : '',
warrantStatus: this.selectResult.warrantStatus,
}
let loadingInstance = Loading.service({fullscreen: true, text: '车辆列表正在导出，请稍后'});
downLoadVehicle(json).then(res => {
let blob = new Blob([res], { type: 'application/vnd.ms-excel;charset=utf-8' })
var link = document.createElement('a')
link.href = window.URL.createObjectURL(blob)
link.download = '车辆列表.xls'
link.click()
loadingInstance.close()
}).catch(err => {
this.$message.error('导出失败')
loadingInstance.close()
})
},
delCAar(row) { delCAar(row) {
this.$confirm(`确定删除该（${row.plateNumber}）该车辆相关信息, 删除后不可撤回，请谨慎操作?`, '提示', { this.$confirm(`确定删除该（${row.plateNumber}）该车辆相关信息, 删除后不可撤回，请谨慎操作?`, '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then((da) => { }).then((da) => {
let json = { let json = {
platenumber: row.plateNumber platenumber: row.plateNumber
} }
......
src/views/transports/driver.vue
...@@ -60,6 +60,7 @@ ...@@ -60,6 +60,7 @@
</el-col> </el-col>
<el-col :span="8" :offset="8"> <el-col :span="8" :offset="8">
<el-button type="primary" size="mini" @click="searchByInfo">查询</el-button> <el-button type="primary" size="mini" @click="searchByInfo">查询</el-button>
<el-button type="primary" size="mini" @click="ListToExcel">导出</el-button>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
...@@ -183,12 +184,14 @@ ...@@ -183,12 +184,14 @@
import Selects from '@/components/Selects'; import Selects from '@/components/Selects';
import dataSource from "@/libs/screen"; import dataSource from "@/libs/screen";
import JudgeType from "@/mixins/judgeType"; import JudgeType from "@/mixins/judgeType";
import { Loading } from 'element-ui'
import { import {
getAllprovinceAndCity, getAllprovinceAndCity,
} from "@/port/set-request"; } from "@/port/set-request";
import { import {
driverQuery, driverQuery,
getAllTransport getAllTransport,
downLoadDriver
} from "@/port/carOrDriver/carOrDriver"; } from "@/port/carOrDriver/carOrDriver";
export default { export default {
...@@ -256,6 +259,46 @@ export default { ...@@ -256,6 +259,46 @@ export default {
await this.initTable(); await this.initTable();
}, },
methods: { methods: {
ListToExcel(){
if (this.total <= 0) {
this.$message.error("导出的数据不存在")
return
}
if (this.total >= 15000) {
this.$message.error("导出的数据量超过15000条会导致服务器带宽异常,请分批导出")
return
}
let json = {
commercialTypeList: this.selectResult.auditStatusList,
operateOrgIdList: this.selectResult.transportList,
runStatus: this.selectResult.serviceStatusList,
serviceStatus: this.selectResult.runStatus,
driverTypeList: this.selectResult.driverTypeList,
searchStr: this.selectResult.searchStr,
pageVo: {
page: this.page,
rows: this.size
},
platformId: this.$store.getters.platformId,
operateCode: this.selectResult.areaCodeList.length > 0 ? this.selectResult.areaCodeList[this.selectResult.areaCodeList.length - 1] : '',
networkPaperStatus: this.selectResult.networkPaperStatus,
};
let loadingInstance = Loading.service({fullscreen: true, text: '司机列表正在导出，请稍后'});
downLoadDriver(json).then(res => {
let blob = new Blob([res], { type: 'application/vnd.ms-excel;charset=utf-8' })
var link = document.createElement('a')
link.href = window.URL.createObjectURL(blob)
link.download = '司机列表.xls'
link.click()
loadingInstance.close()
}).catch(err => {
this.$message.error('导出失败')
loadingInstance.close()
})
},
carDetail(row) { carDetail(row) {
this.$router.push({path: '/transports/driver-detail', query: {id: row.userId, type: row}}) this.$router.push({path: '/transports/driver-detail', query: {id: row.userId, type: row}})
}, },
......
src/views/transports/driverDetail.vue
...@@ -155,57 +155,136 @@ ...@@ -155,57 +155,136 @@
</el-card> </el-card>
<!-- 驾驶证信息--> <!-- 驾驶证信息-->
<el-card class="box-card" style="margin-top: 20px"> <el-card class="box-card" style="margin-top: 20px">
<el-row> <div slot="header" class="clearfix" style="
<div class="title-left"> display: flex;
驾驶证信息 align-items: center;
justify-content: start;
">
<span>驾驶证信息</span>
<div style="margin-left:10px"> <el-button style="pointer-events: none;" :type="tableData.auditStatus == 1 ? 'primary' : tableData.auditStatus == 2 ? 'danger' : 'success'" size="mini" plain> {{ tableData.auditStatus == 1 ? '已通过' : tableData.auditStatus == 2 ? '已驳回' : '未审核' }} </el-button> </div>
</div>
<div class="img-text-part">
<div>
<span>驾驶证：</span>
<div v-if="tableData.driverLicenseJson">
<el-image v-if="tableData.driverLicenseJson.certificatesIco"
style="width: 100px; height: 100px; margin-right: 20px" :src="tableData.driverLicenseJson.certificatesIco"
:preview-src-list="srcList"></el-image>
<el-image v-if="tableData.driverLicenseJson.certificatesIcocopy" style="width: 100px; height: 100px"
:src="tableData.driverLicenseJson.certificatesIcocopy" :preview-src-list="srcList1"></el-image>
</div>
</div>
<div v-if="tableData.driverLicenseJson" style="flex: 1;">
<p>
<span>驾驶证号：</span><span>{{ tableData.driverLicenseJson.CertificateNum }}</span>
</p>
<p>
<span>初次领证日期：</span><span>{{ tableData.driverLicenseJson.licenseTime }}</span>
</p>
<p>
<span>准驾车型：</span><span>{{ tableData.driverLicenseJson.licenseType }}</span>
</p>
<p>
<span>性别：</span><span>{{ tableData.driverLicenseJson.driverGender || '/' }}</span>
</p>
<p>
<span>民族：</span><span>{{ tableData.driverLicenseJson.nation || '/' }}</span>
</p>
<p>
<span>有效期：</span><span>{{ tableData.driverLicenseJson.licenseOf || tableData.driverLicenseJson.licenseTime }} -
{{ tableData.driverLicenseJson.timeEnd || '/' }}</span>
</p>
<p>
<span>档案编号：</span><span>{{ tableData.driverLicenseJson.CertificateNum }}</span>
</p>
<p>
<span>住址：</span><span>{{ tableData.driverLicenseJson.censusAddress || '/' }}</span>
</p>
</div>
</div>
</el-card>
<el-card class="box-card" style="margin: 20px 0" v-if="!isEmptyObject(certificationInfo)">
<div slot="header" class="clearfix" style="
display: flex;
align-items: center;
justify-content: start;
">
<span>网约车资格证:</span>
<div style="margin-left:10px"> <el-button style="pointer-events: none;" :type="certificationInfo.status == 1 ? 'primary' : certificationInfo.status == 2 ? 'danger' : 'success'" size="mini" plain> {{ certificationInfo.status == 1 ? '已通过' : certificationInfo.status == 2 ? '已驳回' : '未审核' }} </el-button> </div>
</div>
<div class="img-text-part">
<div>
<span>网约车资格证：</span>
<div>
<el-image v-if="certificationInfo.imgUrl" style="width: 100px; height: 100px; margin-right: 20px"
:src="certificationInfo.imgUrl" :preview-src-list="srcList5"></el-image>
</div>
</div>
<div style="flex: 1;
margin-left: 50px;">
<el-tabs tab-position="left" v-if="JSON.parse(certificationInfo.type).length > 0">
<el-tab-pane :label="item.category" v-for="item in JSON.parse(certificationInfo.type)" :key="item.value"
:value="item.value">
<div style="display: flex;align-items: start;flex-direction: column;">
<div class="certificationInfoBox">
<div>许可证号:</div>
<div>{{ certificationInfo.networkPapersNo }}</div>
</div> </div>
</el-row>
<div class="img-text-part" style="margin-top: 10px;"> <div class="certificationInfoBox">
<div> <div>发证日期:</div>
<span>驾驶证：</span> <div>{{ item.timeDate || '/' }}</div>
<div v-if="tableData.driverLicenseJson">
<el-image
v-if="tableData.driverLicenseJson.certificatesIco"
style="width: 100px; height: 100px; margin-right: 20px"
:src="tableData.driverLicenseJson.certificatesIco"
:preview-src-list="srcList"
></el-image>
<el-image
v-if="tableData.driverLicenseJson.certificatesIcocopy"
style="width: 100px; height: 100px"
:src="tableData.driverLicenseJson.certificatesIcocopy"
:preview-src-list="srcList1"
></el-image>
</div>
</div> </div>
<div v-if="tableData.driverLicenseJson"> <div class="certificationInfoBox">
<p> <div>发证机构:</div>
<span>驾驶证号：</span <div>{{ item.trspost || '/' }}</div>
><span>{{ tableData.driverLicenseJson.CertificateNum }}</span>
</p>
<p>
<span>初次领证日期：</span
><span>{{ tableData.driverLicenseJson.licenseTime }}</span>
</p>
<p>
<span>准驾车型：</span
><span>{{ tableData.driverLicenseJson.licenseType }}</span>
</p>
<p>
<span>截止日期：</span
><span>{{ tableData.driverLicenseJson.timeEnd }}</span>
</p>
<p>
<span>档案编号：</span
><span>{{ tableData.driverLicenseJson.CertificateNum }}</span>
</p>
</div> </div>
</div> <div class="certificationInfoBox">
<div v-if="this.type == 0" class="car-detail-button"> <div>初次领取资格证日期:</div>
<el-button @click="clickQD">驳回</el-button> <div>{{ item.datestar || '/' }}</div>
<el-button type="primary" @click="clickQX">通过审核</el-button> </div>
</div> <div class="certificationInfoBox">
</el-card> <div>资格证有效起止日期:</div>
<div>{{ item.timeSta || item.datestar }}-{{ item.dateEnd }}</div>
</div>
</div>
</el-tab-pane>
</el-tabs>
<div v-else>
<p>
<span>姓名：</span><span>{{ certificationInfo.dirverName }}</span>
</p>
<p>
<span>证号：</span><span>{{ certificationInfo.networkPapersNo }}</span>
</p>
<p>
<span>有效起始日期：</span><span>{{ !certificationInfo.getTime ? '/' : (certificationInfo.getTime | dateFilter)
}}</span>
</p>
<p>
<span>有效期限：</span><span>{{ !certificationInfo.validTime ? '/' : (certificationInfo.getTime | dateFilter)
}}</span>
</p>
</div>
</div>
</div>
<!-- <div v-if="certificationInfo.status == 0" class="car-detail-button">
<el-button @click="clickQD('certification')" size="small">驳回
</el-button>
<el-button type="primary" @click="clickQX('certification')" size="small">通过审核
</el-button>
</div> -->
</el-card>
<!-- 暂无接口--> <!-- 暂无接口-->
<el-card <el-card
class="box-card" class="box-card"
...@@ -790,4 +869,18 @@ export default { ...@@ -790,4 +869,18 @@ export default {
line-height: 30px; line-height: 30px;
} }
} }
.certificationInfoBox {
display: flex;
align-items: center;
padding: 8px;
div {
// padding: 0 10px;
padding-left: 10px;
}
}
.certificationInfoBox>div:nth-child(2) {
padding: 0 5px;
}
</style> </style>
src/views/transports/transport.vue
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
<el-row style="margin-top: 10px;"> <el-row style="margin-top: 10px;">
<el-form> <el-form>
<el-col :span="12"> <el-col :span="6">
<el-input v-model="form.searchParam" placeholder="请输入运力方简称/营业执照名称" size="mini" style="width: 90%;" suffix-icon="el-icon-search"></el-input> <el-input v-model="form.searchParam" placeholder="请输入运力方简称/营业执照名称" size="mini" style="width: 90%" suffix-icon="el-icon-search"></el-input>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<Selects :options="platformList" sizeType="mini" <Selects :options="platformList" sizeType="mini"
......
src/views/vehicleSeries/index.vue
...@@ -428,7 +428,7 @@ export default { ...@@ -428,7 +428,7 @@ export default {
], ],
modelName: [ modelName: [
{ required: true, message: '型号名称', trigger: 'blur' }, { required: true, message: '型号名称', trigger: 'blur' },
{ min: 2, max: 20, message: '长度在 2 到 20 个字符', trigger: 'blur' }, { min: 2, max: 50, message: '长度在 2 到 50 个字符', trigger: 'blur' },
], ],
carType: [ carType: [
......
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