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
8ed3c797
Commit
8ed3c797
authored
Mar 14, 2024
by
qinjianhui
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 获取物流接口修改
parent
a715c3c5
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
26 deletions
+15
-26
src/api/common.ts
+1
-6
src/types/api/order.ts
+1
-1
src/views/order/index.vue
+13
-19
No files found.
src/api/common.ts
View file @
8ed3c797
...
...
@@ -3,13 +3,8 @@ import axios from './axios'
import
{
LogisticsData
}
from
'@/types/api/order'
// 获取物流公司
export
function
getLogisticsCompanyList
(
query
?:
string
)
{
export
function
getLogisticsCompanyList
()
{
return
axios
.
get
<
never
,
BaseRespData
<
LogisticsData
[]
>>
(
'factory/customJomallOrder/getLogisticsList'
,
{
params
:
{
name
:
query
,
},
},
)
}
src/types/api/order.ts
View file @
8ed3c797
...
...
@@ -3,10 +3,10 @@ import type { TableColumnCtx } from 'element-plus'
export
interface
SearchForm
{
mainSku
:
string
endProductId
:
string
orderOnlineNo
:
string
shopNumber
:
string
internalMemo
:
string
status
?:
number
erpOrderNumber
:
string
}
export
interface
Tab
{
status
:
string
...
...
src/views/order/index.vue
View file @
8ed3c797
...
...
@@ -21,7 +21,7 @@
</ElFormItem>
<ElFormItem
label=
"第三方订单号"
>
<ElInput
v-model=
"searchForm.
orderOnlineNo
"
v-model=
"searchForm.
erpOrderNumber
"
placeholder=
"请输入第三方订单号"
clearable
style=
"width: 160px"
...
...
@@ -260,9 +260,9 @@
<
span
class
=
"value"
>
{{
scope
.
row
.
orderNumber
}}
<
/span
>
<
/div
>
<
div
class
=
"order-detail_item"
>
<
span
class
=
"label"
>
工厂
:
<
/span
>
<
span
class
=
"value"
:
title
=
"scope.row.
facotoryNo
"
>
{{
scope
.
row
.
facotoryNo
||
'--'
<
span
class
=
"label"
>
第三方订单号
:
<
/span
>
<
span
class
=
"value"
:
title
=
"scope.row.
erpOrderNumber
"
>
{{
scope
.
row
.
erpOrderNumber
||
'--'
}}
<
/span
>
<
/div
>
<
div
class
=
"order-detail_item"
>
...
...
@@ -367,13 +367,9 @@
<
ElSelect
v
-
model
=
"shipmentForm.carriageName"
filterable
remote
reserve
-
keyword
placeholder
=
"请输入关键字"
clearable
remote
-
show
-
suffix
style
=
"width: 100%"
:
remote
-
method
=
"getLogisticsList"
>
<
ElOption
v
-
for
=
"item in logisticsCompanyList"
...
...
@@ -481,15 +477,14 @@ import ProductInfo from './ProductInfo.vue'
import
SendOrder
from
'./SendOrder.vue'
import
LogList
from
'@/components/LogList.vue'
import
OrderDetail
from
'./OrderDetail.vue'
import
{
debounce
}
from
'lodash-es'
import
useShipment
from
'./hook/useShipment'
const
[
searchForm
,
resetSearchForm
]
=
useValue
<
SearchForm
>
({
mainSku
:
''
,
endProductId
:
''
,
orderOnlineNo
:
''
,
shopNumber
:
''
,
internalMemo
:
''
,
erpOrderNumber
:
''
,
}
)
const
tabsNav
=
ref
<
Tab
[]
>
([])
...
...
@@ -564,18 +559,17 @@ const {
}
)
onMounted
(()
=>
{
loadTabData
()
getLogisticsList
()
}
)
// 获取物流公司
const
getLogisticsList
=
debounce
(
async
(
query
?:
string
)
=>
{
if
(
query
)
{
try
{
const
res
=
await
getLogisticsCompanyList
(
query
)
logisticsCompanyList
.
value
=
res
.
data
}
catch
(
error
)
{
showError
(
error
)
}
const
getLogisticsList
=
async
()
=>
{
try
{
const
res
=
await
getLogisticsCompanyList
()
logisticsCompanyList
.
value
=
res
.
data
}
catch
(
error
)
{
showError
(
error
)
}
}
,
500
)
}
const
sendOrderList
=
ref
<
SendOrderData
[]
>
([])
const
sendOrderVisible
=
ref
(
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