Skip to content

S
SuperMan
Commit 4f73e4b2 authored by youjie's avatar youjie
Browse files
Options

Merge branch 'master' into carOrder

parents 578cc7fc f35cfa9a
Hide whitespace changes
Inline Side-by-side
Showing with 354 additions and 81 deletions
src/components/FinancialModule/DataAnalysis/components/corporation.vue
View file @ 4f73e4b2
......@@ -71,12 +71,28 @@
</el-table-column>
<el-table-column
prop=""
label="最终利润"
label="营业利润"
min-width="120" align="center">
<template slot-scope="scope">
{{scope.row.DetailList[i].FinalProfit.toFixed(2)}}
</template>
</el-table-column>
<el-table-column
prop=""
label="管销费用"
min-width="120" align="center">
<template slot-scope="scope">
{{scope.row.DetailList[i].GXFY.toFixed(2)}}
</template>
</el-table-column>
<el-table-column
prop=""
label="净利润"
min-width="120" align="center">
<template slot-scope="scope">
{{scope.row.DetailList[i].JLR.toFixed(2)}}
</template>
</el-table-column>
</el-table-column>
</el-table>
</div>
......
src/components/FinancialModule/DataAnalysis/index.vue
View file @ 4f73e4b2
......@@ -13,7 +13,7 @@
<el-select
filterable
v-model="msg.OutBranchId"
@change="getStatement"
@change="getChange"
clearable
>
<el-option
......@@ -29,6 +29,19 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="$t('fnc.bweibi')">
<el-select :disabled="coinGetShow" filterable v-model="msg.StandardCurrencyId" class @change="getChange">
<el-option :value="-1" :label="$t('pub.unlimitedSel')"></el-option>
<el-option
v-for="item in coinGetList"
:label="item.Name"
:value="item.ID"
:key="item.ID"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="线路">
<el-select filterable v-model="msg.LineId" @change="getStatement"
......@@ -63,6 +76,26 @@
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="4" v-if="msg.Type==2">
<el-form-item label="数据类别：">
<el-select v-model="msg.DataType" filterable class="w150" @change="getStatement">
<el-option value="-1" :label="$t('pub.unlimitedSel')"></el-option>
<el-option value="1" label="团队营收"></el-option>
<el-option value="3" label="单办签证"></el-option>
<el-option value="15" label="手配费收入"></el-option>
<el-option value="16" label="单项机票"></el-option>
<el-option value="17" label="单项酒店"></el-option>
<el-option value="18" label="单项包车"></el-option>
<el-option value="19" label="单项门票"></el-option>
<el-option value="20" label="开票收入"></el-option>
<el-option value="21" label="日本手配费收入"></el-option>
<el-option value="22" label="车行收入"></el-option>
<el-option value="23" label="欧洲单团分润收入"></el-option>
<el-option value="24" label="欧洲损失分摊"></el-option>
<el-option value="25" label="CRM直客部外丟團"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
<ul class="clearfix">
......@@ -98,8 +131,10 @@ export default {
startDate: '',
endDate: '',
OutBranchId: -1,
StandardCurrencyId:0,
LineId: 0,
Type: '1'
Type: '1',
DataType:'-1'
},
dateTime: [],
CompanyList: [],
......@@ -109,6 +144,7 @@ export default {
Status: "0",
},
LineList: [],
coinGetList: [],
pickerOptions: {
shortcuts: [{
text: '本月',
......@@ -143,10 +179,37 @@ export default {
this.dateTime = [this.$commonUtils.getFormatDateM(start),this.$commonUtils.getFormatDateM(end)]
this.msg.startDate = this.dateTime[0]
this.msg.endDate = this.dateTime[1]
this.financeinfo_post_GetList()
this.getQueryData()
this.getStatement()
},
methods: {
getChange(val){
if(this.msg.OutBranchId == -1){
this.coinGetShow = false
this.msg.StandardCurrencyId = val>-1?val:this.coinGetList[0].ID
}else{
this.coinGetShow = true
this.msg.StandardCurrencyId = -1
}
this.getStatement();
},
financeinfo_post_GetList(){ // 获取币种
this.apipost('financeinfo_post_GetAllStandardCurrencyList',{}, res => {
if(res.data.resultCode == 1) {
this.coinGetList = res.data.data;
if(this.msg.OutBranchId == -1){
this.coinGetShow = false
this.msg.StandardCurrencyId = this.coinGetList[0].ID
this.msg.StandardCurrencyId=this.$route.query.StandardCurrencyId?Number(this.$route.query.StandardCurrencyId):this.msg.StandardCurrencyId;
}else{
this.coinGetShow = true
this.msg.StandardCurrencyId = -1
}
this.getPageList();
}
})
},
getStatement(){
this.loading = true
this.apipost(
......
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ 4f73e4b2
......@@ -1192,11 +1192,10 @@
</div>
</template>
</div>
<div style="margin-top: 10px;" v-if="(GetDetail.CreateBy==userInfo.EmployeeId
||GetDetail.InvoiceExamineBy==userInfo.EmployeeId
||ActionMenuCode.indexOf('F_Query_AllIncomPay')!= -1)&&GetDetail.InvoiceState!=2">
<template v-if="(GetDetail.InvoiceExamineBy==userInfo.EmployeeId
||ActionMenuCode.indexOf('F_Query_AllIncomPay')!= -1)">
<div style="margin-top: 10px;" >
<div class="_pic_upload">
<!--<div class="_pic_upload" v-if="saveMsg.length!==5 && ((saveMsg.length + GetDetail.VorcherInos.length) < 5)">-->
<el-upload drag :http-request="uploadFileBtnFP" :multiple="true" :show-file-list="false" action="">
<i class="el-icon-plus avatar-uploader-icon"></i>
<div class="el-upload__text">{{$t('objFill.djtzscfp')}}</div>
......@@ -1205,6 +1204,19 @@
<div class="shangchuanfujian"><button class="hollowFixedBtn"
@click="upLoadFuJian(1)">{{$t('objFill.scfp')}}</button></div>
</div>
</template>
<template v-else-if="(GetDetail.CreateBy==userInfo.EmployeeId)&&GetDetail.InvoiceState!=2">
<div style="margin-top: 10px;" >
<div class="_pic_upload">
<el-upload drag :http-request="uploadFileBtnFP" :multiple="true" :show-file-list="false" action="">
<i class="el-icon-plus avatar-uploader-icon"></i>
<div class="el-upload__text">{{$t('objFill.djtzscfp')}}</div>
</el-upload>
</div>
<div class="shangchuanfujian"><button class="hollowFixedBtn"
@click="upLoadFuJian(1)">{{$t('objFill.scfp')}}</button></div>
</div>
</template>
</div>
</div>
......
src/components/FinancialModule/MonthlyCostStatement/components/selectSettlementData.vue
View file @ 4f73e4b2
......@@ -38,7 +38,7 @@
其他收入
</span>
<span v-else-if="scope.row.Type==2" style="display: inline-block;
<span v-else-if="scope.row.Type==2 && scope.row.TCIDList && scope.row.TCIDList.count>0" style="display: inline-block;
padding: 2px 8px;
color: white;
background-color: #E95252;
......@@ -46,6 +46,14 @@
border-radius: 4px;">
成本支出
</span>
<span v-else-if="scope.row.Type==2" style="display: inline-block;
padding: 2px 8px;
color: white;
background-color: #2BB87C;
line-height: 16px;
border-radius: 4px;">
PIC代付
</span>
<span v-else-if="scope.row.Type==1" style="display: inline-block;
padding: 2px 8px;
color: white;
......@@ -126,7 +134,7 @@
this.dataList.forEach(x=>{
x.DetailList.forEach(y=>{
if(x.TemplateId==281 || x.TemplateId==283 || x.Type==2){
if(x.TemplateId==281 || x.TemplateId==283 || (x.Type == 2 && x.TCIDList && x.TCIDList.count>0)){
this.OriginalMoney+=(y.Money *100)
}else{
this.OriginalMoney-=(y.Money *100)
......
src/components/FinancialModule/MonthlyCostStatement/settlement.vue
View file @ 4f73e4b2
......@@ -70,7 +70,7 @@
<button class="normalBtn" @click="GenerateDocuments()">生成结算单据</button>
</li>
</ul>
注释：此处为对台湾结算，结算金额 = 分润收入 + 其他收入(经营费+佣金等) + 台湾成本支出 - 台湾团费收入
注释：此处为对台湾结算，结算金额 = 分润收入 + 其他收入(经营费+佣金等) + 台湾成本支出 - 台湾团费收入 - PIC代付
</div>
<div style="display: flex;flex-wrap: nowrap; padding: 10px;">
<div style="display: flex;flex-wrap: wrap;">
......@@ -122,8 +122,7 @@
border-radius: 4px;">
其他收入
</span>
<span v-else-if="scope.row.Type==2" style="display: inline-block;
<span v-else-if="scope.row.Type==2 && scope.row.TCIDList && scope.row.TCIDList.count>0" style="display: inline-block;
padding: 2px 8px;
color: white;
background-color: #E95252;
......@@ -131,6 +130,14 @@
border-radius: 4px;">
成本支出
</span>
<span v-else-if="scope.row.Type==2" style="display: inline-block;
padding: 2px 8px;
color: white;
background-color: #2BB87C;
line-height: 16px;
border-radius: 4px;">
PIC代付
</span>
<span v-else-if="scope.row.Type==1" style="display: inline-block;
padding: 2px 8px;
color: white;
......@@ -627,7 +634,7 @@
let Money = 0
this.multipleSelection.forEach(x => {
x.DetailList.forEach(y => {
if (x.TemplateId==281 || x.TemplateId==283 || x.Type == 2) {
if (x.TemplateId==281 || x.TemplateId==283 || (x.Type == 2 && x.TCIDList && x.TCIDList.count>0)) {
Money += (y.Money * 100)
}else{
Money -= (y.Money * 100)
......
src/components/FinancialModule/ReportForm/TeamRevenueReport.vue
View file @ 4f73e4b2
......@@ -1174,15 +1174,15 @@ Vue.component("TCStatusport", {
<span v-if="rowData.OutTCStatus==4" style="color: #47BF8C;">已收损</span>
</span>
<span v-else>
<span v-if="rowData.DataType!=16 && rowData.OutTCStatus==0"></span>
<span v-if="rowData.DataType!=16 && rowData.OutTCStatus==1">已出团</span>
<span v-if="rowData.DataType!=16 && rowData.OutTCStatus==2">未出团</span>
<span v-if="rowData.DataType!=16 && rowData.OutTCStatus==3">未发团</span>
<span v-if="rowData.DataType==16 && rowData.OutTCStatus==1">未完结</span>
<span v-if="rowData.DataType==16 && rowData.OutTCStatus==4">收损</span>
<span v-if="rowData.DataType==16 && rowData.OutTCStatus==3">部分收损</span>
<span v-if="rowData.DataType==16 && rowData.OutTCStatus==5">已完结</span>
<span v-if="rowData.DataType==16 && rowData.OutTCStatus==6">收损完结</span>
<span v-if="rowData.DataType!=16 && rowData.DataType!=25 && rowData.OutTCStatus==0"></span>
<span v-if="rowData.DataType!=16 && rowData.DataType!=25 && rowData.OutTCStatus==1">已出团</span>
<span v-if="rowData.DataType!=16 && rowData.DataType!=25 && rowData.OutTCStatus==2">未出团</span>
<span v-if="rowData.DataType!=16 && rowData.DataType!=25 && rowData.OutTCStatus==3">未发团</span>
<span v-if="(rowData.DataType==16 || rowData.DataType==25) && rowData.OutTCStatus==1">未完结</span>
<span v-if="(rowData.DataType==16 || rowData.DataType==25) && rowData.OutTCStatus==4">收损</span>
<span v-if="(rowData.DataType==16 || rowData.DataType==25) && rowData.OutTCStatus==3">部分收损</span>
<span v-if="(rowData.DataType==16 || rowData.DataType==25) && rowData.OutTCStatus==5">已完结</span>
<span v-if="(rowData.DataType==16 || rowData.DataType==25) && rowData.OutTCStatus==6">收损完结</span>
</span>
</span>`,
props: {
......@@ -2389,18 +2389,18 @@ export default {
{
field: "TicketFee",
formatter: this.moneyFormat,
title: "过路停车费",
width: 90,
title: "过路停车费收入",
width: 100,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "YingFu",
field: "JiPiao",
formatter: this.moneyFormat,
title: "应付金额",
width: 90,
title: "过路停车费支出",
width: 100,
titleAlign: "left",
columnAlign: "right",
isResize: true,
......@@ -2418,7 +2418,6 @@ export default {
},
{
field: "MaoLiRate",
// formatter: this.moneyFormat,
title: "毛利率",
width: 90,
titleAlign: "left",
......
src/components/TravelContractDetail.vue
View file @ 4f73e4b2
......@@ -381,6 +381,66 @@
font-size: 12px;
color: gray;
}
.TD_MainContent .TCbtn-info {
color: #ffffff;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
background-color: #49afcd;
background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4);
background-image: -webkit-gradient(linear,
0 0,
0 100%,
from(#5bc0de),
to(#2f96b4));
background-image: -webkit-linear-gradient(top, #5bc0de, #2f96b4);
background-image: -o-linear-gradient(top, #5bc0de, #2f96b4);
background-image: linear-gradient(to bottom, #5bc0de, #2f96b4);
background-repeat: repeat-x;
border-color: #2f96b4 #2f96b4 #1f6377;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2f96b4', GradientType=0);
filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
padding: 10px 19px;
border: none;
outline: none;
cursor: pointer;
}
.TCbtn-info:hover,
.btn-warning:hover {
color: #ffffff;
opacity: 0.8;
}
.TD_MainContent .singeRowTable {
width: 100%;
border-collapse: collapse;
}
.TD_MainContent .singeRowTable tr th,
.v-table-title-cell {
background: #e6e6e6;
height: 40px;
font-size: 14px;
color: #333;
}
.TD_MainContent .singeRowTable tr {
background: #fff;
text-align: center;
height: 40px;
}
.TD_MainContent .singeRowTable tr:nth-child(2n + 1) {
background: #fafafa;
}
.TD_MainContent .singeRowTable tr:hover {
background: #f2f2f2;
}
.TD_MainContent .singeRowTable tr td {
font-size: 12px;
border: 1px solid #e5e5e5;
}
</style>
......@@ -394,6 +454,9 @@
合同详情 &nbsp;&nbsp;<template v-if="dataList.saleName&&dataList.saleName!=''">
销售人员:{{dataList.saleName}}</template>
<span>
<template v-if="dataList.orderType==0">
<input type="button" class="TCbtn-info" @click="(dialogVisible = true), getGuestList()" value="复制合同" />
</template>
<input type="button" class="TCbtn-info" v-if="dataList.status==1" @click="getinvalid()" value="作废" />
<input type="button" class="TCbtn-info" v-if="dataList.companySignature==''"
@click="isShowFade=true,GetQrCode()" value="客户签字" />
......@@ -1083,6 +1146,36 @@
</div>
</div>
</div>
<el-dialog custom-class="w600" title="合同复制" :visible.sync="dialogVisible" center>
<input type="button" v-if="backGuest && backGuest.length > 0" class="TCbtn-info"
style="padding: 8px 10px; float: right; margin-bottom: 10px" @click="copyContract()" value="批量复制合同" />
<table border="0" cellspacing="0" cellpadding="0" class="singeRowTable">
<tr>
<th>选择</th>
<th>旅客姓名</th>
<th>{{ $t("hotel.table_tel") }}</th>
</tr>
<tr v-for="(item, index) in backGuest">
<td>
<template v-if="item.IsShow">
<el-checkbox v-model="item.isCheck"></el-checkbox>
</template>
<template v-else>
<span style="color: red">已存在合同</span>
</template>
</td>
<td>{{ item.surName + "" + item.name }}</td>
<td>{{ item.mobilePhone }}</td>
</tr>
<tr v-if="backGuest.length == 0">
<td colspan="3">已经复制完成</td>
</tr>
</table>
</el-dialog>
<div class="fade" v-show="isShowFade"></div>
<div class="qrCodeDiv" v-show="isShowFade">
<div style="margin-top:15px;">请扫码签字</div>
......@@ -1112,8 +1205,13 @@
//数据源
dataList: [],
isShowFade: false,
dialogVisible: false,
QRCodeStr: "",
pdfLoading: false,
//旅客名单
backGuest: [],
//旅客名单
guestList: [],
//线路名称
LineName: '',
//出发地点
......@@ -1196,12 +1294,91 @@
}).catch(err => {
})
},
//点击合同获取旅客信息
getGuestList() {
let msg = {
orderId: this.msg.orderID,
};
this.apipost(
"travelcontract_post_GetContractGuestByOrderId",
msg,
(res) => {
if (res.data.resultCode === 1) {
var tempData = res.data.data;
if (tempData && tempData.length > 0) {
tempData.forEach((item) => {
item.IsShow = true;
if (this.guestList && this.guestList.length > 0) {
this.guestList.forEach((sItem) => {
if (sItem.id == item.id && sItem.isCheck && item.IsShow) {
item.IsShow = false;
}
});
}
});
}
this.backGuest = tempData;
} else {
this.Error(res.data.message);
}
},
null
);
},
//复制合同
copyContract() {
let newArr = [];
this.backGuest.forEach((x) => {
if (x.isCheck) {
newArr.push(x.id);
}
});
var unionGuestIds = newArr.join(",");
if (unionGuestIds == "") {
this.Error("请选择要复制的旅客");
return;
}
let copyMsg = {
TCID: this.msg.TCID,
guestId: 0,
orderID: this.msg.orderID,
unionGuestIds: unionGuestIds,
};
if (this.$route.query.guestId && this.$route.query.guestId > 0) {
copyMsg.guestId = this.$route.query.guestId;
}
this.apipost(
"travelcontract_post_CopyContractServices",
copyMsg,
(res) => {
if (res.data.resultCode === 1) {
this.Success("复制成功!");
this.dialogVisible = false;
var tempData = res.data.data;
this.$router.push({
name: "TravelContractNew",
query: {
TCID: tempData.TCID,
guestId: tempData.GuestId,
orderID: tempData.OrderId,
Id: tempData.Id,
orderType: tempData.orderType
},
});
} else {
this.Error(res.data.message);
}
},
null
);
},
//获取数据
getList() {
this.apipost("travelcontract_post_GetContractInfoService", this.msg, res => {
if (res.data.resultCode === 1) {
this.dataList = res.data.data;
this.guestList = this.dataList.allGuestList;
} else {
this.Error(res.data.message);
}
......
src/components/TravelContractNew.vue
View file @ 4f73e4b2
......@@ -669,6 +669,7 @@
<el-option label="中国平安财产保险股份有限公司成都市锦城支公司" value="中国平安财产保险股份有限公司成都市锦城支公司"></el-option>
<el-option label="あいおいニッセイ同和損害保険株式会社" value="あいおいニッセイ同和損害保険株式会社"></el-option>
<el-option label="中国大地财产保险股份有限公司" value="中国大地财产保险股份有限公司"></el-option>
<el-option label="中国人民财产保险股份有限公司" value="中国人民财产保险股份有限公司"></el-option>
</el-select>
</el-form-item>
</td>
......
src/components/TravelManager/Ticket/TravelMyTicket.vue
View file @ 4f73e4b2
......@@ -744,7 +744,7 @@
<div class="FlightDivDetails">
<div class="_flightList" v-for="(subItem,subIndex) in item.flightList" :key="subIndex+20000">
<span class="FlightNumber">{{subItem.Flight_number}}</span>
<span>{{subItem.FlightDate}} {{subItem.Departure_time}}</span>
<span>{{subItem.FlightDate}} {{subItem.Departure_time}}/{{subItem.Arrival_time}}</span>
<span>({{subItem.DIATA}}){{subItem.DepartureName}}</span>
<span v-if="subItem.StopoverName">-</span>
<span v-if="subItem.StopoverName">({{subItem.StopoverIATA}}){{subItem.StopoverName}}</span>
......
src/components/TravelManager/Ticket/TravelticketManager.vue
View file @ 4f73e4b2
......@@ -724,7 +724,7 @@
<div class="FlightDivDetails">
<div class="_flightList" v-for="(subItem,subIndex) in item.flightList" :key="subIndex+20000">
<span class="FlightNumber">{{subItem.Flight_number}}</span>
<span>{{subItem.FlightDate}} {{subItem.Departure_time}}</span>
<span>{{subItem.FlightDate}} {{subItem.Departure_time}}/{{subItem.Arrival_time}}</span>
<span>({{subItem.DIATA}}){{subItem.DepartureName}}</span>
<span v-if="subItem.StopoverName">-</span>
<span v-if="subItem.StopoverName">({{subItem.StopoverIATA}}){{subItem.StopoverName}}</span>
......
src/components/administrative/ElectronicAudit.vue
View file @ 4f73e4b2
......@@ -380,7 +380,7 @@
TCID: '',
StartDate: '',
ReturnDate: '',
AuditContract: '',
AuditContract: 1,
PageIndex: 1,
PageSize: 15
},
......
src/components/confirmationOrderDownLoadNew.vue
View file @ 4f73e4b2
......@@ -111,25 +111,42 @@
<el-col :span="14" class="row-aic">
<a id="pdfDownLoad" style="display:none;" target="_blank" href="http://www.baidu.com" download="xx.pdf">页面跳转</a>
<template v-if="orderId>0">
<el-button type="primary" size="medium" @click="toPDF_2023()">
<el-button type="primary" @click="toPDF_2023()">
出团通知书下载</el-button>
<el-button type="primary" size="medium" @click="ToWord_2023()">
出团通知书下载WROD</el-button>
<el-button type="primary" size="medium" @click="OuZhouPdf2024()" v-if="lineId==119||lineId==168" style="display:none;" >
欧洲出团通知书PDF</el-button>
<template v-if="lineId==119||lineId==168">
<el-dropdown style="padding-left:20px;">
<el-button type="primary">
出团通知书<i class="el-icon-arrow-down el-icon--right"></i>
</el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item @click.native="ToWord_2023()">出团通知书WORD</el-dropdown-item>
<el-dropdown-item @click.native="OuZhouPdf2024()">出团通知书(欧洲PDF)</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</template>
<template v-else>
<el-button type="primary" @click="ToWord_2023()">
出团通知书下载WROD</el-button>
</template>
</template>
<template v-else>
<el-button type="primary" size="medium" @click="toPDF_2023(1)">
<el-button type="primary" @click="toPDF_2023(1)">
行程下载</el-button>
<el-button v-if="isShowAllDownLoad" type="primary" size="medium" @click="toPDF_2023()"
style="margin-left:20px;">
行程下载(N)</el-button>
<el-button type="primary" size="medium" @click="ToWord_2023()" style="margin-left:20px;">
行程下载WORD</el-button>
<el-button type="primary" size="medium" @click="OuZhouPdf2024()" style="margin-left:20px;display:none;"
v-if="lineId==119||lineId==168">
欧洲行程PDF</el-button>
<template v-if="lineId==119||lineId==168">
<el-dropdown style="padding-left:20px;">
<el-button type="primary">
行程下载WORD<i class="el-icon-arrow-down el-icon--right"></i>
</el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item @click.native="ToWord_2023()">行程下载WORD</el-dropdown-item>
<el-dropdown-item @click.native="OuZhouPdf2024()">行程下载(欧洲PDF)</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</template>
<template v-else>
<el-button type="primary" @click="ToWord_2023()" style="margin-left:20px;">
行程下载WORD</el-button>
</template>
</template>
<!-- 可以让销售修改基本信息-->
<el-button v-if="orderId>0" type="primary" size="medium" value="修改信息" @click="editMsgShow=true">
......@@ -355,14 +372,10 @@
pdfLoading: false,
loadingText: "", //加载文字
download_timer: null,
isShowAllDownLoad: false, //是否显示实时下载行程按钮
}
},
mounted() {
this.orderId = this.$route.query.orderId;
if (this.$route.query.isda && this.$route.query.isda == 1) {
this.isShowAllDownLoad = true;
}
this.getWxCode();
this.getTripDetail();
this.getAirlines();
......@@ -672,36 +685,15 @@
if (res.data.resultCode === 1) {
this.loadingText = "正在下载pdf文件...";
let path = res.data.data;
var ocrUrl = "";
that.downLoadUrl = path;
that.pdfLoading = true;
ocrUrl = urlObj.ocrUrl + "/Home/CreateTYPdf?url=" + encodeURIComponent(path);
that.$http({
headers: {
'Content-Type': 'application/json'
},
method: 'get',
url: ocrUrl,
data: {},
responseType: 'arraybuffer'
}).then(res => {
that.pdfLoading = false;
let blob = new Blob([res.data], {
type: "application/pdf"
})
let fileUrl = URL.createObjectURL(blob);
let link = document.getElementById('pdfDownLoad');
link.href = fileUrl;
link.setAttribute("download", fileName);
link.click();
that.loadingText = "";
}).catch(err => {
that.pdfLoading = false
})
this.loadingText = "";
this.download_timer = setInterval(function () {
that.checkFile(msg.configId, fileName)
}, 2000);
} else {
this.Error('WORD获取失败');
}
this.pdfLoading = false
}).catch(err => {
})
......@@ -737,7 +729,7 @@
this.pdfDownLoad(fileName, msg);
} else if (command && command == 1) {
this.pdfLoading = true;
objFileKey += "/" + msg.configId + "_" + msg.tcid + "_B2B.pdf?d="+Math.random();
objFileKey += "/" + msg.configId + "_" + msg.tcid + "_B2B.pdf?d=" + Math.random();
that.downloadChengDuFileRename(objFileKey, fileName, res => {
this.pdfLoading = false;
if (res.resultCode == 0) {
......
src/components/newTravelmanager/TravelGroupControl/TravelManagerThree.vue
View file @ 4f73e4b2
......@@ -974,10 +974,8 @@
this.PostConfig.ImgCover = tempData.ImgCover;
this.PostConfig.LtName = tempData.LtName;
this.PostConfig.CreateBy = tempData.CreateBy;
if (tempData.ImgCover != "") {
if (tempData.ImgCoverList.length > 0) {
this.PostConfig.fileList = tempData.ImgCoverList;
}
if (tempData.ImgCover != ""&&tempData.ImgCoverList.length > 0) {
this.PostConfig.fileList = tempData.ImgCoverList;
} else {
this.initFileList();
}
......
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