Skip to content

S
SuperMan
Commit 67f5afcc authored by liudong1993's avatar liudong1993
Browse files
Options

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

parents 1b0135df 59b65e2e
Hide whitespace changes
Inline Side-by-side
Showing with 155 additions and 85 deletions
src/assets/common/lang/zhCN/fill.js
View file @ 67f5afcc
...@@ -8209,7 +8209,12 @@ export const obj = { ...@@ -8209,7 +8209,12 @@ export const obj = {
zuoyewangcheng: '作业完成', zuoyewangcheng: '作业完成',
biangengshenqing: '变更申请', biangengshenqing: '变更申请',
biangengyuanyin: '变更原因', biangengyuanyin: '变更原因',
danxiangyoulun: '单项邮轮订单' danxiangyoulun: '单项邮轮订单',
lvyoujuht: '旅游局合同',
daiqianmin: '待签名',
yiqianshu: '已签署',
daiqianshu: '待签署',
daizuofei: '待作废',
} }
//#endregion //#endregion
} }
......
src/components/SalesModule/groupTourOrder.vue
View file @ 67f5afcc
...@@ -2368,12 +2368,12 @@ ...@@ -2368,12 +2368,12 @@
@click="sItem.thirdContractID&&sItem.thirdContractFileUrl?window.open(sItem.thirdContractFileUrl):goSingleContract(item, sItem)"> @click="sItem.thirdContractID&&sItem.thirdContractFileUrl?window.open(sItem.thirdContractFileUrl):goSingleContract(item, sItem)">
<template v-if="sItem.thirdContractID"> <template v-if="sItem.thirdContractID">
{{sItem.tourists_Name+sItem.thirdContractID}} {{sItem.tourists_Name+sItem.thirdContractID}}
<span v-if="sItem.thirdContractState==0" class="c9e">待上传</span> <span v-if="sItem.thirdContractState==0" class="c9e">{{$t('objFill.daishanchuan')}}</span>
<span v-if="sItem.thirdContractState==1" class="c3FC4FF">待签名</span> <span v-if="sItem.thirdContractState==1" class="c3FC4FF">{{$t('objFill.v103.daiqianmin')}}</span>
<span v-if="sItem.thirdContractState==2" class="c20C997">已签署</span> <span v-if="sItem.thirdContractState==2" class="c20C997">{{$t('objFill.v103.yiqianshu')}}</span>
<span v-if="sItem.thirdContractState==3" class="cF1416C">已作废</span> <span v-if="sItem.thirdContractState==3" class="cF1416C">{{$t('active.cl_yzfei')}}</span>
<span v-if="sItem.thirdContractState==4" class="cff9800">待签署</span> <span v-if="sItem.thirdContractState==4" class="cff9800">{{$t('objFill.v103.daiqianshu')}}</span>
<span v-if="sItem.thirdContractState==5" class="c9e">待作废</span> <span v-if="sItem.thirdContractState==5" class="c9e">{{$t('objFill.v103.daizuofei')}}</span>
</template> </template>
<template v-else> <template v-else>
{{ sItem.tourists_Name+sItem.t_ContractNum }} {{ sItem.tourists_Name+sItem.t_ContractNum }}
...@@ -2400,12 +2400,12 @@ ...@@ -2400,12 +2400,12 @@
@click="sItem.thirdContractID&&sItem.thirdContractFileUrl?window.open(sItem.thirdContractFileUrl):goContract(item, sItem)"> @click="sItem.thirdContractID&&sItem.thirdContractFileUrl?window.open(sItem.thirdContractFileUrl):goContract(item, sItem)">
<template v-if="sItem.thirdContractID"> <template v-if="sItem.thirdContractID">
{{sItem.client_Name+sItem.thirdContractID}} {{sItem.client_Name+sItem.thirdContractID}}
<span v-if="sItem.thirdContractState==0" class="c9e">待上传</span> <span v-if="sItem.thirdContractState==0" class="c9e">{{$t('objFill.daishanchuan')}}</span>
<span v-if="sItem.thirdContractState==1" class="c3FC4FF">待签名</span> <span v-if="sItem.thirdContractState==1" class="c3FC4FF">{{$t('objFill.v103.daiqianmin')}}</span>
<span v-if="sItem.thirdContractState==2" class="c20C997">已签署</span> <span v-if="sItem.thirdContractState==2" class="c20C997">{{$t('objFill.v103.yiqianshu')}}</span>
<span v-if="sItem.thirdContractState==3" class="cF1416C">已作废</span> <span v-if="sItem.thirdContractState==3" class="cF1416C">{{$t('active.cl_yzfei')}}</span>
<span v-if="sItem.thirdContractState==4" class="cff9800">待签署</span> <span v-if="sItem.thirdContractState==4" class="cff9800">{{$t('objFill.v103.daiqianshu')}}</span>
<span v-if="sItem.thirdContractState==5" class="c9e">待作废</span> <span v-if="sItem.thirdContractState==5" class="c9e">{{$t('objFill.v103.daizuofei')}}</span>
</template> </template>
<template v-else> <template v-else>
{{ sItem.client_Name + "" + sItem.contractNum }} {{ sItem.client_Name + "" + sItem.contractNum }}
......
src/components/TravelContractDetail.vue
View file @ 67f5afcc
...@@ -482,12 +482,12 @@ ...@@ -482,12 +482,12 @@
:class="[dataList.thirdContractFileUrl?'pointer':'']" :class="[dataList.thirdContractFileUrl?'pointer':'']"
@click="dataList.thirdContractFileUrl?OpenNewUrl(dataList.thirdContractFileUrl):''">{{$t('objFill.hetongbh')}}： @click="dataList.thirdContractFileUrl?OpenNewUrl(dataList.thirdContractFileUrl):''">{{$t('objFill.hetongbh')}}：
<span>{{dataList.thirdContractID?dataList.thirdContractID:dataList.contractNum}}</span> <span>{{dataList.thirdContractID?dataList.thirdContractID:dataList.contractNum}}</span>
<span v-if="dataList.thirdContractState==0" class="c9e">待上传</span> <span v-if="dataList.thirdContractState==0" class="c9e">{{$t('objFill.daishanchuan')}}</span>
<span v-if="dataList.thirdContractState==1" class="c3FC4FF">待签名</span> <span v-if="dataList.thirdContractState==1" class="c3FC4FF">{{$t('objFill.v103.daiqianmin')}}</span>
<span v-if="dataList.thirdContractState==2" class="c20C997">已签署</span> <span v-if="dataList.thirdContractState==2" class="c20C997">{{$t('objFill.v103.yiqianshu')}}</span>
<span v-if="dataList.thirdContractState==3" class="cF1416C">已作废</span> <span v-if="dataList.thirdContractState==3" class="cF1416C">{{$t('active.cl_yzfei')}}</span>
<span v-if="dataList.thirdContractState==4" class="cff9800">待签署</span> <span v-if="dataList.thirdContractState==4" class="cff9800">{{$t('objFill.v103.daiqianshu')}}</span>
<span v-if="dataList.thirdContractState==5" class="c9e">待作废</span> <span v-if="dataList.thirdContractState==5" class="c9e">{{$t('objFill.v103.daizuofei')}}</span>
</p> </p>
</div> </div>
<div class="menu"> <div class="menu">
......
src/components/TravelContractNew.vue
View file @ 67f5afcc
...@@ -306,12 +306,12 @@ ...@@ -306,12 +306,12 @@
:class="[CtObj.thirdContractFileUrl?'pointer':'']" :class="[CtObj.thirdContractFileUrl?'pointer':'']"
@click="CtObj.thirdContractFileUrl?OpenNewUrl(CtObj.thirdContractFileUrl):''">{{$t('objFill.hetongbh')}}： @click="CtObj.thirdContractFileUrl?OpenNewUrl(CtObj.thirdContractFileUrl):''">{{$t('objFill.hetongbh')}}：
<span>{{CtObj.thirdContractID?CtObj.thirdContractID:CtObj.contractNum}}</span> <span>{{CtObj.thirdContractID?CtObj.thirdContractID:CtObj.contractNum}}</span>
<span v-if="CtObj.thirdContractState==0" class="c9e">待上传</span> <span v-if="CtObj.thirdContractState==0" class="c9e">{{$t('objFill.daishanchuan')}}</span>
<span v-if="CtObj.thirdContractState==1" class="c3FC4FF">待签名</span> <span v-if="CtObj.thirdContractState==1" class="c3FC4FF">{{$t('objFill.v103.daiqianmin')}}</span>
<span v-if="CtObj.thirdContractState==2" class="c20C997">已签署</span> <span v-if="CtObj.thirdContractState==2" class="c20C997">{{$t('objFill.v103.yiqianshu')}}</span>
<span v-if="CtObj.thirdContractState==3" class="cF1416C">已作废</span> <span v-if="CtObj.thirdContractState==3" class="cF1416C">{{$t('active.cl_yzfei')}}</span>
<span v-if="CtObj.thirdContractState==4" class="cff9800">待签署</span> <span v-if="CtObj.thirdContractState==4" class="cff9800">{{$t('objFill.v103.daiqianshu')}}</span>
<span v-if="CtObj.thirdContractState==5" class="c9e">待作废</span> <span v-if="CtObj.thirdContractState==5" class="c9e">{{$t('objFill.v103.daizuofei')}}</span>
</span> </span>
</span> </span>
<div class="pull-right"> <div class="pull-right">
...@@ -2630,7 +2630,7 @@ ...@@ -2630,7 +2630,7 @@
watch: { watch: {
$route(to, from) { $route(to, from) {
//重新获取数据 //重新获取数据
this.getList(); // this.getList();
}, },
}, },
}; };
......
src/components/TravelContractView.vue
View file @ 67f5afcc
...@@ -424,12 +424,12 @@ ...@@ -424,12 +424,12 @@
:class="[CtObj.ThirdContractFileUrl?'pointer':'']" :class="[CtObj.ThirdContractFileUrl?'pointer':'']"
@click="CtObj.ThirdContractFileUrl?OpenNewUrl(CtObj.ThirdContractFileUrl):''">{{$t('objFill.hetongbh')}}： @click="CtObj.ThirdContractFileUrl?OpenNewUrl(CtObj.ThirdContractFileUrl):''">{{$t('objFill.hetongbh')}}：
<span>{{CtObj.ThirdContractID?CtObj.ThirdContractID:CtObj.T_ContractNum}}</span> <span>{{CtObj.ThirdContractID?CtObj.ThirdContractID:CtObj.T_ContractNum}}</span>
<span v-if="CtObj.ThirdContractState==0" class="c9e">待上传</span> <span v-if="CtObj.ThirdContractState==0" class="c9e">{{$t('objFill.daishanchuan')}}</span>
<span v-if="CtObj.ThirdContractState==1" class="c3FC4FF">待签名</span> <span v-if="CtObj.ThirdContractState==1" class="c3FC4FF">{{$t('objFill.v103.daiqianmin')}}</span>
<span v-if="CtObj.ThirdContractState==2" class="c20C997">已签署</span> <span v-if="CtObj.ThirdContractState==2" class="c20C997">{{$t('objFill.v103.yiqianshu')}}</span>
<span v-if="CtObj.ThirdContractState==3" class="cF1416C">已作废</span> <span v-if="CtObj.ThirdContractState==3" class="cF1416C">{{$t('active.cl_yzfei')}}</span>
<span v-if="CtObj.ThirdContractState==4" class="cff9800">待签署</span> <span v-if="CtObj.ThirdContractState==4" class="cff9800">{{$t('objFill.v103.daiqianshu')}}</span>
<span v-if="CtObj.ThirdContractState==5" class="c9e">待作废</span> <span v-if="CtObj.ThirdContractState==5" class="c9e">{{$t('objFill.v103.daizuofei')}}</span>
</p> </p>
</div> </div>
<div class="menu"> <div class="menu">
...@@ -1064,12 +1064,12 @@ ...@@ -1064,12 +1064,12 @@
:class="[CtObj.ThirdContractFileUrl?'pointer':'']" :class="[CtObj.ThirdContractFileUrl?'pointer':'']"
@click="CtObj.ThirdContractFileUrl?OpenNewUrl(CtObj.ThirdContractFileUrl):''">{{$t('objFill.hetongbh')}}： @click="CtObj.ThirdContractFileUrl?OpenNewUrl(CtObj.ThirdContractFileUrl):''">{{$t('objFill.hetongbh')}}：
<span>{{CtObj.ThirdContractID?CtObj.ThirdContractID:CtObj.T_ContractNum}}</span> <span>{{CtObj.ThirdContractID?CtObj.ThirdContractID:CtObj.T_ContractNum}}</span>
<span v-if="CtObj.ThirdContractState==0" class="c9e">待上传</span> <span v-if="CtObj.ThirdContractState==0" class="c9e">{{$t('objFill.daishanchuan')}}</span>
<span v-if="CtObj.ThirdContractState==1" class="c3FC4FF">待签名</span> <span v-if="CtObj.ThirdContractState==1" class="c3FC4FF">{{$t('objFill.v103.daiqianmin')}}</span>
<span v-if="CtObj.ThirdContractState==2" class="c20C997">已签署</span> <span v-if="CtObj.ThirdContractState==2" class="c20C997">{{$t('objFill.v103.yiqianshu')}}</span>
<span v-if="CtObj.ThirdContractState==3" class="cF1416C">已作废</span> <span v-if="CtObj.ThirdContractState==3" class="cF1416C">{{$t('active.cl_yzfei')}}</span>
<span v-if="CtObj.ThirdContractState==4" class="cff9800">待签署</span> <span v-if="CtObj.ThirdContractState==4" class="cff9800">{{$t('objFill.v103.daiqianshu')}}</span>
<span v-if="CtObj.ThirdContractState==5" class="c9e">待作废</span> <span v-if="CtObj.ThirdContractState==5" class="c9e">{{$t('objFill.v103.daizuofei')}}</span>
</p> </p>
</div> </div>
<div class="menu"> <div class="menu">
...@@ -1881,12 +1881,12 @@ ...@@ -1881,12 +1881,12 @@
:class="[CtObj.ThirdContractFileUrl?'pointer':'']" :class="[CtObj.ThirdContractFileUrl?'pointer':'']"
@click="CtObj.ThirdContractFileUrl?window.open(CtObj.ThirdContractFileUrl):''">{{$t('objFill.hetongbh')}}： @click="CtObj.ThirdContractFileUrl?window.open(CtObj.ThirdContractFileUrl):''">{{$t('objFill.hetongbh')}}：
<span>{{CtObj.ThirdContractID?CtObj.ThirdContractID:CtObj.T_ContractNum}}</span> <span>{{CtObj.ThirdContractID?CtObj.ThirdContractID:CtObj.T_ContractNum}}</span>
<span v-if="CtObj.ThirdContractState==0" class="c9e">待上传</span> <span v-if="CtObj.ThirdContractState==0" class="c9e">{{$t('objFill.daishanchuan')}}</span>
<span v-if="CtObj.ThirdContractState==1" class="c3FC4FF">待签名</span> <span v-if="CtObj.ThirdContractState==1" class="c3FC4FF">{{$t('objFill.v103.daiqianmin')}}</span>
<span v-if="CtObj.ThirdContractState==2" class="c20C997">已签署</span> <span v-if="CtObj.ThirdContractState==2" class="c20C997">{{$t('objFill.v103.yiqianshu')}}</span>
<span v-if="CtObj.ThirdContractState==3" class="cF1416C">已作废</span> <span v-if="CtObj.ThirdContractState==3" class="cF1416C">{{$t('active.cl_yzfei')}}</span>
<span v-if="CtObj.ThirdContractState==4" class="cff9800">待签署</span> <span v-if="CtObj.ThirdContractState==4" class="cff9800">{{$t('objFill.v103.daiqianshu')}}</span>
<span v-if="CtObj.ThirdContractState==5" class="c9e">待作废</span> <span v-if="CtObj.ThirdContractState==5" class="c9e">{{$t('objFill.v103.daizuofei')}}</span>
</p> </p>
</div> </div>
<div class="menu"> <div class="menu">
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ 67f5afcc
...@@ -497,6 +497,11 @@ ...@@ -497,6 +497,11 @@
margin-top: 3px; margin-top: 3px;
font-size: 12px; font-size: 12px;
padding-left: 10px; padding-left: 10px;
padding-right: 10px;
max-height: 21px;
border-radius: 4px;
margin-right: 5px;
margin-left: 5px;
} }
.LeaderSpan:hover { .LeaderSpan:hover {
...@@ -521,8 +526,13 @@ ...@@ -521,8 +526,13 @@
width: 100%; width: 100%;
height: 174px; height: 174px;
overflow: auto; overflow: auto;
display: flex;
flex-direction: row;
flex-wrap: wrap;
}
.RL_LeaderNameBox{
cursor: pointer;
} }
.RL_LeaderName { .RL_LeaderName {
display: inline-block; display: inline-block;
min-width: 50px; min-width: 50px;
...@@ -3640,10 +3650,22 @@ ...@@ -3640,10 +3650,22 @@
<div class="RL_ListDiv"> <div class="RL_ListDiv">
<div class="LeaderSpan" :class="{ ckedClass: ckedIndex == index }" v-for="(item, index) in leaderListArr" <div class="LeaderSpan" :class="{ ckedClass: ckedIndex == index }" v-for="(item, index) in leaderListArr"
@click="getLeaderInfo(index, item.LeaderId)" :key="item.subCode"> @click="getLeaderInfo(index, item.LeaderId)" :key="item.subCode">
<span class="RL_LeaderName">{{ item.LeaderName }}【{{ <span class="RL_LeaderName">{{ item.LeaderName }}</span>
getLeaderTypeStr(item.Type, item.LeaderGuidClass) <el-popover placement="top" width="auto" v-model="item.show" trigger="click">
}}】【{{$t('salesModule.Passport')}}：{{item.Passport}} {{$t('hotel.table_tel')}}:{{item.MobilePhone}} <div>
{{$t('objFill.shengfenzheng')}}:{{item.IdCard}}】</span> 【{{
getLeaderTypeStr(item.Type, item.LeaderGuidClass)
}}】【{{$t('salesModule.Passport')}}：{{item.Passport}} {{$t('hotel.table_tel')}}:{{item.MobilePhone}}
{{$t('objFill.shengfenzheng')}}:{{item.IdCard}}】
</div>
<template slot="reference">
<span class="RL_LeaderNameBox">
<i class="el-icon-view"></i>
</span>
</template>
</el-popover>
</div> </div>
</div> </div>
</div> </div>
...@@ -6678,6 +6700,13 @@ ...@@ -6678,6 +6700,13 @@
(res) => { (res) => {
this.loadingSet = false; this.loadingSet = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
let arrList = function (arr) {
arr.forEach((item) => {
item.show = false;
});
}
arrList(res.data.data.LeaderData)
arrList(res.data.data.ScheduleData)
this.leaderListArr = res.data.data.LeaderData; this.leaderListArr = res.data.data.LeaderData;
this.ScheduleArray = res.data.data.ScheduleData; this.ScheduleArray = res.data.data.ScheduleData;
if (this.leaderQueryMsg.LeaderType == 1) { if (this.leaderQueryMsg.LeaderType == 1) {
......
src/components/TravelManager/TravelNewQuotation/newQuotation.vue
View file @ 67f5afcc
...@@ -64,6 +64,26 @@ ...@@ -64,6 +64,26 @@
<div class="flexOne quoTation"> <div class="flexOne quoTation">
<div class="query-box"> <div class="query-box">
<ul> <ul>
<li >
<span><em>{{$t('admin.admin_company')}}</em>
<el-select class="multiple_input" v-model="queryData.OutBranchId" filterable style="width:180px">
<el-option :label="$t('pub.unlimitedSel')" :value='-1'></el-option>
<el-option v-for='item in companyList' :key="item.id" :label="item.bName" :value="item.id">
</el-option>
</el-select>
</span>
</li>
<li >
<span><em>{{$t('system.query_type')}}</em>
<el-select v-model="queryData.TeamType" @change="postConfig.LineId=0,postConfig.LineteamId=0"
style="width:180px">
<el-option :label="$t('pub.unlimitedSel')" :value='-1'></el-option>
<el-option v-for='item in teamList' :key="item.ID" :label="item.Name" :value="item.ID">
</el-option>
</el-select>
</span>
</li>
<li> <li>
<span> <span>
<em>{{$t('system.table_ssLine')}}</em> <em>{{$t('system.table_ssLine')}}</em>
...@@ -605,11 +625,12 @@ ...@@ -605,11 +625,12 @@
PageSize: 10, PageSize: 10,
total: 0, total: 0,
currentPage: 1, currentPage: 1,
TeamType: 0, //0常规,1-小包团,2-一日游,3-地接团 TeamType: -1, //0常规,1-小包团,2-一日游,3-地接团
OfferId: "", //报价单号 OfferId: "", //报价单号
TCNUMS: "", //团号 TCNUMS: "", //团号
StartGroupDate: "", //开始时间 StartGroupDate: "", //开始时间
EndGroupDate: "", //结束时间 EndGroupDate: "", //结束时间
OutBranchId: -1, //出团公司
}, },
pickerBeginDateBefore: { pickerBeginDateBefore: {
disabledDate: time => { disabledDate: time => {
......
src/components/administrative/ContractManage.vue
View file @ 67f5afcc
...@@ -164,7 +164,7 @@ ...@@ -164,7 +164,7 @@
<th width="100">{{$t('visa.v_tuanhao')}}</th> <th width="100">{{$t('visa.v_tuanhao')}}</th>
<th width="150">{{$t('hotel.product_name')}}</th> <th width="150">{{$t('hotel.product_name')}}</th>
<th width="100">{{$t('objFill.hetongzt')}}</th> <th width="100">{{$t('objFill.hetongzt')}}</th>
<th width="100">旅游局合同</th> <th width="100">{{$t('objFill.v103.lvyoujuht')}}</th>
<th width="100">{{$t('active.cl_addPp')}}</th> <th width="100">{{$t('active.cl_addPp')}}</th>
<th width="120">{{$t('fnc.cjshijian')}}</th> <th width="120">{{$t('fnc.cjshijian')}}</th>
<th width="120">{{$t('objFill.shifougz')}}</th> <th width="120">{{$t('objFill.shifougz')}}</th>
...@@ -201,12 +201,12 @@ ...@@ -201,12 +201,12 @@
:class="[item.ThirdContractFileUrl?'pointer c059FF6':'']" :class="[item.ThirdContractFileUrl?'pointer c059FF6':'']"
@click="item.ThirdContractFileUrl?window.open(item.ThirdContractFileUrl):''"> @click="item.ThirdContractFileUrl?window.open(item.ThirdContractFileUrl):''">
{{item.ThirdContractID}} {{item.ThirdContractID}}
<span v-if="item.ThirdContractState==0" class="c9e">待上传</span> <span v-if="item.ThirdContractState==0" class="c9e">{{$t('objFill.daishanchuan')}}</span>
<span v-if="item.ThirdContractState==1" class="c3FC4FF">待签名</span> <span v-if="item.ThirdContractState==1" class="c3FC4FF">{{$t('objFill.v103.daiqianmin')}}</span>
<span v-if="item.ThirdContractState==2" class="c20C997">已签署</span> <span v-if="item.ThirdContractState==2" class="c20C997">{{$t('objFill.v103.yiqianshu')}}</span>
<span v-if="item.ThirdContractState==3" class="cF1416C">已作废</span> <span v-if="item.ThirdContractState==3" class="cF1416C">{{$t('active.cl_yzfei')}}</span>
<span v-if="item.ThirdContractState==4" class="cff9800">待签署</span> <span v-if="item.ThirdContractState==4" class="cff9800">{{$t('objFill.v103.daiqianshu')}}</span>
<span v-if="item.ThirdContractState==5" class="c9e">待作废</span> <span v-if="item.ThirdContractState==5" class="c9e">{{$t('objFill.v103.daizuofei')}}</span>
</span> </span>
<template v-else>-</template> <template v-else>-</template>
</td> </td>
......
src/components/administrative/ElectronicAudit.vue
View file @ 67f5afcc
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
<th width="100">{{$t('hotel.hotel_StarDate')}}</th> <th width="100">{{$t('hotel.hotel_StarDate')}}</th>
<th width="100">{{$t('sm.fanhuiDate')}}</th> <th width="100">{{$t('sm.fanhuiDate')}}</th>
<th width="80">{{$t('hotel.hotel_status')}}</th> <th width="80">{{$t('hotel.hotel_status')}}</th>
<th width="150">旅游局合同</th> <th width="150">{{$t('objFill.v103.lvyoujuht')}}</th>
<th width="80">{{$t('objFill.shifougz')}}</th> <th width="80">{{$t('objFill.shifougz')}}</th>
<th width="125">{{$t('active.cl_addPp')}}</th> <th width="125">{{$t('active.cl_addPp')}}</th>
<th width="200">{{$t('hotel.table_operat')}}</th> <th width="200">{{$t('hotel.table_operat')}}</th>
...@@ -155,12 +155,12 @@ ...@@ -155,12 +155,12 @@
:class="[item.ThirdContractFileUrl?'c3FC4FF pointer':'']" :class="[item.ThirdContractFileUrl?'c3FC4FF pointer':'']"
@click="item.ThirdContractFileUrl?window.open(item.ThirdContractFileUrl):''"> @click="item.ThirdContractFileUrl?window.open(item.ThirdContractFileUrl):''">
{{item.ThirdContractID}}</span> <br/> {{item.ThirdContractID}}</span> <br/>
<span v-if="item.ThirdContractState==0" class="c9e">待上传</span> <span v-if="item.ThirdContractState==0" class="c9e">{{$t('objFill.daishanchuan')}}</span>
<span v-if="item.ThirdContractState==1" class="c3FC4FF">待签名</span> <span v-if="item.ThirdContractState==1" class="c3FC4FF">{{$t('objFill.v103.daiqianmin')}}</span>
<span v-if="item.ThirdContractState==2" class="c20C997">已签署</span> <span v-if="item.ThirdContractState==2" class="c20C997">{{$t('objFill.v103.yiqianshu')}}</span>
<span v-if="item.ThirdContractState==3" class="cF1416C">已作废</span> <span v-if="item.ThirdContractState==3" class="cF1416C">{{$t('active.cl_yzfei')}}</span>
<span v-if="item.ThirdContractState==4" class="cff9800">待签署</span> <span v-if="item.ThirdContractState==4" class="cff9800">{{$t('objFill.v103.daiqianshu')}}</span>
<span v-if="item.ThirdContractState==5" class="c9e">待作废</span> <span v-if="item.ThirdContractState==5" class="c9e">{{$t('objFill.v103.daizuofei')}}</span>
</span> </span>
<template v-else>-</template> <template v-else>-</template>
</td> </td>
...@@ -317,7 +317,7 @@ ...@@ -317,7 +317,7 @@
<th width="100">{{$t('visa.v_tuanhao')}}</th> <th width="100">{{$t('visa.v_tuanhao')}}</th>
<th width="150">{{$t('hotel.product_name')}}</th> <th width="150">{{$t('hotel.product_name')}}</th>
<th width="100">{{$t('objFill.hetongzt')}}</th> <th width="100">{{$t('objFill.hetongzt')}}</th>
<th width="150">旅游局合同</th> <th width="150">{{$t('objFill.v103.lvyoujuht')}}</th>
<th width="100">{{$t('active.cl_addPp')}}</th> <th width="100">{{$t('active.cl_addPp')}}</th>
<th width="120">{{$t('fnc.cjshijian')}}</th> <th width="120">{{$t('fnc.cjshijian')}}</th>
<th width="80">{{$t('objFill.shifougz')}}</th> <th width="80">{{$t('objFill.shifougz')}}</th>
...@@ -357,12 +357,12 @@ ...@@ -357,12 +357,12 @@
:class="[item.ThirdContractFileUrl?'c3FC4FF pointer':'']" :class="[item.ThirdContractFileUrl?'c3FC4FF pointer':'']"
@click="item.ThirdContractFileUrl?window.open(item.ThirdContractFileUrl):''"> @click="item.ThirdContractFileUrl?window.open(item.ThirdContractFileUrl):''">
{{item.ThirdContractID}} <br/> {{item.ThirdContractID}} <br/>
<span v-if="item.ThirdContractState==0" class="c9e">待上传</span> <span v-if="item.ThirdContractState==0" class="c9e">{{$t('objFill.daishanchuan')}}</span>
<span v-if="item.ThirdContractState==1" class="c3FC4FF">待签名</span> <span v-if="item.ThirdContractState==1" class="c3FC4FF">{{$t('objFill.v103.daiqianmin')}}</span>
<span v-if="item.ThirdContractState==2" class="c20C997">已签署</span> <span v-if="item.ThirdContractState==2" class="c20C997">{{$t('objFill.v103.yiqianshu')}}</span>
<span v-if="item.ThirdContractState==3" class="cF1416C">已作废</span> <span v-if="item.ThirdContractState==3" class="cF1416C">{{$t('active.cl_yzfei')}}</span>
<span v-if="item.ThirdContractState==4" class="cff9800">待签署</span> <span v-if="item.ThirdContractState==4" class="cff9800">{{$t('objFill.v103.daiqianshu')}}</span>
<span v-if="item.ThirdContractState==5" class="c9e">待作废</span> <span v-if="item.ThirdContractState==5" class="c9e">{{$t('objFill.v103.daizuofei')}}</span>
</span> </span>
<template v-else>-</template> <template v-else>-</template>
</td> </td>
......
src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue
View file @ 67f5afcc
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
<div slot="tip" class="el-upload__tip" style="color:red;"> <div slot="tip" class="el-upload__tip" style="color:red;">
{{$t('objFill.v101.myOrdersAllType.hengbsbcc')}}</div> {{$t('objFill.v101.myOrdersAllType.hengbsbcc')}}</div>
</el-upload> </el-upload>
<div class="TFSelfimgList" style="margin-top:5px;" <div class="TFSelfimgList" style="margin-top:5px;" v-if="FeatureData&&FeatureData.TripImageListNew&&FeatureData.TripImageListNew.length>0"
v-for="(item,index) in FeatureData.TripImageListNew" :key="item.subCode"> v-for="(item,index) in FeatureData.TripImageListNew" :key="item.subCode">
<img :key="`t_f_`+index+10000" v-if="!item" src="../../../assets/img/bg_c3@3x.png"> <img :key="`t_f_`+index+10000" v-if="!item" src="../../../assets/img/bg_c3@3x.png">
<img :key="`t_f_`+index+20000" v-else :src="item"> <img :key="`t_f_`+index+20000" v-else :src="item">
...@@ -201,10 +201,18 @@ ...@@ -201,10 +201,18 @@
</div> </div>
<!-- ppt 模版行程 --> <!-- ppt 模版行程 -->
<div v-if="FeatureData.FeatureType==9&&FeatureDataFlag" v-loading="iframeLoading"> <div v-if="FeatureData.FeatureType==9&&FeatureDataFlag" v-loading="iframeLoading">
<iframe name="myIframe" :src="myIframeUrl" style="width: 100%;border: 0;" <div style="opacity: 0;position: fixed;left: 0;right: 0; top: 0;bottom: 0; z-index: -1;">
:style="{'height':myIframeHeigth+'px'}"> <iframe name="myIframe" :src="myIframeUrl" style="width: 100%;border: 0;"
</iframe> :style="{'height':myIframeHeigth+'px'}">
<div v-show="PostMessageText=='暂无行程数据'" </iframe>
</div>
<div v-if="FeatureData.TripImageListNew&&FeatureData.TripImageListNew.length">
<template v-for="(item,index) in FeatureData.TripImageListNew">
<el-image style="width: 100%; height:auto;display: block;" :src="item" fit="contain" />
</template>
</div>
<!-- PostMessageText=='暂无行程数据' -->
<div v-else
style="text-align: center;margin-bottom: 20px;font-size: 14px;color: #808080;"> style="text-align: center;margin-bottom: 20px;font-size: 14px;color: #808080;">
{{$t('objFill.v101.myOrdersAllType.zanwusjysjbjssb')}}</div> {{$t('objFill.v101.myOrdersAllType.zanwusjysjbjssb')}}</div>
</div> </div>
...@@ -434,15 +442,20 @@ ...@@ -434,15 +442,20 @@
if (event.data == '行程数据保存成功' || event.data.indexOf('行程特色高') != -1) { if (event.data == '行程数据保存成功' || event.data.indexOf('行程特色高') != -1) {
this.PostMessageText = '' this.PostMessageText = ''
//行程特色高 //行程特色高
if (event.data && typeof (event.data) == 'string' && event.data.indexOf('行程特色高') != -1) { // if (event.data && typeof (event.data) == 'string' && event.data.indexOf('行程特色高') != -1) {
let datas = event.data.split('-') // let datas = event.data.split('-')
this.myIframeHeigth = datas[1]; // this.myIframeHeigth = datas[1];
// this.isPostMessage = true
// }
// if (this.myIframeUrl && this.myIframeUrl != '') {
// document.all.myIframe.src = this.myIframeUrl + `&t=${new Date().getTime()}`
// }
if(event.data == '行程数据保存成功') {
this.isPostMessage = true this.isPostMessage = true
this.$emit('ConfigInfo')
} }
if (this.myIframeUrl && this.myIframeUrl != '') { // this.$emit('pptJourney', true)
document.all.myIframe.src = this.myIframeUrl + `&t=${new Date().getTime()}`
}
this.$emit('pptJourney', true)
} else if (event.data == '暂无行程数据') { } else if (event.data == '暂无行程数据') {
this.PostMessageText = event.data this.PostMessageText = event.data
this.$emit('pptJourney', false) this.$emit('pptJourney', false)
......
src/components/newTravelmanager/TravelGroupControl/TravelManagerThree.vue
View file @ 67f5afcc
...@@ -832,7 +832,7 @@ ...@@ -832,7 +832,7 @@
this.FeatureData.IsUploadFeature = tempData.Feature.IsUploadFeature; this.FeatureData.IsUploadFeature = tempData.Feature.IsUploadFeature;
this.FeatureData.DetailsImageList = tempData.Feature.DetailsImageList; this.FeatureData.DetailsImageList = tempData.Feature.DetailsImageList;
this.FeatureData.TripImageList = tempData.Feature.TripImageList; this.FeatureData.TripImageList = tempData.Feature.TripImageList;
this.FeatureData.TripImageListNew = tempData.Feature.TripImageListNew;
this.FeatureData.DetailsImageListNew = tempData.Feature.DetailsImageListNew; this.FeatureData.DetailsImageListNew = tempData.Feature.DetailsImageListNew;
//图片列表 //图片列表
this.FeatureData.fileList = tempData.Feature.FeatureImgList; this.FeatureData.fileList = tempData.Feature.FeatureImgList;
...@@ -945,7 +945,9 @@ ...@@ -945,7 +945,9 @@
} }
this.FeatureData.LtName = tempData.LtName; this.FeatureData.LtName = tempData.LtName;
this.FeatureData.DayList = tempData.DayList; this.FeatureData.DayList = tempData.DayList;
if (tempData.Feature && tempData.Feature.TripImageListNew) {
this.FeatureData.TripImageListNew = tempData.Feature.TripImageListNew;
}
this.ConfigId = tempData.ID; this.ConfigId = tempData.ID;
//HK 2019-01-08添加 NewConfigId B2B预览使用 //HK 2019-01-08添加 NewConfigId B2B预览使用
this.NewConfigId = tempData.NewConfigId; this.NewConfigId = tempData.NewConfigId;
......
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