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
f65816aa
Commit
f65816aa
authored
Dec 12, 2019
by
zhengke
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
parent
353a07b8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
68 additions
and
42 deletions
+68
-42
commonTripList.vue
src/components/commonPage/commonTripList.vue
+59
-34
onedayTripContract.vue
src/components/onedayTripContract.vue
+9
-8
No files found.
src/components/commonPage/commonTripList.vue
View file @
f65816aa
...
...
@@ -61,56 +61,45 @@
background-color
:
#90b7ec
;
color
:
#fff
;
}
.addTrip
{
width
:
30px
;
height
:
30px
;
color
:
#fff
;
text-align
:
center
;
font-size
:
25px
;
line-height
:
28px
;
background-color
:
#f60
;
border-radius
:
100%
;
cursor
:
pointer
;
margin
:
4px
0
20px
128px
;
}
</
style
>
<
template
>
<div>
<div
class=
"Trip_Content"
>
<div
class=
"Trip_Content"
v-for=
"(item,index) in TripListArr"
>
<div
class=
"leftDayList"
>
<span
class=
"dayNum"
>
第
1
天
</span>
<span
class=
"dayNum"
>
第
{{
index
+
1
}}
天
</span>
</div>
<div
class=
"siteList"
>
<el-form-item
label=
"前往地"
label-width=
'100px'
style=
"display:inline-block;"
>
<el-input
type=
"text"
class=
"w150"
></el-input
>
仲裁委员会仲裁;
<el-input
type=
"text"
class=
"w150"
v-model=
"item.Go"
></el-input>
</el-form-item>
<el-form-item
label=
"前往省份/国家地区"
label-width=
'160px'
style=
"display:inline-block;"
>
<el-input
type=
"text"
class=
"w150"
></el-input>
<el-input
type=
"text"
class=
"w150"
v-model=
"item.GoProvice"
></el-input>
</el-form-item>
<el-form-item
label=
"是否过境"
label-width=
'100px'
style=
"display:inline-block;"
>
<el-checkbox
v-model=
"
checked
"
></el-checkbox>
<el-checkbox
v-model=
"
item.IsOut"
:true-label=
"CheckedVaule"
:false-label=
"UnCheckedVaule
"
></el-checkbox>
</el-form-item>
<el-input
type=
"textarea"
resize=
"none"
rows=
"16"
cols=
"40"
></el-input>
<el-input
type=
"textarea"
resize=
"none"
rows=
"16"
cols=
"40"
v-model=
"item.TravelContent"
></el-input>
<div
class=
"TC_circles"
></div>
</div>
<div
class=
"TripControl"
>
<i
class=
"iconfont icon-baocun1"
></i>
<i
class=
"iconfont icon-img_delete_small"
style=
"margin-left:10px;"
></i>
</div>
</div>
<div
class=
"Trip_Content"
>
<div
class=
"leftDayList"
>
<span
class=
"dayNum"
>
第1天
</span>
</div>
<div
class=
"siteList"
>
<el-form-item
label=
"前往地"
label-width=
'100px'
style=
"display:inline-block;"
>
<el-input
type=
"text"
class=
"w150"
></el-input
>
仲裁委员会仲裁;
</el-form-item>
<el-form-item
label=
"前往省份/国家地区"
label-width=
'160px'
style=
"display:inline-block;"
>
<el-input
type=
"text"
class=
"w150"
></el-input>
</el-form-item>
<el-form-item
label=
"是否过境"
label-width=
'100px'
style=
"display:inline-block;"
>
<el-checkbox
v-model=
"checked"
></el-checkbox>
</el-form-item>
<el-input
type=
"textarea"
resize=
"none"
rows=
"16"
cols=
"40"
></el-input>
<div
class=
"TC_circles"
></div>
</div>
<div
class=
"TripControl"
>
<i
class=
"iconfont icon-baocun1"
></i>
<i
class=
"iconfont icon-img_delete_small"
style=
"margin-left:10px;"
></i>
<i
class=
"iconfont icon-baocun1"
@
click=
"saveTripList(item,index)"
></i>
<i
class=
"iconfont icon-img_delete_small"
style=
"margin-left:10px;"
@
click=
"delTrip(index)"
></i>
</div>
</div>
<div
class=
"addTrip"
@
click=
"addTrip()"
>
+
</div>
</div>
</
template
>
...
...
@@ -118,14 +107,50 @@
export
default
{
data
()
{
return
{
checked
:
false
checked
:
false
,
TripListArr
:[],
//选中过境
CheckedVaule
:
1
,
//不过境
UnCheckedVaule
:
0
,
};
},
mounted
()
{
},
methods
:
{
//添加行程
addTrip
(){
let
obj
=
{
DayNum
:
''
,
//天数
Go
:
''
,
// 前往地
GoProvice
:
''
,
//前往国家地区
IsOut
:
0
,
// 是否过境(0-不过,1-过)
TravelContent
:
''
,
//行程内容
IsShow
:
0
,
}
this
.
TripListArr
.
push
(
obj
);
},
//删除行程
delTrip
(
index
){
this
.
TripListArr
.
splice
(
index
,
1
);
this
.
getSavedData
();
},
//保存行程
saveTripList
(
item
,
index
){
item
.
DayNum
=
index
+
1
;
item
.
IsShow
=
1
;
this
.
getSavedData
();
},
//遍历已经保存数据
getSavedData
(){
let
sendArr
=
[];
this
.
TripListArr
.
forEach
(
x
=>
{
sendArr
.
push
(
x
);
})
this
.
$emit
(
'tripData'
,
sendArr
);
}
}
};
</
script
>
src/components/onedayTripContract.vue
View file @
f65816aa
...
...
@@ -1015,12 +1015,8 @@
<div
style=
"padding:10px;"
>
未尽事宜,经旅游者和出境社双方协商一致,可以列入补充条款。(如合同空间不够,可以另附纸张,由双方签字或者盖章确认。)
</div>
<el-input
type=
"textarea"
resize=
"none"
v-model=
"CtObj.OtherConvention"
rows=
"13"
></el-input>
<!--
<el-input
type=
"textarea"
resize=
"none"
v-model=
"CtObj.OtherConvention"
rows=
"13"
></el-input>
-->
<quill-editor
v-model=
"CtObj.OtherConvention"
style=
"height:400px;"
></quill-editor>
</div>
<div
class=
"block mtop15"
id=
"anchor-3"
ref=
"anchor3"
>
<div
class=
"blockTitle"
>
...
...
@@ -1045,10 +1041,11 @@
《行程单》用语须准确清晰,在表明服务标准用语中不应当出现“准×星级”、“豪华”、“仅供参考”、“以××为准”、“与××同级”等不确定用语。
</div>
<div
v-if=
"CtObj.TripType==0"
>
<el-input
type=
"textarea"
rows=
"26"
resize=
"none"
v-model=
"CtObj.travelContent"
></el-input>
<!--
<el-input
type=
"textarea"
rows=
"26"
resize=
"none"
v-model=
"CtObj.travelContent"
></el-input>
-->
<quill-editor
v-model=
"CtObj.travelContent"
style=
"height:400px;"
></quill-editor>
</div>
<div
v-if=
"CtObj.TripType==1"
>
<commonTripList></commonTripList>
<commonTripList
@
tripData=
"tripData"
></commonTripList>
</div>
</div>
<div
class=
"block mtop15"
id=
"anchor-4"
ref=
"anchor4"
>
...
...
@@ -1790,6 +1787,10 @@ export default {
this
.
CtObj
.
TripType
=
0
;
this
.
tripStr
=
'切换到标准行程录入'
;
}
},
//获取子组件数据
tripData
(
msg
){
this
.
CtObj
.
ContractTripList
=
msg
;
}
},
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