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
fbfc914b
Commit
fbfc914b
authored
Dec 29, 2022
by
houjn@hikoon.cn
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
翻译文案
parent
97d48207
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
9 deletions
+24
-9
en_US.json
src/i18n/languages/en_US.json
+4
-4
receiptDetail.vue
src/views/ecw/financial/receiptDetail.vue
+20
-5
No files found.
src/i18n/languages/en_US.json
View file @
fbfc914b
...
@@ -2173,8 +2173,6 @@
...
@@ -2173,8 +2173,6 @@
"是否确认删除昵称为{nickname}的会员?"
:
"Are you sure to delete the member whose nickname is {nickname}?"
,
"是否确认删除昵称为{nickname}的会员?"
:
"Are you sure to delete the member whose nickname is {nickname}?"
,
"取消删除"
:
"Cancel Delete"
,
"取消删除"
:
"Cancel Delete"
,
"重货标准(CBM)"
:
"Heavy cargo standard (CBM)"
,
"重货标准(CBM)"
:
"Heavy cargo standard (CBM)"
,
"应收可能出现多个币种的情况,多个币种没法计算整个收款单的核销比例,所以增加一个中间币种,如果应收只有一个币种就使用应收币种,如果有多个币种就以美元为核销基准币种"
:
""
,
"实收币种与核销基准币种一样时,无需填写汇率,不一样需要填写汇率"
:
""
,
"WEB端图片"
:
""
,
"WEB端图片"
:
""
,
"APP端图片"
:
""
,
"APP端图片"
:
""
,
"WEB端广告图片(建议尺寸"
:
""
,
"WEB端广告图片(建议尺寸"
:
""
,
...
@@ -2237,5 +2235,7 @@
...
@@ -2237,5 +2235,7 @@
"公告类型不能为空"
:
""
,
"公告类型不能为空"
:
""
,
"添加公告"
:
""
,
"添加公告"
:
""
,
"修改公告"
:
""
,
"修改公告"
:
""
,
"是否确认删除公告编号为"
:
""
"是否确认删除公告编号为"
:
""
,
}
"应收可能出现多个币种的情况,多个币种没法计算整个收款单的核销比例,所以增加一个中间币种,如果应收只有一个币种就使用应收币种,如果有多个币种就以美元为核销基准币种"
:
"应收可能出现多个币种的情况,多个币种没法计算整个收款单的核销比例,所以增加一个中间币种,如果应收只有一个币种就使用应收币种,如果有多个币种就以美元为核销基准币种"
,
\ No newline at end of file
"实收币种与核销基准币种一样时,无需填写汇率,不一样需要填写汇率"
:
"实收币种与核销基准币种一样时,无需填写汇率,不一样需要填写汇率"
}
src/views/ecw/financial/receiptDetail.vue
View file @
fbfc914b
...
@@ -145,7 +145,7 @@
...
@@ -145,7 +145,7 @@
<
span
>
{{
scope
.
row
.
writeOffRate
}}
<
/span
>
<
span
>
{{
scope
.
row
.
writeOffRate
}}
<
/span
>
<
/template
>
<
/template
>
<
template
v
-
else
>
<
template
v
-
else
>
{{
$t
(
'
应
收
总金额
'
)
}}
(
{{
getCurrencyLabel
(
showCurrencyId
)
}}
)
{{
$t
(
'
应
核销
总金额
'
)
}}
(
{{
getCurrencyLabel
(
showCurrencyId
)
}}
)
<
/template
>
<
/template
>
<
/template
>
<
/template
>
<
/el-table-column
>
<
/el-table-column
>
...
@@ -159,6 +159,7 @@
...
@@ -159,6 +159,7 @@
{{
`${bankData.find(v => v.id == scope.row.platformAccountId).baAccountName
}
(${bankData.find(v => v.id == scope.row.platformAccountId).baAccountNum
}
)`
}}
{{
`${bankData.find(v => v.id == scope.row.platformAccountId).baAccountName
}
(${bankData.find(v => v.id == scope.row.platformAccountId).baAccountNum
}
)`
}}
<
/template
>
<
/template
>
<
/el-table-column
>
<
/el-table-column
>
<
el
-
table
-
column
:
label
=
"
$t('期望收款币种')
"
align
=
"
center
"
>
<
el
-
table
-
column
:
label
=
"
$t('期望收款币种')
"
align
=
"
center
"
>
<
template
slot
-
scope
=
"
scope
"
>
<
template
slot
-
scope
=
"
scope
"
>
<!--
<
dict
-
tag
:
type
=
"
DICT_TYPE.BOX_SHIPPING_PRICE_UNIT
"
:
value
=
"
scope.row.collectionCurrencyId
"
/>
-->
<!--
<
dict
-
tag
:
type
=
"
DICT_TYPE.BOX_SHIPPING_PRICE_UNIT
"
:
value
=
"
scope.row.collectionCurrencyId
"
/>
-->
...
@@ -177,7 +178,10 @@
...
@@ -177,7 +178,10 @@
<
el
-
input
v
-
model
=
"
scope.row.collectionRate
"
@
input
=
"
() => rateChange(scope.row, scope.$index)
"
><
/el-input
>
<
el
-
input
v
-
model
=
"
scope.row.collectionRate
"
@
input
=
"
() => rateChange(scope.row, scope.$index)
"
><
/el-input
>
<
/el-form-item> --
>
<
/el-form-item> --
>
<
span
v
-
if
=
"
scope.row.type !== 'total'
"
>
{{
scope
.
row
.
collectionRate
}}
<
/span
>
<
span
v
-
if
=
"
scope.row.type !== 'total'
"
>
{{
scope
.
row
.
collectionRate
}}
<
/span
>
<
span
v
-
else
>
{{
$t
(
'
期望收费金额
'
)
}}
<
/span
>
<
span
v
-
else
>
{{
$t
(
'
期望收费金额
'
)
}}
<
span
:
title
=
"
$t('导出账单给客户时显示的收款金额与币种')
"
><
i
class
=
"
el-icon-question
"
><
/i></
span
>
<
/span
>
<
/template
>
<
/template
>
<
/el-table-column
>
<
/el-table-column
>
<
el
-
table
-
column
:
label
=
"
$t('期望收款金额')
"
align
=
"
center
"
prop
=
"
collectionAmount
"
>
<
el
-
table
-
column
:
label
=
"
$t('期望收款金额')
"
align
=
"
center
"
prop
=
"
collectionAmount
"
>
...
@@ -263,10 +267,15 @@
...
@@ -263,10 +267,15 @@
<
/el-card
>
<
/el-card
>
<
el
-
card
class
=
"
card hexiaoCard
"
>
<
el
-
card
class
=
"
card hexiaoCard
"
>
<
el
-
descriptions
:
column
=
"
3
"
border
>
<
el
-
descriptions
:
column
=
"
3
"
border
>
<
el
-
descriptions
-
item
:
label
=
"
$t('已核销实收总金额')
"
>
<
el
-
descriptions
-
item
>
<!--
<
el
-
tag
>
{{
verificationData
.
usCount
.
toFixed
(
6
)
}}
{{
$t
(
'
美元
'
)
}}
<
/el-tag
>
<!--
<
el
-
tag
>
{{
verificationData
.
usCount
.
toFixed
(
6
)
}}
{{
$t
(
'
美元
'
)
}}
<
/el-tag
>
<
el
-
tag
>
{{
verificationData
.
rmbCount
.
toFixed
(
6
)
}}
{{
$t
(
'
人民币
'
)
}}
<
/el-tag
>
<
el
-
tag
>
{{
verificationData
.
rmbCount
.
toFixed
(
6
)
}}
{{
$t
(
'
人民币
'
)
}}
<
/el-tag
>
<
el
-
tag
>
{{
verificationData
.
nairaCount
.
toFixed
(
6
)
}}
{{
$t
(
'
奈拉
'
)
}}
<
/el-tag> --
>
<
el
-
tag
>
{{
verificationData
.
nairaCount
.
toFixed
(
6
)
}}
{{
$t
(
'
奈拉
'
)
}}
<
/el-tag> --
>
<
template
slot
=
"
label
"
>
{{
$t
(
'
实收已核销总金额
'
)
}}
<
span
:
title
=
"
$t('所有银行收款明细中状态为已核销的实收金额,币种根据实收币种分类统计')
"
><
i
class
=
"
el-icon-question
"
><
/i></
span
>
<
/template
>
<
template
v
-
if
=
"
!Object.keys(writeOffTotal).length
"
>
<
template
v
-
if
=
"
!Object.keys(writeOffTotal).length
"
>
0
0
<
/template
>
<
/template
>
...
@@ -275,16 +284,22 @@
...
@@ -275,16 +284,22 @@
{{
amount
}}
{{
getCurrencyLabel
(
currency
)
}}
{{
amount
}}
{{
getCurrencyLabel
(
currency
)
}}
<
/div
>
<
/div
>
<
/div
>
<
/div
>
<
/el-descriptions-item
>
<
/el-descriptions-item
>
<
el
-
descriptions
-
item
>
<
el
-
descriptions
-
item
>
<
template
slot
=
"
label
"
>
<
template
slot
=
"
label
"
>
{{
$t
(
'
已核销基准币种总金额
'
)
}}
(
{{
getCurrencyLabel
(
showCurrencyId
)
}}
)
{{
$t
(
'
核销基准币种已核销总金额
'
)
}}
(
{{
getCurrencyLabel
(
showCurrencyId
)
}}
)
<
span
:
title
=
"
$t('为了方便统计收款单核销比例,将所有银行收款明细中状态为已核销的实收金额,转换为核销基准币种的金额累加')
"
><
i
class
=
"
el-icon-question
"
><
/i></
span
>
<
/template
>
<
/template
>
{{
writeOffAmount
}}
{{
writeOffAmount
}}
<
/el-descriptions-item
>
<
/el-descriptions-item
>
<
el
-
descriptions
-
item
>
<
el
-
descriptions
-
item
>
<
template
slot
=
"
label
"
>
<
template
slot
=
"
label
"
>
{{
$t
(
'
已核销比例
\n
(已核销基准币种总金额/应收总金额)
'
)
}}
(
{{
getCurrencyLabel
(
showCurrencyId
)
}}
)
{{
$t
(
'
总核销比例
'
)
}}
(
{{
getCurrencyLabel
(
showCurrencyId
)
}}
)
<
span
:
title
=
"
$t('总核销比例=核销基准币种已核销总金额/核销基准币种应收总金额')
"
><
i
class
=
"
el-icon-question
"
><
/i></
span
>
<
/template
>
<
/template
>
{{
WriteOffProportion
}}
%
{{
WriteOffProportion
}}
%
<
/el-descriptions-item
>
<
/el-descriptions-item
>
...
...
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