From 6c6b89e5c4b103c8848741caf93078e2d44152ac Mon Sep 17 00:00:00 2001 From: linfso Date: Wed, 25 Jun 2025 03:37:49 +0800 Subject: [PATCH] md --- src/api/emis/emisSettleBill.js | 8 ++++++ src/api/emis/emisTransPlanRule.js | 8 ++++++ .../CustSettleBillQueryList.vue | 20 +++++++++++++- .../emisSettleBill/panel/SiteConfimPanel.vue | 15 +++++++++-- .../emisSettlePayRecord/panel/PayQrCode.vue | 26 ++++++++++++------- 5 files changed, 64 insertions(+), 13 deletions(-) diff --git a/src/api/emis/emisSettleBill.js b/src/api/emis/emisSettleBill.js index 32faf616..c7c779ed 100644 --- a/src/api/emis/emisSettleBill.js +++ b/src/api/emis/emisSettleBill.js @@ -25,6 +25,14 @@ export function queryPayBackStatList(query) { }) } +export function checkCanOnlinePay(query) { + return request({ + url: '/emis/emisSettleBill/checkCanOnlinePay', + method: 'get', + params: query + }) +} + export function querySalesPayBackRateList(query) { return request({ url: '/emis/emisSettleBill/querySalesPayBackRateList', diff --git a/src/api/emis/emisTransPlanRule.js b/src/api/emis/emisTransPlanRule.js index a9ee2cad..c4af6642 100644 --- a/src/api/emis/emisTransPlanRule.js +++ b/src/api/emis/emisTransPlanRule.js @@ -9,6 +9,14 @@ export function listEmisTransPlanRule(query) { }) } +export function listTranseRuleSupplier(startSiteCode,nextSiteCode) { + return request({ + url: '/emis/emisTransPlanRule/listSimple', + method: 'get', + params: {startSiteCode:startSiteCode,nextSiteCode:nextSiteCode} + }) +} + // 查询供应商线路规划表详细 export function getEmisTransPlanRule(id) { return request({ diff --git a/src/views/emis/emisSettleBill/CustSettleBillQueryList.vue b/src/views/emis/emisSettleBill/CustSettleBillQueryList.vue index 3a2af728..58b211bc 100644 --- a/src/views/emis/emisSettleBill/CustSettleBillQueryList.vue +++ b/src/views/emis/emisSettleBill/CustSettleBillQueryList.vue @@ -283,7 +283,7 @@ import JSZip from 'jszip'; import FileSaver from 'file-saver'; -import { listEmisSettleBill,confirmSettleBillBySite, getEmisSettleBill, delEmisSettleBill, addEmisSettleBill, updateEmisSettleBill } from "@/api/emis/emisSettleBill"; +import { listEmisSettleBill,confirmSettleBillBySite, getEmisSettleBill,checkCanOnlinePay, delEmisSettleBill, addEmisSettleBill, updateEmisSettleBill } from "@/api/emis/emisSettleBill"; import EmpNamePicker1 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue'; @@ -477,6 +477,24 @@ export default { handleGenPayCode(row) { // this.$modal.msgSuccess("暂不支持"); // const ids = row.id || this.ids; + + let selItem=this.selectList[0]; + if(selItem.paymentStatus == 1){ + this.$modal.msgError("已支付,无需再支付"); + return + } + + try{ + let res= await checkCanOnlinePay({settleBillNo:selItem.settleBillNo}); + if(res.data=='0'){ + this.$modal.msgError("不支持在线支付"); + } + }catch(e){ + // this.$modal.msgError(e.message); + return + } + + this.resetRefreshId="pay-"+Math.random().toString(36).substring(3,10); this.titleForm="微信二维码收款"; this.openForm=true; diff --git a/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue b/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue index 6fba6cc8..26c4ba52 100644 --- a/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue +++ b/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue @@ -282,7 +282,7 @@ import JSZip from 'jszip'; import FileSaver from 'file-saver'; import { listEmisSettleBill,confirmSettleBillBySite, - cancelConfirmBillBySite, + cancelConfirmBillBySite,checkCanOnlinePay, getEmisSettleBill, delEmisSettleBill, addEmisSettleBill, updateEmisSettleBill } from "@/api/emis/emisSettleBill"; import MergeBillForm from '@/views/emis/emisSettleBill/MergeBillForm.vue'; import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker'; @@ -493,7 +493,7 @@ export default { this.$modal.msgSuccess("操作成功"); }).catch(() => {}); }, - handleGenPayCode(row) { + async handleGenPayCode(row) { // this.$modal.msgSuccess("暂不支持"); // const ids = row.id || this.ids; let selItem=this.selectList[0]; @@ -502,6 +502,17 @@ export default { return } + try{ + let res= await checkCanOnlinePay({settleBillNo:selItem.settleBillNo}); + if(res.data=='0'){ + this.$modal.msgError("不支持在线支付"); + } + }catch(e){ + // this.$modal.msgError(e.message); + return + } + + this.resetRefreshId="pay-"+Math.random().toString(36).substring(3,10); this.titleForm="微信二维码收款"; this.openForm=true; diff --git a/src/views/emis/emisSettlePayRecord/panel/PayQrCode.vue b/src/views/emis/emisSettlePayRecord/panel/PayQrCode.vue index bb29be86..a4c4d6a7 100644 --- a/src/views/emis/emisSettlePayRecord/panel/PayQrCode.vue +++ b/src/views/emis/emisSettlePayRecord/panel/PayQrCode.vue @@ -4,20 +4,25 @@ -
-
- - 探路供应链(江苏)有限公司 -
+
+
+ + 探路供应链(江苏)有限公司 +
-
¥{{ settleBillItem.thisPayMoney }}
+
+ ¥{{ settleBillItem.thisPayMoney }} +
请使用微信[24小时]内完成支付
+
+ {{ settleBillItem.lockOnlinePayReason }} +
@@ -67,10 +72,10 @@ - + 运单列表: - + 运单号:{{ item.billCode }} @@ -119,14 +124,14 @@ -
+
打印