Skip to content

S
SuperMan
Commit c211af62 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

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

parents 8ed9a03c 55f8ae71
Hide whitespace changes
Inline Side-by-side
Showing with 65 additions and 42 deletions
src/components/FinancialModule/OpComPersonDetails.vue
View file @ c211af62
......@@ -140,9 +140,12 @@
},
methods: {
method5: function() {
let userInfo=this.getLocalStorage();
let msg = JSON.parse(JSON.stringify(this.msg));
msg.EmployeeIdUser=userInfo.EmployeeId;
delete msg.pageIndex;
delete msg.pageSize;
this.GetLocalFile(
"sellcommission_post_GetOPCommissionSingleDetailsListToExcel",
msg,
......
src/components/Hotel/HotelProductManage2.vue
View file @ c211af62
......@@ -280,6 +280,7 @@
<el-option :key="1" label="税入R0" :value="1"></el-option>
<el-option :key="2" label="税别R10" :value="2"></el-option>
<el-option :key="3" label="税别R0" :value="3"></el-option>
<el-option :key="4" label="税入R10" :value="4"></el-option>
</el-select>
</el-form-item>
</el-col>
......@@ -527,6 +528,7 @@
<el-option :key="1" label="税入R0" :value="1"></el-option>
<el-option :key="2" label="税别R10" :value="2"></el-option>
<el-option :key="3" label="税别R0" :value="3"></el-option>
<el-option :key="4" label="税入R10" :value="4"></el-option>
</el-select>
</el-form-item>
</el-col>
......
src/components/Ticketing/flightPerformance.vue
View file @ c211af62
......@@ -3,25 +3,38 @@
border-bottom: 1px solid #d1d1d1;
border-right: 1px solid #d1d1d1;
background: #E6E6E6;
height:40px;
font-size: 14px;
height: 40px;
font-size: 14px;
color: #333;
}
.flightPerformance .fpTable{
width:1000px;
margin-bottom:30px;
border-collapse:collapse;
.flightPerformance .fpTable {
width: 1000px;
margin-bottom: 30px;
border-collapse: collapse;
}
.flightPerformance .creatName{
color:green;
.flightPerformance .creatName {
color: green;
font-weight: bold;
margin-right:10px;
margin-right: 10px;
}
.flightPerformance .fpTable tr {
background: #fff;
text-align: center;
height: 40px;
}
.flightPerformance .fpTable tr td {
font-size: 12px;
border: 1px solid #E5E5E5;
}
.flightPerformance .fpTable tr{background: #fff;text-align: center; height: 40px;}
.flightPerformance .fpTable tr td{font-size: 12px;border: 1px solid #E5E5E5;}
.flightPerformance .fpTable tbody tr:last-child {
border-bottom: 2px solid #333;
}
</style>
<template>
......@@ -50,7 +63,8 @@
</li>
</ul>
</div>
<table class="fpTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading" v-for="(item,index) in dataList.resultList">
<table class="fpTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading"
v-for="(item,index) in dataList.resultList">
<tbody v-for="(subItem,subIndex) in item.TicketList">
<tr v-if="subIndex==0">
<td colspan="6">
......@@ -71,13 +85,14 @@
<td width="10%">
{{childIndex+1}}
</td>
<td width="20%" :rowspan="subItem.SubList.length+1" style="border-bottom:2px solid black" v-if="childIndex==0">
{{subItem.OutBranchName}}
<td width="20%" :rowspan="subItem.SubList.length+1" style="border-bottom:2px solid black"
v-if="childIndex==0">
{{subItem.OutBranchName}}
</td>
<td width="30%">
<template v-if="childItem.TCID>0">
<a style="color:blue;cursor:pointer" @click='goUrlT("RegistrationList",childItem.TCID,"报名清单")'>
({{childItem.TCID}}){{childItem.TCNUM}}
({{childItem.TCID}}){{childItem.TCNUM}}
</a>
</template>
<template v-else>
......@@ -85,18 +100,19 @@
</template>
</td>
<td width="10%">{{childItem.TicketNum}}</td>
<td width="10%" :rowspan="subItem.SubList.length+1" style="border-bottom:2px solid black" v-if="childIndex==0">{{dataList.UnitPrice}}</td>
<td width="10%" :rowspan="subItem.SubList.length+1" style="border-bottom:2px solid black"
v-if="childIndex==0">{{dataList.UnitPrice}}</td>
<td width="10%">{{childItem.TicketNum*dataList.UnitPrice}}</td>
</tr>
<tr v-if="childIndex==subItem.SubList.length-1">
<td></td>
<td style="font-weight:bold;">合计</td>
<td style="color:red;">
{{getPeopleCount(subItem.SubList)}}
</td>
<td style="color:red;">
{{getCount(subItem.SubList)}}
</td>
<td></td>
<td style="font-weight:bold;">合计</td>
<td style="color:red;">
{{getPeopleCount(subItem.SubList)}}
</td>
<td style="color:red;">
{{getCount(subItem.SubList)}}
</td>
</tr>
</template>
<tr v-if="subIndex==item.TicketList.length-1">
......@@ -168,41 +184,43 @@
this.loading = false;
if (res.data.resultCode == 1) {
this.dataList = res.data.data;
} else {
this.Error(res.data.message);
}
});
},
//获取没个的人数
getPeopleCount(subList){
let count=0;
getPeopleCount(subList) {
let count = 0;
subList.forEach(x => {
count+=x.TicketNum;
count += x.TicketNum;
});
return count;
},
//计算小计
getCount(list){
let count=0;
getCount(list) {
let count = 0;
list.forEach(x => {
count+=x.TicketNum;
count += x.TicketNum;
});
return count*this.dataList.UnitPrice;
return count * this.dataList.UnitPrice;
},
//计算总计
getTotalCount(list){
let count=0;
list.forEach(x=>{
x.SubList.forEach(y=>{
count+=y.TicketNum
getTotalCount(list) {
let count = 0;
list.forEach(x => {
x.SubList.forEach(y => {
count += y.TicketNum
})
})
return count*this.dataList.UnitPrice;
return count * this.dataList.UnitPrice;
},
//获取总计人数
getTotalNum(list){
let count=0;
list.forEach(x=>{
x.SubList.forEach(y=>{
count+=y.TicketNum
getTotalNum(list) {
let count = 0;
list.forEach(x => {
x.SubList.forEach(y => {
count += y.TicketNum
})
})
return count;
......
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