aike/emis-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修正账单付款

Browse Source
This commit is contained in:
linfso 2025-07-08 14:41:55 +08:00
parent 18a0617522
commit d1fa962ad1
6 changed files with 112 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/api/bill.js
View File

@ -11,6 +11,14 @@ export const getInfoBySettleBillNo = (data = {})=> {
return coreRequest(url.getInfoBySettleBillNo, data, {}, 'get') 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 = {})=> { export const getWxPayQrCode = (data = {})=> {
return coreRequest(url.getWxPayQrCode, data, {}, 'get') return coreRequest(url.getWxPayQrCode, data, {}, 'get')

3
common/api/url.js
View File

@ -65,6 +65,9 @@ export default {
queryBSettleillList: `/emis/emisSettleBill/list`, // 账单列表 queryBSettleillList: `/emis/emisSettleBill/list`, // 账单列表
getInfoBySettleBillNo: `/emis/emisSettleBill/getInfoBySettleBillNo`, // 获取账单详情 getInfoBySettleBillNo: `/emis/emisSettleBill/getInfoBySettleBillNo`, // 获取账单详情
getSimpleInfoBySettleBillNo: `/emis/emisSettleBill/getSimpleInfoBySettleBillNo`, // 获取简化账单详情
getSubBillListBySettleBillNo: `/emis/emisSettleSubBill/list`, // 获取账单子账单明细
// getSubBillListBySettleBillNo: `/emis/emisSettleSubBill/listSimple`, // 获取账单子账单明细
getWxPayQrCode: `/emis/emisSettleBill/getWxPayQrCode`, // 获取微信支付二维码 getWxPayQrCode: `/emis/emisSettleBill/getWxPayQrCode`, // 获取微信支付二维码
sumbitWxPay: `/emis/emisSettleBill/sumbitWxPay`, // 账单-唤起微信立即支付 sumbitWxPay: `/emis/emisSettleBill/sumbitWxPay`, // 账单-唤起微信立即支付

8
common/env.js
View File

@ -1,9 +1,9 @@
let envMap = { let envMap = {
development: { development: {
apiHost: 'https://api-emis.tanex56.com/api/bizsvr', // apiHost: 'https://api-emis.tanex56.com/api/bizsvr',
socketHost: 'wss://api-emis.tanex56.com/api/bizsvr', // socketHost: 'wss://api-emis.tanex56.com/api/bizsvr',
// apiHost: 'http://47.102.220.189:58089/api/bizsvr', apiHost: 'http://47.102.220.189:58089/api/bizsvr',
// socketHost: 'ws://47.102.220.189:58089/api/bizsvr', socketHost: 'ws://47.102.220.189:58089/api/bizsvr',
}, },
production: { production: {
apiHost: 'https://api-emis.tanex56.com/api/bizsvr', apiHost: 'https://api-emis.tanex56.com/api/bizsvr',

7
components/tpx-scroll-view/tpx-scroll-view.vue
View File

@ -80,6 +80,11 @@
return 'dfl' return 'dfl'
} }
}, },
pageSize: {
default () {
return 20
}
},
maxHeight: { maxHeight: {
default () { default () {
return '' return ''
@ -91,7 +96,7 @@
reqLoading: false, reqLoading: false,
page: { // 分页参数 page: { // 分页参数
pageNum: 1, pageNum: 1,
pageSize: 20, pageSize: this.pageSize,
}, },
showLoadMore: false, // 是否显示加载更多的loading showLoadMore: false, // 是否显示加载更多的loading
loadedAll: false, // 是否加载了所有数据 loadedAll: false, // 是否加载了所有数据

141
pages/bill/detail.vue
View File

@ -1,11 +1,9 @@
<template> <template>
<tpx-page> <tpx-page>
<tpx-layout> <tpx-layout>
<template #body> <template v-slot:header>
<view> <view >
<view class="dt-head"> <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="dt-item">
<view class="lb1">账单编号：</view> <view class="lb1">账单编号：</view>
<view class="lb2" style="font-weight: bold;">{{info.settleBillNo}}</view> <view class="lb2" style="font-weight: bold;">{{info.settleBillNo}}</view>
@ -45,26 +43,12 @@
<view class="dt-item" > <view class="dt-item" >
<view class="">支付状态：</view> <view class="">支付状态：</view>
<view class="lb2"> <view class="lb2">
<tetx v-if="info.paymentStatus == '0'">未付款</tetx> <text v-if="info.paymentStatus == '0'">未付款</text>
<tetx v-if="info.paymentStatus == '1'">已付款</tetx> <text v-if="info.paymentStatus == '1'">已付款</text>
<tetx v-if="info.paymentStatus == '2'">部分付款</tetx> <text v-if="info.paymentStatus == '2'">部分付款</text>
</view> </view>
<!-- <view class="lb2 clr-prm font-weight">已付款</view> --> <!-- <view class="lb2 clr-prm font-weight">已付款</view> -->
</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>
</view>
</u-row>
</view>
</view> -->
<view v-if="info.paymentStatus!=1" class="dt-item mt-30"> <view v-if="info.paymentStatus!=1" class="dt-item mt-30">
<view class="">待支付：</view> <view class="">待支付：</view>
<view class="zhfxin"> <view class="zhfxin">
@ -74,10 +58,10 @@
</view> </view>
</view> </view>
<view v-if="info.paymentStatus!=1" class="dt-item mt-30"> <view v-if="info.paymentStatus!=1" class="dt-item mt-30">
<view class="lb1">备注：</view> <view style="width: 50px;">备注：</view>
<view > <view >
<view v-if="info.blLockOnlinePay=='T'" style="display: inline-block;"> <view v-if="info.blLockOnlinePay=='T'" style="display: inline-block;">
<u-text :text="`${info.lockOnlinePayReason}`" size="26" color="red" align="left"></u-text> <u-text :text="`${info.lockOnlinePayReason}`" size="42" color="red" align="left"></u-text>
</view> </view>
<view v-if="info.blLockOnlinePay!='T'" style="display: inline-block;"> <view v-if="info.blLockOnlinePay!='T'" style="display: inline-block;">
<u-text :text="`账单支持在线支付,收款和开票：探路供应链（江苏）有限公司`" size="26" color="black" align="left"></u-text> <u-text :text="`账单支持在线支付,收款和开票：探路供应链（江苏）有限公司`" size="26" color="black" align="left"></u-text>
@ -85,14 +69,26 @@
</view> </view>
</view> </view>
</view> </view>
<view style="background: #fff;padding-left: 10px;">
<view class="dt-body"> <u-text :text="'运单列表:'" size="30" :bold="true"></u-text>
<u-text :text="'运单列表'" size="30" :bold="true"></u-text>
<u-line margin="20rpx 0 20rpx"></u-line> <u-line margin="20rpx 0 20rpx"></u-line>
<view v-for="(item) in info.subBillList" > </view>
<!-- <view class="dt-item"> --> </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-row justify="between" align="top">
<u-col span="6"> <u-col span="6">
<u-text :text="`运单号：${item.billCode}`" size="26" :bold="true" <u-text :text="`运单号：${item.billCode}`" size="26" :bold="true"
margin="14rpx 0 0 0"></u-text> margin="14rpx 0 0 0"></u-text>
<!-- <view style="display: inline-flex;"> <!-- <view style="display: inline-flex;">
@ -133,19 +129,19 @@
<u-text :text="`寄件公司：${item.waybillDetail.sendCompany}`" size="26" <u-text :text="`寄件公司：${item.waybillDetail.sendCompany}`" size="26"
margin="14rpx 0 0 0"></u-text> margin="14rpx 0 0 0"></u-text>
</u-col> </u-col>
</u-row> </u-row>
<u-row >
<u-row justify="between" align="top">
<u-col span="12"> <u-col span="12">
<u-text :text="`费用备注：${item.waybillDetail.feeRemark}`" size="26" <u-text :text="`费用备注：${item.waybillDetail.feeRemark}`" size="26"
margin="14rpx 0 0 0"></u-text> margin="14rpx 0 0 0"></u-text>
</u-col> </u-col>
</u-row> </u-row>
<!-- </view> -->
</view>
</view> </view>
<tpx-empty v-if="!(info.subBillList && info.subBillList.length > 0)" size="sm"></tpx-empty> </tpx-scroll-view>
</view>
</view> </view>
</template> </template>
@ -156,10 +152,9 @@
>分享给客户支付</u-button> >分享给客户支付</u-button>
</view> </view>
</template> </template>
</tpx-layout> </tpx-layout>
</tpx-page>
</tpx-page>
</template> </template>
<script> <script>
@ -189,6 +184,10 @@
info: {}, info: {},
payQrImageUrl: '', payQrImageUrl: '',
pageLoading: true, pageLoading: true,
searchParam: {
settleBillNo: '',
},
resData: { list: [] }
} }
}, },
onLoad(queryOption) { onLoad(queryOption) {
@ -202,14 +201,23 @@
getSendSiteList: apiService.getSendSiteList, getSendSiteList: apiService.getSendSiteList,
async initData() { async initData() {
await this.getDetailData() await this.getDetailData()
if(this.info.paymentStatus != 1) {
await this.getPayQrcode()
}
this.pageLoading = false this.pageLoading = false
this.triggerListReload();
}, },
async getDetailData(){ 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.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(){ async getPayQrcode(){
// let res = await apiService.getWxPayQrCode({settleBillNo: this.queryOption.blNo, _loading: true }) // let res = await apiService.getWxPayQrCode({settleBillNo: this.queryOption.blNo, _loading: true })
@ -293,11 +301,25 @@
background-color: #F6F6F6; background-color: #F6F6F6;
height: 100% !important; height: 100% !important;
} }
.customer_nav_bar {
padding-top: 30rpx;
background-color: #FFF;
position: relative;
}
</style> </style>
<style scoped lang="scss"> <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 { .dt-head {
margin-top: 30rpx; // margin-top: 30rpx;
padding: 30rpx; padding: 30rpx;
background-color: #FFF; background-color: #FFF;
position: relative; position: relative;
@ -322,18 +344,33 @@
font-weight: bold; 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{ .search-more-panel{
padding: 20rpx 20rpx; overflow: hidden;
background-color: #F6F6F6; position: absolute;
border-radius: 6rpx; left: 0;
margin-bottom: 20rpx; right: 0;
height: calc(70vh);
z-index: 200;
} }
.ydi-lab{ .smp-body{
padding: 30rpx;
display: flex; display: flex;
flex-direction: row; flex-direction: column;
justify-content: space-between; height: 100%;
align-items: center; background-color: #FFF;
border-radius: 0 0 30rpx 30rpx;
box-sizing: border-box;
}
.smp-content{
flex: 1;
position: relative;
} }
</style> </style>

4
pages/bill/list.vue
View File

@ -168,7 +168,7 @@
searchParam: { searchParam: {
searchValue: '', searchValue: '',
_date: [], _date: [],
paymentStatus: '', paymentStatus: '0',
params: { params: {
billCode:null billCode:null
} }
@ -203,7 +203,7 @@
return res return res
}, },
initData(){ initData(){
// searchParam.paymentStatus=0;
}, },
async handleDealItem(item, deal = { type: '1' }) { async handleDealItem(item, deal = { type: '1' }) {
let itemQuery = `?blNo=${item.settleBillNo}` let itemQuery = `?blNo=${item.settleBillNo}`