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
4e4e2b35
Commit
4e4e2b35
authored
Nov 13, 2024
by
qinjianhui
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: ts 报错修改
parent
df5972b5
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
3 deletions
+6
-3
src/views/order/Quarantine.vue
+1
-1
src/views/order/hook/useQuarantine.ts
+4
-1
src/views/order/hook/useShipment.ts
+1
-1
No files found.
src/views/order/Quarantine.vue
View file @
4e4e2b35
...
@@ -184,7 +184,7 @@
...
@@ -184,7 +184,7 @@
<
div
class
=
"left-qa-order-basic-info_item"
>
<
div
class
=
"left-qa-order-basic-info_item"
>
<
span
class
=
"label"
>
发货方式
:
<
/span
>
<
span
class
=
"label"
>
发货方式
:
<
/span
>
<
span
class
=
"value"
>
<
span
class
=
"value"
>
{{
currentRow
.
shippingWay
==
1
?
'送货上门'
:
'快递'
||
'--'
}}
{{
currentRow
.
shippingWay
?
currentRow
.
shippingWay
==
1
?
'送货上门'
:
'快递'
:
'--'
}}
<
/span
>
<
/span
>
<
/div
>
<
/div
>
<
div
class
=
"left-qa-order-basic-info_item"
>
<
div
class
=
"left-qa-order-basic-info_item"
>
...
...
src/views/order/hook/useQuarantine.ts
View file @
4e4e2b35
...
@@ -102,7 +102,10 @@ export default function useQuarantine() {
...
@@ -102,7 +102,10 @@ export default function useQuarantine() {
}
}
})
})
// 删除旧的inspectionStatus
// 删除旧的inspectionStatus
res
.
data
=
res
.
data
.
map
(({
inspectionStatus
,
...
rest
})
=>
rest
)
res
.
data
=
res
.
data
.
map
(({
inspectionStatus
,
...
rest
})
=>
{
console
.
log
(
inspectionStatus
)
return
rest
})
res
.
data
.
sort
((
a
,
b
)
=>
res
.
data
.
sort
((
a
,
b
)
=>
a
.
isCheck
===
b
.
isCheck
?
0
:
a
.
isCheck
?
1
:
-
1
,
a
.
isCheck
===
b
.
isCheck
?
0
:
a
.
isCheck
?
1
:
-
1
,
)
//false在前,true在后
)
//false在前,true在后
...
...
src/views/order/hook/useShipment.ts
View file @
4e4e2b35
...
@@ -121,7 +121,7 @@ export default function useShipment(callback?: () => void) {
...
@@ -121,7 +121,7 @@ export default function useShipment(callback?: () => void) {
shipmentLoading
.
value
=
false
shipmentLoading
.
value
=
false
}
}
}
}
const
canJoin
=
async
(
data
:
any
,
code
:
string
)
=>
{
const
canJoin
=
async
(
data
:
OrderData
,
code
:
string
)
=>
{
const
code1
=
code
?.
split
(
'_'
)[
0
]
const
code1
=
code
?.
split
(
'_'
)[
0
]
for
(
const
item
of
data
.
productList
||
[])
{
for
(
const
item
of
data
.
productList
||
[])
{
item
.
count
=
0
item
.
count
=
0
...
...
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