Skip to content

X
xoadoPlatform
Commit 2a8b6724 by 吕海涛
Options

Merge branch 'master' of https://git.xoado.com/yaohui/xoadoPlatform

# Conflicts: # .env.development
parents 1156383c d537ad04
Showing with 131 additions and 52 deletions
.env.development
...@@ -6,15 +6,15 @@ VUE_APP_BASE_API1 = 'https://apps.xoado.com' ...@@ -6,15 +6,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://xiaoduochuxing.xoado.com' VUE_APP_BASE_API4 = 'https://aitransport.xoado.com'
VUE_APP_BASE_API5 = 'http://xoado.tpddns.cn:10001/brandtt' VUE_APP_BASE_API5 = 'http://192.168.0.251:8181/brand'
VUE_APP_BASE_API6 = 'http://xoado.tpddns.net:10001/transport' VUE_APP_BASE_API6 = 'http://192.168.0.251:8182/transport'
VUE_APP_BASE_API7 = 'http://xoado.tpddns.net:10001/operate' VUE_APP_BASE_API7 = 'http://192.168.0.251:8185/operate'
VUE_APP_BASE_API8 = 'http://xoado.tpddns.net:10001/trace' VUE_APP_BASE_API8 = 'http://192.168.0.251:8183/trace'
VUE_APP_BASE_API9 = 'http://xoado.tpddns.net:10001/payment/' VUE_APP_BASE_API9 = 'http://192.168.0.251:8195/payment/'
VUE_APP_BASE_API10 = 'http://xoado.tpddns.net:10001/payment/v1/' VUE_APP_BASE_API10 = 'http://192.168.0.251:8195/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://xoado.tpddns.net:10001' VUE_APP_BASE_API12 = 'http://192.168.0.251:8195'
VUE_APP_BASE_API13 = 'http://xoado.tpddns.net:10001/anc' VUE_APP_BASE_API13 = 'https://projects.xoado.com/invoice'
VUE_APP_BASE_API14 = 'http://xoado.tpddns.cn:10001/xoadotravel' VUE_APP_BASE_API14 = 'https://projects.xoado.com/message'
VUE_APP_BASE_API15 = 'http://xoado.tpddns.net:10001/brand' VUE_APP_BASE_API15 = 'http://192.168.0.251:8199/smart'
src/port/maintenance/index.js
...@@ -35,3 +35,10 @@ export function pushDriverApi(u, data) { ...@@ -35,3 +35,10 @@ export function pushDriverApi(u, data) {
const url = u +'/xoado/order/pushDriver'; const url = u +'/xoado/order/pushDriver';
return get(url, data) return get(url, data)
} }
/*
*运单强制完单
*/
export function forceFinishApi(data) {
const url = process.env.VUE_APP_BASE_API6 +'/temporaryDispatch/forceFinish';
return get(url, data)
}
src/store/modules/business.js
...@@ -48,23 +48,23 @@ const actions = { ...@@ -48,23 +48,23 @@ const actions = {
.then((res) => { .then((res) => {
if(res.status === 200) { if(res.status === 200) {
/** 正式环境注释 */ /** 正式环境注释 */
// res.data.forEach(item => { res.data.forEach(item => {
// if(item.brandName.indexOf('玖玖') !== -1) { if(item.brandName.indexOf('玖玖') !== -1) {
// item.brandUrl = 'http://192.168.0.251:8181/brand'; item.brandUrl = 'http://192.168.0.251:8181/brand';
// } }
// if(item.brandName.indexOf('江南') !== -1) { if(item.brandName.indexOf('江南') !== -1) {
// item.brandUrl = 'http://192.168.0.251:9191/brand'; item.brandUrl = 'http://192.168.0.251:9191/brand';
// } }
// if(item.brandName.indexOf('妥妥') !== -1) { if(item.brandName.indexOf('妥妥') !== -1) {
// item.brandUrl = 'http://192.168.0.251:9292/brand'; item.brandUrl = 'http://192.168.0.251:9292/brand';
// } }
// }) })
/** 测试环境注释 */ /** 测试环境注释 */
res.data.forEach(item => { // res.data.forEach(item => {
item.brandUrl = item.brandUrl+'/brand'; // item.brandUrl = item.brandUrl+'/brand';
}) // })
let data = res.data; let data = res.data;
commit('SET_BRANDLIST', JSON.stringify(data)) commit('SET_BRANDLIST', JSON.stringify(data))
......
src/views/maintenance/merchant/index.vue
...@@ -37,14 +37,42 @@ ...@@ -37,14 +37,42 @@
</div> </div>
</el-card> </el-card>
<el-row style="border-bottom: 1px solid #d5d5d5;margin: 10px 0;"></el-row> <el-card style="margin-top: 10px;">
<el-card>
<el-row> <el-row>
<div class="title-left" style="padding-left: 10px; font-weight: 800"> <div class="title-left" style="padding-left: 10px; font-weight: 800">
运单详情 运单详情
</div> </div>
</el-row> </el-row>
<el-row style="border-bottom: 1px solid #d5d5d5;margin: 10px 0;"></el-row>
<el-row type="flex" style="flex-wrap: wrap;">
<div v-for="(item, index) in data" style="width: 500px;padding-bottom: 20px;border-bottom: 1px solid #d5d5d5;">
<el-form label-position="right" label-width="120px">
<el-form-item label="订单编号">
{{item.businessId}}
</el-form-item>
<el-form-item label="商户订单号">
{{item.businessSerial}}
</el-form-item>
<el-form-item label="业务场景说明">
{{item.businessName}}
</el-form-item>
<el-form-item label="执行状态">
执行成功
</el-form-item>
<el-form-item label="支付结果">
{{getStatus(item.executeStatus)}}
</el-form-item>
<el-form-item label="创建时间">
{{item.createTime}}
</el-form-item>
<el-form-item label="完成时间">
{{item.executeTime}}
</el-form-item>
</el-form>
</div>
</el-row>
</el-card> </el-card>
</div> </div>
</template> </template>
...@@ -58,7 +86,7 @@ export default { ...@@ -58,7 +86,7 @@ export default {
return { return {
platformList: [], platformList: [],
platformInfo: '', platformInfo: '',
orderId: '', orderId: '20210301095247903_1H2wew42w7T2w',
isShow: false, isShow: false,
data: [] data: []
} }
...@@ -79,26 +107,37 @@ export default { ...@@ -79,26 +107,37 @@ export default {
}, },
methods: { methods: {
searchInfo() { searchInfo() {
paymentRecordApi({orderId: this.orderId}) let params = {
orderId: this.orderId,
paymentId: '',
status: ''
}
paymentRecordApi(params)
.then((res) => { .then((res) => {
if(res.status === 200) {
this.data = res.data;
}
}) })
},
getStatus(v) {
v = parseInt(v);
switch (v) {
case 0:
return '执行中';
case 1:
return '执行成功';
case 2:
return '执行失败';
default:
return '/';
}
} }
} }
} }
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
::v-deep .el-form-item {
.clearfix { margin-bottom: 0;
display: flex;
align-items: center;
justify-content: space-between;
.mainColor {
font-weight: bold;
font-size: 15px;
color: #000000;
}
} }
</style> </style>
src/views/maintenance/toBeSent/index.vue
...@@ -201,8 +201,12 @@ export default { ...@@ -201,8 +201,12 @@ export default {
getOrderInfoApi(JSON.parse(this.platformInfo).brandUrl, [this.orderId]) getOrderInfoApi(JSON.parse(this.platformInfo).brandUrl, [this.orderId])
.then((res) => { .then((res) => {
if(res.status === 200) { if(res.status === 200) {
this.dataSource = res.data.content[0]; if(res.data.content.length === 0) {
this.isShow = true; this.$message.info('未查到订单')
}else {
this.dataSource = res.data.content[0];
this.isShow = true;
}
}else { }else {
this.$message.error(res.msg) this.$message.error(res.msg)
} }
......
src/views/maintenance/waybill/index.vue
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<el-card class="box-card"> <el-card class="box-card">
<el-row> <el-row>
<div class="title-left" style="padding-left: 10px; font-weight: 800"> <div class="title-left" style="padding-left: 10px; font-weight: 800">
调度待派订单 运单运维管理
</div> </div>
</el-row> </el-row>
<div style="margin-top: 10px; display: inline-block"> <div style="margin-top: 10px; display: inline-block">
...@@ -40,12 +40,12 @@ ...@@ -40,12 +40,12 @@
<el-card style="margin-top: 10px;"> <el-card style="margin-top: 10px;">
<el-row type="flex" justify="space-between"> <el-row type="flex" justify="space-between">
<div class="title-left" style="padding-left: 10px; font-weight: 800"> <div class="title-left" style="padding-left: 10px; font-weight: 800">
订单详情 运单详情
</div> </div>
<el-row v-if="isShow"> <el-row v-if="isShow">
<el-button v-if="dataSource.waybillStatus == '1'" type="primary" style="padding: 5px 20px;" @click="synchronization">同步司机信息</el-button> <el-button v-if="dataSource.waybillStatus == '1'" type="primary" style="padding: 5px 20px;" @click="synchronization">同步司机信息</el-button>
<el-button v-if="dataSource.waybillStatus == '1' || dataSource.waybillStatus == '4'" type="warning" style="padding: 5px 20px;" @click="force">强制完单</el-button> <el-button v-if="dataSource.waybillStatus > 1 && dataSource.waybillStatus < 6" type="warning" style="padding: 5px 20px;" @click="force" :loading="forceLoading">强制完单</el-button>
</el-row> </el-row>
</el-row> </el-row>
...@@ -514,14 +514,14 @@ ...@@ -514,14 +514,14 @@
</el-form> </el-form>
<div style="text-align: right;"> <div style="text-align: right;">
<el-button @click="closeDialog">取消</el-button> <el-button @click="closeDialog">取消</el-button>
<el-button type="primary" @click="pushDriver">确定</el-button> <el-button type="primary" @click="pushDriver" :loading="synchronizationLoading">确定</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
import {getWaybillInfoApi, pushDriverApi} from "@/port/maintenance"; import {getWaybillInfoApi, pushDriverApi, forceFinishApi} from "@/port/maintenance";
import judgeType from "@/mixins/judgeType"; import judgeType from "@/mixins/judgeType";
import CopyIcon from "@/views/components/CopyIcon"; import CopyIcon from "@/views/components/CopyIcon";
//NT_20220318231747287_99381340310 //NT_20220318231747287_99381340310
...@@ -533,6 +533,8 @@ export default { ...@@ -533,6 +533,8 @@ export default {
}, },
data() { data() {
return { return {
synchronizationLoading: false,
forceLoading: false,
visibleDialog: false, visibleDialog: false,
platformList: [], platformList: [],
platformInfo: '', platformInfo: '',
...@@ -567,6 +569,7 @@ export default { ...@@ -567,6 +569,7 @@ export default {
}, },
methods: { methods: {
pushDriver() { pushDriver() {
this.synchronizationLoading = true;
let params = { let params = {
orderId: this.orderId, orderId: this.orderId,
platformId: JSON.parse(this.platformInfo).platformId platformId: JSON.parse(this.platformInfo).platformId
...@@ -576,9 +579,14 @@ export default { ...@@ -576,9 +579,14 @@ export default {
.then((res) => { .then((res) => {
if(res.status === 200) { if(res.status === 200) {
this.$message.success('推送成功'); this.$message.success('推送成功');
this.searchInfo();
}else { }else {
this.$message.error(res.msg); this.$message.error(res.msg);
} }
this.synchronizationLoading = false;
})
.catch(() => {
this.synchronizationLoading = false;
}) })
}, },
closeDialog() { closeDialog() {
...@@ -613,7 +621,24 @@ export default { ...@@ -613,7 +621,24 @@ export default {
this.visibleDialog = true; this.visibleDialog = true;
}, },
force() { force() {
this.forceLoading = true;
let params = {
waybillId: this.orderId,
orderId: '',
}
forceFinishApi(params)
.then((res) => {
if(res.status === 200) {
this.searchInfo();
}else {
this.$message.error(res.msg);
}
this.forceLoading = false;
})
.catch(() => {
this.forceLoading = false;
})
}, },
} }
} }
......
src/views/platform/components/settingInfo.vue
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
<el-button size="mini" @click="cancel"> <el-button size="mini" @click="cancel">
取消 取消
</el-button> </el-button>
<el-button size="mini" type="primary" @click="submit"> <el-button size="mini" type="primary" :loading="submitLoading" @click="submit">
确定 确定
</el-button> </el-button>
</el-row> </el-row>
...@@ -140,6 +140,7 @@ export default { ...@@ -140,6 +140,7 @@ export default {
return callback() return callback()
} }
return { return {
submitLoading: false,
topInfo: {}, topInfo: {},
form: { form: {
platformId: '', platformId: '',
...@@ -193,6 +194,7 @@ export default { ...@@ -193,6 +194,7 @@ export default {
submit() { submit() {
this.$refs.form.validate(valid => { this.$refs.form.validate(valid => {
if(valid) { if(valid) {
this.submitLoading = true;
let params = JSON.parse(JSON.stringify(this.form)); let params = JSON.parse(JSON.stringify(this.form));
if(this.$route.query.hasOwnProperty('platformId')) { if(this.$route.query.hasOwnProperty('platformId')) {
updatePlatformInfo(params) updatePlatformInfo(params)
...@@ -203,9 +205,10 @@ export default { ...@@ -203,9 +205,10 @@ export default {
}else { }else {
this.$message.error(res.msg); this.$message.error(res.msg);
} }
this.submitLoading = false;
}) })
.catch(() => { .catch(() => {
this.submitLoading = false;
}) })
}else { }else {
addPlatformInfo(params) addPlatformInfo(params)
...@@ -216,9 +219,10 @@ export default { ...@@ -216,9 +219,10 @@ export default {
}else { }else {
this.$message.error(res.msg); this.$message.error(res.msg);
} }
this.submitLoading = false;
}) })
.catch(() => { .catch(() => {
this.submitLoading = false;
}) })
} }
} }
......
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