Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
factory_front
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
qinjianhui
factory_front
Commits
9212ecaf
Commit
9212ecaf
authored
Jun 30, 2026
by
wusiyi
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev_order_new_search' into dev_new_order
parents
481dd8ed
a73c0d44
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
2 deletions
+21
-2
src/views/order/factoryOrderNew/index.vue
+11
-1
src/views/order/factoryOrderNew/utils/listSearchQueryFilter.ts
+10
-1
No files found.
src/views/order/factoryOrderNew/index.vue
View file @
9212ecaf
...
...
@@ -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
...
...
src/views/order/factoryOrderNew/utils/listSearchQueryFilter.ts
View file @
9212ecaf
...
...
@@ -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'
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment