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
8cc46a54
Commit
8cc46a54
authored
Oct 23, 2019
by
zhengke
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
parent
aef61f61
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
16 deletions
+16
-16
newTravelManager.css
src/assets/css/newTravelManager.css
+1
-1
TravelDaysTrip_Direct.vue
...newTravelmanager/travelLineTrip/TravelDaysTrip_Direct.vue
+6
-6
travelDaysTrip.vue
...onents/newTravelmanager/travelLineTrip/travelDaysTrip.vue
+9
-9
No files found.
src/assets/css/newTravelManager.css
View file @
8cc46a54
...
...
@@ -2876,6 +2876,6 @@
.travelprice
{
color
:
#47BF8C
;
font-size
:
12px
;
font-weight
:
bold
;
margin
:
5px
0
;
white-space
:
nowrap
}
.showOther
{
display
:
none
;
display
:
none
!important
;
}
src/components/newTravelmanager/travelLineTrip/TravelDaysTrip_Direct.vue
View file @
8cc46a54
...
...
@@ -76,8 +76,8 @@
</el-input>
</el-form-item>
</span>
<span
class=
"TDTextspan"
>
集合出发城市
</span>
<span>
<span
class=
"TDTextspan"
:class=
"{'showOther':TeamType==3}"
>
集合出发城市
</span>
<span
:class=
"{'showOther':TeamType==3}"
>
<el-form-item
prop=
"StartCityId"
>
<el-select
class=
"w120"
:placeholder=
"$t('pub.pleaseSel')"
v-model=
"subConfig.StartCityId"
filterable
>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
"SelectDefaultValue"
></el-option>
...
...
@@ -86,8 +86,8 @@
</el-select>
</el-form-item>
</span>
<span
class=
"TDTextspan"
>
返回抵达城市
</span>
<span>
<span
class=
"TDTextspan"
:class=
"{'showOther':TeamType==3}"
>
返回抵达城市
</span>
<span
:class=
"{'showOther':TeamType==3}"
>
<el-form-item
prop=
"ReturnArriveCityId"
>
<el-select
class=
"w120"
:placeholder=
"$t('pub.pleaseSel')"
v-model=
"subConfig.ReturnArriveCityId"
filterable
>
...
...
@@ -97,8 +97,8 @@
</el-select>
</el-form-item>
</span>
<span
class=
"TDTextspan"
>
是否更新行程特色
</span>
<span>
<span
class=
"TDTextspan"
:class=
"{'showOther':TeamType==3}"
>
是否更新行程特色
</span>
<span
:class=
"{'showOther':TeamType==3}"
>
<el-form-item
prop=
"ReturnArriveCityId"
>
<el-select
class=
"w120"
:placeholder=
"$t('pub.pleaseSel')"
v-model=
"subConfig.IsUpdateTrip"
>
<el-option
label=
"不更新"
:value=
"0"
></el-option>
...
...
src/components/newTravelmanager/travelLineTrip/travelDaysTrip.vue
View file @
8cc46a54
...
...
@@ -189,30 +189,30 @@
<noScenic
v-if=
"!ishasScenic"
:trafficObj=
"dayObj.TrafficObj"
></noScenic>
</div>
<div
class=
"TC-ComInfoDiv"
:class=
"scenicCheck>0||dayObj.ScenicArray.length>0?'_margin_bottom':''"
>
<onedayList
<onedayList
:class=
"
{'showOther':TeamType==3}"
v-if="(NoticeParameters.IsDirect==1
&&
dayObj.ScenicArray.length==1)||(scenicCheck==1
&&
NoticeParameters.IsDirect==0)"
:isRead="dayObj.isRead" :scenicArray="dayObj.ScenicArray"
:IsDirect="NoticeParameters.IsDirect" :DayNum="dayObj.DayNum">
</onedayList>
<twodayList
<twodayList
:class=
"
{'showOther':TeamType==3}"
v-if="(NoticeParameters.IsDirect==1
&&
dayObj.ScenicArray.length==2)||(scenicCheck==2
&&
NoticeParameters.IsDirect==0)"
:isRead="dayObj.isRead" :scenicArray="dayObj.ScenicArray"
:IsDirect="NoticeParameters.IsDirect" :DayNum="dayObj.DayNum">
</twodayList>
<threedayList
<threedayList
:class=
"
{'showOther':TeamType==3}"
v-if="(NoticeParameters.IsDirect==1
&&
dayObj.ScenicArray.length==3)||(scenicCheck==3
&&
NoticeParameters.IsDirect==0)"
:isRead="dayObj.isRead" :scenicArray="dayObj.ScenicArray"
:IsDirect="NoticeParameters.IsDirect" :DayNum="dayObj.DayNum">
</threedayList>
<fourdayList
<fourdayList
:class=
"
{'showOther':TeamType==3}"
v-if="(NoticeParameters.IsDirect==1
&&
dayObj.ScenicArray.length==4)||(scenicCheck==4
&&
NoticeParameters.IsDirect==0)"
:isRead="dayObj.isRead" :scenicArray="dayObj.ScenicArray"
:IsDirect="NoticeParameters.IsDirect" :DayNum="dayObj.DayNum">
</fourdayList>
<fivedayList
<fivedayList
:class=
"
{'showOther':TeamType==3}"
v-if="(NoticeParameters.IsDirect==1
&&
dayObj.ScenicArray.length==5)||(scenicCheck==5
&&
NoticeParameters.IsDirect==0)"
:isRead="dayObj.isRead" :scenicArray="dayObj.ScenicArray"
:IsDirect="NoticeParameters.IsDirect" :DayNum="dayObj.DayNum">
</fivedayList>
</div>
<div
class=
"TC-warmTips TC-Comtitlediv"
v-if=
"!dayObj.isRead"
>
<div
class=
"TC-warmTips TC-Comtitlediv"
v-if=
"!dayObj.isRead"
:class=
"
{'showOther':TeamType==3}"
>
<div
class=
"TC-SpecialInstruction clearfix"
>
<div
class=
"TC-leftTitle"
>
温馨提醒
</div>
<div
class=
"TC-leftTitle"
>
温馨提醒
111
</div>
<div
class=
"TC-rightContent"
>
<!--
<el-input
type=
"textarea"
v-model=
"dayObj.WarmTipObj.Description"
></el-input>
-->
<my-edit
v-on:edit-value=
"dayObj.WarmTipObj.Description = arguments[0]"
...
...
@@ -222,9 +222,9 @@
</div>
</div>
</div>
<div
class=
"TC-warmTips TC-Comtitlediv TC-warmText"
v-if=
"dayObj.isRead"
>
<div
class=
"TC-warmTips TC-Comtitlediv TC-warmText"
v-if=
"dayObj.isRead"
:class=
"
{'showOther':TeamType==3}"
>
<div
class=
"TC-SpecialInstruction clearfix"
>
<div
class=
"TC-leftTitle"
>
温馨提醒
</div>
<div
class=
"TC-leftTitle"
>
温馨提醒
222
</div>
<div
class=
"TC-rightContent"
v-html=
"dayObj.WarmTipObj.Description"
></div>
</div>
</div>
...
...
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