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
4eaa7916
Commit
4eaa7916
authored
Mar 25, 2019
by
王悦
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
财务单据显示优化
parent
abd027d1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
9 deletions
+26
-9
CapitalAllocation.vue
src/components/FinancialModule/CapitalAllocation.vue
+6
-6
FinancialDocuments.vue
src/components/FinancialModule/FinancialDocuments.vue
+20
-3
No files found.
src/components/FinancialModule/CapitalAllocation.vue
View file @
4eaa7916
...
...
@@ -15,7 +15,7 @@
.page_CapitalAllocation
.page_CapitalAllocation_list
{
width
:
100%
;
}
.page_CapitalAllocation
i
.icon-sousuo
,
.page_CapitalAllocation
i
.edit
{
.page_CapitalAllocation
i
.icon-sousuo
,
.page_CapitalAllocation
i
.edit
edit
{
width
:
30px
;
height
:
30px
;
display
:
inline-block
;
...
...
@@ -142,9 +142,9 @@
<tr>
<th>
单号
</th>
<th>
金额
</th>
<
th>
实付
</th
>
<
!--
<th>
实付
</th>
--
>
<!--
<th>
原币金额
</th>
-->
<
th>
交易日期
</th
>
<
!--
<th>
交易日期
</th>
--
>
<th>
创建时间
</th>
<th>
创建人
</th>
<!--
<th>
备注
</th>
-->
...
...
@@ -152,11 +152,11 @@
<th>
操作
</th>
</tr>
<tr
v-for=
"(item, index) in dataList"
>
<td>
{{
item
.
FrID
}}
</td>
<td
style=
"cursor:pointer"
@
click=
"goDetail('CapitalAllocationDetail', item.FrID)"
>
{{
item
.
FrID
}}
</td>
<td>
{{
item
.
Money
}}
</td>
<
td>
{{
item
.
PayMoney
}}
</td
>
<
!--
<td>
{{
item
.
PayMoney
}}
</td>
--
>
<!--
<td>
{{
item
.
OriginalMoney
}}
</td>
-->
<
td>
{{
item
.
TradeDate
}}
</td
>
<
!--
<td>
{{
item
.
TradeDate
}}
</td>
--
>
<td>
{{
item
.
CreateDate
}}
</td>
<td>
{{
item
.
EmName
}}
</td>
<!--
<td>
{{
item
.
Description
}}
</td>
-->
...
...
src/components/FinancialModule/FinancialDocuments.vue
View file @
4eaa7916
...
...
@@ -161,6 +161,8 @@
<el-option
key=
"0"
value=
"0"
label=
"不限"
></el-option>
<el-option
key=
"1"
value=
"1"
label=
"收入"
></el-option>
<el-option
key=
"2"
value=
"2"
label=
"支出"
></el-option>
<el-option
key=
"2"
value=
"5"
label=
"应收"
></el-option>
<el-option
key=
"2"
value=
"6"
label=
"应付"
></el-option>
<el-option
key=
"2"
value=
"4"
label=
"资金调拨"
></el-option>
</el-select>
</span>
...
...
@@ -589,6 +591,12 @@
<
template
v-else-if=
"item.OrderSource==10 && item.TCIDAndTCNUMList.length==0"
>
<p
class=
"_TCIDAndTCNUMList"
>
签证编号:
{{
item
.
SourceID
}}
</p>
</
template
>
<
template
v-else-if=
"item.OrderSource==11 && item.TCIDAndTCNUMList.length==0"
>
<p
class=
"_TCIDAndTCNUMList"
>
投诉编号:
{{
item
.
SourceID
}}
</p>
</
template
>
<
template
v-else-if=
"item.OrderSource==12 && item.TCIDAndTCNUMList.length==0"
>
<p
class=
"_TCIDAndTCNUMList"
>
散卖机票编号:
{{
item
.
SourceID
}}
</p>
</
template
>
<
template
v-else-if=
"item.OrderSource==0"
>
<p
class=
"_TCIDAndTCNUMList"
>
{{
item
.
BranchName
}}
-
{{
item
.
DepartName
}}
</p>
</
template
>
...
...
@@ -599,7 +607,7 @@
<td>
<
template
v-for=
"(s,si) in item.CostTypeList"
>
<span
class=
"_tag_span"
>
{{
s
}}
</span><br/>
</
template
>
</
template
>
</td>
<td
class=
"_number"
>
<
template
v-if=
"item.TradeWayList&&item.TradeWayList.length>0"
>
...
...
@@ -619,7 +627,15 @@
<p>
{{item.Type==1?'实收':'实付'}}:
<span
class=
""
>
{{moneyFormat(item.PayMoney)}}
</span></p>
</td>
<td>
<span
class=
"_color_gar"
>
{{item.Type==2?item.ClientTypeName+':':'汇款人:'}}
</span><span>
{{item.RemitterName}}
</span>
<
template
v-if=
'item.Type===1'
>
<span
class=
"_color_gar"
>
汇款人:
</span><span>
{{
item
.
RemitterName
}}
</span>
</
template
>
<
template
v-if=
'item.Type===2'
>
<span
class=
"_color_gar"
>
付款对象:
</span><span>
{{
item
.
RemitterName
}}
</span>
</
template
>
<
template
v-if=
'item.Type===4'
>
<span
class=
"_color_gar"
>
无
</span>
</
template
>
</td>
<td
valign=
"middle"
>
<img
class=
"_head_img"
:src=
"item.EmPhoto"
alt=
""
>
...
...
@@ -658,7 +674,8 @@
<i
v-if=
"((msg.Conditon==1 ||msg.Conditon==7) && (item.InOrNotProcess==1 || item.Status==3 || item.Status==0))"
class=
"edit el-icon-edit"
@
click=
"goEit(item.Type==1?'addReceivablesDocuments':'addFinancialDocuments',item.Type,item.FrID,true,active,msg.pageIndex)"
></i>
</el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"查看"
placement=
"top"
>
<i
class=
"iconfont icon-sousuo"
@
click=
"goUrl('FinancialDocumentsDetail',item.FrID,active,msg.pageIndex)"
></i>
<i
class=
"iconfont icon-sousuo"
v-if=
'item.Type!==4'
@
click=
"goUrl('FinancialDocumentsDetail',item.FrID,active,msg.pageIndex)"
></i>
<i
class=
"iconfont icon-sousuo"
v-if=
'item.Type===4'
@
click=
"goUrl('CapitalAllocationDetail',item.FrID,active,msg.pageIndex)"
></i>
</el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"审核"
placement=
"top"
>
<i
v-if=
"msg.Conditon==3 && item.Is_Self!=1"
class=
"iconfont icon-ico_commodity_defaul"
@
click=
"goUrl('BasicDocuments',item.FrID,active,msg.pageIndex)"
></i>
...
...
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