Skip to content

S
SuperMan
Commit 44053dc5 authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

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

parents b0c54e53 fe4b2c1a
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 36 deletions
src/components/TravelContractConfirm.vue
View file @ 44053dc5
......@@ -990,7 +990,7 @@
<el-col :span="12">乙方签字（盖章）：</el-col>
<el-col :span="12" style="position:relative;">
{{CtObj.TravelAgency_Name}}
<img class="signImg" v-if="CtObj.IsTravelAgencySignature==1" style="position:absolute;right:0;" src="../assets/img/dzht/zhang.png" alt=""/>
<img class="signImg" v-if="CtObj.IsTravelAgencySignature==1" style="position:absolute;right:0;" :src="CurrentUserInfo.ZhangImg" alt=""/>
</el-col>
</el-row>
</li>
......@@ -1397,7 +1397,7 @@
<li >
<el-row>
<el-col :span="12">出境社盖章：</el-col>
<el-col :span="12" style="position:relative;"><img class="signImg" v-if="CtObj.IsTravelAgencySignature==1" style="position:absolute;right:0;" src="../assets/img/dzht/zhang.png" alt=""/></el-col>
<el-col :span="12" style="position:relative;"><img class="signImg" v-if="CtObj.IsTravelAgencySignature==1" style="position:absolute;right:0;" :src="CurrentUserInfo.ZhangImg" alt=""/></el-col>
</el-row>
</li>
<li>
......@@ -1537,7 +1537,7 @@
<li style="position:relative;">
<el-row>
<el-col :span="12">旅行社：（盖章）</el-col>
<el-col :span="12"><img style="width:120px;position:absolute;right:0;" v-if="CtObj.IsTravelAgencySignature==1" src="../assets/img/dzht/zhang.png" alt="" /></el-col>
<el-col :span="12"><img style="width:120px;position:absolute;right:0;" v-if="CtObj.IsTravelAgencySignature==1" :src="CurrentUserInfo.ZhangImg" alt="" /></el-col>
</el-row>
</li>
<li>
......@@ -1958,7 +1958,7 @@
<el-col :span="12">乙方签字（盖章）：</el-col>
<el-col :span="12" style="position:relative;">
{{CtObj.TravelAgency_Name}}
<img class="signImg" style="position:absolute;right:0;" v-if="CtObj.IsTravelAgencySignature==1" src="../assets/img/dzht/zhang.png" alt=""/>
<img class="signImg" style="position:absolute;right:0;" v-if="CtObj.IsTravelAgencySignature==1" :src="CurrentUserInfo.ZhangImg" alt=""/>
</el-col>
</el-row>
</li>
......@@ -3076,6 +3076,7 @@
export default {
data() {
return {
CurrentUserInfo:{},
signShow:true,
tcShow:true,
ActiveTab:1,
......@@ -3703,6 +3704,7 @@
}
},
mounted() {
this.CurrentUserInfo = this.getLocalStorage();
this.msg.ContractId = this.$route.query.ContractId;
var h = window.screen.height;
var cHeight=document.getElementsByClassName("CliSignDiv")[0];
......
src/components/TravelContractDetail.vue
View file @ 44053dc5
......@@ -576,7 +576,7 @@
</td>
<td>
<span>{{dataList.company}}</span>
<img class="esealDiv" v-if="isShowZhang==1" src='../assets/img/dzht/zhang.png' alt=""/>
<img class="esealDiv" v-if="isShowZhang==1" :src="CurrentUserInfo.ZhangImg" alt=""/>
</td>
</tr>
<tr>
......@@ -853,6 +853,7 @@
export default {
data() {
return {
CurrentUserInfo:{},
//选中切换
cked: 1,
//查询参数
......@@ -1428,6 +1429,7 @@
}
},
mounted() {
this.CurrentUserInfo = this.getLocalStorage();
this.msg.TCID = this.$route.query.TCID;
this.msg.orderID = this.$route.query.orderID;
this.msg.guestId = this.$route.query.guestId;
......
src/components/TravelContractNew.vue
View file @ 44053dc5
......@@ -726,20 +726,6 @@
<div style="margin-left:20px;">2、依法向人民法院起诉。</div>
</td>
</tr>
<!-- <tr>
<td>
<el-form-item label="（1）提交">
<el-input type="text" class="w210" v-model="CtObj.arbitrationCommission"></el-input> 仲裁委员会仲裁
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item label="（2）依法向">
<el-input type="text" class="w210" v-model="CtObj.court"></el-input> 人民法院起诉
</el-form-item>
</td>
</tr> -->
</tbody>
</table>
<table class="createTable">
......@@ -978,9 +964,7 @@
</tr>
</tbody>
</table>
</table>
</div>
<!-- <el-input type="textarea" rows="26" resize="none" v-model="CtObj.travelContent"></el-input> -->
</div>
<div class="block mtop15" id="anchor-5" ref="anchor5">
<div class="blockTitle">
......@@ -995,11 +979,7 @@
<tr>
<th>序号</th>
<th>姓名</th>
<!-- <th>国籍</th>
<th>民族</th> -->
<th>性别</th>
<!-- <th>出生日期</th>
<th>身份证号</th> -->
<th>证件类型</th>
<th>护照号码</th>
<th>联系方式</th>
......@@ -1008,18 +988,13 @@
<tr v-for="(item,index) in guestList">
<td>{{index+1}}</td>
<td>{{item.surName+''+item.name}}</td>
<!-- <td>{{item.nationalityName}}</td>
<td></td> -->
<td>{{item.sex==1?'男':'女'}}</td>
<!-- <td>{{getDate(item.birthday)}}</td>
<td>{{item.idCard}}</td> -->
<td>护照</td>
<td>{{item.passportNo}}</td>
<td>{{item.mobilePhone}}</td>
<td>健康</td>
</tr>
</table>
</div>
<div class="block mtop15" id="anchor-6" ref="anchor6">
<div class="blockTitle">
......@@ -1190,7 +1165,6 @@
</tr>
</table>
</el-dialog>
<el-dialog custom-class='w600' title='发送信息' :visible.sync="msgDialog" center>
<input type="button" class="TCbtn-info" :class='{"TC_disabled":!this.canClick}'
style="padding:8px 10px;float:right;margin-bottom:10px;" @click="sendMsg11()" :value="content" />
......@@ -1219,7 +1193,6 @@
</tr>
</table>
</el-dialog>
</div>
</template>
<script>
......
src/components/TravelContractView.vue
View file @ 44053dc5
......@@ -788,7 +788,7 @@
<td>受托方（旅行社）签章:</td>
<td style="position:relative;">
<font>{{CtObj.TravelAgency_Name}}</font>
<img src="../assets/img/dzht/zhang.png" v-if="CtObj.IsTravelAgencySignature==1" alt=""
<img :src="CurrentUserInfo.ZhangImg" v-if="CtObj.IsTravelAgencySignature==1" alt=""
style="width:120px;heigth:120px;position:absolute;top:0;" />
</td>
</tr>
......@@ -1268,7 +1268,7 @@
</td>
<td style="width:15%">出境社盖章：</td>
<td style="width:35%;position:relative;">
<img src="../assets/img/dzht/zhang.png" v-if="CtObj.IsTravelAgencySignature==1" alt=""
<img :src="CurrentUserInfo.ZhangImg" v-if="CtObj.IsTravelAgencySignature==1" alt=""
style="width:120px;heigth:120px;position:absolute;top:0;" />
</td>
</tr>
......@@ -1715,7 +1715,7 @@
<td>乙方签字（盖章）</td>
<td style="position:relative;">
<font>{{CtObj.TravelAgency_Name}}</font>
<img src="../assets/img/dzht/zhang.png" v-if="CtObj.IsTravelAgencySignature==1" alt="" style="width:120px;heigth:120px;position:absolute;top:0;" />
<img :src="CurrentUserInfo.ZhangImg" v-if="CtObj.IsTravelAgencySignature==1" alt="" style="width:120px;heigth:120px;position:absolute;top:0;" />
</td>
</tr>
<tr>
......@@ -1917,6 +1917,7 @@
export default {
data() {
return {
CurrentUserInfo:{},
pdfLoading: false,
ActiveTab: 1,
//查询参数
......@@ -2459,6 +2460,7 @@
},
},
mounted() {
this.CurrentUserInfo = this.getLocalStorage();
this.msg.ContractId = this.$route.query.id;
this.getList();
}
......
src/components/clientConfirm.vue
View file @ 44053dc5
......@@ -962,7 +962,7 @@
<li>
<el-row>
<el-col :span="12">出境社盖章：</el-col>
<el-col :span="12"><img class="signImg" src="../assets/img/dzht/zhang.png" alt="" /></el-col>
<el-col :span="12"><img class="signImg" :src="CurrentUserInfo.ZhangImg" alt="" /></el-col>
</el-row>
</li>
<li>
......@@ -2022,6 +2022,7 @@
export default {
data() {
return {
CurrentUserInfo:{},
signShow: true,
tcShow: true,
ActiveTab: 1,
......@@ -2582,6 +2583,7 @@
}
},
mounted() {
this.CurrentUserInfo = this.getLocalStorage();
this.msg.TCID = this.$route.query.TCID;
this.msg.orderID = this.$route.query.orderID;
this.msg.guestId = this.$route.query.guestId;
......
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