Skip to content

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

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

parents a8927ed3 fc0581a7
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 939 additions and 407 deletions
src/components/FinancialModule/FinancialSubmodule/MergeBillModule.vue
View file @ fabb8dbb
......@@ -138,14 +138,16 @@
<!--<th rowspan="2">数量</th>-->
<!--<th rowspan="2">单 价</th>-->
<th rowspan="2">{{$t('hotel.hotel_Currency')}}</th>
<th colspan="3">{{$t('fnc.jine')}}</th>
<th colspan="5">{{$t('fnc.jine')}}</th>
<th rowspan="2">{{$t('hotel.hotel_remark')}}</th>
<th rowspan="2">{{$t('fnc.zhidanren')}}</th>
</tr>
<tr>
<th width="88">{{$t('fnc.yuanbi')}}</th>
<th width="50">{{$t('hotel.hotel_CurrentRate')}}</th>
<th width="88">{{$t('fnc.bweibi')}}</th>
<th width="68">{{$t('fnc.bweibi')}}</th>
<th width="68">到账</th>
<th width="48">手续费</th>
</tr>
<template v-if="GetDetail.MergeDetailList&&GetDetail.MergeDetailList.length">
<tr v-for="(item) in GetDetail.MergeDetailList" class="_color_b">
......@@ -163,6 +165,8 @@
<td height="34px">{{item.OriginalMoney}}</td>
<td height="34px">{{item.Rate}}</td>
<td height="34px">{{item.Money}}</td>
<td height="34px">{{item.PayMoney}}</td>
<td height="34px">{{item.Fee}}</td>
<td height="34px" style="max-width: 120px;">{{item.Remark}}</td>
<td height="34px">{{item.EmName}}</td>
</tr>
......@@ -212,7 +216,7 @@
<!--v-if="GetDetail.MergeBankList&&GetDetail.MergeBankList.length>0"-->
<tr v-if="GetDetail.MergeBankList&&GetDetail.MergeBankList.length>0">
<td height="34px" class="">{{$t('tips.jiaoyifangshi')}}</td>
<td height="34px" colspan="9" class="_color_b">
<td height="34px" colspan="11" class="_color_b">
<template v-for="(item,index) in GetDetail.MergeBankList">
<p class="_fex_cen clearfix"><span class="_bold">{{item.Alias}}-</span><span class="_bank_name">{{item.TypeName}}-</span><span class="_bank_type" :class="item.AccountType=='对私'?'':'_bank_type2'">{{item.AccountType==""?$t('fnc.no'):item.AccountType}}</span> {{item.BankNo?'-':''}} <span>{{item.BankNo}}</span></p>
</template>
......@@ -220,23 +224,23 @@
</tr>
<tr v-if="GetDetail.Merge">
<td height="34px" class="">{{$t('fnc.wbzjine')}}<span class="_font_size12"></span></td>
<td height="34px" colspan="3" class="_color_b">{{GetDetail.Merge.WBMoney==''?$t('fnc.ling'):GetDetail.WBChineseMoney}}（{{GetDetail.Merge.WBMoney}}）</td>
<td height="34px" colspan="4" class="_color_b">{{GetDetail.Merge.WBMoney==''?$t('fnc.ling'):GetDetail.WBChineseMoney}}（{{GetDetail.Merge.WBMoney}}）</td>
<td height="34px" class="">{{$t('fnc.bwbzjine')}}<span class="_font_size12"></span></td>
<td height="34px" colspan="5" class="_color_b">{{GetDetail.Merge.Money==''?$t('fnc.ling'):GetDetail.ChineseMoney}}（{{GetDetail.Merge.Money}}）</td>
<td height="34px" colspan="6" class="_color_b">{{GetDetail.Merge.Money==''?$t('fnc.ling'):GetDetail.ChineseMoney}}（{{GetDetail.Merge.Money}}）</td>
</tr>
<tr class="_huik_info" v-if="GetDetail.Type==1&&GetDetail.Merge">
<td height="34px" class="">{{$t('fnc.huikuanren')}}</td>
<td height="34px" colspan="3">
<td height="34px" colspan="4">
<span class="_color_b _font_size12">{{GetDetail.Merge.RemitterNameV2}}</span>
</td>
<td height="34px" class="">{{$t('fnc.hkshijian')}}</td>
<td height="34px" colspan="5">
<td height="34px" colspan="6">
<span class="_color_b _font_size12">{{GetDetail.Merge.TradeDateV2}}</span>
</td>
</tr>
<tr class="_huik_info" v-else-if="GetDetail.Type!=1&&GetDetail.Merge">
<td height="34px" class="">{{$t('fnc.jiaoyiriqi')}}</td>
<td height="34px" colspan="9">
<td height="34px" colspan="11">
<span class="_color_b _font_size12">{{GetDetail.Merge.TradeDateV2}}</span>
</td>
</tr>
......
src/components/FinancialModule/ReportForm/EasyReport.vue
View file @ fabb8dbb
......@@ -22,6 +22,9 @@
top: 55px;
right: 0;
}
.column-cell-class-name-test-lan-s .v-table-body-cell{
background-color: #9cf;
}
/* .My_table_tell .v-table-body-cell{
display: block!important;
line-height: 30px!important;
......@@ -981,6 +984,66 @@ export default {
if(rowData.ZongJi < 0 && columnName=="ZongJi"){
return "column-cell-class-name-test-red"
}
if(rowData.ZhaiYao=='以下项均不计入计算'){
if(rowData.YiYue==0){
rowData.YiYue='';
}
if(rowData.ErYue==0){
rowData.ErYue='';
}
if(rowData.SanYue==0){
rowData.SanYue='';
}
if(rowData.DiYiJiDu==0){
rowData.DiYiJiDu='';
}
if(rowData.SiYue==0){
rowData.SiYue='';
}
if(rowData.WuYue==0){
rowData.WuYue='';
}
if(rowData.LiuYue==0){
rowData.LiuYue='';
}
if(rowData.DiErJiDu==0){
rowData.DiErJiDu='';
}
if(rowData.ShangBanNianBao==0){
rowData.ShangBanNianBao='';
}
if(rowData.QiYue==0){
rowData.QiYue='';
}
if(rowData.BaYue==0){
rowData.BaYue='';
}
if(rowData.JiuYue==0){
rowData.JiuYue='';
}
if(rowData.DiSanJiDu==0){
rowData.DiSanJiDu='';
}
if(rowData.ShiYue==0){
rowData.ShiYue='';
}
if(rowData.ShiYiYue==0){
rowData.ShiYiYue='';
}
if(rowData.ShiErYue==0){
rowData.ShiErYue='';
}
if(rowData.DiSiJiDu==0){
rowData.DiSiJiDu='';
}
if(rowData.XiaBanNianBao==0){
rowData.XiaBanNianBao='';
}
if(rowData.ZongJi==0){
rowData.ZongJi='';
}
}
// 设置列class
if (columnName === "ZongJi") {
......@@ -1006,7 +1069,10 @@ export default {
}
if (rowData.ZhaiYao === '所得税费用') {
return "column-cell-class-name-test-greed-s";
}
}
if(rowData.ZhaiYao=='以下项均不计入计算'){
return "column-cell-class-name-test-lan-s"
}
},
exportExcel: function () {
let msg = {
......
src/components/FinancialModule/ReportForm/TeamRevenueReport.vue
View file @ fabb8dbb
......@@ -501,7 +501,7 @@ tr._item_list td:last-child {
</el-col>
<el-col :span="4">
<el-form-item label="数据类别：">
<el-select v-model="msg.DataType" filterable class="w150">
<el-select v-model="msg.DataType" :disabled="shujuType" filterable class="w150">
<el-option value="-1" label="不限"></el-option>
<el-option value="1" label="团队营收"></el-option>
<el-option value="3" label="单办签证"></el-option>
......@@ -1397,6 +1397,7 @@ export default {
pageIndex: 1,
AALloading: false,
BranchStatus:true,
shujuType:false,
};
},
created() {
......@@ -2082,6 +2083,17 @@ export default {
res => {
if (res.data.resultCode == 1) {
let BranchStatus=res.data.data.IsBranchButton;
if(BranchStatus==-2){
BranchStatus = -1;
this.shujuType = true;
this.apipost("line_post_GetList", {}, res => {
if (res.data.resultCode == 1) {
this.LineList = res.data.data;
} else {
this.Error(res.data.message);
}
});
}
if(BranchStatus==-1){
this.BranchStatus=false;
}else{
......
src/components/Hotel/HotelProductCalendar.vue
View file @ fabb8dbb
......@@ -29,9 +29,15 @@
<div v-if="item.data&&item.month===calendar.data.date" :class="stockColor(item.data.SubList[0].InventoryType)">
<template v-for="(childItem,childIndex) in item.data.SubList">
<p>
<span @click="goUrlA('2', item,childItem.BatchNumber)" class="text_underLine">价格：{{childItem.CostPrice}}（{{childItem.CurrencyName}}）</span>
<span class="text_underLine" @click="goUrlB(item)">总库存：{{childItem.Inventory}}（间）</span>
<span class="text_underLine" @click="goUrlHotelTeam(item)">剩余库存：{{childItem.RemainingInventory}}（间）</span>
<span title="点击修改价格和库存信息">
价格：<span @click="goUrlA('2', item,childItem.BatchNumber)" class="text_underLine">{{childItem.CostPrice}}（{{childItem.CurrencyName}}）</span>
</span><br/>
<span title="点击跳转到总库存看板">
总库存：<span class="text_underLine" @click="goUrlB(item)">{{childItem.Inventory}}（间）</span>
</span><br/>
<span title="点击跳转到酒店查询">
剩余库存：<span class="text_underLine" @click="goUrlHotelTeam(item)">{{childItem.RemainingInventory}}（间）</span>
</span>
</p>
</template>
</div>
......@@ -314,6 +320,7 @@
.text_underLine {
cursor: pointer;
text-decoration: underline
}
</style>
src/components/Hotel/HotelQueryList.vue
View file @ fabb8dbb
......@@ -27,16 +27,41 @@
</li>
<li>
<span>
<em>酒店</em>
<el-select v-model="msg.HotelChooseArray" :placeholder="$t('pub.pleaseSel')" filterable multiple :multiple-limit="3" size="mini">
<el-option v-for="item in HotelList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
<em>星级</em>
<el-select v-model="msg.Star" :placeholder="$t('pub.pleaseSel')" >
<el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
<el-option label="3星或商务" :value='3'></el-option>
<el-option label="4星" :value='4'></el-option>
<el-option label="5星" :value='5'></el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>价格区间</em>
<el-select v-model="msg.PriceLevel" :placeholder="$t('pub.pleaseSel')" >
<el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
<el-option label="5000以下" :value='1'></el-option>
<el-option label="5000~6000" :value='2'></el-option>
<el-option label="6000~7000" :value='3'></el-option>
<el-option label="7000~8000" :value='4'></el-option>
<el-option label="8000~9000" :value='5'></el-option>
<el-option label="9000~10000" :value='6'></el-option>
<el-option label="10000以上" :value='7'></el-option>
</el-select>
</span>
</li>
<li><span><em>日期</em>
<el-date-picker v-model='msg.StartDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
-
<el-date-picker v-model='msg.EndDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
<el-date-picker v-model='msg.StartDate' value-format="yyyy-MM-dd" type="date"></el-date-picker>
<el-date-picker v-model='msg.EndDate' value-format="yyyy-MM-dd" type="date"></el-date-picker>
</span>
</li>
<li>
<span>
<em>酒店</em>
<el-select v-model="msg.HotelChooseArray" :placeholder="$t('pub.pleaseSel')" class="multiple_input w300" filterable multiple :multiple-limit="3">
<el-option v-for="item in HotelList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select>
</span>
</li>
<li>
......@@ -69,8 +94,9 @@
</tr>
<tr v-for="item in dataList">
<td>
<div style="min-width:300px; text-align:left;padding-left:5px;cursor:pointer;" @click="GotoHotel(item.HotelId)">
{{item.HotelName}}</div>
<div style="min-width:140px; text-align:left;padding-left:5px;cursor:pointer;" >
<span title="点击跳转到酒店查询页面" @click="GotoHotel(item.HotelId)" style="text-decoration: underline;min-width:140px; ">{{item.HotelName}}</span>
<br/>（总库存:{{item.TotalInventory}}）</div>
</td>
<td>
<div class="Hotel_kong">价格</div>
......@@ -166,6 +192,8 @@
</div>
<el-dialog custom-class="w800" title="信息" :visible.sync="showHQinfo" center>
<el-form>
<div class="HQ_miaoshu">1.酒店库存系统已开放使用,欢迎前往参观选购!! </div>
<div class="HQ_miaoshu">2.库存酒店皆为时时更新,请上传人员细心上传!!</div>
<table border="0" cellspacing="1" cellpadding="0" class="HouseTypeList Hq_addTable" style="width:100%;">
<tr>
<th>编号</th>
......@@ -188,8 +216,6 @@
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="queryMsg.currentPage"
:page-size="queryMsg.pageSize" layout="total,prev, pager, next, jumper" :total="queryMsg.total">
</el-pagination>
<div class="HQ_miaoshu">1.酒店库存系统已开放使用,欢迎前往参观选购!! </div>
<div class="HQ_miaoshu">2.库存酒店皆为时时更新,请上传人员细心上传!!</div>
</el-form>
<div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="showHQinfo = false">关闭</button>
......@@ -211,6 +237,10 @@
Province: 0,
City: 0,
OutBranchId: -1,
//星级
Star:0,
//价格等级
PriceLevel:0
},
//分公司列表
......@@ -291,7 +321,6 @@
this.loading = false;
if (res.data.resultCode == 1) {
this.dataList = res.data.data;
console.log("dataList",this.dataList);
this.isShow = true;
} else {
this.Error(res.data.message);
......
src/components/Hotel/roomQuery.vue 0 → 100644
View file @ fabb8dbb
This diff is collapsed.
src/components/PrintPage.vue
View file @ fabb8dbb
......@@ -2,11 +2,11 @@
._PrintPage{
width: 100%;
background-color: white;
position: absolute;
/* position: absolute; */
padding-top: 20px;
}
._PrintPage_box{
width: 752px;
width: 1000px;
/* margin-left: 160px; */
margin: 0 auto;
padding: 0 !important;
......@@ -14,6 +14,12 @@
._border_1{
border: 1px solid #333333;
margin-bottom:30px;
page-break-after: always;
}
@media print {
._PrintPage{
margin-left:-145px;
}
}
</style>
<template v-loading="loading">
......
src/router/config.js
View file @ fabb8dbb
......@@ -856,6 +856,14 @@ export default {
title: '订房管理'
},
},
{
path: '/roomQuery', //订房查询
name: 'roomQuery',
component: resolve => require(['@/components/Hotel/roomQuery'], resolve),
meta: {
title: '订房查询'
},
},
{
path: '/roomReservationsDetails', //订房管理详情
name: 'roomReservationsDetails',
......
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