解决高级搜索没有订单类型

src/views/orders/Follow.jsx

@@ -361,59 +361,73 @@ function OrderGroupTable({ formValues }) {
     const paymentList = deptOrderList.filter((o) => {
       return o.coli_ordertype === 8
     })
-    deptItems.push(
+    if (formValues.type === 'advance') {
-      {
+      deptItems.push(
-        key: index,
+        {
-        label: deptMap.get(deptNo),
+          key: index,
-        children: <>
+          label: deptMap.get(deptNo),
-          <Divider orientation='left'>新订单</Divider>
+          children: <>
-          <Conditional
+            <Table key={'advanceOrderTable' + deptNo} loading={loading} dataSource={deptOrderList}
-            condition={newOrderList.length > 0}
+              columns={orderColumns}
-            whenTrue={<Table key={'newOrderTable' + deptNo} loading={loading} dataSource={newOrderList}
+              pagination={deptOrderList.length <= 10 ? false : paginationProps} />
-            columns={orderColumns}
+          </>
-            pagination={newOrderList.length <= 10 ? false : paginationProps} />}
+        }
-            whenFalse={<Empty />}
+      )
-          />
+    } else {
-          
+      deptItems.push(
-          <Divider orientation='left'>新消息/老邮件</Divider>
+        {
-          <Conditional
+          key: index,
-            condition={newMsgList.length > 0}
+          label: deptMap.get(deptNo),
-            whenTrue={<Table key={'newMsgTable' + deptNo} loading={loading} dataSource={newMsgList}
+          children: <>
-            columns={orderColumns}         
+            <Divider orientation='left'>新订单</Divider>
-            pagination={newMsgList.length <= 10 ? false : paginationProps} />}
+            <Conditional
-            whenFalse={<Empty />}
+              condition={newOrderList.length > 0}
-          />
+              whenTrue={<Table key={'newOrderTable' + deptNo} loading={loading} dataSource={newOrderList}
-
+              columns={orderColumns}
-          <Divider orientation='left'>催信</Divider>
+              pagination={newOrderList.length <= 10 ? false : paginationProps} />}
-          <Conditional
+              whenFalse={<Empty />}
-            condition={followUpList.length > 0}
+            />
-            whenTrue={<Table key={'followUpTable' + deptNo} loading={loading} dataSource={followUpList}
+            
-            columns={orderColumns}
+            <Divider orientation='left'>新消息/老邮件</Divider>
-            pagination={followUpList.length <= 10 ? false : paginationProps} />}
+            <Conditional
-            whenFalse={<Empty />}
+              condition={newMsgList.length > 0}
-          />
+              whenTrue={<Table key={'newMsgTable' + deptNo} loading={loading} dataSource={newMsgList}
-
+              columns={orderColumns}         
-          <Divider orientation='left'>余款收付</Divider>
+              pagination={newMsgList.length <= 10 ? false : paginationProps} />}
-          <Conditional
+              whenFalse={<Empty />}
-            condition={paymentList.length > 0}
+            />
-            whenTrue={<Table key={'paymentTable' + deptNo} loading={loading} dataSource={paymentList}
+  
-            columns={orderColumns}
+            <Divider orientation='left'>催信</Divider>
-            pagination={paymentList.length <= 10 ? false : paginationProps} />}
+            <Conditional
-            whenFalse={<Empty />}
+              condition={followUpList.length > 0}
-          />          
+              whenTrue={<Table key={'followUpTable' + deptNo} loading={loading} dataSource={followUpList}
-
+              columns={orderColumns}
-          <Divider orientation='left'>入境提醒</Divider>
+              pagination={followUpList.length <= 10 ? false : paginationProps} />}
-          <Conditional
+              whenFalse={<Empty />}
-            condition={entryList.length > 0}
+            />
-            whenTrue={<Table key={'entryTable' + deptNo} loading={loading} dataSource={entryList}
+  
-            columns={orderColumns}
+            <Divider orientation='left'>余款收付</Divider>
-            pagination={entryList.length <= 10 ? false : paginationProps} /> }
+            <Conditional
-            whenFalse={<Empty />}
+              condition={paymentList.length > 0}
-          />
+              whenTrue={<Table key={'paymentTable' + deptNo} loading={loading} dataSource={paymentList}
-          
+              columns={orderColumns}
-        </>
+              pagination={paymentList.length <= 10 ? false : paginationProps} />}
-      }
+              whenFalse={<Empty />}
-    )
+            />          
+  
+            <Divider orientation='left'>入境提醒</Divider>
+            <Conditional
+              condition={entryList.length > 0}
+              whenTrue={<Table key={'entryTable' + deptNo} loading={loading} dataSource={entryList}
+              columns={orderColumns}
+              pagination={entryList.length <= 10 ? false : paginationProps} /> }
+              whenFalse={<Empty />}
+            />
+            
+          </>
+        }
+      )
+    }
   })
 
   return (