Skip to content

S
SuperMan
Commit 3da6c208 authored by liudong1993's avatar liudong1993
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents f35727ee cbdd5bf2
Hide whitespace changes
Inline Side-by-side
Showing with 135 additions and 67 deletions
src/components/DomesticTravelcontract.vue
View file @ 3da6c208
...@@ -551,8 +551,7 @@ ...@@ -551,8 +551,7 @@
</tr> </tr>
<tr> <tr>
<td> <td>
<el-form-item :label="$t('objFill.jiudianzs')" <el-form-item :label="$t('objFill.jiudianzs')" prop="C_NightNum">
prop="C_NightNum">
<el-input type="text" class="w300" @keyup.native="checkInteger(CtObj,'C_NightNum')" <el-input type="text" class="w300" @keyup.native="checkInteger(CtObj,'C_NightNum')"
v-model="CtObj.C_NightNum"></el-input>&nbsp;晚 v-model="CtObj.C_NightNum"></el-input>&nbsp;晚
</el-form-item> </el-form-item>
...@@ -891,7 +890,7 @@ ...@@ -891,7 +890,7 @@
<commonTripList @tripData="tripData" :ContractTripList="CtObj.ContractTripList" :TripType="CtObj.TripType"> <commonTripList @tripData="tripData" :ContractTripList="CtObj.ContractTripList" :TripType="CtObj.TripType">
</commonTripList> </commonTripList>
</div> --> </div> -->
<div v-if="CtObj.ID>0" ref="TcTravel_Table" v-html="CtObj.ContractTripList[0].TravelContent" ></div> <div v-if="CtObj.ID>0" ref="TcTravel_Table" v-html="CtObj.ContractTripList[0].TravelContent"></div>
<div v-else ref="TcTravel_Table"> <div v-else ref="TcTravel_Table">
<table class="TcTravel_Table"> <table class="TcTravel_Table">
<tbody> <tbody>
...@@ -947,29 +946,49 @@ ...@@ -947,29 +946,49 @@
{{ getDayAddOne(CtObj.C_StartDate, index) }} {{ getDayAddOne(CtObj.C_StartDate, index) }}
</td> </td>
<td contenteditable="true"> <td contenteditable="true">
<div v-for="(subItem,subIndex) in item.dayArray" :key="`tdd_`+index+subIndex"> <template v-for="(subItem,subIndex) in item.dayArray">
<span v-if="subItem.type == 2"> <div v-if="subItem.type == 2||subItem.type == 7" :key="`tdd_`+index+subIndex">
{{ subItem.childItem.couponsName }} <span v-if="subItem.type == 2">
<span v-if=" {{ subItem.childItem.couponsName }}
<span v-if="
subItem.childItem.playTimeHour != null && subItem.childItem.playTimeHour != null &&
subItem.childItem.playTimeHour != '' subItem.childItem.playTimeHour != ''
">（{{ subItem.childItem.playTimeHour }}小时</span> ">（{{ subItem.childItem.playTimeHour }}小时</span>
<span v-if=" <span v-if="
subItem.childItem.playTimeMinutes != null && subItem.childItem.playTimeMinutes != null &&
subItem.childItem.playTimeMinutes != '' subItem.childItem.playTimeMinutes != ''
"> ">
<template v-if=" <template v-if="
subItem.childItem.playTimeHour == null && subItem.childItem.playTimeHour == null &&
subItem.childItem.playTimeHour != '' subItem.childItem.playTimeHour != ''
">（</template> ">（</template>
{{ subItem.childItem.playTimeMinutes }}分钟）</span> {{ subItem.childItem.playTimeMinutes }}分钟）</span>
</span> </span>
<span v-if=" <span v-if="
subItem.type == 7 && subItem.type == 7 &&
(index == 0 || index == tripDays.length - 1) (index == 0 || index == tripDays.length - 1)
"> ">
{{ subItem.childItem.title }} {{ subItem.childItem.title }}
</span> </span>
</div>
</template>
<div>
<template v-for="subItem in item.dayArray">
<template v-if="subItem.type == 4">
<span style="padding-right:15px;">
<template v-if="subItem.childItem.useDinnerType==1">
早餐：
</template>
<template v-if="subItem.childItem.useDinnerType==2">
午餐：
</template>
<template v-if="subItem.childItem.useDinnerType==3">
晚餐：
</template>
{{subItem.childItem.dinnerName }}
</span>
</template>
</template>
</div> </div>
</td> </td>
<td contenteditable="true"> <td contenteditable="true">
...@@ -1093,7 +1112,8 @@ ...@@ -1093,7 +1112,8 @@
placement="top-start"> placement="top-start">
<el-button type="primary" icon="el-icon-edit" circle @click="commonUpdate(item)"></el-button> <el-button type="primary" icon="el-icon-edit" circle @click="commonUpdate(item)"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('pub.saveBtn')" v-if="item.IsShow == 1" placement="top-start"> <el-tooltip class="item" effect="dark" :content="$t('pub.saveBtn')" v-if="item.IsShow == 1"
placement="top-start">
<el-button type="primary" icon="iconfont icon-baocun" @click="commonSave(item)" circle></el-button> <el-button type="primary" icon="iconfont icon-baocun" @click="commonSave(item)" circle></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start"> <el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start">
...@@ -1173,7 +1193,8 @@ ...@@ -1173,7 +1193,8 @@
v-if="item.IsShow == 0"> v-if="item.IsShow == 0">
<el-button type="primary" icon="el-icon-edit" circle @click="commonUpdate(item)"></el-button> <el-button type="primary" icon="el-icon-edit" circle @click="commonUpdate(item)"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('pub.saveBtn')" placement="top-start" v-if="item.IsShow == 1"> <el-tooltip class="item" effect="dark" :content="$t('pub.saveBtn')" placement="top-start"
v-if="item.IsShow == 1">
<el-button type="primary" icon="iconfont icon-baocun" circle @click="commonSave(item)"></el-button> <el-button type="primary" icon="iconfont icon-baocun" circle @click="commonSave(item)"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start"> <el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start">
...@@ -1251,7 +1272,8 @@ ...@@ -1251,7 +1272,8 @@
v-if="item.IsShow == 0"> v-if="item.IsShow == 0">
<el-button type="primary" icon="el-icon-edit" circle @click="commonUpdate(item)"></el-button> <el-button type="primary" icon="el-icon-edit" circle @click="commonUpdate(item)"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('pub.saveBtn')" placement="top-start" v-if="item.IsShow == 1"> <el-tooltip class="item" effect="dark" :content="$t('pub.saveBtn')" placement="top-start"
v-if="item.IsShow == 1">
<el-button type="primary" icon="iconfont icon-baocun" circle @click="commonSave(item)"></el-button> <el-button type="primary" icon="iconfont icon-baocun" circle @click="commonSave(item)"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start"> <el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start">
......
src/components/Ticketing/PassengerList.vue
View file @ 3da6c208
...@@ -145,6 +145,7 @@ ...@@ -145,6 +145,7 @@
<li> <li>
<el-select v-model="msg.TCID" @change="msg.pageIndex=1,getList()" <el-select v-model="msg.TCID" @change="msg.pageIndex=1,getList()"
:placeholder="$t('objFill.v101.qingxzchuplx')"> :placeholder="$t('objFill.v101.qingxzchuplx')">
<el-option label="全部团期" :value="0"></el-option>
<el-option v-for="(item,index) in QueryMsg.TeamInfoData" :key="index" :label="item.TCNUM+`(`+item.TCID+`)`" <el-option v-for="(item,index) in QueryMsg.TeamInfoData" :key="index" :label="item.TCNUM+`(`+item.TCID+`)`"
:value="item.TCID"></el-option> :value="item.TCID"></el-option>
</el-select> </el-select>
...@@ -595,9 +596,7 @@ ...@@ -595,9 +596,7 @@
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.QueryMsg.TeamInfoData = res.data.data.resultData; this.QueryMsg.TeamInfoData = res.data.data.resultData;
if (this.QueryMsg.TeamInfoData && this.QueryMsg.TeamInfoData.length > 0) { if (this.QueryMsg.TeamInfoData && this.QueryMsg.TeamInfoData.length > 0) {}
this.msg.TCID = this.QueryMsg.TeamInfoData[0].TCID;
}
this.QueryMsg.TempCode = res.data.data.TempCode; this.QueryMsg.TempCode = res.data.data.TempCode;
this.getList(); this.getList();
} }
......
src/components/TravelContractConfirm.vue
View file @ 3da6c208
...@@ -474,6 +474,10 @@ ...@@ -474,6 +474,10 @@
font-size: 2.2rem; font-size: 2.2rem;
} }
.TCdiv_content .imTips li {
color: red;
}
.TCdiv_content .TcTravel_Table { .TCdiv_content .TcTravel_Table {
width: 100%; width: 100%;
border: none; border: none;
...@@ -1988,7 +1992,8 @@ ...@@ -1988,7 +1992,8 @@
<p>4.<font>{{CtObj.C_IsAgreeRemove==0?$t('salesModule.Agree'):$t('objFill.butongyi')}} </font> <p>4.<font>{{CtObj.C_IsAgreeRemove==0?$t('salesModule.Agree'):$t('objFill.butongyi')}} </font>
{{$t('objFill.v101.Contract.tongyjcht')}}</p> {{$t('objFill.v101.Contract.tongyjcht')}}</p>
<h3> <h3>
<p class="toTopDistance">{{$t('objFill.v101.Contract.diershisitiao')}}&nbsp;&nbsp;{{$t('objFill.v101.Contract.pintyd')}}</p> <p class="toTopDistance">
{{$t('objFill.v101.Contract.diershisitiao')}}&nbsp;&nbsp;{{$t('objFill.v101.Contract.pintyd')}}</p>
</h3> </h3>
<p>{{$t('objFill.lvyouzhe')}}<font> <p>{{$t('objFill.lvyouzhe')}}<font>
{{CtObj.C_IsAgreeSpellGroup==0?$t('salesModule.Agree'):$t('objFill.butongyi')}}</font> {{CtObj.C_IsAgreeSpellGroup==0?$t('salesModule.Agree'):$t('objFill.butongyi')}}</font>
...@@ -2162,7 +2167,7 @@ ...@@ -2162,7 +2167,7 @@
</el-row> </el-row>
</li> </li>
</ul> </ul>
<div class="userDiv"> <div class="userDiv" style="color:red;">
<p v-if="CtObj.ContractTripList&&CtObj.ContractTripList.length>0" <p v-if="CtObj.ContractTripList&&CtObj.ContractTripList.length>0"
v-html="CtObj.ContractTripList[0].TravelContent"></p> v-html="CtObj.ContractTripList[0].TravelContent"></p>
</div> </div>
...@@ -2207,7 +2212,7 @@ ...@@ -2207,7 +2212,7 @@
</div> </div>
<!-- 团队行程 --> <!-- 团队行程 -->
<div v-if="ActiveTab==5" class="item_content"> <div v-if="ActiveTab==5" class="item_content">
<ul class="gzqzUl"> <ul class="gzqzUl imTips">
<li> <li>
<el-row> <el-row>
<el-col :span="12">{{$t('visa.v_tuanhao')}}：</el-col> <el-col :span="12">{{$t('visa.v_tuanhao')}}：</el-col>
...@@ -2258,7 +2263,7 @@ ...@@ -2258,7 +2263,7 @@
</el-row> </el-row>
</li> </li>
</ul> </ul>
<div class="userDiv"> <div class="userDiv" style="color:red">
<p v-if="CtObj.ContractTripList&&CtObj.ContractTripList.length>0" <p v-if="CtObj.ContractTripList&&CtObj.ContractTripList.length>0"
v-html="CtObj.ContractTripList[0].TravelContent"></p> v-html="CtObj.ContractTripList[0].TravelContent"></p>
</div> </div>
...@@ -2268,7 +2273,7 @@ ...@@ -2268,7 +2273,7 @@
</div> </div>
<!-- 自愿购物活动补充协议 --> <!-- 自愿购物活动补充协议 -->
<div v-if="ActiveTab==6" class="item_content"> <div v-if="ActiveTab==6" class="item_content">
<ul class="guestUl"> <ul class="guestUl imTips">
<li v-for="(item,index) in CtObj.ContractShopList" :key="index"> <li v-for="(item,index) in CtObj.ContractShopList" :key="index">
<el-row> <el-row>
<el-col :span="10"> <el-col :span="10">
...@@ -2315,7 +2320,7 @@ ...@@ -2315,7 +2320,7 @@
</div> </div>
<!-- 自愿参加另行付费旅游项目补充协议 --> <!-- 自愿参加另行付费旅游项目补充协议 -->
<div v-if="ActiveTab==7" class="item_content"> <div v-if="ActiveTab==7" class="item_content">
<ul class="guestUl"> <ul class="guestUl imTips">
<li v-for="(item,index) in CtObj.ContractSelfFeeList" :key="index"> <li v-for="(item,index) in CtObj.ContractSelfFeeList" :key="index">
<el-row> <el-row>
<el-col :span="10"> <el-col :span="10">
...@@ -2822,7 +2827,7 @@ ...@@ -2822,7 +2827,7 @@
</div> </div>
<!-- 团队行程 --> <!-- 团队行程 -->
<div v-if="ActiveTab==6" class="item_content"> <div v-if="ActiveTab==6" class="item_content">
<ul class="guestUl"> <ul class="guestUl imTips">
<li> <li>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
...@@ -2847,7 +2852,7 @@ ...@@ -2847,7 +2852,7 @@
</el-row> </el-row>
</li> </li>
</ul> </ul>
<div class="userDiv"> <div class="userDiv" style="color:red;">
<p v-if="CtObj.ContractTripList&&CtObj.ContractTripList.length>0" <p v-if="CtObj.ContractTripList&&CtObj.ContractTripList.length>0"
v-html="CtObj.ContractTripList[0].TravelContent"></p> v-html="CtObj.ContractTripList[0].TravelContent"></p>
</div> </div>
...@@ -2858,7 +2863,7 @@ ...@@ -2858,7 +2863,7 @@
<!-- 自愿购物活动补充协议 --> <!-- 自愿购物活动补充协议 -->
<div v-if="ActiveTab==7" class="item_content"> <div v-if="ActiveTab==7" class="item_content">
<ul class="guestUl"> <ul class="guestUl imTips">
<li v-for="(item,index) in CtObj.ContractShopList" :key="index"> <li v-for="(item,index) in CtObj.ContractShopList" :key="index">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
......
src/components/TravelContractDetail.vue
View file @ 3da6c208
...@@ -257,6 +257,7 @@ ...@@ -257,6 +257,7 @@
border: solid #ddd 1px; border: solid #ddd 1px;
padding: 8px; padding: 8px;
line-height: 25px; line-height: 25px;
color: red;
} }
.TD_MainContent .text_center { .TD_MainContent .text_center {
...@@ -1121,7 +1122,7 @@ ...@@ -1121,7 +1122,7 @@
</tbody> </tbody>
</table> </table>
<br> <br>
<div v-html="dataList.travelContent"> <div v-html="dataList.travelContent" style="color:red;">
</div> </div>
</div> </div>
<!-- 安全告知书 --> <!-- 安全告知书 -->
......
src/components/TravelContractNew.vue
View file @ 3da6c208
...@@ -1023,34 +1023,54 @@ ...@@ -1023,34 +1023,54 @@
<td>酒店标准</td> <td>酒店标准</td>
<td>房间标准</td> <td>房间标准</td>
</tr> </tr>
<tr v-for="(item, index) in tripDays"> <tr v-for="(item, index) in tripDays" :key="`td_`+index">
<td contenteditable="true"> <td contenteditable="true">
{{ getDayAddOne(CtObj.startDate, index) }} {{ getDayAddOne(CtObj.startDate, index) }}
</td> </td>
<td contenteditable="true"> <td contenteditable="true">
<div v-for="subItem in item.dayArray"> <template v-for="(subItem,subIndex) in item.dayArray">
<span v-if="subItem.type == 2"> <div v-if="subItem.type == 2||subItem.type == 7" :key="`tdd_`+index+subIndex">
{{ subItem.childItem.couponsName }} <span v-if="subItem.type == 2">
<span v-if=" {{ subItem.childItem.couponsName }}
<span v-if="
subItem.childItem.playTimeHour != null && subItem.childItem.playTimeHour != null &&
subItem.childItem.playTimeHour != '' subItem.childItem.playTimeHour != ''
">（{{ subItem.childItem.playTimeHour }}{{$t('objFill.xiaoshi')}}</span> ">（{{ subItem.childItem.playTimeHour }}{{$t('objFill.xiaoshi')}}</span>
<span v-if=" <span v-if="
subItem.childItem.playTimeMinutes != null && subItem.childItem.playTimeMinutes != null &&
subItem.childItem.playTimeMinutes != '' subItem.childItem.playTimeMinutes != ''
"> ">
<template v-if=" <template v-if="
subItem.childItem.playTimeHour == null && subItem.childItem.playTimeHour == null &&
subItem.childItem.playTimeHour != '' subItem.childItem.playTimeHour != ''
">（</template> ">（</template>
{{ subItem.childItem.playTimeMinutes }}分钟）</span> {{ subItem.childItem.playTimeMinutes }}分钟）</span>
</span> </span>
<span v-if=" <span v-if="
subItem.type == 7 && subItem.type == 7 &&
(index == 0 || index == tripDays.length - 1) (index == 0 || index == tripDays.length - 1)
"> ">
{{ subItem.childItem.title }} {{ subItem.childItem.title }}
</span> </span>
</div>
</template>
<div>
<template v-for="subItem in item.dayArray">
<template v-if="subItem.type == 4">
<span style="padding-right:15px;">
<template v-if="subItem.childItem.useDinnerType==1">
早餐：
</template>
<template v-if="subItem.childItem.useDinnerType==2">
午餐：
</template>
<template v-if="subItem.childItem.useDinnerType==3">
晚餐：
</template>
{{subItem.childItem.dinnerName }}
</span>
</template>
</template>
</div> </div>
</td> </td>
<td contenteditable="true"> <td contenteditable="true">
......
src/components/TravelContractView.vue
View file @ 3da6c208
...@@ -257,6 +257,7 @@ ...@@ -257,6 +257,7 @@
border: solid #ddd 1px; border: solid #ddd 1px;
padding: 8px; padding: 8px;
line-height: 25px; line-height: 25px;
color:red;
} }
.TravelContractView .text_center { .TravelContractView .text_center {
...@@ -1670,7 +1671,7 @@ ...@@ -1670,7 +1671,7 @@
</tbody> </tbody>
</table> </table>
<br> <br>
<div class="userDiv"> <div class="userDiv" style="color:red">
<template v-if="CtObj.ContractTripList&&CtObj.ContractTripList.length>0"> <template v-if="CtObj.ContractTripList&&CtObj.ContractTripList.length>0">
<p v-html="CtObj.ContractTripList[0].TravelContent"></p> <p v-html="CtObj.ContractTripList[0].TravelContent"></p>
</template> </template>
...@@ -2182,7 +2183,7 @@ ...@@ -2182,7 +2183,7 @@
</tbody> </tbody>
</table> </table>
<br> <br>
<div class="userDiv"> <div class="userDiv" style="color:red;">
<template v-if="CtObj.ContractTripList&&CtObj.ContractTripList.length>0"> <template v-if="CtObj.ContractTripList&&CtObj.ContractTripList.length>0">
<p v-html="CtObj.ContractTripList[0].TravelContent"></p> <p v-html="CtObj.ContractTripList[0].TravelContent"></p>
</template> </template>
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 3da6c208
...@@ -3492,7 +3492,7 @@ ...@@ -3492,7 +3492,7 @@
that.saveLoading = false; that.saveLoading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
if (that.CopyTripAndFeatureMsg.updateType == 1) { if (that.CopyTripAndFeatureMsg.updateType == 1) {
that.Success(that.$t("objFill.v101.fuzhixingccg")); that.Success(that.$t("objFill.v101.fuzhixingccg")+res.data.message);
} else { } else {
that.Success(res.data.message); that.Success(res.data.message);
} }
......
src/components/clientConfirm.vue
View file @ 3da6c208
...@@ -95,7 +95,8 @@ ...@@ -95,7 +95,8 @@
margin-top: 10px; margin-top: 10px;
width: 100%; width: 100%;
text-align: center; text-align: center;
font-size: 1.8rem font-size: 1.8rem;
border-collapse: collapse;
} }
.dic_content .item_content .content_table th { .dic_content .item_content .content_table th {
...@@ -295,6 +296,7 @@ ...@@ -295,6 +296,7 @@
.ClientTravelTable td { .ClientTravelTable td {
border: 1px solid #d1d1d1; border: 1px solid #d1d1d1;
color:red;
} }
.dic_content .TipsDiv { .dic_content .TipsDiv {
...@@ -1316,7 +1318,6 @@ ...@@ -1316,7 +1318,6 @@
<!-- 团队行程 --> <!-- 团队行程 -->
<div v-show="ActiveTab==5" class="item_content"> <div v-show="ActiveTab==5" class="item_content">
<table class="content_table ClientTravelTable"> <table class="content_table ClientTravelTable">
<tbody> <tbody>
<tr> <tr>
<td width="15%">{{$t('visa.v_tuanhao')}}</td> <td width="15%">{{$t('visa.v_tuanhao')}}</td>
...@@ -1351,7 +1352,7 @@ ...@@ -1351,7 +1352,7 @@
</tbody> </tbody>
</table> </table>
<br> <br>
<div v-html="dataList.travelContent"></div> <div v-html="dataList.travelContent" style="color:red"></div>
</div> </div>
<!-- 安全告知书 --> <!-- 安全告知书 -->
<div v-show="ActiveTab==6" class="item_content"> <div v-show="ActiveTab==6" class="item_content">
......
src/components/dmc/manager/dmcTotalTable.vue
View file @ 3da6c208
...@@ -448,7 +448,8 @@ ...@@ -448,7 +448,8 @@
<span class="daysInforCBox-r-scoret">评分：</span> <span class="daysInforCBox-r-scoret">评分：</span>
<el-rate v-model="child.Score" disabled text-color="#ff9900"> <el-rate v-model="child.Score" disabled text-color="#ff9900">
</el-rate> </el-rate>
<span style="color: #ff9900;">{{child.Score}}</span> <span style="color: #ff9900;">{{child.Score.toFixed(1)}}</span>
</div> </div>
</div> </div>
<div class="daysInforCBox-right"> <div class="daysInforCBox-right">
......
src/components/onedayTripContract.vue
View file @ 3da6c208
...@@ -921,11 +921,6 @@ ...@@ -921,11 +921,6 @@
{{$t('objFill.v101.Contract.xingcdyyx')}} {{$t('objFill.v101.Contract.xingcdyyx')}}
</div> </div>
<!-- <div v-if="IsLoad==1">
<commonTripList @tripData="tripData" :ContractTripList="CtObj.ContractTripList" :TripType="CtObj.TripType">
</commonTripList>
</div> -->
<div v-if="CtObj.ID>0" v-html="CtObj.ContractTripList[0].TravelContent" ref="TcTravel_Table"></div> <div v-if="CtObj.ID>0" v-html="CtObj.ContractTripList[0].TravelContent" ref="TcTravel_Table"></div>
<div v-else ref="TcTravel_Table"> <div v-else ref="TcTravel_Table">
<table class="TcTravel_Table"> <table class="TcTravel_Table">
...@@ -982,29 +977,50 @@ ...@@ -982,29 +977,50 @@
{{ getDayAddOne(CtObj.C_StartDate, index) }} {{ getDayAddOne(CtObj.C_StartDate, index) }}
</td> </td>
<td contenteditable="true"> <td contenteditable="true">
<div v-for="(subItem,subIndex) in item.dayArray" :key="`tdd_`+index+subIndex"> <template v-for="(subItem,subIndex) in item.dayArray">
<span v-if="subItem.type == 2"> <div v-if="subItem.type == 2||subItem.type == 7" :key="`tdd_`+index+subIndex">
{{ subItem.childItem.couponsName }} <span v-if="subItem.type == 2">
<span v-if=" {{ subItem.childItem.couponsName }}
<span v-if="
subItem.childItem.playTimeHour != null && subItem.childItem.playTimeHour != null &&
subItem.childItem.playTimeHour != '' subItem.childItem.playTimeHour != ''
">（{{ subItem.childItem.playTimeHour }}小时</span> ">（{{ subItem.childItem.playTimeHour }}小时</span>
<span v-if=" <span v-if="
subItem.childItem.playTimeMinutes != null && subItem.childItem.playTimeMinutes != null &&
subItem.childItem.playTimeMinutes != '' subItem.childItem.playTimeMinutes != ''
"> ">
<template v-if=" <template v-if="
subItem.childItem.playTimeHour == null && subItem.childItem.playTimeHour == null &&
subItem.childItem.playTimeHour != '' subItem.childItem.playTimeHour != ''
">（</template> ">（</template>
{{ subItem.childItem.playTimeMinutes }}分钟）</span> {{ subItem.childItem.playTimeMinutes }}分钟）</span>
</span> </span>
<span v-if=" <span v-if="
subItem.type == 7 && subItem.type == 7 &&
(index == 0 || index == tripDays.length - 1) (index == 0 || index == tripDays.length - 1)
"> ">
{{ subItem.childItem.title }} {{ subItem.childItem.title }}
</span> </span>
</div>
</template>
<div>
<template v-for="subItem in item.dayArray">
<template v-if="subItem.type == 4">
<span style="padding-right:15px;">
<template v-if="subItem.childItem.useDinnerType==1">
早餐：
</template>
<template v-if="subItem.childItem.useDinnerType==2">
午餐：
</template>
<template v-if="subItem.childItem.useDinnerType==3">
晚餐：
</template>
{{subItem.childItem.dinnerName }}
</span>
</template>
</template>
</div> </div>
</td> </td>
<td contenteditable="true"> <td contenteditable="true">
...@@ -1132,7 +1148,8 @@ ...@@ -1132,7 +1148,8 @@
placement="top-start"> placement="top-start">
<el-button type="primary" icon="el-icon-edit" circle @click="commonUpdate(item)"></el-button> <el-button type="primary" icon="el-icon-edit" circle @click="commonUpdate(item)"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('pub.saveBtn')" v-if="item.IsShow == 1" placement="top-start"> <el-tooltip class="item" effect="dark" :content="$t('pub.saveBtn')" v-if="item.IsShow == 1"
placement="top-start">
<el-button type="primary" icon="iconfont icon-baocun" @click="commonSave(item)" circle></el-button> <el-button type="primary" icon="iconfont icon-baocun" @click="commonSave(item)" circle></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start"> <el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start">
...@@ -1212,7 +1229,8 @@ ...@@ -1212,7 +1229,8 @@
v-if="item.IsShow == 0"> v-if="item.IsShow == 0">
<el-button type="primary" icon="el-icon-edit" circle @click="commonUpdate(item)"></el-button> <el-button type="primary" icon="el-icon-edit" circle @click="commonUpdate(item)"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('pub.saveBtn')" placement="top-start" v-if="item.IsShow == 1"> <el-tooltip class="item" effect="dark" :content="$t('pub.saveBtn')" placement="top-start"
v-if="item.IsShow == 1">
<el-button type="primary" icon="iconfont icon-baocun" circle @click="commonSave(item)"></el-button> <el-button type="primary" icon="iconfont icon-baocun" circle @click="commonSave(item)"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start"> <el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment