Skip to content

X
xoadoPlatform
Commit 0f94f968 by weix
Options

修改bug

parent 083ab085
Showing with 248 additions and 239 deletions
src/App.vue
......@@ -26,7 +26,9 @@ export default {
async created () {
axios.defaults.headers.XOADOAPPACCESSCODE = sessionStorage.getItem('code')
await this.$store.dispatch('user/PlatformCode')
await this.mustFun()
await this.mustFun();
/** 测试环境需要解注 */
// await this.getEnvironment();
},
mounted () {
console.log(process.env.VUE_APP_BASE_API5)
......@@ -39,6 +41,9 @@ export default {
clearInterval(this.timerToken)
},
methods: {
getEnvironment () {
sessionStorage.setItem('test', '0');
},
reload () {
this.isRouterAlive = false
this.$nextTick(function () {
......
src/port/carModel/carModel.js
......@@ -31,6 +31,11 @@ export function carTypeAdd(data) {
return post(url, data)
}
export function carTypeUpdate(data) {
const url = process.env.VUE_APP_BASE_API7+'/carType';
return put(url, data)
}
export function carTypeDelete(data, id) {
const url = process.env.VUE_APP_BASE_API7+`/carType/${id}`;
return get(url, data)
......
src/port/complaint/complaint.js
import {postblob} from "@/request/http";
export function exportComplaint(data) {
const url = process.env.VUE_APP_BASE_API5 + '/export/complaint';
export function exportComplaint(data, u) {
const url = (u ? u+'/brand' : process.env.VUE_APP_BASE_API5) + '/export/complaint';
return postblob(url, data);
}
src/port/set-request.js
......@@ -261,8 +261,8 @@ export function getAllOpenArea(platformId) {
}
/* 查询平台所有运力 */
export function getAllTransport(data) {
const url = targetBaseUrl + '/transport'
export function getAllTransport(data, u) {
const url = (u ? u+'/brand' : targetBaseUrl) + '/transport'
return get(url, data)
}
......
src/router/index.js
......@@ -183,8 +183,8 @@ export const routes = [
},
children: [
{
path: 'order-manager',
name: 'OrderManager',
path: 'waybill-index',
name: 'waybillIndex',
component: () =>
import ('@/views/business/waybillManagement/index.vue'),
meta: { icon: 'el-icon-document', title: '运单列表' }
......
src/views/business/complaintList/components/item.vue
......@@ -130,13 +130,6 @@ export default {
}
},
created() {
bus.$on('complaint', (f) => {
this.searchInfo = {...f, ...{runType: ['1']}};
this.getTableList();
})
},
beforeDestroy () {
bus.$off("complaint");
},
filters: {
preDate(v) {
......@@ -189,22 +182,20 @@ export default {
this.tableLoading = true;
let search = this.searchInfo;
let params = {
platformId: search.platformId,
platformId: JSON.parse(search.platformId).platformId,
transportIds: search.transportIds,
complaintLabel: search.complainCategory, // 投诉类型:1线上投诉2电话投诉3建议
complaintType: search.complainWay, // 投诉类别：1客户投诉2司机投诉
orderSource: search.orderSourceList,
status: search.processingStatus,
runType: search.runType,
runType: [search.runType],
queryParam: search.orderInfo,
startTime: search.dateTime.length === 0 ? '' : search.dateTime[0],
endTime: search.dateTime.length === 0 ? '' : search.dateTime[1],
startTime: search.dateTime.length !== 0 ? search.dateTime[0] : '',
endTime: search.dateTime.length !== 0 ? search.dateTime[1] : '',
page: this.page,
rows: this.size
};
console.log(params)
getAllcomplainList(params)
.then((res) => {
if(res.status === 200) {
......
src/views/business/complaintList/components/searchItem.vue deleted 100644 → 0
<template>
<el-form :inline="true" v-model="form">
<el-row class="row-d">
<el-col :span="8">
<el-input style="max-width: 300px;" placeholder="请输入手机号/运单编号/订单编号" v-model="form.orderInfo"></el-input>
</el-col>
<el-col :span="8" style="font-size: 14px;">
<!-- <Selects v-if="dataSource.localOrgId.length > 0" :options="dataSource.localOrgId"-->
<!-- :selectName="'品牌方：'"-->
<!-- :type="'transportIdList'"-->
<!-- @changeList="handlechangeList"></Selects>-->
发单品牌：
<el-select v-model="form.platformId" style="margin-left: 11px;">
<el-option
v-for="(item, index) in dataSource.localOrgId"
:label="item.name"
:value="item.id"
:key="'localOrgId'+index"
>
</el-option>
</el-select>
</el-col>
<el-col :span="8">
<Selects :options="dataSource.localTransportId" v-if="dataSource.localTransportId.length > 0"
:selectName="'承接运力：'"
:type="'transportIds'"
@changeList="handlechangeList"></Selects>
</el-col>
</el-row>
<el-row class="row-d">
<el-col :span="8" style="font-size: 14px;">
控诉时间：
<el-date-picker
style="max-width: 225px;margin-left: 11px;"
v-model="form.dateTime"
type="daterange"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
</el-col>
<el-col :span="8">
<Selects :options="dataSource.complainCategory"
:selectName="'控诉类别：'"
:type="'complainCategory'"
@changeList="handlechangeList"></Selects>
</el-col>
<el-col :span="8">
<Selects :options="dataSource.complainWay"
:selectName="'控诉方式：'"
:type="'complainWay'"
@changeList="handlechangeList"></Selects>
</el-col>
</el-row>
<el-row class="row-d">
<el-col :span="8">
<Selects :options="dataSource.orderSourceList"
:selectName="'订单来源：'"
:type="'orderSourceList'"
@changeList="handlechangeList"></Selects>
</el-col>
<el-col :span="8">
<Selects :options="dataSource.processingStatus"
:selectName="'处理状态：'"
:type="'processingStatus'"
@changeList="handlechangeList"></Selects>
</el-col>
<el-col :span="8">
<el-button style="padding: 8px 20px;" type="primary" @click="searchByInfo">查询</el-button>
<el-button style="padding: 8px 20px;" type="primary" @click="exportB">批量导出excel</el-button>
</el-col>
</el-row>
</el-form>
</template>
<script>
import Selects from '@/components/Selects'
import dataSource from '@/libs/screen'
import {getAllTransport} from "@/port/carOrDriver/carOrDriver";
import {platformInfosList} from "@/port/platfrom/setting";
import {mapGetters} from 'vuex'
import JudgeType from '@/mixins/judgeType'
import bus from "@/utils/bus";
import {exportComplaint} from "@/port/complaint/complaint";
import {Loading} from "element-ui";
export default {
name: "searchItem",
props: ['runType'],
components: {
Selects
},
computed: {
...mapGetters(['transportId']),
},
mixins: [JudgeType],
data() {
return {
dataSource: dataSource,
form: {
orderInfo: '',
dateTime: [],
platformId: '',
orderSourceList: ['4', '6', '7', '9', '10'],
complainWay: ['1', '2'],
complainCategory: ['1', '2'],
processingStatus: ['0', '1', '2'],
transportIds: []
}
}
},
async created() {
await this.getPlatformFun();
await this.getTransport();
bus.$emit('complaint', this.form);
},
methods:{
async getTransport() {
await getAllTransport({})
.then((res) => {
if (res.status == 200) {
let data = res.data;
let transportIdList = [];
let transportIdListArr = [];
data.forEach((item, index) => {
transportIdListArr.push({
id: String(item.transportId),
name: item.transportName,
});
transportIdList.push(String(item.transportId));
});
this.form.transportIds = transportIdList;
this.dataSource.localTransportId = transportIdListArr;
}
})
},
async exportB() {
let search = this.form;
let params = {
platformId: search.platformId,
transportIds: this.form.transportIds,
complaintLabel: this.form.complainCategory, // 投诉类别：1客户投诉2司机投诉
complaintType: search.complainWay, // 投诉类型:1线上投诉2电话投诉3建议
orderSource: search.orderSourceList,
status: search.processingStatus,
page: 1,
rows: 9999,
runType: [this.runType],
queryParam: search.orderInfo,
startTime: search.dateTime.length === 0 ? '' : search.dateTime[0],
endTime: search.dateTime.length === 0 ? '' : search.dateTime[1],
};
let loadingInstance = Loading.service({fullscreen: true});
let res = await exportComplaint(params)
let blob = new Blob([res], {type: "application/vnd.openxmlformatsnh[nh-officedocument.spreadsheetml.sheet;charset=utf-8"});
let link = document.createElement('a');
link.href = window.URL.createObjectURL(blob);
loadingInstance.close();
link.download = `工单列表.xlsx`;
link.click();
},
searchByInfo() {
if(!this.form.dateTime) {
this.form.dateTime = []
}
this.$emit('searchByInfo');
},
handlechangeList(val) {
let source = JSON.parse(JSON.stringify(val))
let type = source.type
let data = this.filftersFun(source.data);
this.form[type] = data;
},
async getPlatformFun() {
await platformInfosList({}).then(res => {
if (res.status == 200) {
let transportIdListArr = [];
res.data.forEach((item, index) => {
transportIdListArr.push({id: String(item.platformId), name: item.brandName})
})
this.dataSource.localOrgId = transportIdListArr;
this.form.platformId = transportIdListArr.length > 0 ? transportIdListArr[0].id : '';
}
})
.catch(() => {
})
},
}
}
</script>
<style scoped lang="scss">
.row-d {
.el-col {
padding: 5px 10px;
}
}
</style>
src/views/business/complaintList/index.vue
<template>
<el-card style="padding-left: 5px;border-radius: 5px;position:relative;background-color: #ffffff;">
<el-tabs v-model="activeName" type="card" @tab-click="handleClick">
<el-row style="background-color: #ffffff;padding: 10px 0 10px 0;">
<el-radio-group v-model="form.platformId" @change="changePlatform">
<el-radio-button
v-for="(item, index) in platformList"
:label="item.id"
:key="'platformId'+index"
>
{{ item.name }}
</el-radio-button>
</el-radio-group>
</el-row>
<el-tabs v-model="form.runType" type="card" @tab-click="handleClick">
<el-tab-pane
style="padding: 5px 10px;"
v-for="(item, index) in tabs"
......@@ -9,23 +20,101 @@
:name="item.runType">
</el-tab-pane>
</el-tabs>
<searchItem ref="searchItem" :runType="activeName" @searchByInfo="searchByInfo"></searchItem>
<itemList ref="itemList" :runType="activeName" :searchInfo="$refs.searchItem"></itemList>
<el-form :inline="true" v-model="form">
<el-row class="row-d">
<el-col :span="8">
<el-input style="max-width: 300px;" placeholder="请输入手机号/运单编号/订单编号"
v-model="form.orderInfo"></el-input>
</el-col>
<el-col :span="8">
<Selects :options="dataSource.localTransportId" v-if="dataSource.localTransportId.length > 0"
:selectName="'承接运力：'"
:type="'transportIds'"
@changeList="handlechangeList"></Selects>
</el-col>
<el-col :span="8" style="font-size: 14px;">
控诉时间：
<el-date-picker
style="max-width: 225px;margin-left: 11px;"
v-model="form.dateTime"
type="daterange"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
</el-col>
</el-row>
<el-row class="row-d">
<el-col :span="8">
<Selects :options="dataSource.complainCategory"
:selectName="'控诉类别：'"
:type="'complainCategory'"
@changeList="handlechangeList"></Selects>
</el-col>
<el-col :span="8">
<Selects :options="dataSource.complainWay"
:selectName="'控诉方式：'"
:type="'complainWay'"
@changeList="handlechangeList"></Selects>
</el-col>
<el-col :span="8">
<Selects :options="dataSource.orderSourceList"
:selectName="'订单来源：'"
:type="'orderSourceList'"
@changeList="handlechangeList"></Selects>
</el-col>
</el-row>
<el-row class="row-d">
<el-col :span="8">
<Selects :options="dataSource.processingStatus"
:selectName="'处理状态：'"
:type="'processingStatus'"
@changeList="handlechangeList"></Selects>
</el-col>
<el-col :span="8">
<el-button style="padding: 8px 20px;" type="primary" @click="searchByInfo">查询</el-button>
<el-button style="padding: 8px 20px;" type="primary" @click="exportB">批量导出excel</el-button>
</el-col>
</el-row>
</el-form>
<itemList ref="itemList" :searchInfo="form"></itemList>
</el-card>
</template>
<script>
import searchItem from "./components/searchItem";
import Selects from '@/components/Selects'
import JudgeType from '@/mixins/judgeType'
import {exportComplaint} from "@/port/complaint/complaint";
import {Loading} from "element-ui";
import itemList from "./components/item"
import {platformInfosList} from "@/port/platfrom/setting";
import {getAllTransport} from "@/port/set-request";
import dataSource from "@/libs/screen";
export default {
name: "index",
components: {
searchItem,
itemList
itemList,
Selects
},
mixins: [JudgeType],
data() {
return {
activeName: '1',
form: {
orderInfo: '',
dateTime: [],
platformId: '',
orderSourceList: ['4', '6', '7', '9', '10'],
complainWay: ['1', '2'],
complainCategory: ['1', '2'],
processingStatus: ['0', '1', '2'],
transportIds: [],
brandUrl: '',
runType: '1'
},
dataSource: dataSource,
platformList: [],
tabs: [
{label: '同城打车', runType: '1'},
{label: '跨城约车', runType: '2'},
......@@ -35,17 +124,109 @@ export default {
],
}
},
created() {
this.getPlatformFun();
},
methods: {
getPlatformFun() {
platformInfosList({}).then(res => {
if (res.status == 200) {
let transportIdListArr = [];
res.data.forEach((item, index) => {
if (item.brandUrl) {
transportIdListArr.push({id: JSON.stringify(item), name: item.brandName})
}
})
this.dataSource.localOrgId = transportIdListArr;
this.platformList = transportIdListArr;
this.form.platformId = transportIdListArr.length > 0 ? transportIdListArr[0].id : '';
this.form.brandUrl = sessionStorage.getItem('test') ? '' : JSON.parse(transportIdListArr[0].id).brandUrl;
this.getTransport();
}
})
.catch(() => {
})
},
changePlatform() {
this.form.brandUrl = JSON.parse(this.form.platformId).brandUrl;
this.dataSource.localTransportId = [];
this.getTransport();
// this.$refs.itemList.initTable(this.form);
},
handleClick() {
this.$refs.itemList.initTable({...this.$refs.searchItem.form, ...{runType: [this.activeName]}});
this.$refs.itemList.initTable(this.form);
},
searchByInfo() {
this.$refs.itemList.initTable({...this.$refs.searchItem.form, ...{runType: [this.activeName]}});
this.$refs.itemList.initTable(this.form);
},
async exportB() {
let search = this.form;
let params = {
platformId: JSON.parse(search.platformId).platformId,
transportIds: this.form.transportIds,
complaintLabel: this.form.complainCategory, // 投诉类别：1客户投诉2司机投诉
complaintType: search.complainWay, // 投诉类型:1线上投诉2电话投诉3建议
orderSource: search.orderSourceList,
status: search.processingStatus,
page: 1,
rows: 9999,
runType: [this.form.runType],
queryParam: search.orderInfo,
startTime: search.dateTime.length === 0 ? '' : search.dateTime[0],
endTime: search.dateTime.length === 0 ? '' : search.dateTime[1],
};
let loadingInstance = Loading.service({fullscreen: true});
let res = await exportComplaint(params, this.form.brandUrl)
let blob = new Blob([res], {type: "application/vnd.openxmlformatsnh[nh-officedocument.spreadsheetml.sheet;charset=utf-8"});
let link = document.createElement('a');
link.href = window.URL.createObjectURL(blob);
loadingInstance.close();
link.download = `工单列表.xlsx`;
link.click();
},
getTransport() {
let json = {
platformId: JSON.parse(this.form.platformId).platformId,
page: 1,
rows: 50
}
getAllTransport(json, this.form.brandUrl).then(res => {
if (res.status == 200) {
let datas = res.data.content;
let transportIdList = [];
let transportIdListArr = [];
datas.forEach((item, index) => {
transportIdListArr.push({id: String(item.transportId), name: item.transportName})
transportIdList.push(String(item.transportId))
})
this.form.transportIds = transportIdList;
this.dataSource.localTransportId = transportIdListArr;
this.$refs.itemList.initTable(this.form);
}
})
},
handlechangeList(val) {
let source = JSON.parse(JSON.stringify(val))
let type = source.type
let data = this.filftersFun(source.data);
this.form[type] = data;
},
}
}
</script>
<style scoped>
<style scoped lang="scss">
.row-d {
.el-col {
padding: 5px 10px;
}
}
</style>
src/views/business/waybillManagement/index.vue
<template>
<!-- <div-->
<!-- class="wabill-order-body"-->
<!-- v-loading="loading"-->
<!-- element-loading-text="拼命加载中"-->
<!-- element-loading-spinner="el-icon-loading"-->
<!-- >-->
<div
class="wabill-order-body"
v-loading="loading"
element-loading-text="拼命加载中"
element-loading-spinner="el-icon-loading"
>
<el-row style="background-color: #ffffff;padding: 10px 0 0 10px;">
......@@ -204,6 +207,7 @@ export default {
mixins: [JudgeType],
data() {
return {
brandUrl: '',
platformList: [],
platformId: '',
activeName: '1',
......@@ -697,7 +701,7 @@ export default {
page: 1,
rows: 50
}
await getAllTransport(json).then(res => {
await getAllTransport(json, this.brandUrl).then(res => {
if (res.status == 200) {
let datas = res.data.content;
let transportIdList = [];
......@@ -714,6 +718,8 @@ export default {
async changePlatform() {
// 切换品牌
this.OperationalData = [];
this.dataSource.localTransportId = [];
this.brandUrl = JSON.parse(this.platformId).brandUrl;
await this.getOpenAreaListFun();
await this.getTransport();
this.page = 1;
......@@ -723,13 +729,16 @@ export default {
await getplatformList().then((res) => {
if (res.status == 200) {
res.data.forEach((element) => {
if(element.brandUrl) {
this.platformList.push({
value: JSON.stringify(element),
label: element.name,
});
}
});
this.platformId = res.data.length > 0 ? JSON.stringify(res.data[0]) : '';
this.platformId = this.platformList.length > 0 ? this.platformList[0].value : '';
this.brandUrl = sessionStorage.getItem('test') ? '' : JSON.parse(this.platformList[0].value).brandUrl;
}
});
},
......@@ -989,7 +998,8 @@ export default {
link.download = '运单导出.xls'
link.click()
}).catch(err => {
this.$message.error('导出失败')
loadingInstance.close()
})
},
handleCurrentChange(val) {
......
src/views/configure/componenets/platformCarType/addDialog.vue
......@@ -100,7 +100,8 @@
import {
modelsQuery,
carTypeQuery,
carTypeAdd
carTypeAdd,
carTypeUpdate
} from "@/port/carModel/carModel";
import dataSource from "@/libs/screen";
export default {
......@@ -169,6 +170,19 @@ export default {
typeName: item.typeItemName,
rangeOfApplication: this.form.runTypes
}
if(this.form.hasOwnProperty('id')) {
params['id'] = this.form.id;
carTypeUpdate(params)
.then((res) => {
if(res.status === 200) {
this.$message.success('修改成功');
this.clearInfo();
this.$emit('reLoadTable');
}else {
this.$message.error(res.msg);
}
})
}else {
carTypeAdd(params)
.then((res) => {
if(res.status === 200) {
......@@ -180,6 +194,7 @@ export default {
}
})
}
}
})
},
// 重新选择品牌，则需要重新查询可接单类型
......@@ -272,6 +287,7 @@ export default {
if (Object.keys(row).length > 0) {
this.title = "修改品牌车型";
this.form = {
id: row.id,
platform: row.platformId,
img: row.imgUrl,
type: row.carType,
......
src/views/configure/platformCarType.vue
......@@ -188,10 +188,12 @@ export default {
await getplatformList().then((res) => {
if (res.status == 200) {
res.data.forEach((element) => {
if(element.brandUrl) {
this.platformList.push({
value: element.platformId,
label: element.name,
});
}
});
this.form.platformListInfo = this.platformList[0].value;
}
......
src/views/platform/components/settingInfo.vue
......@@ -240,7 +240,7 @@ export default {
platformInfosList()
.then((res) => {
if(res.status === 200) {
this.brandList = res.data;
this.brandList = res.data.filter(item => {return item.brandUrl});
}else {
this.$message.error(res.msg);
}
......
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