Browse Source

Project Init

yigeren911 1 year ago
parent
commit
03bb00ce64

+ 3 - 3
src/utils/excel.js

@@ -6,9 +6,9 @@ export const exportExcel = (dataSource, columns, fileName = "excel", sheetName =
   let excelTitle = [];
   let dataTitle = [];
   let data = [];
-  if (columns.length == 0) {
+  if (columns.length === 0) {
     throw "输出列为空";
-  } else if (dataSource.length == 0) {
+  } else if (dataSource.length === 0) {
     throw "数据源为空";
   } else {
     for (let i in columns) {
@@ -18,7 +18,7 @@ export const exportExcel = (dataSource, columns, fileName = "excel", sheetName =
 
     let keys = Object.keys(dataSource[0]);
     for (let k of dataTitle) {
-      if (keys.indexOf("k") == -1) {
+      if (keys.indexOf(k) === -1) {
         throw "数据源中不存在列:" + k;
       }
     }

+ 8 - 3
src/views/backend/enterprise/orderManagement/orderHistory/index.vue

@@ -52,7 +52,7 @@ let tableData = ref([]);
 
 let storeList = ref([]);
 
-let exportExcelRef = ref()
+let exportExcelRef = ref();
 
 let search = reactive({
   storeId: "",
@@ -108,7 +108,7 @@ async function exportExcel() {
     { name: "saleCount", label: "数量" },
     { name: "memberName", label: "会员" },
     { name: "mobileNumber", label: "联系电话" },
-    { name: "createTime", label: "订单创建时间" },
+    { name: "createTime", label: "订单创建时间" }
   ];//表头中文名
   const res = await request.edit(orderExport, {
     beginDate: search.beginDate,
@@ -117,7 +117,12 @@ async function exportExcel() {
   }, "");
   if (res.code === 1) {
     let data = res.data;
-    exportExcelRef.value.open(data,columns);
+    data.forEach(item => {
+      item["memberCouponName"] = item.memberCouponName ? item.memberCouponName : "";
+      // item["storeName"] = item.storeName ? item.storeName : "";
+    });
+    console.log(data);
+    exportExcelRef.value.open(data, columns);
   }