Skip to content

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

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

parents 2a553130 5f2d66b6
Expand all Show whitespace changes
Inline Side-by-side
Showing with 311 additions and 169 deletions
src/components/Hotel/HotelQueryList.vue
View file @ cb413149
......@@ -96,7 +96,7 @@
<span style="color:#000000;background-color: #02F78E;padding:2px 4px;border-radius:5px">特别价</span>
</div>
<template v-if="isShow">
<el-table v-if="dataList.length>0" :data="dataList" style="width:100%" border v-loading='loading' height="500">
<el-table v-if="dataList.length>0" :data="dataList" style="width:100%" border v-loading='loading' :height="tableHeight">
<el-table-column fixed label="酒店名称" min-width="180">
<template slot-scope="scope">
<div style="text-decoration: underline;cursor:pointer" @click="GotoHotel(scope.row.HotelId)">
......@@ -265,6 +265,7 @@
//供应商
Supplier: 0,
},
tableHeight: 0,
beforeCheck: {
disabledDate: time => {
if (this.msg.StartDate) {
......@@ -376,6 +377,16 @@
});
}
},
com_onresize() {
//clientHeight的值由DIV内容的实际高度和CSS中的padding值决定，
var contentsHeight = document.body.clientHeight;
var h = contentsHeight - 50 - 180 - 50;
if (h < 110) {
return;
}
//设置table的行高
this.tableHeight = h;
},
getList() {
this.loading = true;
if (this.msg.StartDate == null) {
......@@ -592,7 +603,11 @@
this.GetHotelList();
this.getList();
this.GetHotelTipList();
},
this.com_onresize();
window.onresize = () => {
this.com_onresize();
}
}
};
</script>
......
src/components/Supplier/HotelManagement.vue
View file @ cb413149
......@@ -224,59 +224,69 @@
<ul style="position:relative;">
<li>
<span class="hotel_name">
<em>{{$t('hotel.hotel_name')}}</em>
<!-- 酒店名称 -->
<em>ホテル名</em>
<el-input maxlength="50" @keyup.native.enter="resetPageIndex(),selectResource()" v-model="msg.Name"></el-input>
</span>
</li>
<li>
<span>
<em>{{$t('system.quety_area')}}</em>
<!-- 区域 -->
<em>面積</em>
<el-select v-model="msg.QCountry" clearable class="w150" filterable @change="getProvinceList(msg.QCountry,1)"
:placeholder="$t('hotel.hotel_country')">
<el-option v-for="item in countryList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select>
<!-- 省 -->
<el-select v-model="msg.QProvince" class="w150" filterable @change="getProvinceList(msg.QProvince,2)"
:placeholder="$t('hotel.hotel_province')">
placeholder="州">
<el-option v-for="item in provinceList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select>
<el-select v-model="msg.QCity" class="w150" filterable @change="getProvinceList(msg.QCity,3)" :placeholder="$t('hotel.hotel_city')">
<!-- 市 -->
<el-select v-model="msg.QCity" class="w150" filterable @change="getProvinceList(msg.QCity,3)" placeholder="市区町村">
<el-option v-for="item in cityList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select>
<el-select v-model="msg.QDistrict" class="w150" filterable :placeholder="$t('hotel.hotel_area')">
<!-- 区 -->
<el-select v-model="msg.QDistrict" class="w150" filterable placeholder="地区">
<el-option v-for="item in district" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>{{$t('hotel.hotel_status')}}</em>
<el-select v-model="msg.Status" class="w210" :placeholder="$t('pub.unlimitedSel')">
<el-option :label="$t('pub.unlimitedSel')" value="-1"></el-option>
<!-- 状态 -->
<em>都道府県</em>
<el-select v-model="msg.Status" class="w210">
<el-option label="無制限" value="-1"></el-option>
<el-option v-for="item in status" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>酒店类型</em>
<el-select v-model="msg.HotelType" class="w210" :placeholder="$t('pub.unlimitedSel')">
<el-option :label="$t('pub.unlimitedSel')" value="-1"></el-option>
<!-- 酒店类型 -->
<em>ホテルのタイプ</em>
<el-select v-model="msg.HotelType" class="w210">
<el-option label="無制限" value="-1"></el-option>
<el-option v-for="item in HotelTypeList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>价格</em>
<el-select v-model="msg.HotelPirceType" class="w210" :placeholder="$t('pub.unlimitedSel')">
<el-option :label="$t('pub.unlimitedSel')" value="-1"></el-option>
<!-- 价格 -->
<em>価格</em>
<el-select v-model="msg.HotelPirceType" class="w210">
<el-option label="無制限" value="-1"></el-option>
<el-option v-for="item in HotelPirceTypeList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select>
</span>
</li>
<li style="position:absolute;top:0;right:10px;">
<button class="hollowFixedBtn" type="button" @click="resetPageIndex(),selectResource()">{{$t('pub.searchBtn')}}</button>
<button class="normalBtn" type="button" @click="goSubInfo('HotelInfo2')">{{$t('pub.addBtn')}}</button>
<!-- 查询 -->
<button class="hollowFixedBtn" type="button" @click="resetPageIndex(),selectResource()">問い合わせ</button>
<!-- 新增 -->
<button class="normalBtn" type="button" @click="goSubInfo('HotelInfo2')">新しい</button>
</li>
</ul>
</div>
......
src/components/Supplier/HotelQueryList.vue
View file @ cb413149
This diff is collapsed.
src/components/Supplier/HotelSalesBoard.vue
View file @ cb413149
......@@ -216,22 +216,24 @@
<ul style="position:relative;">
<li>
<span>
<em style="min-width:60px;">{{$t('system.quety_area')}}</em>
<!-- 区域 -->
<em style="min-width:60px;">面積</em>
<el-select v-model="msg.Province" filterable @change="getProvinceList(msg.Province,2)"
:placeholder="$t('hotel.hotel_province')">
<el-option :key="0" :value="0" label="请选择"></el-option>
<el-option :key="0" :value="0" label="選択してください"></el-option>
<el-option v-for="item in provinceList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select>
<el-select v-model="msg.City" filterable :placeholder="$t('hotel.hotel_city')">
<el-option :key="0" :value="0" label="请选择"></el-option>
<el-option :key="0" :value="0" label="選択してください"></el-option>
<el-option v-for="item in cityList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select>
</span>
</li>
<li>
<span><em style="min-width:60px;">{{$t('admin.admin_company')}}</em>
<el-select filterable v-model='msg.OutBranchId' :placeholder="$t('pub.unlimitedSel')">
<el-option :label="$t('pub.unlimitedSel')" :value='-1'></el-option>
<!-- 公司名称 -->
<span><em style="min-width:60px;">会社名</em>
<el-select filterable v-model='msg.OutBranchId' placeholder="選択してください">
<el-option label="無制限" :value='-1'></el-option>
<el-option v-for='item in companyList' :label='item.BName' :value='item.Id' :key="item.Id">
</el-option>
</el-select>
......@@ -239,40 +241,49 @@
</li>
<li>
<span>
<em style="min-width:60px;">酒店</em>
<el-select v-model="msg.HotelId" :placeholder="$t('pub.pleaseSel')" filterable>
<el-option :label="$t('pub.unlimitedSel')" :value="defaultSelectValue"></el-option>
<!-- 酒店 -->
<em style="min-width:60px;">ホテル</em>
<el-select v-model="msg.HotelId" placeholder="選択してください" filterable>
<el-option label="無制限" :value="defaultSelectValue"></el-option>
<el-option v-for="item in HotelList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select>
</span>
</li>
<li style="display:none;">
<span>
<em>供应商</em>
<el-select v-model="msg.Supplier" placeholder="请选择">
<el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
<em>仕入先</em>
<el-select v-model="msg.Supplier" placeholder="選択してください">
<el-option label="無制限" :value='0'></el-option>
<el-option v-for="(item,index) in SupplierList" :key="index" :label="item.Name" :value="item.ID">
</el-option>
</el-select>
</span>
</li>
<li style="position:absolute;right:10px;top:0;">
<button class="normalBtn" type="button" @click="GetHoltelInventory()">{{$t('pub.searchBtn')}}</button>
<input type="button" class="normalBtn" value="下载" @click="DownLoadHotelSalesBoard()" />
<!-- 查询 -->
<button class="normalBtn" type="button" @click="GetHoltelInventory()">問い合わせ</button>
<!-- 下载 -->
<input type="button" class="normalBtn" value="ダウンロードする" @click="DownLoadHotelSalesBoard()" />
</li>
</ul>
</div>
<div class="title">
酒店统计 共
<span class="Owe_Room">{{TotalInventory}}</span> 间, 当前使用
<span class="Owe_Room">{{UseInventory}}</span> 间,占比
<!-- 酒店统计 共 -->
ホテルの統計 合計
<span class="Owe_Room">{{TotalInventory}}</span> 部屋, 現在の使用 <!-- 间, 当前使用 -->
<span class="Owe_Room">{{UseInventory}}</span> 部屋,割合 <!-- 间,占比-->
<span class="Owe_Room">{{((UseInventory/TotalInventory)*100).toFixed(2)}}</span> %.
&nbsp;&nbsp;
<span class="hasStock_1" style="padding:2px 4px;border-radius:5px">红日</span>
<span class="hasStock_2" style="padding:2px 4px;border-radius:5px">旺季</span>
<span class="hasStock_3" style="padding:2px 4px;border-radius:5px">平季</span>
<span class="hasStock_4" style="padding:2px 4px;border-radius:5px">淡季</span>
<span class="hasStock_5" style="padding:2px 4px;border-radius:5px">特别价</span>
<!-- 红日 -->
<span class="hasStock_1" style="padding:2px 4px;border-radius:5px">赤い日</span>
<!-- 旺季 -->
<span class="hasStock_2" style="padding:2px 4px;border-radius:5px">ハイシーズン</span>
<!-- 平季 -->
<span class="hasStock_3" style="padding:2px 4px;border-radius:5px">フラットシーズン</span>
<!-- 淡季 -->
<span class="hasStock_4" style="padding:2px 4px;border-radius:5px">ローシーズン</span>
<!-- 特别价 -->
<span class="hasStock_5" style="padding:2px 4px;border-radius:5px">特別価格</span>
</div>
<div class="month">
<ul>
......
src/components/Supplier/HotelTotalStock.vue
View file @ cb413149
......@@ -335,21 +335,21 @@
<ul style="position:relative">
<li>
<span>
<em style="min-width:60px;">{{$t('system.quety_area')}}</em>
<em style="min-width:60px;">面積</em>
<el-select v-model="msg.Province" filterable @change="getProvinceList(msg.Province,2)"
:placeholder="$t('hotel.hotel_province')">
<el-option :key="0" :value="0" label="请选择"></el-option>
<el-option :key="0" :value="0" label="選択してください"></el-option>
<el-option v-for="item in provinceList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select>
<el-select v-model="msg.City" filterable :placeholder="$t('hotel.hotel_city')">
<el-option :key="0" :value="0" label="请选择"></el-option>
<el-option :key="0" :value="0" label="選択してください"></el-option>
<el-option v-for="item in cityList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select>
</span>
</li>
<li>
<span>
<em style="min-width:60px;">酒店</em>
<em style="min-width:60px;">ホテル</em>
<el-select v-model="msg.HotelId" :placeholder="$t('pub.pleaseSel')" filterable>
<el-option :label="$t('pub.unlimitedSel')" :value="DefaultSelectValue"></el-option>
<el-option v-for="item in HotelList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
......@@ -358,8 +358,8 @@
</li>
<li style="display:none;">
<span>
<em style="min-width:60px;">供应商</em>
<el-select v-model="msg.Supplier" placeholder="请选择">
<em style="min-width:60px;">仕入先</em>
<el-select v-model="msg.Supplier" placeholder="選択してください">
<el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
<el-option v-for="(item,index) in SupplierList" :key="index" :label="item.Name" :value="item.ID">
</el-option>
......@@ -369,7 +369,7 @@
<li class='time'>
<div class="block date">
<label class="demonstration">{{$t('pub.date')}}</label>
<label class="demonstration">日付</label>
<el-date-picker v-model="msg.sDate" type="date" :placeholder="$t('admin.admin_choDate')"
value-format="yyyy-MM-dd" :picker-options="pickerOptions1">
</el-date-picker>
......@@ -379,13 +379,13 @@
</div>
</li>
<li style="position:absolute;right:10px;top:0;">
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()" />
<input type="button" class="hollowFixedBtn" value="問い合わせ" @click="getList()" />
</li>
</ul>
</div>
<div class="hotelTS_box">
<div class="noData" v-show="noData">
{{$t('system.content_noData')}}
データなし
</div>
<ul class='clearfix' v-loading="loading">
<li v-for="(item,index) in DataList">
......@@ -395,7 +395,7 @@
<el-tooltip effect="dark" :content="item.Name" placement="top-start">
<p>{{item.Name}}</p>
</el-tooltip>
<p><span class="HT_nowInventory">目前库存</span><span class='Remain_num'>{{item.RemainingInventory}}</span>/间
<p><span class="HT_nowInventory">現在の在庫</span><span class='Remain_num'>{{item.RemainingInventory}}</span>/部屋
</p>
</div>
</li>
......
src/components/Supplier/roomQuery.vue
View file @ cb413149
This diff is collapsed.
src/components/Supplier/roomQuery2.vue
View file @ cb413149
......@@ -4,35 +4,49 @@
<ul style="position:relative;">
<li>
<span>
<em>月份</em>
<el-date-picker v-model="msg.QMonthStr" type="month" value-format="yyyy-MM" placeholder="选择月">
<!-- 月份 -->
<em>月</em>
<el-date-picker v-model="msg.QMonthStr" type="month" value-format="yyyy-MM" placeholder="選択月">
</el-date-picker>
</span>
</li>
<li style="position:absolute;right:10px;top:0;">
<input type="button" class="normalBtn" value="查询" @click="getList()" />
<input type="button" class="normalBtn" value="下载" style="display:none;" @click="DownLoadHotel()" />
<!-- 查询 -->
<input type="button" class="normalBtn" value="問い合わせ" @click="getList()" />
<!-- 下载 -->
<input type="button" class="normalBtn" value="ダウンロードする" style="display:none;" @click="DownLoadHotel()" />
</li>
</ul>
</div>
<div style="width: 100%; overflow-x: auto;padding-bottom: 10px; " class="ownScrollbarStyle">
<div style="font-size:12px;padding:2px 4px 3px 20px;">
<div style="display:inline-block;color:red;display:none">注意事项:每次导出数据最好不要超过一个月。</div>
<div class="rq_comSpan" style="display:inline-block;">颜色说明:
<span class="rq_span1">新增团体</span><span class="rq_span2">取消团体</span>
<span class="rq_span3">酒店提醒</span>
<!-- 每次导出数据最好不要超过一个月 -->
<div style="display:inline-block;color:red;display:none">注意事項:データをエクスポートするたびに1か月を超えないことをお勧めします。</div>
<!-- 颜色说明 -->
<div class="rq_comSpan" style="display:inline-block;">色の説明:
<!-- 新增团体 --> <!-- 取消团体 --> <!-- 酒店提醒 -->
<span class="rq_span1">グループを追加</span><span class="rq_span2">グループをキャンセル</span>
<span class="rq_span3">ホテルリマインダー</span>
</div>
</div><br />
<table border="0" cellspacing="1" cellpadding="0" class="roomQuery_SupplierTable" v-loading='loading'>
<tr>
<th width="100">订团号</th>
<th width="100">公司团号</th>
<th width="100">航班</th>
<th width="120">机位总数</th>
<th width="100">当前人数</th>
<th width="100">导游</th>
<th width="100">领队</th>
<th width="150">酒店详情</th>
<!-- 订团号 -->
<th width="100">グループ番号</th>
<!-- 公司团号 -->
<th width="100">会社グループ番号</th>
<!-- 航班 -->
<th width="100">フライト</th>
<!-- 机位总数 -->
<th width="120">総座席数</th>
<!-- 当前人数 -->
<th width="100">現在の番号</th>
<!-- 导游 -->
<th width="100">ガイド</th>
<!-- 领队 -->
<th width="100">リーダー</th>
<!-- 酒店详情 -->
<th width="150">ホテルの詳細</th>
</tr>
<tbody v-for="(item,index) in dataList">
<tr>
......@@ -65,8 +79,10 @@
{{item.LeaderName}} <template v-if="item.LeaderTel">(电话: {{item.LeaderTel}})</template>
</td>
<td>
<a class="hotelLink" slot="reference" @click="getHotelList(item.TCID,item.NewCombinationNum),hotelUseDetail=true">酒店使用情况</a>
<a class="hotelLink" slot="reference" @click="getClickItem(item),dijieDialog=true">备注</a>
<!-- 酒店使用情况 -->
<a class="hotelLink" slot="reference" @click="getHotelList(item.TCID,item.NewCombinationNum),hotelUseDetail=true">ホテル利用</a>
<!-- 备注 -->
<a class="hotelLink" slot="reference" @click="getClickItem(item),dijieDialog=true">備考</a>
</td>
</tr>
<tr>
......@@ -83,12 +99,14 @@
<span v-for="subItem in item.Numbers"></span>
</span>
</div>
<div><span class="rq_reSpan">注意事项</span> {{item.SupplierRemarks}}</div>
<!-- 注意事项 -->
<div><span class="rq_reSpan">注意事項</span> {{item.SupplierRemarks}}</div>
</td>
</tr>
<tr>
<!-- 对地接备注 -->
<td colspan="8" style="text-align:left;padding-left:5px;">
对地接备注： {{item.SupplierToDmcRemarks}}
地上での発言： {{item.SupplierToDmcRemarks}}
</td>
</tr>
</tbody>
......@@ -103,21 +121,23 @@
<el-dialog custom-class='w1006' :title='"【"+NewCombinationNum+"】"+"酒店信息"' :visible.sync="hotelUseDetail" center>
<table class="rq_HotelTable" v-loading="hotelLoading">
<tr>
<!-- 时间 -->
<th width="120">
时间
時間
</th>
<!-- 酒店 -->
<th width="150">
酒店
ホテル
</th>
<th width="300">
价格
価格
</th>
<th width="100">
税入/税别
</th>
<th width="100">提醒</th>
<th width="150">备注</th>
<th width="50">日志</th>
<th width="100">リマインダー</th>
<th width="150">備考</th>
<th width="50">ログ</th>
</tr>
<template v-for="(subItem,subIndex) in HotelList">
<tbody>
......
src/components/SupplierIndex.vue
View file @ cb413149
......@@ -613,10 +613,15 @@
<div style="width: 100%;min-height:200px; overflow-x: auto;padding:0 20px; " class="HotelQueryList"
v-loading="loading">
<div style="margin:20px 0">
<!-- 红日 -->
<span style="color:#fff;background-color: #ff3737;padding:2px 4px;border-radius:5px">赤い日</span>
<!-- 旺季 -->
<span style="color:#000000;background-color: #ff99cc;padding:2px 4px;border-radius:5px">ハイシーズン</span>
<!-- 平季 -->
<span style="color:#000000;background-color: #bcd6ee;padding:2px 4px;border-radius:5px">フラットシーズン</span>
<!-- 淡季 -->
<span style="color:#000000;background-color: #DDDDDD;padding:2px 4px;border-radius:5px">ローシーズン</span>
<!-- 特别价 -->
<span style="color:#000000;background-color: #02F78E;padding:2px 4px;border-radius:5px">特別価格</span>
</div>
<template v-if="isShow">
......@@ -633,9 +638,12 @@
<!-- 价格库存 -->
<el-table-column label="価格&在庫" fixed min-width="120">
<template slot-scope="scope">
<div class="Hotel_kong">价格</div>
<div class="Hotel_kong" style="min-width:60px;">总/用/剩</div>
<div class="Hotel_kong">超定</div>
<!-- 价格 -->
<div class="Hotel_kong">価格</div>
<!-- 总/用/剩 -->
<div class="Hotel_kong" style="min-width:60px;">合計/使用する/残り</div>
<!-- 超定 -->
<div class="Hotel_kong">過剰決定</div>
</template>
</el-table-column>
<el-table-column v-for='(item,index) in dataList[0].subList' :label="getDateList(item.DateStr)"
......@@ -731,7 +739,8 @@
</tr>
</template>
<tr v-else>
<td colspan="5">暂无数据...</td>
<!-- 暂无数据 -->
<td colspan="5">まだデータがありません...</td>
</tr>
</table>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="queryMsg.currentPage"
......@@ -743,9 +752,12 @@
<el-form>
<table border="0" cellspacing="1" cellpadding="0" class="HouseTypeList Hq_addTable" style="width:100%;">
<tr>
<!-- 编号 -->
<th width="50">数</th>
<th>内容</th>
<!-- 运营商 -->
<th width="70">オペレーター</th>
<!-- 运营时间 -->
<th width="140">稼働時間</th>
</tr>
<template v-if="queryMsg.total>0">
......@@ -759,7 +771,8 @@
</tr>
</template>
<tr v-else>
<td colspan="5">暂无数据...</td>
<!-- 暂无数据 -->
<td colspan="5">まだデータがありません...</td>
</tr>
</table>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="queryMsg.currentPage"
......@@ -767,7 +780,8 @@
</el-pagination>
</el-form>
<div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="showHQinfo = false">关闭</button>
<!-- 关闭 -->
<button class="hollowFixedBtn" @click="showHQinfo = false">閉じる</button>
</div>
</el-dialog>
</div>
......
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