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
e1c4596f
Commit
e1c4596f
authored
Jul 05, 2024
by
zhuzhequan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
eslint 修改
parent
7314483a
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
3 deletions
+5
-3
src/api/order.ts
+2
-1
src/types/api/order.ts
+2
-1
src/views/DeliveryNotePage.vue
+1
-1
No files found.
src/api/order.ts
View file @
e1c4596f
...
@@ -202,11 +202,12 @@ export function customJomallReconciliation(
...
@@ -202,11 +202,12 @@ export function customJomallReconciliation(
},
},
)
)
}
}
export
function
printDeliveryNote
(
data
:
string
[])
{
export
function
printDeliveryNote
(
data
:
string
[]
,
userMark
?:
string
)
{
return
axios
.
post
<
never
,
BaseRespData
<
never
>>
(
return
axios
.
post
<
never
,
BaseRespData
<
never
>>
(
'factory/customJomallShipment/printInvoiceStatistics'
,
'factory/customJomallShipment/printInvoiceStatistics'
,
{
{
startTime
:
data
&&
data
[
0
],
startTime
:
data
&&
data
[
0
],
userMark
,
endTime
:
data
&&
data
[
1
],
endTime
:
data
&&
data
[
1
],
},
},
)
)
...
...
src/types/api/order.ts
View file @
e1c4596f
...
@@ -41,7 +41,6 @@ export interface OrderData {
...
@@ -41,7 +41,6 @@ export interface OrderData {
status
?:
number
status
?:
number
weight
?:
number
weight
?:
number
outCurrencyCode
?:
number
outCurrencyCode
?:
number
productAmount
?:
number
carriageAmount
?:
number
carriageAmount
?:
number
totalAmount
?:
number
totalAmount
?:
number
productNum
?:
number
productNum
?:
number
...
@@ -59,8 +58,10 @@ export interface OrderData {
...
@@ -59,8 +58,10 @@ export interface OrderData {
lanshouRegion
?:
string
lanshouRegion
?:
string
lanshouAddress
?:
string
lanshouAddress
?:
string
lanshouPost
?:
string
lanshouPost
?:
string
totolBuyNumber
?:
string
updateTime
?:
string
updateTime
?:
string
createTime
?:
string
createTime
?:
string
productAmount
?:
string
internalMemoList
?:
MemoList
[]
internalMemoList
?:
MemoList
[]
substrateAreaName
?:
string
substrateAreaName
?:
string
productList
?:
ProductList
[]
productList
?:
ProductList
[]
...
...
src/views/DeliveryNotePage.vue
View file @
e1c4596f
...
@@ -356,7 +356,7 @@ const onConfirmDateRange = async () => {
...
@@ -356,7 +356,7 @@ const onConfirmDateRange = async () => {
}
}
btnLoading
.
value
=
true
btnLoading
.
value
=
true
try
{
try
{
const
res
=
await
printDeliveryNote
(
dateRange
.
value
)
const
res
=
await
printDeliveryNote
(
dateRange
.
value
,
searchForm
.
value
?.
userMark
)
window
.
open
(
filePath
+
res
.
message
)
window
.
open
(
filePath
+
res
.
message
)
dateRange
.
value
=
[]
dateRange
.
value
=
[]
dialogVisible
.
value
=
false
dialogVisible
.
value
=
false
...
...
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