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
a44fadf7
Commit
a44fadf7
authored
Jun 07, 2021
by
Mac
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
财务单据线路订单新增
parent
154d5ba5
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
290 additions
and
1 deletion
+290
-1
FinancialDocumentsDetail.vue
src/components/FinancialModule/FinancialDocumentsDetail.vue
+5
-1
DmcTravelBillModule.vue
...inancialModule/FinancialSubmodule/DmcTravelBillModule.vue
+285
-0
No files found.
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @
a44fadf7
...
@@ -486,6 +486,7 @@
...
@@ -486,6 +486,7 @@
</div>
</div>
</div>
</div>
<my-HB-Bill
v-if=
"GetDetail.Is_Merge===1 && ZhiDanRen!==bossID"
:ID=
"FrID"
:FrID=
'FrID'
:GetDetail=
"GetDetail"
:isPrintPage=
"false"
:width=
"widthSon"
:color=
"colorSon"
></my-HB-Bill>
<my-HB-Bill
v-if=
"GetDetail.Is_Merge===1 && ZhiDanRen!==bossID"
:ID=
"FrID"
:FrID=
'FrID'
:GetDetail=
"GetDetail"
:isPrintPage=
"false"
:width=
"widthSon"
:color=
"colorSon"
></my-HB-Bill>
<dmcTravelBill
v-if=
"GetDetail.OtherType==34 && GetDetail.DmcTravelFinanceList && GetDetail.DmcTravelFinanceList.length > 0"
:ID=
"FrID"
:FrID=
'FrID'
:GetDetail=
"GetDetail"
:isPrintPage=
"false"
:width=
"widthSon"
:color=
"colorSon"
></dmcTravelBill>
<!--
<myDJieBill
v-if=
"GetDetail.DijieBathFinanceList && GetDetail.DijieBathFinanceList.length"
:ID=
"GetDetail.FrID"
:isPrintPage=
"false"
:width=
"widthSon"
:color=
"colorSon"
/>
-->
<!--
<myDJieBill
v-if=
"GetDetail.DijieBathFinanceList && GetDetail.DijieBathFinanceList.length"
:ID=
"GetDetail.FrID"
:isPrintPage=
"false"
:width=
"widthSon"
:color=
"colorSon"
/>
-->
<!--
<my-C-Bill
v-if=
"GetDetail.CashierDetail&&GetDetail.CashierDetail.length&&GetDetail.Type!=1"
:ID=
"GetDetail.FrID"
:width=
"widthSon"
:color=
"colorSon"
></my-C-Bill>
-->
<!--
<my-C-Bill
v-if=
"GetDetail.CashierDetail&&GetDetail.CashierDetail.length&&GetDetail.Type!=1"
:ID=
"GetDetail.FrID"
:width=
"widthSon"
:color=
"colorSon"
></my-C-Bill>
-->
<div
class=
"_fujian_box"
v-if=
"(GetDetail.VorcherInos&&GetDetail.VorcherInos.length>0) || saveMsg.length>0"
>
<div
class=
"_fujian_box"
v-if=
"(GetDetail.VorcherInos&&GetDetail.VorcherInos.length>0) || saveMsg.length>0"
>
...
@@ -872,6 +873,8 @@ import myJiPiaoBill from "./FinancialSubmodule/JiPiaoBillModule.vue";
...
@@ -872,6 +873,8 @@ import myJiPiaoBill from "./FinancialSubmodule/JiPiaoBillModule.vue";
import
huijiBill
from
"./FinancialSubmodule/huijiBill.vue"
;
import
huijiBill
from
"./FinancialSubmodule/huijiBill.vue"
;
import
czBillModule
from
"./FinancialSubmodule/czBillModule.vue"
;
import
czBillModule
from
"./FinancialSubmodule/czBillModule.vue"
;
import
dmcTravelBill
from
'./FinancialSubmodule/DmcTravelBillModule'
;
//线路
export
default
{
export
default
{
data
(){
data
(){
return
{
return
{
...
@@ -968,7 +971,8 @@ export default {
...
@@ -968,7 +971,8 @@ export default {
'myJiPiaoBill'
:
myJiPiaoBill
,
'myJiPiaoBill'
:
myJiPiaoBill
,
'huijiBill'
:
huijiBill
,
'huijiBill'
:
huijiBill
,
"czBillModule"
:
czBillModule
"czBillModule"
:
czBillModule
,
"dmcTravelBill"
:
dmcTravelBill
},
},
created
(){
created
(){
this
.
ID
=
this
.
$route
.
query
.
id
;
this
.
ID
=
this
.
$route
.
query
.
id
;
...
...
src/components/FinancialModule/FinancialSubmodule/DmcTravelBillModule.vue
0 → 100644
View file @
a44fadf7
<
style
scoped
>
p
{
margin
:
0
;}
.Receipt_box
{
padding
:
15px
;
color
:
#c94052
;
width
:
100%
;
background-color
:
rgba
(
245
,
245
,
245
,
1
);
position
:
relative
;
margin-top
:
15px
;}
.Receipt_box
tr
th
{
color
:
#c94052
}
.Receipt_box.color_blur
tr
th
{
color
:
#106BAF
}
.Receipt_box.color_blur
{
color
:
#106BAF
;}
.Receipt_box.color_blur
.rb_stit
span
{
display
:
inline-block
;
border-bottom
:
2px
solid
#106BAF
;
padding
:
0
20px
}
.rb_tit
{
font-size
:
16px
;
text-align
:
center
;
margin-bottom
:
20px
;}
.rb_stit
{
font-size
:
14px
;
text-align
:
center
}
.rb_stit
span
{
display
:
inline-block
;
border-bottom
:
2px
solid
#C94052
;
padding
:
0
20px
}
.rb_top_row
{
display
:
flex
;
justify-content
:
space-between
;
font-size
:
12px
;}
.rb_top_row
span
._r_name
{
color
:
#333333
}
.rb_top_row
span
._r_bold
{
font-weight
:
bold
}
.rb_top_row
._r_time
span
{
color
:
#333333
}
._r_mb5
{
margin-bottom
:
5px
;}
.Receipt_table
{
width
:
100%
;
font-size
:
14px
;
text-align
:
center
}
.Receipt_table
th
{
font-weight
:
200
!important
}
.Receipt_table
tr
th
,
.Receipt_table
tr
td
{
background-color
:
white
}
._r_mt10
{
margin-top
:
10px
;}
.Receipt_box.color_blur
{
color
:
#106BAF
;}
.Receipt_box.color_blur
.rb_stit
span
{
display
:
inline-block
;
border-bottom
:
2px
solid
#106BAF
;
padding
:
0
20px
}
._color_b
{
color
:
#333333
!important
;
font-size
:
12px
}
._font_size12
{
font-size
:
12px
!important
}
._r_IsPublic
{
padding-left
:
15px
;
}
._guanlian
{
font-size
:
12px
;
color
:
gray
;
}
._guanlian
span
{
font-size
:
14px
;
color
:
#333333
;
}
._yewudanju
{
position
:
absolute
;
text-align
:
right
;
font-size
:
12px
;
right
:
15px
;
top
:
15px
;
}
._jump_page
{
cursor
:
pointer
;
text-decoration
:
underline
;
}
i
{
font-style
:
initial
;
}
.Receipt_box._PrintPageStyle
tr
th
{
color
:
#333333
}
.Receipt_box._PrintPageStyle
{
color
:
#333333
;}
.Receipt_box._PrintPageStyle
.rb_stit
span
{
border-bottom
:
2px
solid
#333333
;}
.Receipt_box._PrintPageStyle
{
color
:
#333333
;}
.Receipt_box._PrintPageStyle
.rb_stit
span
{
border-bottom
:
2px
solid
#333333
;}
._border_color_r
{
border-color
:
#c94052
;
}
._border_color_b
{
border-color
:
#106BAF
;
}
._border_color_p
{
border-color
:
#333333
;
}
.Receipt_box
.rb_stit
span
._rb_stit_print
{
padding
:
0
;
padding-top
:
10px
;
border
:
none
;
}
._sanjiao_
{
position
:
absolute
;
top
:
0px
;
left
:
0px
;
width
:
0px
;
height
:
0px
;
border-top
:
20px
solid
#e73828
;
border-bottom
:
20px
solid
transparent
;
border-left
:
20px
solid
#e73828
;
border-right
:
20px
solid
transparent
;
}
._sanjiao_
:after
{
content
:
'合'
;
position
:
absolute
;
top
:
-15px
;
left
:
-14px
;
white-space
:
nowrap
;
color
:
#FFFFFF
;
font-size
:
12px
;
}
</
style
>
<
template
v-if=
"GetDetail&&GetDetail.DetailList.length>0"
>
<div
class=
"Receipt_box"
:class=
"[GetDetail.Type==1?'':'color_blur',isPrintPage?'_PrintPageStyle':'']"
:style=
"
{width:width,backgroundColor:color}" @click.stop v-loading='loading'>
<!--
<div
class=
"_sanjiao_"
></div>
-->
<p
class=
"rb_tit"
>
线路订单当日收款
</p>
<table
class=
"Receipt_table"
border=
"1"
:class=
"[GetDetail.Type==1?'_border_color_r':'_border_color_b',isPrintPage?'_border_color_p':'']"
:bordercolor=
"GetDetail.Type==1?'#c94052':'#106BAF'"
style=
"border-collapse:collapse;"
>
<tr>
<th
rowspan=
"2"
>
{{
$t
(
'system.query_company'
)
}}
</th>
<th
rowspan=
"2"
>
{{
$t
(
'visa.v_tuanhao'
)
}}
</th>
<th
rowspan=
"2"
>
{{
$t
(
'fnc.danhao'
)
}}
</th>
<th
rowspan=
"2"
>
{{
$t
(
'fnc.fyshuoming'
)
}}
</th>
<!--
<th
rowspan=
"2"
>
数量
</th>
-->
<!--
<th
rowspan=
"2"
>
单 价
</th>
-->
<th
rowspan=
"2"
>
{{
$t
(
'hotel.hotel_Currency'
)
}}
</th>
<th
colspan=
"5"
>
{{
$t
(
'fnc.jine'
)
}}
</th>
<th
rowspan=
"2"
>
{{
$t
(
'hotel.hotel_remark'
)
}}
</th>
<th
rowspan=
"2"
>
{{
$t
(
'fnc.zhidanren'
)
}}
</th>
</tr>
<tr>
<th
width=
"88"
>
{{
$t
(
'fnc.yuanbi'
)
}}
</th>
<th
width=
"50"
>
{{
$t
(
'hotel.hotel_CurrentRate'
)
}}
</th>
<th
width=
"68"
>
{{
$t
(
'fnc.bweibi'
)
}}
</th>
<th
width=
"68"
>
到账
</th>
<th
width=
"48"
>
手续费
</th>
</tr>
<template
v-if=
"GetDetail.DmcTravelFinanceList&&GetDetail.DmcTravelFinanceList.length"
>
<tr
v-for=
"(item) in GetDetail.DmcTravelFinanceList"
class=
"_color_b"
>
<td
height=
"34px"
>
{{
item
.
BName
}}
</td>
<td
height=
"34px"
>
<template
v-for=
"tc in item.TCIDAndTCNUMList"
>
<p
class=
"_jump_page"
@
click=
"jumpPage('productQuery',tc.TCID,1)"
>
{{
tc
.
TCNUM
}}
(
{{
tc
.
TCID
}}
)
</p>
</
template
>
</td>
<td
height=
"34px"
>
<p
class=
"_jump_page"
@
click=
"jumpPage('FinancialDocumentsDetail',item.FinanceId,2)"
>
{{item.FinanceId}}
</p>
</td>
<td
height=
"34px"
>
{{item.CostTypeName}}
</td>
<!--<td height="34px">{{item.Number}}</td>-->
<!--<td height="34px">{{item.UnitPrice}}</td>-->
<td
height=
"34px"
>
{{item.CurrencyName}}
</td>
<td
height=
"34px"
>
{{item.OriginalMoney}}
</td>
<td
height=
"34px"
>
{{item.Rate}}
</td>
<td
height=
"34px"
>
{{item.Money}}
</td>
<td
height=
"34px"
>
{{item.PayMoney}}
</td>
<td
height=
"34px"
>
{{item.Fee}}
</td>
<td
height=
"34px"
style=
"max-width: 120px;"
>
{{item.Remark}}
</td>
<td
height=
"34px"
>
{{item.EmName}}
</td>
</tr>
</template>
<tr
v-if=
"GetDetail.DmcTravelFinanceList&&GetDetail.DmcTravelFinanceList.length<2"
>
<td
height=
"34px"
></td>
<td
height=
"34px"
></td>
<td
height=
"34px"
></td>
<!--<td height="34px"></td>-->
<td
height=
"34px"
></td>
<td
height=
"34px"
></td>
<td
height=
"34px"
></td>
<td
height=
"34px"
></td>
<td
height=
"34px"
></td>
<td
height=
"34px"
></td>
<td
height=
"34px"
></td>
<td
height=
"34px"
></td>
</tr>
<tr
v-if=
"GetDetail.DmcTravelFinanceList&&GetDetail.DmcTravelFinanceList.length<3"
>
<td
height=
"34px"
></td>
<td
height=
"34px"
></td>
<td
height=
"34px"
></td>
<td
height=
"34px"
></td>
<td
height=
"34px"
></td>
<td
height=
"34px"
></td>
<td
height=
"34px"
></td>
<td
height=
"34px"
></td>
<td
height=
"34px"
></td>
<td
height=
"34px"
></td>
<td
height=
"34px"
></td>
<td
height=
"34px"
></td>
</tr>
<tr>
<td
height=
"26px"
>
合计
</td>
<td
height=
"26px"
></td>
<td
height=
"26px"
></td>
<td
height=
"26px"
></td>
<td
height=
"26px"
></td>
<td
height=
"26px"
>
{{moneyObj.OriginalMoney}}
</td>
<td
height=
"26px"
></td>
<td
height=
"26px"
>
{{moneyObj.Money}}
</td>
<td
height=
"26px"
>
{{moneyObj.PayMoney}}
</td>
<td
height=
"26px"
>
{{moneyObj.Fee}}
</td>
<td
height=
"26px"
></td>
<td
height=
"26px"
></td>
</tr>
</table>
</div>
</template>
<
script
>
export
default
{
props
:[
"ID"
,
"width"
,
"color"
,
"isPrintPage"
,
"name"
],
//接收参数 ID width color
data
(){
return
{
loading
:
false
,
// GetDetail:{DetailList:null},
EmployeeId
:
''
,
EndDate
:
''
,
StartDate
:
''
,
GetDetail
:
{},
moneyObj
:
{},
}
},
methods
:{
jumpPage
(
path
,
id
,
type
){
if
(
type
==
1
){
// let routeData = this.$router.resolve({
// name: path,
// query: { id:id,orderID:this.GetDetail.OrderID,isShow:false}
// });
// window.open(routeData.href, "_blank");
this
.
$router
.
push
({
name
:
path
,
query
:
{
id
:
id
,
orderID
:
this
.
GetDetail
.
OrderID
,
isShow
:
false
,
blank
:
'y'
}
})
}
else
if
(
type
==
2
){
// let routeData = this.$router.resolve({
// name: path,
// query: { starTime:this.StartDate,endTime:this.EndDate,EmployeeId:this.EmployeeId}
// });
// window.open(routeData.href, "_blank");
this
.
$router
.
push
({
name
:
path
,
query
:
{
id
:
id
,
blank
:
'y'
,
tab
:
id
+
'单据详情'
}
})
}
},
Financial_post_GetDetail
(
id
){
//获取单据详情
if
(
!
id
)
return
this
.
loading
=
true
;
this
.
apipost
(
'Financial_post_GetDetail'
,{
ID
:
id
},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
let
data
=
res
.
data
.
data
;
data
.
DetailList
.
forEach
(
x
=>
{
x
.
UnitPrice
=
this
.
$commonUtils
.
addCommas
(
Math
.
round
(
x
.
UnitPrice
*
100
)
/
100
)
x
.
Money
=
Math
.
round
(
x
.
Money
*
100
)
/
100
x
.
OriginalMoney
=
Math
.
round
(
x
.
OriginalMoney
*
100
)
/
100
})
let
OriginalMoney
=
0
;
let
Money
=
0
;
let
PayMoney
=
0
;
let
Fee
=
0
;
data
.
DmcTravelFinanceList
.
forEach
(
x
=>
{
OriginalMoney
+=
x
.
OriginalMoney
;
Money
+=
x
.
Money
;
PayMoney
+=
x
.
PayMoney
;
Fee
+=
x
.
Fee
;
})
this
.
moneyObj
=
{
OriginalMoney
:
Math
.
round
(
OriginalMoney
*
100
)
/
100
,
Money
:
Math
.
round
(
Money
*
100
)
/
100
,
PayMoney
:
Math
.
round
(
PayMoney
*
100
)
/
100
,
Fee
:
Math
.
round
(
Fee
*
100
)
/
100
,
}
data
.
ChineseMoney
=
this
.
$commonUtils
.
changeMoneyToChinese
(
data
.
Merge
.
Money
)
data
.
WBChineseMoney
=
this
.
$commonUtils
.
changeMoneyToChinese
(
data
.
Merge
.
WBMoney
)
data
.
Money
=
this
.
$commonUtils
.
addCommas
(
Math
.
round
(
data
.
Money
*
100
)
/
100
)
data
.
Merge
.
TradeDateV2
=
new
Date
(
data
.
Merge
.
TradeDateV2
).
Format
(
'yyyy-MM-dd'
)
data
.
AuditSteps
.
reverse
()
this
.
GetDetail
=
data
;
this
.
loading
=
false
this
.
$set
(
this
.
$data
,
"GetDetail"
,
data
);
}
},
err
=>
{})
},
},
mounted
(){
const
myDate
=
new
Date
();
let
yaer
=
myDate
.
getFullYear
();
//获取完整的年份(4位,1970-????)
let
month
=
myDate
.
getMonth
()
+
1
;
//获取当前月份(0-11,0代表1月)
let
dateS
=
myDate
.
getDate
();
//获取当前日(1-31)
this
.
StartDate
=
yaer
+
'-'
+
month
+
'-'
+
'01'
;
this
.
EndDate
=
yaer
+
'-'
+
month
+
'-'
+
dateS
;
let
userInfo
=
this
.
getLocalStorage
();
this
.
EmployeeId
=
userInfo
.
EmployeeId
;
this
.
Financial_post_GetDetail
(
this
.
ID
);
},
watch
:
{
// 监听参数变化
GetDetail
:
{
handler
:
function
(
val
,
oldVal
)
{
},
deep
:
true
},
ID
:{
handler
:
function
(
val
,
oldVal
)
{
this
.
ID
=
val
this
.
Financial_post_GetDetail
(
this
.
ID
)
},
deep
:
true
}
}
}
</
script
>
\ No newline at end of file
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