订单跟踪增加“出发日期”排序

dev/mobile
Jimmy Liow 2 years ago
parent dd5bac874f
commit d498f3f257

@ -9,7 +9,6 @@ import Standlone from '@/views/Standlone'
import OrderFollow from '@/views/orders/Follow'
import ChatHistory from '@/views/ChatHistory'
import SalesManagement from '@/views/SalesManagement'
import DingdingQRCode from '@/views/dingding/QRCode'
import DingdingCallback from '@/views/dingding/Callback'
import DingdingLogout from '@/views/dingding/Logout'
import AccountProfile from '@/views/accounts/Profile'
@ -63,9 +62,7 @@ const router = createBrowserRouter([
children: [
{ path: 'dingding/login', element: <DingdingLogin /> },
{ path: 'dingding/logout', element: <DingdingLogout /> },
{ path: 'dingding/qrcode', element: isMobileApp ? <DingdingLogin /> : <DingdingQRCode /> },
{ path: 'dingding/callback', element: <DingdingCallback /> },
{ path: 'mobile-login', element: <DingdingLogin /> },
],
},
]);

@ -230,10 +230,10 @@ function OrderGroupTable({ formValues }) {
width: 120,
hidden: false,
sortDirections: ['ascend', 'descend'],
sorter: (a, b, sortOrder) => {
const datejsA = isEmpty(a.COLI_OrderStartDate) ? dayjs(0) : new dayjs(a.COLI_OrderStartDate)
const datejsB = isEmpty(b.COLI_OrderStartDate) ? dayjs(0) : new dayjs(b.COLI_OrderStartDate)
return datejsA.isAfter(datejsB)
sorter: (a, b) => {
const datejsA = isEmpty(a.COLI_OrderStartDate) ? 0 : new dayjs(a.COLI_OrderStartDate).valueOf()
const datejsB = isEmpty(b.COLI_OrderStartDate) ? 0 : new dayjs(b.COLI_OrderStartDate).valueOf()
return datejsA - datejsB
}
},
{

Loading…
Cancel
Save