Skip to content

X
xoadoPlatform
Commit c3b3202c by weix
Options

优化所有品牌查询

parent af44f136
Showing with 325 additions and 85 deletions
src/mixins/judgeType.js
......@@ -168,6 +168,39 @@ export default {
default :
}
},
orderSourcesSpecialNew(orderSource) {
let type = Number(orderSource)
switch (type) {
case 1:
return '小多出行'
case 2:
return '美团打车'
case 3:
return '航旅纵横'
case 5:
return '滴滴出行'
case 6:
return '品牌自营'
case 8:
return '高德打车'
case 9:
return '同程艺龙'
case 10:
return '携程旅游'
case 11:
return '飞猪旅行'
default :
}
},
orderStatusText(status) {
status = Number(status)
switch (status) {
......
src/port/complaint/complaint.js
import {postblob} from "@/request/http";
export function exportComplaint(data, u) {
const url = (u ? u+'/brand' : process.env.VUE_APP_BASE_API5) + '/export/complaint';
const url = (u ? u : process.env.VUE_APP_BASE_API5) + '/export/complaint';
return postblob(url, data);
}
src/port/priceConfiguration/priceConfiguration.js
......@@ -2,22 +2,22 @@ import {get, post, put} from '@/request/http'
// 获取计价规则 http://192.168.0.251:8181/brand/setting/price/new/{getproductsetting}/{vehicletype}
export function priceNewApi(data, getproductsetting, vehicletype, u) {
const url = (u ? u+'/brand' : process.env.VUE_APP_BASE_API5) + `/setting/price/new/${getproductsetting}/${vehicletype}`;
const url = (u ? u : process.env.VUE_APP_BASE_API5) + `/setting/price/new/${getproductsetting}/${vehicletype}`;
return get(url,data)
}
//newPrice/setting/QueryByMore
export function settingQueryByMoreApi(data, u) {
const url = (u ? u+'/brand' : process.env.VUE_APP_BASE_API5) + '/newPrice/setting/QueryByMore';
const url = (u ? u : process.env.VUE_APP_BASE_API5) + '/newPrice/setting/QueryByMore';
return post(url,data)
}
export function carpoolingPriceNewApi(data, getproductsetting, u) {
const url = (u ? u+'/brand' : process.env.VUE_APP_BASE_API5) + `/setting/price/new/carpooling/${getproductsetting}`;
const url = (u ? u : process.env.VUE_APP_BASE_API5) + `/setting/price/new/carpooling/${getproductsetting}`;
return get(url,data)
}
export function settingPriceNewApi(data,getproductsetting, u) {
const url = (u ? u+'/brand' : process.env.VUE_APP_BASE_API5) + `/setting/price/new/date/${getproductsetting}`;
const url = (u ? u : process.env.VUE_APP_BASE_API5) + `/setting/price/new/date/${getproductsetting}`;
return get(url,data)
}
src/port/productNum/productNum.js
......@@ -2,12 +2,12 @@ import {get, post, deletes} from '@/request/http'
//
export function tripProductApi(data = {}, id, u) {
const url = (u ? u+'/brand' : process.env.VUE_APP_BASE_API5) + '/tripProduct/'+id;
const url = (u ? u : process.env.VUE_APP_BASE_API5) + '/tripProduct/'+id;
return get(url, data)
}
//
export function tripProducDetailtApi(data = {}, id, u) {
const url = (u ? u+'/brand' : process.env.VUE_APP_BASE_API5) + `/tripProduct/detail/${id}`;
const url = (u ? u : process.env.VUE_APP_BASE_API5) + `/tripProduct/detail/${id}`;
return get(url, data)
}
src/port/productSetupNew/productSetupNew.js
......@@ -2,7 +2,7 @@ import {get, post, put} from '@/request/http'
// 产品操作记录
export function tripProductLogApi(data, id, u) {
const url = (u ? u+'/brand' : process.env.VUE_APP_BASE_API5) + '/tripProduct/log/'+id;
const url = (u ? u : process.env.VUE_APP_BASE_API5) + '/tripProduct/log/'+id;
return get(url,data)
}
......
src/port/region/regionManage.js
import {put, get, post, deletes} from '@/request/http'
// 获取列表
export function getRegionManageList(data = {}, u, platformId) {
const url = (u ? u+'/brand' : process.env.VUE_APP_BASE_API5) + '/area/V2/condition';
const url = (u ? u : process.env.VUE_APP_BASE_API5) + '/area/V2/condition';
return get(url, data, platformId)
}
//虚拟号配置查询列表
......
src/port/region/regionTitle.js
......@@ -2,6 +2,6 @@ import {get} from '@/request/http'
// 根据开通区域查询详情 /xoadoAreaOpen/count/all
export function getDetailApi(data, u) {
const url = (u ? u+'/brand' : process.env.VUE_APP_BASE_API5) + '/xoadoAreaOpen/count/all';
const url = (u ? u : process.env.VUE_APP_BASE_API5) + '/xoadoAreaOpen/count/all';
return get(url, data)
}
src/port/set-request.js
......@@ -263,7 +263,7 @@ export function getAllOpenArea(platformId) {
/* 查询平台所有运力 */
export function getAllTransport(data, u) {
const url = (u ? u + '/brand' : targetBaseUrl) + '/transport'
const url = (u ? u : targetBaseUrl) + '/transport'
return get(url, data)
}
......@@ -275,7 +275,7 @@ export function getAllAreaProducts(data) {
/* 查询当前区域开通的所有产品（按条件查询）(新) */
export function getAllTripProduct(data, u) {
const url = (u ? u + '/brand' : targetBaseUrl) + '/tripProduct/list'
const url = (u ? u : targetBaseUrl) + '/tripProduct/list'
return post(url, data)
}
......@@ -395,19 +395,19 @@ export function getYunCubicProductData1(data) {
/* 多条件查询订单列表 */
export function getAllOrderList(data, u, platformId) {
const url = (u ? u + '/brand' : targetBaseUrl) + '/xoado/order/query'
const url = (u ? u : targetBaseUrl) + '/xoado/order/query'
return post(url, data, platformId)
}
/* 多条件查询订单列表 */
export function getThisorderInfo(data, u, platformId) {
const url = (u ? u + '/brand' : targetBaseUrl) + '/xoado/order/select'
const url = (u ? u : targetBaseUrl) + '/xoado/order/select'
return post(url, data, platformId)
}
/* 多条件导出订单列表 */
export function exportAllOrderList(data, u, platformId) {
const url = (u ? u + '/brand' : targetBaseUrl) + '/xoado/order/export'
const url = (u ? u : targetBaseUrl) + '/xoado/order/export'
return postblob(url, data, platformId)
}
......@@ -437,7 +437,7 @@ export function seachDividedInto(data) {
/* 投诉列表查询 */
export function getAllcomplainList(data, u) {
const url = (u ? u + '/brand' : targetBaseUrl) + '/complaint/condition'
const url = (u ? u : targetBaseUrl) + '/complaint/condition'
return post(url, data)
}
......@@ -497,7 +497,7 @@ export function getTransportListForProductId(productId) {
/* 用户操作日志接口信息 */
export function userLog(data, u, platformId) {
const url = (u ? u + '/brand' : targetBaseUrl) + '/operate/log'
const url = (u ? u : targetBaseUrl) + '/operate/log'
return post(url, data, platformId)
}
......@@ -623,7 +623,7 @@ export function SeachfenceInfo(data) {
/* 计算器计价 */
export function calculatorPrice(data, platformId, u) {
const url = (u ? u + '/brand' : process.env.VUE_APP_BASE_API5) + `/xoadoTripProduct/calculator/${platformId}`
const url = (u ? u : process.env.VUE_APP_BASE_API5) + `/xoadoTripProduct/calculator/${platformId}`
return post(url, data)
}
......@@ -1123,7 +1123,7 @@ export function exportCycleBills(data = {}) {
/* 客诉管理---查询客诉 */
export function getComplaintById(id, u, platformId) {
const url = (u ? u + '/brand' : targetBaseUrl) + `/complaint?complaintId=${id}`
const url = (u ? u : targetBaseUrl) + `/complaint?complaintId=${id}`
return get(url, platformId)
}
......
src/views/DepartmentInformation/index.vue
......@@ -539,7 +539,6 @@ export default {
this.getData(this.billState, this.page, this.month, this.rows, this.sort);
},
handleCurrentChange(page) {
debugger
this.page = page;
this.getData(this.billState, this.page, this.month, this.rows, this.sort);
},
......
src/views/business/complaintList/complaintDetail.vue
......@@ -59,7 +59,7 @@
<el-card style="min-height: 200px;max-height: calc(100vh - 280px);overflow-y: auto;">
<el-row class="top-title">
<span style="font-size: 18px;font-weight: 800;">
控制诉信息
控诉信息
</span>
<el-tag size="mini" effect="plain" style="margin-left: 7px;">
{{ complainCategoryText(complaintInfo.complaintLabel) }}
......
src/views/business/complaintList/index.vue
<template>
<el-card style="padding-left: 5px;border-radius: 5px;position:relative;background-color: #ffffff;">
<el-row style="background-color: #ffffff;padding: 10px 0 10px 0;">
<div style="padding-left: 5px;border-radius: 5px;position:relative;background-color: #ffffff;">
<el-row style="background-color: #ffffff;padding: 10px 0 0 20px;">
<el-radio-group v-model="form.platformId" @change="changePlatform">
<el-radio-button
v-for="(item, index) in platformList"
v-for="(item, index) in brandLists"
:label="item.id"
:key="'platformId'+index"
>
......@@ -11,15 +11,17 @@
</el-radio-button>
</el-radio-group>
</el-row>
<el-tabs v-model="form.runType" type="card" @tab-click="handleClick">
<el-tabs style="padding-left: 20px;" v-model="form.runType" type="card" @tab-click="handleClick">
<el-tab-pane
style="padding: 5px 10px;"
style="padding: 0 10px;"
v-for="(item, index) in tabs"
:key="index"
:label="item.label"
:name="item.runType">
</el-tab-pane>
</el-tabs>
<el-card shadow="never">
<el-form :inline="true" v-model="form">
<el-row class="row-d">
<el-col :span="8">
......@@ -80,6 +82,7 @@
</el-form>
<itemList ref="itemList" :searchInfo="form"></itemList>
</el-card>
</div>
</template>
<script>
......@@ -91,6 +94,7 @@ import itemList from "./components/item"
import {platformInfosList} from "@/port/platfrom/setting";
import {getAllTransport} from "@/port/set-request";
import dataSource from "@/libs/screen";
import {mapGetters} from "vuex";
export default {
name: "index",
......@@ -98,6 +102,37 @@ export default {
itemList,
Selects
},
computed: {
...mapGetters(['platformId']),
brandLists() {
let brandList = this.$store.getters.brandList;
if(brandList.length === 0) {
return new Promise(() =>{
this.$store.dispatch('business/getBrandList')
})
brandList = this.$store.getters.brandList;
}
brandList = brandList.filter(item => {
return item.brandUrl
})
brandList = brandList.map(item => {
return {
id: JSON.stringify(item),
name: item.brandName
}
})
return brandList;
}
},
watch: {
async brandLists(v){
if(v.length > 0) {
this.getPlatformInfo();
this.getTransport();
}
}
},
mixins: [JudgeType],
data() {
return {
......@@ -125,9 +160,19 @@ export default {
}
},
created() {
this.getPlatformFun();
// this.getPlatformFun();
if(this.brandLists.length > 0) {
this.getPlatformInfo();
this.getTransport();
}
},
methods: {
getPlatformInfo() {
this.dataSource.localOrgId = this.brandLists;
this.form.platformId = this.brandLists.length > 0 ? this.brandLists[0].id : '';
this.brandUrl = this.brandLists.length > 0 ? JSON.parse(this.brandLists[0].id).brandUrl : '';
this.plat = this.brandLists.length > 0 ? JSON.parse(this.brandLists[0].id).platformId : '';
},
getPlatformFun() {
platformInfosList({}).then(res => {
if (res.status == 200) {
......@@ -150,7 +195,8 @@ export default {
})
},
changePlatform() {
changePlatform(v) {
this.form.platformId = v;
this.form.brandUrl = JSON.parse(this.form.platformId).brandUrl;
this.dataSource.localTransportId = [];
this.getTransport();
......@@ -224,6 +270,17 @@ export default {
<style scoped lang="scss">
.EnterpriseInformation {
::v-deep {
.el-tabs__header {
margin: 0;
}
.el-tabs--card > .el-tabs__header {
border-bottom: none;
}
}
}
.row-d {
.el-col {
padding: 5px 10px;
......
src/views/business/orderManagement/index.vue
......@@ -3,7 +3,7 @@
<el-row style="background-color: #ffffff;padding: 10px 0 0 20px;">
<el-radio-group v-model="platform" @change="changePlatform">
<el-radio-button
v-for="(item, index) in platformList"
v-for="(item, index) in brandLists"
:label="item.value"
:key="'platformId'+index"
>
......@@ -168,6 +168,7 @@ import {
import JudgeType from '@/mixins/judgeType'
import {Loading} from 'element-ui';
import {mapGetters} from "vuex";
export default {
name: "index",
......@@ -479,6 +480,29 @@ export default {
},
}
},
computed: {
...mapGetters(['platformId']),
brandLists() {
let brandList = this.$store.getters.brandList;
if(brandList.length === 0) {
return new Promise(() =>{
this.$store.dispatch('business/getBrandList')
})
brandList = this.$store.getters.brandList;
}
brandList = brandList.filter(item => {
return item.brandUrl
})
brandList = brandList.map(item => {
return {
value: JSON.stringify(item),
label: item.brandName
}
})
return brandList;
}
},
watch: {
TableHeight(val) {
// 为了避免频繁触发resize函数导致页面卡顿，使用定时器
......@@ -494,6 +518,15 @@ export default {
}, 500)
}
},
async brandLists(v){
if(v.length > 0) {
this.getPlatformInfo();
await this.getOpenAreaListFun()
await this.getTransport()
await this.getOrderHeaders()
await this.getData();
}
}
// config: {
// handler(newVal,oldVal){
// console.log(newVal)
......@@ -508,13 +541,21 @@ export default {
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()
if(this.brandLists.length > 0) {
this.getPlatformInfo();
await this.getOpenAreaListFun()
await this.getTransport()
await this.getOrderHeaders()
await this.getData()
}
},
methods: {
getPlatformInfo() {
this.platform = this.brandLists.length > 0 ? this.brandLists[0].value : '';
this.brandUrl = this.brandLists.length > 0 ? JSON.parse(this.brandLists[0].value).brandUrl : '';
this.plat = this.brandLists.length > 0 ? JSON.parse(this.brandLists[0].value).platformId : '';
},
async getTransport() {
let json = {
......@@ -537,10 +578,11 @@ export default {
}
})
},
async changePlatform() {
async changePlatform(v) {
// 切换品牌
this.OperationalData = [];
this.dataSource.localTransportId = [];
this.platform = v;
this.brandUrl = JSON.parse(this.platform).brandUrl;
this.plat = JSON.parse(this.platform).platformId;
await this.getOpenAreaListFun();
......
src/views/business/waybillManagement/index.vue
......@@ -12,7 +12,7 @@
<el-row style="background-color: #ffffff;padding: 10px 0 0 20px;">
<el-radio-group v-model="platformId" @change="changePlatform">
<el-radio-button
v-for="(item, index) in platformList"
v-for="(item, index) in brandLists"
:label="item.value"
:key="'platformId'+index"
>
......@@ -202,7 +202,37 @@ export default {
Table
},
computed: {
...mapGetters(['transportId'])
...mapGetters(['transportId']),
brandLists() {
let brandList = this.$store.getters.brandList;
if(brandList.length === 0) {
return new Promise(() =>{
this.$store.dispatch('business/getBrandList')
})
brandList = this.$store.getters.brandList;
}
brandList = brandList.filter(item => {
return item.brandUrl
})
brandList = brandList.map(item => {
return {
value: JSON.stringify(item),
label: item.brandName
}
})
return brandList;
}
},
watch: {
async brandLists(v){
if(v.length > 0) {
this.getPlatformInfo();
await this.getOpenAreaListFun()
await this.getTransport()
await this.getOrderHeaders()
}
}
},
mixins: [JudgeType],
data() {
......@@ -677,9 +707,6 @@ export default {
}
},
async created() {
await this.getAllPlatform()
await this.getOpenAreaListFun()
await this.getTransport()
this.selectResult.areaCodeList = []
// this.selectResult.orderSourceList = []
this.selectResult.runTypeList = [this.runTypeList]
......@@ -691,11 +718,21 @@ export default {
this.selectResult.weybillFlag = 'createTime'
this.selectResult.order = 'desc'
// this.getAllData()
// await this.getAllPlatform()
if(this.brandLists.length > 0) {
this.getPlatformInfo();
await this.getOpenAreaListFun()
await this.getTransport()
await this.getOrderHeaders()
}
},
methods: {
getPlatformInfo() {
this.platformId = this.brandLists.length > 0 ? this.brandLists[0].value : '';
this.brandUrl = this.brandLists.length > 0 ? JSON.parse(this.brandLists[0].value).brandUrl : '';
this.plat = this.brandLists.length > 0 ? JSON.parse(this.brandLists[0].value).platformId : '';
},
async getTransport() {
let json = {
platformId: JSON.parse(this.platformId).platformId,
page: 1,
......@@ -716,8 +753,9 @@ export default {
}
})
},
async changePlatform() {
async changePlatform(v) {
// 切换品牌
this.platformId = v;
this.OperationalData = [];
this.dataSource.localTransportId = [];
this.brandUrl = JSON.parse(this.platformId).brandUrl;
......
src/views/configure/BasicsCartype.vue
......@@ -26,7 +26,7 @@
<el-col
style="display: flex; align-items: center; justify-content: end"
>
<el-button type="primary" size="mini" @click="$refs.addDialog.showDialog({})"> 添加品牌类型</el-button>
<el-button type="primary" size="mini" @click="$refs.addDialog.showDialog({})"> 添加基础类型</el-button>
</el-col>
</el-row>
</el-form>
......
src/views/configure/componenets/platformCarType/addDialog.vue
......@@ -19,8 +19,8 @@
<el-select v-model="form.platform" @change="changePlatform">
<el-option
v-for="(item, index) in platformList"
:label="item.label"
:value="item.value"
:label="item.brandName"
:value="item.platformId"
:key="'polygon' + index"
>
</el-option>
......@@ -290,7 +290,6 @@ export default {
let range = row.rangeOfApplication.filter(item => {
return item != row.typeItem
})
debugger
this.form = {
id: row.id,
platform: row.platformId,
......
src/views/configure/platformCarType.vue
......@@ -23,10 +23,10 @@
size="mini"
>
<el-option
v-for="item in platformList"
:key="item.value"
:label="item.label"
:value="item.value"
v-for="item in brandLists"
:key="item.platformId"
:label="item.brandName"
:value="item.platformId"
>
</el-option>
</el-select>
......@@ -47,7 +47,8 @@
style="display: flex; align-items: center; justify-content: end"
>
<el-button type="primary" size="mini" @click="searchInfo">
查询</el-button
查询
</el-button
>
<el-button
type="primary"
......@@ -130,15 +131,15 @@
</div>
<addDialog
ref="addDialog"
:platformList="platformList"
:platformList="brandLists"
@reLoadTable="reLoadTable"
></addDialog>
</div>
</template>
<script>
import { carTypeQuery, carTypeDelete } from "@/port/carModel/carModel";
import { getplatformList } from "@/port/set-request";
import {carTypeQuery, carTypeDelete} from "@/port/carModel/carModel";
import {getplatformList} from "@/port/set-request";
import addDialog from "./componenets/platformCarType/addDialog";
import dataSource from "@/libs/screen";
import JudgeType from "@/mixins/judgeType";
......@@ -151,6 +152,22 @@ export default {
addDialog,
Selects,
},
computed: {
brandLists() {
let brandList = this.$store.getters.brandList;
if(brandList.length === 0) {
return new Promise(() =>{
this.$store.dispatch('business/getBrandList')
})
brandList = this.$store.getters.brandList;
}
this.form.platformListInfo = brandList.length > 0 ? brandList[0].platformId : '';
this.initTable();
return brandList;
}
},
data() {
return {
dataSource: dataSource,
......@@ -168,8 +185,7 @@ export default {
};
},
async created() {
await this.listInit();
this.initTable();
// await this.listInit();
},
methods: {
delRow(id) {
......@@ -188,7 +204,8 @@ export default {
}
});
})
.catch(() => {});
.catch(() => {
});
},
reLoadTable() {
this.initTable();
......@@ -213,7 +230,7 @@ export default {
if (element.brandUrl) {
this.platformList.push({
value: element.platformId,
label: element.name,
label: element.brandName,
});
}
});
......@@ -250,8 +267,8 @@ export default {
});
},
// table变色，头
tableHeaderColor({ row, column, rowIndex, columnIndex }) {
return { "background-color": "#0099ff", color: "#ffffff" };
tableHeaderColor({row, column, rowIndex, columnIndex}) {
return {"background-color": "#0099ff", color: "#ffffff"};
},
},
};
......
src/views/disposition/passDetail.vue
......@@ -750,7 +750,6 @@ export default {
// pageJumpUrl: this.ruleForm.pageJumpFlag == 1 ? this.ruleForm.pageJumpUrl : this.ruleForm.insideJumpUrl,
// pageJumpText: this.ruleForm.pageJumpText,
// };
debugger
let json = {
"platformId": this.$store.getters.platformId,// (平台ID)
"displayPage": this.selectResult.pageLocation,// (展示页面)
......
src/views/disposition/passRotation.vue
......@@ -256,7 +256,6 @@ export default {
*弹窗开关切换
* **/
async operatingStatuct(val) {
debugger
let {data, status} = await upOrDown({}, val.advertId, val.isOnline);
if (status == 200) {
this.$message.success("操作成功");
......
src/views/platform/components/productNum.vue
......@@ -24,7 +24,7 @@
<el-col :span="8">
<!-- <Selects :options="dataSource.orderChannelList" :selectName="'适用渠道:'" :type="'applyChannelList'"-->
<!-- @changeList="handlechangeList" class="right-distance"></Selects>-->
<Selects v-if="ylD.length > 0" :options="ylD" :selectName="'授权运力:'" :type="'ylType'"
<Selects :options="ylD" :selectName="'授权运力:'" :type="'ylType'"
@changeList="handlechangeList" class="right-distance"></Selects>
</el-col>
<el-col :span="8">
......@@ -165,7 +165,7 @@ export default {
async created() {
this.ylD = this.ylData
// await this.getAllChannelListFun()
await this.getAllData()
// await this.getAllData()
},
methods: {
searchAll() {
......
src/views/platform/components/publicProductTitle/index.vue
......@@ -32,7 +32,7 @@
<el-tag class="tag-div" type="info">{{ reserveTypeText($store.getters.productJJInfo.reserveType) }}</el-tag>
<el-tag class="tag-div" type="warning">{{ intercityTypeText($store.getters.productJJInfo.intercityType) }}</el-tag>
<el-tag class="tag-div" v-for="item in $store.getters.productJJInfo.applyChannel" :key="item" type="danger">
{{ orderSourcesSpecial(item) }}
{{ orderSourcesSpecialNew(item) }}
</el-tag>
</el-row>
</el-col>
......
src/views/platform/components/settingInfo.vue
......@@ -45,7 +45,7 @@
<el-form-item label="品牌名称：" prop="platformId" v-if="!$route.query.hasOwnProperty('platformId')">
<el-select v-model="form.platformId" size="mini">
<el-option
v-for="(item, index) in brandList"
v-for="(item, index) in brandLists"
:label="item.brandName"
:value="item.platformId"
:key="'platformId'+index"
......@@ -170,6 +170,20 @@ export default {
brandList: []
}
},
computed: {
brandLists() {
let brandList = this.$store.getters.brandList;
if(brandList.length === 0) {
return new Promise(() =>{
this.$store.dispatch('business/getBrandList')
})
brandList = this.$store.getters.brandList;
}
brandList = brandList.filter(item => {return item.brandUrl})
return brandList;
}
},
created() {
// 获取配置项
this.getPlatformConfig();
......@@ -241,17 +255,17 @@ export default {
}
})
platformInfosList()
.then((res) => {
if(res.status === 200) {
this.brandList = res.data.filter(item => {return item.brandUrl});
}else {
this.$message.error(res.msg);
}
})
.catch(() => {
})
// platformInfosList()
// .then((res) => {
// if(res.status === 200) {
// this.brandList = res.data.filter(item => {return item.brandUrl});
// }else {
// this.$message.error(res.msg);
// }
// })
// .catch(() => {
//
// })
},
getInfo() {
getPlatformInfo({}, this.$route.query.platformId)
......
src/views/platform/regionDetail.vue
......@@ -12,10 +12,11 @@
style="font-size: 12px;color: #3399FF;background: #e9f0f8;margin-left: 10px;">{{
company + ' 丨 ' + location
}}</span>
<span
style="font-size: 12px;color: #FF6600;background: #f8e6db;margin-left: 10px;">{{
manage
}}</span>
<span v-for="(item, index) in manage" :key="'manage'+index"
style="font-size: 12px;color: #FF6600;background: #f8e6db;margin-left: 10px;">
{{ item.managerName + ' ' + item.phoneNumber }}
</span>
<!-- <i style="color: #539af3;margin-left: 10px;font-size: 12px;cursor: pointer;" @click="clickEdit" class="el-icon-edit"></i>-->
</el-row>
<el-row style="font-size: 14px;">
......@@ -117,9 +118,9 @@ export default {
.then((res) => {
if (res.status === 200) {
this.regName = res.data.areaInfo.operateName;
this.company = res.data.areaInfo.organizeName;
this.company = res.data.areaInfo.operateCompanyName;
this.location = res.data.areaInfo.operateAreaName;
this.manage = res.data.areaInfo.managerName + ' ' + res.data.areaInfo.managerPhone;
this.manage = res.data.areaInfo.areaManagerVos;
this.priceData = res.data.priceScopeList;
this.yl = getYlInfo(res.data.transportOpenList).str;
this.transportOpenList = getYlInfo(res.data.transportOpenList).d;
......
src/views/platform/regionManage.vue
......@@ -3,7 +3,7 @@
<el-row style="background-color: #ffffff;padding: 10px 0 10px 0;">
<el-radio-group v-model="platform" @change="changePlatform">
<el-radio-button
v-for="(item, index) in platformList"
v-for="(item, index) in brandLists"
:label="item.value"
:key="'platformId'+index"
>
......@@ -84,7 +84,12 @@
</el-table-column>
<el-table-column label="管理人员" align="center" width="200">
<template slot-scope="scope">
{{ scope.row.managerName + ' ' + scope.row.managerPhone }}
<template v-for="item in scope.row.areaManagerVos">
<span>
{{item.managerName+' '+item.phoneNumber}}
</span>
<br/>
</template>
</template>
</el-table-column>
<el-table-column label="已授权运力/个" prop="transportCount" align="center" width="110">
......@@ -153,13 +158,49 @@ export default {
},
async created() {
await this.getPCAInfo();
await this.getPlatformList();
if(this.brandLists.length > 0) {
this.getPlatformInfo();
await this.getTableList();
}
// await this.getPlatformList();
},
computed: {
...mapGetters(['platformId'])
...mapGetters(['platformId']),
brandLists() {
let brandList = this.$store.getters.brandList;
if(brandList.length === 0) {
return new Promise(() =>{
this.$store.dispatch('business/getBrandList')
})
brandList = this.$store.getters.brandList;
}
brandList = brandList.filter(item => {
return item.brandUrl
})
brandList = brandList.map(item => {
return {
value: JSON.stringify(item),
label: item.brandName
}
})
return brandList;
}
},
watch:{
brandLists(v){
if(v.length > 0) {
this.getPlatformInfo();
this.getTableList();
}
}
},
methods: {
getPlatformInfo() {
this.platform = this.brandLists.length > 0 ? this.brandLists[0].value : '';
this.brandUrl = this.brandLists.length > 0 ? JSON.parse(this.brandLists[0].value).brandUrl : '';
this.plat = this.brandLists.length > 0 ? JSON.parse(this.brandLists[0].value).platformId : '';
},
async getPlatformList() {
await getplatformList().then((res) => {
if (res.status == 200) {
......@@ -178,7 +219,8 @@ export default {
}
});
},
changePlatform() {
changePlatform(v) {
this.platform = v;
this.brandUrl = JSON.parse(this.platform).brandUrl;
this.plat = JSON.parse(this.platform).platformId;
this.page = 1;
......@@ -279,7 +321,7 @@ export default {
provinceCode: row.provinceCode,
areaCode: row.operateAreaCode,
areaName: row.operateAreaName,
manager: row.managerName,
manager: row.areaManagerVos,
operateId: row.operateId,
platform: JSON.parse(this.platform),
brandUrl: this.brandUrl
......
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