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
e9cfd2d5
Commit
e9cfd2d5
authored
Dec 08, 2025
by
linjinhong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改播种墙单件入库
parent
4cc8a6db
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
48 additions
and
18 deletions
+48
-18
src/types/api/podMakeOrder.ts
+1
-1
src/views/order/podUs/PodMakeOrder.vue
+47
-17
No files found.
src/types/api/podMakeOrder.ts
View file @
e9cfd2d5
export
interface
PodMakeOrderData
{
data
:
OrderData
|
null
data
?
:
OrderData
|
null
warehouseId
?:
number
box
?:
number
addDate
?:
string
...
...
src/views/order/podUs/PodMakeOrder.vue
View file @
e9cfd2d5
...
...
@@ -138,10 +138,11 @@
</div>
<div
class=
"middle-content"
>
<div
class=
"box-top"
>
<div
class=
"box-top-item"
>
<div
class=
"box-top-item"
v-if=
"boxIndex !== 0"
>
<span
class=
"box-top-item-box-index"
>
{{ boxIndex }}
</span>
<span
class=
"box-top-item-box-index-text"
>
号箱
</span>
<span
style=
"font-size: 30px"
>
放入第
</span>
...
...
@@ -150,6 +151,7 @@
</div>
<span
style=
"font-size: 30px"
>
件商品
</span>
</div>
<div
v-else
class=
"box-top-item-box-index-text"
>
单件订单,已配齐
</div>
<div
class=
"box-top-item-status"
>
<span
v-if=
"
...
...
@@ -201,14 +203,19 @@
:class=
"{
active: item.box && boxIndex == item.box,
isNull: !item.data,
fontStyle: index == 0,
}"
@
click=
"handleBoxClick(item)"
>
<span
style=
"font-weight: bold"
:title=
"index + 1 + '号箱'"
>
{{ index + 1 }}
<span
style=
"font-weight: bold"
:title=
"index == 0 ? '虚拟箱' : index + '号箱'"
>
{{ index == 0 ? '虚拟箱' : index }}
</span>
<span
v-if=
"item.data"
class=
"number"
>
{{ item.data.pickingNumber }}/{{ item.data.purchaseNumber }}
<span
v-if=
"item.data?.pickingNumber"
class=
"number"
>
{{ item.data?.pickingNumber }}/{{ item.data.purchaseNumber }}
</span>
<div
v-if=
"
...
...
@@ -343,7 +350,9 @@ const orderStore = useOrderStore()
const
isLock
=
ref
<
boolean
>
(
false
)
const
productionOrderRef
=
ref
()
const
socketConnect
=
computed
(()
=>
orderStore
.
socketConnect
)
const
podBoxList
=
computed
(()
=>
orderStore
.
podBoxList
)
const
podBoxList
=
computed
(()
=>
{
return
[{
box
:
0
},
...(
orderStore
.
podBoxList
as
PodMakeOrderData
[])]
})
const
coverImage
=
ref
<
string
>
(
''
)
let
currentCode
=
''
const
tableRef
=
ref
()
...
...
@@ -355,8 +364,8 @@ watch(visible, async (value: boolean) => {
const
localId
=
localRaw
?
JSON
.
parse
(
localRaw
)
:
''
/* 先找一次,确认本地值是否存在于列表 */
const
hit
=
props
.
warehouseList
.
find
((
w
)
=>
w
.
id
===
localId
)
warehouseId
.
value
=
hit
?
localId
:
props
.
warehouseList
[
0
].
id
_warehouseId
.
value
=
hit
?
localId
:
props
.
warehouseList
[
0
].
id
warehouseId
.
value
=
hit
?
localId
:
props
.
warehouseList
[
0
]
?
.
id
_warehouseId
.
value
=
hit
?
localId
:
props
.
warehouseList
[
0
]
?
.
id
if
(
userStore
.
user
?.
factory
.
id
)
{
try
{
...
...
@@ -405,6 +414,8 @@ watch(boxIndex, (value: number | null) => {
watch
(
podBoxList
,
(
value
)
=>
{
console
.
log
(
'podBoxIndex1111'
,
podBoxIndex
.
value
)
if
(
value
)
{
const
item
=
value
.
find
((
item
)
=>
item
.
box
===
podBoxIndex
.
value
)
console
.
log
(
'podBoxList'
,
value
,
podBoxIndex
.
value
,
item
)
...
...
@@ -444,13 +455,13 @@ const podBoxIndex = computed(() => orderStore.podBoxIndex)
let
renderLock
=
false
const
renderItemBox
=
(
bool
:
boolean
)
=>
{
if
(
!
podBoxList
.
value
||
podBoxList
.
value
.
length
===
0
||
!
boxIndex
.
value
||
(
bool
&&
boxIndex
.
value
!==
podBoxIndex
.
value
)
)
return
//
if (
//
!podBoxList.value ||
//
podBoxList.value.length === 0 ||
//
!boxIndex.value ||
//
(bool && boxIndex.value !== podBoxIndex.value)
//
)
//
return
if
(
renderLock
)
return
renderLock
=
true
let
boxItem
=
podBoxList
.
value
.
find
((
item
)
=>
item
.
box
===
boxIndex
.
value
)
...
...
@@ -507,6 +518,7 @@ const renderItemBox = (bool: boolean) => {
}
podOrderDetailsData
.
value
=
data
console
.
log
(
408
,
podOrderDetailsData
.
value
)
if
(
productList
.
every
((
item
)
=>
item
.
power
))
{
print
(
data
,
false
,
()
=>
{
...
...
@@ -630,12 +642,27 @@ const getPackingData = async (code: string) => {
productionOrder
.
value
=
''
return
}
const
{
box
}
=
res
.
data
const
{
box
,
data
}
=
res
.
data
console
.
log
(
'box'
,
box
)
if
(
box
)
{
boxIndex
.
value
=
box
}
// if (box == 0) {
podBoxList
.
value
.
forEach
((
el
)
=>
{
if
(
el
.
box
==
box
)
{
console
.
log
(
684
,
el
.
box
)
if
(
!
el
.
data
)
{
el
.
data
=
{
productList
:
[]
}
}
el
.
data
.
productList
=
data
?.
productList
console
.
log
(
684
,
el
)
}
})
renderItemBox
(
true
)
console
.
log
(
'podBoxList'
,
podBoxList
.
value
)
// }
}
catch
(
error
)
{
console
.
log
(
error
)
}
finally
{
...
...
@@ -952,7 +979,7 @@ const print = (data: OrderData, forcePrint = false, callback?: () => void) => {
const
factoryNo
=
userStore
.
user
?.
factory
.
id
if
(
!
factoryNo
)
return
orderStore
.
setPodBoxList
({
boxList
:
item
?
item
.
data
:
null
,
boxList
:
item
?
(
item
.
data
as
PodMakeOrderData
[])
:
null
,
factoryNo
,
box
:
_boxIndex
||
undefined
,
warehouseId
:
warehouseId
.
value
,
...
...
@@ -1231,6 +1258,9 @@ const printNormal = async () => {
background-color
:
red
;
}
}
.fontStyle
{
font-size
:
12px
;
}
</
style
>
<
style
lang=
"scss"
>
.pod-make-order-dialog
{
...
...
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