Эх сурвалжийг харах

feat: cargo集货页面.增加截止时间显示

peter 3 долоо хоног өмнө
parent
commit
dfc75dbffb

+ 19 - 1
src/pages/cargo-consolidation-request/index.vue

@@ -95,6 +95,16 @@
           label="入仓时间"
           width="100"
         />
+        <el-table-column
+          label="截止时间"
+          width="200"
+        >
+          <template #default="scope">
+            <div>
+              {{ formatCutOffDateTime(scope.row.Cut_Off_Date_Time) }}
+            </div>
+          </template>
+        </el-table-column>
         <el-table-column
           prop="Status"
           label="状态"
@@ -701,6 +711,8 @@ import {
 } from 'element-plus'
 import cloneDeep from 'lodash.clonedeep'
 import dayjs from 'dayjs'
+import utc from 'dayjs/plugin/utc.js'
+import timezone from 'dayjs/plugin/timezone.js'
 import debounce from 'lodash.debounce'
 import compPrint from '@/components/print.vue'
 import request from '@/utils/axios'
@@ -752,6 +764,9 @@ let tabs = [
   },
 ]
 
+dayjs.extend(utc)
+dayjs.extend(timezone)
+
 let finalTabs = ref([] as any[])
 finalTabs.value = cloneDeep(tabs)
 
@@ -801,6 +816,9 @@ function getDefaultRange() {
 }
 dateRange.value = getDefaultRange()
 
+let formatCutOffDateTime = (str: string) =>
+  str?.length ? dayjs.utc(str).tz('Asia/Shanghai').format('YYYY-MM-DD HH:mm:ss') : ''
+
 const clearSubList = () => {
   subList.value = []
   subListBackup = []
@@ -811,7 +829,7 @@ let getList = () => {
   loading.value = true
   zoho.CRM.API.coql({
     select_query:
-      'select Container_Number,Name,Forwarder,ETD,ATD,ETA,ATA,Cut_Off_Date,Owner,Status,Modified_Time,SubscriptionId,Carrier,Booking_Number,GRN from Sea_Freight_Table' +
+      'select Container_Number,Name,Forwarder,ETD,ATD,ETA,ATA,Cut_Off_Date,Owner,Status,Modified_Time,SubscriptionId,Carrier,Booking_Number,GRN,Cut_Off_Date_Time from Sea_Freight_Table' +
       " where ETD between '" +
       `${dateRange.value.map((i) => dayjs(i).format('YYYY-MM-DD')).join("' and '")}` +
       "'",