Merge branch 'test'

src/views/reportManage/dataCenter/combinedDisplay/components/tableData/mainData.vue

@@ -205,7 +205,7 @@ async function fetchMainData(taskIds, resetPage = false) {
 
         allColumns.forEach(key => {
           let isSortable = false;
-          if (key.includes('的销售额') || key.includes('当月累计销售额')&& !key.includes('广告销售额') && !key.includes('增长率')) {
+          if (key.includes('的销售额')&& !key.includes('增长率') || key.includes('当月累计销售额')&& !key.includes('广告销售额') && !key.includes('增长率')) {
             isSortable = true;
           }
           const column = {

src/views/reportManage/dataCenter/normalDisplay/components/TableDataDisplay.vue

@@ -218,7 +218,7 @@ async function fetchData(taskIds, apiFunc, startDate, endDate, dataColumns, date
         //"的销售额"字段可以排序
         allColumns.forEach(key => {
           let isSortable = false;
-          if (key.includes('的销售额') || key.includes('当月累计销售额') && !key.includes('增长率')) {
+          if (key.includes('的销售额')&& !key.includes('增长率') || key.includes('当月累计销售额') && !key.includes('增长率')) {
             isSortable = true;
           }
           const column = {