Skip to content

S
SuperMan
Commit 9196014c authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 80c698dc
Expand all Show whitespace changes
Inline Side-by-side
Showing with 2924 additions and 3518 deletions
src/components/SingleContract.vue
View file @ 9196014c
......@@ -298,11 +298,12 @@
.TC-MainContent .ql-editor {
min-height: 200px;
}
.TC-MainContent .disClick {
background-color: #d1d1d1!important;
color: #fff!important;
background-color: #d1d1d1 !important;
color: #fff !important;
background-image: none;
border: 1px solid #d1d1d1!important;
border: 1px solid #d1d1d1 !important;
}
.TC-MainContent .disClick:hover {
......@@ -324,7 +325,8 @@
单项委托协议
</span>
<div class="pull-right">
<input type="button" class="btn-warning" :class="{'disClick':!isSubmit}" @click="submitForm('CtObj')" value="保存" />
<input type="button" class="btn-warning" :class="{'disClick':!isSubmit}" @click="submitForm('CtObj')"
value="保存" />
</div>
</div>
<el-form label-width="180px" :model="CtObj" :rules="rules" ref="CtObj">
......@@ -411,11 +413,22 @@
<div class="createTableTitle">受托方（旅行社）信息</div>
<table class="createTable">
<tbody>
<tr>
<td>
<el-form-item label="合同章">
<el-select v-model="CtObj.SignType" placeholder="请选择">
<el-option key="0" label="和平章" :value="0">
</el-option>
<el-option key="1" label="日本公司章" :value="1">
</el-option>
</el-select>
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item label="名称">
<el-input type="text" v-model="CtObj.TravelAgency_Name" class="w300"
maxlength="70"></el-input>
<el-input type="text" v-model="CtObj.TravelAgency_Name" class="w300" maxlength="70"></el-input>
</el-form-item>
</td>
</tr>
......@@ -1258,6 +1271,7 @@
Tourists_Fax: "",
Tourists_EmergencyLinkMan: "",
Tourists_EmergencyLinkTel: "",
SignType:0,//合同章类型
TravelAgency_Name: "（株）ピースインターナショナル", //旅行社名称
TravelAgency_LicenseNum: "L-SC-CJ00015",
TravelAgency_DealMan: "",
......@@ -1418,8 +1432,8 @@
};
},
filters:{
YMD(date){
filters: {
YMD(date) {
return moment(date).format("YYYY-MM-DD HH:mm");
}
},
......
src/components/TravelContractView.vue
View file @ 9196014c
......@@ -809,7 +809,7 @@
<td>受托方（旅行社）签章:</td>
<td style="position:relative;">
<font>{{CtObj.TravelAgency_Name}}</font>
<img :src="CurrentUserInfo.ZhangImg" v-if="CtObj.IsTravelAgencySignature==1" alt=""
<img :src="CtObj.ZhangImg" v-if="CtObj.IsTravelAgencySignature==1" alt=""
style="width:120px;heigth:120px;position:absolute;top:0;" />
</td>
</tr>
......@@ -1350,7 +1350,7 @@
</td>
<td style="width:15%">出境社盖章：</td>
<td style="width:35%;position:relative;">
<img :src="CurrentUserInfo.ZhangImg" v-if="CtObj.IsTravelAgencySignature==1" alt=""
<img :src="CtObj.ZhangImg" v-if="CtObj.IsTravelAgencySignature==1" alt=""
style="width:120px;heigth:120px;position:absolute;top:0;" />
</td>
</tr>
......@@ -1799,7 +1799,7 @@
<td>乙方签字（盖章）</td>
<td style="position:relative;">
<font>{{CtObj.TravelAgency_Name}}</font>
<img :src="CurrentUserInfo.ZhangImg" v-if="CtObj.IsTravelAgencySignature==1" alt=""
<img :src="CtObj.ZhangImg" v-if="CtObj.IsTravelAgencySignature==1" alt=""
style="width:120px;heigth:120px;position:absolute;top:0;" />
</td>
</tr>
......@@ -2123,7 +2123,8 @@
TripType: 0, //行程类型(0-简易行程，1-标准行程)
Tourists_Sign: '',
CreateTimeStr: "",
IsTravelAgencySignature: 0 //是否盖章
IsTravelAgencySignature: 0, //是否盖章
ZhangImg: "", //合同章
},
};
},
......@@ -2257,8 +2258,7 @@
this.CtObj.OtherConventionPrice = tempObj.OtherConventionPrice;
this.CtObj.TicketTotalNum = tempObj.TicketTotalNum;
this.CtObj.TicketOutDayNum = tempObj.TicketOutDayNum;
this.CtObj.TicketTotalDepositPrice =
tempObj.TicketTotalDepositPrice;
this.CtObj.TicketTotalDepositPrice = tempObj.TicketTotalDepositPrice;
this.CtObj.HotelTotal = tempObj.HotelTotal;
this.CtObj.HotelCheckInType = tempObj.HotelCheckInType;
this.CtObj.HotelNotice = tempObj.HotelNotice;
......@@ -2267,6 +2267,7 @@
this.CtObj.VisaTotalPrice = tempObj.VisaTotalPrice;
this.CtObj.Tourists_Sign = tempObj.Tourists_Sign;
this.CtObj.IsTravelAgencySignature = tempObj.IsTravelAgencySignature;
this.CtObj.ZhangImg = tempObj.ZhangImg;
this.CtObj.TicketAndHotelTotalPrice =
tempObj.TicketAndHotelTotalPrice;
if (
......
src/components/orderCommon/order-form2.vue
View file @ 9196014c
This diff is collapsed.
src/components/orderCommon/productOrderList.vue
View file @ 9196014c
......@@ -460,8 +460,8 @@
width: 200px;
}
</style>
<template>
</style>
<template>
<div class="productQueryList" v-loading="loading">
<ul v-if="list.length != 0">
<li v-for="(item, index) in list" :key="index">
......@@ -868,17 +868,19 @@
<el-tooltip class="item" effect="dark" :content="$t('salesModule.LookBM')" placement="top-start">
<el-button @click="
goUrl(item.TCID, item.TCNUM)
" type="primary" style="background-color: #00c6ff !important; border-color: #00c6ff !important" icon="iconfont icon-sousuo">
" type="primary" style="background-color: #00c6ff !important; border-color: #00c6ff !important"
icon="iconfont icon-sousuo">
</el-button>
</el-tooltip>
<!--关内团后不能在报名 hk 2022-07-13去掉 && item.IsB2B === 1 修改为可报名 -->
<el-tooltip class="item" effect="dark" :content="$t('salesModule.LJXD')" placement="top-start"
v-if="item.IsPayOrder !== 1 ">
<el-button type="primary" style="background-color: #f16c3c !important; border-color: #f16c3c !important" v-if="!TCIDList"
icon="iconfont icon-fukuan1" @click="goBuy(item)"></el-button>
<el-button type="primary" style="background-color: #f16c3c !important; border-color: #f16c3c !important"
v-if="!TCIDList" icon="iconfont icon-fukuan1" @click="goBuy(item)"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('Operation.Op_tripDownLoad')" placement="top-start">
<el-button @click="toTrip(item)" type="primary" style="background-color: #47bf8c !important; border-color: #47bf8c !important"
<el-button @click="toTrip(item)" type="primary"
style="background-color: #47bf8c !important; border-color: #47bf8c !important"
icon="iconfont icon-xiazai"></el-button>
</el-tooltip>
<el-tooltip v-if="
......@@ -888,7 +890,8 @@
item.LineID != 8
" class="item" effect="dark" content="直客版预览" placement="top-start">
<el-button @click.native="goB2B(item)" type="primary"
style="background-color: #f16c3c !important; border-color: #f16c3c !important" icon="iconfont icon-view"></el-button>
style="background-color: #f16c3c !important; border-color: #f16c3c !important"
icon="iconfont icon-view"></el-button>
</el-tooltip>
</el-button-group>
<el-button-group v-show="qjGroupId == userInfo.RB_Group_id || S_Travel_Share" style="display: block">
......@@ -941,8 +944,8 @@
</el-popover>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="'广告数量' + item.AdvertCount" placement="top-start">
<el-button type="primary" style="background-color: #e95252 !important; border-color: #e95252 !important" v-if="!TCIDList"
icon="iconfont icon-guanggao" @click="goUrlX(item)"></el-button>
<el-button type="primary" style="background-color: #e95252 !important; border-color: #e95252 !important"
v-if="!TCIDList" icon="iconfont icon-guanggao" @click="goUrlX(item)"></el-button>
</el-tooltip>
</el-button-group>
</div>
......@@ -979,28 +982,20 @@
</el-dialog>
<!-- 下单 -->
<div class="buy-box" v-show="isShowTeamOrder">
<orderForm @success="reSearchPage" @close="closeForm"
:PTCID="teamInfo.TCID"
:POrderId="0"
:PBranchId="0"
:PProductType="1"
:showCity="true"
:productObj="teamInfo"
:pagesTitle="pagesTitle">
<orderForm @success="reSearchPage" @close="closeForm" :PTCID="teamInfo.TCID" :POrderId="0" :PBranchId="0"
:PProductType="1" :showCity="true" :productObj="teamInfo" :pagesTitle="pagesTitle">
</orderForm>
</div>
</div>
</template>
<script>
</template>
<script>
import commonTeamInfo from "../commonPage/commonTeamInfo.vue";
import tripDownLoadCommon from "../commonPage/TripDownLoadCommon.vue";
import carousel from "../commonPage/carousel.vue";
import commonHotelInfo from "../commonPage/commonHotelInfo.vue";
import orderForm from "./order-form2.vue";
export default {
props:['loading','list','pagesTitle'],
props: ['loading', 'list', 'pagesTitle'],
data() {
return {
//当前登录用户信息
......@@ -1134,10 +1129,10 @@
},
goUrl(id, tcmun) {
let path
if(this.pagesTitle=='跟团游产品'){
if (this.pagesTitle == '跟团游产品') {
path = 'groupTourOrderByTuan'
}
if(this.pagesTitle=='当地游产品'){
if (this.pagesTitle == '当地游产品') {
path = 'groupTourOrderByTuanOne'
}
this.$router.push({
......@@ -1170,16 +1165,17 @@
this.isShowTeamOrder = true;
},
// 产品详情
getTitledetail(item){
if(this.pagesTitle=='跟团游产品'){
getTitledetail(item) {
if (this.pagesTitle == '跟团游产品') {
this.getJourney(item.ConfigID, item.TCID, item.LineName)
}if(this.pagesTitle=='当地游产品'){
}
if (this.pagesTitle == '当地游产品') {
this.goB2Bdetail(item.ConfigID, item.TCID)
}
},
goB2Bdetail(ConfigId, tcid) {
var B2BDomain = this.CurrentUserInfo.B2BDomain//'www.oytour.com';
this.$tripUtils.GotoB2BPage(B2BDomain,encodeURIComponent(ConfigId),tcid);
var B2BDomain = this.CurrentUserInfo.B2BDomain //'www.oytour.com';
this.$tripUtils.GotoB2BPage(B2BDomain, encodeURIComponent(ConfigId), tcid);
},
getJourney(id, TCID, title) {
var that = this;
......@@ -1212,9 +1208,9 @@
},
mounted() {
this.userInfo = this.getLocalStorage();
this.GetSupperOrderEditAuth();//分享权限
this.GetSupperOrderEditAuth(); //分享权限
this.qjGroupId = this.QjGroupId();
this.CurrentUserInfo = this.userInfo ;
this.CurrentUserInfo = this.userInfo;
this.userId = this.userInfo.EmployeeId;
if (this.$route.query.TCIDList) {
this.TCIDList = this.$route.query.TCIDList;
......@@ -1222,5 +1218,4 @@
},
};
</script>
\ No newline at end of file
</script>
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