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
51956048
Commit
51956048
authored
Oct 30, 2025
by
linjinhong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:修改普货按钮问题
parent
926f36ff
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
16 deletions
+24
-16
src/views/order/podUs/PodMakeOrder.vue
+5
-6
src/views/order/podUs/index.vue
+19
-10
No files found.
src/views/order/podUs/PodMakeOrder.vue
View file @
51956048
...
...
@@ -1017,15 +1017,14 @@ const printNormal = async () => {
;(
podBoxList
.
value
||
[]).
forEach
((
item
:
PodMakeOrderData
)
=>
{
if
(
item
.
data
)
{
if
(
item
.
data
.
productList
&&
item
.
data
.
productList
.
length
>
0
)
{
const
flag
=
item
.
data
.
productList
.
some
((
item1
)
=>
{
return
(
item
.
data
.
productList
.
forEach
((
item1
)
=>
{
if
(
item1
.
productMark
==
'normal'
||
item1
.
productMark
==
'custom_normal'
)
)
{
arr
?.
push
(
item1
?.
id
)
}
})
if
(
flag
)
{
arr
?.
push
(
item
.
data
?.
id
)
}
}
}
})
...
...
src/views/order/podUs/index.vue
View file @
51956048
...
...
@@ -1390,7 +1390,10 @@
</template>
</ElDropdown> -->
<div
v-if=
"status === 'WAIT_SHIPMENT' && item.productMark !== 'custom_normal'"
v-if=
"
status === 'WAIT_SHIPMENT' &&
item.productMark !== 'custom_normal'
"
style=
"
display: flex;
flex-direction: column;
...
...
@@ -1410,7 +1413,10 @@
<!-- f -->
</div>
<div
v-if=
"status === 'WAIT_SHIPMENT' && item.productMark !== 'custom_normal'"
v-if=
"
status === 'WAIT_SHIPMENT' &&
item.productMark !== 'custom_normal'
"
style=
"display: flex; justify-content: space-between"
>
<el-button
...
...
@@ -1432,7 +1438,10 @@
</el-button>
</div>
<div
v-if=
"status === 'WAIT_SHIPMENT' && item.productMark !== 'custom_normal'"
v-if=
"
status === 'WAIT_SHIPMENT' &&
item.productMark !== 'custom_normal'
"
style=
"
display: flex;
flex-direction: column;
...
...
@@ -3903,7 +3912,7 @@ watch(
if
(
product
.
productMark
===
'custom_normal'
)
{
product
.
previewImgs
=
[]
}
else
{
product
.
previewImgs
=
product
.
previewImgs
=
JSON
.
parse
(
product
.
imageAry
)?.
filter
(
(
el
:
{
title
:
string
}
)
=>
el
.
title
,
)
||
[]
...
...
@@ -6334,12 +6343,12 @@ const printNormal = async () => {
console
.
log
(
3660
,
selection
.
value
)
selection
.
value
.
forEach
((
s
)
=>
{
const
f
=
s
.
productList
&&
s
.
productList
.
find
(
(
p
)
=>
p
.
productMark
===
'normal'
||
p
.
productMark
===
'custom_normal'
,
)
if
(
f
)
arr
.
push
(
f
.
id
)
s
.
productList
&&
s
.
productList
.
forEach
((
p
)
=>
{
if
(
p
.
productMark
===
'normal'
||
p
.
productMark
===
'custom_normal'
)
{
arr
.
push
(
p
.
id
)
}
}
)
}
)
console
.
log
(
3661
,
arr
)
...
...
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