Merge branch 'xinyan' into test

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

@@ -123,16 +123,19 @@ async function fetchTotalData(taskIds) {
     const dayTotalData = await getDayTotalData({
       data_start_date: dayStartDate.value,
       data_end_date: dayEndDate.value,
+      dataType:'all',//权限控制
       task_ids: taskIds,
     });
     const weekTotalData = await getWeekTotalData({
       data_start_date: weekStart.value,
       data_end_date: weekEnd.value,
+      dataType:'all',
       task_ids: taskIds,
     });
     const monthTotalData = await getMonthTotalData({
       data_start_date: monthStartDate.value,
       data_end_date: monthEndDate.value,
+      dataType:'all',
       task_ids: taskIds,
     });
     totalRow.value = {
@@ -168,7 +171,6 @@ async function fetchMainData(taskIds, resetPage = false) {
       sort: sortOrder.value,
       order_date: order_date.value,
       date_type: dateType.value,
-      dataType : 'all',
       order_total_sales_current_monthly: totalSales.value,
     });
     gridOptions.data = [totalRow.value, ...response.data];