Skip to content

S
SuperMan
Commit f2d21bea authored by 黄奎's avatar 黄奎
Browse files
Options

word上传修改

parent 2ae65cd6
Hide whitespace changes
Inline Side-by-side
Showing with 366 additions and 350 deletions
src/components/ShoppingStore/ShoppingReimbursement.vue
View file @ f2d21bea
...@@ -87,16 +87,19 @@ ...@@ -87,16 +87,19 @@
{{item.GuideName}} {{item.GuideName}}
</td> </td>
<td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'> <td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
<div v-for="subItem in item.CommonReport.PriceShopList">{{ subItem.ShopDetailsList!=null && subItem.ShopDetailsList.length>0? subItem.ShopDetailsList[0].ShopNum:""}}</div> <div v-for="subItem in item.CommonReport.PriceShopList">{{ subItem.ShopDetailsList!=null &&
subItem.ShopDetailsList.length>0? subItem.ShopDetailsList[0].ShopNum:""}}</div>
</td> </td>
<td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'> <td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
<div v-for="subItem in item.CommonReport.PriceShopList">{{subItem.ShopName}}</div> <div v-for="subItem in item.CommonReport.PriceShopList">{{subItem.ShopName}}</div>
</td> </td>
<td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'> <td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
<div v-for="subItem in item.CommonReport.PriceShopList">{{ subItem.ShopDetailsList!=null && subItem.ShopDetailsList.length>0? subItem.ShopDetailsList[0].EnterTimeStr:""}}</div> <div v-for="subItem in item.CommonReport.PriceShopList">{{ subItem.ShopDetailsList!=null &&
subItem.ShopDetailsList.length>0? subItem.ShopDetailsList[0].EnterTimeStr:""}}</div>
</td> </td>
<td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'> <td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
<div v-for="subItem in item.CommonReport.PriceShopList">{{subItem.ShopDetailsList!=null && subItem.ShopDetailsList.length>0? subItem.ShopDetailsList[0].EnterNum:""}}</div> <div v-for="subItem in item.CommonReport.PriceShopList">{{subItem.ShopDetailsList!=null &&
subItem.ShopDetailsList.length>0? subItem.ShopDetailsList[0].EnterNum:""}}</div>
</td> </td>
<td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'> <td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
<template v-for="subItem in item.CommonReport.PriceShopList"> <template v-for="subItem in item.CommonReport.PriceShopList">
...@@ -110,12 +113,13 @@ ...@@ -110,12 +113,13 @@
</td> </td>
<td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'> <td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
<!--佣金领取状况--> <!--佣金领取状况-->
<div v-for="subItem in item.CommonReport.PriceShopList">{{subItem.ShopDetailsList!=null && subItem.ShopDetailsList.length>0? subItem.ShopDetailsList[0].CommissionStatusStr:""}}</div> <div v-for="subItem in item.CommonReport.PriceShopList">{{subItem.ShopDetailsList!=null &&
subItem.ShopDetailsList.length>0? subItem.ShopDetailsList[0].CommissionStatusStr:""}}</div>
</td> </td>
<td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'> <td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
<!--凭证上传--> <!--凭证上传-->
<div v-for="subItem in item.CommonReport.PriceShopList" v-if="subItem.ShopDetailsList!=null && subItem.ShopDetailsList.length>0"> <div v-for="subItem in item.CommonReport.PriceShopList" v-if="subItem.ShopDetailsList!=null && subItem.ShopDetailsList.length>0">
<p v-for="(img, imgIndex) in subItem.ShopDetailsList[0].imgList" title="点击下载" @click="downLoadPZ(img)" <p v-for="(img, imgIndex) in subItem.ShopDetailsList[0].imgList" title="点击下载" @click="downLoadPZ(img)"
v-if="img !== ''" style="cursor: pointer;">{{ '凭证' + (imgIndex + 1)}}</p> v-if="img !== ''" style="cursor: pointer;">{{ '凭证' + (imgIndex + 1)}}</p>
</div> </div>
</td> </td>
...@@ -127,7 +131,8 @@ ...@@ -127,7 +131,8 @@
</td> </td>
<td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'> <td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
<!--导游佣金调整--> <!--导游佣金调整-->
<div v-for="subItem in item.CommonReport.PriceShopList">{{subItem.ShopDetailsList!=null && subItem.ShopDetailsList.length>0? subItem.ShopDetailsList[0].GuideCommission:""}}</div> <div v-for="subItem in item.CommonReport.PriceShopList">{{subItem.ShopDetailsList!=null &&
subItem.ShopDetailsList.length>0? subItem.ShopDetailsList[0].GuideCommission:""}}</div>
</td> </td>
<td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'> <td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
<template v-for="subItem in item.CommonReport.PriceShopList"> <template v-for="subItem in item.CommonReport.PriceShopList">
...@@ -137,15 +142,18 @@ ...@@ -137,15 +142,18 @@
</td> </td>
<td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'> <td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
<!--其余扣除(返佣余额)--> <!--其余扣除(返佣余额)-->
<div v-for="subItem in item.CommonReport.PriceShopList">{{subItem.ShopDetailsList!=null && subItem.ShopDetailsList.length>0? subItem.ShopDetailsList[0].OtherDeduct:""}}</div> <div v-for="subItem in item.CommonReport.PriceShopList">{{subItem.ShopDetailsList!=null &&
subItem.ShopDetailsList.length>0? subItem.ShopDetailsList[0].OtherDeduct:""}}</div>
</td> </td>
<td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'> <td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
<!--返佣总计(返佣余额)--> <!--返佣总计(返佣余额)-->
<div v-for="subItem in item.CommonReport.PriceShopList">{{subItem.ShopDetailsList!=null && subItem.ShopDetailsList.length>0? subItem.ShopDetailsList[0].BackTotalMoney:""}}</div> <div v-for="subItem in item.CommonReport.PriceShopList">{{subItem.ShopDetailsList!=null &&
subItem.ShopDetailsList.length>0? subItem.ShopDetailsList[0].BackTotalMoney:""}}</div>
</td> </td>
<td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'> <td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
<!--汇率--> <!--汇率-->
<div v-for="subItem in item.CommonReport.PriceShopList">{{subItem.ShopDetailsList!=null && subItem.ShopDetailsList.length>0? subItem.ShopDetailsList[0].DMCRate:""}}</div> <div v-for="subItem in item.CommonReport.PriceShopList">{{subItem.ShopDetailsList!=null &&
subItem.ShopDetailsList.length>0? subItem.ShopDetailsList[0].DMCRate:""}}</div>
</td> </td>
<td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'> <td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
<!--地接OP凭证--> <!--地接OP凭证-->
...@@ -154,8 +162,8 @@ ...@@ -154,8 +162,8 @@
v-if="img !== ''" style="cursor: pointer;">{{ '凭证' + (imgIndex + 1)}}</p> v-if="img !== ''" style="cursor: pointer;">{{ '凭证' + (imgIndex + 1)}}</p>
</div> </div>
</td> </td>
<td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0' > <td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
<template v-for="subItem in item.CommonReport.PriceShopList" > <template v-for="subItem in item.CommonReport.PriceShopList">
<div> <div>
<!--subItem.ShopDetailsList--> <!--subItem.ShopDetailsList-->
<p style="cursor: pointer;color:blue;" @click="CreateBill(subItem.ShopDetailsList,outItem.StaticsReportList)">生成单据</p> <p style="cursor: pointer;color:blue;" @click="CreateBill(subItem.ShopDetailsList,outItem.StaticsReportList)">生成单据</p>
...@@ -313,31 +321,35 @@ ...@@ -313,31 +321,35 @@
}, },
//生成单据 //生成单据
CreateBill(ShopDetailsList, outItem) { CreateBill(ShopDetailsList, outItem) {
this.loading = true; var that = this;
var array = []; this.Confirm('是否生成财务单据？', function () {
outItem.forEach(subItem => { that.loading = true;
var obj = { var array = [];
LeaderId: subItem.LeaderId != null ? subItem.LeaderId : 0, outItem.forEach(subItem => {
LeaderName: subItem.LeaderName != null ? subItem.LeaderName : "", var obj = {
TCID: subItem.TCID, LeaderId: subItem.LeaderId != null ? subItem.LeaderId : 0,
GuideId: subItem.GuideId != null ? subItem.GuideId : 0, LeaderName: subItem.LeaderName != null ? subItem.LeaderName : "",
GuideName: subItem.GuideName != null ? subItem.GuideName : "", TCID: subItem.TCID,
TCNUM: subItem.TCNUMS, GuideId: subItem.GuideId != null ? subItem.GuideId : 0,
} GuideName: subItem.GuideName != null ? subItem.GuideName : "",
array.push(obj) TCNUM: subItem.TCNUMS,
}
array.push(obj)
});
var billMsg = {
ShopDetailsList: ShopDetailsList,
LeaderGuide: array
};
that.apipost('dmcstatistics_post_ShopCreateBill', billMsg, res => {
that.loading = false;
if (res.data.resultCode == 1) {
that.Success(res.data.message);
} else {
that.Error(res.data.message);
}
}, err => {})
}); });
var billMsg = {
ShopDetailsList: ShopDetailsList,
LeaderGuide: array
};
this.apipost('dmcstatistics_post_ShopCreateBill', billMsg, res => {
this.loading = false;
if (res.data.resultCode == 1) {
this.Success(res.data.message);
} else {
this.$message.error(res.data.message)
}
}, err => {})
}, },
}, },
mounted() { mounted() {
......
src/components/ShoppingStore/ShoppingStore.vue
View file @ f2d21bea
...@@ -577,55 +577,55 @@ ...@@ -577,55 +577,55 @@
<div class="btmAddStore" :class="{'fillShow':fillShow}"> <div class="btmAddStore" :class="{'fillShow':fillShow}">
<div class="btmTitle">导入营销数据<span class="litTip">(红色边框代表未匹配到的数据)</span></div> <div class="btmTitle">导入营销数据<span class="litTip">(红色边框代表未匹配到的数据)</span></div>
<div style="height:250px;overflow-y: auto;"> <div style="height:250px;overflow-y: auto;">
<table class="impoTable" style="border-spacing: 0px 1px;"> <table class="impoTable" style="border-spacing: 0px 1px;" v-loading="tabLoading">
<thead> <thead>
<tr> <tr>
<th width="200">团号</th> <th width="200">团号</th>
<th>店名</th> <th>店名</th>
<th>进店时间</th> <th>进店时间</th>
<th>导游名称</th> <th>导游名称</th>
<th>领队名称</th> <th>领队名称</th>
<th>购物总额</th> <th>购物总额</th>
<th>组团社提成</th> <th>组团社提成</th>
<th>领队提成</th> <th>领队提成</th>
<th>导游提成</th> <th>导游提成</th>
<th>汇率</th> <th>汇率</th>
<th>币种</th> <th>币种</th>
<th>操作</th> <th>操作</th>
</tr> </tr>
<tr v-for="(item,index) in importData" :key="item.subCode"> <tr v-for="(item,index) in importData" :key="item.subCode">
<td :class="{'redType':item.TCIDExist==-1}"> <td :class="{'redType':item.TCIDExist==-1}">
<el-input v-model="item.TCNUM" class="w150"></el-input> <el-input v-model="item.TCNUM" class="w150"></el-input>
</td> </td>
<td :class="{'redType':item.ShoppingNameExist==-1}"> <td :class="{'redType':item.ShoppingNameExist==-1}">
<el-select clearable class="w150" v-model='item.ShoppingID' filterable :placeholder="$t('hotel.hotel_area')"> <el-select clearable class="w150" v-model='item.ShoppingID' filterable :placeholder="$t('hotel.hotel_area')">
<el-option v-for='item in getShop' :key="item.ID" :label="item.Name" :value="item.ID"> <el-option v-for='item in getShop' :key="item.ID" :label="item.Name" :value="item.ID">
</el-option> </el-option>
</el-select> </el-select>
</td> </td>
<td>{{item.EnterTime}}</td> <td>{{item.EnterTime}}</td>
<td :class="{'redType':item.GuideExist==-1}"> <td :class="{'redType':item.GuideExist==-1}">
<el-select clearable class="w150" v-model='item.GuideID' filterable :placeholder="$t('hotel.hotel_area')"> <el-select clearable class="w150" v-model='item.GuideID' filterable :placeholder="$t('hotel.hotel_area')">
<el-option v-for='item in guidList' :key="item.ID" :label="item.Name" :value="item.ID"> <el-option v-for='item in guidList' :key="item.ID" :label="item.Name" :value="item.ID">
</el-option> </el-option>
</el-select> </el-select>
</td> </td>
<td :class="{'redType':item.LeaderName==-1}"> <td :class="{'redType':item.LeaderName==-1}">
<el-select clearable class="w150" v-model='item.LeaderID' filterable :placeholder="$t('hotel.hotel_area')"> <el-select clearable class="w150" v-model='item.LeaderID' filterable :placeholder="$t('hotel.hotel_area')">
<el-option v-for='item in leaderList' :key="item.ID" :label="item.Name" :value="item.ID"> <el-option v-for='item in leaderList' :key="item.ID" :label="item.Name" :value="item.ID">
</el-option> </el-option>
</el-select> </el-select>
</td> </td>
<td>{{item.NowTotalPrice}}({{item.TotalPrice}}*{{item.Rate}})</td> <td>{{item.TotalPrice}}</td>
<td>{{item.NowGroupExtract}}({{item.GroupExtract}}*{{item.Rate}})</td> <td>{{item.GroupExtract}}</td>
<td>{{item.NowLeaderExtract}}({{item.LeaderExtract}}*{{item.Rate}})</td> <td>{{item.LeaderExtract}}</td>
<td>{{item.NowGuideExtract}}({{item.GuideExtract}}*{{item.Rate}})</td> <td>{{item.GuideExtract}}</td>
<td>{{item.Rate}}</td> <td>{{item.Rate}}</td>
<td :class="{'redType':item.CurrencyExist==-1}">{{item.Currency}}</td> <td :class="{'redType':item.CurrencyExist==-1}">{{item.Currency}}</td>
<td><span class="delInfo" @click="delInfo(index)">删除</span></td> <td><span class="delInfo" @click="delInfo(index)">删除</span></td>
</tr> </tr>
</thead> </thead>
</table> </table>
</div> </div>
<div class="btmBtn impotBtn"> <div class="btmBtn impotBtn">
<input type="button" class="normalBtn" @click="importInfo" value="确认导入" /> <input type="button" class="normalBtn" @click="importInfo" value="确认导入" />
...@@ -690,6 +690,8 @@ ...@@ -690,6 +690,8 @@
AddMsgProvinceList: [], AddMsgProvinceList: [],
//城市列表 //城市列表
AddMsgCityList: [], AddMsgCityList: [],
//表格Loading
tabLoading:false,
msg: { msg: {
pageIndex: 1, pageIndex: 1,
pageSize: 14, pageSize: 14,
...@@ -751,7 +753,6 @@ ...@@ -751,7 +753,6 @@
var imgUrl = this.domainManager().AliUrl + str; var imgUrl = this.domainManager().AliUrl + str;
this.imgArray.push(imgUrl); this.imgArray.push(imgUrl);
this.PicPathArray.push(str); this.PicPathArray.push(str);
// this.updatePic();
}); });
}, },
//更新购物店图片 //更新购物店图片
...@@ -773,7 +774,6 @@ ...@@ -773,7 +774,6 @@
delImg(index) { delImg(index) {
this.PicPathArray.splice(index, 1); this.PicPathArray.splice(index, 1);
this.imgArray.splice(index, 1); this.imgArray.splice(index, 1);
// this.updatePic();
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
this.msg.pageIndex = val; this.msg.pageIndex = val;
...@@ -931,7 +931,6 @@ ...@@ -931,7 +931,6 @@
this.addMsg.BusinessHours = ""; this.addMsg.BusinessHours = "";
} }
this.addMsg.PicPath = this.PicPathArray.toString(); this.addMsg.PicPath = this.PicPathArray.toString();
// console.log("addMsg",this.addMsg);
this.apipost( this.apipost(
"Shopping_Post_Set", "Shopping_Post_Set",
this.addMsg, this.addMsg,
...@@ -953,7 +952,7 @@ ...@@ -953,7 +952,7 @@
ID: ID ID: ID
}; };
this.imgArray = []; this.imgArray = [];
this.PicPathArray=[]; this.PicPathArray = [];
this.titleInfo = "修改购物店"; this.titleInfo = "修改购物店";
this.apipost( this.apipost(
"Shopping_Post_Get", "Shopping_Post_Get",
...@@ -1051,35 +1050,35 @@ ...@@ -1051,35 +1050,35 @@
this.importData[index].infoShow = true; this.importData[index].infoShow = true;
}, },
delInfo(index) { delInfo(index) {
this.$confirm("是否删除?", "提示", { var that = this;
confirmButtonText: "确定", this.Confirm('是否删除？删除后将不能恢复', function () {
cancelButtonText: "取消", that.Success("删除成功!");
type: "warning" that.importData.splice(index, 1);
}) });
.then(() => {
this.Success("删除成功!");
this.importData.splice(index, 1);
})
.catch(() => {
this.Info("已取消删除");
});
}, },
//导入数据
importInfo() { importInfo() {
let msg = this.importData; var that = this;
this.apipost( this.Confirm('是否导入此数据？', function () {
"ShoppingInfo_Post_Set", that.tabLoading = true;
msg, let msg = that.importData;
res => { that.apipost(
if (res.data.resultCode == 1) { "ShoppingInfo_Post_Set",
this.fillShow = false; msg,
this.Success("导入成功"); res => {
this.getList(); that.tabLoading = false;
} else { if (res.data.resultCode == 1) {
this.Error(res.data.message); that.fillShow = false;
} that.Success("导入成功");
}, that.getList();
err => {} } else {
); that.Error(res.data.message);
}
},
err => {}
);
});
}, },
getDownList() { getDownList() {
let msg = {}; let msg = {};
...@@ -1110,30 +1109,23 @@ ...@@ -1110,30 +1109,23 @@
// this.addMsg.Address = msg.address; // this.addMsg.Address = msg.address;
}, },
delShoppingStore(ID) { delShoppingStore(ID) {
this.$confirm("是否删除?", "提示", { var that = this;
confirmButtonText: "确定", this.Confirm('是否删除？删除后将不能恢复', function () {
cancelButtonText: "取消", that.Success("删除成功!");
type: "warning" var msg = {
}) ID: ID
.then(() => { };
this.Success("删除成功!"); that.apipost(
var msg = { "Shopping_Post_Remove",
ID: ID msg,
}; res => {
this.apipost( if (res.data.resultCode == 1) {
"Shopping_Post_Remove", that.getList();
msg, }
res => { },
if (res.data.resultCode == 1) { null
this.getList(); );
} });
},
null
);
})
.catch(() => {
this.Info("已取消删除!");
});
} }
}, },
mounted() { mounted() {
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ f2d21bea
...@@ -63,29 +63,24 @@ ...@@ -63,29 +63,24 @@
<!--v-if="queryCommonData.IsParentCompany==1"--> <!--v-if="queryCommonData.IsParentCompany==1"-->
<div class="TC_companyList"> <div class="TC_companyList">
<span :class="{'TC_checked':queryCommonData.checkCompanyAll}" @click="getCompanyCheckAll()">全部</span> <span :class="{'TC_checked':queryCommonData.checkCompanyAll}" @click="getCompanyCheckAll()">全部</span>
<span v-for="(item,bindex) in queryCommonData.BranchList" :class="{'TC_checked':item.isShow}" <span v-for="(item,bindex) in queryCommonData.BranchList" :class="{'TC_checked':item.isShow}" @click="getCompanyCheck(item)">{{item.BName}}</span>
@click="getCompanyCheck(item)">{{item.BName}}</span>
</div> </div>
<ul> <ul>
<li> <li>
<span> <span>
<em>所属线路</em> <em>所属线路</em>
<el-select class="w150" v-model="queryMsg.LineId" filterable :placeholder="$t('pub.pleaseSel')" <el-select class="w150" v-model="queryMsg.LineId" filterable :placeholder="$t('pub.pleaseSel')" @change="getLinePlaceList()">
@change="getLinePlaceList()">
<el-option :label="$t('pub.unlimitedSel')" :value="queryCommonData.SelectDefaultValue"></el-option> <el-option :label="$t('pub.unlimitedSel')" :value="queryCommonData.SelectDefaultValue"></el-option>
<el-option v-for="item in queryCommonData.LineList" :label="item.LineName" :value="item.LineID" <el-option v-for="item in queryCommonData.LineList" :label="item.LineName" :value="item.LineID" :key="item.LineID"></el-option>
:key="item.LineID"></el-option>
</el-select> </el-select>
</span> </span>
</li> </li>
<li> <li>
<span> <span>
<em>国别/目的地</em> <em>国别/目的地</em>
<el-select class="w150" v-model="queryMsg.PlaceID" filterable :placeholder="$t('pub.pleaseSel')" <el-select class="w150" v-model="queryMsg.PlaceID" filterable :placeholder="$t('pub.pleaseSel')" @change="getLineTeamList()">
@change="getLineTeamList()">
<el-option :label="$t('pub.unlimitedSel')" :value="queryCommonData.SelectDefaultValue"></el-option> <el-option :label="$t('pub.unlimitedSel')" :value="queryCommonData.SelectDefaultValue"></el-option>
<el-option v-for="item in queryCommonData.PlaceList" :label="item.PlaceName" :value="item.PlaceID" <el-option v-for="item in queryCommonData.PlaceList" :label="item.PlaceName" :value="item.PlaceID" :key="item.LtID"></el-option>
:key="item.LtID"></el-option>
</el-select> </el-select>
</span> </span>
</li> </li>
...@@ -94,36 +89,31 @@ ...@@ -94,36 +89,31 @@
<em>系列名称</em> <em>系列名称</em>
<el-select class="w150" v-model="queryMsg.LineteamId" filterable :placeholder="$t('pub.pleaseSel')"> <el-select class="w150" v-model="queryMsg.LineteamId" filterable :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" :value="queryCommonData.SelectDefaultValue"></el-option> <el-option :label="$t('pub.unlimitedSel')" :value="queryCommonData.SelectDefaultValue"></el-option>
<el-option v-for="item in queryCommonData.LineTeamList" :label="item.LtName" :value="item.LtID" <el-option v-for="item in queryCommonData.LineTeamList" :label="item.LtName" :value="item.LtID" :key="item.LtID"></el-option>
:key="item.LtID"></el-option>
</el-select> </el-select>
</span> </span>
</li> </li>
<li> <li>
<span> <span>
<em>团号</em> <em>团号</em>
<el-input maxlength="50" v-model="queryMsg.TCNUM" class="permiss-input w150" <el-input maxlength="50" v-model="queryMsg.TCNUM" class="permiss-input w150" @keyup.native.enter="getControlList"
@keyup.native.enter="getControlList" :placeholder="$t('pub.pleaseImport')"></el-input>
:placeholder="$t('pub.pleaseImport')"></el-input>
</span> </span>
</li> </li>
<li style="display:none;"> <li style="display:none;">
<span> <span>
<em>编号</em> <em>编号</em>
<el-input maxlength="50" v-model="queryMsg.TCID" class="permiss-input w150" <el-input maxlength="50" v-model="queryMsg.TCID" class="permiss-input w150" @keyup.native.enter="getControlList"
@keyup.native.enter="getControlList" :placeholder="$t('pub.pleaseImport')"></el-input>
:placeholder="$t('pub.pleaseImport')"></el-input>
</span> </span>
</li> </li>
<li> <li>
<span> <span>
<em>发团日期</em> <em>发团日期</em>
<el-date-picker class="w150" type="date" v-model="queryMsg.StartGroupDate" <el-date-picker class="w150" type="date" v-model="queryMsg.StartGroupDate" :picker-options="pickerBeginDateBefore"
:picker-options="pickerBeginDateBefore" value-format="yyyy-MM-dd" placeholder></el-date-picker>
value-format="yyyy-MM-dd" placeholder></el-date-picker> <el-date-picker class="w150" type="date" v-model="queryMsg.EndGroupDate" :picker-options="pickerBeginDateAfter"
<el-date-picker class="w150" type="date" v-model="queryMsg.EndGroupDate" value-format="yyyy-MM-dd" placeholder></el-date-picker>
:picker-options="pickerBeginDateAfter"
value-format="yyyy-MM-dd" placeholder></el-date-picker>
</span> </span>
</li> </li>
<li class="advancedLi" style="height:34px;"> <li class="advancedLi" style="height:34px;">
...@@ -134,74 +124,61 @@ ...@@ -134,74 +124,61 @@
<div class="TC_leftSearch"> <div class="TC_leftSearch">
<div> <div>
<span>航空公司</span> <span>航空公司</span>
<el-select v-model="queryMsg.AirTicketId" filterable :placeholder="$t('system.ph_buxian')" <el-select v-model="queryMsg.AirTicketId" filterable :placeholder="$t('system.ph_buxian')" class="w150">
class="w150"> <el-option :label="$t('system.ph_buxian')" :value="queryCommonData.SelectDefaultValue"></el-option>
<el-option :label="$t('system.ph_buxian')" <el-option v-for="item in queryCommonData.AirlineList" :key="item.AirLineId" :label="item.AlName"
:value="queryCommonData.SelectDefaultValue"></el-option> :value="item.AirLineId"></el-option>
<el-option v-for="item in queryCommonData.AirlineList" :key="item.AirLineId"
:label="item.AlName"
:value="item.AirLineId"></el-option>
</el-select> </el-select>
</div> </div>
<div> <div>
<span>操作人员</span> <span>操作人员</span>
<el-select class="w150" v-model="queryMsg.CreateBy" filterable :placeholder="$t('pub.pleaseSel')"> <el-select class="w150" v-model="queryMsg.CreateBy" filterable :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" <el-option :label="$t('pub.unlimitedSel')" :value="queryCommonData.SelectDefaultValue"></el-option>
:value="queryCommonData.SelectDefaultValue"></el-option> <el-option v-for="item in queryCommonData.EmployeeList" :label="item.EmName" :value="item.EmployeeId"
<el-option v-for="item in queryCommonData.EmployeeList" :label="item.EmName" :key="item.EmployeeId"></el-option>
:value="item.EmployeeId"
:key="item.EmployeeId"></el-option>
</el-select> </el-select>
</div> </div>
<div> <div>
<span>行程天数</span> <span>行程天数</span>
<el-input maxlength="50" v-model="queryMsg.DayNum" @keyup.native="checkInteger(queryMsg,'DayNum')" <el-input maxlength="50" v-model="queryMsg.DayNum" @keyup.native="checkInteger(queryMsg,'DayNum')"
class="w150" :placeholder="$t('pub.pleaseImport')"></el-input> class="w150" :placeholder="$t('pub.pleaseImport')"></el-input>
</div> </div>
<div> <div>
<span>联运城市</span> <span>联运城市</span>
<el-select class="w150" filterable v-model="queryMsg.UnionCityId" <el-select class="w150" filterable v-model="queryMsg.UnionCityId" :placeholder="$t('pub.pleaseSel')">
:placeholder="$t('pub.pleaseSel')"> <el-option :label="$t('pub.unlimitedSel')" :value="queryCommonData.SelectDefaultValue"></el-option>
<el-option :label="$t('pub.unlimitedSel')" <el-option v-for="item in queryCommonData.CityList" :label="item.Name" :value="item.ID" :key="item.ID"></el-option>
:value="queryCommonData.SelectDefaultValue"></el-option>
<el-option v-for="item in queryCommonData.CityList" :label="item.Name" :value="item.ID"
:key="item.ID"></el-option>
</el-select> </el-select>
</div> </div>
</div> </div>
<div class="TC_rightSearch"> <div class="TC_rightSearch">
<div> <div>
<span>团队人数</span> <span>团队人数</span>
<el-input maxlength="50" class="w80" v-model="queryMsg.TeamMinNum" <el-input maxlength="50" class="w80" v-model="queryMsg.TeamMinNum" @keyup.native="checkInteger(queryMsg,'TeamMinNum')"
@keyup.native="checkInteger(queryMsg,'TeamMinNum')" :placeholder="$t('pub.pleaseImport')"></el-input>
:placeholder="$t('pub.pleaseImport')"></el-input>
- -
<el-input maxlength="50" class="w80" v-model="queryMsg.TeamMaxNum" <el-input maxlength="50" class="w80" v-model="queryMsg.TeamMaxNum" @keyup.native="checkInteger(queryMsg,'TeamMaxNum')"
@keyup.native="checkInteger(queryMsg,'TeamMaxNum')" @blur="checkTeamNum(queryMsg)" :placeholder="$t('pub.pleaseImport')"></el-input>
@blur="checkTeamNum(queryMsg)" :placeholder="$t('pub.pleaseImport')"></el-input>
</div> </div>
<div> <div>
<span>报名人数</span> <span>报名人数</span>
<el-input maxlength="50" class="w80" v-model="queryMsg.ApplyMinNum" <el-input maxlength="50" class="w80" v-model="queryMsg.ApplyMinNum" @keyup.native="checkInteger(queryMsg,'ApplyMinNum')"
@keyup.native="checkInteger(queryMsg,'ApplyMinNum')" :placeholder="$t('pub.pleaseImport')"></el-input>
:placeholder="$t('pub.pleaseImport')"></el-input>
- -
<el-input maxlength="50" class="w80" v-model="queryMsg.ApplyMaxNum" <el-input maxlength="50" class="w80" v-model="queryMsg.ApplyMaxNum" @keyup.native="checkInteger(queryMsg,'ApplyMaxNum')"
@keyup.native="checkInteger(queryMsg,'ApplyMaxNum')" @blur="checkTeamNum(queryMsg)" :placeholder="$t('pub.pleaseImport')"></el-input>
@blur="checkTeamNum(queryMsg)" :placeholder="$t('pub.pleaseImport')"></el-input>
</div> </div>
<div class="OnlyShowOverTeam"> <div class="OnlyShowOverTeam">
<span>只看报超团</span> <span>只看报超团</span>
<el-switch v-model="queryMsg.OnlyShowOverTeam" active-value="true" <el-switch v-model="queryMsg.OnlyShowOverTeam" active-value="true" inactive-value="false"></el-switch>
inactive-value="false"></el-switch>
</div> </div>
<div> <div>
<span>销售公司</span> <span>销售公司</span>
<el-select class="w180 multiple_input" :class="{'SaleBranchList':queryMsg.SaleBranchId==''}" <el-select class="w180 multiple_input" :class="{'SaleBranchList':queryMsg.SaleBranchId==''}"
v-model="queryMsg.SaleBranchId" multiple> v-model="queryMsg.SaleBranchId" multiple>
<el-option v-for="item in queryCommonData.companyList" :key="item.id" :label="item.bName" <el-option v-for="item in queryCommonData.companyList" :key="item.id" :label="item.bName"
:value="item.id"></el-option> :value="item.id"></el-option>
</el-select> </el-select>
</div> </div>
</div> </div>
...@@ -211,8 +188,7 @@ ...@@ -211,8 +188,7 @@
<span> <span>
<el-checkbox v-model="queryCommonData.checkTCStateAll" @change="checkAllTeam">全选</el-checkbox> <el-checkbox v-model="queryCommonData.checkTCStateAll" @change="checkAllTeam">全选</el-checkbox>
<el-checkbox-group v-model="queryMsg.TCState" @change="checkedTeamList"> <el-checkbox-group v-model="queryMsg.TCState" @change="checkedTeamList">
<el-checkbox v-for="team in $tripUtils.TeamStatesList.TeamStates" :label="team.Id" <el-checkbox v-for="team in $tripUtils.TeamStatesList.TeamStates" :label="team.Id" :key="team.Name">{{team.Name}}</el-checkbox>
:key="team.Name">{{team.Name}}</el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</span> </span>
</div> </div>
...@@ -222,8 +198,7 @@ ...@@ -222,8 +198,7 @@
<span> <span>
<el-checkbox v-model="queryCommonData.checkPlatForm" @change="checkAllSales">全选</el-checkbox> <el-checkbox v-model="queryCommonData.checkPlatForm" @change="checkAllSales">全选</el-checkbox>
<el-checkbox-group v-model="queryMsg.SalePlat" @change="checkSales"> <el-checkbox-group v-model="queryMsg.SalePlat" @change="checkSales">
<el-checkbox v-for="sales in $tripUtils.TeamStatesList.salsPlat" :label="sales.Id" <el-checkbox v-for="sales in $tripUtils.TeamStatesList.salsPlat" :label="sales.Id" :key="sales.Name">{{sales.Name}}</el-checkbox>
:key="sales.Name">{{sales.Name}}</el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</span> </span>
</div> </div>
...@@ -232,8 +207,7 @@ ...@@ -232,8 +207,7 @@
<span> <span>
<el-checkbox v-model="queryCommonData.checkGroupALL" @change="checkGroupAll">全选</el-checkbox> <el-checkbox v-model="queryCommonData.checkGroupALL" @change="checkGroupAll">全选</el-checkbox>
<el-checkbox-group v-model="queryMsg.GroupState" @change="checkGroup"> <el-checkbox-group v-model="queryMsg.GroupState" @change="checkGroup">
<el-checkbox v-for="state in $tripUtils.TeamStatesList.teamDateStates" :label="state.Id" <el-checkbox v-for="state in $tripUtils.TeamStatesList.teamDateStates" :label="state.Id" :key="state.Name">{{state.Name}}</el-checkbox>
:key="state.Name">{{state.Name}}</el-checkbox>
</el-checkbox-group> </el-checkbox-group>
<el-checkbox v-model="queryMsg.IsWarning">预警团</el-checkbox> <el-checkbox v-model="queryMsg.IsWarning">预警团</el-checkbox>
</span> </span>
...@@ -242,9 +216,8 @@ ...@@ -242,9 +216,8 @@
<span>航班状态</span> <span>航班状态</span>
<span> <span>
<el-checkbox-group v-model="queryCommonData.flightCKed" style="margin-left:0;"> <el-checkbox-group v-model="queryCommonData.flightCKed" style="margin-left:0;">
<el-checkbox v-for="state in flightStatus" :label="state.Id" :checked="state.Checked" <el-checkbox v-for="state in flightStatus" :label="state.Id" :checked="state.Checked" @change="checkedFlight(state)"
@change="checkedFlight(state)" :key="state.Name">{{state.Name}}</el-checkbox>
:key="state.Name">{{state.Name}}</el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</span> </span>
</div> </div>
...@@ -257,8 +230,7 @@ ...@@ -257,8 +230,7 @@
</el-select> </el-select>
</span> </span>
</div> </div>
<button class="normalBtn TC_SearchBtn" <button class="normalBtn TC_SearchBtn" @click="resetPageIndex(),getControlList(),queryCommonData.showHigradeSearch=false">查询
@click="resetPageIndex(),getControlList(),queryCommonData.showHigradeSearch=false">查询
</button> </button>
</div> </div>
<span class="advancedQuery" slot="reference">高级查询 <span class="advancedQuery" slot="reference">高级查询
...@@ -274,8 +246,7 @@ ...@@ -274,8 +246,7 @@
<div class="TC_leftSearch"> <div class="TC_leftSearch">
<div> <div>
<span style="display:inline-block;margin: 0 5px 0 0;width:50px;text-align:right;">报名人数</span> <span style="display:inline-block;margin: 0 5px 0 0;width:50px;text-align:right;">报名人数</span>
<el-select v-model="queryMsg.WarningQuery" filterable :placeholder="$t('system.ph_buxian')" <el-select v-model="queryMsg.WarningQuery" filterable :placeholder="$t('system.ph_buxian')" class="w150">
class="w150">
<el-option :label="$t('system.ph_buxian')" value="-1"></el-option> <el-option :label="$t('system.ph_buxian')" value="-1"></el-option>
<el-option label="尚未有人报名" value="1"></el-option> <el-option label="尚未有人报名" value="1"></el-option>
<el-option label="10人以下" value="2"></el-option> <el-option label="10人以下" value="2"></el-option>
...@@ -286,8 +257,7 @@ ...@@ -286,8 +257,7 @@
</div> </div>
<div> <div>
<span style="display:inline-block;margin: 0 5px 0 0;width:50px;text-align:right;">天数选择</span> <span style="display:inline-block;margin: 0 5px 0 0;width:50px;text-align:right;">天数选择</span>
<el-select v-model="queryMsg.RateOnDay" filterable :placeholder="$t('system.ph_buxian')" <el-select v-model="queryMsg.RateOnDay" filterable :placeholder="$t('system.ph_buxian')" class="w150">
class="w150">
<el-option :label="$t('system.ph_buxian')" value="-1"></el-option> <el-option :label="$t('system.ph_buxian')" value="-1"></el-option>
<el-option label="10天以内" value="1"></el-option> <el-option label="10天以内" value="1"></el-option>
<el-option label="15天以内" value="2"></el-option> <el-option label="15天以内" value="2"></el-option>
...@@ -297,8 +267,7 @@ ...@@ -297,8 +267,7 @@
</div> </div>
<div> <div>
<span style="display:inline-block;margin: 0 5px 0 0;width:50px;text-align:right;">上座率</span> <span style="display:inline-block;margin: 0 5px 0 0;width:50px;text-align:right;">上座率</span>
<el-select v-model="queryMsg.RateOn" filterable :placeholder="$t('system.ph_buxian')" <el-select v-model="queryMsg.RateOn" filterable :placeholder="$t('system.ph_buxian')" class="w150">
class="w150">
<el-option :label="$t('system.ph_buxian')" value="-1"></el-option> <el-option :label="$t('system.ph_buxian')" value="-1"></el-option>
<el-option label="100%" value="1"></el-option> <el-option label="100%" value="1"></el-option>
<el-option label="不足80%" value="2"></el-option> <el-option label="不足80%" value="2"></el-option>
...@@ -308,8 +277,7 @@ ...@@ -308,8 +277,7 @@
</div> </div>
</div> </div>
</div> </div>
<button class="normalBtn TC_SearchBtn" <button class="normalBtn TC_SearchBtn" @click="resetPageIndex(),getControlList(),queryCommonData.showWarningSearch=false">查询
@click="resetPageIndex(),getControlList(),queryCommonData.showWarningSearch=false">查询
</button> </button>
</div> </div>
<span class="advancedQuery" slot="reference">预警查询 <span class="advancedQuery" slot="reference">预警查询
...@@ -326,10 +294,8 @@ ...@@ -326,10 +294,8 @@
<div class="TravelTclList" v-loading="queryCommonData.loading"> <div class="TravelTclList" v-loading="queryCommonData.loading">
<ul> <ul>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="queryMsg.currentPage" <el-pagination background @current-change="handleCurrentChange" :current-page.sync="queryMsg.currentPage"
layout="total,prev, pager, next, jumper" :page-size="queryMsg.pageSize" layout="total,prev, pager, next, jumper" :page-size="queryMsg.pageSize" :total="queryMsg.total"></el-pagination>
:total="queryMsg.total"></el-pagination> <li v-for="(item,index) in queryCommonData.dataList" :key="index" :class="{'TC_hasContent':item.OPInnerRemark==''&&item.OPRemark==''}">
<li v-for="(item,index) in queryCommonData.dataList" :key="index"
:class="{'TC_hasContent':item.OPInnerRemark==''&&item.OPRemark==''}">
<div class="TC_remarkContent TC_teamName"> <div class="TC_remarkContent TC_teamName">
<div class="clearfix"> <div class="clearfix">
<div class="TCL_remarkTitle">团名：</div> <div class="TCL_remarkTitle">团名：</div>
...@@ -355,9 +321,8 @@ ...@@ -355,9 +321,8 @@
<p class="d12p">{{item.LtName}}</p> <p class="d12p">{{item.LtName}}</p>
</div> </div>
<div class="TC_TravelSalePlat clearfix"> <div class="TC_TravelSalePlat clearfix">
<span class="TC_neibu" v-if="item.TCState==3" <span class="TC_neibu" v-if="item.TCState==3" :class="{'TCneibu':plat==3,'TCb2b':plat==1,'TCb2c':plat==2,'AppPlat':plat==4,'otherPlat':plat==5}"
:class="{'TCneibu':plat==3,'TCb2b':plat==1,'TCb2c':plat==2,'AppPlat':plat==4,'otherPlat':plat==5}" v-for="plat in item.SalePlatList" :key="plat.subCode">{{$tripUtils.getPlatName(plat)}}</span>
v-for="plat in item.SalePlatList" :key="plat.subCode">{{$tripUtils.getPlatName(plat)}}</span>
<span class="TC_xiajia daiwanshan" v-if="item.TCState==1">待完善</span> <span class="TC_xiajia daiwanshan" v-if="item.TCState==1">待完善</span>
<span class="TC_xiajia" v-if="item.TCState==2">已下架</span> <span class="TC_xiajia" v-if="item.TCState==2">已下架</span>
<span class="TC_xiajia quxiao" v-if="item.TCState==4">已取消</span> <span class="TC_xiajia quxiao" v-if="item.TCState==4">已取消</span>
...@@ -382,8 +347,7 @@ ...@@ -382,8 +347,7 @@
<td class="_d_name _color_666"> <td class="_d_name _color_666">
<span v-if="fIndex==0">{{$t('Airticket.Air_go')}}</span> <span v-if="fIndex==0">{{$t('Airticket.Air_go')}}</span>
<span v-else-if="fIndex==item.flightList.length-1">{{$t('Airticket.Air_returnTrip')}}</span> <span v-else-if="fIndex==item.flightList.length-1">{{$t('Airticket.Air_returnTrip')}}</span>
<span <span v-else-if="fIndex>0 && fIndex!=item.flightList.length-1">{{$t('Airticket.Air_transit')}}</span>
v-else-if="fIndex>0 && fIndex!=item.flightList.length-1">{{$t('Airticket.Air_transit')}}</span>
</td> </td>
<td> <td>
<div>{{fItem.Flight_number}}</div> <div>{{fItem.Flight_number}}</div>
...@@ -401,8 +365,7 @@ ...@@ -401,8 +365,7 @@
</tr> </tr>
</table> </table>
<div class="FlightDiv-TCL" slot="reference"> <div class="FlightDiv-TCL" slot="reference">
<div v-for="subItem in item.flightList" slot="reference" :key="subItem.subCode" <div v-for="subItem in item.flightList" slot="reference" :key="subItem.subCode" class="TCL-flighInfoList">
class="TCL-flighInfoList">
<span class="travelnowrap"> <span class="travelnowrap">
<span class="TCL-FlightNumber">{{subItem.Flight_number}}</span> <span class="TCL-FlightNumber">{{subItem.Flight_number}}</span>
({{subItem.DIATA}}){{subItem.DepartureName}} ({{subItem.DIATA}}){{subItem.DepartureName}}
...@@ -436,6 +399,9 @@ ...@@ -436,6 +399,9 @@
<span>出团公司</span> <span>出团公司</span>
{{item.OutBranchName}} {{item.OutBranchName}}
</p> </p>
<p class="travelnowrap" v-if="item.WordPath!=''">
<a style="corsor:pointer;" :href="domainManager().ViittoFileUrl+item.WordPath">下载WORD行程</a>
</p>
</div> </div>
</div> </div>
<div class="el-col" style="width:190px;"> <div class="el-col" style="width:190px;">
...@@ -512,13 +478,12 @@ ...@@ -512,13 +478,12 @@
</p> </p>
<p> <p>
<span>当前余位</span> <span>当前余位</span>
<i>{{item.SurplusSeat=item.SurplusSeat < 0 ? 0:item.SurplusSeat}}</i></p> <i>{{item.SurplusSeat=item.SurplusSeat < 0 ? 0:item.SurplusSeat}}</i> </p> <p>
<p> <span>已报入</span>
<span>已报入</span> <i>
<i> {{item.OrderGuestNum}}
{{item.OrderGuestNum}} <span class="TCL-redType" v-if="item.OrderLeaderGuestNum>=1">+{{item.OrderLeaderGuestNum}}</span>人
<span class="TCL-redType" v-if="item.OrderLeaderGuestNum>=1">+{{item.OrderLeaderGuestNum}}</span>人 </i>
</i>
</p> </p>
<p> <p>
<span>占位</span> <span>占位</span>
...@@ -592,8 +557,7 @@ ...@@ -592,8 +557,7 @@
<span>签证资料</span> <span>签证资料</span>
</p> </p>
<p v-if="item.VisaFileList.length!==0" v-for="(item2, index2) in item.VisaFileList" :key="index2"> <p v-if="item.VisaFileList.length!==0" v-for="(item2, index2) in item.VisaFileList" :key="index2">
<span style="cursor:pointer;text-decoration: underline;" <span style="cursor:pointer;text-decoration: underline;" @click="downloadFile(item2)">{{item2.Name}}</span>
@click="downloadFile(item2)">{{item2.Name}}</span>
</p> </p>
<p> <p>
<span>个签</span> <span>个签</span>
...@@ -605,8 +569,7 @@ ...@@ -605,8 +569,7 @@
</div> </div>
<div class="el-col"> <div class="el-col">
<div class="d7"> <div class="d7">
<el-button @click.native='goUrl("RegistrationList", item.TCID,"报名清单")' type="primary" <el-button @click.native='goUrl("RegistrationList", item.TCID,"报名清单")' type="primary" style="background:#00C6FF; border-color:#00C6FF">报名清单
style="background:#00C6FF; border-color:#00C6FF">报名清单
</el-button> </el-button>
<el-dropdown trigger="click" style="margin-bottom:5px;"> <el-dropdown trigger="click" style="margin-bottom:5px;">
<span class="el-dropdown-link">修改 <span class="el-dropdown-link">修改
...@@ -620,8 +583,7 @@ ...@@ -620,8 +583,7 @@
</el-dropdown-item> </el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
<el-button @click='goUrlMake("GroupAdvertising",item.LineID,item.TCID,"团期广告")' type="primary" <el-button @click='goUrlMake("GroupAdvertising",item.LineID,item.TCID,"团期广告")' type="primary" style="background:#67c23a; border-color:#67c23a">广告&nbsp;{{item.AdvertCount}}
style="background:#67c23a; border-color:#67c23a">广告&nbsp;{{item.AdvertCount}}
</el-button> </el-button>
<el-button @click="ckOPremark(item)" type="primary" style="background:#F16C3C; border-color:#F16C3C"> <el-button @click="ckOPremark(item)" type="primary" style="background:#F16C3C; border-color:#F16C3C">
OP备注 OP备注
...@@ -635,8 +597,7 @@ ...@@ -635,8 +597,7 @@
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item @click.native="goUrlR('confirmationOrderDownLoad',item)">行程下载</el-dropdown-item> <el-dropdown-item @click.native="goUrlR('confirmationOrderDownLoad',item)">行程下载</el-dropdown-item>
<el-dropdown-item @click.native="removeTeamInfo(item.TCID)">删除</el-dropdown-item> <el-dropdown-item @click.native="removeTeamInfo(item.TCID)">删除</el-dropdown-item>
<el-dropdown-item v-if="item.TCState==2||item.TCState==0||item.TCState==1" <el-dropdown-item v-if="item.TCState==2||item.TCState==0||item.TCState==1" @click.native="setUpPlat(item)">上架
@click.native="setUpPlat(item)">上架
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item v-if="item.TCState==3" @click.native="Setshelves(item.TCID)">下架 <el-dropdown-item v-if="item.TCState==3" @click.native="Setshelves(item.TCID)">下架
</el-dropdown-item> </el-dropdown-item>
...@@ -646,6 +607,7 @@ ...@@ -646,6 +607,7 @@
<el-dropdown-item @click.native='goUrl("DistributionTransport",item.ID,"分销联运")'>分销联运 <el-dropdown-item @click.native='goUrl("DistributionTransport",item.ID,"分销联运")'>分销联运
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item @click.native='ckSellPoint(item)'>本团卖点</el-dropdown-item> <el-dropdown-item @click.native='ckSellPoint(item)'>本团卖点</el-dropdown-item>
<el-dropdown-item @click.native='ShowUploadWord(item)' style="display:none;">WORD行程</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
</div> </div>
...@@ -660,15 +622,13 @@ ...@@ -660,15 +622,13 @@
<div class="TCL_remarkTitle">OP对内备注：</div> <div class="TCL_remarkTitle">OP对内备注：</div>
<div class="TCL_Content">{{item.OPInnerRemark}}</div> <div class="TCL_Content">{{item.OPInnerRemark}}</div>
</div> </div>
<div class="clearfix TCL-redType" <div class="clearfix TCL-redType" v-if="item.DmcRemarkLast || item.HotelDiningBus.HotelChangeState>0 || item.HotelDiningBus.DiningChangeState>0 || item.HotelDiningBus.ResultBusTypeStr!='' ">
v-if="item.DmcRemarkLast || item.HotelDiningBus.HotelChangeState>0 || item.HotelDiningBus.DiningChangeState>0 || item.HotelDiningBus.ResultBusTypeStr!='' ">
<div class="TCL_remarkTitle">地接备注：</div> <div class="TCL_remarkTitle">地接备注：</div>
<div class="TCL_Content">{{item.DmcRemarkLast!=null? item.DmcRemarkLast.DMCRemark:''}} <div class="TCL_Content">{{item.DmcRemarkLast!=null? item.DmcRemarkLast.DMCRemark:''}}
<a v-if="item.HotelDiningBus.HotelChangeState>0" @click="goHotelDiningBus(item,item.HotelDiningBus,1)" <a v-if="item.HotelDiningBus.HotelChangeState>0" @click="goHotelDiningBus(item,item.HotelDiningBus,1)"
style="color:blue;cursor:pointer">酒店变更</a> style="color:blue;cursor:pointer">酒店变更</a>
<a v-if="item.HotelDiningBus.DiningChangeState>0" <a v-if="item.HotelDiningBus.DiningChangeState>0" @click="goHotelDiningBus(item,item.HotelDiningBus,2)"
@click="goHotelDiningBus(item,item.HotelDiningBus,2)" style="color:blue;cursor:pointer">餐厅变更</a>
style="color:blue;cursor:pointer">餐厅变更</a>
<a v-if="item.HotelDiningBus.ResultBusTypeStr!=''">车型:{{item.HotelDiningBus.ResultBusTypeStr}}</a> <a v-if="item.HotelDiningBus.ResultBusTypeStr!=''">车型:{{item.HotelDiningBus.ResultBusTypeStr}}</a>
</div> </div>
</div> </div>
...@@ -677,8 +637,7 @@ ...@@ -677,8 +637,7 @@
</ul> </ul>
<div class="noData" v-show="queryMsg.noData">{{$t('system.content_noData')}}</div> <div class="noData" v-show="queryMsg.noData">{{$t('system.content_noData')}}</div>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="queryMsg.currentPage" <el-pagination background @current-change="handleCurrentChange" :current-page.sync="queryMsg.currentPage"
layout="total,prev, pager, next, jumper" :page-size="queryMsg.pageSize" layout="total,prev, pager, next, jumper" :page-size="queryMsg.pageSize" :total="queryMsg.total"></el-pagination>
:total="queryMsg.total"></el-pagination>
</div> </div>
</div> </div>
...@@ -686,8 +645,7 @@ ...@@ -686,8 +645,7 @@
<div class="combottomTitle">请选择上架平台</div> <div class="combottomTitle">请选择上架平台</div>
<span class="setPlatLeft">销售平台</span> <span class="setPlatLeft">销售平台</span>
<span> <span>
<el-checkbox v-model="queryCommonData.checkDialogAll" @change="checkAllDialog" <el-checkbox v-model="queryCommonData.checkDialogAll" @change="checkAllDialog" style="margin-right:20px;">全选</el-checkbox>
style="margin-right:20px;">全选</el-checkbox>
<el-checkbox-group v-model="queryCommonData.ckedplat" @change="checkDialog"> <el-checkbox-group v-model="queryCommonData.ckedplat" @change="checkDialog">
<el-checkbox v-for="sales in $tripUtils.TeamStatesList.salsPlat" :label="sales.Id" :key="sales.Name">{{sales.Name}}</el-checkbox> <el-checkbox v-for="sales in $tripUtils.TeamStatesList.salsPlat" :label="sales.Id" :key="sales.Name">{{sales.Name}}</el-checkbox>
</el-checkbox-group> </el-checkbox-group>
...@@ -730,11 +688,22 @@ ...@@ -730,11 +688,22 @@
<button class="normalBtn" type="primary" @click="SetSellingPoints">{{$t('pub.sureBtn')}}</button> <button class="normalBtn" type="primary" @click="SetSellingPoints">{{$t('pub.sureBtn')}}</button>
</div> </div>
</div> </div>
<div class="combottomDiv OPremarkDiv" v-if="queryCommonData.UploadWORDTip" v-loading="queryCommonData.uploadLoading">
<div class="combottomTitle">上传WORD行程</div>
<el-form label-width="100px">
<el-col :span="8">
<el-upload :http-request="uploadFileBtn" :multiple="true" :show-file-list="false" action="" accept="*.doc,*.docx">
<i class="el-icon-plus avatar-uploader-icon"></i>
<div class="el-upload__text">点击上传</div>
</el-upload>
</el-col>
</el-form>
</div>
</div> </div>
</template> </template>
<script> <script>
export default { export default {
data () { data() {
return { return {
//查询数据列表 //查询数据列表
queryCommonData: { queryCommonData: {
...@@ -796,7 +765,13 @@ ...@@ -796,7 +765,13 @@
//本团卖点 //本团卖点
SellingPoints: false, SellingPoints: false,
defaultCheckValue: 0, defaultCheckValue: 0,
defaultCheckChooseValue: 1 defaultCheckChooseValue: 1,
//上传WORD提示层
UploadWORDTip: false,
//选择上传项
UploadItem: {},
//word上传提示层
uploadLoading:false,
}, },
//查询参数 //查询参数
queryMsg: { queryMsg: {
...@@ -850,10 +825,10 @@ ...@@ -850,10 +825,10 @@
ProductRecommend: '' ProductRecommend: ''
}, },
flightStatus: [{ flightStatus: [{
Id: 0, Id: 0,
Name: '不限', Name: '不限',
Checked: false Checked: false
}, },
{ {
Id: 1, Id: 1,
Name: '已配置', Name: '已配置',
...@@ -887,17 +862,17 @@ ...@@ -887,17 +862,17 @@
this.downloadFileRename(item.FullUrl.replace(reg, ''), item.Name) this.downloadFileRename(item.FullUrl.replace(reg, ''), item.Name)
}, },
//翻页 //翻页
handleCurrentChange (val) { handleCurrentChange(val) {
this.queryMsg.pageIndex = val this.queryMsg.pageIndex = val
this.getControlList() this.getControlList()
}, },
//重新查询 //重新查询
resetPageIndex () { resetPageIndex() {
this.queryMsg.pageIndex = 1 this.queryMsg.pageIndex = 1
this.queryMsg.currentPage = 1 this.queryMsg.currentPage = 1
}, },
//获取线路列表 //获取线路列表
getLineList () { getLineList() {
this.apipost('line_post_GetList', {}, res => { this.apipost('line_post_GetList', {}, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.queryCommonData.LineList = res.data.data this.queryCommonData.LineList = res.data.data
...@@ -907,7 +882,7 @@ ...@@ -907,7 +882,7 @@
}) })
}, },
//获取目的地列表 //获取目的地列表
getLinePlaceList () { getLinePlaceList() {
this.queryMsg.PlaceID = 0 this.queryMsg.PlaceID = 0
let msg = { let msg = {
lineID: this.queryMsg.LineId, lineID: this.queryMsg.LineId,
...@@ -920,7 +895,7 @@ ...@@ -920,7 +895,7 @@
}) })
}, },
//获取系列列表 //获取系列列表
getLineTeamList () { getLineTeamList() {
this.queryMsg.LineteamId = 0 this.queryMsg.LineteamId = 0
let msg = { let msg = {
lineID: this.queryMsg.LineId, lineID: this.queryMsg.LineId,
...@@ -934,13 +909,13 @@ ...@@ -934,13 +909,13 @@
}) })
}, },
//切换公司 //切换公司
getCompanyTab (Id) { getCompanyTab(Id) {
this.queryMsg.OutBranchId = Id this.queryMsg.OutBranchId = Id
this.queryMsg.currentPage = 1 this.queryMsg.currentPage = 1
this.getControlList() this.getControlList()
}, },
//获取航空公司 //获取航空公司
getAirlineList () { getAirlineList() {
this.apipost( this.apipost(
'airline_post_GetList', {}, 'airline_post_GetList', {},
res => { res => {
...@@ -948,12 +923,11 @@ ...@@ -948,12 +923,11 @@
this.queryCommonData.AirlineList = res.data.data this.queryCommonData.AirlineList = res.data.data
} }
}, },
err => { err => {}
}
) )
}, },
//根据当前员工所在部门获取该部门及子部门员工信息 //根据当前员工所在部门获取该部门及子部门员工信息
getEmployeeList () { getEmployeeList() {
let userInfo = this.getLocalStorage() let userInfo = this.getLocalStorage()
let msg = { let msg = {
GroupId: userInfo.RB_Group_id, GroupId: userInfo.RB_Group_id,
...@@ -969,13 +943,12 @@ ...@@ -969,13 +943,12 @@
this.queryCommonData.EmployeeList = res.data.data this.queryCommonData.EmployeeList = res.data.data
} }
}, },
err => { err => {}
}
) )
}, },
//新获取列表数据 //新获取列表数据
getControlList () { getControlList() {
if (this.flagWangYue) { if (this.flagWangYue) {
this.queryCommonData.flightCKed = [] this.queryCommonData.flightCKed = []
this.queryCommonData.flightCKed.push(0) this.queryCommonData.flightCKed.push(0)
...@@ -1015,18 +988,15 @@ ...@@ -1015,18 +988,15 @@
item.SalePlatList.push(parseInt(y)) item.SalePlatList.push(parseInt(y))
}) })
} }
}) })
} }
}, },
err => { err => {}
}
) )
}, },
//验证大小 //验证大小
checkTeamNum (queryMsg) { checkTeamNum(queryMsg) {
var TeamMinNum = parseInt(queryMsg.TeamMinNum) var TeamMinNum = parseInt(queryMsg.TeamMinNum)
var TeamMaxNum = parseInt(queryMsg.TeamMaxNum) var TeamMaxNum = parseInt(queryMsg.TeamMaxNum)
var ApplyMinNum = parseInt(queryMsg.ApplyMinNum) var ApplyMinNum = parseInt(queryMsg.ApplyMinNum)
...@@ -1039,7 +1009,7 @@ ...@@ -1039,7 +1009,7 @@
} }
}, },
//初始化公司 //初始化公司
getCompanyList () { getCompanyList() {
let userInfo = this.getLocalStorage() let userInfo = this.getLocalStorage()
var RB_Group_id = userInfo.RB_Group_id var RB_Group_id = userInfo.RB_Group_id
let msg = { let msg = {
...@@ -1058,12 +1028,11 @@ ...@@ -1058,12 +1028,11 @@
}) })
} }
}, },
err => { err => {}
}
) )
}, },
//团期状态全选 //团期状态全选
checkGroupAll (val) { checkGroupAll(val) {
this.queryMsg.GroupState = [] this.queryMsg.GroupState = []
if (val) { if (val) {
this.$tripUtils.TeamStatesList.teamDateStates.forEach(x => { this.$tripUtils.TeamStatesList.teamDateStates.forEach(x => {
...@@ -1071,13 +1040,13 @@ ...@@ -1071,13 +1040,13 @@
}) })
} }
}, },
checkGroup (value) { checkGroup(value) {
let checkedCount = value.length let checkedCount = value.length
this.queryCommonData.checkGroupALL = this.queryCommonData.checkGroupALL =
checkedCount === this.$tripUtils.TeamStatesList.teamDateStates.length checkedCount === this.$tripUtils.TeamStatesList.teamDateStates.length
}, },
//销售平台全选 //销售平台全选
checkAllSales (val) { checkAllSales(val) {
this.queryMsg.SalePlat = [] this.queryMsg.SalePlat = []
if (val) { if (val) {
this.$tripUtils.TeamStatesList.salsPlat.forEach(x => { this.$tripUtils.TeamStatesList.salsPlat.forEach(x => {
...@@ -1085,13 +1054,13 @@ ...@@ -1085,13 +1054,13 @@
}) })
} }
}, },
checkSales (value) { checkSales(value) {
let checkedCount = value.length let checkedCount = value.length
this.queryCommonData.checkPlatForm = this.queryCommonData.checkPlatForm =
checkedCount === this.$tripUtils.TeamStatesList.salsPlat.length checkedCount === this.$tripUtils.TeamStatesList.salsPlat.length
}, },
//团队状态全选 //团队状态全选
checkAllTeam (val) { checkAllTeam(val) {
this.queryMsg.TCState = [] this.queryMsg.TCState = []
if (val) { if (val) {
this.$tripUtils.TeamStatesList.TeamStates.forEach(x => { this.$tripUtils.TeamStatesList.TeamStates.forEach(x => {
...@@ -1108,7 +1077,7 @@ ...@@ -1108,7 +1077,7 @@
this.queryCommonData.showPlatForm = false this.queryCommonData.showPlatForm = false
} }
}, },
checkedTeamList (value) { checkedTeamList(value) {
if (value.indexOf(this.$tripUtils.TeamStatesList.TeamStates[2].Id) > -1) { if (value.indexOf(this.$tripUtils.TeamStatesList.TeamStates[2].Id) > -1) {
this.queryCommonData.showPlatForm = true this.queryCommonData.showPlatForm = true
} else { } else {
...@@ -1119,7 +1088,7 @@ ...@@ -1119,7 +1088,7 @@
checkedCount === this.$tripUtils.TeamStatesList.TeamStates.length checkedCount === this.$tripUtils.TeamStatesList.TeamStates.length
}, },
//全选弹出框 //全选弹出框
checkAllDialog (val) { checkAllDialog(val) {
this.queryCommonData.ckedplat = [] this.queryCommonData.ckedplat = []
if (val) { if (val) {
this.$tripUtils.TeamStatesList.salsPlat.forEach(x => { this.$tripUtils.TeamStatesList.salsPlat.forEach(x => {
...@@ -1127,13 +1096,13 @@ ...@@ -1127,13 +1096,13 @@
}) })
} }
}, },
checkDialog (value) { checkDialog(value) {
let checkedCount = value.length let checkedCount = value.length
this.queryCommonData.checkDialogAll = this.queryCommonData.checkDialogAll =
checkedCount === this.$tripUtils.TeamStatesList.salsPlat.length checkedCount === this.$tripUtils.TeamStatesList.salsPlat.length
}, },
//点击上架 //点击上架
setUpPlat (item) { setUpPlat(item) {
this.queryCommonData.outerVisible = false this.queryCommonData.outerVisible = false
this.queryCommonData.setPlatDialog = true this.queryCommonData.setPlatDialog = true
this.queryCommonData.singleTCID = item.TCID this.queryCommonData.singleTCID = item.TCID
...@@ -1153,7 +1122,7 @@ ...@@ -1153,7 +1122,7 @@
} }
}, },
//单团设置下架 //单团设置下架
Setshelves (TCID) { Setshelves(TCID) {
let msg = { let msg = {
TCID: TCID, TCID: TCID,
TCState: 2, TCState: 2,
...@@ -1165,14 +1134,13 @@ ...@@ -1165,14 +1134,13 @@
this.getControlList() this.getControlList()
this.queryCommonData.checkDialogAll = false this.queryCommonData.checkDialogAll = false
this.queryCommonData.ckedplat = [] this.queryCommonData.ckedplat = []
} } else {
else {
this.Info(res.data.message) this.Info(res.data.message)
} }
}) })
}, },
//单团设置上架 //单团设置上架
SetshelvesUp () { SetshelvesUp() {
let msg = { let msg = {
TCID: this.queryCommonData.singleTCID, TCID: this.queryCommonData.singleTCID,
TCState: 3, TCState: 3,
...@@ -1193,7 +1161,7 @@ ...@@ -1193,7 +1161,7 @@
}) })
}, },
goUrl (path, id, name) { goUrl(path, id, name) {
this.$store.commit('pageConditionUpdate', this.queryMsg) this.$store.commit('pageConditionUpdate', this.queryMsg)
this.$router.push({ this.$router.push({
name: path, name: path,
...@@ -1204,7 +1172,7 @@ ...@@ -1204,7 +1172,7 @@
} }
}) })
}, },
goUrlR (path, item) { goUrlR(path, item) {
var cityId = item.StartCityID var cityId = item.StartCityID
if (item.IsUnion == 1 && item.UnionTypeStr == 2) { if (item.IsUnion == 1 && item.UnionTypeStr == 2) {
cityId = item.UnionCityId cityId = item.UnionCityId
...@@ -1223,7 +1191,7 @@ ...@@ -1223,7 +1191,7 @@
}) })
window.open(routeData.href, '_blank') window.open(routeData.href, '_blank')
}, },
goUrlMake (path, LineID, TCID, name) { goUrlMake(path, LineID, TCID, name) {
this.$router.push({ this.$router.push({
name: path, name: path,
query: { query: {
...@@ -1234,7 +1202,7 @@ ...@@ -1234,7 +1202,7 @@
} }
}) })
}, },
goB2B (ConfigId) { goB2B(ConfigId) {
var B2BDomain = this.CurrentUserInfo.B2BDomain var B2BDomain = this.CurrentUserInfo.B2BDomain
window.open( window.open(
'http://www.oytour.com/#/detailTwo/' + 'http://www.oytour.com/#/detailTwo/' +
...@@ -1243,7 +1211,7 @@ ...@@ -1243,7 +1211,7 @@
'_blank' '_blank'
) )
}, },
goTeamBalance (id, OutBranchId) { goTeamBalance(id, OutBranchId) {
this.$router.push({ this.$router.push({
name: 'TeamBalancePayment', name: 'TeamBalancePayment',
query: { query: {
...@@ -1255,7 +1223,7 @@ ...@@ -1255,7 +1223,7 @@
}) })
}, },
//开团或修改 //开团或修改
goToOpenTravel (path, configId, tcid) { goToOpenTravel(path, configId, tcid) {
if (configId > 0) { if (configId > 0) {
this.$store.commit('pageConditionUpdate', this.queryMsg) this.$store.commit('pageConditionUpdate', this.queryMsg)
this.$router.push({ this.$router.push({
...@@ -1277,7 +1245,7 @@ ...@@ -1277,7 +1245,7 @@
}, },
//当团修改 //当团修改
goTonowTeam (path, configId, tcid, TCNUM) { goTonowTeam(path, configId, tcid, TCNUM) {
if (configId > 0) { if (configId > 0) {
this.$store.commit('pageConditionUpdate', this.queryMsg) this.$store.commit('pageConditionUpdate', this.queryMsg)
this.$router.push({ this.$router.push({
...@@ -1301,7 +1269,7 @@ ...@@ -1301,7 +1269,7 @@
}, },
//删除团期 //删除团期
removeTeamInfo (TCID) { removeTeamInfo(TCID) {
var that = this var that = this
that.Confirm('是否删除?', function () { that.Confirm('是否删除?', function () {
var msg = { var msg = {
...@@ -1323,14 +1291,14 @@ ...@@ -1323,14 +1291,14 @@
}) })
}, },
//获取城市 //获取城市
getCountryCity () { getCountryCity() {
this.apipost('sellorder_get_GetAllStartCity', {}, res => { this.apipost('sellorder_get_GetAllStartCity', {}, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.queryCommonData.CityList = res.data.data this.queryCommonData.CityList = res.data.data
} }
}) })
}, },
getSellorCompany () { getSellorCompany() {
//出团公司 //出团公司
this.apipost( this.apipost(
'sellorder_post_GetBranchList', {}, 'sellorder_post_GetBranchList', {},
...@@ -1339,12 +1307,11 @@ ...@@ -1339,12 +1307,11 @@
this.queryCommonData.companyList = res.data.data this.queryCommonData.companyList = res.data.data
} }
}, },
err => { err => {}
}
) )
}, },
//点击op备注 //点击op备注
ckOPremark (item) { ckOPremark(item) {
this.remarkMsg.TCID = item.TCID this.remarkMsg.TCID = item.TCID
this.remarkMsg.OPRemark = item.OPRemark this.remarkMsg.OPRemark = item.OPRemark
this.remarkMsg.OPInnerRemark = item.OPInnerRemark this.remarkMsg.OPInnerRemark = item.OPInnerRemark
...@@ -1352,7 +1319,7 @@ ...@@ -1352,7 +1319,7 @@
this.queryCommonData.outerVisible = true this.queryCommonData.outerVisible = true
}, },
//设置OP备注 //设置OP备注
setOPremark () { setOPremark() {
this.apipost( this.apipost(
'travel_post_SetTravelPrcieOpRemark', 'travel_post_SetTravelPrcieOpRemark',
this.remarkMsg, this.remarkMsg,
...@@ -1365,19 +1332,18 @@ ...@@ -1365,19 +1332,18 @@
this.Error(res.data.message) this.Error(res.data.message)
} }
}, },
err => { err => {}
}
) )
}, },
//点击本团卖点 //点击本团卖点
ckSellPoint (item) { ckSellPoint(item) {
this.queryCommonData.SellingPoints = true this.queryCommonData.SellingPoints = true
this.remarkMsg.ConfigId = item.ID this.remarkMsg.ConfigId = item.ID
this.remarkMsg.ProductRecommend = item.ProductRecommend this.remarkMsg.ProductRecommend = item.ProductRecommend
this.remarkMsg.TCID = item.TCID this.remarkMsg.TCID = item.TCID
}, },
//本团卖点 //本团卖点
SetSellingPoints () { SetSellingPoints() {
this.apipost( this.apipost(
'travel_post_SetSellingPoints', 'travel_post_SetSellingPoints',
this.remarkMsg, this.remarkMsg,
...@@ -1390,17 +1356,16 @@ ...@@ -1390,17 +1356,16 @@
this.Error(res.data.message) this.Error(res.data.message)
} }
}, },
err => { err => {}
}
) )
}, },
checkedFlight (item) { checkedFlight(item) {
this.queryMsg.FlightState = item.Id this.queryMsg.FlightState = item.Id
this.queryCommonData.flightCKed = [] this.queryCommonData.flightCKed = []
this.queryCommonData.flightCKed.push(item.Id) this.queryCommonData.flightCKed.push(item.Id)
}, },
//点击选取出团公司 //点击选取出团公司
getCompanyCheck (item) { getCompanyCheck(item) {
item.isShow = !item.isShow item.isShow = !item.isShow
this.queryCommonData.checkCompanyAll = false this.queryCommonData.checkCompanyAll = false
this.$forceUpdate() this.$forceUpdate()
...@@ -1422,7 +1387,7 @@ ...@@ -1422,7 +1387,7 @@
this.getControlList() this.getControlList()
}, },
//查询全部 //查询全部
getCompanyCheckAll () { getCompanyCheckAll() {
this.queryCommonData.checkCompanyAll = true this.queryCommonData.checkCompanyAll = true
this.queryMsg.OutBranchIds = [] this.queryMsg.OutBranchIds = []
this.queryCommonData.BranchList.forEach(x => { this.queryCommonData.BranchList.forEach(x => {
...@@ -1431,7 +1396,7 @@ ...@@ -1431,7 +1396,7 @@
this.getControlList() this.getControlList()
}, },
SetPrice (value) { SetPrice(value) {
if (value == null) { if (value == null) {
return 0.0 return 0.0
} }
...@@ -1448,7 +1413,7 @@ ...@@ -1448,7 +1413,7 @@
}, },
//隐藏显示 //隐藏显示
ShowUnionList (item) { ShowUnionList(item) {
// this.queryCommonData.showUnion = !this.queryCommonData.showUnion; // this.queryCommonData.showUnion = !this.queryCommonData.showUnion;
item.isshowUnion = !item.isshowUnion item.isshowUnion = !item.isshowUnion
if (item.isshowUnion) { if (item.isshowUnion) {
...@@ -1459,7 +1424,7 @@ ...@@ -1459,7 +1424,7 @@
this.$forceUpdate() this.$forceUpdate()
}, },
//酒店餐厅处理跳转 //酒店餐厅处理跳转
goHotelDiningBus (item, HotelDiningBus, type) { goHotelDiningBus(item, HotelDiningBus, type) {
if (type == 1) { if (type == 1) {
this.$router.push({ this.$router.push({
name: 'ChangeHotel', name: 'ChangeHotel',
...@@ -1481,15 +1446,52 @@ ...@@ -1481,15 +1446,52 @@
} }
}) })
} }
},
} //显示弹窗层
ShowUploadWord(item) {
this.queryCommonData.UploadWORDTip = true;
this.queryCommonData.UploadItem = item;
},
//保存WORD路劲
uploadFileBtn(file) {
var that = this;
let newArr = [];
newArr.push(file.file);
let fileName = file.file.name;
var path = "/Upload/WordTrip/";
this.UploadSelfFile(path, newArr, res => {
if (res.data.StatusCode == 1) {
that.queryCommonData.uploadLoading=true;
let uploadMsg = {
TCID: that.queryCommonData.UploadItem.TCID,
wordPath: res.data.FilePath
}
that.apipost(
'travel_post_UploadWord', uploadMsg,
res => {
that.queryCommonData.uploadLoading=false;
if (res.data.resultCode == 1) {
that.Success(res.data.message)
that.queryCommonData.UploadWORDTip = false
that.getControlList()
} else {
that.Error(res.data.message)
}
},
err => {}
);
} else {
that.Error("上传文件失败!")
}
})
},
}, },
filters: { filters: {
formatStartDate (value) { formatStartDate(value) {
let dataArr = value.split('-') let dataArr = value.split('-')
return dataArr[1] + '-' + dataArr[2] return dataArr[1] + '-' + dataArr[2]
}, },
priceFormat (value) { priceFormat(value) {
if (value == null) { if (value == null) {
return 0.0 return 0.0
} }
...@@ -1505,7 +1507,7 @@ ...@@ -1505,7 +1507,7 @@
return x1 + x2 return x1 + x2
} }
}, },
mounted () { mounted() {
//销售公司 //销售公司
this.getSellorCompany() this.getSellorCompany()
this.getCompanyList() this.getCompanyList()
...@@ -1514,7 +1516,7 @@ ...@@ -1514,7 +1516,7 @@
this.getEmployeeList() this.getEmployeeList()
this.getCountryCity() this.getCountryCity()
}, },
created () { created() {
//默认显示联运 //默认显示联运
this.queryMsg.IsShowUnion = 1 this.queryMsg.IsShowUnion = 1
let userInfo = this.getLocalStorage() let userInfo = this.getLocalStorage()
......
src/components/confirmationOrderDownLoad.vue
View file @ f2d21bea
...@@ -10,6 +10,8 @@ ...@@ -10,6 +10,8 @@
<input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载电脑版PDF" @click="toPDF(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')" /> <input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载电脑版PDF" @click="toPDF(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')" />
<input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载手机版WORD" @click="gernalFeature(0)" /> <input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载手机版WORD" @click="gernalFeature(0)" />
<input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载电脑版WORD" @click="gernalFeature(1)" /> <input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载电脑版WORD" @click="gernalFeature(1)" />
<a class="travelControlTripBtn" v-if="priceList!=null&& priceList[0].wordPath!=''" style="display:inline-block;text-decoration:none;
width:135px;text-align:center;line-height:30px;font-size:13px;position:relative;top:2px;" :href="domainManager().ViittoFileUrl+priceList[0].wordPath">下载WORD行程</a>
<!-- ToWord(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游') --> <!-- ToWord(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游') -->
<!--&&isopOperation HK 注释 可以让销售修改基本信息--> <!--&&isopOperation HK 注释 可以让销售修改基本信息-->
<input type="button" v-if="orderId>0" class="travelControlTripBtn" value="修改信息" @click="editMsgShow=true" /> <input type="button" v-if="orderId>0" class="travelControlTripBtn" value="修改信息" @click="editMsgShow=true" />
......
src/plug/index.js
View file @ f2d21bea
...@@ -149,11 +149,10 @@ export default { ...@@ -149,11 +149,10 @@ export default {
GoogleMapUrl: "http://ditu.google.cn/maps/api/js?key=AIzaSyAZ5MIfzicStzKbIkbI3RcBBeZBjQFKsp0&sensor=false&language=zh-CN", GoogleMapUrl: "http://ditu.google.cn/maps/api/js?key=AIzaSyAZ5MIfzicStzKbIkbI3RcBBeZBjQFKsp0&sensor=false&language=zh-CN",
//google地图图片地址 //google地图图片地址
GoogleMapImageUrl: "http://super.oytour.com", GoogleMapImageUrl: "http://super.oytour.com",
// "http://upload.oytour.com" //上传站点
UploadUrl: locationName.indexOf('oytour') !== -1 ? "http://upload.oytour.com" : "http://127.0.0.1:8120", UploadUrl: locationName.indexOf('oytour') !== -1||locationName.indexOf('viitto')!==-1 ? "http://upload.oytour.com" : "http://127.0.0.1:8120",
// 读取文件 //文件站点
ViittoFileUrl:'http://imgfile.oytour.com' ViittoFileUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto')!==-1 ? "http://imgfile.oytour.com" : 'http://127.0.0.1:8130'
// UploadUrl: "http://upload.oytour.com"
}; };
return obj; return obj;
}, },
...@@ -228,6 +227,7 @@ export default { ...@@ -228,6 +227,7 @@ export default {
successCall(res); successCall(res);
}, faildCall) }, faildCall)
} }
//HTTP提交数据 //HTTP提交数据
Vue.prototype.apipost = function (cmd, msg, successCall, faildCall) { Vue.prototype.apipost = function (cmd, msg, successCall, faildCall) {
if (msg == null || msg == "") { if (msg == null || msg == "") {
...@@ -320,9 +320,7 @@ export default { ...@@ -320,9 +320,7 @@ export default {
successCall(res); successCall(res);
}).catch(function (res) {}); }).catch(function (res) {});
}, },
Vue.prototype.getCookieItem = function () {
return JSON.parse(this.getCookie("userInfo"))
},
Vue.prototype.getLocalStorage = function () { Vue.prototype.getLocalStorage = function () {
var localStorageData = window.localStorage["userInfo"]; var localStorageData = window.localStorage["userInfo"];
if (localStorageData !== undefined && localStorageData!='undefined') { if (localStorageData !== undefined && localStorageData!='undefined') {
...@@ -331,23 +329,7 @@ export default { ...@@ -331,23 +329,7 @@ export default {
return null; return null;
} }
}, },
Vue.prototype.getCookie = function (cookieName) {
var strCookie = document.cookie;
var arrCookie = strCookie.split("; ");
for (var i = 0; i < arrCookie.length; i++) {
var arr = arrCookie[i].split("=");
if (cookieName == arr[0]) {
return arr[1];
}
}
return "";
},
Vue.prototype.getLoginUser = function () {
return this.loginUser
},
Vue.prototype.setLoginUser = function (user) {
this.loginUser = user
}
//PDF预览 //PDF预览
Vue.prototype.previewPDF = function (url) { Vue.prototype.previewPDF = function (url) {
...@@ -470,6 +452,32 @@ export default { ...@@ -470,6 +452,32 @@ export default {
}); });
} }
}, },
//上传文件到本地服务器
Vue.prototype.UploadSelfFile=function(path,files,successCall)
{
if (files && files.length > 0) {
let nameList = new Array()
for (let index = 0; index < files.length; index++) {
nameList.push(this.random_string());
}
let that = this;
co(function* () {
for (let index = 0; index < files.length; index++) {
let fileName = nameList[index]
fileName = path + fileName + "." + files[index].name.split('.').pop()
var formData = new FormData();
var uploadUrl=that.domainManager().UploadUrl+"/Upload?filePath="+path;
formData.append("myfile", files[index]);
that.$http.post(uploadUrl, formData, {})
.then(res => {
successCall(res);
})
}
}).catch(function (err) {
console.log("上传文件出错"+err);
});
}
}
Vue.prototype.uploadBlob = function (path, files, successCall) { Vue.prototype.uploadBlob = function (path, files, successCall) {
if (files && files.length > 0) { if (files && files.length > 0) {
......
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