From de658e32e2e7d514a94d6f9a5ba0a265b592b8f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Tue, 12 Oct 2021 23:35:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BE=9B=E5=BA=94=E5=95=86?=
 =?UTF-8?q?=E3=80=81=E5=AE=A2=E6=88=B7=E3=80=81=E4=BC=9A=E5=91=98=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/views/system/CustomerList.vue | 7 +++++--
 jshERP-web/src/views/system/MemberList.vue   | 5 +++--
 jshERP-web/src/views/system/VendorList.vue   | 7 +++++--
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/jshERP-web/src/views/system/CustomerList.vue b/jshERP-web/src/views/system/CustomerList.vue
index b4843eeb..7e58f67d 100644
--- a/jshERP-web/src/views/system/CustomerList.vue
+++ b/jshERP-web/src/views/system/CustomerList.vue
@@ -182,10 +182,13 @@
         }
       },
       exportExcel() {
-        let aoa = [['名称', '联系人', '手机号码', '联系电话', '电子邮箱', '期初应付', '期末应付', '税率(%)']]
+        let aoa = [['名称', '联系人', '手机号码', '联系电话', '电子邮箱', '传真', '期初应收',
+          '期末应收', '纳税人识别号', '税率(%)', '开户行', '账号', '地址', '备注', '状态']]
         for (let i = 0; i < this.dataSource.length; i++) {
           let ds = this.dataSource[i]
-          let item = [ds.supplier, ds.contacts, ds.telephone, ds.phoneNum, ds.email, ds.beginNeedPay, ds.allNeedPay, ds.taxRate]
+          let enabledStr = ds.enabled?'启用':'禁用'
+          let item = [ds.supplier, ds.contacts, ds.telephone, ds.phoneNum, ds.email, ds.fax, ds.beginNeedGet,
+            ds.allNeedGet, ds.taxNum, ds.taxRate, ds.bankName, ds.accountNumber, ds.address, ds.description, enabledStr]
           aoa.push(item)
         }
         openDownloadDialog(sheet2blob(aoa), '客户信息')
diff --git a/jshERP-web/src/views/system/MemberList.vue b/jshERP-web/src/views/system/MemberList.vue
index 28690fff..a2225178 100644
--- a/jshERP-web/src/views/system/MemberList.vue
+++ b/jshERP-web/src/views/system/MemberList.vue
@@ -179,10 +179,11 @@
         }
       },
       exportExcel() {
-        let aoa = [['名称', '联系人', '手机号码', '联系电话', '电子邮箱', '预付款']]
+        let aoa = [['名称', '联系人', '手机号码', '联系电话', '电子邮箱', '预付款', '备注', '状态']]
         for (let i = 0; i < this.dataSource.length; i++) {
           let ds = this.dataSource[i]
-          let item = [ds.supplier, ds.contacts, ds.telephone, ds.phoneNum, ds.email, ds.advanceIn]
+          let enabledStr = ds.enabled?'启用':'禁用'
+          let item = [ds.supplier, ds.contacts, ds.telephone, ds.phoneNum, ds.email, ds.advanceIn, ds.description, enabledStr]
           aoa.push(item)
         }
         openDownloadDialog(sheet2blob(aoa), '会员信息')
diff --git a/jshERP-web/src/views/system/VendorList.vue b/jshERP-web/src/views/system/VendorList.vue
index 940d2bf3..8c30c91b 100644
--- a/jshERP-web/src/views/system/VendorList.vue
+++ b/jshERP-web/src/views/system/VendorList.vue
@@ -181,10 +181,13 @@
         }
       },
       exportExcel() {
-        let aoa = [['名称', '联系人', '手机号码', '联系电话', '电子邮箱', '期初应付', '期末应付', '税率(%)']]
+        let aoa = [['名称', '联系人', '手机号码', '联系电话', '电子邮箱', '传真', '期初应付',
+          '期末应付', '纳税人识别号', '税率(%)', '开户行', '账号', '地址', '备注', '状态']]
         for (let i = 0; i < this.dataSource.length; i++) {
           let ds = this.dataSource[i]
-          let item = [ds.supplier, ds.contacts, ds.telephone, ds.phoneNum, ds.email, ds.beginNeedPay, ds.allNeedPay, ds.taxRate]
+          let enabledStr = ds.enabled?'启用':'禁用'
+          let item = [ds.supplier, ds.contacts, ds.telephone, ds.phoneNum, ds.email, ds.fax, ds.beginNeedPay,
+            ds.allNeedPay, ds.taxNum, ds.taxRate, ds.bankName, ds.accountNumber, ds.address, ds.description, enabledStr]
           aoa.push(item)
         }
         openDownloadDialog(sheet2blob(aoa), '供应商信息')