Commit 680ddab7 authored by huangyuanyuan's avatar huangyuanyuan
parents f4a4f680 428c7459
......@@ -4,10 +4,9 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
<meta name="renderer" content="webkit">
<meta http-equiv="pragma" content="no-cache">
<meta http-equiv="Cache-Control" content="no-cache, must-revalidate">
<meta http-equiv="expires" content="-1, 26 Feb 1997 08:21:57 GMT">
<!--<meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" name="viewport">-->
<meta http-equiv="Pragma" content="no-cache">
<meta http-equiv="Cache-Control" content="no-cache, must-revalidate, no-store">
<meta http-equiv="Expires" content="0">
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=ZzGBZF6L0sgFDLlDohyvYhCnWy4dwksX" ></script>
<script type="text/javascript" src="static/CurveLine.min.js"></script>
<script type="text/javascript" src="http://ditu.google.cn/maps/api/js?key=AIzaSyAZ5MIfzicStzKbIkbI3RcBBeZBjQFKsp0&language=zh-CN"></script>
......
......@@ -87,6 +87,7 @@
showTab:0,
templateID: null,
DepartID: null,
EmployeeId: null,
}
},methods:{
goUrl(path,id,Name,Type,IsUploadPic) {
......@@ -162,11 +163,19 @@
}
// 5-5 仅茈、而巳。 14:32:06
// 部门id = 242 或者 240 就展示出 templeteId=33 的流程, 流程名字叫做 公司佣金收款
if (x.Id === 33) {
if (this.DepartID === 242 || this.DepartID === 240) {
x.bigShow = true
} else {
x.bigShow = false
if (x.Id === 33 || x.Id === 48) {
if (x.Id === 33) {
if (this.DepartID === 242 || this.DepartID === 240) {
x.bigShow = true
} else {
x.bigShow = false
}
} else if (x.Id === 48) {
if (this.EmployeeId === 1725) {
x.bigShow = true
} else {
x.bigShow = false
}
}
} else {
x.bigShow = true
......@@ -188,6 +197,7 @@
},mounted(){
let userInfo = this.getLocalStorage();
this.DepartID = userInfo.RB_Department_Id;
this.EmployeeId = userInfo.EmployeeId;
this.templateID = this.$route.query.templateID ? JSON.parse(this.$route.query.templateID) : null
this.Financial_post_GetList();
this.showTab = this.$route.query.Type?this.$route.query.Type:0;
......
......@@ -171,7 +171,7 @@
<td :rowspan="item.InvoiceApplyList.length">{{item.ApplyTotalPrice}}</td>
<td :rowspan="item.InvoiceApplyList.length">
<span>{{item.DpreadPrice - item.ApplyTotalPrice}}</span>
<span v-if="(item.DpreadPrice - item.ApplyTotalPrice) < 0" class="_zhuihui" @click="zhuihui(item.OrderId)"></span>
<span v-if="item.ApplyTotalPrice!=0" class="_zhuihui" @click="zhuihui(item.OrderId)"></span>
</td>
<td>{{item.InvoiceApplyList[0].CreateDate.replace('T', ' ')}}</td>
<td>
......
......@@ -452,7 +452,7 @@
<th>操作</th>
</tr>
<tr v-for='(item, index) in nav' >
<td rowspan="2" width="180" v-if="index===0">总金额: {{moneyFormat(TotalNav.reimburseTotalPrice.PlanPrice)}}</td>
<td :rowspan="nav.length" width="180" v-if="index===0">总金额: {{moneyFormat(TotalNav.reimburseTotalPrice.PlanPrice)}}</td>
<td>{{item.TCNUMS}}</td>
<td style="display: flex;align-items: center;padding: 5px 20px; height: 40px;">
<p style="padding-right: 20px;" v-if="item.LeaderGetPrice>0">已领款:<span style="color: red;">{{moneyFormat(item.LeaderGetPrice)}}</span></p>
......
......@@ -750,7 +750,7 @@
<input type="button" class="normalBtn" value="保存" @click="submitForm('addMsg')"/>
</span>
</p>
<el-form :model="addMsg" ref="addMsg" label-position="right" :rules="rules" label-width="80px">
<el-form :model="addMsg" ref="addMsg" label-position="right" :rules="rules" label-width="90px">
<el-row :gutter="20">
<el-col :span="4">
<el-form-item label="客户类型" prop="CustomerType">
......@@ -856,13 +856,19 @@
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="成交单价" prop="Unit_Price">
<el-form-item label="成交单价" prop="Unit_Price" v-if="HightUnitPrice === '2'">
<el-select v-model='addMsg.Unit_Price'
filterable :placeholder="$t('pub.pleaseSel')" @change="getTotalPrice()">
<el-option v-for="item in Unit_PriceList" :label='item.LessMoney' :value='item.ID' :key='item.ID'>
</el-option>
</el-select>
<!-- <el-input v-model='addMsg.Unit_Price' :disabled="true" @keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()"></el-input> -->
</el-form-item>
<el-form-item label="成交单价" prop="Unit_Price" v-else>
<el-input v-model='addMsg.Unit_Price' @change="getTotalPrice(3)"></el-input>
</el-form-item>
<el-form-item label="高于本团单价">
<el-switch v-model="HightUnitPrice" active-value="1" inactive-value="2"></el-switch>
</el-form-item>
<el-form-item>
<p v-if="LessMoney==0" style="line-height: 18px; color: #E95252;">注:如果超出本团的最低让价,差价将由你来承担</p>
......@@ -1907,6 +1913,7 @@
<div class="combottomDiv" v-if="showChangeSales" style="height:200px;">
<updateSalesMan @closeUpdiv="closeSalseDiv" @getList="getList" :subInfo="subInfo"></updateSalesMan>
</div>
<a id='groupTourOrder_DownLoad' target="_blank" style="display:none">1不要删除</a>
</div>
</template>
......@@ -1947,6 +1954,7 @@ import moment from "moment";
customerId: '',
createByInfo: '',
isUpdateSharePeople: false,
HightUnitPrice: '2',
starTime: '',
endTime: '',
stratPrice: '',
......@@ -2259,10 +2267,10 @@ import moment from "moment";
let fileSize = file.file.size < 1024 ? file.file.size : (file.file.size / 1024).toFixed(0)
let saveMsg = {}
saveMsg.Path = x.data.FilePath
saveMsg.FileName = file.file.name
saveMsg.Status = 1
saveMsg.OrderId = this.checkedObj.orderId
saveMsg.Path = x.data.FilePath;
saveMsg.FileName = file.file.name;
saveMsg.Status = 1;
saveMsg.OrderId = this.checkedObj.orderId;
that.apipost('sellorder_post_SetConfirmationLetter', saveMsg, res => {
if (res.data.resultCode == 1) {
this.$message.success(res.data.message)
......@@ -2275,8 +2283,9 @@ import moment from "moment";
})
},
downLoadFile (obj) {
let reg = /^http(s)?:\/\/(.*?)\//
this.downloadFileRename(obj[0].fullUrl.replace(reg, ''), obj[0].name)
let dom = document.querySelector("#groupTourOrder_DownLoad");
dom.href = obj[0].fullUrl;
dom.click();
},
// 订单转团
transfer: function (item) {
......@@ -2932,7 +2941,19 @@ import moment from "moment";
(Number(this.addMsg.ESeatNum)+Number(this.addMsg.FSeatNum));
this.addMsg.YSeatNum = SeatNum<0?0:SeatNum;
},
getTotalPrice () {
getTotalPrice (t) {
if (t === 3) {
if (parseFloat(this.addMsg.Unit_Price).toString() === "NaN") {
this.$message.error('请输入正确的价格!')
this.addMsg.Unit_Price = this.addMsg.TC_Price
return
}
if (parseFloat(this.addMsg.Unit_Price) < this.addMsg.TC_Price) {
this.$message.error('成交单价必须大于等于本团单价!')
this.addMsg.Unit_Price = this.addMsg.TC_Price
return
}
}
this.addMsg.ChirdNum = this.addMsg.ChirdNoNeedBedNum * 1 + this.addMsg.ChirdNeedBedNum * 1
if (this.addObj.IsBirdDiscount == 1) {
//早鸟优惠
......@@ -3516,7 +3537,6 @@ import moment from "moment";
this.loading = false
this.total = res.data.data.count
this.list = res.data.data.pageData;
console.log("this.list",this.list)
} else {
this.$message.error(res.data.message)
}
......
......@@ -1710,7 +1710,7 @@
</div>
</td>
<td>
<span v-if='item.confirmFileList.length>0' class="fz12 dowloadSpan" @click="downLoadFile(item.confirmFileList)">
<span v-if='item.confirmFileList.length>0' style="cursor:pointer" class="fz12 dowloadSpan" @click="downLoadFile(item.confirmFileList)">
确认函下载
</span>
<i v-if='item.confirmFileList.length>0&&item.commissionSharePeople !== userId' @click="deleteFile(item)" style="margin-left: 5px;" class="el-icon-error color999"></i>
......@@ -1992,7 +1992,7 @@
</div>
</td>
<td>
<span v-if='item.confirmFileList.length>0' class="fz12 dowloadSpan" @click="downLoadFile(item.confirmFileList)">
<span v-if='item.confirmFileList.length>0' style="cursor:pointer" class="fz12 dowloadSpan" @click="downLoadFile(item.confirmFileList)">
确认函下载
</span>
<i v-if='item.confirmFileList.length>0&&item.commissionSharePeople !== userId' @click="deleteFile(item)" style="margin-left: 5px;" class="el-icon-error color999"></i>
......@@ -2224,6 +2224,7 @@
<button class="hollowFixedBtn" @click="OrderMoneyDialog=false">{{$t('pub.cancelBtn')}}</button>
</div>
</el-dialog>
<a id='groupTourOrderByTuan_DownLoad' target="_blank" style="display:none">1不要删除</a>
</div>
</template>
......@@ -2732,8 +2733,9 @@ export default {
});
},
downLoadFile(obj) {
let reg = /^http(s)?:\/\/(.*?)\//
this.downloadFileRename(obj[0].fullUrl.replace(reg,''),obj[0].name);
let dom = document.querySelector("#groupTourOrderByTuan_DownLoad");
dom.href = obj[0].fullUrl;
dom.click();
},
// 订单转团
transfer: function (item) {
......@@ -3395,6 +3397,11 @@ submitYSZEForm(){
},
getTotalPrice(t) {
if (t === 3) {
if (parseFloat(this.addMsg.Unit_Price).toString() === "NaN") {
this.$message.error('请输入正确的价格!')
this.addMsg.Unit_Price = this.addMsg.TC_Price
return
}
if (this.addMsg.Unit_Price < this.addMsg.TC_Price) {
this.$message.error('成交单价必须大于等于本团单价!')
this.addMsg.Unit_Price = this.addMsg.TC_Price
......
......@@ -1612,7 +1612,12 @@
},
getTotalPrice(t) {
if (t === 3) {
if (this.addMsg.Unit_Price < this.addMsg.TC_Price) {
if (parseFloat(this.addMsg.Unit_Price).toString() === "NaN") {
this.$message.error('请输入正确的价格!')
this.addMsg.Unit_Price = this.addMsg.TC_Price
return
}
if (parseFloat(this.addMsg.Unit_Price) < this.addMsg.TC_Price) {
this.$message.error('成交单价必须大于等于本团单价!')
this.addMsg.Unit_Price = this.addMsg.TC_Price
return
......
......@@ -1897,7 +1897,8 @@
<td>
<div @click="goOpenUrl('confirmationOrder',childItem.OrderId)" style="cursor:pointer;">电子确认函</div>
<span v-if='childItem.ConfirmFileList.length>0'
@click="downLoadFile(childItem.ConfirmFileList)">确认函下载</span>
@click="downLoadFile(childItem.ConfirmFileList)" style="color:blue;text-decoration:underline;font-size:12px;cursor:pointer;">确认函下载</span>
</td>
<td class="RL-BTNlist" rowspan="2">
<el-button-group>
......@@ -2206,7 +2207,7 @@
</td>
<td>
<div @click="goOpenUrl('confirmationOrder',item.orderId)" style="cursor:pointer;">电子确认函</div>
<span v-if='item.ConfirmFileList.length>0' @click="downLoadFile(item.ConfirmFileList)">确认函下载</span>
<span v-if='item.ConfirmFileList.length>0' @click="downLoadFile(item.ConfirmFileList)" style="color:blue;text-decoration:underline;font-size:12px;cursor:pointer;">确认函下载</span>
</td>
<td class="RL-BTNlist" rowspan="2">
<el-button-group>
......@@ -2617,7 +2618,7 @@
</el-row>
</el-form>
</div>
<a id='RegistrationList_DownLoad' target="_blank" style="display:none">1不要删除</a>
</div>
</template>
......@@ -3303,8 +3304,9 @@
}, null)
},
downLoadFile(obj) {
let reg = /^http(s)?:\/\/(.*?)\//
this.downloadFileRename(obj[0].FullUrl.replace(reg, ''), obj[0].Name)
let dom = document.querySelector("#RegistrationList_DownLoad");
dom.href = obj[0].FullUrl;
dom.click();
},
goUrlTravelControl(name, path, id, tcmun) {
......
......@@ -1190,7 +1190,6 @@
item.SalePlatList.push(parseInt(y))
})
}
console.log("HotelOrderListReports",item.HotelOrderListReports);
});
}
},
......
......@@ -57,7 +57,7 @@
<td>
<el-button-group>
<el-tooltip v-if="item.Status!='0'" class="item" effect="dark" :content="$t('fnc.xiangqing')" placement="top-start">
<el-button @click='getDetails(item.Id)' type="primary" icon="el-icon-tickets" ></el-button>
<el-button @click='getDetails(item.Id, item.Title)' type="primary" icon="el-icon-tickets" ></el-button>
</el-tooltip>
<el-tooltip v-if="item.Status=='0'" class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start">
<el-button @click='updateNotice(item.Id)' type="primary" icon="el-icon-edit" ></el-button>
......@@ -88,12 +88,11 @@
</el-pagination>
<el-dialog custom-class='w800' :title="dialogTitle" :visible.sync="outerVisible" center :before-close="closeChangeMachie">
<div v-if='layerType==1'>
<p class="ann_detail_title">{{detailMessage.Title}}</p>
<p style="text-align: right; padding: 5px 0;">{{detailMessage.EmName}}&nbsp;&nbsp;&nbsp;&nbsp;{{detailMessage.UpdateTime}}</p>
<pre style="letter-spacing: 1px; font-size: 14px; color: #333;">{{detailMessage.Content}}</pre>
<p style="padding:0 10px; margin: 10px 0; background: #f1f1f1;">{{$t('adm.adm_fujian')}}</p>
<p style="height: 28px; padding: 0 10px; line-height: 28px;" v-for="item in downLoadList" class="AnnFileListPMeta">
<span @click="downloadSingle(item)">{{item.Name}}--{{$t('adm.adm_download')}}</span>
<i class="iconfont icon-xiazai"></i>--<span @click="downloadSingle(item)">{{item.Name}}</span>
</p>
</div>
......@@ -357,10 +356,10 @@
}
},err=>{})
},
getDetails(id){
getDetails(id, tit){
this.outerVisible=true;
this.layerType=1;
this.dialogTitle=this.$t('tips.adm_noticexiangqing');
this.dialogTitle=tit;
this.apipost('User_get_NoticeGet',{noticeId:id},res=>{
if(res.data.resultCode == 1) {
this.detailMessage=res.data.data
......@@ -434,5 +433,11 @@
.AnnfileList li{height: 30px; line-height: 30px; padding: 0 10px;}
.AnnfileList li:hover{background: #f1f1f1;}
.AnnfileList li>i{float: right; margin-top:8px;}
.AnnfileList li>span:hover,.AnnFileListPMeta>span:hover{text-decoration: underline; color: #E95252; cursor: pointer;}
.AnnfileList li:hover,.AnnFileListPMeta:hover{text-decoration: underline; color: #E95252; cursor: pointer;}
.AnnFileListPMeta{
color: blue
}
.AnnFileListPMeta .iconfon{
font-size: 12px;
}
</style>
\ No newline at end of file
......@@ -346,6 +346,9 @@
} else if (TeamType == 2) {
path = "TravelManager4";
}
if(postData.isfromManager){
path = "TravelManager5";
}
this.Success("保存成功");
if (this.isNewConfig) {
this.$router.push({
......
......@@ -331,21 +331,21 @@
<ul class="days">
<li class="liList" v-for="(dayobject,index) in days" :key="dayobject.subCode">
<span v-if="dayobject.checkState==$calendarUtils.checkState.noChecked" class="other-month">{{dayobject.day.getDate()}}</span>
<span v-if="dayobject.checkState==$calendarUtils.checkState.checked" class="checked1" :class="dayobject.click?'_yes_click':''"
@click="dayobject.click?clickedDay(dayobject):''">{{dayobject.day.getDate()}}</span>
<span v-else-if="dayobject.checkState==$calendarUtils.checkState.hasValue" :class="dayobject.click?'_yes_click':''"
@click="dayobject.click?clickedDay(dayobject):''">{{dayobject.day.getDate()}}</span>
<span v-if="dayobject.checkState==$calendarUtils.checkState.checked" class="checked1"
@click="clickedDay(dayobject)">{{dayobject.day.getDate()}}</span>
<span v-else-if="dayobject.checkState==$calendarUtils.checkState.hasValue"
@click="clickedDay(dayobject)">{{dayobject.day.getDate()}}</span>
</li>
<!-- <li class="liList" v-for="(dayobject,index) in days" :key="dayobject.subCode">
<span v-if="dayobject.checkState==$calendarUtils.checkState.noChecked"
class="other-month">{{dayobject.day.getDate()}}</span>
<span v-if="dayobject.checkState==$calendarUtils.checkState.checked" class="checked1"
@click="clickedDay(dayobject)">{{dayobject.day.getDate()}}</span>
<span v-else-if="dayobject.checkState==$calendarUtils.checkState.hasValue"
@click="clickedDay(dayobject)">{{dayobject.day.getDate()}}</span>
</li> -->
</ul>
</div>
<!--<div>-->
<!--<el-date-picker-->
<!--v-model="chooseDay"-->
<!--@change="clickedDay()"-->
<!--type="date"-->
<!--placeholder="选择日期">-->
<!--</el-date-picker>-->
<!--</div>-->
</div>
</div>
<div class="TPright"></div>
......@@ -637,7 +637,7 @@
</div>
<div class="clearfix">
<div class="clearfix">
<div class="leftSetInfo">
<span class="TPbaseSet" style="width:62px;"></span>
<span class="TPsecondTitle" style="width:66px;">op对外备注</span>
......@@ -691,6 +691,15 @@
</el-form-item>
</div>
</div>
<div class="TPright" style="float:left;">
<span>团期标签</span>
<span>
<el-checkbox-group v-model="priceData.PriceTagIds">
<el-checkbox v-for="team in teamTips" :label="team.ID"
:key="team.Content">{{team.Content}}</el-checkbox>
</el-checkbox-group>
</span>
</div>
</div>
</el-form>
</div>
......@@ -727,7 +736,7 @@
Url: "",
Name: ""
},
SaleBranchIdArray: []
SaleBranchIdArray: [],
},
returnPriceList: this.priceList,
companyList: [],
......@@ -779,6 +788,8 @@
queryFlightAirListData:[],
queryFlightAirDateList:[],
getSelectdata:'',
//团期标签
teamTips:[],
};
},
methods: {
......@@ -871,9 +882,13 @@
AirticketBindList: [],
LowNum: 2,
TeamType:1,
//选中团期标签
PriceTagIds:[],
PriceFlight: JSON.parse(
JSON.stringify(this.PostConfig.FlightList)
)
),
customId:this.PostConfig.customId,
allotId:this.PostConfig.allotId,
};
}
this.returnPriceList.push(objItem);
......@@ -1388,7 +1403,22 @@
});
}
});
}
},
//获取所有小包团
getAllTeamTips(){
let msg = {
name:'theme',
code:'1'
}
this.apipost("travel_get_GetTravelPriceTag", msg, res => {
if (res.data.resultCode == 1) {
this.teamTips = res.data.data;
}else{
this.Error(res.data.message);
}
},err => {}
);
},
},created(){
localStorage.removeItem('queryFlightAirMsg');
if(this.TeamType==1){
......@@ -1404,6 +1434,7 @@
this.currentMonth = dateObj.CurrentMonth;
this.initCalendar();
this.getCompanyList();
this.getAllTeamTips();
},
watch: {
priceList: {
......@@ -1429,7 +1460,7 @@
this.returnPriceList.forEach((x, index) => {
if (index == 0) {
this.priceData = this.returnPriceList[index];
console.log(this.priceData,'刚进来。。。');
x["Checked"] = true;
this.chooseDay = this.priceData.StartDate;
//this.getSelectFilght(this.priceData.StartDate);
......@@ -1442,6 +1473,13 @@
},
deep: true
},
priceData: {
handler:function(val,oldVal){
},
deep:true
},
returnPriceList: {
//深度监听,可监听到对象、数组的变化
handler: function (val, oldVal) {
......
......@@ -119,6 +119,8 @@
//是否更新酒店库存
IsUpdateHotel:0,
OpenTeamDescribe:"",//开团备注
customId:0,
allotId:0,
},
//行程
FeatureData: {
......@@ -189,6 +191,7 @@
TeamType:'',
loading: false,
isNewConfig: true,
isfromManager:true,
};
},
components: {
......@@ -246,7 +249,6 @@
//行程回调
getDaysTrip(tripObj) {
this.PostDaysTrip = tripObj;
console.log("this.PostDaysTrip",this.PostDaysTrip);
},
/*获取行程特色内容对象*/
getFeature(featureObj) {
......@@ -339,7 +341,7 @@
TripFeature.B2BRemark = this.PostNotice.B2BRemark;
TripFeature.ShopRemark = this.PostNotice.ShopRemark;
TripFeature.VisaRemark = this.PostNotice.VisaRemark;
if (
basicData.TrafficList != null &&
basicData.TrafficList.length > 0 &&
......@@ -365,9 +367,10 @@
if (res.data.resultCode == 1) {
//配置编号
TripFeature.ConfigId = res.data.data;
TripFeature.isfromManager = true;
this.$refs.TravelFeature.getHtml(TripFeature, SaveType,this.TeamType);
this.$refs.TravelPrice.closeHotelDialog();
this.$refs.TravelPrice.initStatus();
// this.$refs.TravelPrice.closeHotelDialog();
// this.$refs.TravelPrice.initStatus();
} else if (res.data.resultCode == 10009) {
this.FeatureData.IsSave = false;
//表单重复提交
......@@ -576,7 +579,7 @@
res => {
if (res.data.resultCode == 1) {
var tempData = res.data.data;
console.log("tempData",tempData);
if (tempData.Feature != null) {
this.FeatureData.ID = tempData.Feature.ID;
this.FeatureData.ConfigId = tempData.Feature.ConfigId;
......@@ -742,6 +745,12 @@
},
watch: {},
mounted() {
if (this.$route.query.customId) {
this.PostDaysTrip.customId = this.$route.query.customId;
}
if (this.$route.query.allotId) {
this.PostDaysTrip.allotId = this.$route.query.allotId;
}
this.ScrollMethod();
},
created() {
......
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