Merge branch 'dev_order_new_search' into dev_new_order

src/views/order/factoryOrderNew/index.vue

@@ -147,7 +147,17 @@
             </ElFormItem>
             </ElFormItem>
 
 
             <ElFormItem
             <ElFormItem
-              v-if="cardLayoutStatuses.includes(status)"
+              v-if="
+                cardLayoutStatuses.includes(status) ||
+                [
+                  'ALL',
+                  'PICKING',
+                  'PENDING_DELIVERY',
+                  'COMPLETED',
+                  'SUSPEND',
+                  'CANCELLED',
+                ].includes(status)
+              "
               label="操作单号"
               label="操作单号"
             >
             >
               <ElInput
               <ElInput

src/views/order/factoryOrderNew/utils/listSearchQueryFilter.ts

@@ -5,7 +5,16 @@ export const FACTORY_ORDER_LIST_SEARCH_FIELD_RULES: Record<
   (ctx: FactoryOrderSearchQueryVisibilityContext) => boolean
   (ctx: FactoryOrderSearchQueryVisibilityContext) => boolean
 > = {
 > = {
   batchArrangeNumber: (c) => c.isCardLayout,
   batchArrangeNumber: (c) => c.isCardLayout,
-  operationNo: (c) => c.isCardLayout,
+  operationNo: (c) =>
+    c.isCardLayout ||
+    [
+      'ALL',
+      'PICKING',
+      'PENDING_DELIVERY',
+      'COMPLETED',
+      'SUSPEND',
+      'CANCELLED',
+    ].includes(c.status),
   receiverCountry: (c) => !c.isCardLayout,
   receiverCountry: (c) => !c.isCardLayout,
   logisticsWayId: (c) => c.status === 'ALL',
   logisticsWayId: (c) => c.status === 'ALL',
   customerNo: (c) => c.status === 'ALL',
   customerNo: (c) => c.status === 'ALL',