浏览代码

Merge branch 'refs/heads/xinyan' into test

xinyan 11 月之前
父节点
当前提交
b8b749e473

+ 7 - 7
src/views/reportManage/dataCenter/combinedDisplay/components/tableData/monthlyComparativeData.vue

@@ -74,16 +74,16 @@ async function fetchMonthlyData(taskIds) {
       const firstRow = response.data[0];
       const dynamicColumns = [];
       for (const key in firstRow) {
-        if (key.includes('的销售额')) {
-          dynamicColumns.push({ field: key, title: key,});
+        if (key.includes('的销售额') || key.includes('的周销售额')) {
+          dynamicColumns.push({ field: key, title: key });
         }
       }
       tableColumns.value = [
-        { field: 'platformNumber', title: '平台编号', fixed: "left",},
-        { field: 'platformName', title: '平台名称', fixed: "left", },
-        { field: 'user_name', title: '运营', fixed: "left",},
-        { field: 'country', title: '国家', fixed: "left",},
-        { field: 'brandName', title: '品牌', fixed: "left",},
+        { field: 'platformNumber', title: '平台编号', fixed: "left" },
+        { field: 'platformName', title: '平台名称', fixed: "left" },
+        { field: 'user_name', title: '运营', fixed: "left" },
+        { field: 'country', title: '国家', fixed: "left" },
+        { field: 'brandName', title: '品牌', fixed: "left" },
         ...dynamicColumns
       ];
     } else {