From 59db6fab9c1ed1fa5559d423d439e14ea33b1598 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 27 四月 2023 11:18:24 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/custom/components/module/voucher/voucherTable/index.jsx | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/tabviews/custom/components/module/voucher/voucherTable/index.jsx b/src/tabviews/custom/components/module/voucher/voucherTable/index.jsx
index 2acf108..5e3b17c 100644
--- a/src/tabviews/custom/components/module/voucher/voucherTable/index.jsx
+++ b/src/tabviews/custom/components/module/voucher/voucherTable/index.jsx
@@ -108,7 +108,7 @@
let account = {}
subAccounts.forEach(item => {
- if (item.field === 'supplier') {
+ if (item.field === 'supplier' || item.field === 'logistics' || item.field === 'lessor') {
account[item.field] = {suppliercode: item.value, suppliername: item.name}
} else if (item.field === 'customer') {
account[item.field] = {customercode: item.value, customername: item.name}
@@ -762,7 +762,7 @@
if (record.sup_accounting && record.supAccounts) {
record.supAccounts.forEach(item => {
- if (item.sup_acc_type === 'supplier') {
+ if (item.sup_acc_type === 'supplier' || item.sup_acc_type === 'logistics' || item.sup_acc_type === 'lessor') {
val += item.suppliercode ? '_' + item.suppliercode + ' ' + item.suppliername : ''
} else if (item.sup_acc_type === 'customer') {
val += item.customercode ? '_' + item.customercode + ' ' + item.customername : ''
--
Gitblit v1.8.0