Skip to content

X
xoadoPlatform
Commit d8402805 by weix
Options

修改bug

parent 9b1b1270
Showing with 105 additions and 51 deletions
src/App.vue
......@@ -27,8 +27,6 @@ export default {
axios.defaults.headers.XOADOAPPACCESSCODE = sessionStorage.getItem('code')
await this.$store.dispatch('user/PlatformCode')
await this.mustFun();
/** 测试环境需要解注 */
// await this.getEnvironment();
},
mounted () {
console.log(process.env.VUE_APP_BASE_API5)
......@@ -41,9 +39,6 @@ export default {
clearInterval(this.timerToken)
},
methods: {
getEnvironment () {
sessionStorage.setItem('test', '0');
},
reload () {
this.isRouterAlive = false
this.$nextTick(function () {
......
src/router/index.js
......@@ -384,7 +384,7 @@ export const routes = [{
name: 'toBeSent',
component: () =>
import ('@/views/maintenance/toBeSent/index.vue'),
meta: { title: '待派订单', icon: 'el-icon-s-home' }
meta: { title: '调度待派订单', icon: 'el-icon-s-home' }
},
{
path: 'merchant',
......
src/views/maintenance/merchant/index.vue
......@@ -8,22 +8,22 @@
</el-row>
<div style="margin-top: 10px; display: inline-block">
<div style="display: flex; align-items: center">
<div style="margin-right: 10px; display: flex; align-items: center">
<span style="white-space: nowrap; margin-right: 10px">
品牌：
</span>
<el-select v-model="platformInfo" placeholder="请选择" style="width: 200px;">
<el-option
v-for="item in brandLists"
:key="item.value"
:label="item.brandName"
:value="JSON.stringify(item)"
>
</el-option>
</el-select>
</div>
<!-- <div style="margin-right: 10px; display: flex; align-items: center">-->
<!-- <span style="white-space: nowrap; margin-right: 10px">-->
<!-- 品牌：-->
<!-- </span>-->
<!-- <el-select v-model="platformInfo" placeholder="请选择" style="width: 200px;">-->
<!-- <el-option-->
<!-- v-for="item in brandLists"-->
<!-- :key="item.value"-->
<!-- :label="item.brandName"-->
<!-- :value="JSON.stringify(item)"-->
<!-- >-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </div>-->
<el-input v-model="orderId" placeholder="请输入内容" style="width: 300px"></el-input>
<el-input v-model="orderId" placeholder="请输入商户订单号" style="width: 300px"></el-input>
<el-button
type="primary"
......@@ -79,14 +79,14 @@
<script>
import {paymentRecordApi} from "@/port/maintenance";
//20210301095247903_1H2wew42w7T2w
export default {
name: "index",
data() {
return {
platformList: [],
platformInfo: '',
orderId: '20210301095247903_1H2wew42w7T2w',
orderId: '',
isShow: false,
data: []
}
......@@ -112,10 +112,13 @@ export default {
paymentId: '',
status: ''
}
this.data = [];
paymentRecordApi(params)
.then((res) => {
if(res.status === 200) {
this.data = res.data;
}else{
this.$message.error(res.msg)
}
})
},
......
src/views/maintenance/toBeSent/index.vue
......@@ -41,9 +41,28 @@
<el-row type="flex" justify="space-between">
<div class="title-left" style="padding-left: 10px; font-weight: 800">
订单详情
<span v-if="isShow" style="margin-left: 10px;font-size: 14px;font-weight: normal;">{{
<span v-if="isShow"
:style="{
'background-color': dataSource.orderReserveType == 1 ? 'rgba(55, 153, 255, 0.6)' : 'rgba(255, 102, 51, 0.6)',
'color':dataSource.orderReserveType == 1 ? '#3399FF' : '#FF6633'
}"
style="margin-left: 10px;font-size: 14px;font-weight: normal;padding: 2px 5px;border-radius: 5px;">{{
dataSource.orderReserveType == 1 ? "实时" : "预约"
}}</span>
<span v-if="isShow"
style="
background-color: rgba(128, 128, 255, 0.6);
color: #8080FF;
margin-left: 10px;
font-size: 14px;
font-weight: normal;
padding: 2px 5px;
border-radius: 5px;
"
>
{{getCarName(JSON.parse(dataSource.chooseVehicleType).type)}}
</span>
</div>
<el-button v-if="isShow" type="danger" style="padding: 0 20px;" @click="del">删除</el-button>
</el-row>
......@@ -84,6 +103,18 @@
</li>
<li>
<div>
<span v-if="dataSource.startAddress"
>用车时间：{{ dataSource.appointmentTime | formatDates }}</span
>
</div>
<div>
<span v-if="dataSource.endAddress"
>下单时间：{{ dataSource.createTime | formatDates}}</span
>
</div>
</li>
<li>
<div>
<span
>订单价格：{{
(!!dataSource.trealMoney&&dataSource.runType!=6)
......@@ -111,6 +142,16 @@
:msg="dataSource.passengerMobile"
/>
</div>
<div>
<span>
乘车人数：{{
dataSource.vehicleInfo ? JSON.parse(dataSource.vehicleInfo).vehicleObj.seats : '/'
}}
</span
>
</div>
</li>
<li>
<div
v-if="
dataSource.otherInfo &&
......@@ -130,30 +171,7 @@
/>
</div>
<div v-else-if="dataSource.runType!=6"><span>航班号：/</span></div>
</li>
<li>
<div v-if="dataSource.waybillId">
<span>运单编号：{{ dataSource.waybillId }}</span>
<CopyIcon
:msg="dataSource.waybillId"
/>
</div>
<div v-if="dataSource.orderSource == 10 && dataSource.otherInfo != null">
<span>携程单号：{{ dataSource.otherInfo ? dataSource.otherInfo.masterOrderId : '' }}</span>
<CopyIcon
:msg="dataSource.otherInfo ? dataSource.otherInfo.masterOrderId : ''"
/>
</div>
</li>
<li>
<div>
<span v-if="dataSource.tpaymentStatus == 2 || dataSource.tpaymentStatus == 4">
预估金额：{{dataSource.estimateMoney}}元
</span>
<span v-if="dataSource.tpaymentStatus == 1 || dataSource.tpaymentStatus == 3">
应付金额：{{dataSource.trealMoney}}元
</span>
</div>
<div><span>备注：{{dataSource.orderMemo ? dataSource.orderMemo : '/'}}</span></div>
</li>
</ul>
</div>
......@@ -166,6 +184,8 @@
import {getOrderInfoApi, delDispatchDataApi} from "@/port/maintenance";
import judgeType from "@/mixins/judgeType";
import CopyIcon from "@/views/components/CopyIcon";
import {modelsQuery} from "@/port/carModel/carModel";
import {formatDate} from "@/utils/formatDate";
export default {
name: "index",
......@@ -179,9 +199,17 @@ export default {
platformInfo: '',
orderId: '',
dataSource: {},
isShow: false
isShow: false,
modelsData: []
}
},
filters: {
formatDates(time) {
let date = new Date(time);
console.log(new Date(time));
return formatDate(date, "yyyy-MM-dd hh:mm:ss");
},
},
computed: {
brandLists() {
let brandList = this.$store.getters.brandList;
......@@ -196,7 +224,35 @@ export default {
return brandList;
}
},
methods: {
created() {
this.getModelsCar();
},
methods: {// 查询基础车型
getModelsCar() {
let params = {
type: '',
pageVo:{
page: 1,
rows: 9999
}
}
modelsQuery(params)
.then((res) => {
if(res.status === 200) {
this.modelsData = res.data.content;
}
})
.catch(() => {
})
},
getCarName(id) {
for (let i = 0; i < this.modelsData.length; i++) {
if(this.modelsData[i].vehicleFlag == id) {
return this.modelsData[i].vehicleName;
}
}
},
searchInfo() {
getOrderInfoApi(JSON.parse(this.platformInfo).brandUrl, [this.orderId])
.then((res) => {
......
src/views/platform/regionManage.vue
......@@ -98,7 +98,7 @@
</el-table-column>
<el-table-column label="操作" align="center" fixed="right" width="120" v-if="$store.state.user.roleType != 2">
<template slot-scope="scope">
<el-button type="text" @click="handledbClick">
<el-button type="text" @click="handledbClick(scope.row)">
查看产品
</el-button>
</template>
......
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