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
43607540
Commit
43607540
authored
May 13, 2025
by
wuqian
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
局部印对账
parent
e3d872de
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
127 additions
and
65 deletions
+127
-65
src/api/order.ts
+75
-25
src/types/api/billOrder.ts
+10
-6
src/types/api/deliveryNote.ts
+28
-20
src/types/api/index.ts
+14
-14
src/views/podBillOrder/index.vue
+0
-0
No files found.
src/api/order.ts
View file @
43607540
import
{
BasePaginationData
,
BaseRespData
,
RejectParams
}
from
'@/types/api'
import
{
BasePaginationData
,
BaseRespData
,
RejectParams
}
from
'@/types/api'
import
axios
from
'./axios'
import
axios
from
'./axios'
import
{
PaymentForm
}
from
'@/types/api/index.ts'
import
{
PaymentForm
}
from
'@/types/api/index.ts'
import
{
import
{
LogListData
,
LogListData
,
OrderData
,
OrderData
,
...
@@ -16,9 +16,11 @@ import {
...
@@ -16,9 +16,11 @@ import {
apiSubmitPodOrderForm
,
apiSubmitPodOrderForm
,
DeliveryNoteData
,
DeliveryNoteData
,
DeliveryNoteSearchForm
,
DeliveryNoteSearchForm
,
DetailForm
,
LogListsData
,
DetailForm
,
LogListsData
,
ProductionOrder
,
ProductionOrder
,
ShipmentOrderDetailData
,
updatePriceForm
,
ShipmentOrderDetailData
,
updatePriceForm
,
}
from
'@/types/api/deliveryNote'
}
from
'@/types/api/deliveryNote'
import
{
import
{
AccountStatementNote
,
AccountStatementNote
,
...
@@ -366,11 +368,14 @@ export function exportExcelApi(ids: string) {
...
@@ -366,11 +368,14 @@ export function exportExcelApi(ids: string) {
})
})
}
}
export
function
exportPodExcelApi
(
ids
:
string
)
{
export
function
exportPodExcelApi
(
ids
:
string
)
{
return
axios
.
get
<
never
,
BaseRespData
<
never
>>
(
'pod/podReconciliation/exportExcel'
,
{
return
axios
.
get
<
never
,
BaseRespData
<
never
>>
(
params
:
{
'pod/podReconciliation/exportExcel'
,
ids
,
{
params
:
{
ids
,
},
},
},
}
)
)
}
}
export
function
getShipmentDetailsById
(
data
:
DetailForm
)
{
export
function
getShipmentDetailsById
(
data
:
DetailForm
)
{
return
axios
.
post
<
never
,
BasePaginationData
<
BillOrderDetailData
>>
(
return
axios
.
post
<
never
,
BasePaginationData
<
BillOrderDetailData
>>
(
...
@@ -382,12 +387,14 @@ export function apiupdateByPodExcel(formData: never) {
...
@@ -382,12 +387,14 @@ export function apiupdateByPodExcel(formData: never) {
return
axios
.
post
(
'pod/podReconciliation/updateByExcel'
,
formData
,
{
return
axios
.
post
(
'pod/podReconciliation/updateByExcel'
,
formData
,
{
headers
:
{
headers
:
{
'Content-Type'
:
'multipart/form-data'
,
'Content-Type'
:
'multipart/form-data'
,
},
},
})
})
}
}
export
function
apiRejectedPodReconciliation
(
params
?:
RejectParams
)
{
export
function
apiRejectedPodReconciliation
(
params
?:
RejectParams
)
{
return
axios
.
post
<
never
,
BaseRespData
<
never
>>
(
'pod/podReconciliation/rejectedLocal'
,
params
)
return
axios
.
post
<
never
,
BaseRespData
<
never
>>
(
'pod/podReconciliation/rejectedLocal'
,
params
,
)
}
}
export
function
getPodShipmentDetailsById
(
data
:
DetailForm
)
{
export
function
getPodShipmentDetailsById
(
data
:
DetailForm
)
{
return
axios
.
post
<
never
,
BasePaginationData
<
BillOrderDetailData
>>
(
return
axios
.
post
<
never
,
BasePaginationData
<
BillOrderDetailData
>>
(
...
@@ -396,27 +403,45 @@ export function getPodShipmentDetailsById(data: DetailForm) {
...
@@ -396,27 +403,45 @@ export function getPodShipmentDetailsById(data: DetailForm) {
)
)
}
}
export
function
apiLogList
(
id
?:
number
)
{
export
function
apiLogList
(
id
?:
number
)
{
return
axios
.
get
<
never
,
BaseRespData
<
LogListsData
[]
>>
(
'pod/podReconciliation/getLog'
,
{
params
:{
id
}
})
return
axios
.
get
<
never
,
BaseRespData
<
LogListsData
[]
>>
(
'pod/podReconciliation/getLog'
,
{
params
:
{
id
}
},
)
}
}
export
function
apiItemLogList
(
id
?:
number
)
{
export
function
apiItemLogList
(
id
?:
number
)
{
return
axios
.
get
<
never
,
BaseRespData
<
LogListsData
[]
>>
(
'pod/podReconciliation/getItemLog'
,
{
params
:{
id
}
})
return
axios
.
get
<
never
,
BaseRespData
<
LogListsData
[]
>>
(
'pod/podReconciliation/getItemLog'
,
{
params
:
{
id
}
},
)
}
}
export
function
apiSubmitPodOrder
(
params
:
apiSubmitPodOrderForm
)
{
export
function
apiSubmitPodOrder
(
params
:
apiSubmitPodOrderForm
)
{
return
axios
.
get
<
never
,
BaseRespData
<
ShipmentOrderDetailData
>>
(
'pod/podReconciliation/create'
,
{
params
})
return
axios
.
get
<
never
,
BaseRespData
<
ShipmentOrderDetailData
>>
(
'pod/podReconciliation/create'
,
{
params
},
)
}
}
export
function
apiPodBillSubmit
(
ids
:
number
[])
{
export
function
apiPodBillSubmit
(
ids
:
number
[])
{
return
axios
.
post
<
never
,
BaseRespData
<
ShipmentOrderDetailData
>>
(
'pod/podReconciliation/submission'
,
{
ids
})
return
axios
.
post
<
never
,
BaseRespData
<
ShipmentOrderDetailData
>>
(
'pod/podReconciliation/submission'
,
{
ids
},
)
}
}
export
function
apiPodUpdatePrice
(
data
:
updatePriceForm
)
{
export
function
apiPodUpdatePrice
(
data
:
updatePriceForm
)
{
return
axios
.
get
<
never
,
BaseRespData
<
never
>>
(
'pod/podReconciliation/updatePrice'
,
{
params
:
data
})
return
axios
.
get
<
never
,
BaseRespData
<
never
>>
(
'pod/podReconciliation/updatePrice'
,
{
params
:
data
},
)
}
}
export
function
updateRecPrice
(
data
:
updatePriceForm
)
{
export
function
updateRecPrice
(
data
:
updatePriceForm
)
{
return
axios
.
get
<
never
,
BaseRespData
<
never
>>
(
'pod/podReconciliation/updateRecPrice'
,
{
params
:
data
})
return
axios
.
get
<
never
,
BaseRespData
<
never
>>
(
'pod/podReconciliation/updateRecPrice'
,
{
params
:
data
},
)
}
}
export
function
getLogListApi
(
id
?:
number
)
{
export
function
getLogListApi
(
id
?:
number
)
{
...
@@ -426,9 +451,12 @@ export function getLogListApi(id?: number) {
...
@@ -426,9 +451,12 @@ export function getLogListApi(id?: number) {
}
}
export
function
getPodLogListApi
(
id
?:
number
)
{
export
function
getPodLogListApi
(
id
?:
number
)
{
return
axios
.
get
<
never
,
BaseRespData
<
LogList
[]
>>
(
'pod/podReconciliation/getLog'
,
{
return
axios
.
get
<
never
,
BaseRespData
<
LogList
[]
>>
(
params
:
{
id
},
'pod/podReconciliation/getLog'
,
})
{
params
:
{
id
},
},
)
}
}
export
function
auditOrderApi
(
url
:
string
,
data
:
string
)
{
export
function
auditOrderApi
(
url
:
string
,
data
:
string
)
{
return
axios
.
get
(
url
,
{
return
axios
.
get
(
url
,
{
...
@@ -453,11 +481,34 @@ export function confirmOrderApi(data: ConfirmOrderForm) {
...
@@ -453,11 +481,34 @@ export function confirmOrderApi(data: ConfirmOrderForm) {
}
}
export
function
confirmPodOrderApi
(
data
:
ConfirmOrderForm
)
{
export
function
confirmPodOrderApi
(
data
:
ConfirmOrderForm
)
{
return
axios
.
post
<
never
,
BaseRespData
<
never
>>
(
'pod/podReconciliation/confirm'
,
data
)
return
axios
.
post
<
never
,
BaseRespData
<
never
>>
(
'pod/podReconciliation/confirm'
,
data
,
)
}
}
export
function
apiRejectionOfReview
({
export
function
apiBillPodPayment
(
data
:
PaymentForm
)
{
ids
,
return
axios
.
get
<
never
,
BaseRespData
<
never
>>
(
'pod/podReconciliation/payment'
,
{
params
:
data
})
description
,
recNumbers
,
}:
{
ids
:
string
recNumbers
:
string
description
:
string
})
{
return
axios
.
post
<
never
,
BaseRespData
<
never
>>
(
'pod/podReconciliation/rejectionOfReview'
,
{
ids
,
description
,
recNumbers
,
},
)
}
export
function
apiBillPodPayment
(
data
:
PaymentForm
)
{
return
axios
.
post
<
never
,
BaseRespData
<
never
>>
(
'pod/podReconciliation/payment'
,
data
,
)
}
}
export
function
rejectOrderApi
({
export
function
rejectOrderApi
({
ids
,
ids
,
...
@@ -474,4 +525,3 @@ export function rejectOrderApi({
...
@@ -474,4 +525,3 @@ export function rejectOrderApi({
pass
,
pass
,
})
})
}
}
src/types/api/billOrder.ts
View file @
43607540
...
@@ -29,6 +29,7 @@ export interface AccountStatementNote {
...
@@ -29,6 +29,7 @@ export interface AccountStatementNote {
pass_num
?:
number
pass_num
?:
number
factory_code
?:
string
factory_code
?:
string
total_amount
?:
string
|
number
total_amount
?:
string
|
number
actual_amount
?:
string
|
number
num
?:
number
num
?:
number
end_time
?:
string
end_time
?:
string
rec_number
?:
string
rec_number
?:
string
...
@@ -43,6 +44,9 @@ export interface AccountStatementNote {
...
@@ -43,6 +44,9 @@ export interface AccountStatementNote {
id
?:
number
id
?:
number
erp_total_amount
?:
number
erp_total_amount
?:
number
dataVersion
:
''
dataVersion
:
''
water_list
?:
{
url
:
string
|
undefined
}[]
}
}
export
interface
BillOrderDetailData
{
export
interface
BillOrderDetailData
{
create_time
?:
string
create_time
?:
string
...
@@ -69,11 +73,11 @@ export interface LogList {
...
@@ -69,11 +73,11 @@ export interface LogList {
create_time
?:
string
create_time
?:
string
info_id
?:
number
info_id
?:
number
id
:
string
id
:
string
diy_id
:
number
;
diy_id
:
number
employee_account
?:
string
;
employee_account
?:
string
employee_name
?:
string
;
employee_name
?:
string
employee_id
?:
string
;
employee_id
?:
string
description
?:
string
;
description
?:
string
}
}
export
interface
ItemList
{
export
interface
ItemList
{
...
@@ -95,5 +99,5 @@ export interface ItemList {
...
@@ -95,5 +99,5 @@ export interface ItemList {
export
interface
ConfirmOrderForm
{
export
interface
ConfirmOrderForm
{
pass
?:
number
|
null
pass
?:
number
|
null
description
?:
string
description
?:
string
ids
?:
string
ids
?:
string
}
}
src/types/api/deliveryNote.ts
View file @
43607540
...
@@ -183,21 +183,29 @@ export interface DbFactory {
...
@@ -183,21 +183,29 @@ export interface DbFactory {
status
?:
number
status
?:
number
}
}
export
interface
LogListsData
{
export
interface
LogListsData
{
id
:
number
;
id
:
number
diy_id
:
number
;
diy_id
:
number
employee_account
?:
string
;
employee_account
?:
string
employee_name
?:
string
;
employee_name
?:
string
employee_id
?:
string
;
employee_id
?:
string
description
?:
string
;
description
?:
string
create_time
?:
string
;
create_time
?:
string
}
export
interface
LogListData
{
id
?:
string
|
number
|
null
infoId
?:
number
employeeId
?:
number
employeeAccount
?:
string
description
?:
string
createTime
?:
string
}
}
export
interface
DetailForm
{
export
interface
DetailForm
{
billNumber
?:
string
billNumber
?:
string
orderNumber
?:
string
orderNumber
?:
string
shipmentNumber
?:
string
shipmentNumber
?:
string
dateRange
?:
string
[]
dateRange
?:
string
[]
endTime
?:
string
endTime
?:
string
startTime
?:
string
startTime
?:
string
subOrderNumber
?:
string
subOrderNumber
?:
string
rows
?:
number
rows
?:
number
page
?:
number
page
?:
number
...
@@ -205,15 +213,15 @@ export interface DetailForm {
...
@@ -205,15 +213,15 @@ export interface DetailForm {
infoId
?:
number
infoId
?:
number
}
}
export
interface
BillForm
{
export
interface
BillForm
{
timeRange
:
[
string
,
string
]
|
[]
;
timeRange
:
[
string
,
string
]
|
[]
}
}
export
interface
apiSubmitPodOrderForm
{
export
interface
apiSubmitPodOrderForm
{
startDate
?:
string
;
startDate
?:
string
endDate
?:
string
;
endDate
?:
string
}
}
export
interface
updatePriceForm
{
export
interface
updatePriceForm
{
ids
?:
string
;
ids
?:
string
infoId
?:
number
;
infoId
?:
number
price
?:
string
;
price
?:
string
}
}
src/types/api/index.ts
View file @
43607540
export
interface
BaseRespData
<
D
>
{
export
interface
BaseRespData
<
D
>
{
code
:
number
code
:
number
message
?:
string
message
?:
string
...
@@ -14,7 +13,7 @@ export interface PaginationData<D> {
...
@@ -14,7 +13,7 @@ export interface PaginationData<D> {
current
:
number
current
:
number
records
:
D
[]
records
:
D
[]
}
}
export
interface
Statistics
<
D
>
{
export
interface
Statistics
<
D
>
{
sumNotPassNum
:
number
sumNotPassNum
:
number
sumPassNum
:
number
sumPassNum
:
number
sumShipmentNum
:
number
sumShipmentNum
:
number
...
@@ -30,20 +29,21 @@ export interface Statistics<D> {
...
@@ -30,20 +29,21 @@ export interface Statistics<D> {
export
type
BasePaginationData
<
D
>
=
BaseRespData
<
PaginationData
<
D
>>
export
type
BasePaginationData
<
D
>
=
BaseRespData
<
PaginationData
<
D
>>
export
type
StatisticsData
<
D
>
=
BaseRespData
<
Statistics
<
D
>>
export
type
StatisticsData
<
D
>
=
BaseRespData
<
Statistics
<
D
>>
export
interface
baseRes
{
export
interface
baseRes
{
code
:
number
code
:
number
msg
:
string
msg
:
string
}
}
export
interface
PaymentForm
{
export
interface
PaymentForm
{
waterList
:
string
waterList
:
string
id
?:
number
|
string
id
?:
number
|
string
actualAmount
?:
number
|
string
actualAmount
?:
number
|
string
payableAmount
?:
number
|
string
payableAmount
?:
number
|
string
recNumber
?:
number
|
string
}
}
export
interface
RejectParams
{
export
interface
RejectParams
{
id
:
number
id
:
number
description
?:
string
description
?:
string
ids
?:
string
ids
?:
string
pass
?:
number
pass
?:
number
}
}
src/views/podBillOrder/index.vue
View file @
43607540
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