Commit 159d9784 authored by zhengke's avatar zhengke

修改

parent 6e7b826f
......@@ -223,7 +223,7 @@ export const obj = {
yizhidanbng: "すでに制单、再改正できない!と",
jisuan1: "税別計算:単価*(予約者数-免減人数)*(1 + 0.08 -下男比率/ 100)",
jisuan1: "税別計算:単価*(予約者数-免減人数)*(1 + 0.1 -下男比率/ 100)",
jisuan2: "税入計算:単価*(予約者数-免減者数)*(1 -返女中比率/ 100)",
sidaobsuan: "司導間【月结】計上しない金額」",
dijiecaozuoxinxi: "地接操作情報",
......
......@@ -211,7 +211,7 @@ export const obj = {
qingxuanzeriq: "请选择日期",
zhengzaitijiao: "正在提交",
yizhidanbng: "已制单,不能再修改!",
jisuan1: "税别计算: 单价 * (预订人数-免减人数) * (1 + 0.08 - 返佣比例 / 100)",
jisuan1: "税别计算: 单价 * (预订人数-免减人数) * (1 + 0.1 - 返佣比例 / 100)",
jisuan2: "税入计算: 单价 * (预订人数-免减人数) * (1 - 返佣比例 / 100)",
sidaobsuan: "司导间【月结】不计入总金额",
dijiecaozuoxinxi: "地接操作信息",
......
......@@ -211,7 +211,7 @@ export const obj = {
qingxuanzeriq: "請選擇日期",
zhengzaitijiao: "正在提交",
yizhidanbng:"已制單,不能再修改!",
jisuan1:"稅別計算:單價*(預訂人數-免减人數)*(1 + 0.08 -返傭比例/ 100)",
jisuan1:"稅別計算:單價*(預訂人數-免减人數)*(1 + 0.1 -返傭比例/ 100)",
jisuan2:"稅入計算:單價*(預訂人數-免减人數)*(1 -返傭比例/ 100)",
sidaobsuan:"司導間【月結】不計入總金額",
dijiecaozuoxinxi:"地接操作資訊",
......
......@@ -343,6 +343,7 @@
<span v-if="GetDetail.IsShowGuestUrl && GetDetail.IsShowPlanUrl==1 && GetDetail.ClientType==7" @click="goGuideAccount('GuideAccount',GetDetail.ClientID)" class="FD_yijian">
领队导游往来
</span>
<span v-if="GetDetail.IsShowDiJieChargeUrl==1" style="margin-left:10px;cursor:pointer;" @click="jumpHotelContract('HotelContract',o)">手配费详情</span>
</td>
<td @click="jumpPage('TravelControlList',o.TCNUM,1)"> <span class="_jump_page _font_bold">查看团队</span> </td>
<td @click="jumpPage('RegistrationList',o.TCID,7)"> <span class="_jump_page _font_bold">查看报名</span> </td>
......@@ -1832,6 +1833,13 @@ export default {
})
}
},
//跳转至手配详情
jumpHotelContract(path,item){
this.$router.push({
name: path,
query: { id:item.TCID,TCNUM:item.TCNUM,blank:'y'}
})
},
zhuanBtn(){
this.zhuanMsg.WorkFlowId = this.ID;
if(!this.zhuanMsg.AuditEmId) return this.$message.error('请选择转交人');
......
......@@ -409,6 +409,7 @@
<span v-if="GetDetail.IsShowGuestUrl && GetDetail.IsShowGuestUrl===1 && GetDetail.ClientType===7" @click="goGuideAccount('GuideAccount',GetDetail.ClientID)" class="FD_yijian">
领队导游往来
</span>
<span v-if="GetDetail.IsShowDiJieChargeUrl==1" style="margin-left:10px;cursor:pointer;" @click="jumpHotelContract('HotelContract',o)">手配费详情</span>
</td>
<td @click="jumpPage('TravelControlList',o.TCNUM,1)"> <span class="_jump_page _font_bold">查看团队</span> </td>
<td @click="jumpPage('RegistrationList',o.TCID,7)"> <span class="_jump_page _font_bold">查看报名</span> </td>
......@@ -1232,6 +1233,13 @@ export default {
})
}
},
//跳转至手配详情
jumpHotelContract(path,item){
this.$router.push({
name: path,
query: { id:item.TCID,TCNUM:item.TCNUM,blank:'y'}
})
},
uploadFileBtn(file) { //上传
if(file.file.size > 1024 * 1024 * 10) {
this.$message.warning('文件大小不能超过10M!')
......@@ -1374,7 +1382,6 @@ export default {
}
this.chongJudge(data)
this.GetDetail = data;
// console.log("this.GetDetail",this.GetDetail)
if(this.GetDetail.DetailList){
this.GetDetail.DetailList.forEach(item=>{
if(item.CostTypeName=="领队导游资金池领款"){
......@@ -1412,7 +1419,6 @@ export default {
}
})
}
// 拼接团号显示团信息
let str = '';
if(data.TCIDList.length>0){
......
This diff is collapsed.
......@@ -167,7 +167,7 @@
<p style="padding-top: 5px;">
<template v-if="subItem.ContractUrl!=''">
<span style="color:green">已上传手配书</span>
&nbsp;&nbsp;<a v-if="subItem.ContractUrl" target="_blank" style="color:red" :href="subItem.ContractUrl">查看</a>
&nbsp;&nbsp;<a v-if="subItem.ContractUrl" target="_blank" style="color:blue" :href="subItem.ContractUrl">查看</a>
</template>
</p>
<el-upload :http-request="uploadFileBtnS" :multiple="false" :show-file-list="false" action=''>
......@@ -825,7 +825,7 @@
var coefficient = 1;
//税别
if (obj.TaxType == 2) {
coefficient = 1 + 0.08;
coefficient = 1 + 0.1;
}
if (index == 4 && obj.DMCPayType == 9) {
tempPrice = 0;
......@@ -911,10 +911,10 @@
}
});
})
if(!isUpload){
this.Error(str);
return;
}
// if(!isUpload){
// this.Error(str);
// return;
// }
this.loading = true;
this.apipost('dmcstatistics_get_SetHotelOrder', this.list, res => {
this.loading = false;
......@@ -967,10 +967,10 @@
}
});
})
if(!isUpload){
this.Error(str);
return;
}
// if(!isUpload){
// this.Error(str);
// return;
// }
let mag = {
TotalList: this.list,
SingleItem: item
......
......@@ -1212,6 +1212,14 @@ export default {
title: '订房管理详情'
},
},
{
path: '/HotelContract',
name: 'HotelContract',
component: resolve => require(['@/components/Hotel/HotelContract'], resolve),
meta: {
title: '手配书详情'
},
},
{
path: '/HotelOrder', //酒店订单
name: 'HotelOrder',
......
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