Skip to content

S
SuperMan
Commit 237dd23d authored by zhengke's avatar zhengke
Browse files
Options

修改从旅客名单跳转到财务单据

parent 89cad1b6
Show whitespace changes
Inline Side-by-side
Showing with 207 additions and 4 deletions
src/components/FinancialModule/addFinancialDocuments.vue
View file @ 237dd23d
...@@ -658,6 +658,7 @@ export default { ...@@ -658,6 +658,7 @@ export default {
resultCode:null, resultCode:null,
EmployeeId:0, EmployeeId:0,
describeList:[], describeList:[],
isFrompassenger:false,
} }
}, },
methods:{ methods:{
...@@ -896,6 +897,7 @@ export default { ...@@ -896,6 +897,7 @@ export default {
if(res.data.resultCode==1){ if(res.data.resultCode==1){
//清除旅客名单数据 //清除旅客名单数据
sessionStorage.removeItem("saveGuestInfo"); sessionStorage.removeItem("saveGuestInfo");
sessionStorage.removeItem("guoji");
// this.$store.commit('saveGuestInfo',[]) // this.$store.commit('saveGuestInfo',[])
this.$confirm(this.$t('tips.czcgsfjxzhidan'), this.$t('tips.tips'), { this.$confirm(this.$t('tips.czcgsfjxzhidan'), this.$t('tips.tips'), {
confirmButtonText: this.$t('fnc.jxzhidan'), confirmButtonText: this.$t('fnc.jxzhidan'),
...@@ -1144,6 +1146,7 @@ export default { ...@@ -1144,6 +1146,7 @@ export default {
this.apipost('Financial_post_GetCostTypeList',{ID:id}, res => { this.apipost('Financial_post_GetCostTypeList',{ID:id}, res => {
if(res.data.resultCode == 1) { if(res.data.resultCode == 1) {
this.GetCostTypeList = res.data.data; this.GetCostTypeList = res.data.data;
console.log(this.GetCostTypeList,'type');
if(type){ if(type){
this.msg.detailList.forEach(x=>{ this.msg.detailList.forEach(x=>{
this.GetCostTypeList.forEach(y=>{ this.GetCostTypeList.forEach(y=>{
...@@ -1265,6 +1268,9 @@ export default { ...@@ -1265,6 +1268,9 @@ export default {
{ {
this.msg.Type=this.$route.query.InPay; this.msg.Type=this.$route.query.InPay;
} }
if(this.isFrompassenger){
this.setDocument();
}
}else{ }else{
this.loading=false; this.loading=false;
this.$message.error(res.data.message); this.$message.error(res.data.message);
...@@ -1309,19 +1315,99 @@ export default { ...@@ -1309,19 +1315,99 @@ export default {
this.companyList = data; this.companyList = data;
}, err => {}) }, err => {})
}, },
//设置选中单据名单
setDocument(){
let guojiSessions = JSON.parse(window.sessionStorage.getItem("guoji"));
if(guojiSessions.guojiArr.length>0){
this.msg.detailList.push({
ID:0,
UnitPrice:'',
UnitPriceTo:'',
Number:guojiSessions.guojiArr.length,
Rate:'',
CostTypeId:52,
CurrencyId:'',
Remark:'',
CostTypeName:'',
yTotalPrice:'',
yTotalPriceTo:'',
bTotalPrice:'',
bTotalPriceTo:'',
show:false,
});
}
if(guojiSessions.guoneiArr.length>0){
this.msg.detailList.push({
ID:0,
UnitPrice:'',
UnitPriceTo:'',
Number:guojiSessions.guoneiArr.length,
Rate:'',
CostTypeId:66,
CurrencyId:'',
Remark:'',
CostTypeName:'',
yTotalPrice:'',
yTotalPriceTo:'',
bTotalPrice:'',
bTotalPriceTo:'',
show:false,
});
}
if(guojiSessions.shuijinArr.length>0){
detailList.CostTypeId = 80,
detailList.Number=guojiSessions.shuijinArr.length
this.msg.detailList.push({
ID:0,
UnitPrice:'',
UnitPriceTo:'',
Number:guojiSessions.shuijinArr.length,
Rate:'',
CostTypeId:80,
CurrencyId:'',
Remark:'',
CostTypeName:'',
yTotalPrice:'',
yTotalPriceTo:'',
bTotalPrice:'',
bTotalPriceTo:'',
show:false,
});
}
}
},created(){ },created(){
var that=this; var that=this;
this.orderObj = this.$route.query.orderObj?JSON.parse(this.$route.query.orderObj):null; this.orderObj = this.$route.query.orderObj?JSON.parse(this.$route.query.orderObj):null;
this.isFrompassenger = this.orderObj.isFromPassenger;
console.log(this.orderObj,'orderObj');
// console.log(this.$route.query.orderObj) // console.log(this.$route.query.orderObj)
if(this.orderObj!=null&&this.orderObj.OrderSource===10){ if(this.orderObj!=null&&this.orderObj.OrderSource===10&&this.isFrompassenger==undefined){
that.Description="旅客名单："; that.Description="旅客名单：";
that.describeList=JSON.parse(sessionStorage.getItem("saveGuestInfo")); that.describeList=JSON.parse(sessionStorage.getItem("saveGuestInfo"));
console.log("that.describeList",that.describeList) console.log("that.describeList",that.describeList)
that.describeList.forEach(item=>{ that.describeList.forEach(item=>{
that.Description+=item.GuestName+" "; that.Description+=item.GuestName+" ";
}) })
}
console.log("that.Description",that.Description) if(this.orderObj!=null&&this.orderObj.OrderSource===10&&this.isFrompassenger){
let guojiSessions = JSON.parse(window.sessionStorage.getItem("guoji"));
let guoji='',guonei='',guojizhongduan='',shuijin='',shengcang='';
guojiSessions.guojiArr.forEach(x=>{
guoji+=x+' '
})
guojiSessions.guoneiArr.forEach(x=>{
guonei+=x+' '
})
guojiSessions.gjzdArr.forEach(x=>{
guojizhongduan+=x+' '
})
guojiSessions.shuijinArr.forEach(x=>{
shuijin+=x+' '
})
guojiSessions.shengcangArr.forEach(x=>{
shengcang+=x+' '
})
that.Description='国际机票:'+guoji+' '+'国内航段:'+guonei+' '+'国际中断:'+guojizhongduan+' '+'税金:'+shuijin+' '+'升舱:'+shengcang
} }
},mounted(){ },mounted(){
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
...@@ -1359,6 +1445,7 @@ export default { ...@@ -1359,6 +1445,7 @@ export default {
this.returnCode = this.$route.query.Conditon; this.returnCode = this.$route.query.Conditon;
} }
// this.admin_get_DepartmentGetList(); // this.admin_get_DepartmentGetList();
},components: { },components: {
"my-FlowChartModule": myFlowChartModule "my-FlowChartModule": myFlowChartModule
} }
......
src/components/Ticketing/PassengerList.vue
View file @ 237dd23d
...@@ -117,12 +117,18 @@ ...@@ -117,12 +117,18 @@
</li> </li>
<li> <li>
<input type="button" class="normalBtn" value="导出报表" @click="getFlightInfo(),getCombinTeam()" /> <input type="button" class="normalBtn" value="导出报表" @click="getFlightInfo(),getCombinTeam()" />
<input type="button" class="normalBtn" v-if="isShowGuoji" value="制作财务单据" @click="makeFinacelDoc()" />
<input type="button" class="normalBtn" value="导出报表" @click="exportExcel()" style="display:none;"/> <input type="button" class="normalBtn" value="导出报表" @click="exportExcel()" style="display:none;"/>
</li> </li>
</ul> </ul>
</div> </div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0"> <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr> <tr>
<th>国际机票</th>
<th>国内机票</th>
<th>国际中断</th>
<th>税金</th>
<th>升舱</th>
<th>旅客姓名</th> <th>旅客姓名</th>
<th>身份证</th> <th>身份证</th>
<th>英文姓</th> <th>英文姓</th>
...@@ -135,6 +141,21 @@ ...@@ -135,6 +141,21 @@
<th>客人联系方式</th> <th>客人联系方式</th>
</tr> </tr>
<tr v-for="(item,index) in QueryMsg.dataList"> <tr v-for="(item,index) in QueryMsg.dataList">
<td>
<input v-model="item.guoji" type="checkbox"/>
</td>
<td>
<input v-model="item.guonei" type="checkbox"/>
</td>
<td>
<input v-model="item.gjzd" type="checkbox"/>
</td>
<td>
<input v-model="item.shuijin" type="checkbox"/>
</td>
<td>
<input v-model="item.shengcang" type="checkbox"/>
</td>
<td>{{item.GuestName}}</td> <td>{{item.GuestName}}</td>
<td>{{item.IdCard}}</td> <td>{{item.IdCard}}</td>
<td>{{item.ESurName}}</td> <td>{{item.ESurName}}</td>
...@@ -260,6 +281,14 @@ ...@@ -260,6 +281,14 @@
outerVisible: false, outerVisible: false,
flightList: [], flightList: [],
combineTeamList: [], combineTeamList: [],
isShowGuoji:false,
jipiaoObj:{
guojiArr:[],
guoneiArr:[],
gjzdArr:[],
shuijinArr:[],
shengcangArr:[]
},
}; };
}, },
methods: { methods: {
...@@ -282,6 +311,16 @@ ...@@ -282,6 +311,16 @@
item.Sex = "女"; item.Sex = "女";
} }
}); });
if(this.isShowGuoji){
this.QueryMsg.dataList.forEach(x=>{
x.guoji = false;
x.guonei=false;
x.gjzd = false;
x.shuijin = false;
x.shengcang = false;
})
}
console.log(this.QueryMsg.dataList);
} }
}, },
err => {} err => {}
...@@ -413,11 +452,59 @@ ...@@ -413,11 +452,59 @@
}, },
err => {} err => {}
); );
},
makeFinacelDoc(){
this.jipiaoObj.guojiArr=[];
this.jipiaoObj.guoneiArr=[];
this.jipiaoObj.gjzdArr=[];
this.jipiaoObj.shuijinArr=[];
this.jipiaoObj.shengcangArr=[];
this.QueryMsg.dataList.forEach(x=>{
if(x.guoji){
this.jipiaoObj.guojiArr.push(x.GuestName);
}
if(x.guonei){
this.jipiaoObj.guoneiArr.push(x.GuestName);
}
if(x.gjzd){
this.jipiaoObj.gjzdArr.push(x.GuestName);
}
if(x.shuijin){
this.jipiaoObj.shuijinArr.push(x.GuestName);
}
if(x.shengcang){
this.jipiaoObj.shengcangArr.push(x.GuestName);
}
})
console.log(this.jipiaoObj,'jipiaoObj');
sessionStorage.setItem("guoji",JSON.stringify(this.jipiaoObj));
let orderObj = {
OrderID: 0,
OrderSource: 10,
Obj: {},
SourceID: 0,
TCIDList: [],
isFromPassenger:true,
}
this.$router.push({
name: 'ChoiceAddFinancialDocuments',
query:{
"Type": 2,
"companyID": '',
"path": "",
'blank': 'y',
'orderObj': JSON.stringify(orderObj)
}
});
} }
}, },
mounted() { mounted() {
this.QueryMsg.AirTicketId = this.$route.query.id; this.QueryMsg.AirTicketId = this.$route.query.id;
this.msg.AirTicketId = this.$route.query.id; this.msg.AirTicketId = this.$route.query.id;
if(this.$route.query.isFromTk!=undefined){
this.isShowGuoji = this.$route.query.isFromTk;
}
var myDate = new Date(); var myDate = new Date();
this.QueryMsg.nowDate = this.QueryMsg.nowDate =
myDate.getFullYear() + myDate.getFullYear() +
...@@ -426,6 +513,9 @@ ...@@ -426,6 +513,9 @@
"-" + "-" +
myDate.getDate(); myDate.getDate();
this.getTeamInfo(); this.getTeamInfo();
if(this.isShowGuoji){
this.msg.PageSize=200;
}
this.getList(); this.getList();
} }
}; };
......
src/components/Ticketing/TicketManager.vue
View file @ 237dd23d
...@@ -1516,7 +1516,7 @@ ...@@ -1516,7 +1516,7 @@
</div> </div>
</li> </li>
<!--尾款--> <!--尾款-->
<li v-if="item.FinalPayment!=''"> <li v-if="item.FinalPayment!=''&&item.FirstDeposit==''&&item.SecondDeposit==''&&item.ThirdDeposit==''&&item.FourthDeposit==''">
<div @click="goFinacePage(item,5)" :class="getClass(item.FinalPaymentStatus)"> <div @click="goFinacePage(item,5)" :class="getClass(item.FinalPaymentStatus)">
<el-tooltip effect="dark" :content="item.FinalPayment" placement="top" popper-class="max-w250"> <el-tooltip effect="dark" :content="item.FinalPayment" placement="top" popper-class="max-w250">
<span>尾</span> <span>尾</span>
...@@ -1529,6 +1529,19 @@ ...@@ -1529,6 +1529,19 @@
</span> </span>
</div> </div>
</li> </li>
<li v-else>
<div @click="goCustomList('PassengerList',item,'旅客名单')" :class="getClass(item.FinalPaymentStatus)">
<el-tooltip effect="dark" :content="item.FinalPayment" placement="top" popper-class="max-w250">
<span>尾</span>
</el-tooltip>
</div>
<div class="FinaDetailContent">
<span v-if="item.FinalAuditList!=null" v-for="childItem in item.FinalAuditList">
<span class="FinaceDanList"
@click="goFinaceDetails(childItem.FinaceId)">{{childItem.FinaceId}}</span>
</span>
</div>
</li>
</ul> </ul>
</div> </div>
</el-col> </el-col>
...@@ -2502,6 +2515,18 @@ ...@@ -2502,6 +2515,18 @@
} }
}); });
}, },
//跳转至旅客名单
goCustomList(path, obj, title){
this.$router.push({
name: path,
query: {
"id": obj,
blank: 'y',
isFromTk:true,
tab: title
}
})
},
//导入 //导入
getImport(command) { getImport(command) {
this.importType = command; this.importType = command;
...@@ -2542,6 +2567,7 @@ ...@@ -2542,6 +2567,7 @@
this.total = res.data.data.count; this.total = res.data.data.count;
this.dataList = res.data.data.pageData; this.dataList = res.data.data.pageData;
this.noData = !this.total > 0; this.noData = !this.total > 0;
console.log(this.dataList,'datalist');
} }
if (this.msg.ID == 0) { if (this.msg.ID == 0) {
this.msg.ID = ""; this.msg.ID = "";
......
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