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
f7da650f
Commit
f7da650f
authored
Oct 23, 2025
by
linjinhong
Committed by
qinjianhui
Oct 23, 2025
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:修改列表字段"erp"为"erp推送"
parent
c2fd61dc
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
33 additions
and
24 deletions
+33
-24
src/views/order/podCN/index.vue
+4
-3
src/views/order/podUs/index.vue
+29
-21
No files found.
src/views/order/podCN/index.vue
View file @
f7da650f
...
@@ -1347,9 +1347,10 @@
...
@@ -1347,9 +1347,10 @@
<span
class=
"order-detail-item-value"
>
<span
class=
"order-detail-item-value"
>
{{
{{
row
.
source
row
.
source
?
{
'jomall-erp'
:
'erp'
,
'third-party'
:
'第三方推送'
}
[
?
{
row
.
source
as
'jomall-erp'
|
'third-party'
'jomall-erp'
:
'erp推送'
,
]
'third-party'
:
'第三方推送'
,
}
[
row
.
source
as
'jomall-erp'
|
'third-party'
]
:
''
:
''
}}
}}
<
/span
>
<
/span
>
...
...
src/views/order/podUs/index.vue
View file @
f7da650f
<
template
>
<
template
>
<div
class=
"card flex-column h-100 overflow-hidden"
>
<div
class=
"card flex-column h-100 overflow-hidden"
>
<div
class=
"header-filter-form"
>
<div
class=
"header-filter-form"
>
<ElForm
class=
"search-form"
label-position=
"right"
label-width=
"70px"
:model=
"searchForm"
size=
"default"
inline
>
<ElForm
class=
"search-form"
label-position=
"right"
label-width=
"70px"
:model=
"searchForm"
size=
"default"
inline
>
<!--
<div>
-->
<!--
<div>
-->
<ElFormItem
label=
"仓库"
>
<ElFormItem
label=
"仓库"
>
<ElSelect
<ElSelect
...
@@ -126,8 +133,8 @@
...
@@ -126,8 +133,8 @@
v-model=
"searchForm.customizedQuantity"
v-model=
"searchForm.customizedQuantity"
@
click
.
stop=
"(e: Event) => handleRadioGroupClick(e)"
@
click
.
stop=
"(e: Event) => handleRadioGroupClick(e)"
>
>
<el-radio-button
label=
"single"
>
单面
</el-radio-button>
<el-radio-button
label=
"single"
>
单面
</el-radio-button>
<el-radio-button
label=
"multiple"
>
多面
</el-radio-button>
<el-radio-button
label=
"multiple"
>
多面
</el-radio-button>
</el-radio-group>
</el-radio-group>
</ElFormItem>
</ElFormItem>
<ElFormItem
label=
"数量"
>
<ElFormItem
label=
"数量"
>
...
@@ -322,7 +329,7 @@
...
@@ -322,7 +329,7 @@
style=
"width: 150px"
style=
"width: 150px"
>
>
<ElOption
<ElOption
v-for=
"(item, index) in logisticsWayList
"
v-for=
"(item, index) in logisticsWayList"
:key=
"index"
:key=
"index"
:value=
"item.id"
:value=
"item.id"
:label=
"item.name"
:label=
"item.name"
...
@@ -338,7 +345,7 @@
...
@@ -338,7 +345,7 @@
style=
"width: 150px"
style=
"width: 150px"
>
>
<ElOption
<ElOption
v-for=
"(item, index) in sourceList
"
v-for=
"(item, index) in sourceList"
:key=
"index"
:key=
"index"
:value=
"item.id"
:value=
"item.id"
:label=
"item.name"
:label=
"item.name"
...
@@ -1508,9 +1515,10 @@
...
@@ -1508,9 +1515,10 @@
<span
class=
"order-detail-item-value"
>
<span
class=
"order-detail-item-value"
>
{{
{{
row
.
source
row
.
source
?
{
'jomall-erp'
:
'erp'
,
'third-party'
:
'第三方推送'
}
[
?
{
row
.
source
as
'jomall-erp'
|
'third-party'
'jomall-erp'
:
'erp推送'
,
]
'third-party'
:
'第三方推送'
,
}
[
row
.
source
as
'jomall-erp'
|
'third-party'
]
:
''
:
''
}}
}}
<
/span
>
<
/span
>
...
@@ -2899,7 +2907,8 @@ import {
...
@@ -2899,7 +2907,8 @@ import {
changeToFinished
,
changeToFinished
,
updateTrackingNumberAndRegister
,
updateTrackingNumberAndRegister
,
countTrackRegisterApi
,
countTrackRegisterApi
,
getCustomTagListApi
,
getLogisticsWayApi
,
getCustomTagListApi
,
getLogisticsWayApi
,
}
from
'@/api/podUsOrder'
}
from
'@/api/podUsOrder'
import
{
BaseRespData
}
from
'@/types/api'
import
{
BaseRespData
}
from
'@/types/api'
...
@@ -2971,18 +2980,18 @@ declare global {
...
@@ -2971,18 +2980,18 @@ declare global {
}
}
const
sourceList
=
[
const
sourceList
=
[
{
{
name
:
'erp推送'
,
name
:
'erp推送'
,
id
:
'jomall-erp'
id
:
'jomall-erp'
,
}
,
}
,
{
{
name
:
'第三方推送'
,
name
:
'第三方推送'
,
id
:
'third-party'
id
:
'third-party'
,
}
}
,
]
]
const
tabsNav
=
ref
<
Tab
[]
>
()
const
tabsNav
=
ref
<
Tab
[]
>
()
const
isAuto
=
ref
(
true
)
const
isAuto
=
ref
(
true
)
const
countryList
=
ref
([])
const
countryList
=
ref
([])
const
logisticsWayList
=
ref
<
{
name
:
string
,
id
:
number
}
[]
>
([])
const
logisticsWayList
=
ref
<
{
name
:
string
;
id
:
number
}
[]
>
([])
const
currentRow
=
ref
<
AddressInfo
>
({
const
currentRow
=
ref
<
AddressInfo
>
({
receiverName
:
''
,
receiverName
:
''
,
receiverPhone
:
''
,
receiverPhone
:
''
,
...
@@ -6169,8 +6178,8 @@ const getTagName = (row: ProductList) => {
...
@@ -6169,8 +6178,8 @@ const getTagName = (row: ProductList) => {
:
''
:
''
}
}
const
getLogisticsWay
=
async
()
=>
{
const
getLogisticsWay
=
async
()
=>
{
const
{
data
}
=
await
getLogisticsWayApi
()
const
{
data
}
=
await
getLogisticsWayApi
()
logisticsWayList
.
value
=
data
logisticsWayList
.
value
=
data
}
}
...
@@ -6525,15 +6534,14 @@ useRouter().beforeEach((to, from, next) => {
...
@@ -6525,15 +6534,14 @@ useRouter().beforeEach((to, from, next) => {
color
:
white
;
color
:
white
;
font
-
weight
:
bold
;
font
-
weight
:
bold
;
}
}
.
search
-
form
{
.
search
-
form
{
::
v
-
deep
.
el
-
radio
-
button
{
::
v
-
deep
.
el
-
radio
-
button
{
width
:
75
px
;
width
:
75
px
;
.
el
-
radio
-
button__inner
{
.
el
-
radio
-
button__inner
{
width
:
100
%
;
width
:
100
%
;
}
}
}
}
}
}
<
/style
>
<
/style
>
<
style
lang
=
"scss"
>
<
style
lang
=
"scss"
>
.
customize
-
select
-
style
{
.
customize
-
select
-
style
{
...
...
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