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
cf5f0dfe
Commit
cf5f0dfe
authored
Oct 30, 2025
by
qinjianhui
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 胚衣问题修改
parent
dbfd307b
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
34 additions
and
7 deletions
+34
-7
src/types/api/podUsOrder.ts
+1
-0
src/views/order/podUs/PodMakeOrder.vue
+22
-0
src/views/order/podUs/index.vue
+11
-7
No files found.
src/types/api/podUsOrder.ts
View file @
cf5f0dfe
...
...
@@ -143,6 +143,7 @@ export interface ProductList {
sizeType
?:
number
|
null
productMark
?:
string
|
null
customTagList
?:
{
name
:
string
}[]
productMark
?:
string
}
export
interface
cardImages
{
title
:
string
...
...
src/views/order/podUs/PodMakeOrder.vue
View file @
cf5f0dfe
...
...
@@ -211,6 +211,17 @@
<span
v-if=
"item.data"
class=
"number"
>
{{ item.data.pickingNumber }}/{{ item.data.purchaseNumber }}
</span>
<div
v-if=
"
item.data &&
item.data.productList?.some(
(e) => e.productMark === 'custom_normal',
)
"
class=
"cb-product-mark"
>
<div
class=
"red-circle"
></div>
</div>
</div>
</div>
</div>
...
...
@@ -1204,6 +1215,17 @@ const printNormal = async () => {
color
:
#ddd
;
}
}
.cb-product-mark
{
position
:
absolute
;
top
:
0
;
right
:
0
;
.red-circle
{
width
:
8px
;
height
:
8px
;
border-radius
:
50%
;
background-color
:
red
;
}
}
</
style
>
<
style
lang=
"scss"
>
.pod-make-order-dialog
{
...
...
src/views/order/podUs/index.vue
View file @
cf5f0dfe
...
...
@@ -1390,7 +1390,7 @@
</template>
</ElDropdown> -->
<div
v-if=
"status === 'WAIT_SHIPMENT'"
v-if=
"status === 'WAIT_SHIPMENT'
&& item.productMark !== 'custom_normal'
"
style=
"
display: flex;
flex-direction: column;
...
...
@@ -1410,7 +1410,7 @@
<!-- f -->
</div>
<div
v-if=
"status === 'WAIT_SHIPMENT'"
v-if=
"status === 'WAIT_SHIPMENT'
&& item.productMark !== 'custom_normal'
"
style=
"display: flex; justify-content: space-between"
>
<el-button
...
...
@@ -1432,7 +1432,7 @@
</el-button>
</div>
<div
v-if=
"status === 'WAIT_SHIPMENT'"
v-if=
"status === 'WAIT_SHIPMENT'
&& item.productMark !== 'custom_normal'
"
style=
"
display: flex;
flex-direction: column;
...
...
@@ -3900,10 +3900,14 @@ watch(
order
.
productList
?.
forEach
((
product
)
=>
{
if
(
!
product
.
previewImgs
&&
product
.
imageAry
)
{
try
{
if
(
product
.
productMark
===
'custom_normal'
)
{
product
.
previewImgs
=
[]
}
else
{
product
.
previewImgs
=
JSON
.
parse
(
product
.
imageAry
)?.
filter
(
(
el
:
{
title
:
string
}
)
=>
el
.
title
,
)
||
[]
JSON
.
parse
(
product
.
imageAry
)?.
filter
(
(
el
:
{
title
:
string
}
)
=>
el
.
title
,
)
||
[]
}
}
catch
(
error
)
{
console
.
error
(
'JSON解析失败:'
,
error
)
product
.
previewImgs
=
[]
...
...
@@ -5237,7 +5241,7 @@ const handleMark = (mark: string) => {
return
{
name
:
'CB'
,
color
:
'#67C23A'
,
label
:
'
海外供应
'
,
label
:
'
胚衣
'
,
}
default
:
return
{
...
...
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