From d31da35371216fafd3292e5b038dd60ee55a65f0 Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Wed, 1 Apr 2026 16:54:07 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=90=88=E5=B9=B6=E6=94=B6=E6=AC=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../panel/PayRecordInputByMerge.vue | 63 ++++++++++++++++++-
1 file changed, 60 insertions(+), 3 deletions(-)
diff --git a/src/views/emis/emisSettlePayRecord/panel/PayRecordInputByMerge.vue b/src/views/emis/emisSettlePayRecord/panel/PayRecordInputByMerge.vue
index 73106562..3598dabc 100644
--- a/src/views/emis/emisSettlePayRecord/panel/PayRecordInputByMerge.vue
+++ b/src/views/emis/emisSettlePayRecord/panel/PayRecordInputByMerge.vue
@@ -84,9 +84,6 @@
-
-
-
@@ -95,6 +92,49 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -397,6 +437,23 @@ export default {
}
this.form.payMan=item.custName;
},
+ onAllowanceMoneyBlur() {
+ const allowanceMoney = Number(this.form.allowanceMoney);
+ if (!allowanceMoney || allowanceMoney <= 0) {
+ return;
+ }
+ const recMoneySum = (this.billList || []).reduce((sum, item) => {
+ return sum + Number(item.recMoney || 0);
+ }, 0);
+ if (recMoneySum <= 0) {
+ return;
+ }
+ if (allowanceMoney > recMoneySum * 0.02) {
+ this.$alert("该批账单折扣金额已大于账单总金额2%,请及时汇报申请。", "提醒", {
+ confirmButtonText: "知道了"
+ });
+ }
+ },
// 取消按钮
cancel() {
this.reset();
From 0b8c4b597ab6b9ff2d30554217c4904461bd6000 Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Wed, 1 Apr 2026 16:56:01 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E7=AE=A1=E7=90=86?=
=?UTF-8?q?=E7=BD=91=E7=82=B9=E7=AE=A1=E7=90=86=E7=AD=89=E9=A1=B5=E9=9D=A2?=
=?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/DictTag/index.vue | 32 +++++--
src/views/emis/emisCountryArea/indexPanel.vue | 76 +++++++++--------
src/views/emis/emisDestination/index.vue | 77 +++++++++--------
src/views/emis/emisRegion/PcdPanel.vue | 84 ++++++++++++-------
src/views/emis/emisRegion/TownPanel.vue | 4 +
src/views/emis/emisSite/index.vue | 6 ++
.../emis/emisSpecialCalcWeight/index.vue | 77 +++++++++--------
src/views/emis/emisTransLine/index.vue | 6 ++
8 files changed, 220 insertions(+), 142 deletions(-)
diff --git a/src/components/DictTag/index.vue b/src/components/DictTag/index.vue
index d6dda654..6898d053 100644
--- a/src/components/DictTag/index.vue
+++ b/src/components/DictTag/index.vue
@@ -1,7 +1,7 @@
-
+