Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
SuperMan
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
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
罗超
SuperMan
Commits
b0d98ec2
Commit
b0d98ec2
authored
May 17, 2019
by
huangyuanyuan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
资金调拨修改时 数据问题
parent
04317503
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
3 deletions
+25
-3
CapitalAllocationDetail.vue
src/components/FinancialModule/CapitalAllocationDetail.vue
+14
-0
addCapitalAllocation.vue
src/components/FinancialModule/addCapitalAllocation.vue
+11
-3
No files found.
src/components/FinancialModule/CapitalAllocationDetail.vue
View file @
b0d98ec2
...
@@ -304,7 +304,10 @@
...
@@ -304,7 +304,10 @@
<th
width=
"110"
>
{{
$t
(
'fnc.jine'
)
}}
</th>
<th
width=
"110"
>
{{
$t
(
'fnc.jine'
)
}}
</th>
<th
width=
"90"
>
{{
$t
(
'hotel.hotel_Currency'
)
}}
</th>
<th
width=
"90"
>
{{
$t
(
'hotel.hotel_Currency'
)
}}
</th>
<th
width=
"85"
>
{{
$t
(
'hotel.hotel_CurrentRate'
)
}}
</th>
<th
width=
"85"
>
{{
$t
(
'hotel.hotel_CurrentRate'
)
}}
</th>
<th>
汇兑收益
</th>
<th>
{{
$t
(
'fnc.bwbjine'
)
}}
</th>
<th>
{{
$t
(
'fnc.bwbjine'
)
}}
</th>
</tr>
</tr>
<tr>
<tr>
<td>
{{
item
.
TypeName
}}
</td>
<td>
{{
item
.
TypeName
}}
</td>
...
@@ -314,7 +317,12 @@
...
@@ -314,7 +317,12 @@
<td>
{{
item
.
OriginalMoney
}}
</td>
<td>
{{
item
.
OriginalMoney
}}
</td>
<td>
{{
item
.
CurrencyName
}}
</td>
<td>
{{
item
.
CurrencyName
}}
</td>
<td>
{{
item
.
Rate
}}
</td>
<td>
{{
item
.
Rate
}}
</td>
<td>
<span
v-if=
"item.IsExChange==1"
>
是
</span>
<span
v-if=
"item.IsExChange==0"
>
否
</span>
</td>
<td>
{{
item
.
Money
}}
</td>
<td>
{{
item
.
Money
}}
</td>
</tr>
</tr>
</table>
</table>
<div
class=
"clearfix Ca_comLinediv"
>
<div
class=
"clearfix Ca_comLinediv"
>
...
@@ -356,6 +364,7 @@
...
@@ -356,6 +364,7 @@
<th
width=
"110"
>
{{$t('fnc.jine')}}
</th>
<th
width=
"110"
>
{{$t('fnc.jine')}}
</th>
<th
width=
"90"
>
{{$t('hotel.hotel_Currency')}}
</th>
<th
width=
"90"
>
{{$t('hotel.hotel_Currency')}}
</th>
<th
width=
"85"
>
{{$t('hotel.hotel_CurrentRate')}}
</th>
<th
width=
"85"
>
{{$t('hotel.hotel_CurrentRate')}}
</th>
<th>
汇兑损失
</th>
<th>
{{$t('fnc.bwbjine')}}
</th>
<th>
{{$t('fnc.bwbjine')}}
</th>
</tr>
</tr>
<tr>
<tr>
...
@@ -366,6 +375,10 @@
...
@@ -366,6 +375,10 @@
<td>
{{item.OriginalMoney}}
</td>
<td>
{{item.OriginalMoney}}
</td>
<td>
{{item.CurrencyName}}
</td>
<td>
{{item.CurrencyName}}
</td>
<td>
{{item.Rate}}
</td>
<td>
{{item.Rate}}
</td>
<td>
<span
v-if=
"item.IsExChange==1"
>
是
</span>
<span
v-if=
"item.IsExChange==0"
>
否
</span>
</td>
<td>
{{item.Money}}
</td>
<td>
{{item.Money}}
</td>
</tr>
</tr>
</table>
</table>
...
@@ -637,6 +650,7 @@ export default {
...
@@ -637,6 +650,7 @@ export default {
this
.
apipost
(
'Financial_get_GetFundTransfer'
,
this
.
msg
,
res
=>
{
this
.
apipost
(
'Financial_get_GetFundTransfer'
,
this
.
msg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
dataList
=
res
.
data
.
data
;
this
.
dataList
=
res
.
data
.
data
;
console
.
log
(
"this.dataList"
,
this
.
dataList
)
this
.
GetDetail
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
dataList
));
this
.
GetDetail
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
dataList
));
this
.
GetDetail
.
AuditSteps
=
[];
this
.
GetDetail
.
AuditSteps
=
[];
if
(
this
.
dataList
.
Status
==
2
){
if
(
this
.
dataList
.
Status
==
2
){
...
...
src/components/FinancialModule/addCapitalAllocation.vue
View file @
b0d98ec2
...
@@ -428,10 +428,12 @@ export default {
...
@@ -428,10 +428,12 @@ export default {
this
.
loading
=
true
this
.
loading
=
true
this
.
apipost
(
'Financial_get_GetFundTransfer'
,
{
ID
:
id
},
res
=>
{
this
.
apipost
(
'Financial_get_GetFundTransfer'
,
{
ID
:
id
},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
){
if
(
res
.
data
.
resultCode
==
1
){
let
data
=
res
.
data
.
data
let
data
=
res
.
data
.
data
;
this
.
inList
=
data
.
SBankList
;
this
.
inList
=
data
.
SBankList
;
this
.
outList
=
data
.
FBankList
this
.
outList
=
data
.
FBankList
;
this
.
msg
.
FrID
=
data
.
FrID
this
.
msg
.
FrID
=
data
.
FrID
this
.
msg
.
TemplateId
=
data
.
TemplateId
this
.
msg
.
TemplateId
=
data
.
TemplateId
this
.
msg
.
Status
=
data
.
Status
this
.
msg
.
Status
=
data
.
Status
...
@@ -456,11 +458,17 @@ export default {
...
@@ -456,11 +458,17 @@ export default {
},
null
)
},
null
)
},
},
AddFinancial
:
function
()
{
AddFinancial
:
function
()
{
this
.
loading
=
true
this
.
loading
=
true
this
.
msg
.
BankList
.
push
(...
this
.
inList
,...
this
.
outList
)
let
c
=
this
.
inList
.
concat
(
this
.
outList
);
this
.
msg
.
BankList
=
c
;
this
.
msg
.
BankList
.
forEach
(
x
=>
{
this
.
msg
.
BankList
.
forEach
(
x
=>
{
delete
x
.
shouAccNumList
delete
x
.
shouAccNumList
})
})
// return;
this
.
apipost
(
'Financial_post_SetFundTransfer'
,
this
.
msg
,
res
=>
{
this
.
apipost
(
'Financial_post_SetFundTransfer'
,
this
.
msg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
){
if
(
res
.
data
.
resultCode
==
1
){
this
.
$message
.
success
(
res
.
data
.
message
);
this
.
$message
.
success
(
res
.
data
.
message
);
...
...
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