Skip to content

S
SuperMan
Commit 786a2981 authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

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

parents 73c8706c 5e876e31
Hide whitespace changes
Inline Side-by-side
Showing with 221 additions and 157 deletions
src/assets/common/lang/zh.js
View file @ 786a2981
...@@ -1743,7 +1743,8 @@ export const visaT = { ...@@ -1743,7 +1743,8 @@ export const visaT = {
qxzzzdqzlx:'请选择正确的签证类型！', qxzzzdqzlx:'请选择正确的签证类型！',
qxzxybddry:"请选择需要绑定的人员", qxzxybddry:"请选择需要绑定的人员",
v_Othervisas: '其他', v_Othervisas: '其他',
dxzhanghu: '对象账户' dxzhanghu: '对象账户',
guazdanju: '挂账单'
} }
import invoicesManager from './H/h-invoicesManager' import invoicesManager from './H/h-invoicesManager'
export const ios = invoicesManager export const ios = invoicesManager
\ No newline at end of file
src/assets/css/salefeture2.css → src/assets/css/sale_pdf.css
View file @ 786a2981
.travelControlTrip *{
page-break-inside: avoid;
}
.clearfix:after {content: "\0020";display: block;height: 0;clear: both;}
.travelControlTrip .trip-box{
page-break-after: always;
}
.travelControlTrip .logo-div{width: 100%;text-align: center;}
.travelControlTrip .logo-div>img{
width: 100%;
}
.travelControlTrip .footer-div{text-align: center;padding: 25px 0; border-top: 1px solid #eee;}
.travelControlTrip .website{text-align: center; font-size: 12px; color: #e73e6d; margin-top: 10px; }
.travelControlTrip .website .website-line{height: 1px; background: #f1f1f1; transform: rotateX(60deg);}
.travelControlTrip .trip-adviser{background: #f7f7f7; font-size: 14px; color: #000000; line-height: 30px;margin: 10px 0 0 0; padding: 10px 20px;}
.travelControlTrip .trip-adviser>p{margin: 10px 0 0 0;font-size: 18px;}
.travelControlTrip .website span{top:-10px; position: relative; background: #fff; padding: 0 15px; font-size: 13px; color: #EE4454;}
.travelControlTrip .trip-nav-title{font-size: 22px; text-align: center;margin: 0px;}
.travelControlTrip .module-title{text-align: center; font-size: 18px; color: #333; padding-top: 30px; padding-bottom: 30px;}
.travelControlTrip .module-title h2{font-weight: normal;font-size: 18px;margin: 0px;}
.template-box .travelSpecial{padding-top: 0px;}
.travelControlTrip .module-title .short-line{width: 32px; height: 2px; background: #e73e6d; margin: 12px auto;}
.travelControlTrip .module-title .english-title{font-family: arial; font-size: 12px; color: #ccc;}
.travelControlTrip .module-title .long-line{width: 100%; height: 1px; background: #f1f1f1; margin: 35px 0; transform: rotateX(60deg) /*解决pdf打印线条过粗*/;}
.travelControlTrip .essential{display: flex; flex-direction: row; flex-wrap: wrap; margin-bottom: 40px;}
.travelControlTrip .essential-item{width:320px; height:100px; box-sizing: border-box;padding-left: 20px;}
.travelControlTrip .essential-item img{float: left; margin-right:12px; width: 66px; height: 66px; border-radius: 38px;}
.travelControlTrip .essential-item p.pkey{font-size: 14px; color: #000; margin:10px 0 0 0; }
.travelControlTrip .essential-item p.pvalue{font-size: 18px; color: #000; margin-top:5px; }
.detail-box .left-team-box{ .detail-box .left-team-box{
height: 465px; height: 465px;
overflow-y: auto; overflow-y: auto;
......
src/components/FinancialModule/FinancialDocuments.vue
View file @ 786a2981
...@@ -170,9 +170,10 @@ ...@@ -170,9 +170,10 @@
<el-option key="0" value="0" :label="$t('pub.unlimitedSel')"></el-option> <el-option key="0" value="0" :label="$t('pub.unlimitedSel')"></el-option>
<el-option key="1" value="1" :label="$t('restaurant.res_income')"></el-option> <el-option key="1" value="1" :label="$t('restaurant.res_income')"></el-option>
<el-option key="2" value="2" :label="$t('restaurant.res_outcome')"></el-option> <el-option key="2" value="2" :label="$t('restaurant.res_outcome')"></el-option>
<el-option key="2" value="5" :label="$t('fnc.yingshou')"></el-option> <el-option key="3" value="5" :label="$t('fnc.yingshou')"></el-option>
<el-option key="2" value="6" :label="$t('fnc.yingfu')"></el-option> <el-option key="4" value="6" :label="$t('fnc.yingfu')"></el-option>
<el-option key="2" value="4" :label="$t('fnc.zjdiaobo')"></el-option> <el-option key="5" value="4" :label="$t('fnc.zjdiaobo')"></el-option>
<el-option key="6" value="7" :label="$t('visaT.guazdanju')"></el-option>
</el-select> </el-select>
</span> </span>
</li> </li>
...@@ -416,12 +417,15 @@ ...@@ -416,12 +417,15 @@
popper-class="detailsIT_Journal" popper-class="detailsIT_Journal"
placement="bottom-start" placement="bottom-start"
trigger="click"> trigger="click">
<template v-if="item.Type!=1&&item.modelShow&&(item.Is_Merge===0||item.Is_Merge===null)"> <template v-if="item.Type!=1&&item.Type!=7&&item.modelShow&&(item.Is_Merge===0||item.Is_Merge===null)">
<my-Bill :ID="item.FrID" :width="widthSon" :color="colorSon"></my-Bill> <my-Bill :ID="item.FrID" :width="widthSon" :color="colorSon"></my-Bill>
</template> </template>
<template v-else-if="item.Type==1&&item.modelShow&&(item.Is_Merge===0||item.Is_Merge===null)"> <template v-else-if="item.Type==1&&item.modelShow&&(item.Is_Merge===0||item.Is_Merge===null)">
<my-RVB-Bill :ID="item.FrID" :width="widthSon" :color="colorSon"></my-RVB-Bill> <my-RVB-Bill :ID="item.FrID" :width="widthSon" :color="colorSon"></my-RVB-Bill>
</template> </template>
<template v-else-if="item.Type==7&&item.modelShow&&(item.Is_Merge===0||item.Is_Merge===null)">
<my-GZ-Bill :ID="item.FrID" :width="'1000px'" :color="colorSon"></my-GZ-Bill>
</template>
<template v-else-if="item.Is_Merge===1&&item.modelShow"> <template v-else-if="item.Is_Merge===1&&item.modelShow">
<my-HB-Bill :ID="item.FrID" :width="widthSon" :color="colorSon"></my-HB-Bill> <my-HB-Bill :ID="item.FrID" :width="widthSon" :color="colorSon"></my-HB-Bill>
</template> </template>
...@@ -662,6 +666,7 @@ ...@@ -662,6 +666,7 @@
import myBill from "./FinancialSubmodule/BillModule.vue"; import myBill from "./FinancialSubmodule/BillModule.vue";
import myrbvBill from "./FinancialSubmodule/ReceivablesModule.vue"; import myrbvBill from "./FinancialSubmodule/ReceivablesModule.vue";
import myhrBill from "./FinancialSubmodule/MergeBillModule.vue"; import myhrBill from "./FinancialSubmodule/MergeBillModule.vue";
import myGZBill from "./FinancialSubmodule/GZBillModule.vue";
export default { export default {
data(){ data(){
return{ return{
...@@ -817,6 +822,7 @@ export default { ...@@ -817,6 +822,7 @@ export default {
"my-Bill": myBill, "my-Bill": myBill,
"my-RVB-Bill":myrbvBill, "my-RVB-Bill":myrbvBill,
"my-HB-Bill":myhrBill, "my-HB-Bill":myhrBill,
"my-GZ-Bill": myGZBill,
},mounted(){ },mounted(){
let userInfo=this.getLocalStorage(); let userInfo=this.getLocalStorage();
let userMenuCode = ',' + userInfo.ActionMenuCode + ','; let userMenuCode = ',' + userInfo.ActionMenuCode + ',';
...@@ -1392,6 +1398,9 @@ export default { ...@@ -1392,6 +1398,9 @@ export default {
} else if (type === 4) { } else if (type === 4) {
path = 'addCapitalAllocation' path = 'addCapitalAllocation'
this.$router.push({ name: path,query:{"id":id,"edit":1,blank:'y',tab:'修改财务单据'} }) this.$router.push({ name: path,query:{"id":id,"edit":1,blank:'y',tab:'修改财务单据'} })
} else if (type === 7) {
path = 'addFinancialGZDocuments'
this.$router.push({ name: path,query:{"FrID":id,"edit":1,blank:'y',tab:'修改财务单据'} })
} }
// this.$router.push({ name: path,query:{"type":type,"FrID":id,"edit":edit,"Conditon":Conditon,"pageIndex":pageIndex,blank:'y',tab:'修改财务单据'} }) // this.$router.push({ name: path,query:{"type":type,"FrID":id,"edit":edit,"Conditon":Conditon,"pageIndex":pageIndex,blank:'y',tab:'修改财务单据'} })
} }
......
src/components/FinancialModule/FinancialSubmodule/BillModule.vue
View file @ 786a2981
...@@ -109,8 +109,8 @@ ...@@ -109,8 +109,8 @@
<span class="_r_name" v-if="GetDetail.TradeDate!=''">{{GetDetail.AccountNumber}} （{{GetDetail.TradeDate}}）</span> <span class="_r_name" v-if="GetDetail.TradeDate!=''">{{GetDetail.AccountNumber}} （{{GetDetail.TradeDate}}）</span>
<span class="_r_name" v-else>{{GetDetail.AccountNumber}}</span> <span class="_r_name" v-else>{{GetDetail.AccountNumber}}</span>
</p> </p>
<p v-if="(GetDetail.Type==2 || GetDetail.Type==6) && GetDetail.IsPublic !== 3" style="max-width: 500px"> <p v-if="GetDetail.Type==2 || GetDetail.Type==6" style="max-width: 500px">
<span>{{$t('visaT.dxzhanghu')}}：</span> <span>{{$t('fnc.fkzhanghu')}}：</span>
<span class="_r_name" v-if="GetDetail.TradeDate!=''">{{GetDetail.AccountNumber}}（{{GetDetail.TradeDate}}）</span> <span class="_r_name" v-if="GetDetail.TradeDate!=''">{{GetDetail.AccountNumber}}（{{GetDetail.TradeDate}}）</span>
<span class="_r_name" v-else>{{GetDetail.AccountNumber?GetDetail.AccountNumber:$t('fnc.no')}}</span> <span class="_r_name" v-else>{{GetDetail.AccountNumber?GetDetail.AccountNumber:$t('fnc.no')}}</span>
</p> </p>
......
src/components/FinancialModule/invoicesManagerDetail.vue
View file @ 786a2981
...@@ -357,7 +357,7 @@ ...@@ -357,7 +357,7 @@
<button class="normalBtn" @click="dialogFormVisible2 = true">{{$t('ios.tonggei')}}</button> <button class="normalBtn" @click="dialogFormVisible2 = true">{{$t('ios.tonggei')}}</button>
<button class="hollowFixedBtn" @click="dialogFormVisible = true">{{$t('ios.jujue')}}</button> <button class="hollowFixedBtn" @click="dialogFormVisible = true">{{$t('ios.jujue')}}</button>
</div> </div>
<div class="iis_save" v-else-if="noDetail && detail.InvoiceApplyState===1 && EmployeeId === detail.CreateBy && EmployeeId === 1"> <div class="iis_save" v-else-if="noDetail && detail.InvoiceApplyState===1 && (EmployeeId === detail.CreateBy || EmployeeId === 1)">
<button class="normalBtn" @click="setStatus(2)">{{$t('pub.cancelBtn')}}</button> <button class="normalBtn" @click="setStatus(2)">{{$t('pub.cancelBtn')}}</button>
</div> </div>
<div class="imd_img_box"> <div class="imd_img_box">
......
src/components/SalesconfirmationOrder.vue
View file @ 786a2981
...@@ -15,9 +15,9 @@ ...@@ -15,9 +15,9 @@
<div class="trip_cover" v-show="pdfLoading" v-loading="pdfLoading"></div> <div class="trip_cover" v-show="pdfLoading" v-loading="pdfLoading"></div>
<input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载电脑版PDF" <input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载电脑版PDF"
@click="toPDF(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')" /> @click="toPDF(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')" />
<input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载手机版WORD" <input type="button" style="width: auto !important; display:none;" class="travelControlTripBtn" value="下载手机版WORD"
@click="gernalFeature(0)" /> @click="gernalFeature(0)" />
<input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载电脑版WORD" <input type="button" style="width: auto !important; display:none;" class="travelControlTripBtn" value="下载电脑版WORD"
@click="gernalFeature(1)" /> @click="gernalFeature(1)" />
<a class="travelControlTripBtn" v-if="priceList.length>0&& priceList[0].wordPath!=''" style="display:inline-block;text-decoration:none; <a class="travelControlTripBtn" v-if="priceList.length>0&& priceList[0].wordPath!=''" style="display:inline-block;text-decoration:none;
width:135px;text-align:center;line-height:30px;font-size:13px;position:relative;top:2px;" width:135px;text-align:center;line-height:30px;font-size:13px;position:relative;top:2px;"
...@@ -252,145 +252,150 @@ ...@@ -252,145 +252,150 @@
<div id="teamacitvy"> </div> <div id="teamacitvy"> </div>
</div> </div>
<div class="trip-box"> <div class="trip-box">
<div class="timeline" style="z-index:999"> <div class="timeline" style="z-index:999">
<div class="timeline-box"></div> <div class="timeline-box"></div>
<div v-for="(item,index) in dataList.dayList" :key="index"> <div v-for="(item,index) in dataList.dayList" :key="index">
<div class="timeline-item"> <div class="timeline-item">
<div class="left"> <div class="left">
<span class="big" style=" font-size: 20px;">行程</span> <span class="big" style=" font-size: 20px;">行程</span>
</div> </div>
<div class="new_right"> <div class="new_right">
<span class="medium"> <span class="medium">
<div v-for="(dn,i) in item.dayArray" :key="i"> <div v-for="(dn,i) in item.dayArray" :key="i">
{{dn.childItem.title}} {{dn.childItem.title}}
</div> </div>
</span> </span>
</div> </div>
</div>
<div v-for="(son,i) in item.dayArray" :key="i">
<!-- <traffice :tripItem='son' v-if="son.type==1"></traffice> -->
<template v-if="son.type==1">
<div class="timeline-item">
<div class="left">
<i class="iconfont icon-feiji"></i>
</div>
<div class="new_right">
<span class="time" v-if="son.childItem.timeType==1">上午</span>
<span class="time" v-if="son.childItem.timeType==2">下午</span>
<span class="time" v-if="son.childItem.timeType==0">全天</span>
<span class="title">
<span v-if="son.type==1" v-for="(dns,o) in son.childItem.subTraffic" :key="o">
{{dns.startCityName}}
<i v-if="dns.arrivalType==1" class="iconfont icon-feiji"></i>
<i v-if="dns.arrivalType==2" class="iconfont icon-bus"></i>
<i v-if="dns.arrivalType==3" class="iconfont icon-icon31"></i>
<i v-if="dns.arrivalType==4" class="iconfont icon-gaotiedongche"></i>
<span v-if="o+1==son.childItem.subTraffic.length">{{dns.arrivalCityName}}</span>
</span>
</span>
<span class="content" v-html="son.childItem.description"></span>
</div> </div>
<div v-for="(son,i) in item.dayArray" :key="i"> </div>
<!-- <traffice :tripItem='son' v-if="son.type==1"></traffice> --> </template>
<template v-if="son.type==1">
<div class="timeline-item">
<div class="left">
<i class="iconfont icon-feiji"></i>
</div>
<div class="new_right">
<span class="time" v-if="son.childItem.timeType==1">上午</span>
<span class="time" v-if="son.childItem.timeType==2">下午</span>
<span class="time" v-if="son.childItem.timeType==0">全天</span>
<span class="title">
<span v-if="son.type==1" v-for="(dns,o) in son.childItem.subTraffic" :key="o">
{{dns.startCityName}}
<i v-if="dns.arrivalType==1" class="iconfont icon-feiji"></i>
<i v-if="dns.arrivalType==2" class="iconfont icon-bus"></i>
<i v-if="dns.arrivalType==3" class="iconfont icon-icon31"></i>
<i v-if="dns.arrivalType==4" class="iconfont icon-gaotiedongche"></i>
<span v-if="o+1==son.childItem.subTraffic.length">{{dns.arrivalCityName}}</span>
</span>
</span>
<span class="content" v-html="son.childItem.description"></span>
</div>
</div>
</template>
<template v-if="son.type==2"> <template v-if="son.type==2">
<div class="timeline-item"> <div class="timeline-item">
<div class="left"> <div class="left">
<i class="iconfont icon-zuji"></i> <i class="iconfont icon-zuji"></i>
</div> </div>
<div class="new_right"> <div class="new_right">
<span class="time" v-if="son.childItem.timeType==1">上午</span> <span class="time" v-if="son.childItem.timeType==1">上午</span>
<span class="time" v-if="son.childItem.timeType==2">下午</span> <span class="time" v-if="son.childItem.timeType==2">下午</span>
<span class="time" v-if="son.childItem.timeType==0">全天</span> <span class="time" v-if="son.childItem.timeType==0">全天</span>
<span class="title"> <span class="title">
{{son.childItem.couponsName}} {{son.childItem.couponsName}}
</span> </span>
<span class="playTime"> <i class="iconfont icon-shijian"></i> 游玩时间：<span v-if="son.childItem.playTimeHour!=null&&son.childItem.playTimeHour!=''">{{son.childItem.playTimeHour+'小时'}}</span><span v-if="son.childItem.playTimeMinutes!=null&&son.childItem.playTimeMinutes!=''">{{son.childItem.playTimeMinutes+'分钟'}}</span></span> <div class="playTime"> <i class="iconfont icon-shijian"></i> 游玩时间：
<span class="content" v-html="son.childItem.description"></span> <span v-if="son.childItem.playTimeHour!=null&&son.childItem.playTimeHour!=''">{{son.childItem.playTimeHour+'小时'}}</span>
<div class="Newimg-list" v-if="son.childItem.imaArray.length"> <span v-if="son.childItem.playTimeMinutes!=null&&son.childItem.playTimeMinutes!=''">{{son.childItem.playTimeMinutes+'分钟'}}</span>
<div class="item" v-for="(img,i) in son.childItem.imaArray" :key="i"> </div>
<img :src='img.url'/> <div class="content" v-html="son.childItem.description"></div>
</div> <div class="Newimg-list clearfix" v-if="son.childItem.imaArray.length">
</div> <div class="item" v-for="(img,i) in son.childItem.imaArray" :key="i">
</div> <img :src='img.url' />
</div> </div>
</template> </div>
</div>
<template v-if="son.type==3"> </div>
<div class="timeline-item"> </template>
<div class="left">
<i class="iconfont icon-jiudian"></i>
</div>
<div class="new_right">
<span class="time" v-if="son.childItem.timeType==1">上午</span>
<span class="time" v-if="son.childItem.timeType==2">下午</span>
<span class="time" v-if="son.childItem.timeType==0">全天</span>
<span class="title">
{{son.childItem.hotelName+son.childItem.hotelProductName}}
</span>
<span class="content" v-html="son.childItem.description"></span>
<div class="Newimg-list" v-if="son.childItem.imaArray.length">
<div class="item" v-for="(img,i) in son.childItem.imaArray" :key="i">
<img :src='img.url'/>
</div>
</div>
</div>
</div>
</template>
<template v-if="son.type==4">
<div class="timeline-item">
<div class="left">
<i class="iconfont icon-yongcan"></i>
</div>
<div class="new_right">
<span class="time" v-if="son.childItem.timeType==1">上午</span>
<span class="time" v-if="son.childItem.timeType==2">下午</span>
<span class="time" v-if="son.childItem.timeType==0">全天</span>
<span class="title">
{{son.childItem.dinnerName+son.childItem.mealName}}
</span>
<span class="playTime"> <i class="iconfont icon-shijian"></i> 用餐时长：<span v-if="son.childItem.playTimeHour!=null&&son.childItem.playTimeHour!=''">{{son.childItem.playTimeHour+'小时'}}</span><span v-if="son.childItem.playTimeMinutes!=null&&son.childItem.playTimeMinutes!=''">{{son.childItem.playTimeMinutes+'分钟'}}</span></span>
<span class="content" v-html="son.childItem.description"></span>
<div class="Newimg-list" v-if="son.childItem.imaArray.length">
<div class="item" v-for="(img,i) in son.childItem.imaArray" :key="i">
<img :src='img.url'/>
</div>
</div>
</div>
</div>
</template>
<template v-if="son.type==5">
<div class="timeline-item">
<div class="left">
<i class="iconfont icon-huodong"></i>
</div>
<div class="new_right">
<span class="time" v-if="son.childItem.timeType==1">上午</span>
<span class="time" v-if="son.childItem.timeType==2">下午</span>
<span class="time" v-if="son.childItem.timeType==0">全天</span>
<span class="content" v-html="son.childItem.description"></span>
</div>
</div>
</template>
<template v-if="son.type==6">
<div class="timeline-item">
<div class="left">
<i class="iconfont icon-tishi"></i>
</div>
<div class="new_right">
<span class="content" v-html="son.childItem.description"></span>
</div>
</div>
</template>
<!-- <scenic v-if="son.type==2" :tripItem='son'></scenic> --> <template v-if="son.type==3">
<!-- <hotel v-if="son.type==3" :tripItem='son'></hotel> --> <div class="timeline-item">
<!-- <restaurant v-if="son.type==4" :tripItem='son'></restaurant> --> <div class="left">
<!-- <activity v-if="son.type==5" :tripItem='son'></activity> --> <i class="iconfont icon-jiudian"></i>
<!-- <tips v-if="son.type==6" :tripItem='son'></tips> -->
</div> </div>
</div> <div class="new_right">
<span class="time" v-if="son.childItem.timeType==1">上午</span>
<span class="time" v-if="son.childItem.timeType==2">下午</span>
<span class="time" v-if="son.childItem.timeType==0">全天</span>
<div class="title">
{{son.childItem.hotelName+son.childItem.hotelProductName}}
</div>
<div class="content" v-html="son.childItem.description"></div>
<div class="Newimg-list clearfix" v-if="son.childItem.imaArray.length">
<div class="item" v-for="(img,i) in son.childItem.imaArray" :key="i">
<img :src='img.url' />
</div>
</div>
</div>
</div>
</template>
<template v-if="son.type==4">
<div class="timeline-item">
<div class="left">
<i class="iconfont icon-yongcan"></i>
</div>
<div class="new_right">
<span class="time" v-if="son.childItem.timeType==1">上午</span>
<span class="time" v-if="son.childItem.timeType==2">下午</span>
<span class="time" v-if="son.childItem.timeType==0">全天</span>
<span class="title">
{{son.childItem.dinnerName+son.childItem.mealName}}
</span>
<div class="playTime"> <i class="iconfont icon-shijian"></i> 用餐时长：<span
v-if="son.childItem.playTimeHour!=null&&son.childItem.playTimeHour!=''">{{son.childItem.playTimeHour+'小时'}}</span><span
v-if="son.childItem.playTimeMinutes!=null&&son.childItem.playTimeMinutes!=''">{{son.childItem.playTimeMinutes+'分钟'}}</span></div>
<div class="content" v-html="son.childItem.description"></div>
<div class="Newimg-list clearfix" v-if="son.childItem.imaArray.length">
<div class="item" v-for="(img,i) in son.childItem.imaArray" :key="i">
<img :src='img.url' />
</div>
</div>
</div>
</div>
</template>
<template v-if="son.type==5">
<div class="timeline-item">
<div class="left">
<i class="iconfont icon-huodong"></i>
</div>
<div class="new_right">
<span class="time" v-if="son.childItem.timeType==1">上午</span>
<span class="time" v-if="son.childItem.timeType==2">下午</span>
<span class="time" v-if="son.childItem.timeType==0">全天</span>
<span class="content" v-html="son.childItem.description"></span>
</div>
</div>
</template>
<template v-if="son.type==6">
<div class="timeline-item">
<div class="left">
<i class="iconfont icon-tishi"></i>
</div>
<div class="new_right">
<span class="content" v-html="son.childItem.description"></span>
</div>
</div>
</template>
<!-- <scenic v-if="son.type==2" :tripItem='son'></scenic> -->
<!-- <hotel v-if="son.type==3" :tripItem='son'></hotel> -->
<!-- <restaurant v-if="son.type==4" :tripItem='son'></restaurant> -->
<!-- <activity v-if="son.type==5" :tripItem='son'></activity> -->
<!-- <tips v-if="son.type==6" :tripItem='son'></tips> -->
</div>
</div> </div>
</div>
</div> </div>
<div id="pdf_4"> <div id="pdf_4">
<div v-if='vshowE' class="module-title"> <div v-if='vshowE' class="module-title">
...@@ -621,7 +626,7 @@ ...@@ -621,7 +626,7 @@
effect="dark" content="下移" placement="top-start"> effect="dark" content="下移" placement="top-start">
<el-button type="danger" icon="iconfont icon-xiayi1" @click="MoveItem(priceFlight,index,1)" circle> <el-button type="danger" icon="iconfont icon-xiayi1" @click="MoveItem(priceFlight,index,1)" circle>
</el-button> </el-button>
</el-tooltip> </el-tooltip>
</td> </td>
</tr> </tr>
</table> </table>
...@@ -961,7 +966,7 @@ ...@@ -961,7 +966,7 @@
url: urlObj.DomainUrl + '/api/file/GetWebHtmlTwo', url: urlObj.DomainUrl + '/api/file/GetWebHtmlTwo',
data: { data: {
"msg": pageData, "msg": pageData,
isSale:1 sign: "sale_pdf"
} }
}).then(res => { }).then(res => {
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
...@@ -1044,7 +1049,7 @@ ...@@ -1044,7 +1049,7 @@
}, res => { }, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
let data = (res.data.data); let data = (res.data.data);
console.log(data,'dataaaa'); console.log(data, 'dataaaa');
this.orderTripdiff = data.orderTripdiff; this.orderTripdiff = data.orderTripdiff;
this.orderMsg = data.orderMsg; this.orderMsg = data.orderMsg;
if (this.orderTripdiff && this.orderTripdiff.flightInfoJson) { if (this.orderTripdiff && this.orderTripdiff.flightInfoJson) {
...@@ -1397,7 +1402,7 @@ ...@@ -1397,7 +1402,7 @@
</script> </script>
<style> <style>
@import url('../assets/css/tripIndex.css'); @import url('../assets/css/tripIndex.css');
@import url('../assets/css/salefeture2.css'); @import url('../assets/css/sale_pdf.css');
.edit_form_box { .edit_form_box {
display: flex; display: flex;
......
src/components/TravelManager/TravelList/TravelControlListSale.vue
View file @ 786a2981
...@@ -553,7 +553,7 @@ ...@@ -553,7 +553,7 @@
</span> </span>
<el-dropdown-menu slot="dropdown" class="TC-dropdown"> <el-dropdown-menu slot="dropdown" class="TC-dropdown">
<el-dropdown-item @click.native="goTeamBalance(item.TCID,item.OutBranchId)">团队收支明细</el-dropdown-item> <el-dropdown-item @click.native="goTeamBalance(item.TCID,item.OutBranchId)">团队收支明细</el-dropdown-item>
<el-dropdown-item @click.native="goUrlR('confirmationOrderDownLoad',item.TCID,item.ID,item.StartCityID)">行程下载</el-dropdown-item> <el-dropdown-item @click.native="goUrlR('SalesconfirmationOrder',item.TCID,item.ID,item.StartCityID)">行程下载</el-dropdown-item>
<el-dropdown-item @click.native="removeTeamInfo(item.TCID)">删除</el-dropdown-item> <el-dropdown-item @click.native="removeTeamInfo(item.TCID)">删除</el-dropdown-item>
<el-dropdown-item v-if="item.TCState==2||item.TCState==0||item.TCState==1" @click.native="setUpPlat(item)">上架</el-dropdown-item> <el-dropdown-item v-if="item.TCState==2||item.TCState==0||item.TCState==1" @click.native="setUpPlat(item)">上架</el-dropdown-item>
<el-dropdown-item v-if="item.TCState==3" @click.native="Setshelves(item.TCID)">下架</el-dropdown-item> <el-dropdown-item v-if="item.TCState==3" @click.native="Setshelves(item.TCID)">下架</el-dropdown-item>
...@@ -900,7 +900,6 @@ ...@@ -900,7 +900,6 @@
}); });
} }
}); });
console.log(this.queryCommonData.dataList,'dataList');
} }
}, },
err => {} err => {}
......
src/components/administrative/ExaminationStatistics.vue
View file @ 786a2981
...@@ -292,7 +292,7 @@ export default { ...@@ -292,7 +292,7 @@ export default {
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "left",
isResize: true, isResize: true,
width: 80, width: 70,
orderBy: "", orderBy: "",
formatter: function(rowData, rowIndex, pagingIndex, field) { formatter: function(rowData, rowIndex, pagingIndex, field) {
return `<span>${rowData.leaveEarlyCount <= 0 ? '' : rowData.leaveEarlyCount}</span>` return `<span>${rowData.leaveEarlyCount <= 0 ? '' : rowData.leaveEarlyCount}</span>`
...@@ -316,12 +316,24 @@ export default { ...@@ -316,12 +316,24 @@ export default {
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "left",
isResize: true, isResize: true,
width: 80, width: 90,
orderBy: "", orderBy: "",
formatter: function(rowData, rowIndex, pagingIndex, field) { formatter: function(rowData, rowIndex, pagingIndex, field) {
return `<span>${rowData.lllegalModifyRemarkCount <= 0 ? '' : rowData.lllegalModifyRemarkCount}</span>` return `<span>${rowData.lllegalModifyRemarkCount <= 0 ? '' : rowData.lllegalModifyRemarkCount}</span>`
} }
}; };
let AppletOrderCount = {
field: "appletOrderCount",
title: "报名确认单数",
titleAlign: "left",
columnAlign: "left",
isResize: true,
width: 80,
// orderBy: "",
formatter: function(rowData, rowIndex, pagingIndex, field) {
return `<span>${rowData.appletOrderCount <= 0 ? '' : rowData.appletOrderCount}</span>`
}
};
let discountPrice = { let discountPrice = {
field: "discountPrice", field: "discountPrice",
title: "少价金额", title: "少价金额",
...@@ -340,6 +352,7 @@ export default { ...@@ -340,6 +352,7 @@ export default {
this.columns.push(userName); this.columns.push(userName);
this.columns.push(periods); this.columns.push(periods);
this.columns.push(LllegalModifyRemarkCount); this.columns.push(LllegalModifyRemarkCount);
this.columns.push(AppletOrderCount);
this.columns.push(rejectCount); this.columns.push(rejectCount);
this.columns.push(receivedPeopleCount); this.columns.push(receivedPeopleCount);
this.columns.push(orderCount); this.columns.push(orderCount);
...@@ -378,9 +391,12 @@ export default { ...@@ -378,9 +391,12 @@ export default {
if(param.uncollected!=''){ if(param.uncollected!=''){
this.msg.OrderBy='a.Uncollected '+param.uncollected this.msg.OrderBy='a.Uncollected '+param.uncollected
} }
if(param.LllegalModifyRemarkCount!=''){ if(param.lllegalModifyRemarkCount!=''){
this.msg.OrderBy='a.LllegalModifyRemarkCount '+param.lllegalModifyRemarkCount this.msg.OrderBy='a.LllegalModifyRemarkCount '+param.lllegalModifyRemarkCount
} }
if(param.appletOrderCount!=''){
this.msg.OrderBy='a.AppletOrderCount '+param.appletOrderCount
}
//this.tableData = this.orderBy(d, ["incomeVal"], param.income).results; //this.tableData = this.orderBy(d, ["incomeVal"], param.income).results;
this.getList(); this.getList();
// }else{ // }else{
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice2.vue
View file @ 786a2981
...@@ -896,6 +896,12 @@ ...@@ -896,6 +896,12 @@
) )
}; };
} }
this.queryFlightAirListData.forEach(subItem=>{
if(subItem.FlightDate==objItem.StartDate)
{
objItem.AirTicketId=subItem.AirLineTicketId
}
});
this.returnPriceList.push(objItem); this.returnPriceList.push(objItem);
this.initDatePickerCheched(); this.initDatePickerCheched();
this.returnPriceList.sort( this.returnPriceList.sort(
...@@ -1323,7 +1329,6 @@ ...@@ -1323,7 +1329,6 @@
this.returnPriceList.forEach(x => { this.returnPriceList.forEach(x => {
if (x.TCID == this.modifyTcid) { if (x.TCID == this.modifyTcid) {
priceList = []; priceList = [];
// x.TCID = 0;
x.ConfigID = 0; x.ConfigID = 0;
priceList.push(x); priceList.push(x);
} }
...@@ -1338,7 +1343,6 @@ ...@@ -1338,7 +1343,6 @@
this.priceData = this.returnPriceList[index]; this.priceData = this.returnPriceList[index];
x["Checked"] = true; x["Checked"] = true;
this.chooseDay = this.priceData.StartDate; this.chooseDay = this.priceData.StartDate;
} else { } else {
x["Checked"] = false; x["Checked"] = false;
} }
......
src/components/newTravelmanager/oldTravelGroupControl/TravelManager5.vue
View file @ 786a2981
...@@ -572,7 +572,7 @@ ...@@ -572,7 +572,7 @@
dinnerObj.UseDinnerType = useDinnerType dinnerObj.UseDinnerType = useDinnerType
dinnerObj.DinnerName = dinnerName dinnerObj.DinnerName = dinnerName
dinnerObj.BreakfastUseType = 0 dinnerObj.BreakfastUseType = 0
dinnerObj.DayNum = dayNum dinnerObj.DayNum = dayNumdayNum
return dinnerObj return dinnerObj
}, },
firstLoadConfigInfo() { firstLoadConfigInfo() {
...@@ -640,7 +640,7 @@ ...@@ -640,7 +640,7 @@
this.FeatureData.Subtitle = tempData.LtName this.FeatureData.Subtitle = tempData.LtName
this.FeatureData.LineName = tempData.LineName this.FeatureData.LineName = tempData.LineName
this.FeatureData.DayList = tempData.DayList this.FeatureData.DayList = tempData.DayList2
this.ConfigId = tempData.ID this.ConfigId = tempData.ID
//HK 2019-01-08添加 NewConfigId B2B预览使用 //HK 2019-01-08添加 NewConfigId B2B预览使用
......
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