From a3be35ca028a859476c6c33387f0c2b8351d9a0f Mon Sep 17 00:00:00 2001
From: Jimmy <yijun.liao@gmail.com>
Date: Mon, 18 Mar 2024 14:32:07 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=88=97=E5=AE=BD=EF=BC=8C?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E6=97=A5=E6=9C=9F=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/OrderFollow.jsx | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/views/OrderFollow.jsx b/src/views/OrderFollow.jsx
index bbfa283..fc72eb1 100644
--- a/src/views/OrderFollow.jsx
+++ b/src/views/OrderFollow.jsx
@@ -188,10 +188,11 @@ function OrderGroupTable({ formValues }) {
         if (record.buytime > 0) regularText = '(R' + record.buytime + ')'
         return (
           <Space>
-            {isNotEmpty(record.coli_guest_WhatsApp) && <WhatsAppOutlined className={['pl-1', record.last_received_time ? 'text-whatsapp' : 'text-neutral-500']} />}
-            <Tooltip title={record.coli_guest_WhatsApp}>
+            <Conditional
+              condition={isNotEmpty(record.coli_guest_WhatsApp)}
+              whenTrue={<Tooltip title={record.coli_guest_WhatsApp}><WhatsAppOutlined className={['pl-1', record.last_received_time ? 'text-whatsapp' : 'text-neutral-500']} /></Tooltip>}
+            />
             {text + regularText}
-            </Tooltip>
             <Badge
               count={record.unread_msg}
               style={{
@@ -205,7 +206,7 @@ function OrderGroupTable({ formValues }) {
     {
       title: '订单状态',
       dataIndex: 'COLI_State',
-      width: 150,
+      width: 120,
       render: (text, record) => {
         // 1新订单<InfoCircleTwoTone />；2未读消息<MessageTwoTone />；3需一催；4需二催；5需三催<PhoneTwoTone />；6未处理邮件<MailTwoTone />
         const needTo = '要催信' + (record.coli_ordertype - 2)
@@ -224,23 +225,35 @@ function OrderGroupTable({ formValues }) {
       }
     },
     {
-      title: '报价title',
+      title: '报价 Title',
       dataIndex: 'lettertitle',
       ellipsis: true,
-      hidden: false
+      hidden: false,      
+      // render: (text, record) => {
+      //   return (
+      //     <Tooltip title={text}>{text}</Tooltip>
+      //   )
+      // }
     },
     {
       title: '出发日期',
       dataIndex: 'COLI_OrderStartDate',
-      width: 150,
+      width: 120,
       hidden: false
     },
     {
       title: '客人最后一次回复时间',
       dataIndex: 'last_received_time',
+      width: 180,
+      render: (text, record) => {
+        if (record.last_received_time) {
+          return new dayjs(record.last_received_time).format('YYYY-MM-DD HH:mm:ss')
+        }
+      }
     },
     {
       title: '附加信息',
+      ellipsis: true,
       dataIndex: 'COLI_Introduction',
     },
   ]