Skip to content

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

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

parents 1071fb19 0ebe813b
Hide whitespace changes
Inline Side-by-side
Showing with 1152 additions and 24 deletions
src/components/Complaints/AddComplaints.vue
View file @ a3846cf6
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
<p>投诉情况</p> <p>投诉情况</p>
<div class="AC_complaintList"> <div class="AC_complaintList">
<div class="t">主题内容：</div> <div class="t">主题内容：</div>
<ul> <ul style="width:90%;">
<li v-for="subItem in themeList" @click="getTheme(subItem)" :class="{'checked':subItem.isCheck}"> <li v-for="subItem in themeList" @click="getTheme(subItem)" :class="{'checked':subItem.isCheck}">
{{subItem.Name}} {{subItem.Name}}
</li> </li>
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
</div> </div>
<div class="AC_complaintList"> <div class="AC_complaintList">
<div class="t">严重程度：</div> <div class="t">严重程度：</div>
<ul> <ul style="width:90%;">
<li v-for="subItem in severityList" @click="getServerity(subItem)" :class="{'checked':subItem.isCheck}"> <li v-for="subItem in severityList" @click="getServerity(subItem)" :class="{'checked':subItem.isCheck}">
{{subItem.Name}} {{subItem.Name}}
</li> </li>
...@@ -234,10 +234,10 @@ ...@@ -234,10 +234,10 @@
this.EditMsg.LineID = this.PriceInfo.LineID; this.EditMsg.LineID = this.PriceInfo.LineID;
this.EditMsg.LineteamId = this.PriceInfo.LineteamId; this.EditMsg.LineteamId = this.PriceInfo.LineteamId;
} }
this.ExitCount = res.data.data.ExitCount; // this.ExitCount = res.data.data.ExitCount;
if(this.ExitCount>0){ // if(this.ExitCount>0){
this.Error("该订单已存在投诉"); // this.Error("该订单已存在投诉");
} // }
} else { } else {
this.Error(res.data.message) this.Error(res.data.message)
} }
......
src/components/Complaints/ComplaintsManage.vue
View file @ a3846cf6
...@@ -203,6 +203,7 @@ ...@@ -203,6 +203,7 @@
<td>{{getTimeConsuming(item,2)}}</td> <td>{{getTimeConsuming(item,2)}}</td>
<td> <td>
<span class="CM_detail" @click="goUrl('ComplaintsDetail',item.ID,item.OrderID,'投诉详情')">详情</span> <span class="CM_detail" @click="goUrl('ComplaintsDetail',item.ID,item.OrderID,'投诉详情')">详情</span>
<span class="CM_detail" @click="delComplaints(item.ID,item.CreateBy)">删除</span>
</td> </td>
</tr> </tr>
</table> </table>
...@@ -438,6 +439,29 @@ ...@@ -438,6 +439,29 @@
var fileName = "投诉报表.xls"; var fileName = "投诉报表.xls";
this.GetLocalFile("get_complain_GetExport", msg, fileName); this.GetLocalFile("get_complain_GetExport", msg, fileName);
}, },
//删除
delComplaints(ID,UserID){
let userInfo = this.getLocalStorage();
if(userInfo.EmployeeId==UserID){
var that = this;
that.Confirm("是否删除?", function () {
var msg = {
ID : ID
};
that.apipost(
"conplain_post_Remove",msg,res => {
if (res.data.resultCode == 1) {
that.Success(res.data.message);
that.getList();
}
},
null
);
});
}else{
this.Error('只能删除自己创建的单据');
}
}
}, },
mounted () { mounted () {
this.getLineList() this.getLineList()
......
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ a3846cf6
...@@ -855,7 +855,7 @@ export default { ...@@ -855,7 +855,7 @@ export default {
}, err => {}) }, err => {})
}, },
upLoadFuJian: function() { upLoadFuJian: function() {
if (this.saveMsg.length===0) return this.$message.error('请上传图片！'); if (this.saveMsg.length===0) return this.$message.error('请上传文件！');
let msg = { let msg = {
FrID: this.ID, FrID: this.ID,
vorcherInos: this.saveMsg vorcherInos: this.saveMsg
......
src/components/FinancialModule/ReportForm/CombinedRevenueReport.vue
View file @ a3846cf6
...@@ -1718,10 +1718,10 @@ export default { ...@@ -1718,10 +1718,10 @@ export default {
x.Is_Transport = x.Is_Transport === 0 ? "否" : "是"; x.Is_Transport = x.Is_Transport === 0 ? "否" : "是";
newData.push(x); newData.push(x);
} else { } else {
x.MaoLiRate = this.total===0 ? 0 : parseFloat(x.MaoLiRate/this.total); // x.MaoLiRate = this.total===0 ? 0 : parseFloat(x.MaoLiRate/this.total);
x.AverageIncome = this.total===0 ? 0 : parseFloat(x.AverageIncome/this.total); // x.AverageIncome = this.total===0 ? 0 : parseFloat(x.AverageIncome/this.total);
x.AverageCost = this.total===0 ? 0 : parseFloat(x.AverageCost/this.total); // x.AverageCost = this.total===0 ? 0 : parseFloat(x.AverageCost/this.total);
x.AverageProfit = this.total===0 ? 0 : parseFloat(x.AverageProfit/this.total); // x.AverageProfit = this.total===0 ? 0 : parseFloat(x.AverageProfit/this.total);
x.LineName = "合计"; x.LineName = "合计";
x.TCID = ""; x.TCID = "";
x.TCNUM = ""; x.TCNUM = "";
......
src/components/FinancialModule/ReportForm/MonthReport.vue
View file @ a3846cf6
...@@ -580,6 +580,7 @@ export default { ...@@ -580,6 +580,7 @@ export default {
LineId:"", LineId:"",
QStartDate: "", QStartDate: "",
QEndDate: "", QEndDate: "",
EmployeeId:''
}, },
getCompanyMsg: { getCompanyMsg: {
// 公司 // 公司
...@@ -904,6 +905,7 @@ export default { ...@@ -904,6 +905,7 @@ export default {
}, },
method5: function() { method5: function() {
this.loading = true; this.loading = true;
this.msg.EmployeeId=this.userId;
this.GetLocalFile( this.GetLocalFile(
"financestatistics_post_OutToExcelTravelMonthReportList", "financestatistics_post_OutToExcelTravelMonthReportList",
this.msg, this.msg,
......
src/components/FinancialModule/invoicesManagerDetail.vue
View file @ a3846cf6
<style scoped> <style>
.page_iisMgdetail { .page_iisMgdetail {
width: 830px; width: 830px;
background-color: white; background-color: white;
...@@ -16,22 +16,22 @@ ...@@ -16,22 +16,22 @@
top: 10px; top: 10px;
font-size: 14px; font-size: 14px;
} }
.page_iisMgdetail .page_iisMgadd_table { .page_iisMgdetail .page_iisMgdetail_table {
width: 100%; width: 100%;
font-size: 14px; font-size: 14px;
text-align: center; text-align: center;
} }
.page_iisMgdetail .page_iisMgadd_table td { .page_iisMgdetail .page_iisMgdetail_table td {
padding: 10px; padding: 10px;
} }
.page_iisMgdetail .page_iisMgadd_table .page_iisMgadd_bank td._bank_td{ .page_iisMgdetail .page_iisMgdetail_table .page_iisMgdetail_bank td._bank_td{
width: 679px; width: 679px;
} }
.iis_save{ .iis_save{
text-align: right; text-align: right;
padding: 10px 0 0 0; padding: 10px 0 0 0;
} }
.page_iisMgdetail .page_iisMgadd_table tr td.font-weight{ .page_iisMgdetail .page_iisMgdetail_table tr td.font-weight{
font-weight: 800; font-weight: 800;
} }
.page_iisMgdetail .cursorpointer{ .page_iisMgdetail .cursorpointer{
...@@ -140,6 +140,75 @@ ...@@ -140,6 +140,75 @@
justify-content: center; justify-content: center;
display: flex; display: flex;
} }
.page_iisMgdetail ._addUpload_tips {
margin-top: 20px;
font-size: 12px;
color: #999999;
}
.page_iisMgdetail ._addUpload_box {
display: block;
margin-top: 15px;
}
.page_iisMgdetail ._addUpload_box img {
width: 100%;
height: 100%;
}
.page_iisMgdetail ._addUpload_box > div {
float: left;
width: 138px;
height: 92px;
border: 1px dashed rgba(210, 210, 210, 1);
border-radius: 2px;
cursor: pointer;
margin-bottom: 10px;
padding: 5px;
margin-right: 10px;
position: relative;
}
.page_iisMgdetail ._addUpload_box > div:hover {
background-color: #f5f5f5;
}
.page_iisMgdetail ._addFile_name {
padding-left: 15px;
max-width: 450px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.page_iisMgdetail ._addUpload_box .icon-guanbi1 {
font-size: 12px;
color: white;
display: inline-block;
margin-left: 15px;
position: absolute;
right: -6px;
top: -9px;
background-color: #f56c6c;
border-radius: 50%;
height: 20px;
width: 20px;
text-align: center;
line-height: 20px;
}
.page_iisMgdetail ._addUpload_box .icon-guanbi1:hover {
font-size: 12px;
color: #c94052;
}
.page_iisMgdetail ._addUpload_box .icon-excel,
.page_iisMgdetail ._addUpload_box .icon-pdf {
text-align: center;
font-size: 38px;
color: green;
line-height: 75px;
}
.page_iisMgdetail .el-upload-dragger {
font-size: 28px;
color: #8c939d;
width: 126px;
height: 80px;
line-height: 41px;
text-align: center;
}
</style> </style>
<template> <template>
<div class="page_iisMgdetail" v-loading="loading"> <div class="page_iisMgdetail" v-loading="loading">
...@@ -155,7 +224,7 @@ ...@@ -155,7 +224,7 @@
<table <table
data-v-ca5157c2 data-v-ca5157c2
border="1" border="1"
class="page_iisMgadd_table" class="page_iisMgdetail_table"
style="border-collapse: collapse;" style="border-collapse: collapse;"
> >
<tr> <tr>
...@@ -184,7 +253,7 @@ ...@@ -184,7 +253,7 @@
<span @click="goUrlO(detail.OrderId)">{{detail.DueInMoney}}</span> <span @click="goUrlO(detail.OrderId)">{{detail.DueInMoney}}</span>
</td> </td>
</tr> </tr>
<tr class="page_iisMgadd_bank"> <tr class="page_iisMgdetail_bank">
<td>{{$t('ios.dzyinhang')}}</td> <td>{{$t('ios.dzyinhang')}}</td>
<td colspan="3" class="_bank_td"> <td colspan="3" class="_bank_td">
{{orderList. AccountNumber}} {{orderList. AccountNumber}}
...@@ -302,7 +371,7 @@ ...@@ -302,7 +371,7 @@
</span> </span>
<span class="cursorpointer" @click="fujianShow = false">收起 <i class="iconfont icon-gengduo"></i></span> <span class="cursorpointer" @click="fujianShow = false">收起 <i class="iconfont icon-gengduo"></i></span>
</p> </p>
<div class="_addUpload_box" v-if="fujianShow"> <div class=" clearfix" v-if="fujianShow">
<div style="width:100%;" v-if="FuImgList.length>0"> <div style="width:100%;" v-if="FuImgList.length>0">
<el-carousel trigger="click" height="293px" width="440px" :interval="5000"> <el-carousel trigger="click" height="293px" width="440px" :interval="5000">
<el-carousel-item style="height: 293px;" v-for="item in FuImgList" :key="item"> <el-carousel-item style="height: 293px;" v-for="item in FuImgList" :key="item">
...@@ -310,7 +379,7 @@ ...@@ -310,7 +379,7 @@
</el-carousel-item> </el-carousel-item>
</el-carousel> </el-carousel>
</div> </div>
<div class="clearfix bg_white" v-if="detail.ApplyPics && detail.ApplyPics.length"> <div class="clearfix" v-if="detail.ApplyPics && detail.ApplyPics.length">
<template v-for="(file,fIndex) in detail.ApplyPics" v-if="file.Type==='1'"> <template v-for="(file,fIndex) in detail.ApplyPics" v-if="file.Type==='1'">
<div class="_wenjian" @click="showUpLoadFile(file)"> <div class="_wenjian" @click="showUpLoadFile(file)">
<p v-if="file.Type==='1'" class="_wenjian_P iconfont" :class="file.Url.substring(file.Url.lastIndexOf('.')+1,file.Url.length).toUpperCase()=='PDF'? 'icon-pdf' : 'icon-excel'"></p> <p v-if="file.Type==='1'" class="_wenjian_P iconfont" :class="file.Url.substring(file.Url.lastIndexOf('.')+1,file.Url.length).toUpperCase()=='PDF'? 'icon-pdf' : 'icon-excel'"></p>
...@@ -319,6 +388,36 @@ ...@@ -319,6 +388,36 @@
</div> </div>
</div> </div>
</div> </div>
<div v-else-if="!detail.ApplyPics && EmployeeId === detail.CreateBy">
<div class="_addUpload_box _addUpload_box_btm clearfix" >
<template v-for="(file,fIndex) in saveMsg">
<div v-if="file.Type==3">
<div style="width:100%;height:100%;overflow: hidden;">
<img :src="file.Url?file.Url:file.Content" @click="showImg(file.Url?file.Url:file.Content)">
</div>
<span class="iconfont icon-guanbi1" @click="deleteUploadFile(fIndex)"></span>
</div>
<div v-if="file.Type==1">
<div class="iconfont _wenjian_P" :class="file.Content.substring(file.Content.lastIndexOf('.')+1,file.Content.length).toUpperCase()=='PDF'? 'icon-pdf' : 'icon-excel'" @click="showUpLoadFileT(file)">
</div>
<span class="iconfont icon-guanbi1" @click="deleteUploadFile(fIndex)"></span>
</div>
</template>
</div>
<div style="margin-top: 80px;">
<div class="_pic_upload" >
<el-upload
drag
:http-request="uploadFileBtn"
:multiple="true" :show-file-list="false" action="">
<i class="el-icon-plus avatar-uploader-icon"></i>
<div class="el-upload__text">点击/拖拽上传</div>
</el-upload>
</div>
<div class="shangchuanfujian"><button class="hollowFixedBtn" @click="upLoadFuJian">上传附件</button></div>
</div>
</div>
<div class="querenhan"> <div class="querenhan">
<p >确认函</p> <p >确认函</p>
<div style="width:100%;" > <div style="width:100%;" >
...@@ -380,9 +479,59 @@ export default { ...@@ -380,9 +479,59 @@ export default {
title:false title:false
}, },
fujianShow:true, fujianShow:true,
saveMsg: [],
}; };
}, },
methods: { methods: {
uploadFileBtn(file) { //上传
if(file.file.size > 1024 * 1024 * 10) {
this.$message.warning('文件大小不能超过10M！')
return
}
// 1 文档 2 数据 3 图片
let typeArr=[
{stringArr:'GIF|JPG|JPEG|PNG|BMP',type:3},
{stringArr:'DOCX|DOC|XLSX|XLS|PPT|PPTX|PDF',type:1},
]
let ft=file.file.name.substring(file.file.name.lastIndexOf('.')+1,file.file.name.length).toUpperCase();
let fileTypeNumber = 2;
let typeOk = false;
typeArr.forEach(x=>{
if(x.stringArr.indexOf(ft)!='-1')
{
fileTypeNumber=x.type;
typeOk = true;
}
});
if (!typeOk) return this.$message.error('请上传图片、word、excel类型的文件！');
let newArr = [];
newArr.push(file.file)
let path = "/Upload/Temporary/"
this.$message.info('上传中...')
this.UploadSelfFileT(path, newArr, x => {
let fileSize = file.file.size<1024? file.file.size:(file.file.size / 1024).toFixed(0);
this.saveMsg.push({
Type: fileTypeNumber,
Content: x.data.FilePath,
Url: this.domainManager().ViittoFileUrl + x.data.FilePath,
});
this.$message.success('上传成功');
});
},
upLoadFuJian: function() {
if (this.saveMsg.length===0) return this.$message.error('请上传文件！');
let msg = {
ID: this.msg.ID,
ApplyPics: this.saveMsg
};
this.apipost('InvoiceApply_get_UpdateInvoiceApplyInfo', msg, res=>{
if (res.data.resultCode===1) {
this.getDetail(this.msg.ID)
} else {
this.$message.error(res.data.message);
}
}, null)
},
showUpLoadFile(i){ // 预览上传文件 showUpLoadFile(i){ // 预览上传文件
if(i.Url.substring(i.Url.lastIndexOf('.')+1,i.Url.length).toUpperCase()=='PDF'){ if(i.Url.substring(i.Url.lastIndexOf('.')+1,i.Url.length).toUpperCase()=='PDF'){
this.previewPDF(i.Url) this.previewPDF(i.Url)
......
src/components/Hotel/roomReservationsDetails.vue
View file @ a3846cf6
...@@ -490,7 +490,20 @@ ...@@ -490,7 +490,20 @@
//单条保存 //单条保存
SaveSingle(item) { SaveSingle(item) {
item.HotelOrderState = 1; item.HotelOrderState = 1;
this.apipost('dmcstatistics_post_SetNewHotelOrder', item, res => { this.list.forEach(item => {
item.HotelOrderList.forEach(subItem => {
subItem.OrderDetailsList.forEach(y => {
y.HouseTypeCount = parseInt(y.HouseTypeCount);
y.UnitPrice = parseInt(y.UnitPrice);
y.HotelDiscount = parseInt(y.HotelDiscount);
if (y.BookNum == "") {
y.BookNum = 0;
}
})
});
})
let mag={TotalList:this.list,SingleItem:item};
this.apipost('dmcstatistics_get_SetHotelOrder', this.list, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.Success(res.data.message); this.Success(res.data.message);
this.getList(); this.getList();
......
src/components/SalesModule/enrollTotalForAirUnion.vue 0 → 100644
View file @ a3846cf6
<template>
<div class="flexOne">
<div class="enrollTotalSearch">
<ul>
<li><span><em>线路</em>
<el-select class='w200' v-model="msg.LineId" filterable :placeholder="$t('pub.pleaseSel')">
<el-option label="不限" value='-1'></el-option>
<el-option v-for="item in LineList" :label='item.LineName' :value='item.LineID' :key='item.LineID'>
</el-option>
</el-select>
</span>
</li>
<li><span><em>公司</em>
<el-select class='w200' v-model="msg.BranchId" filterable :placeholder="$t('pub.pleaseSel')" @change='linkageDepartment()'>
<el-option label="不限" value='-1'></el-option>
<el-option v-for="item in companyList" :label='item.BName' :value='item.Id' :key='item.Id'>
</el-option>
</el-select>
</span>
</li>
<li><span><em>参团类型</em>
<el-select class='w200' v-model="msg.GroupType" filterable :placeholder="$t('pub.pleaseSel')">
<el-option label="不限" value='-1'></el-option>
<el-option v-for="item in ctlxList" :key='item.Id' :label='item.Name' :value='item.Id'></el-option>
</el-select>
</span>
</li>
<li>
<span><em>团号</em></span>
<el-input class='w200' v-model='msg.TCNUM'></el-input>
</li>
<li>
<span><em>人员选择</em></span>
<el-select class='w200' v-model="msg.CreateBy" filterable :placeholder="$t('pub.pleaseSel')">
<el-option label='不限' value='-1'></el-option>
<el-option v-for='item in employeeList' :label='item.name' :value='item.empId' :key='item.empId'>
</el-option>
</el-select>
</li>
<li>
<span><em>订单号</em></span>
<el-input class='w200' v-model='msg.tempOrderId'></el-input>
</li>
<li>
<span><em>订单状态</em></span>
<el-select v-model='msg.OrderState' filterable :placeholder="$t('pub.pleaseSel')">
<el-option label="不限" value='-1'></el-option>
<el-option v-for="item in ddztList" :label='item.Name' :value='item.Id' :key='item.Id'>
</el-option>
</el-select>
</li>
<li><span><em>发团日期</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.QEndDate' @change="dataDuiQ()" class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
</span>
</li>
<li><span><em>报名日期</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.CEndDate' @change="dataDui()" class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
</span>
</li>
<li>
<input type="button" class="hollowFixedBtn" value="查询" @click="getList();resetPageIndex()" />
</li>
</ul>
</div>
<!-- 表格 -->
<div style="clear: both; width: 100%;height: 20px;"></div>
<table class="enrollTotalSearchTable" border="0" cellspacing="0" cellpadding="0" v-loading='loading'>
<tr>
<th width="130">单号&团号</th>
<th width="60">客户信息</th>
<th width="70">类型</th>
<th width="180">系列&线路</th>
<th width="100">人数/机位数</th>
<th width="80">单价</th>
<th width="80">成交单价</th>
<th width="80">应收总额</th>
<th width="80">实收</th>
<th width="80">优惠</th>
<th width="60">小费</th>
<th width="80">退款</th>
<th width="80">平台税金</th>
<th width="80">平台在途</th>
<th width="80">待收金额</th>
<th width="60">状态</th>
<th v-if="userId==1" width="140">操作</th>
</tr>
<tr>
<td v-show="list.length==0" colspan="15" align="center">暂无数据</td>
</tr>
<tbody v-for="(item,index) in list" :key="index">
<tr>
<td rowspan="2">
<p v-if="item.isChargeLossOrders==1" style="color:red">损</p>
<p class="fbold over_ellipsis" style="width: 100%;cursor:pointer;" :title="item.orderId" @click="goUrlX('团报名清单', 'groupTourOrderByTuan',item.tcid,item.tcnum)">{{item.orderId}}</p>
<p class="fz12 over_ellipsis" style="width: 100%;text-decoration:underline;cursor:pointer;" :title="item.alName"
@click="goUrlX('产品查询', 'productQuery',item.tcid,item.tcnum)">{{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=='无'?'':item.commissionSPeopleName}}</p>
<p>发团：{{item.startDate}}</p>
<p v-if='item.commissionMoney' style="color:red">提成：{{item.commissionMoney}}</p>
<p v-else-if="item.latestCommissionMoney" style="color:red">提成：{{item.latestCommissionMoney}}</p>
<div v-if="item.extraRewardMoney!=null&&item.extraRewardMoney>0">奖励金额：<span style="color:#e95252">{{item.extraRewardMoney}}</span></div>
<div v-if="item.extraDeductMoney!=null&&item.extraDeductMoney>0">扣除金额：<span style="color:#e95252">{{item.extraDeductMoney}}</span></div>
</td>
<td>
<p class="over_ellipsis" style="width: 150px;" :title="item.contactName">{{item.contactName}}</p>
<p>{{item.contactMobile}}</p>
</td>
<td>
<p class="fz12 over_ellipsis" style="width: 100%;">{{item.orderTypeName}}</p>
</td>
<td class="fz12">
<p style="max-width: 160px;display: block;" class="over_ellipsis" :title="item.lineName">
<span>{{item.lineName}}</span>
</p>
<p style="max-width: 160px;display: block;" class="over_ellipsis" :title="item.ltName">{{item.ltName}}</p>
</td>
<td>
{{item.guestNum}}/{{item.ySeatNum>0? item.ySeatNum+'Y ':''}}{{item.eSeatNum>0? item.eSeatNum+'E ':''}}{{item.fSeatNum>0? item.fSeatNum+'F ':''}}
</td>
<td style="color:#FF9C00">{{item.tC_Price}}</td>
<td style="color:#FF9C00">￥{{item.unit_Price}}</td>
<td>
<p style="color:#FF9C00">￥{{item.preferPrice}}</p>
</td>
<td>
<span v-if='item.isEnd==0' style="cursor: pointer;">{{item.income}}</span>
<span v-if='item.isEnd!=0' style="cursor: pointer;color: #e95252;">{{item.income}}</span>
</td>
<!-- 优惠 -->
<td>
<el-popover style='padding: 0;' width="600" trigger="click">
<div class="personNolayer">
<table border="0" cellspacing="1" cellpadding="1">
<tr>
<th>优惠券名称</th>
<th>优惠券类型</th>
<th>抵扣金额/折扣</th>
<th>使用条件</th>
<th>获取方式</th>
<th>获取日期</th>
</tr>
<tr v-if='item.couponAllotList.length>0' v-for="(item2,index2) in item.couponAllotList" :key="index2">
<td>{{item2.couponsName}}</td>
<td>
<span v-if="item2.couponsType==1">抵用券</span>
<span v-if="item2.couponsType==2">折扣卷</span>
</td>
<td>{{item2.denomination}}</td>
<td>满{{item2.useCondition}}可用</td>
<td>
<span v-if="item2.accessType==1">抽奖</span>
<span v-else></span>
</td>
<td>{{item2.acessDate}}</td>
</tr>
<tr v-if='item.couponAllotList.length==0'>
<td colspan="6" align="center">暂无数据</td>
</tr>
</table>
</div>
<span style="cursor: pointer;color: #e95252;" slot="reference">{{moneyFormat(item.discountMoney)}}</span>
</el-popover>
</td>
<td v-if="item.tipMoney">{{item.tipMoney}}</td>
<td v-else>0.00</td>
<td>{{item.refund}}</td>
<td>{{item.platformTax}}</td>
<td>{{item.zaiTuMoney}}</td>
<td><span :class="{color_red_order:item.dueInMoney!==item.preferPrice}">{{item.dueInMoney}}</span></td>
<td v-if="item.isChargeLossOrders==1" class="fz12" style="color: #e95252">收损</td>
<td v-else class="fz12" :style="item.orderState===3?'color: #e95252;':''">{{item.statsstr}}</td>
<td v-if="userId==1">
<button class="normalBtn" style="margin-left:0;width:95px;padding:0" @click="getSalerInfo(item)">修改业务员</button>
</td>
</tr>
<tr>
<td colspan="3" class="groupTourOrder_remarks" style="height: 40px;">
<div>
<div><span>备注：</span>
<p><span v-if='item.clientSource==1&&item.brandName!=""'>{{item.brandName}}订单 {{item.platformOrder}};</span>{{item.remarks}}</p>
</div>
<div>
<span>{{item.remarksName}}&ensp;{{item.rematksTime}}</span>
<el-popover width="600" placement="bottom-end" trigger="click">
<div class="groupTourOrder_remarks_popover">
<div>历史备注</div>
<p v-if="item.remarksList.length !== 0" v-for="(item2, index2) in item.remarksList" :key="index2">
<span>{{item2.remarks}}</span>
<span>{{item2.createByName}} <span style="color: #666666;">{{item2.createDate}}</span></span>
</p>
<span v-if="item.remarksList.length === 0">暂无数据</span>
</div>
<el-button slot="reference" icon="iconfont icon-gengduo" style="padding:0px;border:none;background-color:transparent;"
class="groupTourOrder_remarks_btn"></el-button>
</el-popover>
</div>
</div>
</td>
<td colspan="4" class="groupTourOrder_remarks" style="height: 40px;">
<div>
<div>
<span>OP备注:</span>
<p>{{item.oP_Remarks ? item.oP_Remarks : '无'}}</p>
</div>
</div>
</td>
<td colspan="8" class="groupTourOrder_tickets" style="height: 40px;cursor: pointer;" @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
<div>
<div>收款单据：</div>
<div>
<span v-for="(item2,index2) in item.financeList" :key="index2">
<span v-if="item2.colorState===1" class="groupTourOrder_tickets_blue">{{item2.frID}}</span>
<span v-else-if="item2.colorState===2" class="groupTourOrder_tickets_green">{{item2.frID}}</span>
<span v-else-if="item2.colorState===3" class="groupTourOrder_tickets_red">{{item2.frID}}</span>
<span v-else-if="item2.colorState===4" class="groupTourOrder_tickets_black">{{item2.frID}}</span>
</span>
<span v-if="item.financeList.length===0" style="cursor: default;">暂无数据</span>
</div>
</div>
<div>
<div>付款单据：</div>
<div>
<span v-for="(item2,index2) in item.refundFinanceList" :key="index2">
<span v-if="item2.colorState===1" class="groupTourOrder_tickets_blue">{{item2.frID}}</span>
<span v-else-if="item2.colorState===2" class="groupTourOrder_tickets_green">{{item2.frID}}</span>
<span v-else-if="item2.colorState===3" class="groupTourOrder_tickets_red">{{item2.frID}}</span>
<span v-else-if="item2.colorState===4" class="groupTourOrder_tickets_black">{{item2.frID}}</span>
</span>
<span v-if="item.financeList.length===0" style="cursor: default;">暂无数据</span>
</div>
</div>
<div>
<div>发票单据：</div>
<div>
<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-else-if="item2.invoiceApplyState===1" class="groupTourOrder_tickets_green" @click="goIisDetail(item2.id)">{{item2.id}}</span>
<span v-else-if="item2.invoiceApplyState===5" class="groupTourOrder_tickets_red" @click="goIisDetail(item2.id)">{{item2.id}}</span>
<span v-else-if="item2.invoiceApplyState===3" class="groupTourOrder_tickets_black" @click="goIisDetail(item2.id)">{{item2.id}}</span>
</span>
<span v-if="item.invoiceApplyList.length===0" style="cursor: default;">暂无数据</span>
</div>
</div>
</td>
</tr>
</tbody>
</table>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" layout="total,prev, pager, next, jumper"
:page-size=msg.pageSize :total=total></el-pagination>
<div class="combottomDiv" v-if="showChangeSales" style="height:200px;">
<updateSalesMan @closeUpdiv="closeSalseDiv" @getList="getList" :subInfo="subInfo"></updateSalesMan>
</div>
</div>
</template>
<script>
import Treeselect from "@riophae/vue-treeselect";
import updateSalesMan from "../commonPage/updateSalesMan.vue";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default {
components: {
Treeselect,
updateSalesMan
},
data() {
return {
normalizer(node) {
var obj = {
id: node.DepartmentId,
label: node.DepartmentName,
};
if (node.ChildList != null && node.ChildList.length > 0) {
obj.children = node.ChildList;
}
return obj;
},
defaultImg: 'this.src="' + require("../../assets/img/litheader.png") + '"',
currentPage: 1,
total: 0,
loading: false,
msg: {
LineId: "-1",
RB_Department_Id: null,
CreateBy: "-1",
OrderState: "-1",
CStartDate: "",
CEndDate: "",
QStartDate: "",
QEndDate: "",
pageIndex: 1,
pageSize: 10,
tempOrderId: "",
SellFormEmp: 0,
GroupType: '-1',
TCNUM: '',
BranchId:'-1',
IsUnionOrder:'1'
},
employeeMsg: {
RB_Group_id: "0",
RB_Branch_id: "-1",
departmentId: "0",
IsLeave: "-1"
},
getCompanyMsg: {
RB_Group_Id: '0',
Status: '0',
},
getDepartmentMsg: {
RB_Group_Id: '0',
RB_Branch_Id: '-1',
Status: '0',
},
isOwn: false,
list: [],
LineList: [],
LineTeamList: [],
departmentList: [],
employeeList: [],
companyList: [],
ddztList: [],
countData: {
// 总报名人数
TotalGuestNum: 0,
TotalYSeatNum: 0,
TotalESeatNum: 0,
TotalFSeatNum: 0,
// 正常报名人数
NormalGuestNum: 0,
NormalYSeatNum: 0,
NormalESeatNum: 0,
NormalFSeatNum: 0,
// 取消人数
CancelGuestNum: 0,
CancelYSeatNum: 0,
CancelESeatNum: 0,
CancelFSeatNum: 0,
// 其他统计项
Income: 0,
Commission: 0,
DueinMoney: 0,
PreferPrice: 0,
InteriorNum: 0,
B2BNum: 0
},
ctlxList: [],
showChangeSales:false,
//订单编号及业务员信息
subInfo:{
CreateBy:'',
OrderId:0
},
userId:0,
};
},
methods: {
goUrlSFD: function (path, name, item) {
let obj = JSON.parse(JSON.stringify(item))
obj.oP_Remarks = ''
obj.remarksList = []
obj.refundFinanceList = []
obj.remarks = []
obj.ltName = []
obj.lineName = []
obj.financeList = []
obj.guestList = []
obj.description = []
this.$router.push({
name: path,
query: { blank: 'y', tab: name, item: JSON.stringify(obj)}
});
},
// 结束日期不能大于开始日期
dataDui() {
if (this.msg.CStartDate > this.msg.CEndDate && this.msg.CEndDate !== "") {
this.$message.error("结束日期不能大于开始日期");
this.msg.CEndDate = "";
}
},
dataDuiQ() {
if (this.msg.QStartDate > this.msg.QEndDate && this.msg.QEndDate !== "") {
this.$message.error("结束日期不能大于开始日期");
this.msg.QEndDate = "";
}
},
goUrl(name, path, id, tcmun) {
this.$router.push({
name: path,
query: {
id: id,
tcmun: tcmun,
blank: 'y',
tab: name
}
});
},
goUrlX(name, path, id, tcmun) {
this.$router.push({
name: path,
query: {
id: id,
tcmun: tcmun,
blank: 'y',
tab: name
}
});
},
linkageEmployeeMsg(node, instanceId) {
this.employeeMsg.departmentId = node.DepartmentId;
this.msg.CreateBy = "-1";
this.getEmployee();
},
getDdztList() {
this.apipost(
"sellorder_post_GetSellOrderStatusEnumList", {},
res => {
if (res.data.resultCode == 1) {
this.ddztList = res.data.data;
}
},
err => {}
);
},
getEmployee() {
this.apipost(
"app_get_company_employee",
this.employeeMsg,
res => {
if (res.data.resultCode == 1) {
this.employeeList = res.data.data;
}
},
err => {}
);
},
getLineList() {
this.apipost("line_post_GetAllList", {}, res => {
if (res.data.resultCode == 1) {
this.LineList = res.data.data;
} else {
this.$message.error(res.data.message);
}
});
},
//获取公司
getCompany() {
this.apipost('admin_get_BranchGetList', this.getCompanyMsg, res => {
if (res.data.resultCode == 1) {
this.companyList = res.data.data;
} else {}
}, err => {})
},
linkageDepartment() { //联动部门
this.msg.RB_Department_Id = null;
if(this.msg.BranchId!=0){
this.getDepartmentMsg.RB_Branch_Id = this.msg.BranchId;
}
this.getDepartment();
},
getDepartment() {
this.apipost(
"admin_Get_GetDepartmentTreeForReceiveQuery",
this.getDepartmentMsg,
res => {
if (res.data.resultCode == 1) {
this.departmentList = res.data.data;
} else {
this.Error(res.data.message);
}
},
err => {}
);
},
getList() {
this.loading = true;
this.apipost(
"sellorder_post_GetOrderList",
this.msg,
res => {
if (res.data.resultCode == 1) {
this.loading = false;
this.total = res.data.data.count;
this.list = res.data.data.pageData;
} else {
this.loading = false;
this.$message.error(res.data.message);
}
},
err => {}
);
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
},
resetPageIndex() {
this.msg.pageIndex = 1;
this.currentPage = 1;
},
// 获取参团类型
getCtlxList() {
this.apipost('sellorder_get_GetOrderJoinEnumList', {}, res => {
if (res.data.resultCode == 1) {
this.ctlxList = res.data.data
}
}, err => {})
},
//点击修改业务员
getSalerInfo(item){
this.subInfo.CreateBy = item.createBy;
this.subInfo.OrderId = item.orderId;
this.showChangeSales = true;
},
//关闭修改业务员
closeSalseDiv(){
this.showChangeSales=false;
},
goIisDetail: function (id) { // 跳转发票详情页面
this.$router.push({
name: 'invoicesManagerDetail',
query: { id: id,noDetail: 1,blank: "y",}
});
},
},
mounted() {
let userInfo = this.getLocalStorage();
this.userId = userInfo.EmployeeId;
this.getCompanyMsg.RB_Group_Id = this.getDepartmentMsg.RB_Group_Id = userInfo.RB_Group_id; //集团
this.getCompany();
this.getCtlxList()
this.getEmployee();
this.getLineList();
this.getDepartment();
this.getDdztList();
if (this.$route.query.id) {
this.msg.tempOrderId = this.$route.query.id;
}
if (this.$route.query.isOwn) {
this.isOwn = true;
this.msg.SellFormEmp = 1;
}
this.msg.CreateBy = this.$route.query.EmployeeId === undefined ? "-1" : this.$route.query.EmployeeId;
this.msg.QStartDate = this.$route.query.starTime === undefined ? "" : this.$route.query.starTime;
this.msg.QEndDate = this.$route.query.endTime === undefined ? "" : this.$route.query.endTime;
if (this.msg.QStartDate === "" && this.msg.QEndDate === "" && !this.msg.tempOrderId) {
let nowDay = new Date().toLocaleDateString();
this.msg.QStartDate = nowDay;
this.msg.QEndDate = nowDay;
}
if (this.$route.query.orderId) {
this.msg.tempOrderId = this.$route.query.orderId;
this.msg.QStartDate = "";
this.msg.QEndDate = "";
}
this.getList();
}
};
</script>
<style>
.color_red_order{
color: #e95252 !important;
}
.enrollTotalSearch {
width: 100%;
min-height: auto;
padding: 0 0 20px 0;
}
.enrollTotalSearch::after {
display: block;
clear: both;
content: "";
visibility: hidden;
height: 0;
}
.enrollTotalSearch li {
float: left;
font-size: 12px;
height: 40px;
color: #666;
margin: 20px 10px 10px 0;
}
.enrollTotalSearch li>span {
display: inline-block;
}
.enrollTotalSearch li span>em {
display: inline-block;
min-width: 60px;
text-align: right;
font-style: normal;
margin: 0 12px 0 0;
}
.enrollTotalSearch li:last-child {
float: right;
position: fixed;
top: 36px;
right: 20px;
text-align: right;
z-index: 50;
}
.enrollTotalSearchTable {
width: 100%;
font-size: 14px;
color: #333;
border-bottom: 1px solid #cccccc;
border-right: 1px solid #cccccc;
border-collapse: collapse;
}
.enrollTotalSearchTable tr {
/* border-bottom: 2px solid #333; */
}
.enrollTotalSearchTable tr th {
background: #bdbdbd;
height: 30px;
font-size: 12px;
text-align: left;
text-indent: 15px;
border-top: 1px solid #cccccc;
border-left: 1px solid #cccccc;
}
.enrollTotalSearchTable tr {
background: #fff;
text-align: left;
}
.enrollTotalSearchTable tbody tr:last-child {
border-bottom: 2px solid #333;
}
.enrollTotalSearchTable tr:first-child td:first-child {
border-bottom: 2px solid #333;
}
.enrollTotalSearchTable tr td {
height: 80px;
padding: 10px;
border-top: 1px solid #cccccc;
border-left: 1px solid #cccccc;
}
.enrollTotalSearchTable tr td>img {
width: 32px;
height: 32px;
border-radius: 16px;
vertical-align: middle;
margin-right: 5px;
}
.enrollTotalSearchTable tr td p {
line-height: 20px;
}
.groupTourOrder_count_green {
color: #1BC594;
}
.groupTourOrder_count_blue {
color: #4D7AFD;
}
.groupTourOrder_count_yellow {
color: #FF9C00;
}
.groupTourOrder_count_gray {
color: #999999;
}
.groupTourOrder_count {
margin: 0 0 20px 0;
width: 100%;
height: auto;
}
.groupTourOrder_count_col {
height: 80px;
}
.groupTourOrder_count_item {
font-weight: 400;
padding: 10px;
height: 100%;
border: 1px solid #E6E6E6;
background-color: #FFFFFF;
color: #333333;
}
.groupTourOrder_count_item>div>i {
font-size: 12px;
vertical-align: bottom;
}
.groupTourOrder_count_item>div>span:nth-child(2) {
font-size: 14px;
vertical-align: bottom;
}
.groupTourOrder_count_item>div>span:nth-child(3) {
font-weight: bold;
font-size: 16px;
vertical-align: bottom;
}
.groupTourOrder_count_item>p {
font-size: 12px;
line-height: 18px;
}
.groupTourOrder_count_item>p>span {
margin: 0 5px 0 0;
white-space: nowrap;
}
.groupTourOrder_more {
margin: 0 -12px;
}
.groupTourOrder_more>div {
width: 100%;
height: 30px;
line-height: 30px;
text-align: center;
font-size: 12px;
color: #333333;
background-color: #FFFFFF;
cursor: pointer;
}
.groupTourOrder_more>div:hover {
color: #297BEF;
background-color: #DCEBFF;
}
.groupTourOrder_remarks {
font-size: 0px;
}
.groupTourOrder_remarks>div {}
.groupTourOrder_remarks>div>div:nth-child(1) {
float: left;
display: flex;
align-items: flex-start;
}
.groupTourOrder_remarks>div>div:nth-child(1)>span {
line-height: 20px;
font-size: 12px;
color: #e95252;
white-space: nowrap;
}
.groupTourOrder_remarks>div>div:nth-child(1)>p {
line-height: 20px;
font-size: 12px;
color: #e95252;
}
.groupTourOrder_remarks>div>div:nth-child(2) {
float: right;
text-align: right;
font-size: 12px;
color: #e95252;
}
.groupTourOrder_remarks>div>div:nth-child(2)>i {
font-size: 10px;
cursor: pointer;
}
.groupTourOrder_remarks>div::after {
display: block;
clear: both;
content: "";
visibility: hidden;
height: 0;
}
.groupTourOrder_remarks_btn {
padding: 0px;
width: 12px;
height: 12px;
border: none;
background-color: transparent;
}
.groupTourOrder_remarks_btn>i {
color: #e95252;
font-size: 12px;
}
.groupTourOrder_remarks_popover>div {
display: inline-block;
font-size: 14px;
color: #000000;
}
.groupTourOrder_remarks_popover>div::before {
content: '';
display: inline-block;
margin: 0 5px 0 0;
width: 2px;
height: 12px;
background-color: #e95252;
}
.groupTourOrder_remarks_popover>span {
display: block;
margin: 0 0 0 0;
width: 100%;
text-align: center;
font-size: 12px;
color: #000000;
}
.groupTourOrder_remarks_popover>p {
margin: 5px 0 0 0;
padding: 3px;
width: 100%;
max-height: 300px;
overflow-y: auto;
font-size: 12px;
color: #000000;
}
.groupTourOrder_remarks_popover>p:nth-child(even) {
background-color: #E6E6E6;
}
.groupTourOrder_remarks_popover>p>span:nth-child(1) {
float: left;
}
.groupTourOrder_remarks_popover>p>span:nth-child(2) {
margin: 0 10px 0 0;
float: right;
}
.groupTourOrder_remarks_popover>p::after {
display: block;
clear: both;
content: "";
visibility: hidden;
height: 0;
}
/* .groupTourOrder_tickets>div>span{
margin: 0 5px 0 0;
cursor: pointer;
} */
.groupTourOrder_tickets>div>div>span {
display: inline-block;
margin: 0 10px 0 0;
}
.groupTourOrder_tickets_red {
color: #FF0000;
text-decoration: underline;
}
.groupTourOrder_tickets_blue {
color: #0000FF;
text-decoration: underline;
}
.groupTourOrder_tickets_green {
color: #008000;
text-decoration: underline;
}
.groupTourOrder_tickets_black {
color: #000000;
text-decoration: underline;
}
.groupTourOrderByTuan_ico {
margin: 0 10px 0 0;
}
.groupTourOrderByTuan_ico>i {
display: inline-block;
margin: 0 2px 0 0;
width: 8px;
height: 8px;
border-radius: 2px;
vertical-align: middle;
}
.groupTourOrderByTuan_ico>span {
vertical-align: middle;
}
.groupTourOrder_tickets>div>div {
display: table-cell;
cursor: pointer;
}
.groupTourOrder_tickets>div>div:nth-child(1) {
width: 80px;
}
.groupTourOrder_tickets>div>div>span {
display: inline-block;
margin: 0 10px 0 0;
}
</style>
src/components/systemManagement/currencyManagement.vue
View file @ a3846cf6
...@@ -161,6 +161,7 @@ ...@@ -161,6 +161,7 @@
<th>{{$t('fnc.chushihuilv')}}</th> <th>{{$t('fnc.chushihuilv')}}</th>
<th>{{$t('fnc.benqihuilv')}}</th> <th>{{$t('fnc.benqihuilv')}}</th>
<th>{{$t('fnc.danqgianhuilv')}}</th> <th>{{$t('fnc.danqgianhuilv')}}</th>
<th>上调汇率</th>
<th>{{$t('fnc.zjjiner')}}</th> <th>{{$t('fnc.zjjiner')}}</th>
<th>{{$t('system.table_operation')}}</th> <th>{{$t('system.table_operation')}}</th>
</tr> </tr>
...@@ -178,6 +179,7 @@ ...@@ -178,6 +179,7 @@
<span>{{item.CurrentRate}}</span> <span>{{item.CurrentRate}}</span>
<span :class="item.IsStandardCurrency!=1?'':'display_none'" @click="getCurrentRate(item.ID,index)" class="iconfont icon-qiehuan"></span> <span :class="item.IsStandardCurrency!=1?'':'display_none'" @click="getCurrentRate(item.ID,index)" class="iconfont icon-qiehuan"></span>
</td> </td>
<td>{{item.ExchangeRates}}</td>
<td><span class="_underline" @click="goUrl('FineBalance',item.ID,item.Name)">{{item.Money}}</span></td> <td><span class="_underline" @click="goUrl('FineBalance',item.ID,item.Name)">{{item.Money}}</span></td>
<td> <td>
<el-button-group size='mini'> <el-button-group size='mini'>
...@@ -233,6 +235,11 @@ ...@@ -233,6 +235,11 @@
<el-input v-model="addMsg.Rate" disabled class="w135"></el-input> <el-input v-model="addMsg.Rate" disabled class="w135"></el-input>
</el-form-item> </el-form-item>
</li> </li>
<li>
<el-form-item label="上调汇率" prop="ExchangeRates">
<el-input v-model="addMsg.ExchangeRates" class="w135"></el-input>
</el-form-item>
</li>
<li> <li>
<el-form-item :label="$t('fnc.sfbenweibi')+ '：'"> <el-form-item :label="$t('fnc.sfbenweibi')+ '：'">
<el-switch v-model="addMsg.IsStandardCurrency" <el-switch v-model="addMsg.IsStandardCurrency"
...@@ -246,7 +253,7 @@ ...@@ -246,7 +253,7 @@
</el-form> </el-form>
<div> <div>
<ul class="clearfix" style="text-align: right;"> <ul class="clearfix" style="text-align: right;">
<li class="_add_saveBtn"style="float: initial;" > <li class="_add_saveBtn" style="float: initial;" >
<button type="button" class="normalBtn" @click="submitForm('addMsg',1)">{{$t('pub.saveBtn')}}</button> <button type="button" class="normalBtn" @click="submitForm('addMsg',1)">{{$t('pub.saveBtn')}}</button>
<button class="hollowFixedBtn" type="button" @click="cancelEdit(),resetForm('addMsg')">{{$t('pub.cancelBtn')}}</button> <button class="hollowFixedBtn" type="button" @click="cancelEdit(),resetForm('addMsg')">{{$t('pub.cancelBtn')}}</button>
</li> </li>
...@@ -288,7 +295,7 @@ ...@@ -288,7 +295,7 @@
</el-form> </el-form>
<div> <div>
<ul class="clearfix" style="text-align: right;"> <ul class="clearfix" style="text-align: right;">
<li class="_add_saveBtn"style="float: initial;" > <li class="_add_saveBtn" style="float: initial;" >
<button type="button" class="normalBtn" @click="submitForm('SetProfitLossMsg',2)">{{$t('fnc.qrtijiao')}}</button> <button type="button" class="normalBtn" @click="submitForm('SetProfitLossMsg',2)">{{$t('fnc.qrtijiao')}}</button>
<button class="hollowFixedBtn" type="button" @click="cancelEdit(),resetForm('SetProfitLossMsg')">{{$t('pub.cancelBtn')}}</button> <button class="hollowFixedBtn" type="button" @click="cancelEdit(),resetForm('SetProfitLossMsg')">{{$t('pub.cancelBtn')}}</button>
</li> </li>
...@@ -312,7 +319,8 @@ ...@@ -312,7 +319,8 @@
Name:'', Name:'',
IsStandardCurrency:'0', IsStandardCurrency:'0',
Code:'', Code:'',
Rate:'' Rate:'',
ExchangeRates:''
}, },
SetProfitLossMsg:{ SetProfitLossMsg:{
ID:0, ID:0,
......
src/router/config.js
View file @ a3846cf6
...@@ -1996,6 +1996,14 @@ export default { ...@@ -1996,6 +1996,14 @@ export default {
title: '报名统计' title: '报名统计'
}, },
}, },
{ // 票务 联运报名统计
path: '/enrollTotalForAirUnion',
name: 'enrollTotalForAirUnion',
component: resolve => require(['@/components/SalesModule/enrollTotalForAirUnion'], resolve),
meta: {
title: '团队联运订单查询'
},
},
{ // 销售 少价管理 { // 销售 少价管理
path: '/Lowpricemanagement', path: '/Lowpricemanagement',
name: 'Lowpricemanagement', name: 'Lowpricemanagement',
......
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