Compare commits
10 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
84391ce4a8 | ||
|
|
d3233d9c1d | ||
|
|
467ee15584 | ||
|
|
faaa04d1e6 | ||
|
|
a40e440d02 | ||
|
|
cb0444f757 | ||
|
|
6d87feaa93 | ||
|
|
62174891d8 | ||
|
|
7607f7c920 | ||
|
|
9bf3eed711 |
@ -11,6 +11,16 @@ export const getInfoBySettleBillNo = (data = {})=> {
|
||||
return coreRequest(url.getInfoBySettleBillNo, data, {}, 'get')
|
||||
}
|
||||
|
||||
// 获取简化账单信息
|
||||
export const getSimpleInfoBySettleBillNo = (data = {})=> {
|
||||
return coreRequest(url.getSimpleInfoBySettleBillNo, data, {}, 'get')
|
||||
}
|
||||
|
||||
// 获取子账单信息
|
||||
export const getSubBillListBySettleBillNo = (data = {})=> {
|
||||
return coreRequest(url.getSubBillListBySettleBillNo, data, {}, 'get')
|
||||
}
|
||||
|
||||
// 获取微信支付二维码
|
||||
export const getWxPayQrCode = (data = {})=> {
|
||||
return coreRequest(url.getWxPayQrCode, data, {}, 'get')
|
||||
|
||||
@ -102,3 +102,6 @@ export const getOnlineKefuH5Url = (data = {})=> {
|
||||
return coreRequest(url.getOnlineKefuH5Url, data, {}, 'get')
|
||||
}
|
||||
|
||||
export const getLbsRecordListByBillCode = (data = {})=> {
|
||||
return coreRequest(url.getLbsRecordListByBillCode, data, {}, "GET")
|
||||
}
|
||||
|
||||
@ -56,6 +56,10 @@ export default {
|
||||
scanCheckBillCode: `/oms2c/emisWaybill/scanCheckBillCode`, // 扫码下单寄件-checke
|
||||
queryBSettleillList: `/oms2c/emisSettleBill/listSimple`, // 账单列表
|
||||
getInfoBySettleBillNo: `/oms2c/emisSettleBill/getInfoBySettleBillNo`, // 获取账单详情
|
||||
|
||||
getSimpleInfoBySettleBillNo: `/oms2c/emisSettleBill/getSimpleInfoBySettleBillNo`, // 获取简化账单详情
|
||||
getSubBillListBySettleBillNo: `/oms2c/emisSettleBill/listSubBill`, // 获取账单子账单明细
|
||||
|
||||
getWxPayQrCode: `/oms2c/emisSettleBill/getWxPayQrCode`, // 获取微信支付二维码
|
||||
sumbitWxPay: `/oms2c/emisSettleBill/sumbitWxPay`, // 账单-唤起微信立即支付
|
||||
|
||||
@ -66,6 +70,7 @@ export default {
|
||||
querySappNotifyTplList: `/oms2c/common/querySappNotifyTplList`, // 小程序订阅消息模板列表
|
||||
getOnlineKefuH5Url: `/oms2c/common/getOnlineKefuH5Url`, // 获取客服消息链接
|
||||
reportBatchWsInError: `/oms2c/emisWarehouseIn/reportBatchWsInError`, // 进仓单异常反馈
|
||||
getLbsRecordListByBillCode: `/oms2c/common/getLbsRecordListByBillCode`, // 获取运单lbs信息
|
||||
|
||||
|
||||
}
|
||||
|
||||
21
common/custom.js
Normal file
21
common/custom.js
Normal file
@ -0,0 +1,21 @@
|
||||
/**
|
||||
* This is just a simple version of deep copy
|
||||
* Has a lot of edge cases bug
|
||||
* If you want to use a perfect deep copy, use lodash's _.cloneDeep
|
||||
* @param {Object} source
|
||||
* @returns {Object}
|
||||
*/
|
||||
export function deepClone(source) {
|
||||
if (!source && typeof source !== 'object') {
|
||||
throw new Error('error arguments', 'deepClone')
|
||||
}
|
||||
const targetObj = source.constructor === Array ? [] : {}
|
||||
Object.keys(source).forEach(keys => {
|
||||
if (source[keys] && typeof source[keys] === 'object') {
|
||||
targetObj[keys] = deepClone(source[keys])
|
||||
} else {
|
||||
targetObj[keys] = source[keys]
|
||||
}
|
||||
})
|
||||
return targetObj
|
||||
}
|
||||
@ -1,9 +1,9 @@
|
||||
export default (path)=> {
|
||||
// return `/sta_back/images/${path}`
|
||||
return `https://oms.jtrs56.com/static/sapp/images/${path}`
|
||||
return `https://oms.tanex56.com/static/sapp/images/${path}`
|
||||
}
|
||||
|
||||
export const getCdnRoot = (path)=> {
|
||||
// return `/static/${path}`
|
||||
return `https://oms.jtrs56.com/static/sapp/${path}`
|
||||
return `https://oms.tanex56.com/static/sapp/${path}`
|
||||
}
|
||||
110
components/buns-post-detail-templates/bpd-map-reciever-panel.vue
Normal file
110
components/buns-post-detail-templates/bpd-map-reciever-panel.vue
Normal file
@ -0,0 +1,110 @@
|
||||
<template>
|
||||
<u-row justify="between">
|
||||
<u-row @click="setClipboardData(modelInfo.billCode)">
|
||||
<view>
|
||||
<u-text v-if="modelInfo.billCode" :text="`运单号：${modelInfo.billCode}` " size="26"></u-text>
|
||||
<u-text v-else :text="`订单号：${modelInfo.orderSn}` " size="26"></u-text>
|
||||
</view>
|
||||
<view class="pl-10">
|
||||
<u-icon name="file-text" size="32" custom-style=""></u-icon>
|
||||
</view>
|
||||
</u-row>
|
||||
<view>
|
||||
<!-- <view v-if="showInfoBtn" @click="goto(`post/detail?billCode=${modelInfo.billCode}`)" class="com-tag-grey">
|
||||
运单信息
|
||||
</view> -->
|
||||
<tpx-text-dic v-if="!showInfoBtn" :value="modelInfo.orderStatus" :list="dicData.emis_order_status" ></tpx-text-dic>
|
||||
</view>
|
||||
</u-row>
|
||||
|
||||
<view @click="goto(`post/detail?billCode=${modelInfo.billCode}`)">
|
||||
<u-row custom-style="margin-top: 5rpx;" justify="center">
|
||||
<u-col span="4">
|
||||
<u-text :text="(sender.countryName + sender.provinceName)||'-'" size="30" :bold="true" align="center"></u-text>
|
||||
<!-- <u-text :text="sender.name" size="26" color="#999" margin="20rpx 0 0 0"
|
||||
align="center"></u-text> -->
|
||||
</u-col>
|
||||
<u-col span="4" justify="center" align="center" custom-style="text-align: center;">
|
||||
<image style="width: 70rpx;height: 14rpx;" :src="getCdnUrl('post/toline.png')">
|
||||
</image>
|
||||
<!-- getCdnUrl('post/toline-grey.png') -->
|
||||
<view class="mt-10">
|
||||
<tpx-text-dic :value="modelInfo.waybillStatus" :list="dicData.emis_waybill_status" ></tpx-text-dic>
|
||||
</view>
|
||||
</u-col>
|
||||
<u-col span="4">
|
||||
<u-text :text="(reciever.countryName + reciever.provinceName)||'-'" size="30" :bold="true" align="center"></u-text>
|
||||
<!-- <u-text :text="reciever.name" size="26" color="#999" margin="20rpx 0 0 0"
|
||||
align="center"></u-text> -->
|
||||
</u-col>
|
||||
</u-row>
|
||||
|
||||
<u-text v-if="modelInfo.blSign!=1" :text="`下单时间：${modelInfo.sendDate}`" color="#999" size="24"
|
||||
margin="10rpx 0 0 0"></u-text>
|
||||
|
||||
<u-text v-if="modelInfo.blSign==1" :text="`签收时间：${modelInfo.signDate}`" color="#999" size="24"
|
||||
margin="10rpx 0 0 0"></u-text>
|
||||
</view>
|
||||
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
computed: {
|
||||
modelInfo: {
|
||||
get() {
|
||||
return this.value
|
||||
}
|
||||
},
|
||||
sender() {
|
||||
let obj = JSON.parse(JSON.stringify(this.value?.sender || this.value || {}))
|
||||
obj.countryName = obj.sendCountryName || obj.countryName
|
||||
obj.provinceName = obj.sendProvinceName || obj.provinceName
|
||||
obj.name = obj.sendName || obj.name
|
||||
return obj
|
||||
},
|
||||
reciever() {
|
||||
let obj = JSON.parse(JSON.stringify(this.value?.reciever || this.value || {}))
|
||||
obj.countryName = obj.receiveCountryName || obj.countryName
|
||||
obj.provinceName = obj.receiveProvinceName || obj.provinceName
|
||||
obj.name = obj.receiveName || obj.name
|
||||
return obj
|
||||
},
|
||||
dicData() {
|
||||
return this.$store.getters.dicData
|
||||
}
|
||||
},
|
||||
props: {
|
||||
value: {
|
||||
default () {
|
||||
return {}
|
||||
}
|
||||
},
|
||||
showInfoBtn: {
|
||||
default () {
|
||||
return true
|
||||
}
|
||||
},
|
||||
},
|
||||
data() {
|
||||
return {}
|
||||
},
|
||||
created() {
|
||||
|
||||
},
|
||||
onHide() {
|
||||
|
||||
},
|
||||
unmounted() {
|
||||
|
||||
},
|
||||
|
||||
methods: {
|
||||
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
|
||||
</style>
|
||||
@ -80,6 +80,12 @@
|
||||
return 'dfl'
|
||||
}
|
||||
},
|
||||
pageSize: {
|
||||
default () {
|
||||
return 20
|
||||
}
|
||||
},
|
||||
|
||||
maxHeight: {
|
||||
default () {
|
||||
return ''
|
||||
@ -91,7 +97,7 @@
|
||||
reqLoading: false,
|
||||
page: { // 分页参数
|
||||
pageNum: 1,
|
||||
pageSize: 20,
|
||||
pageSize: this.pageSize,
|
||||
},
|
||||
showLoadMore: false, // 是否显示加载更多的loading
|
||||
loadedAll: false, // 是否加载了所有数据
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name" : "探路速运",
|
||||
"appid" : "__UNI__21F858F",
|
||||
"appid" : "__UNI__BAEB38C",
|
||||
"description" : "探路速运",
|
||||
"versionName" : "1.0.0",
|
||||
"versionCode" : "100",
|
||||
@ -98,6 +98,18 @@
|
||||
"appkey_ios" : "aatodo",
|
||||
"appkey_android" : "b7feefb9882f1d0953fbeffb1cef8aec"
|
||||
}
|
||||
},
|
||||
"share" : {
|
||||
"weixin" : {
|
||||
"appid" : "wx79c800bfadd5b081",
|
||||
"UniversalLinks" : ""
|
||||
}
|
||||
},
|
||||
"oauth" : {
|
||||
"weixin" : {
|
||||
"appid" : "wx79c800bfadd5b081",
|
||||
"UniversalLinks" : ""
|
||||
}
|
||||
}
|
||||
},
|
||||
"orientation" : [ "portrait-primary" ],
|
||||
|
||||
@ -14,7 +14,8 @@
|
||||
"author": "",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"dayjs": "^1.11.10",
|
||||
"coordtransform": "^2.1.2",
|
||||
"dayjs": "^1.11.13",
|
||||
"file-saver": "2.0.5"
|
||||
},
|
||||
"dcloudext": {
|
||||
|
||||
@ -1,119 +1,164 @@
|
||||
<template>
|
||||
<tpx-page>
|
||||
<tpx-layout>
|
||||
<template #body>
|
||||
<template v-slot:header>
|
||||
<view >
|
||||
<view class="dt-head">
|
||||
<u-text :text="'账单信息'" size="30" :bold="true"></u-text>
|
||||
<u-line margin="20rpx 0 20rpx"></u-line>
|
||||
<view class="dt-item">
|
||||
<view class="lb1">账单编号</view>
|
||||
<view class="lb2">{{info.settleBillNo}}</view>
|
||||
<view class="lb1">账单编号：</view>
|
||||
<view class="lb2" style="font-weight: bold;">{{info.settleBillNo}}</view>
|
||||
</view>
|
||||
<view class="dt-item">
|
||||
<view class="lb1">出账日期</view>
|
||||
<view class="lb2">{{info.settleStartDate}}</view>
|
||||
<view class="lb1">账单日期：</view>
|
||||
<view class="lb2">{{info.createTime}}</view>
|
||||
</view>
|
||||
<view class="dt-item">
|
||||
<view class="lb1">总票数</view>
|
||||
<view class="lb2">{{info.sendPieceSum}}</view>
|
||||
</view>
|
||||
<view class="dt-item">
|
||||
<view class="lb1">总件数</view>
|
||||
<view class="lb2">{{info.pieceNumber}}</view>
|
||||
</view>
|
||||
<view class="dt-item">
|
||||
<view class="lb1">总重量</view>
|
||||
<view class="lb2">{{info.feeWeight}}</view>
|
||||
</view>
|
||||
<view class="dt-item">
|
||||
<view class="lb1">应付金额</view>
|
||||
<view class="lb2 clr-prm">￥{{info.recMoney}}</view>
|
||||
</view>
|
||||
<view class="dt-item">
|
||||
<view class="lb1">已付金额</view>
|
||||
<view class="lb2 clr-prm">￥{{info.recedMoney}}</view>
|
||||
</view>
|
||||
<view class="dt-item">
|
||||
<view class="lb1">开票状态</view>
|
||||
<view class="lb2">
|
||||
<tetx v-if="info.openBillStatus == 0">未开票</tetx>
|
||||
<tetx v-if="info.openBillStatus == 1">已开票</tetx>
|
||||
<tetx v-if="info.openBillStatus == 2">部分开票</tetx>
|
||||
</view>
|
||||
</view>
|
||||
<view v-if="info.paymentStatus==1" class="dt-item">
|
||||
<view class="lb1">支付状态</view>
|
||||
<view class="lb2 clr-prm font-weight">已支付</view>
|
||||
</view>
|
||||
<!-- <view class="dt-item mt-30">
|
||||
<view class="lb1">收款账户</view>
|
||||
<view class="lb2">
|
||||
<u-row >
|
||||
<u-avatar size="80" shape="square"></u-avatar>
|
||||
<view class="pl-10">
|
||||
<u-text :text="'江苏探路者国际物流有限公司'" size="28" :bold="true" ></u-text>
|
||||
<u-text :text="'介绍'" size="26" color="#666" margin="10rpx 0 0 0"></u-text>
|
||||
<u-row justify="between" align="top">
|
||||
<u-col span="12">
|
||||
<!-- <u-text :text="`账单月份：${info.billMonth}`" size="26"
|
||||
margin="14rpx 0 0 0"></u-text> -->
|
||||
<u-text :text="`总票数：${info.sendPieceSum}`" size="26"
|
||||
margin="14rpx 0 0 0"></u-text>
|
||||
<u-text :text="`结算重量：${info.feeWeight}KG`" size="26"
|
||||
margin="14rpx 0 0 0"></u-text>
|
||||
|
||||
<u-text :text="`总费用：${info.recMoney}CNY`" size="26"
|
||||
margin="14rpx 0 0 0"></u-text>
|
||||
|
||||
</u-col>
|
||||
<u-col span="12">
|
||||
<u-text :text="`总件数：${info.pieceNumber}`" size="26"
|
||||
margin="14rpx 0 0 0"></u-text>
|
||||
<view >
|
||||
<u-text v-if="info.openBillStatus == '0'" :text="`开票状态：未开票`" size="26"margin="14rpx 0 0 0"></u-text>
|
||||
<u-text v-if="info.openBillStatus == '1'" :text="`开票状态：已开票`" size="26"margin="14rpx 0 0 0"></u-text>
|
||||
<u-text v-if="info.openBillStatus == '2'" :text="`开票状态：部分开票`" size="26"margin="14rpx 0 0 0"></u-text>
|
||||
<u-text v-if="info.openBillStatus == '3'" :text="`开票状态：不开票`" size="26"margin="14rpx 0 0 0"></u-text>
|
||||
</view>
|
||||
<u-text :text="`已付费用：${info.recedMoney}CNY`" size="26"
|
||||
margin="14rpx 0 0 0"></u-text>
|
||||
</u-col>
|
||||
</u-row>
|
||||
</view>
|
||||
<view class="dt-item" >
|
||||
<view class="">支付状态：</view>
|
||||
<view class="lb2">
|
||||
<text v-if="info.paymentStatus == '0'">未付款</text>
|
||||
<text v-if="info.paymentStatus == '1'">已付款</text>
|
||||
<text v-if="info.paymentStatus == '2'">部分付款</text>
|
||||
</view>
|
||||
<!-- <view class="lb2 clr-prm font-weight">已付款</view> -->
|
||||
</view>
|
||||
<view v-if="info.paymentStatus!=1&&info.thisPayMoney>0" class="dt-item mt-30">
|
||||
<view class="">待支付：</view>
|
||||
<view class="zhfxin">
|
||||
<view style="display: inline-block;">
|
||||
<u-text :text="`￥${info.thisPayMoney}`" size="42" :bold="true" color="red" align="center"></u-text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view v-if="info.paymentStatus!=1" class="dt-item mt-30">
|
||||
<view style="width: 50px;">备注：</view>
|
||||
<view >
|
||||
<view v-if="info.blLockOnlinePay=='T'" style="display: inline-block;">
|
||||
<u-text :text="`${info.lockOnlinePayReason}`" size="42" color="red" align="left"></u-text>
|
||||
</view>
|
||||
<view v-if="info.blLockOnlinePay!='T'" style="display: inline-block;">
|
||||
<u-text :text="`账单支持在线支付,收款和开票：探路供应链（江苏）有限公司`" size="26" color="black" align="left"></u-text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view style="background: #fff;padding-left: 10px;">
|
||||
<u-text :text="'运单列表:'" size="30" :bold="true"></u-text>
|
||||
<u-line margin="20rpx 0 20rpx"></u-line>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<template v-slot:body>
|
||||
|
||||
<view class="pos-abt-all">
|
||||
<tpx-scroll-view v-model:resObject="resData" :pageSize="5" :searchParam="searchParam" :getListFun="getListFun"
|
||||
ref="listRef"
|
||||
>
|
||||
<view class="">
|
||||
<!-- 列表数据 -->
|
||||
<view v-for="(item) in resData.list" class="ord-list-item" >
|
||||
|
||||
<u-row justify="between" align="top">
|
||||
<u-col span="6">
|
||||
|
||||
<u-text :text="`运单号：${item.billCode}`" size="26" :bold="true"
|
||||
margin="14rpx 0 0 0"></u-text>
|
||||
<!-- <view style="display: inline-flex;">
|
||||
<u-text :text="`运单号：`" size="26"
|
||||
margin="14rpx 0 0 0"></u-text>
|
||||
<u-text :text="`${item.billCode}`" :bold="true" size="26"
|
||||
margin="0rpx 0 0 0"></u-text>
|
||||
</view> -->
|
||||
|
||||
<view v-if="info.paymentStatus!=1" class="dt-item mt-30">
|
||||
<view class="lb1">支付金额</view>
|
||||
<view class="zhfxin">
|
||||
<view style="text-align: center;width: 300rpx;">
|
||||
<u-image :src="payQrImageUrl" height="300" width="300" radius="10"></u-image>
|
||||
<view class="mt-10" style="display: inline-block;">
|
||||
<u-text :text="`￥${info.thisPayMoney}`" size="32" :bold="true" color="#B12D29" align="center"></u-text>
|
||||
</view>
|
||||
</view>
|
||||
<u-text margin="20rpx 0 0 0" :text="'请使用微信或支付宝扫以上码支付'" size="28" :bold="true"></u-text>
|
||||
</view>
|
||||
</view>
|
||||
<u-text :text="`发件人：${item.waybillDetail.sendName}`" size="26"
|
||||
margin="14rpx 0 0 0"></u-text>
|
||||
|
||||
<u-text :text="`总运费：${item.waybillDetail.freight}CNY`" size="26"
|
||||
margin="14rpx 0 0 0"></u-text>
|
||||
|
||||
<u-text :text="`实际重量：${item.waybillDetail.billWeight}KG`" size="26"
|
||||
margin="14rpx 0 0 0"></u-text>
|
||||
|
||||
<u-text :text="`体积：${item.waybillDetail.totalVolume}m³`" size="26"
|
||||
margin="14rpx 0 0 0"></u-text>
|
||||
|
||||
<u-text :text="`产品类型：${item.waybillDetail.productTypeName}`" size="26"
|
||||
margin="14rpx 0 0 0"></u-text>
|
||||
</u-col>
|
||||
<u-col span="6">
|
||||
<u-text :text="`寄件日期：${this.formatSendDay(item.waybillDetail.sendDate)}`" size="26"
|
||||
margin="14rpx 0 0 0"></u-text>
|
||||
|
||||
<u-text :text="`快件类型：${item.waybillDetail.sendSiteName}--${item.waybillDetail.dispatchUnderlingSiteName}`" size="26"
|
||||
margin="14rpx 0 0 0"></u-text>
|
||||
|
||||
<u-text :text="`件数：${item.waybillDetail.parcelQty}`" size="26"
|
||||
margin="14rpx 0 0 0"></u-text>
|
||||
|
||||
<u-text :text="`结算重量：${item.waybillDetail.settlementWeight}KG`" size="26"
|
||||
margin="14rpx 0 0 0"></u-text>
|
||||
|
||||
<u-text :text="`寄件公司：${item.waybillDetail.sendCompany}`" size="26"
|
||||
margin="14rpx 0 0 0"></u-text>
|
||||
</u-col>
|
||||
|
||||
</u-row>
|
||||
<u-row >
|
||||
<u-col span="12">
|
||||
<u-text :text="`费用备注：${item.waybillDetail.feeRemark}`" size="26"
|
||||
margin="14rpx 0 0 0"></u-text>
|
||||
</u-col>
|
||||
</u-row>
|
||||
|
||||
</view>
|
||||
|
||||
<view class="dt-body">
|
||||
<u-text :text="'运单列表'" size="30" :bold="true"></u-text>
|
||||
<u-line margin="20rpx 0 20rpx"></u-line>
|
||||
<view v-for="(item) in info.subBillList" class="yditem">
|
||||
<view class="ydi-lab">
|
||||
<view>
|
||||
<u-text :text="'运单号'" size="26" color="#999"></u-text>
|
||||
</view>
|
||||
<view>
|
||||
<u-text :text="item.billCode" size="28" :bold="true" align="right"></u-text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="ydi-lab mt-10">
|
||||
<view>
|
||||
<u-text :text="'应付金额'" size="26" color="#999"></u-text>
|
||||
</view>
|
||||
<view>
|
||||
<u-text :text="`￥${item.billFee}`" size="28" :bold="true" color="#B12D29" align="right"></u-text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<tpx-empty v-if="!(info.subBillList && info.subBillList.length > 0)" size="sm"></tpx-empty>
|
||||
</view>
|
||||
</tpx-scroll-view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<template #footer>
|
||||
<view v-if="info.paymentStatus!=1" class="blcok-white-noradius">
|
||||
<view v-if="info.paymentStatus!=1&&info.blLockOnlinePay!='T'&&info.thisPayMoney>0" class="blcok-white-noradius">
|
||||
<u-button @click="handleCallPay()" type="primary" size="large" shape="circle"
|
||||
custom-style="height:80rpx;font-size: 30rpx;"
|
||||
>支付</u-button>
|
||||
>立即支付</u-button>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
</tpx-layout>
|
||||
</tpx-page>
|
||||
|
||||
</tpx-page>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import dayjs from "dayjs"
|
||||
import * as apiService from "@/common/api"
|
||||
import { checkParams } from "@/common/validate"
|
||||
|
||||
@ -139,6 +184,10 @@
|
||||
info: {},
|
||||
payQrImageUrl: '',
|
||||
pageLoading: true,
|
||||
searchParam: {
|
||||
settleBillNo: '',
|
||||
},
|
||||
resData: { list: [] }
|
||||
}
|
||||
},
|
||||
onLoad(queryOption) {
|
||||
@ -152,23 +201,55 @@
|
||||
getSendSiteList: apiService.getSendSiteList,
|
||||
async initData() {
|
||||
await this.getDetailData()
|
||||
if(this.info.paymentStatus != 1) {
|
||||
await this.getPayQrcode()
|
||||
}
|
||||
this.pageLoading = false
|
||||
this.triggerListReload();
|
||||
},
|
||||
async getDetailData(){
|
||||
let res = await apiService.getInfoBySettleBillNo({settleBillNo: this.queryOption.blNo, _loading: true })
|
||||
let res = await apiService.getSimpleInfoBySettleBillNo({settleBillNo: this.queryOption.blNo, _loading: true })
|
||||
this.info = res.data || {}
|
||||
this.searchParam.settleBillNo=this.queryOption.blNo;
|
||||
|
||||
},
|
||||
triggerListReload(){
|
||||
this?.$refs?.listRef?.getDataList?.(true) // 重置到第一页数据
|
||||
},
|
||||
async getListFun(param){
|
||||
console.log("===>getListFun===>",param);
|
||||
param.settleBillNo=this.queryOption.blNo;
|
||||
let res = await apiService.getSubBillListBySettleBillNo(param)
|
||||
return res
|
||||
},
|
||||
async getPayQrcode(){
|
||||
let res = await apiService.getWxPayQrCode({settleBillNo: this.queryOption.blNo, _loading: true })
|
||||
this.payQrImageUrl = res.data
|
||||
},
|
||||
async handleCallPay(){
|
||||
let res = await apiService.sumbitWxPay({settleBillNo: this.queryOption.blNo, _loading: true })
|
||||
console.log(res)
|
||||
debugger
|
||||
let info = this.$store.getters.userInfo
|
||||
let openId = info.openId;
|
||||
let res = await apiService.sumbitWxPay({settleBillNo: this.queryOption.blNo,openId:openId,_loading: true })
|
||||
// 调起微信支付
|
||||
let weChatPayData = res.data;
|
||||
uni.requestPayment({
|
||||
provider: 'wxpay',
|
||||
timeStamp: weChatPayData.timeStamp,
|
||||
nonceStr: weChatPayData.nonceStr,
|
||||
package: weChatPayData.package,
|
||||
signType: weChatPayData.signType,
|
||||
paySign: weChatPayData.paySign,
|
||||
success: function(res) {
|
||||
uni.showToast({
|
||||
title: '支付成功',
|
||||
icon: 'none'
|
||||
});
|
||||
},
|
||||
fail: function(err) {
|
||||
uni.showToast({
|
||||
title: '支付失败:'+err,
|
||||
icon: 'none'
|
||||
});
|
||||
}
|
||||
});
|
||||
},
|
||||
formatSendDay(sendDate){
|
||||
return dayjs(sendDate).format('YYYY-MM-DD');
|
||||
},
|
||||
}
|
||||
}
|
||||
@ -180,11 +261,25 @@
|
||||
background-color: #F6F6F6;
|
||||
height: 100% !important;
|
||||
}
|
||||
|
||||
.customer_nav_bar {
|
||||
padding-top: 30rpx;
|
||||
background-color: #FFF;
|
||||
position: relative;
|
||||
}
|
||||
</style>
|
||||
<style scoped lang="scss">
|
||||
.pgb-cont{
|
||||
padding: 30rpx;
|
||||
}
|
||||
.pgb-header {
|
||||
// padding-top: --status-bar-height;
|
||||
padding-top: 30rpx;
|
||||
background-color: #FFF;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.dt-head {
|
||||
margin-top: 30rpx;
|
||||
// margin-top: 30rpx;
|
||||
padding: 30rpx;
|
||||
background-color: #FFF;
|
||||
position: relative;
|
||||
@ -202,24 +297,40 @@
|
||||
.lb1 {
|
||||
width: 160rpx;
|
||||
font-size: 26rpx;
|
||||
color: #999;
|
||||
color: #000;
|
||||
}
|
||||
.lb2{
|
||||
font-size: 26rpx;
|
||||
font-weight: bold;
|
||||
}
|
||||
}
|
||||
.zhfxin{
|
||||
|
||||
.ord-list-item{
|
||||
box-shadow: 0rpx 3rpx 12rpx 0rpx rgba(139,139,139,0.06);
|
||||
border-radius: 20rpx;
|
||||
padding: 22rpx 30rpx;
|
||||
background-color: #fff;
|
||||
margin-bottom: 30rpx;
|
||||
}
|
||||
.yditem{
|
||||
padding: 20rpx 20rpx;
|
||||
background-color: #F6F6F6;
|
||||
border-radius: 6rpx;
|
||||
margin-bottom: 20rpx;
|
||||
.search-more-panel{
|
||||
overflow: hidden;
|
||||
position: absolute;
|
||||
left: 0;
|
||||
right: 0;
|
||||
height: calc(70vh);
|
||||
z-index: 200;
|
||||
}
|
||||
.ydi-lab{
|
||||
.smp-body{
|
||||
padding: 30rpx;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
flex-direction: column;
|
||||
height: 100%;
|
||||
background-color: #FFF;
|
||||
border-radius: 0 0 30rpx 30rpx;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
.smp-content{
|
||||
flex: 1;
|
||||
position: relative;
|
||||
}
|
||||
</style>
|
||||
@ -5,14 +5,14 @@
|
||||
<view class="pgb-header">
|
||||
|
||||
<view class="com-jianju" style="">
|
||||
<tpx-search placeholder="请输入运单号/订单号" v-model:value="searchParam.searchValue" @change="handleSearch" bgColor="#FFF" :timelyTrigger="false"></tpx-search>
|
||||
<tpx-search placeholder="请输入运单号" v-model:value="searchParam.params.billCode" @change="handleSearch" bgColor="#FFF" :timelyTrigger="false"></tpx-search>
|
||||
</view>
|
||||
|
||||
<view class="com-jianju" style="padding-top: 30rpx;">
|
||||
<u-row justify="between" align="top">
|
||||
<u-col span="12">
|
||||
<!-- 订单状态 -->
|
||||
<tpx-tabs :list="dicData.emis_settlebill_status_tab" v-model:value="searchParam.params.queryType"
|
||||
<tpx-tabs :list="dicData.emis_settlebill_status_tab" v-model:value="searchParam.paymentStatus"
|
||||
v-slot="curOrdTab"
|
||||
>
|
||||
<text slot>
|
||||
@ -70,29 +70,46 @@
|
||||
<!-- 列表数据 -->
|
||||
<view v-for="(item) in resData.list" class="ord-list-item" >
|
||||
<u-row justify="between">
|
||||
<text>{{item.settleBillNo}}</text>
|
||||
<view class="com-tag-grey font-26">
|
||||
<tetx v-if="item.openBillStatus == 0">未开票</tetx>
|
||||
<tetx v-if="item.openBillStatus == 1">已开票</tetx>
|
||||
<tetx v-if="item.openBillStatus == 2">部分开票</tetx>
|
||||
</view>
|
||||
<text style="font-weight: bold;">账单号:{{item.settleBillNo}}</text>
|
||||
<!-- <view class="com-tag-grey font-26">
|
||||
<tetx v-if="item.openBillStatus == '0'">未开票</tetx>
|
||||
<tetx v-if="item.openBillStatus == '1'">已开票</tetx>
|
||||
<tetx v-if="item.openBillStatus == '2'">部分开票</tetx>
|
||||
<tetx v-if="item.openBillStatus == '3'">不开票</tetx>
|
||||
</view> -->
|
||||
</u-row>
|
||||
|
||||
<view class="mt-10" @click="handleDealItem(item, { type: 1 })">
|
||||
<u-row justify="between" align="top">
|
||||
<u-col span="6">
|
||||
<u-text :text="`总票数：${item.sendPieceSum}`" size="26"
|
||||
<u-text :text="`账单月份：${item.billMonth}`" size="26"
|
||||
margin="14rpx 0 0 0"></u-text>
|
||||
<u-text :text="`总重量：${item.feeWeight}`" size="26"
|
||||
<u-text :text="`总票数：${item.sendPieceSum}`" size="26"
|
||||
margin="14rpx 0 0 0"></u-text>
|
||||
<u-text :text="`总件数：${item.pieceNumber}`" size="26"
|
||||
margin="14rpx 0 0 0"></u-text>
|
||||
<u-text :text="`结算重量：${item.feeWeight} KG`" size="26"
|
||||
margin="14rpx 0 0 0"></u-text>
|
||||
<view >
|
||||
<u-text v-if="item.openBillStatus == '0'" :text="`开票状态：未开票`" size="26"margin="14rpx 0 0 0"></u-text>
|
||||
<u-text v-if="item.openBillStatus == '1'" :text="`开票状态：已开票`" size="26"margin="14rpx 0 0 0"></u-text>
|
||||
<u-text v-if="item.openBillStatus == '2'" :text="`开票状态：部分开票`" size="26"margin="14rpx 0 0 0"></u-text>
|
||||
<u-text v-if="item.openBillStatus == '3'" :text="`开票状态：不开票`" size="26"margin="14rpx 0 0 0"></u-text>
|
||||
|
||||
</view>
|
||||
|
||||
</u-col>
|
||||
<u-col span="6">
|
||||
<u-text :text="`应付金额：${item.recMoney}CNY`" size="26"
|
||||
margin="14rpx 0 0 0"></u-text>
|
||||
<u-text :text="`已付金额：${item.recedMoney}CNY`" size="26"
|
||||
margin="14rpx 0 0 0"></u-text>
|
||||
|
||||
<u-text :text="`总费用：${item.recMoney}CNY`" size="26"margin="14rpx 0 0 0"></u-text>
|
||||
<u-text :text="`已付费用：${item.recedMoney}CNY`" size="26"margin="14rpx 0 0 0"></u-text>
|
||||
<u-text :text="`待支付：${(item.recMoney-item.recedMoney).toFixed(2)}CNY`" size="26"margin="14rpx 0 0 0"></u-text>
|
||||
<view >
|
||||
<u-text v-if="item.paymentStatus == '0'" :text="`付款状态：未付款`" size="26"margin="14rpx 0 0 0"></u-text>
|
||||
<u-text v-if="item.paymentStatus == '1'" :text="`付款状态：已付款`" size="26"margin="14rpx 0 0 0"></u-text>
|
||||
<u-text v-if="item.paymentStatus == '2'" :text="`付款状态：部分付款`" size="26"margin="14rpx 0 0 0"></u-text>
|
||||
</view>
|
||||
|
||||
</u-col>
|
||||
</u-row>
|
||||
</view>
|
||||
@ -151,8 +168,9 @@
|
||||
searchParam: {
|
||||
searchValue: '',
|
||||
_date: [],
|
||||
paymentStatus: '0',
|
||||
params: {
|
||||
queryType: dicData.emis_settlebill_status_tab?.[0]?.val,
|
||||
billCode:null
|
||||
}
|
||||
},
|
||||
queryOption: {
|
||||
|
||||
@ -5,14 +5,21 @@
|
||||
<template v-slot:body>
|
||||
<div style="min-height: 100%;display: flex;flex-direction: column;">
|
||||
<view style="position: relative;">
|
||||
<map :markers="map.markers" :latitude="map.latitude" :longitude="map.longitude"
|
||||
style="width: 750rpx;height: 400rpx;"
|
||||
<map
|
||||
:polyline="[...polyline]"
|
||||
:latitude="map.latitude"
|
||||
:longitude="map.longitude"
|
||||
:scale="map.scale"
|
||||
style="width: 750rpx;height: 70vh;"
|
||||
></map>
|
||||
|
||||
<view style="position: absolute;top:5px;width: 95%;padding-left: 8px;padding-right: 8px">
|
||||
<view class="mp-base-block">
|
||||
<bpd-send-reciever-tmp :value="modelInfo"></bpd-send-reciever-tmp>
|
||||
<bpd-map-reciever-panel :value="modelInfo"></bpd-map-reciever-panel>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view style="position: absolute;top:62vh;width: 95%;padding-left: 8px;padding-right: 8px">
|
||||
<view class="mp-base-block blackbg" @click="makePhoneCall(modelInfo.takePieceEmployeePhone)">
|
||||
<u-row justify="between">
|
||||
<u-row>
|
||||
@ -23,15 +30,17 @@
|
||||
</u-row>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="dt-block mt-20">
|
||||
<view style="color: #b12d29;font-size: 10px;" >温馨提示:由于小程序腾讯地图局限，中国外地图道路可能显示不全，请通过网页查询。</view>
|
||||
<view class="mb-20">
|
||||
<buns-locus-pos :billCode="queryOption.billCode"></buns-locus-pos>
|
||||
</view>
|
||||
</view>
|
||||
</div>
|
||||
</template>
|
||||
<template v-slot:footer>
|
||||
<!-- <template v-slot:footer>
|
||||
<view class="blcok-white-noradius" style="margin-top: 0;">
|
||||
<u-row justify="space-around">
|
||||
<u-button @click="goBack()" :plain="true" size="large" shape="circle"
|
||||
@ -43,15 +52,15 @@
|
||||
</u-button>
|
||||
</u-row>
|
||||
</view>
|
||||
</template>
|
||||
</template> -->
|
||||
</tpx-layout>
|
||||
</tpx-page>
|
||||
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import coordtransform from 'coordtransform';
|
||||
import * as apiService from "@/common/api"
|
||||
import BpdSendRecieverTmp from "@/components/buns-post-detail-templates/bpd-send-reciever-tmp"
|
||||
import BpdMapRecieverPanel from "@/components/buns-post-detail-templates/bpd-map-reciever-panel"
|
||||
|
||||
export default {
|
||||
props: {
|
||||
@ -62,32 +71,24 @@
|
||||
return this.$store.getters.dicData
|
||||
},
|
||||
},
|
||||
components: { BpdSendRecieverTmp },
|
||||
components: { BpdMapRecieverPanel },
|
||||
data() {
|
||||
return {
|
||||
queryOption: {
|
||||
billCode: '', // 运单id
|
||||
},
|
||||
modelInfo: {},
|
||||
dataList:[],
|
||||
polyline: [{
|
||||
width: 4,
|
||||
points: [],
|
||||
arrowLine: true,
|
||||
color: '#28f',
|
||||
}],
|
||||
map: {
|
||||
latitude: 23.106574, //纬度
|
||||
longitude: 113.324587, //经度
|
||||
scale: 13, //缩放级别
|
||||
markers: [{
|
||||
latitude: 23.106574, //纬度
|
||||
longitude: 113.324587, //经度
|
||||
title: '出发地------',
|
||||
iconPath: this.getCdnUrl('mine/kjcha.png'),
|
||||
width: 50,
|
||||
height: 50,
|
||||
label: {
|
||||
content: '发货地址',
|
||||
color: '#fff',
|
||||
borderRadius: '10',
|
||||
bgColor: '#B12D29',
|
||||
padding: '10'
|
||||
}
|
||||
}]
|
||||
scale: 6, //缩放级别
|
||||
}
|
||||
}
|
||||
},
|
||||
@ -106,6 +107,34 @@
|
||||
let res = await apiService.getOrderDetail({billCode: this.queryOption.billCode, _loading: true})
|
||||
// 通过对象合并才能修改父级 数据
|
||||
Object.assign(this.modelInfo, res.data || {})
|
||||
|
||||
const resLbs = await apiService.getLbsRecordListByBillCode({
|
||||
billCode: this.queryOption.billCode
|
||||
});
|
||||
|
||||
if (resLbs && resLbs.code === 200) {
|
||||
|
||||
let lbsRecordList=resLbs.data.lbsRecordList;
|
||||
if( lbsRecordList && lbsRecordList.length>0){
|
||||
let currentInfo=lbsRecordList[lbsRecordList.length-1];
|
||||
this.map.latitude=this.cvtToWgs84(currentInfo.longitude, currentInfo.latitude)[1];
|
||||
this.map.longitude=this.cvtToWgs84(currentInfo.longitude, currentInfo.latitude)[0];
|
||||
|
||||
this.dataList=lbsRecordList;
|
||||
let points = lbsRecordList.map(item => ({
|
||||
latitude: this.cvtToWgs84(item.longitude, item.latitude)[1],
|
||||
longitude: this.cvtToWgs84(item.longitude, item.latitude)[0]
|
||||
}));
|
||||
this.polyline[0].points=points;
|
||||
}
|
||||
}
|
||||
|
||||
},
|
||||
|
||||
cvtToWgs84(longitude, latitude) {
|
||||
let lng = longitude / 1000000;
|
||||
let lat = latitude / 1000000;
|
||||
return coordtransform.wgs84togcj02(lng, lat);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -433,24 +433,18 @@
|
||||
|
||||
this.submitParam.sendSiteCode = item.code;
|
||||
this.submitParam.sendSiteName = item.name
|
||||
|
||||
// 重新计算产品
|
||||
// this.handleWayChange()
|
||||
},
|
||||
handlePickupMethodChange(val){
|
||||
this.submitParam.pickupMethod=val;
|
||||
console.log("==>val==>",val);
|
||||
console.log("==>this.submitParam.pickupMethod==>",this.submitParam.pickupMethod);
|
||||
// 上门取件方式
|
||||
if(this.submitParam.pickupMethod==2){
|
||||
this.submitParam.intoWarehouseCode=null;
|
||||
this.submitParam.intoWarehouseName=null;
|
||||
// 重新选择寄件网点
|
||||
this.updateDltSendSite({ lineCode: this.submitParam.transLine })
|
||||
this.handleWayChange()
|
||||
}
|
||||
// 仓库收货，整柜提货
|
||||
else if(this.submitParam.pickupMethod==1 || this.submitParam.pickupMethod==3){
|
||||
// 重新计算产品
|
||||
this.handleWayChange()
|
||||
}
|
||||
},
|
||||
handleCstClrChange(val){
|
||||
|
||||
@ -40,6 +40,13 @@
|
||||
</view>
|
||||
|
||||
<view class="dt-block">
|
||||
<view class="dt-tle">
|
||||
<view class="t1">物流动态</view>
|
||||
<view class="t2">
|
||||
<u-button @click="goto(`post/locus?billCode=${searchParam.billCode}`)" shape="circle" :plain="true" custom-style="height: 50rpx;font-size:28rpx;">查看轨迹</u-button>
|
||||
</view>
|
||||
</view>
|
||||
<u-line margin="20rpx 0 20rpx"></u-line>
|
||||
<view class="mb-20">
|
||||
<buns-locus-pos :billCode="searchParam.billCode" ref="lcusRef"></buns-locus-pos>
|
||||
</view>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user