Merge branch 'main' of github.com-haina:hainatravel/global-sales

src/views/orders/Follow.jsx

@@ -345,21 +345,21 @@ function OrderGroupTable({ formValues }) {
 
   deptKeys.forEach((deptNo, index) => {
     const deptOrderList = groupOrderData[deptNo]
-    // 1新订单；2未读消息；3需一催；4需二催；5需三催；6未处理邮件
+    // 1新订单；2未读消息；3需一催；4需二催；5需三催；6未处理邮件；入境提醒coli_ordertype=7，余款提醒coli_ordertype=8
     const newOrderList = deptOrderList.filter((o) => {
       return o.coli_ordertype === 1
     })
     const newMsgList = deptOrderList.filter((o) => {
-      return o.coli_ordertype === 2
+      return o.coli_ordertype === 2 || o.coli_ordertype === 6
     })
     const followUpList = deptOrderList.filter((o) => {
       return o.coli_ordertype === 3 || o.coli_ordertype === 4 || o.coli_ordertype === 5
     })
-    const paymentList = deptOrderList.filter((o) => {
-      return o.coli_ordertype === 1000
-    })
     const entryList = deptOrderList.filter((o) => {
-      return o.coli_ordertype === 20000
+      return o.coli_ordertype === 7
+    })
+    const paymentList = deptOrderList.filter((o) => {
+      return o.coli_ordertype === 8
     })
     deptItems.push(
       {
@@ -371,7 +371,7 @@ function OrderGroupTable({ formValues }) {
             condition={newOrderList.length > 0}
             whenTrue={<Table key={'newOrderTable' + deptNo} loading={loading} dataSource={newOrderList}
             columns={orderColumns}
-            pagination={deptOrderList.length <= 10 ? false : paginationProps} />}
+            pagination={newOrderList.length <= 10 ? false : paginationProps} />}
             whenFalse={<Empty />}
           />
           
@@ -380,7 +380,7 @@ function OrderGroupTable({ formValues }) {
             condition={newMsgList.length > 0}
             whenTrue={<Table key={'newMsgTable' + deptNo} loading={loading} dataSource={newMsgList}
             columns={orderColumns}         
-            pagination={deptOrderList.length <= 10 ? false : paginationProps} />}
+            pagination={newMsgList.length <= 10 ? false : paginationProps} />}
             whenFalse={<Empty />}
           />
 
@@ -389,7 +389,7 @@ function OrderGroupTable({ formValues }) {
             condition={followUpList.length > 0}
             whenTrue={<Table key={'followUpTable' + deptNo} loading={loading} dataSource={followUpList}
             columns={orderColumns}
-            pagination={deptOrderList.length <= 10 ? false : paginationProps} />}
+            pagination={followUpList.length <= 10 ? false : paginationProps} />}
             whenFalse={<Empty />}
           />
 
@@ -398,7 +398,7 @@ function OrderGroupTable({ formValues }) {
             condition={paymentList.length > 0}
             whenTrue={<Table key={'paymentTable' + deptNo} loading={loading} dataSource={paymentList}
             columns={orderColumns}
-            pagination={deptOrderList.length <= 10 ? false : paginationProps} />}
+            pagination={paymentList.length <= 10 ? false : paginationProps} />}
             whenFalse={<Empty />}
           />          
 
@@ -407,7 +407,7 @@ function OrderGroupTable({ formValues }) {
             condition={entryList.length > 0}
             whenTrue={<Table key={'entryTable' + deptNo} loading={loading} dataSource={entryList}
             columns={orderColumns}
-            pagination={deptOrderList.length <= 10 ? false : paginationProps} /> }
+            pagination={entryList.length <= 10 ? false : paginationProps} /> }
             whenFalse={<Empty />}
           />