Merge branch 'xinyan' into test

src/views/reportManage/dataCenter/combinedDisplay/components/DatePicker/index.vue

@@ -87,12 +87,14 @@ const monthShortCuts = [
 const handleStartWeekChange = (value) => {
   if (value) {
     weekStartDate.value = dayjs(value).locale('en').startOf('week').format('YYYY-MM-DD');
+    wEndDate.value = dayjs(value).locale('en').endOf('week').format('YYYY-MM-DD');
   }
   checkAndEmitDateChange();
 };
 
 const handleEndWeekChange = (value) => {
   if (value) {
+    wStartDate.value = dayjs(value).locale('en').startOf('week').format('YYYY-MM-DD');
     weekEndDate.value = dayjs(value).locale('en').endOf('week').format('YYYY-MM-DD');
   }
   checkAndEmitDateChange();

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

@@ -168,6 +168,7 @@ 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];

src/views/reportManage/dataCenter/normalDisplay/components/DatePicker/index.vue

@@ -88,12 +88,14 @@ const monthShortCuts = [
 const handleStartWeekChange = (value) => {
   if (value) {
     weekStartDate.value = dayjs(value).locale('en').startOf('week').format('YYYY-MM-DD');
+    wEndDate.value = dayjs(value).locale('en').endOf('week').format('YYYY-MM-DD');
   }
   checkAndEmitDateChange();
 };
 
 const handleEndWeekChange = (value) => {
   if (value) {
+    wStartDate.value = dayjs(value).locale('en').startOf('week').format('YYYY-MM-DD');
     weekEndDate.value = dayjs(value).locale('en').endOf('week').format('YYYY-MM-DD');
   }
   checkAndEmitDateChange();