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
da90ae64
Commit
da90ae64
authored
Dec 11, 2019
by
黄奎
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://gitlab.oytour.com/luochao/superman
parents
aedc820b
e52d6023
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
485 additions
and
283 deletions
+485
-283
DomesticTravelcontract.vue
src/components/DomesticTravelcontract.vue
+317
-259
ContractManage.vue
src/components/administrative/ContractManage.vue
+2
-2
LianMengManagement.vue
src/components/administrative/LianMengManagement.vue
+5
-4
happyMoneyDetails.vue
src/components/administrative/happyMoneyDetails.vue
+55
-7
commonTripList.vue
src/components/commonPage/commonTripList.vue
+36
-0
leaderPay2.vue
src/components/leaderPay2.vue
+1
-1
onedayTripContract.vue
src/components/onedayTripContract.vue
+69
-10
No files found.
src/components/DomesticTravelcontract.vue
View file @
da90ae64
This diff is collapsed.
Click to expand it.
src/components/administrative/ContractManage.vue
View file @
da90ae64
...
...
@@ -85,13 +85,13 @@
/>
<input
type=
"button"
@
click=
"goContract('
onedayTripC
ontract')"
@
click=
"goContract('
DomesticTravelc
ontract')"
class=
"normalBtn"
value=
"境内旅游合同"
/>
<input
type=
"button"
@
click=
"goContract('
onedayTrip
Contract')"
@
click=
"goContract('
Single
Contract')"
class=
"normalBtn"
value=
"单项委托合同"
/>
...
...
src/components/administrative/LianMengManagement.vue
View file @
da90ae64
...
...
@@ -34,10 +34,10 @@
</tr>
<tr
v-for=
"item in dataList"
>
<td>
{{
item
.
AllianceName
}}
</td>
<td>
{{
item
.
CustomerCount
}}
</td>
<td>
<span
class=
"cursorpointer text-decoration"
@
click=
"goCustomerList(item.ID)"
>
{{
item
.
CustomerCount
}}
</span>
</td>
<td>
{{
item
.
StartYear
}}
-
{{
item
.
EndYear
}}
</td>
<td>
{{
moneyFormat
(
item
.
TradeMoney
)
}}
</td>
<td><span
class=
"cursorpointer text-decoration"
@
click=
"
goCustomerList(item.ID)"
>
{{
item
.
TotalGuestNum
}}
</span></td>
<td><span
class=
"cursorpointer text-decoration"
@
click=
"
jiesuan(item.ID, 'happyMoneyDetails', 1)"
>
{{
item
.
TotalGuestNum
}}
</span></td>
<td
class=
"_icon_btn"
>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"新增客户"
placement=
"top"
>
<i
class=
"edit el-icon-edit"
@
click=
"addCustorm(item)"
></i>
...
...
@@ -186,13 +186,14 @@ export default {
this
.
employeeMsg
.
GroupId
=
userInfo
.
RB_Group_id
;
//集团ID
this
.
getEmployee
()
},
methods
:
{
jiesuan
:
function
(
ID
,
path
){
jiesuan
:
function
(
ID
,
path
,
t
){
this
.
$router
.
push
({
name
:
path
,
query
:
{
id
:
ID
,
blank
:
"y"
,
tab
:
'大红包结算'
tab
:
'大红包结算'
,
type
:
t
}
});
},
...
...
src/components/administrative/happyMoneyDetails.vue
View file @
da90ae64
...
...
@@ -120,9 +120,22 @@
background-color
:
#a0a0a0
;
border-color
:
#a0a0a0
;
}
.happyMoney
._icon_btn
i
{
width
:
30px
;
height
:
30px
;
display
:
inline-block
;
color
:
white
!important
;
border-radius
:
50%
;
text-align
:
center
;
line-height
:
28px
;
margin-right
:
10px
;
cursor
:
pointer
;
outline
:
none
;
}
.happyMoney
._icon_btn
i
.icon-guanli2
{
background-color
:
#E95252
;}
</
style
>
<
template
>
<div
class=
"happyMoney"
v-
if=
"
show"
>
<div
class=
"happyMoney"
v-
loading=
"!
show"
>
<div
class=
"tit"
>
<div
class=
"name"
>
{{
dataList
.
AllianceName
+
dataList
.
EndYear
}}
年度大红包结算
</div>
</div>
...
...
@@ -143,15 +156,21 @@
<th>
名称
</th>
<th>
交易金额
</th>
<th>
交易人头
</th>
<th>
预计返现
</th>
<th
width=
"200"
>
确认返现
</th>
<th
v-if=
"!hideBtn"
>
预计返现
</th>
<th
width=
"200"
v-if=
"!hideBtn"
>
确认返现
</th>
<th
v-if=
"hideBtn"
>
操作
</th>
</tr>
<tr
v-for=
"(item, index) in dataList.CustomerList"
>
<td>
{{
item
.
CustomerName
}}
</td>
<td>
{{
item
.
CustomerName
}}
<span
v-if=
"item.IsMain == 1"
style=
"color: #E95252"
>
(主)
</span>
</td>
<td>
¥
{{
moneyFormat
(
item
.
TradeMoney
)
}}
</td>
<td>
{{
item
.
TotalGuestNum
}}
人
</td>
<td>
¥
{{
moneyFormat
(
item
.
PredictPrice
)
}}
</td>
<td>
¥
{{
moneyFormat
(
item
.
PredictPrice
)
}}
</td>
<td
v-if=
"!hideBtn"
>
¥
{{
moneyFormat
(
item
.
PredictPrice
)
}}
</td>
<td
v-if=
"!hideBtn"
>
¥
{{
moneyFormat
(
item
.
PredictPrice
)
}}
</td>
<td
class=
"_icon_btn"
v-if=
"hideBtn"
>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"设置主门店"
placement=
"top"
>
<i
class=
"iconfont icon-guanli2"
@
click=
"setAdmin(item)"
></i>
</el-tooltip>
</td>
</tr>
</table>
<div
class=
"_addUpload_box clearfix"
>
...
...
@@ -203,18 +222,47 @@ export default {
picIsShow
:
false
,
show
:
false
,
dataList
:
{},
hideBtn
:
false
,
};
},
mounted
()
{
let
id
=
this
.
$route
.
query
.
id
if
(
this
.
$route
.
query
.
type
){
this
.
hideBtn
=
true
}
this
.
getList
(
id
);
},
methods
:
{
setAdmin
:
function
(
obj
)
{
let
ParentId
=
this
.
$route
.
query
.
id
this
.
$confirm
(
'确认设置“'
+
obj
.
CustomerName
+
'”为主门店?'
,
'提示'
,
{
confirmButtonText
:
'确定'
,
cancelButtonText
:
'取消'
,
type
:
'warning'
}).
then
(()
=>
{
this
.
apipost
(
"app_customer_UpdateIsMain"
,
{
ParentId
:
ParentId
,
Id
:
obj
.
ID
},
res
=>
{
if
(
res
.
data
.
resultCode
===
1
)
{
this
.
$message
.
success
(
res
.
data
.
message
)
this
.
getList
(
ParentId
);
}
},
null
);
}).
catch
(()
=>
{
this
.
$message
({
type
:
'info'
,
message
:
'已取消'
});
});
},
getList
:
function
(
id
)
{
this
.
show
=
false
this
.
apipost
(
"app_customer_GetClearingAllianceDetails"
,
{
Id
:
id
},
{
Id
:
id
},
res
=>
{
if
(
res
.
data
.
resultCode
===
1
)
{
this
.
show
=
true
...
...
src/components/commonPage/commonTripList.vue
0 → 100644
View file @
da90ae64
<
style
>
.leftDayList
{
display
:
inline-block
;
}
.dayNum
{
font-weight
:
bold
;
font-size
:
16px
;
margin-left
:
-42px
;
position
:
relative
;
z-index
:
2
;
margin-bottom
:
5px
;
display
:
block
;
}
.siteList
{
display
:
inline-block
;
position
:
relative
;
border-left
:
2px
solid
#ebebec
;
position
:
relative
;
padding
:
0
0
20px
;
margin-left
:
10px
;
}
</
style
>
<
template
>
<div>
<div
class=
"leftDayList"
>
<span
class=
"dayNum"
>
第1天
</span>
</div>
<div
class=
"siteList"
>
<el-form-item
label=
"前往地"
label-width=
'100px'
>
<el-input
type=
"text"
class=
"w300"
></el-input
>
仲裁委员会仲裁;
</el-form-item>
</div>
</div>
</
template
>
src/components/leaderPay2.vue
View file @
da90ae64
...
...
@@ -1338,7 +1338,7 @@
let
obj
=
this
.
lingjiandiObj
let
inputPrice
=
obj
.
price
?
parseFloat
(
obj
.
price
)
:
0
let
userinfo
=
this
.
getLocalStorage
()
if
(
inputPrice
<
=
0
)
{
if
(
inputPrice
=
=
0
)
{
this
.
$message
.
error
(
'请输入制单金额'
)
return
}
...
...
src/components/onedayTripContract.vue
View file @
da90ae64
...
...
@@ -271,6 +271,26 @@
.onedayAccount
.el-form-item__label
{
margin-top
:
5px
;
}
.ContractNum
{
font-size
:
16px
!important
;
color
:
#5882bb
;
margin-left
:
20px
;
}
.Tc_ExchangeBtn
{
padding
:
3px
10px
;
background-color
:
#006dcc
;
color
:
#fff
;
float
:
right
;
margin-top
:
10px
;
border
:
none
;
outline
:
none
;
cursor
:
pointer
;
}
.Tc_ExchangeBtn
:hover
{
color
:
#ffffff
;
background-color
:
#0044cc
;
*
background-color
:
#003bb3
;
}
</
style
>
<
template
>
<div
class=
"TC-MainContent"
>
...
...
@@ -288,6 +308,7 @@
<div
class=
"contractTit"
>
<span>
全国版国内旅游一日游合同示范文本
<span
class=
"ContractNum"
>
合同编号:
{{
CtObj
.
T_ContractNum
}}
</span>
<span
style=
"color:blue;font-size:14px;"
></span>
</span>
<div
class=
"pull-right"
>
...
...
@@ -960,7 +981,19 @@
</div>
</td>
</tr>
<tr>
<tr
v-if=
"CtObj.C_SolveType==1"
>
<td>
<el-form-item
label=
"1.将争议提交"
label-width=
'225px'
>
<el-input
type=
"text"
class=
"w300"
v-model=
"CtObj.C_SolveRemark"
></el-input
>
仲裁委员会仲裁;
</el-form-item>
</td>
</tr>
<tr
v-if=
"CtObj.C_SolveType==2"
>
<td>
<div
style=
"margin:0 0 20px 130px;"
>
2.依法向人民法院提起民事诉讼。
...
...
@@ -996,6 +1029,7 @@
</span>
<h2>
<em>
行程信息
</em>
<input
type=
"button"
class=
"Tc_ExchangeBtn"
@
click=
"exchangeTrip()"
:value=
"tripStr"
/>
</h2>
</div>
<div
style=
"padding:10px;background:#f9f9f9;color:red;"
>
...
...
@@ -1010,10 +1044,12 @@
(8)行程安排的娱乐活动(明确娱乐活动的时间、地点和项目内容);
《行程单》用语须准确清晰,在表明服务标准用语中不应当出现“准×星级”、“豪华”、“仅供参考”、“以××为准”、“与××同级”等不确定用语。
</div>
<div>
123
<div
v-if=
"CtObj.TripType==0"
>
<el-input
type=
"textarea"
rows=
"26"
resize=
"none"
v-model=
"CtObj.travelContent"
></el-input>
</div>
<div
v-if=
"CtObj.TripType==1"
>
<commonTripList></commonTripList>
</div>
<!--
<el-input
type=
"textarea"
rows=
"26"
resize=
"none"
v-model=
"CtObj.travelContent"
></el-input>
-->
</div>
<div
class=
"block mtop15"
id=
"anchor-4"
ref=
"anchor4"
>
<div
class=
"blockTitle"
>
...
...
@@ -1109,7 +1145,7 @@
type=
"primary"
icon=
"el-icon-edit"
circle
@
click=
"
item.IsShow = 1
"
@
click=
"
getItem(item)
"
></el-button>
</el-tooltip>
<el-tooltip
...
...
@@ -1310,7 +1346,7 @@
</div>
</
template
>
<
script
>
import
moment
from
"moment
"
;
import
commonTripList
from
"./commonPage/commonTripList.vue
"
;
export
default
{
data
()
{
return
{
...
...
@@ -1320,6 +1356,7 @@ export default {
CtObj
:
{
ID
:
0
,
CType
:
3
,
//合同类型:(1-单项委托协议[平台版2018],2大陆境内旅游合同2014,3-全国版国内旅游一日游旅游合同示范文本[2015版])
T_ContractNum
:
''
,
Tourists_Name
:
""
,
Tourists_IDNum
:
""
,
Tourists_Addres
:
""
,
...
...
@@ -1369,7 +1406,7 @@ export default {
C_IsAgreeRemove
:
1
,
// 是否同意解除合同(1-不同意,0同意)
C_IsAgreeSpellGroup
:
1
,
// 是否同意拼团(1-不同意,0同意)
C_SpellGroupName
:
""
,
// 拼团旅行社名称
C_SolveType
:
""
,
// 争议解决方式
C_SolveType
:
2
,
// 争议解决方式
C_SolveRemark
:
""
,
// 争议解决方式备注
C_ContractTotal
:
""
,
// 合同总分数
C_ContractPer
:
1
,
// 各持几份
...
...
@@ -1405,6 +1442,7 @@ export default {
OtherConventionPrice
:
""
,
// 其他服务费用合计
OtherConvention
:
""
,
// 其他约定事项
TripJson
:
""
,
TripType
:
0
,
//行程类型(0-简易行程,1-标准行程)
GuestJson
:
""
,
// 游客信息【json】
ShopJson
:
""
,
// 购物信息【json】
SelfFeeJson
:
""
,
// 自费信息【Json】
...
...
@@ -1448,7 +1486,7 @@ export default {
{
required
:
true
,
message
:
"请输入返回地点"
,
trigger
:
"change"
}
]
},
tripStr
:
'切换到标准行程录入'
,
//菜单列表
menuArr
:
[
"合同基本信息"
,
...
...
@@ -1471,9 +1509,12 @@ export default {
CGuestHealth
:
"健康"
,
IsShow
:
1
}
]
]
,
};
},
components
:
{
commonTripList
:
commonTripList
},
methods
:
{
//跳转锚点
goAnchor
(
selector
)
{
...
...
@@ -1574,6 +1615,12 @@ export default {
this
.
ckedIndex
=
5
;
}
},
getItem
(
item
){
item
.
IsShow
=
1
;
this
.
$forceUpdate
();
},
GetData
()
{
this
.
apipost
(
"travelcontract_get_GetTravelContractService"
,
...
...
@@ -1581,8 +1628,10 @@ export default {
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
var
tempObj
=
res
.
data
.
data
;
console
.
log
(
tempObj
,
'tempobj'
);
this
.
CtObj
.
ID
=
tempObj
.
ID
;
this
.
CtObj
.
CType
=
tempObj
.
CType
;
this
.
CtObj
.
T_ContractNum
=
tempObj
.
T_ContractNum
;
this
.
CtObj
.
Tourists_Name
=
tempObj
.
Tourists_Name
;
this
.
CtObj
.
Tourists_IDNum
=
tempObj
.
Tourists_IDNum
;
this
.
CtObj
.
Tourists_Addres
=
tempObj
.
Tourists_Addres
;
...
...
@@ -1717,7 +1766,7 @@ export default {
gItem
.
IsShow
=
0
;
});
}
console
.
log
(
this
.
CtObj
.
ContractGuestList
,
'this.CtObj.ContractGuestList'
);
if
(
tempObj
.
ContractTripList
&&
tempObj
.
ContractTripList
!=
null
&&
...
...
@@ -1733,6 +1782,16 @@ export default {
},
err
=>
{}
);
},
//点击切换行程
exchangeTrip
(){
if
(
this
.
CtObj
.
TripType
==
0
){
this
.
CtObj
.
TripType
=
1
;
this
.
tripStr
=
'切换到简易行程录入'
;
}
else
{
this
.
CtObj
.
TripType
=
0
;
this
.
tripStr
=
'切换到标准行程录入'
;
}
}
},
mounted
()
{
...
...
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