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
3ebcfff5
Commit
3ebcfff5
authored
Jan 31, 2020
by
zhengke
Browse files
Options
Browse Files
Download
Plain Diff
修改
parents
16cd652e
62a270f5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
120 additions
and
116 deletions
+120
-116
TeamRevenueReport.vue
...mponents/FinancialModule/ReportForm/TeamRevenueReport.vue
+15
-0
VisaProductOrder.vue
src/components/SalesVisa/VisaProductOrder.vue
+11
-5
scenicRecommentList.vue
src/components/scenicSpot/scenicRecommentList.vue
+82
-109
workDetails.vue
src/components/work/workDetails.vue
+2
-1
workManager.vue
src/components/work/workManager.vue
+9
-0
index.js
src/plug/index.js
+1
-1
No files found.
src/components/FinancialModule/ReportForm/TeamRevenueReport.vue
View file @
3ebcfff5
...
@@ -616,6 +616,7 @@ tr._item_list td:last-child {
...
@@ -616,6 +616,7 @@ tr._item_list td:last-child {
:footer=
"footer"
:footer=
"footer"
:footer-row-height=
"33"
:footer-row-height=
"33"
:multiple-sort=
"multipleSort"
:multiple-sort=
"multipleSort"
:row-click=
"rowClick"
>
>
<!-- 多个排序 -->
<!-- 多个排序 -->
</v-table>
</v-table>
...
@@ -1795,6 +1796,20 @@ export default {
...
@@ -1795,6 +1796,20 @@ export default {
this
.
getPageList
();
this
.
getPageList
();
},
},
methods
:
{
methods
:
{
rowClick
(
rowIndex
,
rowData
,
column
){
let
path
=
'RegistrationList'
;
if
(
this
.
msg
.
DataType
==
1
||
this
.
msg
.
DataType
==
'1'
){
if
(
column
.
title
==
"待收金额"
||
column
.
title
==
"溢收金额"
){
this
.
$router
.
push
({
name
:
path
,
query
:
{
id
:
rowData
.
TCID
,
blank
:
"y"
,
}
});
}
}
},
//获取目的地列表
//获取目的地列表
getLinePlaceList
(
lineId
)
{
getLinePlaceList
(
lineId
)
{
let
msg
=
{
let
msg
=
{
...
...
src/components/SalesVisa/VisaProductOrder.vue
View file @
3ebcfff5
...
@@ -124,10 +124,11 @@
...
@@ -124,10 +124,11 @@
</ul>
</ul>
</div>
</div>
<div
style=
"
padding-bottom: 10px;"
>
<div
style=
"padding-bottom: 10px;"
>
<span>
应收总额:
{{
moneyFormat
(
PreferPrice
)
}}
</span>
<span>
应收总额:
{{
moneyFormat
(
PreferPrice
)
}}
</span>
<span>
实收:
{{
moneyFormat
(
IncomePrice
)
}}
</span>
<span>
实收:
{{
moneyFormat
(
IncomePrice
)
}}
</span>
<span>
待收:
<span
:class=
"
{color_red:(PreferPrice-IncomePrice)!==0}">
{{
moneyFormat
(
PreferPrice
-
IncomePrice
)
}}
</span></span>
<span>
优惠:
{{
moneyFormat
(
DiscountMoneyAll
)
}}
</span>
<span>
待收:
<span
:class=
"
{color_red:(PreferPrice-IncomePrice-DiscountMoneyAll)!==0}">
{{
moneyFormat
(
PreferPrice
-
IncomePrice
-
DiscountMoneyAll
)
}}
</span></span>
</div>
</div>
<table
class=
"VisaProductTable"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
v-loading=
'loading'
>
<table
class=
"VisaProductTable"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
v-loading=
'loading'
>
<tr>
<tr>
...
@@ -321,6 +322,7 @@ export default {
...
@@ -321,6 +322,7 @@ export default {
isShow
:
0
,
isShow
:
0
,
PreferPrice
:
0
,
PreferPrice
:
0
,
IncomePrice
:
0
,
IncomePrice
:
0
,
DiscountMoneyAll
:
0
,
EmployeeId
:
0
,
EmployeeId
:
0
,
EditVisible
:
false
,
EditVisible
:
false
,
EditMsg
:{
EditMsg
:{
...
@@ -400,8 +402,9 @@ export default {
...
@@ -400,8 +402,9 @@ export default {
},
},
getList
(){
// 获取列表数据
getList
(){
// 获取列表数据
this
.
apipost
(
'dmc_get_visa_GetVisaOrderList'
,
this
.
msg
,
res
=>
{
this
.
apipost
(
'dmc_get_visa_GetVisaOrderList'
,
this
.
msg
,
res
=>
{
this
.
PreferPrice
=
0
;
this
.
PreferPrice
=
0
;
this
.
IncomePrice
=
0
;
this
.
IncomePrice
=
0
;
this
.
DiscountMoneyAll
=
0
;
if
(
res
.
data
.
resultCode
==
0
){
if
(
res
.
data
.
resultCode
==
0
){
this
.
loading
=
false
;
this
.
loading
=
false
;
this
.
dataList
=
[]
this
.
dataList
=
[]
...
@@ -412,8 +415,11 @@ export default {
...
@@ -412,8 +415,11 @@ export default {
this
.
dataList
.
forEach
(
x
=>
{
this
.
dataList
.
forEach
(
x
=>
{
if
(
x
.
VisaOrderStatus
!=
2
){
if
(
x
.
VisaOrderStatus
!=
2
){
this
.
PreferPrice
+=
x
.
TotalPrice
;
this
.
PreferPrice
+=
x
.
TotalPrice
;
this
.
DiscountMoneyAll
+=
x
.
DiscountMoney
;
this
.
IncomePrice
+=
(
x
.
Income
+
x
.
PlatformTax
-
x
.
RefundMoney
);
}
}
this
.
IncomePrice
+=
(
x
.
Income
+
x
.
PlatformTax
-
x
.
RefundMoney
);
})
})
}
}
},
err
=>
{})
},
err
=>
{})
...
...
src/components/scenicSpot/scenicRecommentList.vue
View file @
3ebcfff5
This diff is collapsed.
Click to expand it.
src/components/work/workDetails.vue
View file @
3ebcfff5
...
@@ -57,7 +57,8 @@
...
@@ -57,7 +57,8 @@
<p
v-if=
"d.w"
>
{{
d
.
w
.
CreateName
}}
提交于
{{
item
.
CreateDate
}}
</p>
<p
v-if=
"d.w"
>
{{
d
.
w
.
CreateName
}}
提交于
{{
item
.
CreateDate
}}
</p>
<div
class=
"cont"
>
{{
item
.
Content
}}
</div>
<div
class=
"cont"
>
{{
item
.
Content
}}
</div>
<div
class=
"attach"
>
<div
class=
"attach"
>
<a
href=
"http://baidu.com"
target=
"_blank"
>
附件:baidu.jpg
</a>
附件:无
<!--
<a
href=
"http://baidu.com"
target=
"_blank"
></a>
-->
</div>
</div>
</el-card>
</el-card>
</div>
</div>
...
...
src/components/work/workManager.vue
View file @
3ebcfff5
...
@@ -357,6 +357,15 @@ export default {
...
@@ -357,6 +357,15 @@ export default {
err
=>
{}
err
=>
{}
);
);
},
},
query
(
id
){
this
.
$router
.
push
({
name
:
"workDetails"
,
query
:
{
"id"
:
id
,
blank
:
'y'
}
})
},
query2
(
id
){
query2
(
id
){
this
.
$router
.
push
({
this
.
$router
.
push
({
name
:
"workDetails"
,
name
:
"workDetails"
,
...
...
src/plug/index.js
View file @
3ebcfff5
...
@@ -118,7 +118,7 @@ export default {
...
@@ -118,7 +118,7 @@ export default {
javaUrldo
=
locationName
.
indexOf
(
'oytour'
)
!==
-
1
||
locationName
.
indexOf
(
'viitto'
)
!==
-
1
?
(
locationName
.
indexOf
(
'oytour'
)
!==
-
1
?
"http://efficient.oytour.com"
:
"http://47.96.12.235:9001"
)
:
"http://192.168.2.215:9000"
;
javaUrldo
=
locationName
.
indexOf
(
'oytour'
)
!==
-
1
||
locationName
.
indexOf
(
'viitto'
)
!==
-
1
?
(
locationName
.
indexOf
(
'oytour'
)
!==
-
1
?
"http://efficient.oytour.com"
:
"http://47.96.12.235:9001"
)
:
"http://192.168.2.215:9000"
;
if
(
locationName
.
indexOf
(
'testerp.oytour'
)
!==
-
1
)
{
if
(
locationName
.
indexOf
(
'testerp.oytour'
)
!==
-
1
)
{
domainUrl
=
"http://
127.0.0.1:8082
"
;
domainUrl
=
"http://
testapi.oytour.com
"
;
}
}
else
if
(
locationName
.
indexOf
(
'oytour'
)
!==
-
1
)
{
else
if
(
locationName
.
indexOf
(
'oytour'
)
!==
-
1
)
{
domainUrl
=
"http://reborn.oytour.com"
;
domainUrl
=
"http://reborn.oytour.com"
;
...
...
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