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
bfeaf32e
Commit
bfeaf32e
authored
May 07, 2024
by
qinjianhui
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 发货单管理开发
parent
cb427077
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
174 additions
and
9 deletions
+174
-9
components.d.ts
+1
-0
src/api/auth.ts
+14
-6
src/api/order.ts
+53
-3
src/router/index.ts
+5
-0
src/router/menu.ts
+5
-0
src/types/api/deliveryNote.ts
+96
-0
src/views/DeliveryNotePage.vue
+0
-0
No files found.
components.d.ts
View file @
bfeaf32e
...
...
@@ -11,6 +11,7 @@ declare module 'vue' {
ElCheckbox
:
typeof
import
(
'element-plus/es'
)[
'ElCheckbox'
]
ElCol
:
typeof
import
(
'element-plus/es'
)[
'ElCol'
]
ElConfigProvider
:
typeof
import
(
'element-plus/es'
)[
'ElConfigProvider'
]
ElDatePicker
:
typeof
import
(
'element-plus/es'
)[
'ElDatePicker'
]
ElDialog
:
typeof
import
(
'element-plus/es'
)[
'ElDialog'
]
ElDrawer
:
typeof
import
(
'element-plus/es'
)[
'ElDrawer'
]
ElDropdown
:
typeof
import
(
'element-plus/es'
)[
'ElDropdown'
]
...
...
src/api/auth.ts
View file @
bfeaf32e
...
...
@@ -2,6 +2,7 @@ import { BasePaginationData, BaseRespData } from '@/types/api'
import
axios
from
'./axios'
import
{
LoginReq
,
LoginResp
}
from
'@/types/api/auth'
import
{
UserEditForm
,
userData
,
userSearchForm
}
from
'@/types/api/user'
import
{
NameSpaceList
}
from
'@/types/api/deliveryNote'
export
function
loginApi
(
data
:
LoginReq
)
{
return
axios
.
post
<
never
,
LoginResp
>
(
'/factory/login'
,
data
)
...
...
@@ -62,10 +63,17 @@ export function getDetailsByIdApi(id: number) {
}
// 切换用户状态
export
function
changeUserStatusApi
(
status
:
number
,
id
:
number
)
{
return
axios
.
get
<
never
,
BaseRespData
<
never
>>
(
'factory/factoryUser/enableDisable'
,{
params
:
{
status
,
id
}
})
return
axios
.
get
<
never
,
BaseRespData
<
never
>>
(
'factory/factoryUser/enableDisable'
,
{
params
:
{
status
,
id
,
},
},
)
}
export
function
getUserNameSpaceList
()
{
return
axios
.
get
<
never
,
BaseRespData
<
NameSpaceList
[]
>>
(
'dbDiyUser/getList'
)
}
src/api/order.ts
View file @
bfeaf32e
...
...
@@ -9,8 +9,13 @@ import {
ShipmentForm
,
ShipmentOrderRes
,
Tab
,
InspectionData
InspectionData
,
}
from
'@/types/api/order'
import
{
DeliveryNoteData
,
DeliveryNoteSearchForm
,
ProductionOrder
,
}
from
'@/types/api/deliveryNote'
export
function
getOrderList
(
data
:
SearchForm
,
...
...
@@ -93,10 +98,10 @@ export function getQaOrderBySubOrderNumber(orderNumber: string) {
)
}
// 质检完成
export
function
qaFinishedApi
(
data
:
InspectionData
[])
{
export
function
qaFinishedApi
(
data
:
InspectionData
[])
{
return
axios
.
post
<
never
,
BaseRespData
<
never
>>
(
'factory/customJomallOrder/inspection'
,
data
data
,
)
}
...
...
@@ -167,3 +172,48 @@ export function refreshProductInfo(data: number[]) {
data
,
)
}
export
function
getDeliveryNoteList
(
data
:
DeliveryNoteSearchForm
,
currentPage
:
number
,
pageSize
:
number
,
)
{
return
axios
.
post
<
never
,
BasePaginationData
<
DeliveryNoteData
>>
(
'factory/customJomallShipment/list_page'
,
{
...
data
,
currentPage
,
pageSize
,
},
)
}
export
function
printDeliveryNote
(
data
:
string
[])
{
return
axios
.
post
<
never
,
BaseRespData
<
never
>>
(
'factory/customJomallShipment/printInvoiceStatistics'
,
{
startTime
:
data
&&
data
[
0
],
endTime
:
data
&&
data
[
1
],
},
)
}
export
function
getProductionOrderList
(
subOrderNumber
:
string
)
{
return
axios
.
get
<
never
,
BaseRespData
<
ProductionOrder
>>
(
'customJomallOrderProduct/getBySubOrderNumber'
,
{
params
:
{
subOrderNumber
,
},
},
)
}
export
function
getOrderByIdApi
(
id
?:
number
)
{
return
axios
.
get
<
never
,
BaseRespData
<
OrderData
>>
(
'factory/customJomallOrder/getOrderById'
,
{
params
:
{
id
,
},
},
)
}
src/router/index.ts
View file @
bfeaf32e
...
...
@@ -9,6 +9,7 @@ import OrderList from '@/views/order/index.vue'
import
ProductionComplete
from
'@/views/production/complete.vue'
import
{
getToken
}
from
'@/api/axios'
import
UserPage
from
'@/views/UserPage.vue'
import
DeliveryNotePage
from
'@/views/DeliveryNotePage.vue'
const
router
=
createRouter
({
history
:
createWebHistory
(),
...
...
@@ -33,6 +34,10 @@ const router = createRouter({
{
path
:
'/system/user'
,
component
:
UserPage
},
{
path
:
'/system/delivery-note'
,
component
:
DeliveryNotePage
}
],
},
...
...
src/router/menu.ts
View file @
bfeaf32e
...
...
@@ -25,6 +25,11 @@ const menu: MenuItem[] = [
index
:
'/system/user'
,
id
:
4
,
label
:
'用户管理'
,
},
{
index
:
'/system/delivery-note'
,
id
:
5
,
label
:
'发货单管理'
,
}
]
},
...
...
src/types/api/deliveryNote.ts
0 → 100644
View file @
bfeaf32e
export
interface
DeliveryNoteSearchForm
{
subOrderNumber
?:
string
billNumber
?:
number
startTime
?:
string
endTime
?:
string
logisticsTracking
?:
string
lanshouName
?:
string
orderNumber
?:
string
namespace
?:
string
shippingWay
?:
number
}
export
interface
DeliveryNoteData
{
id
:
number
billNumber
?:
string
shippingWay
?:
number
addressId
?:
number
carriageAmount
?:
number
|
string
carriageName
?:
string
logisticsTracking
?:
string
shippingStatus
?:
number
lanshouName
?:
string
lanshouPhone
?:
string
lanshouRegion
?:
string
lanshouAddress
?:
string
lanshouPost
?:
string
inspectionStatus
?:
boolean
facotoryNo
?:
number
updateTime
?:
string
createTime
?:
string
subOrderNumber
?:
string
detailList
:
DetailList
[]
}
export
interface
DetailList
{
id
:
number
shipmentId
?:
number
customOrderId
?:
number
customOrderNumber
?:
string
subOrderNumber
?:
string
baseSku
?:
string
variantSku
?:
string
variantImage
?:
string
shipmentNum
?:
number
passNum
?:
number
notPassNum
?:
number
inspectionStatus
?:
boolean
updateTime
?:
string
createTime
?:
string
productionNum
?:
number
notShipmentNum
?:
number
productName
?:
string
facotoryNo
?:
string
|
number
billNumber
?:
string
|
number
}
export
interface
NameSpaceList
{
id
:
number
sku
?:
string
name
?:
string
password
?:
string
imgUrl
?:
string
chimaStatus
?:
number
status
?:
number
createDate
?:
string
updateDate
?:
string
}
export
interface
ProductionOrder
{
id
:
number
erpId
?:
number
customOrderId
?:
number
subOrderNumber
?:
string
erpSubOrderNumber
?:
string
erpOrderId
?:
number
erpOrderItemId
?:
number
erpProductItemId
?:
number
shopNumber
?:
number
baseSku
?:
string
variantSku
?:
string
variantImage
?:
string
chimaId
?:
string
diyId
?:
string
endProductId
?:
string
num
?:
number
printType
?:
number
version
?:
number
shipmentNum
?:
number
price
?:
number
productName
?:
string
weight
?:
number
createTime
?:
string
updateTime
?:
string
notPassNum
?:
number
passNum
?:
number
}
src/views/DeliveryNotePage.vue
0 → 100644
View file @
bfeaf32e
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