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
438a7e84
Commit
438a7e84
authored
Mar 06, 2025
by
wuqian
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新JMPOD
parent
8e1db597
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
187 additions
and
82 deletions
+187
-82
src/api/podOrder.ts
+12
-2
src/views/order/ProductInfo.vue
+3
-3
src/views/order/fastProduction.vue
+3
-4
src/views/order/hook/podUseShipMent.ts
+2
-0
src/views/order/pod/index.vue
+167
-73
No files found.
src/api/podOrder.ts
View file @
438a7e84
...
@@ -73,7 +73,8 @@ export function getCardOrderList(
...
@@ -73,7 +73,8 @@ export function getCardOrderList(
}
}
export
function
getOrderBySubOrderNumber
(
orderNumber
:
string
)
{
export
function
getOrderBySubOrderNumber
(
orderNumber
:
string
)
{
return
axios
.
get
<
never
,
BaseRespData
<
OrderData
>>
(
return
axios
.
get
<
never
,
BaseRespData
<
OrderData
>>
(
'factory/podJomallOrder/getOrderBySubOrderNumber'
,
// 'factory/podJomallOrder/getOrderBySubOrderNumber',
'factory/podJomallOrder/getOrderProductBySubOrderNumber'
,
{
{
params
:
{
params
:
{
factorySubOrderNumber
:
orderNumber
,
factorySubOrderNumber
:
orderNumber
,
...
@@ -81,7 +82,16 @@ export function getOrderBySubOrderNumber(orderNumber: string) {
...
@@ -81,7 +82,16 @@ export function getOrderBySubOrderNumber(orderNumber: string) {
},
},
)
)
}
}
export
function
applyForReplenishmentApi
(
productIds
:
string
)
{
return
axios
.
get
<
never
,
BaseRespData
<
never
>>
(
'factory/podJomallOrderProduct/applyForReplenishment'
,
{
params
:
{
productIds
,
},
},
)
}
// 发货保存
// 发货保存
export
function
saveOrder
(
export
function
saveOrder
(
sumbitSendOutList
:
ShipmentOrderRes
[],
sumbitSendOutList
:
ShipmentOrderRes
[],
...
...
src/views/order/ProductInfo.vue
View file @
438a7e84
...
@@ -170,13 +170,13 @@
...
@@ -170,13 +170,13 @@
(
item
.
num
||
0
)
-
(
item
.
shipmentNum
||
0
)
(
item
.
num
||
0
)
-
(
item
.
shipmentNum
||
0
)
}}
</span>
}}
</span>
</div>
</div>
<div
class=
"order-list-expand_item_info_title"
>
<div
v-if=
"isPod"
class=
"order-list-expand_item_info_title"
>
<span
class=
"order-list-expand_item_label"
>
工艺:
</span>
<span
class=
"order-list-expand_item_label"
>
工艺:
</span>
<span
class=
"order-list-expand_item_value"
>
{{
<span
class=
"order-list-expand_item_value"
>
{{
!
isPod
?
item
?.
processName
||
'--'
:
item
?.
process
||
'--'
item
?.
processName
||
'--'
}}
</span>
}}
</span>
</div>
</div>
<div
v-if=
"
!
isPod"
class=
"order-list-expand_item_info_title"
>
<div
v-if=
"isPod"
class=
"order-list-expand_item_info_title"
>
<span
class=
"order-list-expand_item_label"
>
工艺简称:
</span>
<span
class=
"order-list-expand_item_label"
>
工艺简称:
</span>
<span
class=
"order-list-expand_item_value"
>
{{
<span
class=
"order-list-expand_item_value"
>
{{
item
?.
process
||
'--'
item
?.
process
||
'--'
...
...
src/views/order/fastProduction.vue
View file @
438a7e84
...
@@ -324,7 +324,7 @@ const props = defineProps({
...
@@ -324,7 +324,7 @@ const props = defineProps({
type
:
String
,
type
:
String
,
},
},
})
})
const
emit
=
defineEmits
([
'update:detailVisible'
,
'close'
])
const
emit
=
defineEmits
([
'update:detailVisible'
,
'close'
,
'onSuccess'
])
watch
(
watch
(
()
=>
props
.
detailVisible
,
()
=>
props
.
detailVisible
,
...
@@ -461,9 +461,8 @@ const changeStatus = async () => {
...
@@ -461,9 +461,8 @@ const changeStatus = async () => {
setData
(
TrackingNumber
.
value
)
setData
(
TrackingNumber
.
value
)
})
})
}
}
const
setData
=
async
(
orderNumber
:
string
)
=>
{
const
setData
=
async
(
orderNumber
:
string
)
=>
{
if
(
detail
.
value
&&
detail
.
value
?.
id
)
{
if
(
detail
.
value
&&
detail
.
value
?.
id
!=-
1
)
{
try
{
try
{
const
id
=
detail
.
value
?.
id
const
id
=
detail
.
value
?.
id
await
productionQueryApi
(
id
)
await
productionQueryApi
(
id
)
...
@@ -481,7 +480,7 @@ const setData = async (orderNumber: string) => {
...
@@ -481,7 +480,7 @@ const setData = async (orderNumber: string) => {
localStorage
.
setItem
(
'historyData'
,
JSON
.
stringify
(
historyData
.
value
))
localStorage
.
setItem
(
'historyData'
,
JSON
.
stringify
(
historyData
.
value
))
}
}
}
}
emit
(
'onSuccess'
)
playAudio
(
'weight_success'
)
playAudio
(
'weight_success'
)
detail
.
value
=
{
id
:
-
1
,
podOrderId
:
-
1
,
imgList
:
[]
}
detail
.
value
=
{
id
:
-
1
,
podOrderId
:
-
1
,
imgList
:
[]
}
}
catch
(
e
)
{
}
catch
(
e
)
{
...
...
src/views/order/hook/podUseShipMent.ts
View file @
438a7e84
...
@@ -73,6 +73,8 @@ export default function useShipment(callback?: () => void) {
...
@@ -73,6 +73,8 @@ export default function useShipment(callback?: () => void) {
isLock
.
value
=
false
isLock
.
value
=
false
await
nextTick
()
await
nextTick
()
if
(
shipmentOrderRef
.
value
)
{
if
(
shipmentOrderRef
.
value
)
{
console
.
log
(
"shipmentOrderRef.value"
,
shipmentOrderRef
.
value
);
const
rowEl
=
shipmentOrderRef
.
value
.
listRef
?.
querySelector
(
const
rowEl
=
shipmentOrderRef
.
value
.
listRef
?.
querySelector
(
`div[data-id="
${
rowData
.
id
}
"]`
,
`div[data-id="
${
rowData
.
id
}
"]`
,
)
)
...
...
src/views/order/pod/index.vue
View file @
438a7e84
This diff is collapsed.
Click to expand it.
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