Merge branch 'dev' into dev_zyh

src/components/DateRange/src/DateRange.vue

@@ -144,7 +144,6 @@ const defaultDate = () => {
         daterangeObj2.ETA = obj
         emit('defaultDate', daterangeObj, daterangeObj2, searchTableQeuryTracking.value)
       }
-
       if (data.etd_start) {
         DateStart.value = [dayjs(data.etd_start), dayjs(data.etd_end)]
         daterangeObj.ETD =
@@ -155,7 +154,7 @@ const defaultDate = () => {
           title: 'ETD',
           data: [DateStart.value[0].format('MM/DD/YYYY'), DateStart.value[1].format('MM/DD/YYYY')]
         }
-        daterangeObj2.ETA = obj
+        daterangeObj2.ETD = obj
         emit('defaultDate', daterangeObj, daterangeObj2, searchTableQeuryTracking.value)
       }
     }

src/components/ScoringGrade/src/ScoringGrade.vue

@@ -308,7 +308,7 @@ const SubmitText = ref()
     </el-popover>
     <el-dialog
       v-model="dialogVisible"
-      title="Hi,Caroline!"
+      title="Hi!"
       :destroy-on-close="true"
       @close="closeDialog"
       width="640"

src/views/Dashboard/src/DashboardView.vue

@@ -469,35 +469,35 @@ const ClickParams = (val: any) => {
     if (name == 'Container') {
       if (type == 'ETA') {
         if (startyear.value) {
-          reportList.eta_start = startyear.value + '-' + startmonth.value + '-01'
+          reportList.eta_start = startmonth.value + '/01/' + startyear.value
           reportList.eta_end =
-            endyear.value +
-            '-' +
             endmonth.value +
-            '-' +
-            new Date(endyear.value, endmonth.value, 0).getDate()
+            '/' +
+            new Date(endyear.value, endmonth.value, 0).getDate() +
+            '/' +
+            endyear.value
         }
       } else {
         if (startyear.value) {
-          reportList.etd_start = startyear.value + '-' + startmonth.value + '-01'
+          reportList.etd_start = startmonth.value + '/01/' + startyear.value
           reportList.etd_end =
-            endyear.value +
-            '-' +
             endmonth.value +
-            '-' +
-            new Date(endyear.value, endmonth.value, 0).getDate()
+            '/' +
+            new Date(endyear.value, endmonth.value, 0).getDate() +
+            '/' +
+            endyear.value
         }
       }
     } else {
       if (type == 'ETA') {
         if (startyear.value) {
-          reportList.eta_start = startyear.value + '-' + startmonth.value + startday.value
-          reportList.eta_end = endyear.value + '-' + endmonth.value + '-' + endday.value
+          reportList.eta_start = startmonth.value + '/' + startday.value + '/' + startyear.value
+          reportList.eta_end = endmonth.value + '/' + endday.value + '/' + endyear.value
         }
       } else {
         if (startyear.value) {
-          reportList.etd_start = startyear.value + '-' + startmonth.value + startday.value
-          reportList.etd_end = endyear.value + '-' + endmonth.value + '-' + endday.value
+          reportList.etd_start = startmonth.value + '/' + startday.value + '/' + startyear.value
+          reportList.etd_end = endmonth.value + '/' + endday.value + '/' + endyear.value
         }
       }
     }

src/views/Dashboard/src/components/DashFiters.vue

@@ -113,7 +113,7 @@ const StartChange = (val: any) => {
   if (!props.isETDToETA) {
     const nextMonth = new Date(val)
     let currentYear = nextMonth.getFullYear() + 1
-    let currentMonth = nextMonth.getMonth() + 2
+    let currentMonth = nextMonth.getMonth()
     let current = currentYear + '-' + currentMonth
     EndDate.value = current
   }
@@ -126,7 +126,7 @@ const EndChange = (val: any) => {
   if (!props.isETDToETA) {
     const nextMonth = new Date(val)
     let currentYear = nextMonth.getFullYear() - 1
-    let currentMonth = nextMonth.getMonth()
+    let currentMonth = nextMonth.getMonth() + 2
     let current = currentYear + '-' + currentMonth
     startDate.value = current
   }

src/views/Dashboard/src/components/SellerChart.vue

@@ -132,7 +132,7 @@ const initOption = reactive({
     {
       type: 'bar',
       data: sellerValue,
-      barWidth: '10%',
+      barWidth: '20',
       itemStyle: {
         color: function (params: { dataIndex: number }) {
           return ColorValue.value[params.dataIndex % ColorValue.value.length]

src/views/Tracking/src/TrackingView.vue

@@ -156,12 +156,13 @@ const defaultDate = (val: any, value: any, data: any) => {
         searchTableQeuryTracking.etd_start = value[key].data[0]
         searchTableQeuryTracking.etd_end = value[key].data[1]
       }
-    } else {
-      for (const key in value) {
-        searchTableQeuryTracking.etd_start = value[key].data[0]
-        searchTableQeuryTracking.etd_end = value[key].data[1]
-      }
     }
+    // else {
+    //   for (const key in value) {
+    //     searchTableQeuryTracking.etd_start = value[key].data[0]
+    //     searchTableQeuryTracking.etd_end = value[key].data[1]
+    //   }
+    // }
   } else {
     searchTableQeuryTracking = data
     if (searchTableQeuryTracking._textSearch) {