Commit c3b3202c by weix

优化所有品牌查询

parent af44f136
...@@ -168,6 +168,39 @@ export default { ...@@ -168,6 +168,39 @@ export default {
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) { orderStatusText(status) {
status = Number(status) status = Number(status)
switch (status) { switch (status) {
......
import {postblob} from "@/request/http"; import {postblob} from "@/request/http";
export function exportComplaint(data, u) { 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); return postblob(url, data);
} }
...@@ -2,22 +2,22 @@ import {get, post, put} from '@/request/http' ...@@ -2,22 +2,22 @@ import {get, post, put} from '@/request/http'
// 获取计价规则 http://192.168.0.251:8181/brand/setting/price/new/{getproductsetting}/{vehicletype} // 获取计价规则 http://192.168.0.251:8181/brand/setting/price/new/{getproductsetting}/{vehicletype}
export function priceNewApi(data, getproductsetting, vehicletype, u) { 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) return get(url,data)
} }
//newPrice/setting/QueryByMore //newPrice/setting/QueryByMore
export function settingQueryByMoreApi(data, u) { 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) return post(url,data)
} }
export function carpoolingPriceNewApi(data, getproductsetting, u) { 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) return get(url,data)
} }
export function settingPriceNewApi(data,getproductsetting, u) { 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) return get(url,data)
} }
...@@ -2,12 +2,12 @@ import {get, post, deletes} from '@/request/http' ...@@ -2,12 +2,12 @@ import {get, post, deletes} from '@/request/http'
// //
export function tripProductApi(data = {}, id, u) { 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) return get(url, data)
} }
// //
export function tripProducDetailtApi(data = {}, id, u) { 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) return get(url, data)
} }
...@@ -2,7 +2,7 @@ import {get, post, put} from '@/request/http' ...@@ -2,7 +2,7 @@ import {get, post, put} from '@/request/http'
// 产品操作记录 // 产品操作记录
export function tripProductLogApi(data, id, u) { 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) return get(url,data)
} }
......
import {put, get, post, deletes} from '@/request/http' import {put, get, post, deletes} from '@/request/http'
// 获取列表 // 获取列表
export function getRegionManageList(data = {}, u, platformId) { 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) return get(url, data, platformId)
} }
//虚拟号配置查询列表 //虚拟号配置查询列表
......
...@@ -2,6 +2,6 @@ import {get} from '@/request/http' ...@@ -2,6 +2,6 @@ import {get} from '@/request/http'
// 根据开通区域查询详情 /xoadoAreaOpen/count/all // 根据开通区域查询详情 /xoadoAreaOpen/count/all
export function getDetailApi(data, u) { 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) return get(url, data)
} }
...@@ -263,7 +263,7 @@ export function getAllOpenArea(platformId) { ...@@ -263,7 +263,7 @@ export function getAllOpenArea(platformId) {
/* 查询平台所有运力 */ /* 查询平台所有运力 */
export function getAllTransport(data, u) { export function getAllTransport(data, u) {
const url = (u ? u + '/brand' : targetBaseUrl) + '/transport' const url = (u ? u : targetBaseUrl) + '/transport'
return get(url, data) return get(url, data)
} }
...@@ -275,7 +275,7 @@ export function getAllAreaProducts(data) { ...@@ -275,7 +275,7 @@ export function getAllAreaProducts(data) {
/* 查询当前区域开通的所有产品(按条件查询)(新) */ /* 查询当前区域开通的所有产品(按条件查询)(新) */
export function getAllTripProduct(data, u) { export function getAllTripProduct(data, u) {
const url = (u ? u + '/brand' : targetBaseUrl) + '/tripProduct/list' const url = (u ? u : targetBaseUrl) + '/tripProduct/list'
return post(url, data) return post(url, data)
} }
...@@ -395,19 +395,19 @@ export function getYunCubicProductData1(data) { ...@@ -395,19 +395,19 @@ export function getYunCubicProductData1(data) {
/* 多条件查询订单列表 */ /* 多条件查询订单列表 */
export function getAllOrderList(data, u, platformId) { 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) return post(url, data, platformId)
} }
/* 多条件查询订单列表 */ /* 多条件查询订单列表 */
export function getThisorderInfo(data, u, 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) return post(url, data, platformId)
} }
/* 多条件导出订单列表 */ /* 多条件导出订单列表 */
export function exportAllOrderList(data, u, 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) return postblob(url, data, platformId)
} }
...@@ -437,7 +437,7 @@ export function seachDividedInto(data) { ...@@ -437,7 +437,7 @@ export function seachDividedInto(data) {
/* 投诉列表查询 */ /* 投诉列表查询 */
export function getAllcomplainList(data, u) { export function getAllcomplainList(data, u) {
const url = (u ? u + '/brand' : targetBaseUrl) + '/complaint/condition' const url = (u ? u : targetBaseUrl) + '/complaint/condition'
return post(url, data) return post(url, data)
} }
...@@ -497,7 +497,7 @@ export function getTransportListForProductId(productId) { ...@@ -497,7 +497,7 @@ export function getTransportListForProductId(productId) {
/* 用户操作日志接口信息 */ /* 用户操作日志接口信息 */
export function userLog(data, u, platformId) { 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) return post(url, data, platformId)
} }
...@@ -623,7 +623,7 @@ export function SeachfenceInfo(data) { ...@@ -623,7 +623,7 @@ export function SeachfenceInfo(data) {
/* 计算器计价 */ /* 计算器计价 */
export function calculatorPrice(data, platformId, u) { 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) return post(url, data)
} }
...@@ -1123,7 +1123,7 @@ export function exportCycleBills(data = {}) { ...@@ -1123,7 +1123,7 @@ export function exportCycleBills(data = {}) {
/* 客诉管理---查询客诉 */ /* 客诉管理---查询客诉 */
export function getComplaintById(id, u, platformId) { 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) return get(url, platformId)
} }
...@@ -1170,4 +1170,4 @@ export function PutvoicePage(data) { ...@@ -1170,4 +1170,4 @@ export function PutvoicePage(data) {
export function updateMobilenoCaptCha(data) { export function updateMobilenoCaptCha(data) {
const url = process.env.VUE_APP_BASE_API6 + `/driver/updateMobile/noCaptCha` const url = process.env.VUE_APP_BASE_API6 + `/driver/updateMobile/noCaptCha`
return put(url, data) return put(url, data)
} }
\ No newline at end of file
...@@ -539,7 +539,6 @@ export default { ...@@ -539,7 +539,6 @@ export default {
this.getData(this.billState, this.page, this.month, this.rows, this.sort); this.getData(this.billState, this.page, this.month, this.rows, this.sort);
}, },
handleCurrentChange(page) { handleCurrentChange(page) {
debugger
this.page = page; this.page = page;
this.getData(this.billState, this.page, this.month, this.rows, this.sort); this.getData(this.billState, this.page, this.month, this.rows, this.sort);
}, },
......
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
<el-card style="min-height: 200px;max-height: calc(100vh - 280px);overflow-y: auto;"> <el-card style="min-height: 200px;max-height: calc(100vh - 280px);overflow-y: auto;">
<el-row class="top-title"> <el-row class="top-title">
<span style="font-size: 18px;font-weight: 800;"> <span style="font-size: 18px;font-weight: 800;">
诉信息 控诉信息
</span> </span>
<el-tag size="mini" effect="plain" style="margin-left: 7px;"> <el-tag size="mini" effect="plain" style="margin-left: 7px;">
{{ complainCategoryText(complaintInfo.complaintLabel) }} {{ complainCategoryText(complaintInfo.complaintLabel) }}
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<el-row style="background-color: #ffffff;padding: 10px 0 0 20px;"> <el-row style="background-color: #ffffff;padding: 10px 0 0 20px;">
<el-radio-group v-model="platform" @change="changePlatform"> <el-radio-group v-model="platform" @change="changePlatform">
<el-radio-button <el-radio-button
v-for="(item, index) in platformList" v-for="(item, index) in brandLists"
:label="item.value" :label="item.value"
:key="'platformId'+index" :key="'platformId'+index"
> >
...@@ -168,6 +168,7 @@ import { ...@@ -168,6 +168,7 @@ import {
import JudgeType from '@/mixins/judgeType' import JudgeType from '@/mixins/judgeType'
import {Loading} from 'element-ui'; import {Loading} from 'element-ui';
import {mapGetters} from "vuex";
export default { export default {
name: "index", name: "index",
...@@ -479,6 +480,29 @@ export default { ...@@ -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: { watch: {
TableHeight(val) { TableHeight(val) {
// 为了避免频繁触发resize函数导致页面卡顿,使用定时器 // 为了避免频繁触发resize函数导致页面卡顿,使用定时器
...@@ -494,6 +518,15 @@ export default { ...@@ -494,6 +518,15 @@ export default {
}, 500) }, 500)
} }
}, },
async brandLists(v){
if(v.length > 0) {
this.getPlatformInfo();
await this.getOpenAreaListFun()
await this.getTransport()
await this.getOrderHeaders()
await this.getData();
}
}
// config: { // config: {
// handler(newVal,oldVal){ // handler(newVal,oldVal){
// console.log(newVal) // console.log(newVal)
...@@ -508,13 +541,21 @@ export default { ...@@ -508,13 +541,21 @@ export default {
const start = new Date(); const start = new Date();
start.setTime(start.getTime() + 8.64e7 - 3600 * 1000 * 24 * 7); 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]; 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() if(this.brandLists.length > 0) {
await this.getTransport() this.getPlatformInfo();
await this.getOrderHeaders() await this.getOpenAreaListFun()
await this.getData() await this.getTransport()
await this.getOrderHeaders()
await this.getData()
}
}, },
methods: { 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() { async getTransport() {
let json = { let json = {
...@@ -537,10 +578,11 @@ export default { ...@@ -537,10 +578,11 @@ export default {
} }
}) })
}, },
async changePlatform() { async changePlatform(v) {
// 切换品牌 // 切换品牌
this.OperationalData = []; this.OperationalData = [];
this.dataSource.localTransportId = []; this.dataSource.localTransportId = [];
this.platform = v;
this.brandUrl = JSON.parse(this.platform).brandUrl; this.brandUrl = JSON.parse(this.platform).brandUrl;
this.plat = JSON.parse(this.platform).platformId; this.plat = JSON.parse(this.platform).platformId;
await this.getOpenAreaListFun(); await this.getOpenAreaListFun();
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<el-row style="background-color: #ffffff;padding: 10px 0 0 20px;"> <el-row style="background-color: #ffffff;padding: 10px 0 0 20px;">
<el-radio-group v-model="platformId" @change="changePlatform"> <el-radio-group v-model="platformId" @change="changePlatform">
<el-radio-button <el-radio-button
v-for="(item, index) in platformList" v-for="(item, index) in brandLists"
:label="item.value" :label="item.value"
:key="'platformId'+index" :key="'platformId'+index"
> >
...@@ -202,7 +202,37 @@ export default { ...@@ -202,7 +202,37 @@ export default {
Table Table
}, },
computed: { 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], mixins: [JudgeType],
data() { data() {
...@@ -677,9 +707,6 @@ export default { ...@@ -677,9 +707,6 @@ export default {
} }
}, },
async created() { async created() {
await this.getAllPlatform()
await this.getOpenAreaListFun()
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]
...@@ -691,11 +718,21 @@ export default { ...@@ -691,11 +718,21 @@ export default {
this.selectResult.weybillFlag = 'createTime' this.selectResult.weybillFlag = 'createTime'
this.selectResult.order = 'desc' this.selectResult.order = 'desc'
// this.getAllData() // this.getAllData()
await this.getOrderHeaders() // await this.getAllPlatform()
if(this.brandLists.length > 0) {
this.getPlatformInfo();
await this.getOpenAreaListFun()
await this.getTransport()
await this.getOrderHeaders()
}
}, },
methods: { 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() { async getTransport() {
let json = { let json = {
platformId: JSON.parse(this.platformId).platformId, platformId: JSON.parse(this.platformId).platformId,
page: 1, page: 1,
...@@ -716,8 +753,9 @@ export default { ...@@ -716,8 +753,9 @@ export default {
} }
}) })
}, },
async changePlatform() { async changePlatform(v) {
// 切换品牌 // 切换品牌
this.platformId = v;
this.OperationalData = []; this.OperationalData = [];
this.dataSource.localTransportId = []; this.dataSource.localTransportId = [];
this.brandUrl = JSON.parse(this.platformId).brandUrl; this.brandUrl = JSON.parse(this.platformId).brandUrl;
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<el-col <el-col
style="display: flex; align-items: center; justify-content: end" 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-col>
</el-row> </el-row>
</el-form> </el-form>
......
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
<el-select v-model="form.platform" @change="changePlatform"> <el-select v-model="form.platform" @change="changePlatform">
<el-option <el-option
v-for="(item, index) in platformList" v-for="(item, index) in platformList"
:label="item.label" :label="item.brandName"
:value="item.value" :value="item.platformId"
:key="'polygon' + index" :key="'polygon' + index"
> >
</el-option> </el-option>
...@@ -290,7 +290,6 @@ export default { ...@@ -290,7 +290,6 @@ export default {
let range = row.rangeOfApplication.filter(item => { let range = row.rangeOfApplication.filter(item => {
return item != row.typeItem return item != row.typeItem
}) })
debugger
this.form = { this.form = {
id: row.id, id: row.id,
platform: row.platformId, platform: row.platformId,
......
...@@ -750,7 +750,6 @@ export default { ...@@ -750,7 +750,6 @@ export default {
// pageJumpUrl: this.ruleForm.pageJumpFlag == 1 ? this.ruleForm.pageJumpUrl : this.ruleForm.insideJumpUrl, // pageJumpUrl: this.ruleForm.pageJumpFlag == 1 ? this.ruleForm.pageJumpUrl : this.ruleForm.insideJumpUrl,
// pageJumpText: this.ruleForm.pageJumpText, // pageJumpText: this.ruleForm.pageJumpText,
// }; // };
debugger
let json = { let json = {
"platformId": this.$store.getters.platformId,// (平台ID) "platformId": this.$store.getters.platformId,// (平台ID)
"displayPage": this.selectResult.pageLocation,// (展示页面) "displayPage": this.selectResult.pageLocation,// (展示页面)
......
...@@ -256,7 +256,6 @@ export default { ...@@ -256,7 +256,6 @@ export default {
*弹窗开关切换 *弹窗开关切换
* **/ * **/
async operatingStatuct(val) { async operatingStatuct(val) {
debugger
let {data, status} = await upOrDown({}, val.advertId, val.isOnline); let {data, status} = await upOrDown({}, val.advertId, val.isOnline);
if (status == 200) { if (status == 200) {
this.$message.success("操作成功"); this.$message.success("操作成功");
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<el-col :span="8"> <el-col :span="8">
<!-- <Selects :options="dataSource.orderChannelList" :selectName="'适用渠道:'" :type="'applyChannelList'"--> <!-- <Selects :options="dataSource.orderChannelList" :selectName="'适用渠道:'" :type="'applyChannelList'"-->
<!-- @changeList="handlechangeList" class="right-distance"></Selects>--> <!-- @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> @changeList="handlechangeList" class="right-distance"></Selects>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
...@@ -165,7 +165,7 @@ export default { ...@@ -165,7 +165,7 @@ export default {
async created() { async created() {
this.ylD = this.ylData this.ylD = this.ylData
// await this.getAllChannelListFun() // await this.getAllChannelListFun()
await this.getAllData() // await this.getAllData()
}, },
methods: { methods: {
searchAll() { searchAll() {
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<el-tag class="tag-div" type="info">{{ reserveTypeText($store.getters.productJJInfo.reserveType) }}</el-tag> <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" 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"> <el-tag class="tag-div" v-for="item in $store.getters.productJJInfo.applyChannel" :key="item" type="danger">
{{ orderSourcesSpecial(item) }} {{ orderSourcesSpecialNew(item) }}
</el-tag> </el-tag>
</el-row> </el-row>
</el-col> </el-col>
......
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
<el-form-item label="品牌名称:" prop="platformId" v-if="!$route.query.hasOwnProperty('platformId')"> <el-form-item label="品牌名称:" prop="platformId" v-if="!$route.query.hasOwnProperty('platformId')">
<el-select v-model="form.platformId" size="mini"> <el-select v-model="form.platformId" size="mini">
<el-option <el-option
v-for="(item, index) in brandList" v-for="(item, index) in brandLists"
:label="item.brandName" :label="item.brandName"
:value="item.platformId" :value="item.platformId"
:key="'platformId'+index" :key="'platformId'+index"
...@@ -170,6 +170,20 @@ export default { ...@@ -170,6 +170,20 @@ export default {
brandList: [] 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() { created() {
// 获取配置项 // 获取配置项
this.getPlatformConfig(); this.getPlatformConfig();
...@@ -241,17 +255,17 @@ export default { ...@@ -241,17 +255,17 @@ export default {
} }
}) })
platformInfosList() // platformInfosList()
.then((res) => { // .then((res) => {
if(res.status === 200) { // if(res.status === 200) {
this.brandList = res.data.filter(item => {return item.brandUrl}); // this.brandList = res.data.filter(item => {return item.brandUrl});
}else { // }else {
this.$message.error(res.msg); // this.$message.error(res.msg);
} // }
}) // })
.catch(() => { // .catch(() => {
//
}) // })
}, },
getInfo() { getInfo() {
getPlatformInfo({}, this.$route.query.platformId) getPlatformInfo({}, this.$route.query.platformId)
......
...@@ -12,10 +12,11 @@ ...@@ -12,10 +12,11 @@
style="font-size: 12px;color: #3399FF;background: #e9f0f8;margin-left: 10px;">{{ style="font-size: 12px;color: #3399FF;background: #e9f0f8;margin-left: 10px;">{{
company + ' 丨 ' + location company + ' 丨 ' + location
}}</span> }}</span>
<span <span v-for="(item, index) in manage" :key="'manage'+index"
style="font-size: 12px;color: #FF6600;background: #f8e6db;margin-left: 10px;">{{ style="font-size: 12px;color: #FF6600;background: #f8e6db;margin-left: 10px;">
manage
}}</span> {{ item.managerName + ' ' + item.phoneNumber }}
</span>
<!-- <i style="color: #539af3;margin-left: 10px;font-size: 12px;cursor: pointer;" @click="clickEdit" class="el-icon-edit"></i>--> <!-- <i style="color: #539af3;margin-left: 10px;font-size: 12px;cursor: pointer;" @click="clickEdit" class="el-icon-edit"></i>-->
</el-row> </el-row>
<el-row style="font-size: 14px;"> <el-row style="font-size: 14px;">
...@@ -117,9 +118,9 @@ export default { ...@@ -117,9 +118,9 @@ export default {
.then((res) => { .then((res) => {
if (res.status === 200) { if (res.status === 200) {
this.regName = res.data.areaInfo.operateName; 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.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.priceData = res.data.priceScopeList;
this.yl = getYlInfo(res.data.transportOpenList).str; this.yl = getYlInfo(res.data.transportOpenList).str;
this.transportOpenList = getYlInfo(res.data.transportOpenList).d; this.transportOpenList = getYlInfo(res.data.transportOpenList).d;
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<el-row style="background-color: #ffffff;padding: 10px 0 10px 0;"> <el-row style="background-color: #ffffff;padding: 10px 0 10px 0;">
<el-radio-group v-model="platform" @change="changePlatform"> <el-radio-group v-model="platform" @change="changePlatform">
<el-radio-button <el-radio-button
v-for="(item, index) in platformList" v-for="(item, index) in brandLists"
:label="item.value" :label="item.value"
:key="'platformId'+index" :key="'platformId'+index"
> >
...@@ -84,7 +84,12 @@ ...@@ -84,7 +84,12 @@
</el-table-column> </el-table-column>
<el-table-column label="管理人员" align="center" width="200"> <el-table-column label="管理人员" align="center" width="200">
<template slot-scope="scope"> <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> </template>
</el-table-column> </el-table-column>
<el-table-column label="已授权运力/个" prop="transportCount" align="center" width="110"> <el-table-column label="已授权运力/个" prop="transportCount" align="center" width="110">
...@@ -153,13 +158,49 @@ export default { ...@@ -153,13 +158,49 @@ export default {
}, },
async created() { async created() {
await this.getPCAInfo(); await this.getPCAInfo();
await this.getPlatformList(); if(this.brandLists.length > 0) {
await this.getTableList(); this.getPlatformInfo();
await this.getTableList();
}
// await this.getPlatformList();
}, },
computed: { 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: { 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() { async getPlatformList() {
await getplatformList().then((res) => { await getplatformList().then((res) => {
if (res.status == 200) { if (res.status == 200) {
...@@ -178,7 +219,8 @@ export default { ...@@ -178,7 +219,8 @@ export default {
} }
}); });
}, },
changePlatform() { changePlatform(v) {
this.platform = v;
this.brandUrl = JSON.parse(this.platform).brandUrl; this.brandUrl = JSON.parse(this.platform).brandUrl;
this.plat = JSON.parse(this.platform).platformId; this.plat = JSON.parse(this.platform).platformId;
this.page = 1; this.page = 1;
...@@ -279,7 +321,7 @@ export default { ...@@ -279,7 +321,7 @@ export default {
provinceCode: row.provinceCode, provinceCode: row.provinceCode,
areaCode: row.operateAreaCode, areaCode: row.operateAreaCode,
areaName: row.operateAreaName, areaName: row.operateAreaName,
manager: row.managerName, manager: row.areaManagerVos,
operateId: row.operateId, operateId: row.operateId,
platform: JSON.parse(this.platform), platform: JSON.parse(this.platform),
brandUrl: this.brandUrl 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