Commit 3e92c419 authored by 黄奎's avatar 黄奎

1

parent c61b01ec
<template> <template>
<div class="flexOne groupts"> <div class="flexOne groupts">
<div class="enrollTotalSearch"> <div class="query-box">
<ul> <ul>
<li><span><em>{{$t('advmanager.v_line')}}</em> <li><span><em>{{$t('advmanager.v_line')}}</em>
<el-select class='w200' v-model="msg.LineId" filterable :placeholder="$t('pub.pleaseSel')"> <el-select class='w200' v-model="msg.LineId" filterable :placeholder="$t('pub.pleaseSel')">
...@@ -69,26 +69,31 @@ ...@@ -69,26 +69,31 @@
<el-option :label="$t('salesModule.OneDayOrder')" :value='1'></el-option> <el-option :label="$t('salesModule.OneDayOrder')" :value='1'></el-option>
</el-select> </el-select>
</li> </li>
<li><span><em>{{$t('ground.shousunShezhi')}}</em>
<el-select class='w200' v-model="msg.LossStatus" filterable :placeholder="$t('pub.pleaseSel')">
<el-option v-for="item in shouSunSelect" :key='item.Id' :label='item.label' :value='item.Id'></el-option>
</el-select>
</span>
</li>
<li><span><em>{{$t('scen.sc_ftTime')}}</em> <li><span><em>{{$t('scen.sc_ftTime')}}</em>
<el-date-picker v-model='msg.QStartDate' @change="dataDuiQ()" class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker> <el-date-picker v-model='msg.QStartDate' @change="dataDuiQ()" class='w135' value-format="yyyy-MM-dd"
type="date"></el-date-picker>
- -
<el-date-picker v-model='msg.QEndDate' @change="dataDuiQ()" class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker> <el-date-picker v-model='msg.QEndDate' @change="dataDuiQ()" class='w135' value-format="yyyy-MM-dd"
type="date"></el-date-picker>
</span> </span>
</li> </li>
<li><span><em>{{$t('fnc.bmriqi')}}</em> <li><span><em>{{$t('fnc.bmriqi')}}</em>
<el-date-picker v-model='msg.CStartDate' @change="dataDui()" class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker> <el-date-picker v-model='msg.CStartDate' @change="dataDui()" class='w135' value-format="yyyy-MM-dd"
type="date"></el-date-picker>
- -
<el-date-picker v-model='msg.CEndDate' @change="dataDui()" class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker> <el-date-picker v-model='msg.CEndDate' @change="dataDui()" class='w135' value-format="yyyy-MM-dd"
</span> type="date"></el-date-picker>
</li>
<li><span><em>{{$t('ground.shousunShezhi')}}</em>
<el-select class='w200' v-model="msg.LossStatus" filterable :placeholder="$t('pub.pleaseSel')">
<el-option v-for="item in shouSunSelect" :key='item.Id' :label='item.label' :value='item.Id'></el-option>
</el-select>
</span> </span>
</li> </li>
<li> <li>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList();resetPageIndex()" /> <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')"
@click="getList();resetPageIndex()" />
</li> </li>
</ul> </ul>
</div> </div>
...@@ -120,19 +125,31 @@ ...@@ -120,19 +125,31 @@
<tr> <tr>
<td rowspan="3"> <td rowspan="3">
<p v-if="item.isChargeLossOrders==1" style="color:red">{{$t('fnc.sun')}}</p> <p v-if="item.isChargeLossOrders==1" style="color:red">{{$t('fnc.sun')}}</p>
<p class="fbold over_ellipsis" style="width: 100%;cursor:pointer;" :title="item.orderId" @click="goUrlX('团报名清单', item.isOneDay === 1 ? 'groupTourOrderByTuanOne' : 'groupTourOrderByTuan',item.tcid,item.tcnum)">{{item.orderId}} <p class="fbold over_ellipsis" style="width: 100%;cursor:pointer;" :title="item.orderId"
<el-tooltip class="item" effect="dark" :content="$t('salesModule.ByProgram')" placement="top" v-show="item.orderForm==4"> <i class="iconfont icon-xiaochengxu" style="font-size:22px;color:red;"></i></el-tooltip> @click="goUrlX('团报名清单', item.isOneDay === 1 ? 'groupTourOrderByTuanOne' : 'groupTourOrderByTuan',item.tcid,item.tcnum)">
{{item.orderId}}
<el-tooltip class="item" effect="dark" :content="$t('salesModule.ByProgram')" placement="top"
v-show="item.orderForm==4"> <i class="iconfont icon-xiaochengxu" style="font-size:22px;color:red;"></i>
</el-tooltip>
</p> </p>
<p class="fz12 over_ellipsis" style="width: 100%;text-decoration:underline;cursor:pointer;" :title="item.alName" <p class="fz12 over_ellipsis" style="width: 100%;text-decoration:underline;cursor:pointer;"
@click="goUrlX('产品查询', item.isOneDay === 1 ? 'productQueryOne' : 'productQuery',item.tcid,item.tcnum)">{{item.tcnum}}</p> :title="item.alName"
<p class="fz12 over_ellipsis" style="width: 100%;">{{item.createBy}}<span v-if="item.leaveStr!=''" style="color:red">({{item.leaveStr}})</span></p> @click="goUrlX('产品查询', item.isOneDay === 1 ? 'productQueryOne' : 'productQuery',item.tcid,item.tcnum)">
<p class="fz12 over_ellipsis" style="width: 100%;">{{item.commissionSPeopleName==$t('fnc.no')?'':item.commissionSPeopleName}}</p> {{item.tcnum}}</p>
<p class="fz12 over_ellipsis" style="width: 100%;">{{item.createBy}}<span v-if="item.leaveStr!=''"
style="color:red">({{item.leaveStr}})</span></p>
<p class="fz12 over_ellipsis" style="width: 100%;">
{{item.commissionSPeopleName==$t('fnc.no')?'':item.commissionSPeopleName}}</p>
<p>{{$t('hotel.hotel_StartTeam')}}{{item.startDate}}</p> <p>{{$t('hotel.hotel_StartTeam')}}{{item.startDate}}</p>
<p v-if="item.tradeWay ==1">{{item.platformOrder}}</p> <p v-if="item.tradeWay ==1">{{item.platformOrder}}</p>
<p v-if='item.commissionMoney' style="color:red">{{$t('salesModule.CommissionNum')}}{{item.commissionMoney}} {{item.commissionCurrency}}</p> <p v-if='item.commissionMoney' style="color:red">
<p v-else-if="item.latestCommissionMoney" style="color:red">{{$t('salesModule.CommissionNum')}}{{item.latestCommissionMoney}}</p> {{$t('salesModule.CommissionNum')}}{{item.commissionMoney}} {{item.commissionCurrency}}</p>
<div v-if="item.extraRewardMoney!=null&&item.extraRewardMoney>0">{{$t('ground.jiangljine')}}<span style="color:#e95252">{{item.extraRewardMoney}}</span></div> <p v-else-if="item.latestCommissionMoney" style="color:red">
<div v-if="item.extraDeductMoney!=null&&item.extraDeductMoney>0">{{$t('ground.kouchujine')}}<span style="color:#e95252">{{item.extraDeductMoney}}</span></div> {{$t('salesModule.CommissionNum')}}{{item.latestCommissionMoney}}</p>
<div v-if="item.extraRewardMoney!=null&&item.extraRewardMoney>0">{{$t('ground.jiangljine')}}<span
style="color:#e95252">{{item.extraRewardMoney}}</span></div>
<div v-if="item.extraDeductMoney!=null&&item.extraDeductMoney>0">{{$t('ground.kouchujine')}}<span
style="color:#e95252">{{item.extraDeductMoney}}</span></div>
</td> </td>
<td> <td>
<p class="over_ellipsis" style="width: 150px;" :title="item.contactName">{{item.contactName}}</p> <p class="over_ellipsis" style="width: 150px;" :title="item.contactName">{{item.contactName}}</p>
...@@ -149,7 +166,7 @@ ...@@ -149,7 +166,7 @@
</td> </td>
<td> <td>
{{item.guestNum}}/{{item.ySeatNum>0? item.ySeatNum+'Y ':''}}{{item.eSeatNum>0? item.eSeatNum+'E ':''}}{{item.fSeatNum>0? item.fSeatNum+'F ':''}} {{item.guestNum}}/{{item.ySeatNum>0? item.ySeatNum+'Y ':''}}{{item.eSeatNum>0? item.eSeatNum+'E ':''}}{{item.fSeatNum>0? item.fSeatNum+'F ':''}}
<br/> <br />
<span v-if="item.refuseVisaNum>0" style="color:red"> <span v-if="item.refuseVisaNum>0" style="color:red">
({{$t('salesModule.RefuseQ')}}{{item.refuseVisaNum}}{{$t('hotel.hotel_people')}}) ({{$t('salesModule.RefuseQ')}}{{item.refuseVisaNum}}{{$t('hotel.hotel_people')}})
</span> </span>
...@@ -209,15 +226,18 @@ ...@@ -209,15 +226,18 @@
<td v-if="item.isChargeLossOrders==1" class="fz12" style="color: #e95252">{{$t('fnc.shousun')}}</td> <td v-if="item.isChargeLossOrders==1" class="fz12" style="color: #e95252">{{$t('fnc.shousun')}}</td>
<td v-else class="fz12" :style="item.orderState===3?'color: #e95252;':''">{{item.statsstr}}</td> <td v-else class="fz12" :style="item.orderState===3?'color: #e95252;':''">{{item.statsstr}}</td>
<td> <td>
<button class="normalBtn" @click="shousunDialog=true,SetShouSunClick(item.orderId)" style="width:95px;padding:0">{{$t('ground.shezhissje')}}</button> <button class="normalBtn" @click="shousunDialog=true,SetShouSunClick(item.orderId)"
style="width:95px;padding:0">{{$t('ground.shezhissje')}}</button>
</td> </td>
</tr> </tr>
<tr style="height:20px"> <tr style="height:20px">
<td colspan="16" class="RL_Order" style="height:20px"> <td colspan="16" class="RL_Order" style="height:20px">
<span style="font-size: 14px;color: #333333">{{$t('salesModule.MD')}}:</span> <span style="font-size: 14px;color: #333333">{{$t('salesModule.MD')}}:</span>
<span v-for="(childItem) in item.guestList" style="font-size: 14px;color: blue">{{childItem.userName}}&nbsp;&nbsp;</span> <span v-for="(childItem) in item.guestList"
style="font-size: 14px;color: blue">{{childItem.userName}}&nbsp;&nbsp;</span>
<!-- <span v-else>{{$t('salesModule.ZWMD')}}</span>--> <!-- <span v-else>{{$t('salesModule.ZWMD')}}</span>-->
<span style="display: block;font-size: 14px;color: #333333">{{$t('salesModule.RoomInfo')}}:{{item.orderGuestHouseStr}}</span> <span
style="display: block;font-size: 14px;color: #333333">{{$t('salesModule.RoomInfo')}}:{{item.orderGuestHouseStr}}</span>
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -225,9 +245,11 @@ ...@@ -225,9 +245,11 @@
<div> <div>
<div><span>{{$t('pub.pubRemark')}}:</span> <div><span>{{$t('pub.pubRemark')}}:</span>
<span v-if="item.tsIdList.length>0">{{$t('salesModule.ComplaintNum')}}: <span v-if="item.tsIdList.length>0">{{$t('salesModule.ComplaintNum')}}:
<a class="underline" v-for="ts in item.tsIdList" href="javascript:void(0);" @click="goUrlTS('ComplaintsDetail',ts,item.orderId,'投诉详情')">{{ts}} </a> ; <a class="underline" v-for="ts in item.tsIdList" href="javascript:void(0);"
@click="goUrlTS('ComplaintsDetail',ts,item.orderId,'投诉详情')">{{ts}} </a> ;
</span> </span>
<p><span v-if='item.clientSource==1&&item.brandName!=""'>{{item.brandName}}{{$t('fnc.dingdan')}} {{item.platformOrder}};</span>{{item.remarks}}</p> <p><span v-if='item.clientSource==1&&item.brandName!=""'>{{item.brandName}}{{$t('fnc.dingdan')}}
{{item.platformOrder}};</span>{{item.remarks}}</p>
</div> </div>
<div> <div>
<span>{{item.remarksName}}&ensp;{{item.rematksTime}}</span> <span>{{item.remarksName}}&ensp;{{item.rematksTime}}</span>
...@@ -240,8 +262,9 @@ ...@@ -240,8 +262,9 @@
</p> </p>
<span v-if="item.remarksList.length === 0">{{$t('system.content_noData')}}</span> <span v-if="item.remarksList.length === 0">{{$t('system.content_noData')}}</span>
</div> </div>
<el-button slot="reference" icon="iconfont icon-gengduo" style="padding:0px;border:none;background-color:transparent;" <el-button slot="reference" icon="iconfont icon-gengduo"
class="groupTourOrder_remarks_btn"></el-button> style="padding:0px;border:none;background-color:transparent;" class="groupTourOrder_remarks_btn">
</el-button>
</el-popover> </el-popover>
</div> </div>
</div> </div>
...@@ -283,20 +306,26 @@ ...@@ -283,20 +306,26 @@
<div>{{$t('salesModule.Invoice')}}</div> <div>{{$t('salesModule.Invoice')}}</div>
<div> <div>
<span v-for="(item2,index2) in item.invoiceApplyList" :key="index2"> <span v-for="(item2,index2) in item.invoiceApplyList" :key="index2">
<span v-if="item2.invoiceApplyState === 6" class="groupTourOrder_tickets_blue" @click="goIisDetail(item2.id)">{{item2.id}}</span> <span v-if="item2.invoiceApplyState === 6" class="groupTourOrder_tickets_blue"
<span v-else-if="item2.invoiceApplyState === 1 || item2.invoiceApplyState === 3 || item2.invoiceApplyState === 6" class="groupTourOrder_tickets_green" @click="goIisDetail(item2.id)">{{item2.id}}</span> @click="goIisDetail(item2.id)">{{item2.id}}</span>
<span v-else-if="item2.invoiceApplyState === 5 || item2.invoiceApplyState === 4 " class="groupTourOrder_tickets_red" @click="goIisDetail(item2.id)">{{item2.id}}</span> <span
<span v-else-if="item2.invoiceApplyState === 2" class="groupTourOrder_tickets_black" @click="goIisDetail(item2.id)">{{item2.id}}</span> v-else-if="item2.invoiceApplyState === 1 || item2.invoiceApplyState === 3 || item2.invoiceApplyState === 6"
class="groupTourOrder_tickets_green" @click="goIisDetail(item2.id)">{{item2.id}}</span>
<span v-else-if="item2.invoiceApplyState === 5 || item2.invoiceApplyState === 4 "
class="groupTourOrder_tickets_red" @click="goIisDetail(item2.id)">{{item2.id}}</span>
<span v-else-if="item2.invoiceApplyState === 2" class="groupTourOrder_tickets_black"
@click="goIisDetail(item2.id)">{{item2.id}}</span>
</span> </span>
<span v-if="item.invoiceApplyList.length===0" style="cursor: default;">{{$t('system.content_noData')}}</span> <span v-if="item.invoiceApplyList.length===0"
style="cursor: default;">{{$t('system.content_noData')}}</span>
</div> </div>
</div> </div>
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" layout="total,prev, pager, next, jumper" <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
:page-size=msg.pageSize :total=total></el-pagination> layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=total></el-pagination>
<div class="combottomDiv" v-if="showChangeSales" style="height:200px;"> <div class="combottomDiv" v-if="showChangeSales" style="height:200px;">
<updateSalesMan @closeUpdiv="closeSalseDiv" @getList="getList" :subInfo="subInfo"></updateSalesMan> <updateSalesMan @closeUpdiv="closeSalseDiv" @getList="getList" :subInfo="subInfo"></updateSalesMan>
</div> </div>
...@@ -335,7 +364,7 @@ ...@@ -335,7 +364,7 @@
currentPage: 1, currentPage: 1,
total: 0, total: 0,
loading: false, loading: false,
shousunDialog:false, shousunDialog: false,
msg: { msg: {
LineId: "-1", LineId: "-1",
RB_Department_Id: null, RB_Department_Id: null,
...@@ -351,21 +380,21 @@ ...@@ -351,21 +380,21 @@
SellFormEmp: 0, SellFormEmp: 0,
GroupType: '-1', GroupType: '-1',
TCNUM: '', TCNUM: '',
BranchId:'-1', BranchId: '-1',
IsOneDay: '-1', IsOneDay: '-1',
IsLeaderOrder:1, IsLeaderOrder: 1,
LossType:2, LossType: 2,
LossStatus:2 LossStatus: 2
}, },
//收损设置下拉 //收损设置下拉
shouSunSelect:[{ shouSunSelect: [{
Id:0, Id: 0,
label: this.$t('pub.unlimitedSel') label: this.$t('pub.unlimitedSel')
},{ }, {
Id:1, Id: 1,
label: this.$t('ground.yshezhi') label: this.$t('ground.yshezhi')
},{ }, {
Id:2, Id: 2,
label: this.$t('ground.weishezhi') label: this.$t('ground.weishezhi')
}], }],
employeeMsg: { employeeMsg: {
...@@ -410,13 +439,13 @@ ...@@ -410,13 +439,13 @@
B2BNum: 0 B2BNum: 0
}, },
ctlxList: [], ctlxList: [],
showChangeSales:false, showChangeSales: false,
//订单编号及业务员信息 //订单编号及业务员信息
subInfo:{ subInfo: {
CreateBy:'', CreateBy: '',
OrderId:0 OrderId: 0
}, },
userId:0, userId: 0,
getDepartmentMsg: { // 部门 getDepartmentMsg: { // 部门
RB_Group_Id: '', RB_Group_Id: '',
RB_Branch_Id: '', RB_Branch_Id: '',
...@@ -427,18 +456,18 @@ ...@@ -427,18 +456,18 @@
}; };
}, },
methods: { methods: {
closeShouSunDialog(){ closeShouSunDialog() {
this.shousunDialog=false; this.shousunDialog = false;
}, },
//点击设置收损 //点击设置收损
SetShouSunClick(OrderId){ SetShouSunClick(OrderId) {
this.shousunDialog=true; this.shousunDialog = true;
this.$nextTick(()=>{ this.$nextTick(() => {
this.$refs.childShou.getShouSunList(OrderId); this.$refs.childShou.getShouSunList(OrderId);
}) })
}, },
//跳转 //跳转
goUrlTS (path, id, orderId, title) { goUrlTS(path, id, orderId, title) {
this.$router.push({ this.$router.push({
name: path, name: path,
query: { query: {
...@@ -462,7 +491,11 @@ ...@@ -462,7 +491,11 @@
obj.description = [] obj.description = []
this.$router.push({ this.$router.push({
name: path, name: path,
query: { blank: 'y', tab: name, item: JSON.stringify(obj)} query: {
blank: 'y',
tab: name,
item: JSON.stringify(obj)
}
}); });
}, },
// 结束日期不能大于开始日期 // 结束日期不能大于开始日期
...@@ -587,19 +620,23 @@ ...@@ -587,19 +620,23 @@
}, err => {}) }, err => {})
}, },
//点击修改业务员 //点击修改业务员
getSalerInfo(item){ getSalerInfo(item) {
this.subInfo.CreateBy = item.createBy; this.subInfo.CreateBy = item.createBy;
this.subInfo.OrderId = item.orderId; this.subInfo.OrderId = item.orderId;
this.showChangeSales = true; this.showChangeSales = true;
}, },
//关闭修改业务员 //关闭修改业务员
closeSalseDiv(){ closeSalseDiv() {
this.showChangeSales=false; this.showChangeSales = false;
}, },
goIisDetail: function (id) { // 跳转发票详情页面 goIisDetail: function (id) { // 跳转发票详情页面
this.$router.push({ this.$router.push({
name: 'invoicesManagerDetail', name: 'invoicesManagerDetail',
query: { id: id,noDetail: 1,blank: "y",} query: {
id: id,
noDetail: 1,
blank: "y",
}
}); });
}, },
}, },
...@@ -629,18 +666,19 @@ ...@@ -629,18 +666,19 @@
this.getList(); this.getList();
} }
}; };
</script> </script>
<style> <style>
.groupts .underline{ .groupts .underline {
text-decoration: underline; text-decoration: underline;
margin: 5px; margin: 5px;
text-align: center; text-align: center;
} }
.color_red_order{
.color_red_order {
color: #e95252 !important; color: #e95252 !important;
} }
.enrollTotalSearch { .enrollTotalSearch {
width: 100%; width: 100%;
min-height: auto; min-height: auto;
...@@ -710,12 +748,15 @@ ...@@ -710,12 +748,15 @@
background: #fff; background: #fff;
text-align: left; text-align: left;
} }
.enrollTotalSearchTable tbody tr:last-child { .enrollTotalSearchTable tbody tr:last-child {
border-bottom: 2px solid #333; border-bottom: 2px solid #333;
} }
.enrollTotalSearchTable tr:first-child td:first-child { .enrollTotalSearchTable tr:first-child td:first-child {
border-bottom: 2px solid #333; border-bottom: 2px solid #333;
} }
.enrollTotalSearchTable tr td { .enrollTotalSearchTable tr td {
height: 80px; height: 80px;
padding: 10px; padding: 10px;
...@@ -927,5 +968,4 @@ ...@@ -927,5 +968,4 @@
display: inline-block; display: inline-block;
margin: 0 10px 0 0; margin: 0 10px 0 0;
} }
</style> </style>
\ No newline at end of file
...@@ -836,6 +836,7 @@ ...@@ -836,6 +836,7 @@
downloadFile(fileUrl, fileName) { downloadFile(fileUrl, fileName) {
const link = document.createElement('a'); const link = document.createElement('a');
link.href = fileUrl; link.href = fileUrl;
link.target="_blank";
link.download = fileName; link.download = fileName;
document.body.appendChild(link); document.body.appendChild(link);
link.click(); link.click();
......
...@@ -587,8 +587,8 @@ ...@@ -587,8 +587,8 @@
</p> </p>
</template> </template>
<template> <template>
<el-button type="primary" class="normalBtn" style="float:right;margin-right:40px;" <el-button type="primary" class="normalBtn" style="float:right;margin-right:40px;" :loading="downLoadloading"
:loading="importOfferLoading" @click="downLoadOffer(postConfig)">{{$t('objFill.xiazaxtbjd')}} @click="downLoadOffer(postConfig)">{{$t('objFill.xiazaxtbjd')}}
</el-button> </el-button>
</template> </template>
</td> </td>
...@@ -620,6 +620,7 @@ ...@@ -620,6 +620,7 @@
AduitMsg: { AduitMsg: {
}, },
downLoadloading: false,
} }
}, },
methods: { methods: {
...@@ -682,6 +683,7 @@ ...@@ -682,6 +683,7 @@
const link = document.createElement('a'); const link = document.createElement('a');
link.href = fileUrl; link.href = fileUrl;
link.download = fileName; link.download = fileName;
link.target = "_blank";
document.body.appendChild(link); document.body.appendChild(link);
link.click(); link.click();
}, },
...@@ -701,9 +703,9 @@ ...@@ -701,9 +703,9 @@
} }
} }
fileName += ".xls" fileName += ".xls"
this.loading = true; this.downLoadloading = true;
this.GetLocalFile("quotation_get_DownLoadQuotation", downMsg, fileName, res => { this.GetLocalFile("quotation_get_DownLoadQuotation", downMsg, fileName, res => {
this.loading = false; this.downLoadloading = false;
}); });
}, },
//调用父组件方法 //调用父组件方法
......
...@@ -39,8 +39,9 @@ ...@@ -39,8 +39,9 @@
<span> <span>
<em>{{$t('objFill.v101.dmc.chutrq')}}</em> <em>{{$t('objFill.v101.dmc.chutrq')}}</em>
<el-date-picker style="width: 300px;" v-model="StartTime" format='yyyy-MM-dd' value-format="yyyy-MM-dd" <el-date-picker style="width: 300px;" v-model="StartTime" format='yyyy-MM-dd' value-format="yyyy-MM-dd"
size="small" type="daterange" :range-separator="$t('OrderList.zhi')" :start-placeholder="$t('OrderList.star')" :end-placeholder="$t('OrderList.end')" size="small" type="daterange" :range-separator="$t('OrderList.zhi')"
@change="getStartTime" clearable> :start-placeholder="$t('OrderList.star')" :end-placeholder="$t('OrderList.end')" @change="getStartTime"
clearable>
</el-date-picker> </el-date-picker>
</span> </span>
</li> </li>
...@@ -58,21 +59,23 @@ ...@@ -58,21 +59,23 @@
@click="goTravel(scope.row)">{{scope.row.TCNUM}}({{scope.row.TCID}})</span> @click="goTravel(scope.row)">{{scope.row.TCNUM}}({{scope.row.TCID}})</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="StartDate" :label="$t('hotel.hotel_StarDate')" width="120" show-overflow-tooltip></el-table-column> <el-table-column prop="StartDate" :label="$t('hotel.hotel_StarDate')" width="120" show-overflow-tooltip>
</el-table-column>
<el-table-column prop="LtName" :label="$t('advmanager.v_xilie')" width="200" show-overflow-tooltip> <el-table-column prop="LtName" :label="$t('advmanager.v_xilie')" width="200" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.LineName}}</br> {{scope.row.LineName}}<br />
{{scope.row.LtName}} {{scope.row.LtName}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="Title" :label="$t('Operation.Op_TeamName')" width="200" show-overflow-tooltip></el-table-column> <el-table-column prop="Title" :label="$t('Operation.Op_TeamName')" width="200" show-overflow-tooltip>
</el-table-column>
<el-table-column prop="" :label="$t('visaT.Applicant')+'/'+$t('objFill.shengqirq')" width="200"> <el-table-column prop="" :label="$t('visaT.Applicant')+'/'+$t('objFill.shengqirq')" width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<p> {{scope.row.BranchApplyName}}</p> <p> {{scope.row.BranchApplyName}}</p>
<p> {{scope.row.BranchApplyTime}}</p> <p> {{scope.row.BranchApplyTime}}</p>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="OPName" :label="$t('objFill.shengqyy')" show-overflow-tooltip> <el-table-column prop="OPName" :label="$t('objFill.v101.dmc.shengqyy')" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.BranchApplyResion}} {{scope.row.BranchApplyResion}}
</template> </template>
...@@ -94,10 +97,12 @@ ...@@ -94,10 +97,12 @@
<el-table-column prop="" :label="$t('system.table_operation')" width="150"> <el-table-column prop="" :label="$t('system.table_operation')" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="_icon_btn"> <div class="_icon_btn">
<el-tooltip class="item" effect="dark" :content="$t('fnc.shenhe')" placement="top" v-if="scope.row.BranchAuditState==1"> <el-tooltip class="item" effect="dark" :content="$t('fnc.shenhe')" placement="top"
v-if="scope.row.BranchAuditState==1">
<i v-loading="loading" class="iconfont icon-ico_commodity_defaul" @click="shenhei(scope.row)"></i> <i v-loading="loading" class="iconfont icon-ico_commodity_defaul" @click="shenhei(scope.row)"></i>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('fnc.bohui')" placement="top" v-if="scope.row.BranchAuditState==1"> <el-tooltip class="item" effect="dark" :content="$t('fnc.bohui')" placement="top"
v-if="scope.row.BranchAuditState==1">
<i class="iconfont icon-shenhebohui" @click="bohui(scope.row)"></i> <i class="iconfont icon-shenhebohui" @click="bohui(scope.row)"></i>
</el-tooltip> </el-tooltip>
</div> </div>
...@@ -105,20 +110,22 @@ ...@@ -105,20 +110,22 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<div style="width: 100%;"> <div style="width: 100%;">
<el-pagination background @current-change="handleCurrentChange" <el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.pageIndex"
:current-page.sync="msg.pageIndex" layout="total,prev, pager, next, jumper" layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total">
:page-size="msg.pageSize" :total="total">
</el-pagination> </el-pagination>
</div> </div>
<el-dialog custom-class="w600" :title="$t('objFill.bohuiyy')" :visible.sync="cancelOrderDialog"> <el-dialog custom-class="w600" :title="$t('objFill.bohuiyy')" :visible.sync="cancelOrderDialog">
<div style="padding-bottom:20px"> <div style="padding-bottom:20px">
<el-input type="textarea" autofocus rows="5" :placeholder="$t('objFill.v101.dmc.qingtxbtyy')" clear="w300" v-model="cancelRemark"> <el-input type="textarea" autofocus rows="5" :placeholder="$t('objFill.v101.dmc.qingtxbtyy')" clear="w300"
v-model="cancelRemark">
</el-input> </el-input>
<el-row :gutter="20" style="margin-top: 20px;"> <el-row :gutter="20" style="margin-top: 20px;">
<el-col :span="24" style="text-align: right;"> <el-col :span="24" style="text-align: right;">
<el-button class="normalBtn" value="" @click="cancelOrderHandler" :loading="loading">{{$t('objFill.v101.dmc.quedinbh')}}</el-button> <el-button class="normalBtn" value="" @click="cancelOrderHandler" :loading="loading">
<el-button class="hollowFixedBtn" @click="cancelOrderDialog = false,cancelRemark=''">{{$t('pub.closeSel')}}</el-button> {{$t('objFill.v101.dmc.quedinbh')}}</el-button>
<el-button class="hollowFixedBtn" @click="cancelOrderDialog = false,cancelRemark=''">{{$t('pub.closeSel')}}
</el-button>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
...@@ -353,7 +360,6 @@ ...@@ -353,7 +360,6 @@
} }
} }
} }
</script> </script>
<style scoped> <style scoped>
.groupApproval .singeRowTable { .groupApproval .singeRowTable {
...@@ -424,5 +430,4 @@ ...@@ -424,5 +430,4 @@
._icon_btn i.icon-mingxi { ._icon_btn i.icon-mingxi {
background-color: rgb(71, 191, 140) background-color: rgb(71, 191, 140)
} }
</style> </style>
\ No newline at end of file
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