change: cargo-consolidation-request应要求调整.

src/pages/cargo-consolidation-request/index.vue

@@ -65,11 +65,21 @@
           label="ETD"
           width="110"
         />
+        <el-table-column
+          prop="ATD"
+          label="ATD"
+          width="110"
+        />
         <el-table-column
           prop="ETA"
           label="ETA"
           width="110"
         />
+        <el-table-column
+          prop="ATA"
+          label="ATA"
+          width="110"
+        />
         <el-table-column
           prop="Cut_Off_Date"
           label="入仓时间"
@@ -80,14 +90,14 @@
           label="状态"
           width="100"
         />
-        <el-table-column
+        <!-- <el-table-column
           label="修改时间"
           min-width="190"
         >
           <template #default="scope">
             {{ dayjs(scope.row.Modified_Time).format('YYYY-MM-DD HH:mm:ss') }}
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column
           prop="GRN"
           label="入仓单号"
@@ -109,6 +119,7 @@
               size="small"
               type="warning"
               link
+              :disabled="!scope.row.SubscriptionId"
               @click="openMapDrawer(scope.row)"
             >
               查看轨迹
@@ -588,8 +599,20 @@ const dateShortcuts = ref([
     value: generateDateRange(14),
   },
 ] as any[])
+function getDefaultRange() {
+  const today = dayjs()
+  const lastMonthFirstDay = today
+    .subtract(1, 'month')
+    .startOf('month')
+    .format('YYYY-MM-DD')
+  const nextMonthLastDay = today
+    .add(1, 'month')
+    .endOf('month')
+    .format('YYYY-MM-DD')
 
-dateRange.value = generateDateRange(14)
+  return [lastMonthFirstDay, nextMonthLastDay]
+}
+dateRange.value = getDefaultRange()
 
 const clearSubList = () => {
   subList.value = []
@@ -601,16 +624,25 @@ let getList = () => {
   loading.value = true
   zoho.CRM.API.coql({
     select_query:
-      'select Name,Forwarder,ETD,ETA,Cut_Off_Date,Owner,Status,Modified_Time,Carrier,Booking_Number,GRN from Sea_Freight_Table' +
+      'select Name,Forwarder,ETD,ATD,ETA,ATA,Cut_Off_Date,Owner,Status,Modified_Time,SubscriptionId,Carrier,Booking_Number,GRN from Sea_Freight_Table' +
       " where ETD between '" +
       `${dateRange.value.map((i) => dayjs(i).format('YYYY-MM-DD')).join("' and '")}` +
       "'",
   })
     .then((res: any) => {
       if (Array.isArray(res.data) && res.data.length) {
-        list.value = res.data
+        list.value = res.data.sort(
+          (a: any, b: any) =>
+            new Date(b.Cut_Off_Date).getTime() -
+            new Date(a.Cut_Off_Date).getTime(),
+        )
       } else if (res.status === 204) {
-        ElMessage.info(res.statusText || 'zoho api return:' + res.status)
+        ElNotification({
+          type: 'warning',
+          title: 'No Data Found',
+          message: res.statusText || `zoho api return: ${res.status}`,
+          duration: 3000,
+        })
         list.value = []
         clearSubList()
       }
@@ -1086,7 +1118,7 @@ const openMapDrawer = (row: any) => {
   // console.log(row.Booking_Number, 'row.value.Booking_Number')
   if ((window as any).Sgld) {
     nextTick(() => {
-      (window as any).Sgld.createContainerTrack({
+      ;(window as any).Sgld.createContainerTrack({
         id: 'mapDrawer',
         carrierCode: row.Carrier, // 船公司代码
         billNo: row.Booking_Number, // 提单号