From 781c35e45939b7f211b59834c65799d6c336e9d1 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Thu, 27 Mar 2025 14:27:08 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=B8=8A=E6=9E=B6?=
=?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
yxt-as-ui/src/views/storage/upShelf/upShelfAdd.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/yxt-as-ui/src/views/storage/upShelf/upShelfAdd.vue b/yxt-as-ui/src/views/storage/upShelf/upShelfAdd.vue
index 992cfbff71..10dd7f0b36 100644
--- a/yxt-as-ui/src/views/storage/upShelf/upShelfAdd.vue
+++ b/yxt-as-ui/src/views/storage/upShelf/upShelfAdd.vue
@@ -222,7 +222,7 @@ export default {
this.formobj.list.splice(index, 1)
},
inputCount(row) {
- if (row.count !== '' && row.maxCount !== '' && parseFloat(row.count) - parseFloat(row.maxCount) < 0) {
+ if (row.count !== '' && row.maxCount !== '' && parseFloat(row.count) - parseFloat(row.maxCount) > 0) {
row.count = row.maxCount
}
}
From 2ab5c1921a48ec7551b1235145ea791a6534680a Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Thu, 27 Mar 2025 15:18:13 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BB=98=E6=AC=BE?=
=?UTF-8?q?=E7=94=B3=E8=AF=B7=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../fukuanshenqing/paymentAdd.vue | 1 +
.../relation/paymentInformationAdd.vue | 65 +++++++++++--------
.../relation/paymentInformationInfo.vue | 1 +
3 files changed, 39 insertions(+), 28 deletions(-)
diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue
index 8a3c1af512..c811b55553 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue
@@ -723,6 +723,7 @@ export default {
receiveCompany: value.receiveCompany, // 收款单位名称
receiveCompanySid: value.receiveCompanySid, // 收款单位sid
bank: value.bank, // 开户行
+ bankShortName: value.bankShortName, // 银行简称
receivingAccount: value.receivingAccount, // 收款银行账号
payAccount: value.payAccount, // 付款金额
detailSid: '', // 付款申请明细sid
diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/paymentInformationAdd.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/paymentInformationAdd.vue
index 1be1664e5a..ff3673887b 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/paymentInformationAdd.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/paymentInformationAdd.vue
@@ -95,6 +95,13 @@
+
+
+
+
+
+
+
@@ -129,11 +136,9 @@
- 业务类型
+ 银行简称
-
-
-
+
@@ -165,7 +170,7 @@ export default {
costTitle_list: [],
payment_list: [],
receiveCompany_list: [],
- businessType_list: [],
+ receivingAccount_list: [],
formobj: {
sid: '', // sid
costTitleKey: '', // 款项名称，数据字典
@@ -174,6 +179,7 @@ export default {
paymentType: '', // 付款方式value
receiveCompany: '', // 收款单位名称
receiveCompanySid: '', // 收款单位sid
+ bankShortName: '', // 银行简称
bank: '', // 开户行
receivingAccount: '', // 收款银行账号
payAccount: '', // 付款金额
@@ -187,8 +193,7 @@ export default {
companyName: '', // 单位名称
bank: '', // 开户行
receivingAccount: '', // 收款银行账号
- businessTypeKey: '', // 业务类型key
- businessTypeValue: '', // 业务类型value
+ bankShortName: '',
remarks: '', // 备注
useOrgSid: '', // 分公司sid
useOrgName: ''
@@ -214,11 +219,6 @@ export default {
this.payment_list = res.data
}
})
- typeValues({ type: 'cw_businessType' }).then((res) => {
- if (res.success) {
- this.businessType_list = res.data
- }
- })
},
showAdd(useOrgSid) {
this.viewTitle = '【新增】付款信息'
@@ -258,22 +258,22 @@ export default {
const choose = this.costTitle_list.filter((item) => item.dictValue === value)
if (choose !== null && choose.length > 0) {
this.formobj.costTitleKey = choose[0].dictKey
+ if (value === '银行保证金') {
+ this.formobj.isPay = '1'
+ } else {
+ this.formobj.isPay = '0'
+ }
} else {
this.formobj.costTitleKey = ''
+ this.formobj.isPay = ''
}
},
paymentChange(value) {
const choose = this.payment_list.filter((item) => item.dictValue === value)
if (choose !== null && choose.length > 0) {
this.formobj.paymentTypeKey = choose[0].dictKey
- if (value === '银行保证金') {
- this.formobj.isPay = '1'
- } else {
- this.formobj.isPay = '0'
- }
} else {
this.formobj.paymentTypeKey = ''
- this.formobj.isPay = ''
}
},
receiveCompanyChange(value) {
@@ -282,10 +282,27 @@ export default {
this.formobj.receiveCompanySid = choose[0].sid
this.formobj.receiveCompany = choose[0].companyName
this.formobj.bank = choose[0].bank
+ this.formobj.bankShortName = choose[0].bankShortName
+ if (this.formobj.costTitleValue === '银行保证金') {
+ if (this.receiveCompany_list.length > 0) {
+ this.receivingAccount_list = []
+ this.receiveCompany_list.forEach((e) => {
+ if (e.companyName === this.formobj.receiveCompany && e.bank === this.formobj.bank) {
+ this.receivingAccount_list.push({
+ sid: e.sid,
+ receivingAccount: e.receivingAccount
+ })
+ }
+ })
+ }
+ } else {
+ this.receivingAccount_list = []
+ }
} else {
this.formobj.receiveCompanySid = ''
this.formobj.receiveCompany = ''
this.formobj.bank = ''
+ this.formobj.bankShortName = ''
}
},
receiveCompanyAdd() {
@@ -306,8 +323,7 @@ export default {
this.temp.companyName = '' // 单位名称
this.temp.bank = '' // 开户行
this.temp.receivingAccount = '' // 收款银行账号
- this.temp.businessTypeKey = '' // 业务类型key
- this.temp.businessTypeValue = '' // 业务类型value
+ this.temp.bankShortName = ''
this.temp.remarks = '' // 备注
},
toAdd() {
@@ -332,14 +348,6 @@ export default {
toDelete(index) {
this.formobj.finPaymentapplyDetailsBelowEveList.splice(index, 1)
},
- businessTypeChange(value) {
- const choose = this.businessType_list.filter((item) => item.dictValue === value)
- if (choose !== null && choose.length > 0) {
- this.temp.businessTypeKey = choose[0].dictKey
- } else {
- this.temp.businessTypeKey = ''
- }
- },
saveOrUpdate() {
this.$refs['form_obj'].validate((valid) => {
if (valid) {
@@ -358,6 +366,7 @@ export default {
receiveCompany: '', // 收款单位名称
receiveCompanySid: '', // 收款单位sid
bank: '', // 开户行
+ bankShortName: '', // 银行简称
receivingAccount: '', // 收款银行账号
payAccount: '', // 付款金额
detailSid: '', // 付款申请明细sid
diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/paymentInformationInfo.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/paymentInformationInfo.vue
index 54fba62b6c..f8e76f0ea6 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/paymentInformationInfo.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/paymentInformationInfo.vue
@@ -56,6 +56,7 @@
+
From 40be78644b5c68d5548fc328425c76a4cdada78a Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Thu, 27 Mar 2025 15:23:38 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=B8=8A=E6=9E=B6?=
=?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
yxt-as-ui/src/views/storage/receivingGoods/index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/yxt-as-ui/src/views/storage/receivingGoods/index.vue b/yxt-as-ui/src/views/storage/receivingGoods/index.vue
index 843477b1b3..80cf322c7e 100644
--- a/yxt-as-ui/src/views/storage/receivingGoods/index.vue
+++ b/yxt-as-ui/src/views/storage/receivingGoods/index.vue
@@ -243,7 +243,7 @@ export default {
showUpShelfBill(row) {
this.dialogVisible = false
this.viewState = 6
- this.$refs['upShelfInfo'].showEdit(row.billSid)
+ this.$refs['upShelfInfo'].showEdit({ sid: row.billSid })
},
resetState2() {
this.viewState = 1