Skip to content

S
SuperMan
Commit 0e33d7a0 authored by liudong1993's avatar liudong1993
Browse files
Options

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

parents 18a0b573 ff0b7ea9
Hide whitespace changes
Inline Side-by-side
Showing with 186 additions and 214 deletions
src/components/Hotel/HotelWorkList.vue
View file @ 0e33d7a0
......@@ -469,7 +469,8 @@
this.apipost(
"hotel_post_GetHasStockHotelList", {
Country: this.qCountryId,
IsMoreThanZero: 1
IsMoreThanZero: 1,
IsAllHotel:1,
},
res => {
if (res.data.resultCode == 1) {
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 0e33d7a0
......@@ -713,32 +713,34 @@
</el-popover>
</el-tooltip>
</template>
<!-- <template v-if="item.TeamPriceList && item.TeamPriceList.length > 0">
<el-tooltip class="item" effect="dark" content="合并列表(和平国旅合并团队使用)">
<el-popover width="350" trigger="click" popper-class="TC_HotelPop">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td style="width: 100px">
{{ $t("Airticket.Air_StartTime") }}
</td>
<td style="width: 250px">{{ $t("visa.v_tuanhao") }}</td>
</tr>
<tr v-for="(rItem, rIndex) in item.TeamPriceList" :key="`d_`+index+`_t_`+rIndex">
<td>
{{ rItem.StartDate }}
</td>
<td>
({{ rItem.TCID }}){{ rItem.TCNUM }}[{{ rItem.TCState }}]
</td>
</tr>
</table>
<el-button slot="reference" circle size="mini" type="success"
style="width: 20px; height: 20px; padding: 4px" @click="showTripDialog(item)">
{{ item.TeamPriceList.length }}
</el-button>
</el-popover>
</el-tooltip>
</template> -->
<template v-if="item.TeamPriceList && item.TeamPriceList.length > 1">
<font style="display:none;">
<el-tooltip class="item" effect="dark" content="合并列表(和平国旅合并团队使用)">
<el-popover width="350" trigger="hover" popper-class="TC_HotelPop">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td style="width: 100px">
{{ $t("Airticket.Air_StartTime") }}
</td>
<td style="width: 250px">{{ $t("visa.v_tuanhao") }}</td>
</tr>
<tr v-for="(rItem, rIndex) in item.TeamPriceList" :key="`d_`+index+`_t_`+rIndex">
<td>
{{ rItem.StartDate }}
</td>
<td>
({{ rItem.TCID }}){{ rItem.TCNUM }}[{{ rItem.TCState }}]
</td>
</tr>
</table>
<el-button slot="reference" circle size="mini" type="success"
style="width: 20px; height: 20px; padding: 4px" @click="showTripDialog(item)">
{{ item.TeamPriceList.length }}
</el-button>
</el-popover>
</el-tooltip>
</font>
</template>
</p>
<p class="travelnowrap flex" v-if="item.OfferShouPeiFee > 0">
<span>{{ $t("objFill.handpartscharge") }}</span>
......@@ -1611,7 +1613,20 @@
</div>
<div class="clearfix TCL-redType" v-if="item.DMCNum">
<div class="TCL_remarkTitle">{{ $t("op.DJBZTH") }}：</div>
<div class="TCL_Content">{{ item.DMCNum }}</div>
<div class="TCL_Content">{{ item.DMCNum }}
<template v-if="item.DMType>0">
<template v-if="item.DMType==1">
<font style="color:blue;">
{{item.DMByName}}:{{item.DMTime}} 作业中.
</font>
</template>
<template v-if="item.DMType==2">
<font style="color:#67C23A">
{{item.DMByName}}:{{item.DMTime}} 作业完成
</font>
</template>
</template>
</div>
</div>
<div class="clearfix TCL-redType" v-if="
(item.DmcRemarkLast && item.DmcRemarkLast.DMCRemark != '') ||
......
src/components/TravelManager/TravelList/TravelControlListSale.vue
View file @ 0e33d7a0
......@@ -1072,10 +1072,6 @@
<div class="TCL_remarkTitle">{{$t('objFill.bohuiyy')}}：</div>
<div class="TCL_Content">{{item.OutGroupAuditRemark}} {{item.OutGroupAuditDate}}</div>
</div>
<!-- <div class="clearfix TCL-redType" v-if="item.ProductRecommend">
<div class="TCL_remarkTitle">{{$t('Operation.Op_bentuanMaidian')}}：</div>
<div class="TCL_Content">{{item.ProductRecommend}}</div>
</div> -->
<div class="clearfix TCL-redType" v-if="item.OPRemark">
<div class="TCL_remarkTitle">{{$t('Operation.Op_duiwaiRemark')}}：</div>
<div class="TCL_Content">{{item.OPRemark}}</div>
......@@ -1084,9 +1080,22 @@
<div class="TCL_remarkTitle">{{$t('Operation.Op_duineiRemark')}}：</div>
<div class="TCL_Content">{{item.OPInnerRemark}}</div>
</div>
<div class="clearfix TCL-redType" v-if="item.DMCNum">
<div class="clearfix TCL-redType">
<div class="TCL_remarkTitle">{{$t('op.DJBZTH')}}：</div>
<div class="TCL_Content">{{item.DMCNum}}</div>
<div class="TCL_Content">{{item.DMCNum}}
<template v-if="item.DMType>0">
<template v-if="item.DMType==1">
<font style="color:blue;">
{{item.DMByName}}:{{item.DMTime}} 作业中.
</font>
</template>
<template v-if="item.DMType==2">
<font style="color:#67C23A">
{{item.DMByName}}:{{item.DMTime}} 作业完成
</font>
</template>
</template>
</div>
</div>
<div class="clearfix TCL-redType"
v-if="(item.DmcRemarkLast&&item.DmcRemarkLast.DMCRemark!='') || item.HotelDiningBus.HotelChangeState>0 || item.HotelDiningBus.DiningChangeState>0 || item.HotelDiningBus.ResultBusTypeStr!='' ">
......@@ -1332,7 +1341,8 @@
<el-col :span="4">
<el-form-item :label="$t('objFill.tuanduilx')" prop="Remark">
<el-select class="multiple_input" v-model="changePriceMsg.NewB2BPrice">
<el-option v-for='item in teamList' v-if="item.ID!=2" :key="item.ID" :label="item.Name" :value="item.ID">
<el-option v-for='item in teamList' v-if="item.ID!=2" :key="item.ID" :label="item.Name"
:value="item.ID">
</el-option>
</el-select>
</el-form-item>
......
src/components/TravelManager/TravelNewQuotation/CostNewPriceForm.vue
View file @ 0e33d7a0
......@@ -185,6 +185,9 @@
v-model='subItem.HotelId' :placeholder="$t('objFill.qingshurujdmc')" :loading="loading"
@change="getHotel(subItem,subItem.HotelId)" style="width:135px;">
<el-option v-for="(x) in subItem.HotelList" :key="x.ID" :label="x.Name" :value='x.ID'>
<span style="float: left">{{ x.Name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">库存:{{ x.Inventory }}
&nbsp;价格:{{x.CostPrice}}</span>
</el-option>
</el-select>
<el-form-item :label="$t('objFill.v101.hancan')">
......@@ -714,7 +717,6 @@
watch: {
postConfig: {
handler: function (val, oldVal) {
this.getOfferItemObj(1);
},
deep: true
......@@ -892,7 +894,8 @@
getHotel(subItem, HotelId) {
subItem.HotelList.forEach(x => {
if (x.ID == HotelId) {
subItem.HotelName = x.Name
subItem.HotelName = x.Name;
subItem.HotelCostPrice = x.CostPrice;
}
})
this.$forceUpdate()
......@@ -951,10 +954,14 @@
},
//初始化酒店列表
initHotel(query, subItem, day) {
var hMsg = {
Name: query,
IsAllHotel: 1,
sDate: this.GetDayStr(subItem.DayNum - 1)
};
console.log("hMsg", hMsg)
this.apipost(
"hotel_post_GetList", {
Name: query
},
"hotel_post_GetHasStockHotelList", hMsg,
res => {
this.loading = false
if (res.data.resultCode == 1) {
......
src/components/commonPage/commonHotelInfo.vue
View file @ 0e33d7a0
......@@ -43,7 +43,9 @@
<tr>
<th width="120">{{$t('pub.date')}}</th>
<th width="150">{{$t('hotel.hotel')}}</th>
<th width="150">{{$t('salesModule.ChangeHotel')}}</th>
<th width="80" v-if="showHotelObj.showPrice">库存</th>
<th width="120">{{$t('salesModule.HotelStatus')}}</th>
<th width="120">{{$t('salesModule.OPstatus')}}</th>
<th width="120">{{$t('salesModule.DJstatus')}}</th>
......@@ -54,8 +56,7 @@
<th width="130" v-if="showHotelObj.showZhan">{{$t('salesModule.UseRoomTime')}}</th>
<th width="100" v-if="showHotelObj.showZhan">{{$t('salesModule.SureTime')}}</th>
<th width="100" v-if="showHotelObj.ShowSupplier">{{$t('hotel.hotel_Supplier')}}</th>
<th width="80" v-if="showHotelObj.caiwu">{{$t('pub.yes')}}{{$t('pub.no')}}<br />{{$t('fnc.fukuan')}}</th>
<th width="180" v-if="showHotelObj.caiwu">{{$t('salesModule.DJNUM')}}{{$t('hotel.hotel_corrlelatition')}}</th>
<!-- <th width="80" v-if="showHotelObj.caiwu">{{$t('pub.yes')}}{{$t('pub.no')}}<br />{{$t('fnc.fukuan')}}</th>-->
<th width="70" v-if="showHotelObj.showPrice">
{{$t('fnc.rizhi')}}
</th>
......@@ -76,6 +77,11 @@
<td style="text-align:left;padding-left:3px;color:red">
{{hotelSubItem.HotelName!=hotelSubItem.NewHotelName?""+hotelSubItem.NewHotelName:""}}
</td>
<td v-if="showHotelObj.showPrice">
总库存:{{hotelSubItem.Inventory}}
<br/>
剩余:{{hotelSubItem.RemainingInventory}}
</td>
<td>
<template v-if="hotelSubItem.OPState==1||hotelSubItem.DMCState==1">
<a style="color:green">{{$t('salesModule.BZRZ')}}</a>
......@@ -128,20 +134,9 @@
<td v-if="showHotelObj.ShowSupplier">
{{hotelSubItem.SupplierName}}
</td>
<td v-if="showHotelObj.caiwu">
<!-- <td v-if="showHotelObj.caiwu">
{{hotelSubItem.IsPay==1?$t('pub.yes'):$t('pub.no')}}
</td>
<td v-if="showHotelObj.caiwu">
<div>
<div v-if="hotelSubItem.FrList&&hotelSubItem.FrList.length > 0" v-for="(item2, index2) in hotelSubItem.FrList" :key="index2">
<span style="cursor:pointer;text-decoration:underline;" @click="goUrl('财务单据','FinancialDocumentsDetail',item2.FrID,'')">
{{ item2.FrID }}（{{item2.StatusStr}}）
</span>
</div>
<span v-else
style="cursor: default">{{ $t("system.content_noData") }}</span>
</div>
</td>
</td> -->
<td v-if="showHotelObj.showPrice">
<el-popover width="200" trigger="click" popper-class="Bus_HotelPop">
<commonHotelLog :ref="'comHotelLog'+index+hotelSubIndex+''"> </commonHotelLog>
......
src/components/confirmationOrderDownLoadNew.vue
View file @ 0e33d7a0
......@@ -116,44 +116,12 @@
{{$t('objFill.v101.chuttzhisxz')}}</el-button>
<el-button type="primary" @click="ToWord_2023()">
{{$t('objFill.v101.chuttzhisxz')}}WROD</el-button>
<!-- <template v-if="lineId==119||lineId==168">
<el-dropdown style="padding-left:20px;">
<el-button type="primary">
{{$t('Operation.Op_teamNotice')}}<i class="el-icon-arrow-down el-icon--right"></i>
</el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item @click.native="ToWord_2023()">{{$t('Operation.Op_teamNotice')}} WORD</el-dropdown-item>
<el-dropdown-item @click.native="OuZhouPdf2024()">{{$t('objFill.v101.chuttzsozpdf')}}</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</template>
<template v-else>
<el-button type="primary" @click="ToWord_2023()">
{{$t('objFill.v101.chuttzhisxz')}}WROD</el-button>
</template> -->
</template>
<template v-else>
<el-button type="primary" @click="toPDF_2023(1)">
{{$t('Operation.Op_tripDownLoad')}}</el-button>
<el-button type="primary" @click="ToWord_2023()" style="margin-left:20px;">
{{$t('Operation.Op_tripDownLoad')}}WORD</el-button>
<!-- <template v-if="lineId==119||lineId==168">
<el-dropdown style="padding-left:20px;">
<el-button type="primary">
{{$t('Operation.Op_tripDownLoad')}} 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()">{{$t('Operation.Op_tripDownLoad')}}WORD
</el-dropdown-item>
<el-dropdown-item @click.native="OuZhouPdf2024()">
{{$t('Operation.Op_tripDownLoad')}}{{$t('objFill.v101.ouzhoupdf')}}</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</template>
<template v-else>
<el-button type="primary" @click="ToWord_2023()" style="margin-left:20px;">
{{$t('Operation.Op_tripDownLoad')}}WORD</el-button>
</template> -->
</template>
<!-- 可以让销售修改基本信息-->
<el-button v-if="orderId>0" type="primary" :value="$t('objFill.xiugaixinxi')" @click="editMsgShow=true"
......@@ -658,32 +626,40 @@
this.pdfLoading = true;
this.loadingText = this.$t('objFill.zhengzscpdf');
let msg = this.getPostMsg();
var that = this;
this.pdfLoading = true;
this.loadingText = "正在生成WORD行程...";
this.download_timer = setInterval(function () {
that.checkWord(msg, title)
}, 2000);
},
checkWord: function (pMsg, title) {
let urlObj = this.domainManager();
this.$http({
headers: {
'Content-Type': 'application/json'
},
method: 'post',
url: urlObj.DomainUrl + '/api/file/GetToWord_2023',
url: urlObj.DomainUrl + '/api/file/CheckWord2025',
data: {
"msg": msg
"msg": pMsg
}
}).then(res => {
if (res.data.resultCode === 1) {
var tempData = res.data.data;
if (tempData.Result === 1) {
clearInterval(this.download_timer);
this.loadingText = this.$t('objFill.zhengzxzpdf');
let sign = title;
const a = document.createElement('a');
a.setAttribute('download', '');
a.setAttribute('href', urlObj.DomainUrl + '/api/file/DownloadFileForPdf?fileName=' + sign +
'.doc&&fPath=' + res.data.data);
'.doc&&fPath=' + tempData.Path);
a.click();
this.loadingText = "";
} else {
this.Error(this.$t('objFill.wordhqsb'));
this.pdfLoading = false
}
this.pdfLoading = false
}).catch(err => {
this.pdfLoading = false
})
},
OuZhouPdf2024: function () {
......
src/components/dmc/manager/dmcTotalTable.vue
View file @ 0e33d7a0
......@@ -43,7 +43,8 @@
<li><span><em>{{$t('sm.Date')}}</em>
<!-- <el-date-picker v-model='msg.StartDate' class='w135' value-format="yyyy-MM-dd" type="date"
:picker-options="pickerBeginDateBefore"></el-date-picker> -->
<DateLimit :clearable="false" :StartGroupDate="msg.StartDate" :EndGroupDate="msg.EndDate" @change="(date)=> msg.StartDate = date"></DateLimit>
<DateLimit :clearable="false" :StartGroupDate="msg.StartDate" :EndGroupDate="msg.EndDate"
@change="(date)=> msg.StartDate = date"></DateLimit>
-
<el-date-picker v-model='msg.EndDate' class='w135' value-format="yyyy-MM-dd" type="date"
:picker-options="pickerBeginDateAfter"></el-date-picker>
......@@ -159,7 +160,7 @@
<tr>
<th colspan="12">{{$t('ground.gstyxinxi')}}</th>
<th colspan="6">{{$t('ground.tdxuqiubiao')}}</th>
<th colspan="10">{{$t('ground.djieopcaozuo')}}</th>
<th colspan="9">{{$t('ground.djieopcaozuo')}}</th>
</tr>
<tr>
<th width="130">{{$t('active.ad_xuhao')}}</th>
......@@ -180,26 +181,45 @@
<th width="60">{{$t('leader.leader_Guide')}}</th>
<th width="60">{{$t('ground.yikaipiao')}}</th>
<th width="60">{{$t('ground.fenfangbiao')}}</th>
<th width="60">{{$t('salesModule.LKMD')}}</th>
<th width="70">{{$t('salesModule.LKMD')}}</th>
<th width="60">{{$t('Operation.Op_chutuan')}}<br />{{$t('ground.tongzhishu')}}</th>
<th width="60">{{$t('leader.leader_Guide')}}<br />{{$t('ground.jihuabiao')}}</th>
<th width="60">{{$t('leader.leader_Leader')}}<br />{{$t('ground.jiaojiebiao')}}</th>
<th width="70">{{$t('leader.leader_Guide')}}<br />{{$t('ground.jihuabiao')}}</th>
<th width="70">{{$t('leader.leader_Leader')}}<br />{{$t('ground.jiaojiebiao')}}</th>
<th width="60">{{$t('ground.yongkuan')}}<br />{{$t('ground.jihua')}}</th>
<th width="60">{{$t('hotel.hotel')}}</th>
<th width="70">{{$t('hotel.hotel')}}</th>
<th width="60">{{$t('scen.sc_piao')}}</th>
<th width="60">{{$t('ground.canshi')}}</th>
<th width="60">{{$t('MarketingActi.car')}}</th>
<th width="70">{{$t('ground.canshi')}}</th>
<th width="70">{{$t('MarketingActi.car')}}</th>
<th width="60">{{$t('leader.leader_Leader')}}<br />{{$t('ground.baozhang')}}</th>
<th width="60">{{$t('ground.bjd')}}</th>
<th width="60">{{$t('ground.htff')}}</th>
<th width="70">{{$t('ground.bjd')}}</th>
<th width="60">{{$t('ground.ldrtf')}}</th>
<th width="120">{{$t('system.table_operation')}}</th>
<th width="70">{{$t('system.table_operation')}}</th>
</tr>
<tbody v-for="(outItem,outindex) in list" :class="{dmcTotalSplitTrCss:outindex%2!=0}" :key="outindex">
<template v-for="(item,index) in outItem.PriceCommonList">
<tr :key="index">
<td :rowspan="2*outItem.PriceCommonList.length" v-if='index==0'>
{{outItem.NewCombinationNum}}
<el-tooltip class="item" effect="dark" content="地接操作" placement="top-start" v-if="item.LineId==14 ">
<el-popover placement="bottom" width="300" trigger="click" v-model="item.isShowPop">
<table class="dmcSetTable">
<tr>
<td colspan="2" style="text-align:center;">
<el-checkbox v-model="UpdateHotelMsg.DMType" :true-label="1" :false-label="CheckedVaule">作业中
</el-checkbox>
<el-checkbox v-model="UpdateHotelMsg.DMType" :true-label="2" :false-label="UnCheckedVaule">
作业完成</el-checkbox>
</td>
</tr>
<tr>
<td colspan="2" style="text-align:center;">
<input type="button" class="normalBtn" @click="SetIsOpenHotelService(item)" value="保存" />
</td>
</tr>
</table>
<el-button slot="reference" type="primary" round size="mini">操作</el-button>
</el-popover>
</el-tooltip>
</td>
<td style="position: relative">
{{item.OutBranchName}}
......@@ -207,7 +227,8 @@
({{$t('objFill.quxiaofatuan')}})
</div>
<div style="padding: 5px 0;">
<span class="TC_neibu" style="float: inherit;color: #ffffff;" v-if="item.StandardCurrencyName" :class="{'TCneibu':item.StandardCurrencyName=='人民币','TCb2b':item.StandardCurrencyName=='日元',
<span class="TC_neibu" style="float: inherit;color: #ffffff;" v-if="item.StandardCurrencyName"
:class="{'TCneibu':item.StandardCurrencyName=='人民币','TCb2b':item.StandardCurrencyName=='日元',
'TCb2c':item.StandardCurrencyName=='新台币','AppPlat':item.StandardCurrencyName=='',
'otherPlat':item.StandardCurrencyName=='',}">{{item.StandardCurrencyName}}{{$t('objFill.jiesuan')}}</span>
</div>
......@@ -296,7 +317,8 @@
<p v-if='!item.GuideName' @click="goUrlT('leaderArrangement',item.TCID,'带团安排')">
{{$t('ground.daituananpai')}}</p>
<p v-else @click="goUrlT('leaderArrangement',item.TCID,'带团安排')">
{{item.GuideName}}{{item.IsGuideDaiTuan==1?$t('objFill.v101.dmc.daituan'):$t('objFill.v101.dmc.budaituan')}}</p>
{{item.GuideName}}{{item.IsGuideDaiTuan==1?$t('objFill.v101.dmc.daituan'):$t('objFill.v101.dmc.budaituan')}}
</p>
</div>
</td>
<td>
......@@ -320,7 +342,8 @@
@click="DownLoadGuestList(item,outItem,index)">{{$t('ground.chujingNAME')}}</a>
<a style="text-decoration:underline;cursor:pointer;margin-top:5px;display:inline-block;"
:title="$t('objFill.dianjixzdhmd')" @click="DownLoadGuestTelList(item,outItem,index)">{{$t('ground.dianhuamingdan')}}</a>
:title="$t('objFill.dianjixzdhmd')"
@click="DownLoadGuestTelList(item,outItem,index)">{{$t('ground.dianhuamingdan')}}</a>
</td>
<td>
<div class="fz16 fbold linkspan">
......@@ -374,8 +397,6 @@
<span style="color: #4BCA81;" v-if="item.FoodsResult==1">√</span>
<span class="colorE95252" v-else>{{item.FoodsResult=='-1'?"x":"O"}}</span>
</div>
<!-- <a style="text-decoration:underline;cursor:pointer;" title="点击下载餐配信息"
@click="DownLoadDinner(item)">{{$t('ground.peicanxiazai')}}</a> -->
<a style="text-decoration:underline;cursor:pointer;" :title="$t('objFill.v101.dmc.dianjxzcpxx')"
@click="DownLoadNewDinner(item)">{{$t('ground.peicanxiazai')}}</a>
</td>
......@@ -387,9 +408,9 @@
v-else>{{item.BusResult=='-1'?"x":"O"}}</span>
<span @click="GoShoupei(outItem)"
style="cursor:pointer;text-decoration:underline;display:block;color:#666;font-size:12px;">{{$t('ground.cheliangxinxi')}}</span>
<template v-if="(item.LineId==14||item.LineId==118) &&(item.CarIsPush==0||item.CarIsPush==2)">
<el-tooltip class="item" effect="dark" :content="$t('objFill.v101.dmc.tongbucxxdch')" placement="top-start">
<el-tooltip class="item" effect="dark" :content="$t('objFill.v101.dmc.tongbucxxdch')"
placement="top-start">
<div slot="content">
<div v-html="TipsContent(item)"></div>
</div>
......@@ -417,15 +438,8 @@
</div>
</td>
<td>
<span @click="showDialog(0, item.OfferId)" style="cursor:pointer" v-if="item.OfferId">{{$t('objFill.baojiaxiangqing')}}</span>
</td>
<td :rowspan="2*outItem.PriceCommonList.length" v-if='index==0'>
<div class="fz16 fbold linkspan"
@click="goUrlLeaderIsApply('TravelPassengerList3',item,outItem,'合团分房表')"
v-if="outItem.PriceCommonList.length > 1">
<span style="color: #4BCA81;" v-if="item.LeaderIsApply==2">√</span>
<span class="colorE95252" v-else>{{item.LeaderIsApply=='0'?"x":"O"}}</span>
</div>
<span @click="showDialog(0, item.OfferId)" style="cursor:pointer"
v-if="item.OfferId">{{$t('objFill.baojiaxiangqing')}}</span>
</td>
<td :rowspan="2*outItem.PriceCommonList.length" v-if='index==0' style="width: 150px;">
<el-popover width="100" trigger="click" popper-class="DMC_HotelPop">
......@@ -443,7 +457,7 @@
<span slot="reference" style="cursor:pointer;text-decoration:underline;">{{outItem.TotalPrice}}</span>
</el-popover>
</td>
<td>
<td :rowspan="2*outItem.PriceCommonList.length" v-if='index==0'>
<div style="width: 150px;">
<el-button-group>
<el-tooltip class="item" effect="dark" :content="$t('ground.djxinxi')" placement="top-start">
......@@ -506,48 +520,10 @@
@click="goUrlF('teamRevenueExpenditure',item.TCID,item.LineId,'团队收支')" type="primary"
style="background:#00C6FF; border-color:#00C6FF"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('ground.lianxiop')" placement="top-start">
<!-- <el-tooltip class="item" effect="dark" :content="$t('ground.lianxiop')" placement="top-start">
<el-button @click='openChart(item)' icon="iconfont icon-wechat" type="primary"
style="background:#6DD875; border-color:#6DD875"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('ground.jiudiancaozuo')" placement="top-start"
v-if="item.LineId==14 && IsDMCIsOpenHotel==1">
<el-popover placement="bottom" width="300" trigger="click" v-model="item.isShowPop">
<table class="dmcSetTable">
<tr>
<td colspan="2" style="text-align:center;">
<el-checkbox v-model="UpdateHotelMsg.UpdateType" :true-label="UnCheckedVaule"
:false-label="CheckedVaule">{{$t('ground.dangtuan')}}</el-checkbox>
<el-checkbox v-model="UpdateHotelMsg.UpdateType" :true-label="CheckedVaule"
:false-label="UnCheckedVaule">{{$t('ground.plxgai')}}</el-checkbox>
</td>
</tr>
<tr v-if="UpdateHotelMsg.UpdateType==1">
<td>
<el-date-picker class='w135' v-model="UpdateHotelMsg.StartDate"
style="display:inline-block;" value-format="yyyy-MM-dd" type="date"
:picker-options="pickerBefore"></el-date-picker>
</td>
<td>
<el-date-picker class='w135' v-model="UpdateHotelMsg.EndDate"
style="display:inline-block;" value-format="yyyy-MM-dd" type="date"
:picker-options="pickerAfter"></el-date-picker>
</td>
</tr>
<tr>
<td colspan="2" style="text-align:center;">
<input type="button" class="normalBtn" @click="SetIsOpenHotelService(item)"
:value="item.IsOpenHotel==0?$t('objFill.guanbijdcz'):$t('objFill.kaiqijdcz')" />
</td>
</tr>
</table>
<el-button v-if="item.IsOpenHotel==0" slot="reference"
style="background:#E95252; border-color:#E95252" icon="iconfont icon-suo" type="primary">
</el-button>
<el-button v-if="item.IsOpenHotel==1" slot="reference" icon="iconfont icon-suo1" type="primary"
style="background:green; border-color:green"></el-button>
</el-popover>
</el-tooltip>
</el-tooltip> -->
</el-button-group>
</div>
</td>
......@@ -558,6 +534,18 @@
<p @click="getJourney(item)" style="padding-top:4px;">{{item.Title}}</p>
<div class="colorE95252" style="padding-top:5px;padding-bottom:4px;font-size:13px;">
{{$t('op.DJBZTH')}}：<span style="font-weight:bold">{{outItem.PriceCommonList[index].DMCNum}}</span>
<template v-if="outItem.PriceCommonList[index].DMType>0">
<template v-if="outItem.PriceCommonList[index].DMType==1">
<font style="color:blue;">
{{outItem.PriceCommonList[index].DMByName}}:{{outItem.PriceCommonList[index].DMTime}} 作业中.
</font>
</template>
<template v-if="outItem.PriceCommonList[index].DMType==2">
<font style="color:#67C23A">
{{outItem.PriceCommonList[index].DMByName}}:{{outItem.PriceCommonList[index].DMTime}} 作业完成
</font>
</template>
</template>
</div>
<div v-show="outItem.PriceCommonList[index].OPInnerRemark!=''" class="colorE95252"
style="padding-top:5px;padding-bottom:4px;font-size:13px;">
......@@ -583,11 +571,11 @@
</div>
</div>
</td>
  <td>
                <!-- @click="OpenCompanyAlipay(item)"  :class="item.CompanyAlipay==1?'colorE95252':''" -->
                 <div @click="GoCompanyAlipay(item)" v-if="item.CompanyAlipay==1" class="colorE95252" style="text-decoration: underline;padding-top:5px;padding-bottom:4px;font-size:13px;cursor: pointer;"> {{$t('objFill.v101.dmc.yikqqydf')}}</div>
              </td>
<td>
<div @click="GoCompanyAlipay(item)" v-if="item.CompanyAlipay==1" class="colorE95252"
style="text-decoration: underline;padding-top:5px;padding-bottom:4px;font-size:13px;cursor: pointer;">
{{$t('objFill.v101.dmc.yikqqydf')}}</div>
</td>
</tr>
</template>
</tbody>
......@@ -608,8 +596,6 @@
<el-dialog :visible.sync="dialog.show" width="1400px" :title="$t('objFill.baojiaxiangqing')">
<price-dialog :ConfigId="dialog.ConfigId" :OfferId="dialog.OfferId" ref="dialog"></price-dialog>
</el-dialog>
<el-dialog :visible.sync="DownLoad.ShowDownLoad" width="386px" :title="$t('objFill.v101.dmc.yujiykxz')">
<div style="height:120px;">
<ul>
......@@ -678,12 +664,8 @@
UnCheckedVaule: 0,
//酒店更新
UpdateHotelMsg: {
UpdateType: 0, //0-当团,1-批量修改
StartDate: "", //开始日期
EndDate: "", //结束日期
LineId: 14,
DMType: 0, //1-作业中,2-作业完成
TCID: 0,
Status: 0
},
thLengthTitle: [],
list: [],
......@@ -793,16 +775,16 @@
DateLimit
},
methods: {
 GoCompanyAlipay(obj){
        let routeData = this.$router.resolve({
          name: 'AlipayManagementDetail',
          query: {
            Id: obj.TCID,
            searchTitle: '费控制度详情'
          }
        })
        window.open(routeData.href, '_blank')
      },
GoCompanyAlipay(obj) {
let routeData = this.$router.resolve({
name: 'AlipayManagementDetail',
query: {
Id: obj.TCID,
searchTitle: '费控制度详情'
}
})
window.open(routeData.href, '_blank')
},
//推送消息
PushMessage(obj, item) {
......@@ -817,7 +799,7 @@
tipMessage = this.$t('objFill.v101.dmc.quxchdd');
}
let that = this;
that.$confirm(this.$t('objFill.v101.dmc.shifouqr')+ tipMessage, this.$t('tips.tips'), {
that.$confirm(this.$t('objFill.v101.dmc.shifouqr') + tipMessage, this.$t('tips.tips'), {
confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning'
......@@ -841,12 +823,12 @@
let dateStr = '';
if (item.CarIsPush == 1) {
resultStr += this.$t('objFill.v101.dmc.dianjqxchdd')+ "<br/>" + ''
dateStr = this.$t('objFill.v101.activity.tuisongshijian')+'：'
resultStr += this.$t('objFill.v101.dmc.dianjqxchdd') + "<br/>" + ''
dateStr = this.$t('objFill.v101.activity.tuisongshijian') + '：'
} else if (item.CarIsPush == 2 || item.CarIsPush == 0) {
resultStr += this.$t('objFill.v101.dmc.dianjqxchdd') + "<br/>"
if (item.CarIsPush == 2) {
dateStr = this.$t('objFill.v101.dmc.quxiaosj')+'：'
dateStr = this.$t('objFill.v101.dmc.quxiaosj') + '：'
}
}
if (item.CarPushDateStr) {
......@@ -910,7 +892,7 @@
return
}
this.DownLoad.EmployeeID = this.getLocalStorage().EmployeeId;
var fileName = this.$t('objFill.v101.dmc.tuanyjykxz')+'.xls'
var fileName = this.$t('objFill.v101.dmc.tuanyjykxz') + '.xls'
this.GetLocalFile("dmcstatistics_post_GetHotelPriceDownLoad", this.DownLoad, fileName,
res => {
......@@ -1011,27 +993,13 @@
//开启关闭酒店操作
SetIsOpenHotelService(item) {
item.isShowPop = true;
if (item.IsOpenHotel == 0) {
this.UpdateHotelMsg.Status = 1;
} else {
this.UpdateHotelMsg.Status = 0;
}
if (this.UpdateHotelMsg.UpdateType == 1) {
if (this.UpdateHotelMsg.StartDate == "" || this.UpdateHotelMsg.EndDate == "") {
this.Error(this.$t('objFill.qingxuanzherq'))
return
}
}
this.UpdateHotelMsg.TCID = item.TCID
this.apipost('dmcstatistics_post_SetIsOpenHotelService', this.UpdateHotelMsg, res => {
this.apipost('dmcstatistics_post_SetDMOption', this.UpdateHotelMsg, res => {
if (res.data.resultCode == 1) {
this.Success(res.data.message);
this.getList();
this.UpdateHotelMsg.UpdateType = 0;
this.UpdateHotelMsg.StartDate = "";
this.UpdateHotelMsg.EndDate = "";
this.UpdateHotelMsg.DMType = 0;
this.UpdateHotelMsg.TCID = 0;
this.UpdateHotelMsg.Status = 0;
} else {
this.Error(res.data.message);
}
......@@ -1364,10 +1332,10 @@
DMCNum: nDmcNum,
InOut: item.InOut
};
var fileName = this.$t('objFill.chujinmdb')+'.doc'
var fileName = this.$t('objFill.chujinmdb') + '.doc'
if (item.TCNUMS != null) {
fileName =
"【" + item.TCNUMS + "】"+this.$t('objFill.chujinmdb')+'.doc'
"【" + item.TCNUMS + "】" + this.$t('objFill.chujinmdb') + '.doc'
}
this.GetLocalFile("travel_get_GetTravelGuestExport_V2", msg, fileName,
res => {
......@@ -1388,10 +1356,10 @@
DMCNum: nDmcNum,
InOut: item.InOut
};
var fileName = this.$t('objFill.dianhuamd')+'.doc'
var fileName = this.$t('objFill.dianhuamd') + '.doc'
if (item.TCNUMS != null) {
fileName =
"【" + item.TCNUMS + "】"+this.$t('objFill.dianhuamd')+'.doc'
"【" + item.TCNUMS + "】" + this.$t('objFill.dianhuamd') + '.doc'
}
this.GetLocalFile("travel_get_GetTravelGuestTelExport", msg, fileName,
res => {
......@@ -1417,10 +1385,10 @@
StartDate: item.StartDateStr,
DayNum: item.DayNum
};
var fileName = this.$t('objFill.canpeixz')+'.xls'
var fileName = this.$t('objFill.canpeixz') + '.xls'
if (item.TCNUMS != null) {
fileName =
"【" + item.TCNUMS + "】"+ this.$t('objFill.canpeixz')+'.xls'
"【" + item.TCNUMS + "】" + this.$t('objFill.canpeixz') + '.xls'
}
this.GetLocalFile("travel_get_GetTravelDinnerDownLoad", msg, fileName,
res => {
......@@ -1435,10 +1403,10 @@
StartDate: item.StartDateStr,
DayNum: item.DayNum
};
var fileName = this.$t('objFill.canpeixz')+'.xls'
var fileName = this.$t('objFill.canpeixz') + '.xls'
if (item.TCNUMS != null) {
fileName =
"【" + item.TCNUMS + "】"+ this.$t('objFill.canpeixz')+'.xls'
"【" + item.TCNUMS + "】" + this.$t('objFill.canpeixz') + '.xls'
}
this.GetLocalFile("travel_get_GetNewTravelDinnerDownLoad", msg, fileName,
res => {
......
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