Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jiedao-app-operator-master
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lanbaoming
jiedao-app-operator-master
Commits
3f7b43f0
Commit
3f7b43f0
authored
Dec 31, 2022
by
huhaiqing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
海运国际化补全
parent
050ee02c
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
26 additions
and
23 deletions
+26
-23
index.vue
src/components/RightToolbar/index.vue
+5
-5
index.vue
src/components/WarehouseAreaDialog/index.vue
+6
-6
en_US.json
src/i18n/languages/en_US.json
+7
-1
index.js
src/router/index.js
+4
-4
indexFutureBox.vue
src/views/ecw/box/indexFutureBox.vue
+3
-4
indexSea.vue
src/views/ecw/box/indexSea.vue
+0
-1
query.vue
src/views/ecw/box/query.vue
+1
-1
cusDeclaration.vue
src/views/ecw/box/shippingSea/nodePage/cusDeclaration.vue
+0
-1
No files found.
src/components/RightToolbar/index.vue
View file @
3f7b43f0
<
template
>
<
template
>
<div
class=
"top-right-btn"
>
<div
class=
"top-right-btn"
>
<el-row>
<el-row>
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"showSearch ?
'隐藏搜索' : '显示搜索'
"
placement=
"top"
>
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"showSearch ?
$t('隐藏搜索') : $t('显示搜索')
"
placement=
"top"
>
<el-button
size=
"mini"
circle
icon=
"el-icon-search"
@
click=
"toggleSearch()"
/>
<el-button
size=
"mini"
circle
icon=
"el-icon-search"
@
click=
"toggleSearch()"
/>
</el-tooltip>
</el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"刷新
"
placement=
"top"
>
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"$t('刷新')
"
placement=
"top"
>
<el-button
size=
"mini"
circle
icon=
"el-icon-refresh"
@
click=
"refresh()"
/>
<el-button
size=
"mini"
circle
icon=
"el-icon-refresh"
@
click=
"refresh()"
/>
</el-tooltip>
</el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"显隐列
"
placement=
"top"
v-if=
"columns"
>
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"$t('显隐列')
"
placement=
"top"
v-if=
"columns"
>
<el-button
size=
"mini"
circle
icon=
"el-icon-menu"
@
click=
"showColumn()"
/>
<el-button
size=
"mini"
circle
icon=
"el-icon-menu"
@
click=
"showColumn()"
/>
</el-tooltip>
</el-tooltip>
</el-row>
</el-row>
<el-dialog
:title=
"title"
:visible.sync=
"open"
append-to-body
>
<el-dialog
:title=
"title"
:visible.sync=
"open"
append-to-body
>
<el-transfer
<el-transfer
:titles=
"[
'显示', '隐藏'
]"
:titles=
"[
$t('显示'), $t('隐藏')
]"
v-model=
"value"
v-model=
"value"
:data=
"columns"
:data=
"columns"
@
change=
"dataChange"
@
change=
"dataChange"
...
@@ -29,7 +29,7 @@ export default {
...
@@ -29,7 +29,7 @@ export default {
// 显隐数据
// 显隐数据
value
:
[],
value
:
[],
// 弹出层标题
// 弹出层标题
title
:
"
显示/隐藏
"
,
title
:
this
.
$t
(
'
显示/隐藏
'
)
,
// 是否显示弹出层
// 是否显示弹出层
open
:
false
,
open
:
false
,
};
};
...
...
src/components/WarehouseAreaDialog/index.vue
View file @
3f7b43f0
<
template
>
<
template
>
<div>
<div>
<el-dialog
<el-dialog
title=
"选择储位
"
:title=
"$t('选择储位')
"
:visible.sync=
"opened"
:visible.sync=
"opened"
width=
"600px"
width=
"600px"
:before-close=
"handleClose()"
:before-close=
"handleClose()"
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
<el-tabs
v-model=
"activeName"
type=
"card"
@
tab-click=
"activeWarehouse =
{}">
<el-tabs
v-model=
"activeName"
type=
"card"
@
tab-click=
"activeWarehouse =
{}">
<el-tab-pane
:label=
"item.name"
:name=
"'' + index"
v-for=
"(item, index) in area"
:key=
"index"
>
<el-tab-pane
:label=
"item.name"
:name=
"'' + index"
v-for=
"(item, index) in area"
:key=
"index"
>
<div>
<div>
<div
style=
"text-align: center"
>
区域
</div>
<div
style=
"text-align: center"
>
{{
$t
(
'
区域
'
)
}}
</div>
<div
style=
"background-color: #efefef;padding: 10px 10px 0;border: #dcdcdc solid 1px;border-radius: 2px"
>
<div
style=
"background-color: #efefef;padding: 10px 10px 0;border: #dcdcdc solid 1px;border-radius: 2px"
>
<el-row
:gutter=
"20"
>
<el-row
:gutter=
"20"
>
<el-col
:span=
"12"
v-for=
"warehouse in item.children"
:key=
"warehouse.id"
>
<el-col
:span=
"12"
v-for=
"warehouse in item.children"
:key=
"warehouse.id"
>
...
@@ -26,7 +26,7 @@
...
@@ -26,7 +26,7 @@
</div>
</div>
</div>
</div>
<div>
<div>
<div
style=
"text-align: center"
>
仓位
</div>
<div
style=
"text-align: center"
>
{{
$t
(
'
仓位
'
)
}}
</div>
<div
class=
"position-group"
>
<div
class=
"position-group"
>
<div
class=
"position"
v-for=
"position in activeWarehouse.positionList"
:key=
"position.id"
@
click=
"handleSelectPosition(position)"
>
<div
class=
"position"
v-for=
"position in activeWarehouse.positionList"
:key=
"position.id"
@
click=
"handleSelectPosition(position)"
>
<template
v-if=
"position.children"
>
<template
v-if=
"position.children"
>
...
@@ -51,13 +51,13 @@
...
@@ -51,13 +51,13 @@
</div>
</div>
</div>
</div>
<el-divider></el-divider>
<el-divider></el-divider>
已选择
:{{ selected.join(', ') }}
{{$t('已选择')}}
:{{ selected.join(', ') }}
<el-divider></el-divider>
<el-divider></el-divider>
</el-tab-pane>
</el-tab-pane>
</el-tabs>
</el-tabs>
<span
slot=
"footer"
>
<span
slot=
"footer"
>
<el-button
@
click=
"opened = false"
>
关 闭
</el-button>
<el-button
@
click=
"opened = false"
>
{{$t('关闭')}}
</el-button>
<el-button
type=
"primary"
@
click=
"handleSubmit()"
>
提 交
</el-button>
<el-button
type=
"primary"
@
click=
"handleSubmit()"
>
{{$t('提交')}}
</el-button>
</span>
</span>
</el-dialog>
</el-dialog>
</div>
</div>
...
...
src/i18n/languages/en_US.json
View file @
3f7b43f0
...
@@ -3528,5 +3528,11 @@
...
@@ -3528,5 +3528,11 @@
"手机号码不能为空"
:
"Mobile number cannot be empty"
,
"手机号码不能为空"
:
"Mobile number cannot be empty"
,
"社交平台"
:
"Social platform"
,
"社交平台"
:
"Social platform"
,
"已绑定"
:
"Bound"
,
"已绑定"
:
"Bound"
,
"未绑定"
:
"Unbound"
"未绑定"
:
"Unbound"
,
"已选择"
:
"selected"
,
"隐藏搜索"
:
"hide search"
,
"显示搜索"
:
"show search"
,
"显隐列"
:
"Display column"
,
"隐藏"
:
"hide"
,
"显示/隐藏"
:
"show/hide"
}
}
src/router/index.js
View file @
3f7b43f0
...
@@ -416,14 +416,14 @@ export const constantRoutes = [
...
@@ -416,14 +416,14 @@ export const constantRoutes = [
component
:
(
resolve
)
=>
import
(
'
@/views/ecw/box/query
'
),
component
:
(
resolve
)
=>
import
(
'
@/views/ecw/box/query
'
),
props
:
true
,
props
:
true
,
name
:
'
shippingDetail
'
,
name
:
'
shippingDetail
'
,
meta
:
{
title
:
'
出货详情
'
,
icon
:
''
,
activeMenu
:
'
/shipment/boxDetail
'
}
meta
:
{
title
Zh
:
'
出货详情
'
,
titleEn
:
"
Shipping Details
"
,
icon
:
''
,
activeMenu
:
'
/shipment/boxDetail
'
}
},
},
{
{
path
:
'
shippingSea/:shipmentId(
\\
d+)
'
,
path
:
'
shippingSea/:shipmentId(
\\
d+)
'
,
component
:
(
resolve
)
=>
import
(
'
@/views/ecw/box/shippingSea/shippingSea
'
),
component
:
(
resolve
)
=>
import
(
'
@/views/ecw/box/shippingSea/shippingSea
'
),
props
:
true
,
props
:
true
,
name
:
'
shippingSea
'
,
name
:
'
shippingSea
'
,
meta
:
{
title
:
'
海运出货操作
'
,
icon
:
''
,
activeMenu
:
'
/shipment/boxSea
'
}
meta
:
{
title
Zh
:
'
海运出货操作
'
,
titleEn
:
"
Ocean shipment operation
"
,
icon
:
''
,
activeMenu
:
'
/shipment/boxSea
'
}
}
}
]
]
},
},
...
@@ -438,14 +438,14 @@ export const constantRoutes = [
...
@@ -438,14 +438,14 @@ export const constantRoutes = [
component
:
(
resolve
)
=>
import
(
'
@/views/ecw/box/query
'
),
component
:
(
resolve
)
=>
import
(
'
@/views/ecw/box/query
'
),
props
:
true
,
props
:
true
,
name
:
'
shippingDetail
'
,
name
:
'
shippingDetail
'
,
meta
:
{
title
:
'
出货详情
'
,
icon
:
''
,
activeMenu
:
'
/shipment/boxDetail
'
}
meta
:
{
title
Zh
:
'
出货详情
'
,
titleEn
:
"
Shipping Details
"
,
icon
:
''
,
activeMenu
:
'
/shipment/boxDetail
'
}
},
},
{
{
path
:
'
shippingSeaAir/:shipmentId(
\\
d+)
'
,
path
:
'
shippingSeaAir/:shipmentId(
\\
d+)
'
,
component
:
(
resolve
)
=>
import
(
'
@/views/ecw/box/shippingSeaAir/shippingSeaAir
'
),
component
:
(
resolve
)
=>
import
(
'
@/views/ecw/box/shippingSeaAir/shippingSeaAir
'
),
props
:
true
,
props
:
true
,
name
:
'
shippingSeaAir
'
,
name
:
'
shippingSeaAir
'
,
meta
:
{
title
:
'
海空联运出货操作
'
,
icon
:
''
,
activeMenu
:
'
/shipment/boxSeaAir
'
}
meta
:
{
title
Zh
:
'
海空联运出货操作
'
,
titleEn
:
"
Sea and Air Combined Shipping Operation
"
,
icon
:
''
,
activeMenu
:
'
/shipment/boxSeaAir
'
}
}
}
]
]
},
},
...
...
src/views/ecw/box/indexFutureBox.vue
View file @
3f7b43f0
...
@@ -145,7 +145,7 @@
...
@@ -145,7 +145,7 @@
<el-form-item
:label=
"$t('已装柜仓数')"
>
<el-form-item
:label=
"$t('已装柜仓数')"
>
{{form.loadingNumber}} m³
{{form.loadingNumber}} m³
</el-form-item>
</el-form-item>
<el-form-item
label=
""
>
<el-form-item
label=
""
>
<div>
<div>
{{$t('未来')}}
<el-input
v-model=
"form.futureNumber"
class=
"w-100"
></el-input>
{{$t('天货柜数')}}
{{$t('未来')}}
<el-input
v-model=
"form.futureNumber"
class=
"w-100"
></el-input>
{{$t('天货柜数')}}
...
@@ -222,7 +222,7 @@ export default {
...
@@ -222,7 +222,7 @@ export default {
},
},
// 表单参数
// 表单参数
form
:
{
form
:
{
},
},
// 表单校验
// 表单校验
rules
:
{
rules
:
{
...
@@ -277,7 +277,7 @@ export default {
...
@@ -277,7 +277,7 @@ export default {
return
id
=>
{
return
id
=>
{
let
warehouse
=
this
.
importWarehouseList
.
find
(
item
=>
item
.
id
==
id
)
let
warehouse
=
this
.
importWarehouseList
.
find
(
item
=>
item
.
id
==
id
)
return
this
.
$l
(
warehouse
,
'
title
'
)
return
this
.
$l
(
warehouse
,
'
title
'
)
}
}
}
}
/* importCityList(){
/* importCityList(){
return this.tradeCityList.filter(item => item.type == 1 || item.tye == 3)
return this.tradeCityList.filter(item => item.type == 1 || item.tye == 3)
...
@@ -314,7 +314,6 @@ export default {
...
@@ -314,7 +314,6 @@ export default {
this
.
getVolume
()
this
.
getVolume
()
},
},
'
form.shippingChannelId
'
(){
'
form.shippingChannelId
'
(){
console
.
log
(
'
123shippingChannelId
'
)
this
.
getVolume
()
this
.
getVolume
()
},
},
'
form.warehousedNumber
'
(){
'
form.warehousedNumber
'
(){
...
...
src/views/ecw/box/indexSea.vue
View file @
3f7b43f0
...
@@ -296,7 +296,6 @@ export default {
...
@@ -296,7 +296,6 @@ export default {
this
.
transportTypes
=
this
.
getDictDatas
(
this
.
transportTypes
=
this
.
getDictDatas
(
this
.
DICT_TYPE
.
ECW_TRANSPORT_TYPE
this
.
DICT_TYPE
.
ECW_TRANSPORT_TYPE
).
filter
((
item
)
=>
item
.
value
==
"
1
"
||
item
.
value
==
"
2
"
);
).
filter
((
item
)
=>
item
.
value
==
"
1
"
||
item
.
value
==
"
2
"
);
console
.
log
(
this
.
transportTypes
)
getWarehouseList
().
then
((
res
)
=>
(
this
.
warehouseList
=
res
.
data
));
getWarehouseList
().
then
((
res
)
=>
(
this
.
warehouseList
=
res
.
data
));
getCabinetPage
(
null
).
then
((
response
)
=>
{
getCabinetPage
(
null
).
then
((
response
)
=>
{
this
.
cabinetList
=
response
.
data
.
list
;
this
.
cabinetList
=
response
.
data
.
list
;
...
...
src/views/ecw/box/query.vue
View file @
3f7b43f0
...
@@ -110,7 +110,7 @@
...
@@ -110,7 +110,7 @@
<div
class=
"status-line"
></div>
<div
class=
"status-line"
></div>
<div
class=
"status-number"
>
{{logList.length - index}}
</div>
<div
class=
"status-number"
>
{{logList.length - index}}
</div>
<div
class=
"status-info"
>
<div
class=
"status-info"
>
<div>
{{
item.titleZh
}}
</div>
<div>
{{
$l(item, 'title')
}}
</div>
<div>
<div>
<p>
{{formatDate(item.createTime)}}
</p>
<p>
{{formatDate(item.createTime)}}
</p>
<p>
{{item.operator}}
</p>
<p>
{{item.operator}}
</p>
...
...
src/views/ecw/box/shippingSea/nodePage/cusDeclaration.vue
View file @
3f7b43f0
...
@@ -241,7 +241,6 @@ export default {
...
@@ -241,7 +241,6 @@ export default {
...
this
.
shipmentObj
[
voName
],
...
this
.
shipmentObj
[
voName
],
documentInfo
:
this
.
shipmentObj
.
documentInfo
?.
split
(
"
,
"
)
??
[],
documentInfo
:
this
.
shipmentObj
.
documentInfo
?.
split
(
"
,
"
)
??
[],
};
};
console
.
log
(
oldData
)
if
(
!
this
.
shipmentObj
[
voName
])
{
if
(
!
this
.
shipmentObj
[
voName
])
{
oldData
.
dcCustomsType
=
oldData
.
dcCustomsType
oldData
.
dcCustomsType
=
oldData
.
dcCustomsType
...
...
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