Commit 9212ecaf by wusiyi

Merge branch 'dev_order_new_search' into dev_new_order

parents 481dd8ed a73c0d44
......@@ -147,7 +147,17 @@
</ElFormItem>
<ElFormItem
v-if="cardLayoutStatuses.includes(status)"
v-if="
cardLayoutStatuses.includes(status) ||
[
'ALL',
'PICKING',
'PENDING_DELIVERY',
'COMPLETED',
'SUSPEND',
'CANCELLED',
].includes(status)
"
label="操作单号"
>
<ElInput
......
......@@ -5,7 +5,16 @@ export const FACTORY_ORDER_LIST_SEARCH_FIELD_RULES: Record<
(ctx: FactoryOrderSearchQueryVisibilityContext) => boolean
> = {
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,
logisticsWayId: (c) => c.status === 'ALL',
customerNo: (c) => c.status === 'ALL',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment