Skip to content

X
xoadoPlatform
Commit 4240f4f8 by weix
Options

修改bug

parent 6188c695
Showing with 149 additions and 53 deletions
.env.development
...@@ -5,15 +5,15 @@ VUE_APP_BASE_API1 = 'https://apps.xoado.com' ...@@ -5,15 +5,15 @@ 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 = 'https://aitransport.xoado.com'
VUE_APP_BASE_API5 = 'http://192.168.0.251:8181/brand' VUE_APP_BASE_API5 = 'https://aitransport.xoado.com/brand'
VUE_APP_BASE_API6 = 'http://192.168.0.251:8182/transport' VUE_APP_BASE_API6 = 'https://projects.xoado.com/transport'
VUE_APP_BASE_API7 = 'http://192.168.0.251:8185/operate' VUE_APP_BASE_API7 = 'https://projects.xoado.com/operate'
VUE_APP_BASE_API8 = 'http://192.168.0.251:8183/trace' VUE_APP_BASE_API8 = 'https://projects.xoado.com/trace'
VUE_APP_BASE_API9 = 'http://192.168.0.251:8195/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://192.168.0.251:8195' 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://192.168.0.251:8199/smart' VUE_APP_BASE_API15 = 'https://aitransport.xoado.com/smart'
.env.production
...@@ -5,15 +5,15 @@ VUE_APP_BASE_API1 = 'https://apps.xoado.com' ...@@ -5,15 +5,15 @@ 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 = 'https://aitransport.xoado.com'
VUE_APP_BASE_API5 = 'http://192.168.0.251:8181/brand' VUE_APP_BASE_API5 = 'https://aitransport.xoado.com/brand'
VUE_APP_BASE_API6 = 'http://192.168.0.251:8182/transport' VUE_APP_BASE_API6 = 'https://projects.xoado.com/transport'
VUE_APP_BASE_API7 = 'http://192.168.0.251:8185/operate' VUE_APP_BASE_API7 = 'https://projects.xoado.com/operate'
VUE_APP_BASE_API8 = 'http://192.168.0.251:8183/trace' VUE_APP_BASE_API8 = 'https://projects.xoado.com/trace'
VUE_APP_BASE_API9 = 'http://192.168.0.251:8195/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://192.168.0.251:8195' 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://192.168.0.251:8199/smart' VUE_APP_BASE_API15 = 'https://aitransport.xoado.com/smart'
src/libs/screen.js
...@@ -146,6 +146,53 @@ const dataSource = { ...@@ -146,6 +146,53 @@ const dataSource = {
'name': '客服录单' 'name': '客服录单'
} }
], ],
'orderSourceListNew': [
{
'id': '1',
'name': '小多出行'
},
{
'id': '2',
'name': '美团打车'
},
{
'id': '3',
'name': '航旅纵横'
},
{
'id': '4',
'name': '自营司机（面对面下单）'
},
{
'id': '5',
'name': '滴滴出行'
},
{
'id': '6',
'name': '自营微信小程序'
},
{
'id': '7',
'name': '自营客服'
},
{
'id': '8',
'name': '高德打车'
},
{
'id': '9',
'name': '同程艺龙'
},
{
'id': '10',
'name': '携程旅游'
},
{
'id': '11',
'name': '飞猪旅行'
}
],
'applyOrderSourceList' : ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11'],
'orderChannelList': [ 'orderChannelList': [
{ {
'id': '6', 'id': '6',
......
src/mixins/judgeType.js
...@@ -108,6 +108,45 @@ export default { ...@@ -108,6 +108,45 @@ export default {
default : default :
} }
}, },
orderSourcesNew(orderSource) {
let type = Number(orderSource)
switch (type) {
case 1:
return '小多出行'
case 2:
return '美团打车'
case 3:
return '航旅纵横'
case 4:
return '自营司机（面对面下单）'
case 5:
return '滴滴出行'
case 6:
return '自营微信小程序'
case 7:
return '自营客服'
case 8:
return '高德打车'
case 9:
return '同程艺龙'
case 10:
return '携程旅游'
case 11:
return '飞猪旅行'
default :
}
},
orderSourcesSpecial(orderSource) { orderSourcesSpecial(orderSource) {
let type = Number(orderSource) let type = Number(orderSource)
switch (type) { switch (type) {
......
src/port/set-request.js
...@@ -496,9 +496,9 @@ export function getTransportListForProductId(productId) { ...@@ -496,9 +496,9 @@ export function getTransportListForProductId(productId) {
} }
/* 用户操作日志接口信息 */ /* 用户操作日志接口信息 */
export function userLog(data) { export function userLog(data, u, platformId) {
const url = process.env.VUE_APP_BASE_API5 + '/operate/log' const url = (u ? u + '/brand' : targetBaseUrl) + '/operate/log'
return post(url, data) return post(url, data, platformId)
} }
/* 通过区域id查询运营区域管理人员 */ /* 通过区域id查询运营区域管理人员 */
...@@ -1122,9 +1122,9 @@ export function exportCycleBills(data = {}) { ...@@ -1122,9 +1122,9 @@ export function exportCycleBills(data = {}) {
} }
/* 客诉管理---查询客诉 */ /* 客诉管理---查询客诉 */
export function getComplaintById(id) { export function getComplaintById(id, u, platformId) {
const url = targetBaseUrl + `/complaint?complaintId=${id}` const url = (u ? u + '/brand' : targetBaseUrl) + `/complaint?complaintId=${id}`
return get(url) return get(url, platformId)
} }
/* 车辆管理---品牌查询 */ /* 车辆管理---品牌查询 */
......
src/store/modules/business.js
...@@ -18,7 +18,7 @@ const mutations = { ...@@ -18,7 +18,7 @@ const mutations = {
sessionStorage.setItem('areaCodeObj', payload) sessionStorage.setItem('areaCodeObj', payload)
}, },
SET_ORDERDETAIL(state, payload) { SET_ORDERDETAIL(state, payload) {
state.areaCodeObj = String(payload) state.orderDetail = payload
sessionStorage.setItem('orderDetail', payload) sessionStorage.setItem('orderDetail', payload)
}, },
SET_COMPLANT(state, payload) { SET_COMPLANT(state, payload) {
......
src/views/business/complaintList/complaintDetail.vue
...@@ -256,10 +256,11 @@ export default { ...@@ -256,10 +256,11 @@ export default {
this.$message.error("复制错误"); this.$message.error("复制错误");
}, },
toOrderDetail() { toOrderDetail() {
this.$router.push({path: 'order-Details', query: {orderId: this.$route.query.orderId}}) this.$router.push({path: 'order-Detail', query: {orderId: this.$route.query.orderId}})
}, },
getOrderInfo() { getOrderInfo() {
getThisorderInfo([this.$route.query.orderId]) let item = this.$store.getters.orderDetail
getThisorderInfo([this.$route.query.orderId], item.brandUrl, item.platformId)
.then((res) => { .then((res) => {
if(res.status === 200) { if(res.status === 200) {
if(res.data.content.length === 0) { if(res.data.content.length === 0) {
...@@ -274,7 +275,8 @@ export default { ...@@ -274,7 +275,8 @@ export default {
}) })
}, },
getComplainInfo() { getComplainInfo() {
getComplaintById(this.$route.query.id) let item = this.$store.getters.orderDetail
getComplaintById(this.$route.query.id, item.brandUrl, item.platformId)
.then((res) => { .then((res) => {
if(res.status === 200) { if(res.status === 200) {
this.complaintInfo = res.data.complaint; this.complaintInfo = res.data.complaint;
......
src/views/business/complaintList/components/item.vue
...@@ -155,7 +155,8 @@ export default { ...@@ -155,7 +155,8 @@ export default {
this.$message.error("复制错误"); this.$message.error("复制错误");
}, },
handledbClick(row) { handledbClick(row) {
console.log(row) let search = this.searchInfo;
this.$store.commit('business/SET_ORDERDETAIL', JSON.stringify({brandUrl: search.brandUrl, platformId: JSON.parse(search.platformId).platformId}));
this.$router.push({path: '/business/complaint-detail', query: {id: row.complaintId, orderId: row.orderId}}) this.$router.push({path: '/business/complaint-detail', query: {id: row.complaintId, orderId: row.orderId}})
}, },
// table变色，行 // table变色，行
......
src/views/business/complaintList/index.vue
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
@changeList="handlechangeList"></Selects> @changeList="handlechangeList"></Selects>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<Selects :options="dataSource.orderSourceList" <Selects :options="dataSource.orderSourceListNew"
:selectName="'订单来源：'" :selectName="'订单来源：'"
:type="'orderSourceList'" :type="'orderSourceList'"
@changeList="handlechangeList"></Selects> @changeList="handlechangeList"></Selects>
...@@ -105,7 +105,7 @@ export default { ...@@ -105,7 +105,7 @@ export default {
orderInfo: '', orderInfo: '',
dateTime: [], dateTime: [],
platformId: '', platformId: '',
orderSourceList: ['4', '6', '7', '9', '10'], orderSourceList: dataSource.applyOrderSourceList,
complainWay: ['1', '2'], complainWay: ['1', '2'],
complainCategory: ['1', '2'], complainCategory: ['1', '2'],
processingStatus: ['0', '1', '2'], processingStatus: ['0', '1', '2'],
......
src/views/business/orderManagement/index.vue
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
@changeList="handlechangeList"></Selects> @changeList="handlechangeList"></Selects>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<Selects :options="dataSource.orderSourceList" :selectName="'订单来源：'" :type="'orderSourceList'" <Selects :options="dataSource.orderSourceListNew" :selectName="'订单来源：'" :type="'orderSourceList'"
@changeList="handlechangeList"></Selects> @changeList="handlechangeList"></Selects>
</el-col> </el-col>
</el-row> </el-row>
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
<div></div> <div></div>
</div> </div>
<div> <div>
<Table :config="config" @orderClick="orderClick" <Table v-if="flag" :config="config" @orderClick="orderClick"
@sortChange="sortChange"></Table> @sortChange="sortChange"></Table>
</div> </div>
<div class="bottom-part"> <div class="bottom-part">
...@@ -196,11 +196,13 @@ export default { ...@@ -196,11 +196,13 @@ export default {
searchStr: '', // 搜索条件 searchStr: '', // 搜索条件
placeOrderTimeList: [], // 下单时间 placeOrderTimeList: [], // 下单时间
useCarTimeList: [], // 用车时间 useCarTimeList: [], // 用车时间
orderSourceList: ['4', '6', '7', '9', '10'], // 订单来源 orderSourceList: dataSource.applyOrderSourceList, // 订单来源
runTypeList: ['1'], // 运营类型 runTypeList: ['1'], // 运营类型
statusList: ['0', '1', '2', '3', '4', '5', '6', '11', '12', '13', '14', '15'], // 订单状态 statusList: ['0', '1', '2', '3', '4', '5', '6', '11', '12', '13', '14', '15'], // 订单状态
tpaymentStatusList: ['1', '2'], // 支付状态 tpaymentStatusList: ['1', '2'], // 支付状态
transportIdList: [], // 运力方ID transportIdList: [], // 运力方ID
order: 'desc',
orderFlag: 'appointmentTime',
pageVo: { pageVo: {
page: 1, page: 1,
rows: 10 rows: 10
...@@ -502,6 +504,10 @@ export default { ...@@ -502,6 +504,10 @@ export default {
async created() { async created() {
let clientHeights = document.documentElement.clientHeight; let clientHeights = document.documentElement.clientHeight;
this.TableHeight = clientHeights - 310; this.TableHeight = clientHeights - 310;
const end = new Date();
const start = new Date();
start.setTime(start.getTime() + 8.64e7 - 3600 * 1000 * 24 * 7);
this.selectResult.placeOrderTimeList = [new Date(start.toDateString()).getTime(), new Date(end.toDateString()).getTime() + 8.64e7 - 1000];
await this.getAllPlatform() await this.getAllPlatform()
await this.getOpenAreaListFun() await this.getOpenAreaListFun()
await this.getTransport() await this.getTransport()
...@@ -545,12 +551,12 @@ export default { ...@@ -545,12 +551,12 @@ export default {
async getAllPlatform() { async getAllPlatform() {
await getplatformList().then(async (res) => { await getplatformList().then(async (res) => {
if (res.status == 200) { if (res.status == 200) {
res.data.forEach((element) => { this.platformList = res.data.map((element) => {
if(element.brandUrl) { if(element.brandUrl) {
this.platformList.push({ return {
value: JSON.stringify(element), value: JSON.stringify(element),
label: element.name, label: element.name,
}); };
} }
}); });
this.platform = this.platformList.length > 0 ? this.platformList[0].value : ''; this.platform = this.platformList.length > 0 ? this.platformList[0].value : '';
...@@ -599,7 +605,7 @@ export default { ...@@ -599,7 +605,7 @@ export default {
* 获取自定义列表数据 * 获取自定义列表数据
* */ * */
async getOrderHeaders() { async getOrderHeaders() {
// this.flag = false this.flag = false
let json = { let json = {
key: this.$store.getters.platformId key: this.$store.getters.platformId
} }
...@@ -643,20 +649,20 @@ export default { ...@@ -643,20 +649,20 @@ export default {
} else { } else {
this.config.data = obj.data this.config.data = obj.data
} }
// this.flag = true this.flag = true
console.log(this.config) console.log(this.config)
} else { } else {
this.config.data = obj.data this.config.data = obj.data
} }
}) })
this.loading = false this.loading = false
// this.flag = true this.flag = true
}, },
/** /**
* 存储自定义表头 * 存储自定义表头
* */ * */
async setHeaders(val) { async setHeaders(val) {
// this.flag = false this.flag = false
// val是传过来的头部数组信息 // val是传过来的头部数组信息
console.info(val) console.info(val)
let json = { let json = {
...@@ -682,7 +688,7 @@ export default { ...@@ -682,7 +688,7 @@ export default {
}) })
this.config.headers = NewArray this.config.headers = NewArray
this.$nextTick(() => { this.$nextTick(() => {
// this.flag = true; this.flag = true;
}) })
this.dialogVisible = false this.dialogVisible = false
}, },
...@@ -758,8 +764,8 @@ export default { ...@@ -758,8 +764,8 @@ export default {
this.selectResult.orderFlag = column.prop; this.selectResult.orderFlag = column.prop;
this.selectResult.order = 'asc'; this.selectResult.order = 'asc';
} else { } else {
this.selectResult.orderFlag = ''; this.selectResult.orderFlag = 'appointmentTime';
this.selectResult.order = ''; this.selectResult.order = 'desc';
} }
this.sortRule.order = column.order; this.sortRule.order = column.order;
this.sortRule.prop = column.prop; this.sortRule.prop = column.prop;
......
src/views/business/orderManagement/orderDetail.vue
...@@ -509,7 +509,8 @@ export default { ...@@ -509,7 +509,8 @@ export default {
options: [], options: [],
options1: [] options1: []
}; };
userLog(json).then(res => { let item = this.$store.getters.orderDetail
userLog(json, item.brandUrl, item.platformId).then(res => {
if (res.status == 200) { if (res.status == 200) {
if (res.data) { if (res.data) {
this.getOrderLogList = res.data.content; this.getOrderLogList = res.data.content;
......
src/views/business/waybillManagement/index.vue
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
<el-row type="flex" class="row-bg" justify="space-between"> <el-row type="flex" class="row-bg" justify="space-between">
<el-col :span="8"> <el-col :span="8">
<Selects :selectName="'运单来源：'" :type="'orderSourceList'" :options="dataSource.orderSourceList" <Selects :selectName="'运单来源：'" :type="'orderSourceList'" :options="dataSource.orderSourceListNew"
@changeList="handlechangeList"></Selects> @changeList="handlechangeList"></Selects>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
...@@ -230,7 +230,7 @@ export default { ...@@ -230,7 +230,7 @@ export default {
transportIdList: [], transportIdList: [],
areaCodeList: [], // 运力区域 areaCodeList: [], // 运力区域
runTypeList: ['1'], // 业务类型选择 runTypeList: ['1'], // 业务类型选择
orderSourceList: [], // 订单来源 orderSourceList: dataSource.applyOrderSourceList, // 订单来源
waybillStatusList: ['1', '2', '4', '6', '7', '11'], // 订单状态 waybillStatusList: ['1', '2', '4', '6', '7', '11'], // 订单状态
// paymentStatusList: ['1', '2'], // 支付状态 // paymentStatusList: ['1', '2'], // 支付状态
placeOrderTimeList: [], // 下单时间 默认显示当前时间到一周前 placeOrderTimeList: [], // 下单时间 默认显示当前时间到一周前
...@@ -681,7 +681,7 @@ export default { ...@@ -681,7 +681,7 @@ export default {
await this.getOpenAreaListFun() await this.getOpenAreaListFun()
await this.getTransport() await this.getTransport()
this.selectResult.areaCodeList = [] this.selectResult.areaCodeList = []
this.selectResult.orderSourceList = [] // this.selectResult.orderSourceList = []
this.selectResult.runTypeList = [this.runTypeList] this.selectResult.runTypeList = [this.runTypeList]
this.selectResult.waybillStatusList = [] this.selectResult.waybillStatusList = []
let end = new Date() let end = new Date()
......
src/views/platform/components/productNum.vue
...@@ -37,11 +37,6 @@ ...@@ -37,11 +37,6 @@
<div style="margin-right: 10px;"> <div style="margin-right: 10px;">
<el-button type="primary" size="small" @click="searchAll">查询</el-button> <el-button type="primary" size="small" @click="searchAll">查询</el-button>
</div> </div>
<div style="margin-right: 10px;">
<el-button type="primary" size="small" @click="addProductDialog"><i
class="el-icon-plus el-icon--right"></i>添加产品
</el-button>
</div>
</el-col> </el-col>
</el-row> </el-row>
<el-table <el-table
...@@ -83,6 +78,11 @@ ...@@ -83,6 +78,11 @@
<span v-for="(item, index) in row.applyChannel">{{ orderSourcesSpecial(item) + (index === row.applyChannel.length - 1 ? '': '、') }}</span> <span v-for="(item, index) in row.applyChannel">{{ orderSourcesSpecial(item) + (index === row.applyChannel.length - 1 ? '': '、') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" prop="isOnLine" label="上下线" width="80">
<template slot-scope="{row}">
{{row.isOnLine == 0 ? '下线' : '上线'}}
</template>
</el-table-column>
</el-table> </el-table>
</el-card> </el-card>
<div class="pagination"> <div class="pagination">
......
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