From 64278ec389fa6343b8b092a01a09f6b449fbf718 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Tue, 24 Dec 2024 10:00:09 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=9B=9E=E6=AC=BE?=
=?UTF-8?q?=E8=BF=94=E5=88=A9=E5=88=86=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../manufacturerrebates/fenpeishenhe/collectionAudit.vue | 4 ++--
.../fenpeishenhe/collectionrebateallotAdd.vue | 4 ++--
.../fenpeishenhe/collectionrebateallotInfo.vue | 4 ++--
.../huikuanfenpei/collectionrebateallot.vue | 4 ++--
.../huikuanfenpei/collectionrebateallotByVehicleAdd.vue | 4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/fenpeishenhe/collectionAudit.vue b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/fenpeishenhe/collectionAudit.vue
index f062b9e5a7..c62dc18231 100644
--- a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/fenpeishenhe/collectionAudit.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/fenpeishenhe/collectionAudit.vue
@@ -56,8 +56,8 @@
-
-
+
+
diff --git a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/fenpeishenhe/collectionrebateallotAdd.vue b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/fenpeishenhe/collectionrebateallotAdd.vue
index ffc57ed78f..c8d05e4256 100644
--- a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/fenpeishenhe/collectionrebateallotAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/fenpeishenhe/collectionrebateallotAdd.vue
@@ -37,11 +37,11 @@
- 分摊参考比例
+ 分摊参考比例(%)
{{ formobj.shareGinExaProportion }}
- 分摊比例
+ 分摊比例(%)
{{ formobj.shareProportion }}
diff --git a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/fenpeishenhe/collectionrebateallotInfo.vue b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/fenpeishenhe/collectionrebateallotInfo.vue
index 3a56ab744b..d74842e2de 100644
--- a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/fenpeishenhe/collectionrebateallotInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/fenpeishenhe/collectionrebateallotInfo.vue
@@ -34,11 +34,11 @@
- 分摊参考比例
+ 分摊参考比例(%)
{{ formobj.shareGinExaProportion }}
- 分摊比例
+ 分摊比例(%)
{{ formobj.shareProportion }}
diff --git a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanfenpei/collectionrebateallot.vue b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanfenpei/collectionrebateallot.vue
index ce8f69b57e..e5de576b41 100644
--- a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanfenpei/collectionrebateallot.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanfenpei/collectionrebateallot.vue
@@ -57,8 +57,8 @@
-
-
+
+
diff --git a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanfenpei/collectionrebateallotByVehicleAdd.vue b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanfenpei/collectionrebateallotByVehicleAdd.vue
index d335e3f3e6..16c53d69ae 100644
--- a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanfenpei/collectionrebateallotByVehicleAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanfenpei/collectionrebateallotByVehicleAdd.vue
@@ -44,11 +44,11 @@
- 分摊参考比例
+ 分摊参考比例(%)
{{ formobj.shareGinExaProportion }}
- 分摊比例
+ 分摊比例(%)
{{ formobj.shareProportion }}
From 602c7e85282daf7fc5193eff5b8f561cb768e661 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Tue, 24 Dec 2024 10:13:01 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=87=BA=E7=BA=B3?=
=?UTF-8?q?=E4=BB=98=E6=AC=BE=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../chunafukuan/chunafukuanguanli/cashier.vue | 24 +++++++++++--------
1 file changed, 14 insertions(+), 10 deletions(-)
diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/chunafukuan/chunafukuanguanli/cashier.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/chunafukuan/chunafukuanguanli/cashier.vue
index b4cce31884..76a7f3bdca 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/chunafukuan/chunafukuanguanli/cashier.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/chunafukuan/chunafukuanguanli/cashier.vue
@@ -226,7 +226,7 @@
-
+
*付款账号
@@ -283,6 +283,7 @@ export default {
return {
btndisabled: false,
submitdisabled: false,
+ showHide: true,
btnList: [
{
type: 'primary',
@@ -557,16 +558,18 @@ export default {
this.getList()
},
changePayWay(value) {
- let bb = null
- this.payWay_list.forEach((e) => {
- if (e.dictValue === value) {
- bb = {
- key: e.dictKey,
- value: e.dictValue
- }
+ const choose = this.payWay_list.filter((item) => item.dictValue === value)
+ if (choose !== null && choose.length > 0) {
+ this.formobj.payWayKey = choose[0].dictKey
+ if (choose[0].groupName === '0') {
+ this.showHide = false
+ } else {
+ this.showHide = true
}
- })
- this.formobj.payWayKey = bb.key
+ } else {
+ this.formobj.payWayKey = ''
+ this.showHide = true
+ }
},
changerRceiveCompany(value) {
const choose = this.receiveCompany_list.filter((item) => item.name === value)
@@ -788,6 +791,7 @@ export default {
}
this.disabledCost = false
this.submitdisabled = false
+ this.showHide = true
this.diploma_list = []
this.$refs['form_obj'].resetFields()
},