diff --git a/jshERP-web/public/doc/customer_template.xls b/jshERP-web/public/doc/customer_template.xls new file mode 100644 index 00000000..0ec0e368 Binary files /dev/null and b/jshERP-web/public/doc/customer_template.xls differ diff --git a/jshERP-web/public/doc/member_template.xls b/jshERP-web/public/doc/member_template.xls new file mode 100644 index 00000000..4732da22 Binary files /dev/null and b/jshERP-web/public/doc/member_template.xls differ diff --git a/jshERP-web/public/doc/vendor_template.xls b/jshERP-web/public/doc/vendor_template.xls new file mode 100644 index 00000000..d0901d5d Binary files /dev/null and b/jshERP-web/public/doc/vendor_template.xls differ diff --git a/jshERP-web/src/views/system/CustomerList.vue b/jshERP-web/src/views/system/CustomerList.vue index 76a2566a..517330e9 100644 --- a/jshERP-web/src/views/system/CustomerList.vue +++ b/jshERP-web/src/views/system/CustomerList.vue @@ -38,12 +38,12 @@ 导入 - 导出 + 导出 删除 @@ -157,7 +157,8 @@ list: "/supplier/list", delete: "/supplier/delete", deleteBatch: "/supplier/deleteBatch", - importExcelUrl: "/supplier/importExcel", + importExcelUrl: "/supplier/importCustomer", + exportXlsUrl: "/supplier/exportExcel", batchSetStatusUrl: "/supplier/batchSetStatus" } } @@ -181,18 +182,6 @@ if(this.btnEnableList.indexOf(1)===-1) { this.$refs.modalForm.isReadOnly = true } - }, - exportExcel() { - let aoa = [['名称', '联系人', '手机号码', '联系电话', '电子邮箱', '传真', '期初应收', - '期末应收', '纳税人识别号', '税率(%)', '开户行', '账号', '地址', '备注', '状态']] - for (let i = 0; i < this.dataSource.length; i++) { - let ds = this.dataSource[i] - 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 fea037f7..dffd4012 100644 --- a/jshERP-web/src/views/system/MemberList.vue +++ b/jshERP-web/src/views/system/MemberList.vue @@ -37,12 +37,12 @@ 导入 - 导出 + 导出 删除 @@ -154,7 +154,8 @@ list: "/supplier/list", delete: "/supplier/delete", deleteBatch: "/supplier/deleteBatch", - importExcelUrl: "/supplier/importExcel", + importExcelUrl: "/supplier/importMember", + exportXlsUrl: "/supplier/exportExcel", batchSetStatusUrl: "/supplier/batchSetStatus" } } @@ -178,16 +179,6 @@ if(this.btnEnableList.indexOf(1)===-1) { this.$refs.modalForm.isReadOnly = true } - }, - exportExcel() { - let aoa = [['名称', '联系人', '手机号码', '联系电话', '电子邮箱', '预付款', '备注', '状态']] - for (let i = 0; i < this.dataSource.length; i++) { - let ds = this.dataSource[i] - 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 e9445c6f..52da30e1 100644 --- a/jshERP-web/src/views/system/VendorList.vue +++ b/jshERP-web/src/views/system/VendorList.vue @@ -37,12 +37,12 @@ 导入 - 导出 + 导出 删除 @@ -156,7 +156,8 @@ list: "/supplier/list", delete: "/supplier/delete", deleteBatch: "/supplier/deleteBatch", - importExcelUrl: "/supplier/importExcel", + importExcelUrl: "/supplier/importVendor", + exportXlsUrl: "/supplier/exportExcel", batchSetStatusUrl: "/supplier/batchSetStatus" } } @@ -180,18 +181,6 @@ if(this.btnEnableList.indexOf(1)===-1) { this.$refs.modalForm.isReadOnly = true } - }, - exportExcel() { - let aoa = [['名称', '联系人', '手机号码', '联系电话', '电子邮箱', '传真', '期初应付', - '期末应付', '纳税人识别号', '税率(%)', '开户行', '账号', '地址', '备注', '状态']] - for (let i = 0; i < this.dataSource.length; i++) { - let ds = this.dataSource[i] - 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), '供应商信息') } } }