From 3672b83182a648733ff245bd690f170d68cc80a9 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 15 五月 2023 17:38:27 +0800
Subject: [PATCH] 2023-05-15

---
 src/tabviews/custom/components/module/voucher/voucherTable/index.jsx |   12 ++++++++++--
 1 files changed, 10 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 5e3b17c..914d039 100644
--- a/src/tabviews/custom/components/module/voucher/voucherTable/index.jsx
+++ b/src/tabviews/custom/components/module/voucher/voucherTable/index.jsx
@@ -108,8 +108,12 @@
       let account = {}
 
       subAccounts.forEach(item => {
-        if (item.field === 'supplier' || item.field === 'logistics' || item.field === 'lessor') {
+        if (item.field === 'supplier') {
           account[item.field] = {suppliercode: item.value, suppliername: item.name}
+        } else if (item.field === 'logistics') {
+          account[item.field] = {logistics_code: item.value, logistics_name: item.name}
+        } else if (item.field === 'lessor') {
+          account[item.field] = {lessor_code: item.value, lessor_name: item.name}
         } else if (item.field === 'customer') {
           account[item.field] = {customercode: item.value, customername: item.name}
         } else if (item.field === 'department') {
@@ -762,8 +766,12 @@
 
             if (record.sup_accounting && record.supAccounts) {
               record.supAccounts.forEach(item => {
-                if (item.sup_acc_type === 'supplier' || item.sup_acc_type === 'logistics' || item.sup_acc_type === 'lessor') {
+                if (item.sup_acc_type === 'supplier') {
                   val += item.suppliercode ? '_' + item.suppliercode + ' ' + item.suppliername : ''
+                } else if (item.sup_acc_type === 'logistics') {
+                  val += item.logistics_code ? '_' + item.logistics_code + ' ' + item.logistics_name : ''
+                } else if (item.sup_acc_type === 'lessor') {
+                  val += item.lessor_code ? '_' + item.lessor_code + ' ' + item.lessor_name : ''
                 } else if (item.sup_acc_type === 'customer') {
                   val += item.customercode ? '_' + item.customercode + ' ' + item.customername : ''
                 } else if (item.sup_acc_type === 'department') {

--
Gitblit v1.8.0