Skip to content

S
SuperMan
Commit 2eb71962 authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

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

parents 12175cd2 397764a1
Expand all Show whitespace changes
Inline Side-by-side
Showing with 970 additions and 601 deletions
src/assets/common/lang/zh.js
View file @ 2eb71962
This diff is collapsed.
src/components/SalesModule/CustomerCertification.vue
View file @ 2eb71962
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
class="ownScrollbarStyle" class="ownScrollbarStyle"
@click.stop @click.stop
> >
<div class="title" style="background:#fff">实名认证详情</div> <div class="title" style="background:#fff">{{$t('salesModule.SMdetails')}}</div>
<div class="list"> <div class="list">
<div class="itemAnswer" v-show="answerDetailList.length>0" style="padding:0"> <div class="itemAnswer" v-show="answerDetailList.length>0" style="padding:0">
<div class="item" v-for="item in answerDetailList" style="margin:0"> <div class="item" v-for="item in answerDetailList" style="margin:0">
...@@ -21,9 +21,9 @@ ...@@ -21,9 +21,9 @@
<span <span
v-if="item.ApplyState === 0" v-if="item.ApplyState === 0"
class="_status_str _status_str_y" class="_status_str _status_str_y"
>审核中</span> >{{$t('fnc.a_shezhong')}}</span>
<span v-if="item.ApplyState == 1||item.ApplyState == 3" class="_status_str _status_str_g">已通过</span> <span v-if="item.ApplyState == 1||item.ApplyState == 3" class="_status_str _status_str_g">{{$t('fnc.ytongguo')}}</span>
<span v-if="item.ApplyState === 2" class="_status_str _status_str_r">已拒绝</span> <span v-if="item.ApplyState === 2" class="_status_str _status_str_r">{{$t('fnc.HasRefused')}}</span>
</p> </p>
<p class="mt5"> <p class="mt5">
<i class="iconfont icon-img_dianhua fz12" style="color: #09d49d;"></i> <i class="iconfont icon-img_dianhua fz12" style="color: #09d49d;"></i>
...@@ -36,11 +36,11 @@ ...@@ -36,11 +36,11 @@
<p class="fz12 color999 mt5">{{item.Addres}}</p> <p class="fz12 color999 mt5">{{item.Addres}}</p>
</div> </div>
<p class="fz16 color666"> <p class="fz16 color666">
<i class="iconfont icon-ico-renwuyaoqiu fz14 color999"></i>&nbsp;认证信息 <i class="iconfont icon-ico-renwuyaoqiu fz14 color999"></i>&nbsp;{{$t('salesModule.AuInformatiton')}}
</p> </p>
<div class="salesApprovalLayercontentBtn"> <div class="salesApprovalLayercontentBtn">
<p class="fz12 color999 mt5">认证方式：{{item.ApplyType==1?"三证合一":"身份证+名片"}}</p> <p class="fz12 color999 mt5">{{$t('salesModule.Autication')}}：{{item.ApplyType==1?"三证合一":"身份证+名片"}}</p>
<p class="fz12 color999 mt5">申请时间：{{item.CreateDateStr}}</p> <p class="fz12 color999 mt5">{{$t('salesModule.ApplyTime')}}：{{item.CreateDateStr}}</p>
<div v-if="item.CertificationPics&&item.CertificationPics.length>0" class="mt10"> <div v-if="item.CertificationPics&&item.CertificationPics.length>0" class="mt10">
<div v-for="picItem in item.CertificationPics" class="img_box"> <div v-for="picItem in item.CertificationPics" class="img_box">
<img v-if="!picItem" src="../../assets/img/litheader.png" /> <img v-if="!picItem" src="../../assets/img/litheader.png" />
...@@ -48,25 +48,25 @@ ...@@ -48,25 +48,25 @@
</div> </div>
</div> </div>
<div> <div>
<span class="fz14 color333">审批意见</span> <span class="fz14 color333">{{$t('salesModule.SPYJ')}}</span>
</div> </div>
<p class="mt10"> <p class="mt10">
<el-input v-if="item.ApplyState === 0" type="textarea" v-model="Reason"></el-input> <el-input v-if="item.ApplyState === 0" type="textarea" v-model="Reason"></el-input>
<span v-else>Reason</span> <span v-else>Reason</span>
</p> </p>
<input type="button" class="hollowFixedBtn mt20 fr" value="取消" @click="closeLayer" /> <input type="button" class="hollowFixedBtn mt20 fr" :value="$t('pub.cancelBtn')" @click="closeLayer" />
<input <input
type="button" type="button"
class="normalBtn mt20 fr" class="normalBtn mt20 fr"
v-if="item.ApplyState === 0" v-if="item.ApplyState === 0"
value="通过" :value="$t('visa.v_tongguo')"
@click="saveIdea(item,1)" @click="saveIdea(item,1)"
/> />
<input <input
type="button" type="button"
class="normalBtn mt20 fr" class="normalBtn mt20 fr"
v-if="item.ApplyState === 0" v-if="item.ApplyState === 0"
value="拒绝" :value="$t('visa.v_jujue')"
@click="saveIdea(item,2)" @click="saveIdea(item,2)"
/> />
</div> </div>
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
--> -->
<li> <li>
<span> <span>
<em>申请时间</em> <em>{{$t('salesModule.ApplyTime')}}</em>
</span> </span>
<el-date-picker <el-date-picker
v-model="msg.SDate" v-model="msg.SDate"
...@@ -116,20 +116,20 @@ ...@@ -116,20 +116,20 @@
</li> </li>
<li> <li>
<span> <span>
<em>状态</em> <em>{{$t('admin.admin_status')}}</em>
</span> </span>
<el-select v-model="msg.ApplyState"> <el-select v-model="msg.ApplyState">
<el-option label="不限" value="-1" key="-1"></el-option> <el-option :label="$t('pub.unlimitedSel')" value="-1" key="-1"></el-option>
<el-option label="申请中" value="0" key="0"></el-option> <el-option :label="$t('salesModule.Appling')" value="0" key="0"></el-option>
<el-option label="通过" value="1" key="1"></el-option> <el-option :label="$t('visa.v_tongguo')" value="1" key="1"></el-option>
<el-option label="拒绝" value="2" key="2"></el-option> <el-option :label="$t('visa.v_jujue')" value="2" key="2"></el-option>
</el-select> </el-select>
</li> </li>
<li> <li>
<input <input
type="button" type="button"
class="hollowFixedBtn" class="hollowFixedBtn"
value="查询" :value="$t('pub.searchBtn')"
@click="resetPageIndex(),getList()" @click="resetPageIndex(),getList()"
/> />
</li> </li>
...@@ -143,18 +143,18 @@ ...@@ -143,18 +143,18 @@
v-loading="loading" v-loading="loading"
> >
<tr> <tr>
<th width="10%">门店名称</th> <th width="10%">{{$t('salesModule.storeName')}}</th>
<th width="10%">联系人</th> <th width="10%">{{$t('hotel.suplier_contact')}}</th>
<th width="10%">电话</th> <th width="10%">{{$t('hotel.table_tel')}}</th>
<th width="10%">交易金额</th> <th width="10%">{{$t('salesModule.TransactionMon')}}</th>
<th width="10%">地址</th> <th width="10%">{{$t('admin.admin_address')}}</th>
<th width="10%">所属联盟</th> <th width="10%">{{$t('salesModule.belongUnion')}}</th>
<th width="10%">申请时间</th> <th width="10%">{{$t('salesModule.ApplyTime')}}</th>
<th width="10%">申请状态</th> <th width="10%">{{$t('salesModule.ApplyStatus')}}</th>
<th width="10%">操作</th> <th width="10%">{{$t('system.table_operation')}}</th>
</tr> </tr>
<tr> <tr>
<td colspan="9" align="center" v-show="list.length==0">暂无数据</td> <td colspan="9" align="center" v-show="list.length==0">{{$t('system.content_noData')}}</td>
</tr> </tr>
<tr v-for="(item,index) in list"> <tr v-for="(item,index) in list">
<td>{{item.CustomerName}}</td> <td>{{item.CustomerName}}</td>
...@@ -165,14 +165,14 @@ ...@@ -165,14 +165,14 @@
<td>{{item.AllianceName}}</td> <td>{{item.AllianceName}}</td>
<td>{{item.CreateDateStr}}</td> <td>{{item.CreateDateStr}}</td>
<td> <td>
<span v-if="item.ApplyState === 0" class="_status_str _status_str_y">审核中</span> <span v-if="item.ApplyState === 0" class="_status_str _status_str_y">{{$t('fnc.a_shezhong')}}</span>
<span v-if="item.ApplyState == 1||item.ApplyState === 3" class="_status_str _status_str_g">已通过</span> <span v-if="item.ApplyState == 1||item.ApplyState === 3" class="_status_str _status_str_g">{{$t('fnc.ytongguo')}}</span>
<span v-if="item.ApplyState === 2" class="_status_str _status_str_r">已拒绝</span> <span v-if="item.ApplyState === 2" class="_status_str _status_str_r">{{$t('salesModule.HasRefused')}}</span>
</td> </td>
<td> <td>
<input <input
type="button" type="button"
value="查看详情" :value="$t('salesModule.CheckDetails')"
class="normalBtn" class="normalBtn"
style="margin-left: 0;" style="margin-left: 0;"
@click="getDetail(item)" @click="getDetail(item)"
......
src/components/SalesModule/Lowpricemanagement.vue
View file @ 2eb71962
...@@ -6,9 +6,9 @@ ...@@ -6,9 +6,9 @@
<span><em>{{$t('admin.admin_status')}}</em> <span><em>{{$t('admin.admin_status')}}</em>
<el-select v-model='msg.ApplyState' :placeholder="$t('pub.unlimitedSel')"> <el-select v-model='msg.ApplyState' :placeholder="$t('pub.unlimitedSel')">
<el-option :label="$t('pub.unlimitedSel')" value='-1'></el-option> <el-option :label="$t('pub.unlimitedSel')" value='-1'></el-option>
<el-option label="审核中" value='0'></el-option> <el-option :label="$t('fnc.a_shezhong')" value='0'></el-option>
<el-option label="通过" value='1'></el-option> <el-option :label="$t('visa.v_tongguo')" value='1'></el-option>
<el-option label="拒绝" value='2'></el-option> <el-option :label="$t('visa.v_jujue')" value='2'></el-option>
</el-select> </el-select>
</span> </span>
</li> </li>
...@@ -19,15 +19,15 @@ ...@@ -19,15 +19,15 @@
</div> </div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0"> <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr> <tr>
<th width="100">申请人</th> <th width="100">{{$t('visaT.Applicant')}}</th>
<th width="150">申请时间</th> <th width="150">{{$t('salesModule.ApplyTime')}}</th>
<th width="200">订单号</th> <th width="200">{{$t('hotel.order_Number')}}</th>
<th>订单原单价</th> <th>{{$t('salesModule.OriginalOrder')}}</th>
<th>申请单价</th> <th>{{$t('salesModule.ApplyPrice')}}</th>
<th>申请状态</th> <th>{{$t('salesModule.ApplyStatus')}}</th>
<th>审核理由</th> <th>{{$t('salesModule.ReviewReason')}}</th>
<th>申请理由</th> <th>{{$t('salesModule.ApplyReason')}}</th>
<th width="200">操作</th> <th width="200">{{$t('system.table_operation')}}</th>
</tr> </tr>
<tr v-for="(item,index) in dataList"> <tr v-for="(item,index) in dataList">
<td>{{item.CreateByStr}}</td> <td>{{item.CreateByStr}}</td>
...@@ -40,8 +40,8 @@ ...@@ -40,8 +40,8 @@
<td>{{item.ApplyReason}}</td> <td>{{item.ApplyReason}}</td>
<td> <td>
<el-row v-if="item.ApplyState === 0"> <el-row v-if="item.ApplyState === 0">
<button class="normalBtn" type="primary" @click="outerVisible = true,dialogTitle='审核理由',addMsg.ID=item.ID,addMsg.ApplyState= 1,addMsg.Reasons=item.Reasons, GetApplyLessPrice(item)">同意</button> <button class="normalBtn" type="primary" @click="outerVisible = true,dialogTitle='审核理由',addMsg.ID=item.ID,addMsg.ApplyState= 1,addMsg.Reasons=item.Reasons, GetApplyLessPrice(item)">{{$t('salesModule.Agree')}}</button>
<button class="hollowFixedBtn" @click="outerVisible = true,dialogTitle='拒绝理由',addMsg.ID=item.ID,addMsg.ApplyState= 2,addMsg.Reasons=item.ApplyReason, GetApplyLessPrice(item, 1)">拒绝</button> <button class="hollowFixedBtn" @click="outerVisible = true,dialogTitle='拒绝理由',addMsg.ID=item.ID,addMsg.ApplyState= 2,addMsg.Reasons=item.ApplyReason, GetApplyLessPrice(item, 1)">{{$t('visa.v_jujue')}}</button>
</el-row> </el-row>
</td> </td>
</tr> </tr>
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
</div> </div>
<el-dialog custom-class='w450' :title="dialogTitle" :visible.sync="outerVisible" center :before-close="closeChangeMachie"> <el-dialog custom-class='w450' :title="dialogTitle" :visible.sync="outerVisible" center :before-close="closeChangeMachie">
<el-form :rules="rules" ref="addMsg" label-width="100px"> <el-form :rules="rules" ref="addMsg" label-width="100px">
<el-form-item label="成交单价" prop="Description"> <el-form-item :label="$t('fnc.cjdanjia')" prop="Description">
<el-input v-if="EmployeeId === 1" class='w217' v-model="addMsg.ApplyPrice"></el-input> <el-input v-if="EmployeeId === 1" class='w217' v-model="addMsg.ApplyPrice"></el-input>
<el-select v-model='addMsg.ApplyPrice' v-else> <el-select v-model='addMsg.ApplyPrice' v-else>
<el-option v-for="price in Unit_PriceList" :label='price.LessMoney' :value='price.ID' :key='price.ID'></el-option> <el-option v-for="price in Unit_PriceList" :label='price.LessMoney' :value='price.ID' :key='price.ID'></el-option>
......
src/components/SalesModule/productQuery.vue
View file @ 2eb71962
This diff is collapsed.
src/components/TravelContractNew.vue
View file @ 2eb71962
...@@ -604,6 +604,17 @@ ...@@ -604,6 +604,17 @@
</el-form-item> </el-form-item>
</td> </td>
</tr> </tr>
<tr style="display:none;">
<td>
<div style="margin:0 0 10px 180px;">
<el-checkbox-group>
<el-checkbox label="大地保险"></el-checkbox>
<el-checkbox label="平安保险"></el-checkbox>
<el-checkbox label="工行保险"></el-checkbox>
</el-checkbox-group>
</div>
</td>
</tr>
<tr> <tr>
<td> <td>
<el-form-item label="保险产品名称" prop="insuranceProduct" v-if="CtObj.insuranceOpinion==1"> <el-form-item label="保险产品名称" prop="insuranceProduct" v-if="CtObj.insuranceOpinion==1">
......
src/components/commonPage/TripDownLoadCommon.vue
View file @ 2eb71962
...@@ -38,67 +38,67 @@ ...@@ -38,67 +38,67 @@
<table style="width:380px" border="0" cellspacing="0" cellpadding="0"> <table style="width:380px" border="0" cellspacing="0" cellpadding="0">
<tr> <tr>
<th colspan="2"> <th colspan="2">
请选择需要的类容 {{$t('salesModule.ChoiceNeed')}}
</th> </th>
</tr> </tr>
<tbody v-if="downType==1"> <tbody v-if="downType==1">
<tr height="36"> <tr height="36">
<td width="50%"><input id="vshowA" v-model="TripLayer.vshowA" type="checkbox" /><label for="vshowA">基础信息</label></td> <td width="50%"><input id="vshowA" v-model="TripLayer.vshowA" type="checkbox" /><label for="vshowA">{{$t('fnc.jcxinxi')}}</label></td>
<td width="50%"><input id="vshowB" v-model="TripLayer.vshowB" type="checkbox" /><label for="vshowB">航班信息</label></td> <td width="50%"><input id="vshowB" v-model="TripLayer.vshowB" type="checkbox" /><label for="vshowB">{{$t('salesModule.FlighInfo')}}</label></td>
</tr> </tr>
<tr height="36"> <tr height="36">
<td><input id="vshowC" v-model="TripLayer.vshowC" type="checkbox" /><label for="vshowC">行程特色</label></td> <td><input id="vshowC" v-model="TripLayer.vshowC" type="checkbox" /><label for="vshowC">{{$t('salesModule.TripSpecial')}}</label></td>
<td><input id="vshowD" v-model="TripLayer.vshowD" type="checkbox" /><label for="vshowD">行程安排</label></td> <td><input id="vshowD" v-model="TripLayer.vshowD" type="checkbox" /><label for="vshowD">{{$t('salesModule.TripAP')}}</label></td>
</tr> </tr>
<tr height="36"> <tr height="36">
<td><input id="vshowE" v-model="TripLayer.vshowE" type="checkbox" /><label for="vshowE">费用说明</label></td> <td><input id="vshowE" v-model="TripLayer.vshowE" type="checkbox" /><label for="vshowE">{{$t('fnc.fyshuoming')}}</label></td>
<td><input id="vshowF" v-model="TripLayer.vshowF" type="checkbox" /><label for="vshowF">购物说明</label></td> <td><input id="vshowF" v-model="TripLayer.vshowF" type="checkbox" /><label for="vshowF">{{$t('salesModule.ShoppDetail')}}</label></td>
</tr> </tr>
<tr height="36"> <tr height="36">
<td><input id="vshowG" v-model="TripLayer.vshowG" type="checkbox" /><label for="vshowG">订单须知</label></td> <td><input id="vshowG" v-model="TripLayer.vshowG" type="checkbox" /><label for="vshowG">{{$t('salesModule.OrderKnow')}}</label></td>
<td><input id="vshowH" v-model="TripLayer.vshowH" type="checkbox" /><label for="vshowH">签证信息</label></td> <td><input id="vshowH" v-model="TripLayer.vshowH" type="checkbox" /><label for="vshowH">{{$t('salesModule.VisaInfo')}}</label></td>
</tr> </tr>
<tr height="36"> <tr height="36">
<td><input id="vshowI" v-model="TripLayer.vshowI" type="checkbox" /><label for="vshowI">同行备注</label></td> <td><input id="vshowI" v-model="TripLayer.vshowI" type="checkbox" /><label for="vshowI">{{$t('salesModule.THBZ')}}</label></td>
<td><input id="vshowJ" v-model="TripLayer.vshowJ" type="checkbox" /><label for="vshowJ">印象标识</label></td> <td><input id="vshowJ" v-model="TripLayer.vshowJ" type="checkbox" /><label for="vshowJ">{{$t('salesModule.YXBS')}}</label></td>
</tr> </tr>
<tr height="36"> <tr height="36">
<td><input id="vshowK" v-model="TripLayer.vshowK" type="checkbox" /><label for="vshowK">景点图片</label></td> <td><input id="vshowK" v-model="TripLayer.vshowK" type="checkbox" /><label for="vshowK">{{$t('salesModule.JDTP')}}</label></td>
</tr> </tr>
</tbody> </tbody>
<tbody v-if="downType==2"> <tbody v-if="downType==2">
<tr height="36"> <tr height="36">
<td width="50%"><input id="vshowA" v-model="TripLayer.vshowA" type="checkbox" /><label for="vshowA">基础信息</label></td> <td width="50%"><input id="vshowA" v-model="TripLayer.vshowA" type="checkbox" /><label for="vshowA">{{$t('fnc.jcxinxi')}}</label></td>
<td width="50%"><input id="vshowL" v-model="TripLayer.vshowL" type="checkbox" /><label for="vshowL">集合地点</label></td> <td width="50%"><input id="vshowL" v-model="TripLayer.vshowL" type="checkbox" /><label for="vshowL">{{$t('salesModule.JHDD')}}</label></td>
</tr> </tr>
<tr height="36"> <tr height="36">
<td><input id="vshowM" v-model="TripLayer.vshowM" type="checkbox" /><label for="vshowM">旅客信息</label></td> <td><input id="vshowM" v-model="TripLayer.vshowM" type="checkbox" /><label for="vshowM">{{$t('salesModule.TravelInfo')}}</label></td>
<td><input id="vshowB" v-model="TripLayer.vshowB" type="checkbox" /><label for="vshowB">航班信息</label></td> <td><input id="vshowB" v-model="TripLayer.vshowB" type="checkbox" /><label for="vshowB">{{$t('salesModule.FlighInfo')}}</label></td>
</tr> </tr>
<tr height="36"> <tr height="36">
<td><input id="vshowC" v-model="TripLayer.vshowC" type="checkbox" /><label for="vshowC">行程特色</label></td> <td><input id="vshowC" v-model="TripLayer.vshowC" type="checkbox" /><label for="vshowC">{{$t('salesModule.TripSpecial')}}</label></td>
<td><input id="vshowD" v-model="TripLayer.vshowD" type="checkbox" /><label for="vshowD">行程安排</label></td> <td><input id="vshowD" v-model="TripLayer.vshowD" type="checkbox" /><label for="vshowD">{{$t('salesModule.TripAP')}}</label></td>
</tr> </tr>
<tr height="36"> <tr height="36">
<td><input id="vshowE" v-model="TripLayer.vshowE" type="checkbox" /><label for="vshowE">费用说明</label></td> <td><input id="vshowE" v-model="TripLayer.vshowE" type="checkbox" /><label for="vshowE">{{$t('fnc.fyshuoming')}}</label></td>
<td><input id="vshowF" v-model="TripLayer.vshowF" type="checkbox" /><label for="vshowF">购物说明</label></td> <td><input id="vshowF" v-model="TripLayer.vshowF" type="checkbox" /><label for="vshowF">{{$t('salesModule.ShoppDetail')}}</label></td>
</tr> </tr>
<tr height="36"> <tr height="36">
<td><input id="vshowG" v-model="TripLayer.vshowG" type="checkbox" /><label for="vshowG">订单须知</label></td> <td><input id="vshowG" v-model="TripLayer.vshowG" type="checkbox" /><label for="vshowG">{{$t('salesModule.OrderKnow')}}</label></td>
<td><input id="vshowH" v-model="TripLayer.vshowH" type="checkbox" /><label for="vshowH">签证信息</label></td> <td><input id="vshowH" v-model="TripLayer.vshowH" type="checkbox" /><label for="vshowH">{{$t('salesModule.VisaInfo')}}</label></td>
</tr> </tr>
<tr height="36"> <tr height="36">
<td><input id="vshowI" v-model="TripLayer.vshowI" type="checkbox" /><label for="vshowI">同行备注</label></td> <td><input id="vshowI" v-model="TripLayer.vshowI" type="checkbox" /><label for="vshowI">{{$t('salesModule.THBZ')}}</label></td>
<td><input id="vshowJ" v-model="TripLayer.vshowJ" type="checkbox" /><label for="vshowJ">印象标识</label></td> <td><input id="vshowJ" v-model="TripLayer.vshowJ" type="checkbox" /><label for="vshowJ">{{$t('salesModule.YXBS')}}</label></td>
</tr> </tr>
<tr height="36"> <tr height="36">
<td><input id="vshowK" v-model="TripLayer.vshowK" type="checkbox" /><label for="vshowK">景点图片</label></td> <td><input id="vshowK" v-model="TripLayer.vshowK" type="checkbox" /><label for="vshowK">{{$t('salesModule.JDTP')}}</label></td>
<td><input id="vshowLLR" v-model="TripLayer.vshowLLR" type="checkbox" /><label for="vshowLLR">紧急联络人</label></td> <td><input id="vshowLLR" v-model="TripLayer.vshowLLR" type="checkbox" /><label for="vshowLLR">{{$t('salesModule.EmergencyContact')}}</label></td>
</tr> </tr>
</tbody> </tbody>
<tr height="66"> <tr height="66">
<td colspan="2" align="center"> <td colspan="2" align="center">
<input type="button" class="TripBtn" @click="goUrlR();" value="确定" /> <input type="button" class="TripBtn" @click="goUrlR();" :value="$t('pub.sureBtn')" />
</td> </td>
</tr> </tr>
</table> </table>
......
src/components/commonPage/commonHotelInfo.vue
View file @ 2eb71962
...@@ -28,32 +28,32 @@ ...@@ -28,32 +28,32 @@
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="singeRowTable"> <table width="100%" border="0" cellspacing="0" cellpadding="0" class="singeRowTable">
<tr v-if="showHotelObj.showPrice"> <tr v-if="showHotelObj.showPrice">
<td> <td>
公司团号 {{$t('salesModule.CompanyNum')}}
</td> </td>
<td colspan="4" style="text-align:left;"> <td colspan="4" style="text-align:left;">
<span style="padding-left:5px;">{{TCNUM}} ({{TCID}})</span> <span style="padding-left:5px;">{{TCNUM}} ({{TCID}})</span>
</td> </td>
<td> <td>
地接团号 {{$t('salesModule.DJNum')}}
</td> </td>
<td :colspan="showHotelObj.colspanLength" style="text-align:left;"> <td :colspan="showHotelObj.colspanLength" style="text-align:left;">
<span style="padding-left:5px;">{{DMCNum}}</span> <span style="padding-left:5px;">{{DMCNum}}</span>
</td> </td>
</tr> </tr>
<tr> <tr>
<th width="120">日期</th> <th width="120">{{$t('pub.date')}}</th>
<th width="150">酒店</th> <th width="150">{{$t('hotel.hotel')}}</th>
<th width="150">更换酒店</th> <th width="150">{{$t('salesModule.ChangeHotel')}}</th>
<th width="120">酒店状态</th> <th width="120">{{$t('salesModule.HotelStatus')}}</th>
<th width="120">OP状态</th> <th width="120">{{$t('salesModule.OPstatus')}}</th>
<th width="120">地接状态</th> <th width="120">{{$t('salesModule.DJstatus')}}</th>
<th width="110" v-if="showHotelObj.showPrice">数量<br />价格</th> <th width="110" v-if="showHotelObj.showPrice">{{$t('restaurant.res_Number')}}<br />{{$t('Operation.Op_price')}}</th>
<th width="120" v-if="showHotelObj.showPay">付款方式<br/>返佣比例</th> <th width="120" v-if="showHotelObj.showPay">{{$t('fnc.fkfangshi')}}<br/>{{$t('restaurant.res_commissionColumn')}}</th>
<th width="130" v-if="showHotelObj.showZhan">占房时间</th> <th width="130" v-if="showHotelObj.showZhan">{{$t('salesModule.UseRoomTime')}}</th>
<th width="100" v-if="showHotelObj.showZhan">确认时间</th> <th width="100" v-if="showHotelObj.showZhan">{{$t('salesModule.SureTime')}}</th>
<th width="100" v-if="showHotelObj.ShowSupplier">供应商</th> <th width="100" v-if="showHotelObj.ShowSupplier">{{$t('hotel.hotel_Supplier')}}</th>
<th width="70" v-if="showHotelObj.showPrice"> <th width="70" v-if="showHotelObj.showPrice">
日志 {{$t('fnc.rizhi')}}
</th> </th>
</tr> </tr>
<template v-for="(hotelItem,index) in HotelObj"> <template v-for="(hotelItem,index) in HotelObj">
...@@ -74,29 +74,29 @@ ...@@ -74,29 +74,29 @@
</td> </td>
<td> <td>
<template v-if="hotelSubItem.OPState==1||hotelSubItem.DMCState==1"> <template v-if="hotelSubItem.OPState==1||hotelSubItem.DMCState==1">
<a style="color:green">保证入住</a> <a style="color:green">{{$t('salesModule.BZRZ')}}</a>
</template> </template>
</td> </td>
<td> <td>
<span v-if="hotelSubItem.HotelName!='温馨的家' &&hotelSubItem.HotelName!='机场附近酒店'"> <span v-if="hotelSubItem.HotelName!='温馨的家' &&hotelSubItem.HotelName!='机场附近酒店'">
<template v-if="hotelSubItem.OPState==1"> <template v-if="hotelSubItem.OPState==1">
<a style="color:green">OP-指定</a> <a style="color:green">{{$t('salesModule.OPZD')}}</a>
</template> </template>
<template v-else-if="hotelSubItem.OPState==2"> <template v-else-if="hotelSubItem.OPState==2">
<a style="color:red">OP-暂定</a> <a style="color:red">{{$t('salesModule.OPCD')}}</a>
</template> </template>
</span> </span>
</td> </td>
<td> <td>
<span v-if="hotelSubItem.HotelName!='温馨的家'&&hotelSubItem.HotelName!='机场附近酒店'"> <span v-if="hotelSubItem.HotelName!='温馨的家'&&hotelSubItem.HotelName!='机场附近酒店'">
<template v-if="hotelSubItem.DMCState==1"> <template v-if="hotelSubItem.DMCState==1">
<a style="color:green">地接-OK</a> <a style="color:green">{{$t('salesModule.DJOK')}}</a>
</template> </template>
<template v-else-if="hotelSubItem.DMCState==2"> <template v-else-if="hotelSubItem.DMCState==2">
<a style="color:red">地接-暂定</a> <a style="color:red">{{$t('salesModule.DJZK')}}</a>
</template> </template>
<template v-else-if="hotelSubItem.DMCState==0"> <template v-else-if="hotelSubItem.DMCState==0">
<a style="color:red">地接-未操作</a> <a style="color:red">{{$t('salesModule.DJWCZ')}}</a>
</template> </template>
</span> </span>
</td> </td>
...@@ -108,8 +108,8 @@ ...@@ -108,8 +108,8 @@
</a> </a>
</td> </td>
<td v-if="showHotelObj.showPay"> <td v-if="showHotelObj.showPay">
{{hotelSubItem.PayTypeStr}} <template v-if="hotelSubItem.TaxType==1">税入</template> {{hotelSubItem.PayTypeStr}} <template v-if="hotelSubItem.TaxType==1">{{$t('pub.SR')}}</template>
<template v-if="hotelSubItem.TaxType==2">税别</template> <template v-if="hotelSubItem.TaxType==2">{{$t('pub.SB')}}</template>
{{hotelSubItem.RebateRatio}} {{hotelSubItem.RebateRatio}}
</td> </td>
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
<el-popover width="200" trigger="click" popper-class="Bus_HotelPop"> <el-popover width="200" trigger="click" popper-class="Bus_HotelPop">
<commonHotelLog :ref="'comHotelLog'+index+hotelSubIndex+''"> </commonHotelLog> <commonHotelLog :ref="'comHotelLog'+index+hotelSubIndex+''"> </commonHotelLog>
<div slot="reference" class="w80" style="cursor:pointer;text-decoration:underline;" <div slot="reference" class="w80" style="cursor:pointer;text-decoration:underline;"
@click="GetHotelLog(hotelSubItem,index,hotelSubIndex)">日志</div> @click="GetHotelLog(hotelSubItem,index,hotelSubIndex)">{{$t('fnc.rizhi')}}</div>
</el-popover> </el-popover>
</td> </td>
</tr> </tr>
...@@ -140,34 +140,34 @@ ...@@ -140,34 +140,34 @@
<template v-if="HotelObj&&HotelObj.length>0"> <template v-if="HotelObj&&HotelObj.length>0">
<tr> <tr>
<td class="tdRight"> <td class="tdRight">
开团时间： {{$t('salesModule.TeamTime')}}：
</td> </td>
<td class="tdLeft"> <td class="tdLeft">
<span v-if="HotelObj[0].PriceCreateDateStr">{{HotelObj[0].PriceCreateDateStr}}</span> <span v-if="HotelObj[0].PriceCreateDateStr">{{HotelObj[0].PriceCreateDateStr}}</span>
<span v-else>暂无</span> <span v-else>{{$t('active.cl_zanwu')}}</span>
</td> </td>
<td class="tdRight"> <td class="tdRight">
吃房时间： {{$t('salesModule.UseRoomTime')}}：
</td> </td>
<td class="tdLeft"> <td class="tdLeft">
<span v-if="HotelObj[0].UseHotelTimeStr">{{HotelObj[0].UseHotelTimeStr}}</span> <span v-if="HotelObj[0].UseHotelTimeStr">{{HotelObj[0].UseHotelTimeStr}}</span>
<span v-else>暂无</span> <span v-else>{{$t('active.cl_zanwu')}}</span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="tdRight"> <td class="tdRight">
地接团号生成时间： {{$t('salesModule.CreatTime')}}：
</td> </td>
<td class="tdLeft"> <td class="tdLeft">
<span v-if="HotelObj[0].DMCNumCreateTimeStr">{{HotelObj[0].DMCNumCreateTimeStr}}</span> <span v-if="HotelObj[0].DMCNumCreateTimeStr">{{HotelObj[0].DMCNumCreateTimeStr}}</span>
<span v-else>暂无</span> <span v-else>{{$t('active.cl_zanwu')}}</span>
</td> </td>
<td class="tdRight"> <td class="tdRight">
手配确认时间： {{$t('salesModule.SPtime')}}：
</td> </td>
<td class="tdLeft"> <td class="tdLeft">
<span v-if="HotelObj[0].ShouPeiStatusTimeStr">{{HotelObj[0].ShouPeiStatusTimeStr}}</span> <span v-if="HotelObj[0].ShouPeiStatusTimeStr">{{HotelObj[0].ShouPeiStatusTimeStr}}</span>
<span v-else>暂无</span> <span v-else>{{$t('active.cl_zanwu')}}</span>
</td> </td>
</tr> </tr>
</template> </template>
......
src/components/commonPage/commonTeamInfo.vue
View file @ 2eb71962
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<template> <template>
<div class="trip-box-commonTeam" v-loading="loading"> <div class="trip-box-commonTeam" v-loading="loading">
<div class="item-title"> <div class="item-title">
<span class="t">{{tripList.length}}日行程</span> <span class="t">{{tripList.length}}{{$t('salesModule.DaysTrip')}}</span>
<span> <span>
<small class="s"></small> <small class="s"></small>
</span> </span>
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<div class="trip-block-commonTeam" v-for="(item,i) in tripList" :key="i"> <div class="trip-block-commonTeam" v-for="(item,i) in tripList" :key="i">
<div class="trip-title"> <div class="trip-title">
<div> <div>
<p class="day">第<span v-if='item.dayNum<10'>0</span>{{item.dayNum}}天</p> <p class="day">{{$t('tips.di')}}<span v-if='item.dayNum<10'>0</span>{{item.dayNum}}{{$t('hotel.hotel_day')}}</p>
<template v-if="startDate&&startDate!=''"> <template v-if="startDate&&startDate!=''">
<p>{{GetDayStr(startDate,item.dayNum-1)}}</p> <p>{{GetDayStr(startDate,item.dayNum-1)}}</p>
</template> </template>
......
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