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
b8d91a05
Commit
b8d91a05
authored
Oct 21, 2024
by
wuqian
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
质检排序
parent
ef5c4b4f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
4 deletions
+25
-4
src/types/api/order.ts
+1
-0
src/views/order/hook/useQuarantine.ts
+11
-2
src/views/order/index.vue
+13
-2
No files found.
src/types/api/order.ts
View file @
b8d91a05
...
...
@@ -14,6 +14,7 @@ export interface SearchForm {
internalMemo
:
string
status
?:
number
subOrderNumber
:
string
order
:
string
}
export
interface
Tab
{
...
...
src/views/order/hook/useQuarantine.ts
View file @
b8d91a05
...
...
@@ -95,9 +95,17 @@ export default function useQuarantine() {
try
{
const
res
=
await
getQaOrderBySubOrderNumber
(
code
)
const
code1
=
code
?.
split
(
'_'
)[
0
]
res
.
data
.
forEach
((
el
)
=>
{
el
.
isCheck
=
el
.
inspectionStatus
res
.
data
=
res
.
data
.
map
((
item
)
=>
{
return
{
...
item
,
isCheck
:
item
.
inspectionStatus
,
}
})
// 删除旧的inspectionStatus
res
.
data
=
res
.
data
.
map
(({
inspectionStatus
,
...
rest
})
=>
rest
)
res
.
data
.
sort
((
a
,
b
)
=>
a
.
isCheck
===
b
.
isCheck
?
0
:
a
.
isCheck
?
1
:
-
1
,
)
//false在前,true在后
activeTab
.
value
=
'all'
sourceData
.
value
=
res
.
data
_sourceData
.
value
=
res
.
data
...
...
@@ -221,6 +229,7 @@ export default function useQuarantine() {
dzjTotal
.
value
=
_sourceData
.
value
.
filter
((
item
)
=>
!
item
.
isCheck
).
length
yzjTotal
.
value
=
allTotal
.
value
-
dzjTotal
.
value
qaInputRef
.
value
.
focus
()
onChangeTab
(
activeTab
.
value
)
}
// 新的onReissue
const
giveDelivery
=
(
form
:
shopRemark
)
=>
{
...
...
src/views/order/index.vue
View file @
b8d91a05
...
...
@@ -135,7 +135,17 @@
style=
"width: 130px"
></ElInput>
</ElFormItem>
<ElFormItem
label=
"排序"
>
<el-select
v-model=
"searchForm.order"
clearable
style=
"width: 100px; margin-right: 5px"
placeholder=
"排序类型"
>
<el-option
value=
"asc"
label=
"正序"
></el-option>
<el-option
value=
"desc"
label=
"倒序"
></el-option>
</el-select>
</ElFormItem>
<ElFormItem>
<ElButton
type=
"primary"
@
click=
"search"
>
查询
</ElButton>
</ElFormItem>
...
...
@@ -548,7 +558,7 @@
style
=
"margin-right: -14px"
>
<
div
style
=
"flex: 1; flex-shrink: 0
;
"
style
=
"flex: 1; flex-shrink: 0"
class
=
"order-list-expand"
>
<
ProductInfoInspected
:
row
=
"row"
:
status
=
"statusCode"
/>
...
...
@@ -957,6 +967,7 @@ const [searchForm] = useValue<SearchForm>({
orderNumber
:
''
,
internalMemo
:
''
,
subOrderNumber
:
''
,
order
:
'desc'
,
}
)
const
tabsNav
=
ref
<
Tab
[]
>
([])
const
splitRef
=
ref
<
InstanceType
<
typeof
SplitDiv
>>
()
...
...
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