Skip to content

S
SuperMan
Commit 43711976 authored by 黄奎's avatar 黄奎
Browse files
Options

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

parents b2b957df 7ec3981f
Hide whitespace changes
Inline Side-by-side
Showing with 565 additions and 180 deletions
src/assets/common/lang/zhCN/Ground.js
View file @ 43711976
...@@ -213,5 +213,61 @@ export const obj = { ...@@ -213,5 +213,61 @@ export const obj = {
qingxuanzgys: "请输选择供应商", qingxuanzgys: "请输选择供应商",
qingxuanzeriq: "请选择日期", qingxuanzeriq: "请选择日期",
zhengzaitijiao: "正在提交", zhengzaitijiao: "正在提交",
yizhidanbng: "已制单，不能再修改!",
jisuan1: "税别计算: 单价 * (预订人数-免减人数) * (1 + 0.08 - 返佣比例 / 100)",
jisuan2: "税入计算: 单价 * (预订人数-免减人数) * (1 - 返佣比例 / 100)",
sidaobsuan: "司导间【月结】不计入总金额",
dijiecaozuoxinxi: "地接操作信息",
jiweizongshu: "机位总数",
shiji: "实际",
yongfangshu: "用房数",
xiugaijiudiangys: "修改酒店/供应商",
fangjianleixing: "房间类型",
fangjian: "房间",
yudingshu: "预定数",
yudingrenshu: "预定人数",
danjiameiren: "单价/每人",
mianjianrenshu: "免减人数",
jinexiaoji: "金额小计",
fanyongyjin: "返佣金额",
jinezongji: "金额总计",
fukuanbzdth: "付款方式&订团号&备注",
qingxuanzegys: "请选择供应商",
shoupeifei: "手配费",
wshoupeifei: "无手配费",
hanshui: "含税",
bhanshui: "不含税",
dfzhuangtai: "订房状态",
lingduidydf: "领队导游垫付",
shuaka: "刷卡",
yuejie: "月结",
sidaoffkfs: "司导房付款方式",
fukuanth: "付款团号",
dingtuanhao: "订团号",
tixinggys: "提醒供应商",
yibantx: "一般提醒",
zhongyaotx: "重要提醒",
duigysbz: "对供应商备注",
gongysddjbz: "供应商对地接备注",
shifoutbgxfj: "是否同步更新房间数",
tongbugx: "同步更新",
bugengxin: "不更新",
qingqiucanscw: "请求参数错误",
zymcdcsjbcgygy: "注意事项:每次导出数据最好不要超过一个月",
shuyongsj: "使用时间",
dingfangcx: "订房查询",
fangjianfp: "房间分配",
nanxingzhanchuang: "男性占床",
nvxingzhanchuang: "女性占床",
sanxinghsw: "3星或商务",
sixing: "4星",
wuxing: "5星",
jiagequjian: "价格区间",
wukucun: "无库存",
shezhijiudian: "设置酒店",
thdjth: "团号/地接团号",
sfthxzjd: "是否要替换选中的酒店?",
jiudiangzb: "酒店工作表",
shifoushancgjd: "是否要删除该酒店?",
} }
export default obj; export default obj;
\ No newline at end of file
src/assets/common/lang/zhTW/Ground.js
View file @ 43711976
...@@ -213,5 +213,61 @@ export const obj = { ...@@ -213,5 +213,61 @@ export const obj = {
qingxuanzgys: "請輸選擇供應商", qingxuanzgys: "請輸選擇供應商",
qingxuanzeriq: "請選擇日期", qingxuanzeriq: "請選擇日期",
zhengzaitijiao: "正在提交", zhengzaitijiao: "正在提交",
yizhidanbng:"已制單，不能再修改！",
jisuan1:"稅別計算：單價*（預訂人數-免减人數）*（1 + 0.08 -返傭比例/ 100）",
jisuan2:"稅入計算：單價*（預訂人數-免减人數）*（1 -返傭比例/ 100）",
sidaobsuan:"司導間【月結】不計入總金額",
dijiecaozuoxinxi:"地接操作資訊",
jiweizongshu:"機位總數",
shiji:"實際",
yongfangshu:"用房數",
xiugaijiudiangys:"修改飯店/供應商",
fangjianleixing:"房間類型",
fangjian:"房間",
yudingshu:"預定數",
yudingrenshu:"預定人數",
danjiameiren:"單價/每人",
mianjianrenshu:"免减人數",
jinexiaoji:"金額小計",
fanyongyjin:"返傭金額",
jinezongji:"金額總計",
fukuanbzdth:"付款方式&訂團號&備註",
qingxuanzegys:"請選擇供應商",
shoupeifei:"手配費",
wshoupeifei:"無手配費",
hanshui:"含稅",
bhanshui:"不含稅",
dfzhuangtai:"訂房狀態",
lingduidydf:"領隊導遊墊付",
shuaka:"刷卡",
yuejie:"月結",
sidaoffkfs:"司導房付款方式",
fukuanth:"付款團號",
dingtuanhao:"訂團號",
tixinggys:"提醒供應商",
yibantx:"一般提醒",
zhongyaotx:"重要提醒",
duigysbz:"對供應商備註",
gongysddjbz:"供應商對地接備註",
shifoutbgxfj:"是否同步更新房間數",
tongbugx:"同步更新",
bugengxin:"不更新",
qingqiucanscw: "請求參數錯誤",
zymcdcsjbcgygy: "注意事項：每次匯出數據最好不要超過一個月",
shuyongsj: "使用時間",
dingfangcx: "訂房査詢",
fangjianfp: "房間分配",
nanxingzhanchuang: "男性占床",
nvxingzhanchuang: "女性占床",
sanxinghsw: "3星或商務",
sixing: "4星",
wuxing: "5星",
jiagequjian: "價格區間",
wukucun: "無庫存",
shezhijiudian: "設定飯店",
thdjth: "團號/地接團號",
sfthxzjd: "是否要替換選中的飯店?",
jiudiangzb: "飯店工作表",
shifoushancgjd: "是否要删除該飯店?",
} }
export default obj; export default obj;
\ No newline at end of file
src/components/Buying/BuyingList.vue
View file @ 43711976
...@@ -100,6 +100,9 @@ ...@@ -100,6 +100,9 @@
<el-tooltip class="item" effect="dark" content="下架" placement="top"> <el-tooltip class="item" effect="dark" content="下架" placement="top">
<el-button type="warning" size="mini" class="iconfont icon-xiajia1" @click="setProS(2, item.Id)" v-if="item.Status === 3"></el-button> <el-button type="warning" size="mini" class="iconfont icon-xiajia1" @click="setProS(2, item.Id)" v-if="item.Status === 3"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="价格" placement="top">
<el-button type="warning" size="mini" class="iconfont icon-jiage" @click="setPrice(item.Id)"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="取消" placement="top"> <el-tooltip class="item" effect="dark" content="取消" placement="top">
<el-button type="danger" size="mini" class="iconfont icon-quxiao1" @click="setProS(4, item.Id)"></el-button> <el-button type="danger" size="mini" class="iconfont icon-quxiao1" @click="setProS(4, item.Id)"></el-button>
</el-tooltip> </el-tooltip>
...@@ -145,6 +148,9 @@ export default { ...@@ -145,6 +148,9 @@ export default {
}, },
methods: { methods: {
setPrice(id){
this.$router.push({ name: 'BuyingPrice',query:{blank: 'y', proId: id} })
},
setProS(t, id){ setProS(t, id){
this.apipost("Shop_post_SetCommodityStatus",{CommodityId: id, Status: t},res => { this.apipost("Shop_post_SetCommodityStatus",{CommodityId: id, Status: t},res => {
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
......
src/components/Buying/BuyingPrice.vue 0 → 100644
View file @ 43711976
<style>
.height_auto.el-select .el-input{
height: auto
}
.BuyingList .el-button-group .el-button{
padding: 6px !important;
}
.BuyingList .el-button-group .el-button.iconfont{
font-size: 12px !important;
}
</style>
<template>
<div class="flexOne BuyingList">
<div class="query-box">
<ul class="user_time_picker">
<li>
<span>
<em>{{$t('MarketingActi.commName')}}</em>
<el-input v-model="msg.name" @keyup.enter.native="getList"></el-input>
</span>
</li>
<li>
<input type="button" @click="getList" class="hollowFixedBtn" :value="$t('pub.searchBtn')">
<input type="button" @click="outerVisible = true" class="normalBtn" :value="$t('pub.addBtn')">
</li>
</ul>
</div>
<div class="clearfix"></div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
<tr>
<th>{{$t('MarketingActi.commName')}}</th>
<th>成本价</th>
<th>销售价</th>
<th>开始时间</th>
<th>结束时间</th>
<th>描述</th>
<th>操作人</th>
<th>操作时间</th>
<th>{{$t('system.table_operation')}}</th>
</tr>
<tr v-for="item in dataList">
<td>{{item.CommodityName}}</td>
<td>{{item.CostPrice}}</td>
<td>{{item.SellPrice}}</td>
<td>{{item.StartTime}}</td>
<td>{{item.EndTime}}</td>
<td>{{item.Description}}</td>
<td>{{item.UpdateBy}}</td>
<td>{{item.UpdateDate}}</td>
<td class="BuyingList">
<el-button-group size="mini">
<el-tooltip class="item" effect="dark" content="修改" placement="top">
<el-button type="primary" size="mini" class="iconfont icon-xiugai" @click="editPrice(item)"></el-button>
</el-tooltip>
</el-button-group>
</td>
</tr>
</table>
<el-dialog
custom-class="w400"
title="新增价格"
:visible.sync="outerVisible"
center
:before-close="closeChangeMachie"
>
<el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="140px">
<el-form-item label="成本价格" prop="CostPrice">
<el-input v-model="addMsg.CostPrice" class="w217"/>
</el-form-item>
<el-form-item label="销售价格" prop="SellPrice">
<el-input v-model="addMsg.SellPrice" class="w217"/>
</el-form-item>
<el-form-item label="价格有效开始时间" prop="StartDate">
<el-date-picker
v-model="addMsg.StartDate"
type="date"
value-format="yyyy-MM-dd"
@change="regDate()"
:picker-options="pickerOptions"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item label="价格有效结束时间" prop="EndDate">
<el-date-picker
v-model="addMsg.EndDate"
type="date"
:picker-options="pickerOptions"
value-format="yyyy-MM-dd"
@change="regDate(1)"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item label="描述" prop="Description">
<el-input v-model="addMsg.Description" class="w217"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<button
class="hollowFixedBtn"
@click="outerVisible = false, resetForm('addMsg')"
>{{$t('pub.cancelBtn')}}</button> &nbsp;
<button class="normalBtn" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button>
</div>
</el-dialog>
<el-pagination background @current-change="handleCurrentChange" layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=total>
</el-pagination>
<div class="noDataNotice" v-if="dataList.length<1">
<i class="iconfont icon-kong"></i>
<p>{{$t("active.ld_noData")}}</p>
</div>
</div>
</template>
<script>
export default {
data() {
return {
//请求
msg: {
pageSize: 15,
pageIndex: 1,
CommodityId: 0,
CommodityName: '',
StartDate: ''
},
addMsg: {
CommodityId: '',
Description: '',
CostPrice: '',
SellPrice: '',
StartDate: '',
EndDate: '',
Id: 0,
},
rules: {
Description: [
{ required: true, message: "请输入描述信息", trigger: "blur" }
],
CostPrice: [
{ required: true, message: "请输入成本价格", trigger: "blur" }
],
SellPrice: [
{ required: true, message: "请输入销售价格", trigger: "blur" }
],
StartDate: [
{ required: true, message: "请选择开始时间", trigger: "blur" }
],
EndDate: [
{ required: true, message: "请选择结束时间", trigger: "blur" }
]
},
loading:false,
dataList:[],
total:0,
outerVisible: false,
pickerOptions: {
disabledDate(time) {
return time.getTime() < Date.now() - 8.64e7
}
}
};
},
mounted() {
this.msg.CommodityId = this.addMsg.CommodityId = this.$route.query.proId
this.getList();
},
filters: {
},
methods: {
regDate(t){
if (t) {
if (this.addMsg.StartDate == '') return
if (this.addMsg.StartDate > this.addMsg.EndDate) {
this.addMsg.EndDate = ''
this.$message.error('结束时间必须大于开始时间')
}
return
}
if (this.addMsg.EndDate == '') return
if (this.addMsg.StartDate > this.addMsg.EndDate) {
this.addMsg.StartDate = ''
this.$message.error('开始时间必须小于结束时间')
}
},
handleCurrentChange(val){
this.msg.pageIndex=val;
this.getList();
},
editPrice(item){
this.addMsg.Description = item.Description;
this.addMsg.CostPrice = item.CostPrice;
this.addMsg.SellPrice = item.SellPrice;
this.addMsg.StartDate = item.StartTime;
this.addMsg.EndDate = item.EndTime;
this.addMsg.Id = item.Id
this.outerVisible = true;
},
closeChangeMachie(done) {
//弹出框关闭初始化弹框内表单
done();
this.resetForm("addMsg");
},
//重置信息
resetInfo() {
var newMsg = {
CommodityId: this.$route.query.proId,
Description: '',
CostPrice: '',
SellPrice: '',
StartDate: '',
EndDate: '',
Id: 0
};
this.addMsg = newMsg;
},
addAward(){
this.apipost("Shop_post_SetCommodityPriceInfo", this.addMsg, res => {
if (res.data.resultCode === 1) {
this.getList()
this.resetInfo()
this.outerVisible = false;
} else {
this.Error(res.data.message)
}
}, null);
},
//提交
submitForm(addMsg) {
//提交创建、修改表单
this.$refs[addMsg].validate(valid => {
if (valid) {
this.addAward();
} else {
return false;
}
});
},
//获取数据
getList() {
this.loading = true;
this.apipost("Shop_post_GetCommodityPricePageList", this.msg, res => {
this.loading = false;
if (res.data.resultCode === 1) {
this.dataList = res.data.data.pageData;
this.total= res.data.data.count;
} else {
this.Error(res.data.message)
}
}, null);
},
resetForm(formName) {
this.$refs[formName].resetFields();
this.resetInfo()
}
}
};
</script>
\ No newline at end of file
src/components/Hotel/HotelWorkList.vue
View file @ 43711976
...@@ -34,11 +34,11 @@ ...@@ -34,11 +34,11 @@
<em>{{$t('system.quety_area')}}</em> <em>{{$t('system.quety_area')}}</em>
<el-select v-model="msg.Province" filterable class="w110 HworkInput" @change="getProvinceList(msg.Province,2)" <el-select v-model="msg.Province" filterable class="w110 HworkInput" @change="getProvinceList(msg.Province,2)"
:placeholder="$t('hotel.hotel_province')"> :placeholder="$t('hotel.hotel_province')">
<el-option :key="0" :value="0" label="请选择"></el-option> <el-option :key="0" :value="0" :label="$t('pub.pleaseSel')"></el-option>
<el-option v-for="item in provinceList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option> <el-option v-for="item in provinceList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select> </el-select>
<el-select v-model="msg.City" filterable class="w110 HworkInput" :placeholder="$t('hotel.hotel_city')"> <el-select v-model="msg.City" filterable class="w110 HworkInput" :placeholder="$t('hotel.hotel_city')">
<el-option :key="0" :value="0" label="请选择"></el-option> <el-option :key="0" :value="0" :label="$t('pub.pleaseSel')"></el-option>
<el-option v-for="item in cityList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option> <el-option v-for="item in cityList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select> </el-select>
</span> </span>
...@@ -54,18 +54,18 @@ ...@@ -54,18 +54,18 @@
</li> </li>
<li> <li>
<span> <span>
<em>星级</em> <em>{{$t('hotel.hotel_starlevel')}}</em>
<el-select v-model="msg.Star" :placeholder="$t('pub.pleaseSel')"> <el-select v-model="msg.Star" :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option> <el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
<el-option label="3星或商务" :value='3'></el-option> <el-option :label="$t('ground.sanxinghsw')" :value='3'></el-option>
<el-option label="4星" :value='4'></el-option> <el-option :label="$t('ground.sixing')" :value='4'></el-option>
<el-option label="5星" :value='5'></el-option> <el-option :label="$t('ground.wuxing')" :value='5'></el-option>
</el-select> </el-select>
</span> </span>
</li> </li>
<li> <li>
<span> <span>
<em>价格区间</em> <em>{{$t('ground.jiagequjian')}}</em>
<el-select v-model="msg.PriceLevel" :placeholder="$t('pub.pleaseSel')"> <el-select v-model="msg.PriceLevel" :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option> <el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
<el-option label="5000以下" :value='1'></el-option> <el-option label="5000以下" :value='1'></el-option>
...@@ -80,16 +80,16 @@ ...@@ -80,16 +80,16 @@
</li> </li>
<li> <li>
<span> <span>
<em>时间</em> <em>{{$t('adm.adm_time')}}</em>
<el-date-picker v-model="msg.YearMonthStr" type="month" value-format="yyyy-MM" placeholder="选择月"> <el-date-picker v-model="msg.YearMonthStr" type="month" value-format="yyyy-MM" :placeholder="$t('ground.xuanzeyue')">
</el-date-picker> </el-date-picker>
</span> </span>
</li> </li>
<li> <li>
<span> <span>
<em>供应商</em> <em>{{$t('hotel.hotel_Supplier')}}</em>
<el-select v-model="msg.Supplier" placeholder="请选择"> <el-select v-model="msg.Supplier" :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option> <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 v-for="(item,index) in SupplierList" :key="index" :label="item.Name" :value="item.ID">
</el-option> </el-option>
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
</li> </li>
<li> <li>
<span> <span>
<em>酒店</em> <em>{{$t('hotel.hotel')}}</em>
<el-select v-model="msg.HotelChooseArray" :placeholder="$t('pub.pleaseSel')" class="multiple_input w300" <el-select v-model="msg.HotelChooseArray" :placeholder="$t('pub.pleaseSel')" class="multiple_input w300"
filterable multiple :multiple-limit="3"> filterable multiple :multiple-limit="3">
<el-option v-for="item in HotelList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option> <el-option v-for="item in HotelList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
...@@ -106,20 +106,20 @@ ...@@ -106,20 +106,20 @@
</span> </span>
</li> </li>
<li> <li>
<input type="button" class="normalBtn" value="查询" @click="getList()" /> <input type="button" class="normalBtn" :value="$t('pub.searchBtn')" @click="getList()" />
<input type="button" class="normalBtn" value="下载" @click="DownLoadHotelWork()" /> <input type="button" class="normalBtn" :value="$t('adm.adm_download')" @click="DownLoadHotelWork()" />
</li> </li>
</ul> </ul>
</div> </div>
<div class="hotelProductManage2_tableBox" style="margin-bottom: 20px;"> <div class="hotelProductManage2_tableBox" style="margin-bottom: 20px;">
<span style="color:#FFFFFF; background-color:green ; padding: 2px 4px; border-radius: 5px;">OK</span> <span style="color:#FFFFFF; background-color:green ; padding: 2px 4px; border-radius: 5px;">OK</span>
<span style="color:#FFFFFF; background-color:#3333CC; padding: 2px 4px; border-radius: 5px;">暂定</span> <span style="color:#FFFFFF; background-color:#3333CC; padding: 2px 4px; border-radius: 5px;">{{$t('visa.v_zanding')}}</span>
<span style="color:#FFFFFF; background-color:red; padding: 2px 4px; border-radius: 5px;">未操作</span> <span style="color:#FFFFFF; background-color:red; padding: 2px 4px; border-radius: 5px;">{{$t('ground.wicaozuo')}}</span>
<span style="color:#FFFFFF; background-color:#000; padding: 2px 4px; border-radius: 5px;">无库存</span> <span style="color:#FFFFFF; background-color:#000; padding: 2px 4px; border-radius: 5px;">{{$t('ground.wukucun')}}</span>
</div> </div>
<template v-if="isShow"> <template v-if="isShow">
<el-table :data="dataList" style="width:100%" border v-loading='loading' :height="tableHeight"> <el-table :data="dataList" style="width:100%" border v-loading='loading' :height="tableHeight">
<el-table-column fixed label="酒店名称" min-width="220" style="background:#EAEAEA"> <el-table-column fixed :label="$t('hotel.hotel_name')" min-width="220" style="background:#EAEAEA">
<template slot-scope="scope"> <template slot-scope="scope">
<div style="text-decoration: underline;cursor:pointer" @click="GotoHotel(scope.row.Hotel)"> <div style="text-decoration: underline;cursor:pointer" @click="GotoHotel(scope.row.Hotel)">
{{scope.row.HotelName}} {{scope.row.HotelName}}
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
<el-table-column v-for='(item,index) in dataList[0].DayList' :label="item.DateStr" :key='index' min-width="210"> <el-table-column v-for='(item,index) in dataList[0].DayList' :label="item.DateStr" :key='index' min-width="210">
<template slot-scope="scope"> <template slot-scope="scope">
<template v-if="scope.row.DayList[index].IsHaveStock==0"> <template v-if="scope.row.DayList[index].IsHaveStock==0">
<div style="background-color:#000!important;width:50px;height:100%;margin:0,padding:0;color:#FFFFFF">无库存 <div style="background-color:#000!important;width:50px;height:100%;margin:0,padding:0;color:#FFFFFF">{{$t('ground.wukucun')}}
</div> </div>
</template> </template>
<template v-else> <template v-else>
...@@ -142,12 +142,12 @@ ...@@ -142,12 +142,12 @@
@click="outerVisible=true,GetClickItem(item.DateAllStr,scope.row.Hotel,childItem.TCID)"> @click="outerVisible=true,GetClickItem(item.DateAllStr,scope.row.Hotel,childItem.TCID)">
{{childItem.BookGroup}} {{childItem.BookGroup}}
</div> </div>
<a style="display:inline-block;text-decoration:underline;color:red;cursor:pointer" @click="DeleteHotel(item.DateAllStr,scope.row.Hotel,childItem.TCID)">删除</a> <a style="display:inline-block;text-decoration:underline;color:red;cursor:pointer" @click="DeleteHotel(item.DateAllStr,scope.row.Hotel,childItem.TCID)">{{$t('system.table_delete')}}</a>
</template> </template>
</template> </template>
<template v-else> <template v-else>
<div slot="reference" class="w80" style="cursor:pointer;text-decoration:underline;" <div slot="reference" class="w80" style="cursor:pointer;text-decoration:underline;"
@click="outerVisible=true,GetClickItem(item.DateAllStr,scope.row.Hotel,0)">设置酒店 @click="outerVisible=true,GetClickItem(item.DateAllStr,scope.row.Hotel,0)">{{$t('ground.shezhijiudian')}}
</div> </div>
</template> </template>
</template> </template>
...@@ -161,34 +161,34 @@ ...@@ -161,34 +161,34 @@
</template> </template>
<el-dialog custom-class='HW_hotelDialog' :title="'【'+qMsg.DateStr+'】团期酒店信息列表'" :visible.sync="outerVisible" center> <el-dialog custom-class='HW_hotelDialog' :title="'【'+qMsg.DateStr+'】团期酒店信息列表'" :visible.sync="outerVisible" center>
<div> <div>
团号/地接团号:&nbsp;&nbsp;&nbsp;<el-input type="text" v-model="qMsg.TCNUM" maxlength="50" class="w200"></el-input> {{$t('ground.thdjth')}}:&nbsp;&nbsp;&nbsp;<el-input type="text" v-model="qMsg.TCNUM" maxlength="50" class="w200"></el-input>
<input type="button" class="normalBtn" value="查询" @click="GetChangeHotelList()" /> <input type="button" class="normalBtn" :value="$t('pub.searchBtn')" @click="GetChangeHotelList()" />
</div> </div>
<table class="Hw_tableOne" style="margin-top:20px;"> <table class="Hw_tableOne" style="margin-top:20px;">
<tr> <tr>
<th width="60"> <th width="60">
选择 {{$t('fnc.xuanze')}}
</th> </th>
<th width="145"> <th width="145">
团号 {{$t('visa.v_tuanhao')}}
</th> </th>
<th width="150"> <th width="150">
地接团号 {{$t('salesModule.DJNum')}}
</th> </th>
<th width="125"> <th width="125">
酒店 {{$t('hotel.hotel')}}
</th> </th>
<th width="125"> <th width="125">
更换酒店 {{$t('salesModule.ChangeHotel')}}
</th> </th>
<th width="80"> <th width="80">
OP状态 {{$t('salesModule.OPstatus')}}
</th> </th>
<th width="90"> <th width="90">
地接状态 {{$t('salesModule.DJstatus')}}
</th> </th>
<th width="90"> <th width="90">
操作 {{$t('system.table_operation')}}
</th> </th>
</tr> </tr>
</table> </table>
...@@ -213,32 +213,32 @@ ...@@ -213,32 +213,32 @@
</td> </td>
<td style="text-align:center;" width="80"> <td style="text-align:center;" width="80">
<template v-if="hItem.OPState==1"> <template v-if="hItem.OPState==1">
<a style="color:green">OP-指定</a> <a style="color:green">{{$t('salesModule.OPZD')}}</a>
</template> </template>
<template v-else-if="hItem.OPState==2"> <template v-else-if="hItem.OPState==2">
<a style="color:red">OP-暂定</a> <a style="color:red">{{$t('salesModule.OPCD')}}</a>
</template> </template>
</td> </td>
<td style="text-align:center;" width="90"> <td style="text-align:center;" width="90">
<template v-if="hItem.DMCState==1"> <template v-if="hItem.DMCState==1">
<a style="color:green">地接-OK</a> <a style="color:green">{{$t('salesModule.DJOK')}}</a>
</template> </template>
<template v-else-if="hItem.DMCState==2"> <template v-else-if="hItem.DMCState==2">
<a style="color:red">地接-暂定</a> <a style="color:red">{{$t('salesModule.DJZK')}}</a>
</template> </template>
<template v-else-if="hItem.DMCState==0"> <template v-else-if="hItem.DMCState==0">
<a style="color:red">地接-未操作</a> <a style="color:red">{{$t('salesModule.DJWCZ')}}</a>
</template> </template>
</td> </td>
<td style="text-align:center;" width="90"> <td style="text-align:center;" width="90">
<a style="text-decoration:underline;color:blue;cursor:pointer;" @click="DelItem(hItem)">删除</a> <a style="text-decoration:underline;color:blue;cursor:pointer;" @click="DelItem(hItem)">{{$t('system.table_delete')}}</a>
</td> </td>
</tr> </tr>
</table> </table>
</div> </div>
<div style="text-align:center;margin-top:20px;"> <div style="text-align:center;margin-top:20px;">
<input type="button" class="normalBtn" value="保存" @click="SaveHotelOrder()" /> <input type="button" class="normalBtn" :value="$t('pub.saveBtn')" @click="SaveHotelOrder()" />
<input type="button" class="normalBtn" value="关闭" @click="CloseHotel()" /> <input type="button" class="normalBtn" :value="$t('pub.closeSel')" @click="CloseHotel()" />
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
...@@ -347,7 +347,7 @@ ...@@ -347,7 +347,7 @@
//保存酒店订单 //保存酒店订单
SaveHotelOrder() { SaveHotelOrder() {
var that = this; var that = this;
that.Confirm("是否要替换选中的酒店?", function () { that.Confirm(that.$t('ground.sfthxzjd'), function () {
var newList = []; var newList = [];
if (that.MyDataList && that.MyDataList.length > 0) { if (that.MyDataList && that.MyDataList.length > 0) {
that.MyDataList.forEach(item => { that.MyDataList.forEach(item => {
...@@ -379,7 +379,7 @@ ...@@ -379,7 +379,7 @@
//删除酒店 //删除酒店
DelItem(hItem) { DelItem(hItem) {
var that = this; var that = this;
this.Confirm("是否删除?删除后将不能恢复!", function () { this.Confirm(that.$t('sm.sfdeletenothf'), function () {
that.apipost('dmcstatistics_post_DeleteHotelOrder', { that.apipost('dmcstatistics_post_DeleteHotelOrder', {
ID: hItem.ID, ID: hItem.ID,
TCID: hItem.TCID TCID: hItem.TCID
...@@ -483,7 +483,7 @@ ...@@ -483,7 +483,7 @@
queryMsg: this.msg, queryMsg: this.msg,
uid: this.getLocalStorage().EmployeeId uid: this.getLocalStorage().EmployeeId
}; };
let fileName = "酒店工作表" + this.$commonUtils.getCurrentDate() + ".xls"; let fileName = this.$t('ground.jiudiangzb') + this.$commonUtils.getCurrentDate() + ".xls";
this.GetLocalFile("hotel_get_downloadHotelWork", qMsg, fileName, this.GetLocalFile("hotel_get_downloadHotelWork", qMsg, fileName,
res => { res => {
this.loading = false; this.loading = false;
...@@ -507,7 +507,7 @@ ...@@ -507,7 +507,7 @@
Hotel:Hotel, Hotel:Hotel,
UseTime:DateAllStr UseTime:DateAllStr
}; };
that.Confirm("是否要删除该酒店?", function () { that.Confirm(that.$t('ground.shifoushancgjd'), function () {
that.apipost("journeyorder_post_DeleteWorkHotelOrderService", nMsg, that.apipost("journeyorder_post_DeleteWorkHotelOrderService", nMsg,
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
......
src/components/Hotel/roomQuery.vue
View file @ 43711976
...@@ -14,9 +14,9 @@ ...@@ -14,9 +14,9 @@
</li> </li>
<li> <li>
<span> <span>
<em>系列</em> <em>{{$t('advmanager.v_xilie')}}</em>
<el-select v-model="msg.LineteamId" filterable :placeholder="$t('pub.pleaseSel')"> <el-select v-model="msg.LineteamId" filterable :placeholder="$t('pub.pleaseSel')">
<el-option label="不限" :value='0'></el-option> <el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
<el-option v-for="item in queryCommonData.LineTeamList" :label='item.LtName' :value='item.LtID' <el-option v-for="item in queryCommonData.LineTeamList" :label='item.LtName' :value='item.LtID'
:key='item.LtID'> :key='item.LtID'>
</el-option> </el-option>
...@@ -25,11 +25,11 @@ ...@@ -25,11 +25,11 @@
</li> </li>
<li> <li>
<span> <span>
<em>团号</em> <em>{{$t('visa.v_tuanhao')}}</em>
<el-input v-model='msg.TCNUM'></el-input> <el-input v-model='msg.TCNUM'></el-input>
</span> </span>
</li> </li>
<li><span><em>日期</em> <li><span><em>{{$t('sm.Date')}}</em>
<el-date-picker v-model='msg.StartDate' class='w135' value-format="yyyy-MM-dd" type="date" <el-date-picker v-model='msg.StartDate' class='w135' value-format="yyyy-MM-dd" type="date"
:picker-options="pickerBeginDateBefore"></el-date-picker> :picker-options="pickerBeginDateBefore"></el-date-picker>
- -
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
</span> </span>
</li> </li>
<li><span> <li><span>
<em>状态</em> <em>{{$t('admin.admin_status')}}</em>
<el-select v-model='msg.PriceStatus'> <el-select v-model='msg.PriceStatus'>
<el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option> <el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
<el-option v-for="team in $tripUtils.TeamStatesList.TeamStates" :label="team.Name" :key="team.Id" <el-option v-for="team in $tripUtils.TeamStatesList.TeamStates" :label="team.Name" :key="team.Id"
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
</li> </li>
<li> <li>
<span> <span>
<em>航空公司</em> <em>{{$t('Airticket.Air_Airlines')}}</em>
<el-select v-model="msg.AirLineId" filterable :placeholder="$t('system.ph_buxian')"> <el-select v-model="msg.AirLineId" filterable :placeholder="$t('system.ph_buxian')">
<el-option :label="$t('system.ph_buxian')" :value="0"> <el-option :label="$t('system.ph_buxian')" :value="0">
</el-option> </el-option>
...@@ -70,13 +70,13 @@ ...@@ -70,13 +70,13 @@
</li> </li>
<li> <li>
<span> <span>
<em>地接团号</em> <em>{{$t('salesModule.DJNum')}}</em>
<el-input v-model='msg.CombinationNum'></el-input> <el-input v-model='msg.CombinationNum'></el-input>
</span> </span>
</li> </li>
<li> <li>
<span> <span>
<em>酒店</em> <em>{{$t('hotel.hotel')}}</em>
<el-select v-model="msg.HotelId" :placeholder="$t('pub.pleaseSel')" filterable> <el-select v-model="msg.HotelId" :placeholder="$t('pub.pleaseSel')" filterable>
<el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option> <el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
<el-option v-for="item in HotelList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option> <el-option v-for="item in HotelList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
...@@ -85,23 +85,23 @@ ...@@ -85,23 +85,23 @@
</li> </li>
<li> <li>
<span> <span>
<em>酒店状态</em> <em>{{$t('salesModule.HotelStatus')}}</em>
<el-select v-model="msg.HotelStatus" :placeholder="$t('pub.pleaseSel')" filterable> <el-select v-model="msg.HotelStatus" :placeholder="$t('pub.pleaseSel')" filterable>
<el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option> <el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
<el-option label="全部OK" :value='100'></el-option> <el-option :label="$t('ground.jiudianztS[0]')" :value='100'></el-option>
<el-option label="暂定一晚" :value='1'></el-option> <el-option :label="$t('ground.jiudianztS[1]')" :value='1'></el-option>
<el-option label="暂定两晚" :value='2'></el-option> <el-option :label="$t('ground.jiudianztS[2]')" :value='2'></el-option>
<el-option label="暂定三晚" :value='3'></el-option> <el-option :label="$t('ground.jiudianztS[3]')" :value='3'></el-option>
<el-option label="暂定四晚" :value='4'></el-option> <el-option :label="$t('ground.jiudianztS[4]')" :value='4'></el-option>
<el-option label="暂定五晚" :value='5'></el-option> <el-option :label="$t('ground.jiudianztS[5]')" :value='5'></el-option>
<el-option label="暂定六晚" :value='6'></el-option> <el-option :label="$t('ground.jiudianztS[6]')" :value='6'></el-option>
<el-option label="暂定七晚以上" :value='7'></el-option> <el-option :label="$t('ground.jiudianztS[7]')" :value='7'></el-option>
</el-select> </el-select>
</span> </span>
</li> </li>
<li> <li>
<span> <span>
<em>出团公司</em> <em>{{$t('scen.sc_cp')}}</em>
<el-select v-model="msg.OutBranchIds" filterable multiple class="multiple_input" <el-select v-model="msg.OutBranchIds" filterable multiple class="multiple_input"
:placeholder="$t('pub.pleaseSel')"> :placeholder="$t('pub.pleaseSel')">
<el-option v-for="item in queryCommonData.BranchList" :label='item.BName' :value='item.Id' :key='item.Id'> <el-option v-for="item in queryCommonData.BranchList" :label='item.BName' :value='item.Id' :key='item.Id'>
...@@ -110,31 +110,31 @@ ...@@ -110,31 +110,31 @@
</span> </span>
</li> </li>
<li> <li>
<input type="button" class="normalBtn" value="查询" @click="getList();resetPageIndex()" /> <input type="button" class="normalBtn" :value="$t('pub.searchBtn')" @click="getList();resetPageIndex()" />
<input type="button" class="normalBtn" value="下载" @click="DownLoadHotel()" /> <input type="button" class="normalBtn" :value="$t('adm.adm_download')" @click="DownLoadHotel()" />
</li> </li>
</ul> </ul>
</div> </div>
<div style="width: 100%; overflow-x: auto;padding-bottom: 10px; " class="ownScrollbarStyle"> <div style="width: 100%; overflow-x: auto;padding-bottom: 10px; " class="ownScrollbarStyle">
<div style="font-size:12px;padding:2px 4px 3px 4px; color:red">注意事项:每次导出数据最好不要超过一个月。</div> <div style="font-size:12px;padding:2px 4px 3px 4px; color:red">{{$t('ground.zymcdcsjbcgygy')}}。</div>
<table border="0" cellspacing="1" cellpadding="0" class="roomQueryTalbe" v-loading='loading'> <table border="0" cellspacing="1" cellpadding="0" class="roomQueryTalbe" v-loading='loading'>
<tr> <tr>
<th width="120">序号</th> <th width="120">{{$t('active.ad_xuhao')}}</th>
<th width="100">出发地</th> <th width="100">{{$t('sm.chufadi')}}</th>
<th width="80">公司团号</th> <th width="80">{{$t('salesModule.CompanyNum')}}</th>
<th width="150">航班</th> <th width="150">{{$t('visa.v_hangban')}}</th>
<th width="100">领队</th> <th width="100">{{$t('leader.leader_Leader')}}</th>
<th width="100">导游</th> <th width="100">{{$t('leader.leader_Guide')}}</th>
<th width="100">系列</th> <th width="100">{{$t('advmanager.v_xilie')}}</th>
<th width="80">机位总数<br />(Y/E/F)</th> <th width="80">{{$t('ground.jiweishu')}}<br />(Y/E/F)</th>
<th width="100">使用时间</th> <th width="100">{{$t('ground.shuyongsj')}}</th>
<th width="120">酒店名称</th> <th width="120">{{$t('hotel.hotel_name')}}</th>
<th width="120">更换酒店</th> <th width="120">{{$t('ground.genghuanjiudian')}}</th>
<th width="100">OP状态</th> <th width="100">{{$t('salesModule.OPstatus')}}</th>
<th width="100">地接状态</th> <th width="100">{{$t('salesModule.DJstatus')}}</th>
</tr> </tr>
<tr v-if="dataList.length==0"> <tr v-if="dataList.length==0">
<td colspan="13">暂无数据</td> <td colspan="13">{{$t('active.ld_noData')}}</td>
</tr> </tr>
<template v-for="(outItem,outindex) in dataList"> <template v-for="(outItem,outindex) in dataList">
<tbody :class="{roomQuerySplitTrCss:outindex%2!=0}"> <tbody :class="{roomQuerySplitTrCss:outindex%2!=0}">
...@@ -196,21 +196,21 @@ ...@@ -196,21 +196,21 @@
</td> </td>
<td> <td>
<template v-if="thirdItem.OPState==1"> <template v-if="thirdItem.OPState==1">
<span style="color: green;">OP-指定</span> <span style="color: green;">{{$t('salesModule.OPZD')}}</span>
</template> </template>
<template v-else-if="thirdItem.OPState==2"> <template v-else-if="thirdItem.OPState==2">
<span style="color:red;">OP-暂定</span> <span style="color:red;">{{$t('salesModule.OPCD')}}</span>
</template> </template>
</td> </td>
<td> <td>
<template v-if="thirdItem.DMCState==1"> <template v-if="thirdItem.DMCState==1">
<span style="color: green;">地接-OK</span> <span style="color: green;">{{$t('salesModule.DJOK')}}</span>
</template> </template>
<template v-else-if="thirdItem.DMCState==2"> <template v-else-if="thirdItem.DMCState==2">
<span style="color:red;">地接-暂定</span> <span style="color:red;">{{$t('salesModule.DJZK')}}</span>
</template> </template>
<template v-else-if="thirdItem.DMCState==0"> <template v-else-if="thirdItem.DMCState==0">
<span style="color:red;">地接-未操作</span> <span style="color:red;">{{$t('salesModule.DJWCZ')}}</span>
</template> </template>
</td> </td>
</tr> </tr>
...@@ -408,7 +408,7 @@ ...@@ -408,7 +408,7 @@
queryMsg: this.msg, queryMsg: this.msg,
uid: this.getLocalStorage().EmployeeId uid: this.getLocalStorage().EmployeeId
}; };
let fileName = "订房查询" + this.$commonUtils.getCurrentDate() + ".xls"; let fileName = this.$t('ground.dingfangcx') + this.$commonUtils.getCurrentDate() + ".xls";
this.GetLocalFile("hotel_get_downloadHotel", qMsg, fileName, this.GetLocalFile("hotel_get_downloadHotel", qMsg, fileName,
res => { res => {
this.loading = false; this.loading = false;
......
src/components/Hotel/roomReservationsDetails.vue
View file @ 43711976
...@@ -21,46 +21,46 @@ ...@@ -21,46 +21,46 @@
<div class="query-box" style="border-bottom: none;"> <div class="query-box" style="border-bottom: none;">
<ul> <ul>
<li> <li>
<input v-if="IsOperation!=1" type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" /> <input v-if="IsOperation!=1" type="button" class="fr normalBtn mb30" :value="$t('pub.saveBtn')" @click="saveList(1)" />
<input v-if="IsOperation==1&&(CurrentUserInfo.EmployeeId==615||CurrentUserInfo.EmployeeId==46)" type="button" class="fr normalBtn mb30" <input v-if="IsOperation==1&&(CurrentUserInfo.EmployeeId==615||CurrentUserInfo.EmployeeId==46)" type="button" class="fr normalBtn mb30"
value="保存" @click="saveList(1)" /> :value="$t('pub.saveBtn')" @click="saveList(1)" />
<span v-if="IsOperation==1" style="color:red;font-size:14px;">已制单，不能再修改!</span> <span v-if="IsOperation==1" style="color:red;font-size:14px;">{{$t('gorund.yizhidanbng')}}</span>
</li> </li>
</ul> </ul>
税别计算: 单价 * (预订人数-免减人数) * (1 + 0.08 - 返佣比例 / 100) <br /> {{$t('ground.jisuan1')}} <br />
税入计算: 单价 * (预订人数-免减人数) * (1 - 返佣比例 / 100) <br /> {{$t('ground.jisuan2')}} <br />
司导间【月结】不计入总金额 {{$t('ground.sidaobsuan')}}
</div> </div>
<div style="width: 100%; overflow-x: auto;padding-bottom: 10px; " :style="{height: boxHeight + 'px'}" <div style="width: 100%; overflow-x: auto;padding-bottom: 10px; " :style="{height: boxHeight + 'px'}"
class="ownScrollbarStyle" ref="ownScrollbarStyle"> class="ownScrollbarStyle" ref="ownScrollbarStyle">
<table border="0" cellspacing="1" cellpadding="0" class="roomReservationsDetailsTalbe" v-loading="loading"> <table border="0" cellspacing="1" cellpadding="0" class="roomReservationsDetailsTalbe" v-loading="loading">
<tr> <tr>
<th class="fz14" colspan="5">团队信息&nbsp;&nbsp;领队:{{LeaderName}} &nbsp;&nbsp;导游:{{GuideName}}.</th> <th class="fz14" colspan="5">{{$t('visa.v_teaminfo')}}&nbsp;&nbsp;{{$t('leader.leader_Leader')}}:{{LeaderName}} &nbsp;&nbsp;{{$t('leader.leader_Guide')}}:{{GuideName}}.</th>
<th class="fz14" colspan="17">地接操作信息</th> <th class="fz14" colspan="17">{{$t('ground.dijiecaozuoxinxi')}}</th>
</tr> </tr>
<tr> <tr>
<th width="120">入住时间</th> <th width="120">{{$t('hotel.table_CheckInDate')}}</th>
<th width="180">酒店名称</th> <th width="180">{{$t('hotel.hotel_name')}}</th>
<th width="120">机位总数<br />(Y/E/F)</th> <th width="120">{{$t('ground.jiweizongshu')}}<br />(Y/E/F)</th>
<th width="80">占床/<br />不占床</th> <th width="80">{{$t('ground.zhanchuang')}}/<br />{{$t('ground.bzhanchuang')}}</th>
<th width="80">实际<br />用房数</th> <th width="80">{{$t('ground.shiji')}}<br />{{$t('ground.yongfangshu')}}</th>
<th width="170">修改酒店/供应商</th> <th width="170">{{$t('ground.xiugaijiudiangys')}}</th>
<th width="100">房间类型</th> <th width="100">{{$t('ground.fangjianleixing')}}</th>
<th width="80">房间<br />预定数</th> <th width="80">{{$t('ground.fangjian')}}<br />{{$t("ground.yudingshu")}}</th>
<th width="80">预定人数</th> <th width="80">{{$t('ground.yudingrenshu')}}</th>
<!-- <th width="80">尚差<br />房间数</th> --> <!-- <th width="80">尚差<br />房间数</th> -->
<th width="80">单价/每人</th> <th width="80">{{$t('ground.danjiameiren')}}</th>
<th width="80">免减人数</th> <th width="80">{{$t('ground.mianjianrenshu')}}</th>
<th width="80">金额小计</th> <th width="80">{{$t('ground.jinexiaoji')}}</th>
<th width="80">返佣类型</th> <th width="80">{{$t('ground.fanyongleixing')}}</th>
<th width="80">返佣</th> <th width="80">{{$t('hotel.hotel_commission')}}</th>
<th width="80">返佣金额</th> <th width="80">{{$t('ground.fanyongyjin')}}</th>
<th width="80">入汤税</th> <th width="80">{{$t('ground.rutangshui')}}</th>
<th width="80">城市税</th> <th width="80">{{$t('ground.chengshishui')}}</th>
<th width="80">停车费</th> <th width="80">{{$t('ground.tingchefei')}}</th>
<th width="100">金额总计</th> <th width="100">{{$t('ground.jinezongji')}}</th>
<th width="250">付款方式&订团号&备注</th> <th width="250">{{$t('ground.fukuanbzdth')}}</th>
<th width="80">操作</th> <th width="80">{{$t('system.table_operation')}}</th>
</tr> </tr>
<template v-for="(item,index) in list"> <template v-for="(item,index) in list">
<template v-for="(subItem,subIndex) in item.HotelOrderList"> <template v-for="(subItem,subIndex) in item.HotelOrderList">
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
</tr> </tr>
<tr> <tr>
<td width="40"> <td width="40">
电话： {{$t('hotel.table_tel')}}：
</td> </td>
<td style="text-align:left"> <td style="text-align:left">
{{subItem.Tel}} {{subItem.Tel}}
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
</tr> </tr>
<tr> <tr>
<td width="40"> <td width="40">
地址： {{$t('hotel.table_address')}}：
</td> </td>
<td style="text-align:left"> <td style="text-align:left">
{{subItem.Address}} {{subItem.Address}}
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
<el-button size="small" type="danger" :data-index="'comCheckHotel'+index+subIndex+''" <el-button size="small" type="danger" :data-index="'comCheckHotel'+index+subIndex+''"
slot="reference" style="cursor:pointer;" slot="reference" style="cursor:pointer;"
@click="getChildHotel(index,subIndex),subItem.isShowPop=true"> @click="getChildHotel(index,subIndex),subItem.isShowPop=true">
酒店选择 {{$t('sm.jiudianxuanz')}}
</el-button> </el-button>
</el-popover> </el-popover>
</td> </td>
...@@ -140,11 +140,11 @@ ...@@ -140,11 +140,11 @@
</tr> </tr>
<tr> <tr>
<td width="70" style="text-align:right;"> <td width="70" style="text-align:right;">
供应商 {{$t('hotel.hotel_Supplier')}}
</td> </td>
<td> <td>
<el-select class='w120 sel' v-model='subItem.SupplierId' @change="getSupplierShoupei(subItem)" <el-select class='w120 sel' v-model='subItem.SupplierId' @change="getSupplierShoupei(subItem)"
filterable placeholder="请选择供应商"> filterable :placeholder="$t('gorund.qingxuanzegys')">
<el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option> <el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
<el-option v-for="(SupplierItem,Supplierindex) in SupplierList" :key="Supplierindex" <el-option v-for="(SupplierItem,Supplierindex) in SupplierList" :key="Supplierindex"
:label="SupplierItem.Name" :value="SupplierItem.ID"> :label="SupplierItem.Name" :value="SupplierItem.ID">
...@@ -157,8 +157,8 @@ ...@@ -157,8 +157,8 @@
</tr> </tr>
<tr> <tr>
<td colspan="2"> <td colspan="2">
<span v-if="subItem.IsHaveShouPeiFee==0" style="color:red;">无手配费</span> <span v-if="subItem.IsHaveShouPeiFee==0" style="color:red;">{{$t('ground.wshoupeifei')}}</span>
<span v-if="subItem.IsHaveShouPeiFee==1" style="color:red;">手配费:{{subItem.ShouPeiMoney}}</span> <span v-if="subItem.IsHaveShouPeiFee==1" style="color:red;">{{$t('ground.shoupeifei')}}:{{subItem.ShouPeiMoney}}</span>
</td> </td>
</tr> </tr>
</table> </table>
...@@ -168,14 +168,14 @@ ...@@ -168,14 +168,14 @@
{{subItem.HouseStatistics.HouseTypeList[childIndex].HouseTypeNameExt}} {{subItem.HouseStatistics.HouseTypeList[childIndex].HouseTypeNameExt}}
<template v-if="childIndex==4"> <template v-if="childIndex==4">
<template v-if="subItem.DriverGuideIsRebate==1"> <template v-if="subItem.DriverGuideIsRebate==1">
<br /><span style="color:green">返佣</span> <br /><span style="color:green">{{$t('hotel.hotel_commission')}}</span>
</template> </template>
<template v-else-if="subItem.DriverGuideIsRebate==0"> <template v-else-if="subItem.DriverGuideIsRebate==0">
<br /><span style="color:red;">不返佣</span> <br /><span style="color:red;">{{$t('ground.bufanyong')}}</span>
</template> </template>
</template> </template>
<template v-if="childIndex==5"> <template v-if="childIndex==5">
<br /><span style="color:red;">不返佣</span> <br /><span style="color:red;">{{$t('ground.bufanyong')}}</span>
</template> </template>
</td> </td>
<!-- 房间数 --> <!-- 房间数 -->
...@@ -230,10 +230,10 @@ ...@@ -230,10 +230,10 @@
<!-- 返佣类型 --> <!-- 返佣类型 -->
<td style="white-space:nowrap;" v-if="childIndex==0" :rowspan="6"> <td style="white-space:nowrap;" v-if="childIndex==0" :rowspan="6">
<template v-if="subItem.RebateType==1"> <template v-if="subItem.RebateType==1">
<span style="color:green">含税</span> <span style="color:green">{{$t('ground.hanshui')}}</span>
</template> </template>
<template v-else> <template v-else>
<span style="color:red"> 不含税</span> <span style="color:red"> {{$t('ground.bhanshui')}}</span>
</template> </template>
</td> </td>
<!--返佣--> <!--返佣-->
...@@ -300,9 +300,9 @@ ...@@ -300,9 +300,9 @@
<td v-if="childIndex==0" :rowspan="6"> <td v-if="childIndex==0" :rowspan="6">
<table class="hotelTable"> <table class="hotelTable">
<tr> <tr>
<td width="70" style="text-align:right;">币种：</td> <td width="70" style="text-align:right;">{{$t('hotel.hotel_Currency')}}：</td>
<td> <td>
<el-select v-model="subItem.CurrencyId" placeholder="请选择" class='w135 sel' <el-select v-model="subItem.CurrencyId" :placeholder="$t('pub.pleaseSel')" class='w135 sel'
@change="calculationPrice(subItem)"> @change="calculationPrice(subItem)">
<el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option> <el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
<el-option v-for="(item,index) in allCurrencyList" :key="index" :label="item.Name" <el-option v-for="(item,index) in allCurrencyList" :key="index" :label="item.Name"
...@@ -315,13 +315,13 @@ ...@@ -315,13 +315,13 @@
<td colspan="2" style="height:5px;"></td> <td colspan="2" style="height:5px;"></td>
</tr> </tr>
<tr> <tr>
<td width="70" style="text-align:right;">订房状态：</td> <td width="70" style="text-align:right;">{{$t('ground.dfzhuangtai')}}：</td>
<td> <td>
<el-select class='w135 sel' v-model='subItem.DMCState' :placeholder="$t('pub.pleaseSel')" <el-select class='w135 sel' v-model='subItem.DMCState' :placeholder="$t('pub.pleaseSel')"
:disabled="IsEditHotel==0?true:false"> :disabled="IsEditHotel==0?true:false">
<el-option label='请选择' :value='0'></el-option> <el-option :label="$t('pub.pleaseSel')" :value='0'></el-option>
<el-option label='确定' :value='1'></el-option> <el-option :label="$t('pub.sureBtn')" :value='1'></el-option>
<el-option label='暂定' :value='2'></el-option> <el-option :label="$t('visa.v_zanding')" :value='2'></el-option>
</el-select> </el-select>
</td> </td>
</tr> </tr>
...@@ -329,7 +329,7 @@ ...@@ -329,7 +329,7 @@
<td colspan="2" style="height:5px;"></td> <td colspan="2" style="height:5px;"></td>
</tr> </tr>
<tr> <tr>
<td width="70" style="text-align:right;">确认时间：</td> <td width="70" style="text-align:right;">{{$t('salesModule.SureTime')}}：</td>
<td> <td>
<el-date-picker v-model='subItem.SureTime' class='w135' value-format="yyyy-MM-dd" type="date" <el-date-picker v-model='subItem.SureTime' class='w135' value-format="yyyy-MM-dd" type="date"
:disabled="IsEditHotel==0?true:false"></el-date-picker> :disabled="IsEditHotel==0?true:false"></el-date-picker>
...@@ -339,13 +339,13 @@ ...@@ -339,13 +339,13 @@
<td colspan="2" style="height:5px;"></td> <td colspan="2" style="height:5px;"></td>
</tr> </tr>
<tr> <tr>
<td width="70" style="text-align:right;">税入/税别：</td> <td width="70" style="text-align:right;">{{$t('ground.shurushubie')}}：</td>
<td> <td>
<el-select class='w135 sel' v-model='subItem.TaxType' :placeholder="$t('pub.pleaseSel')" <el-select class='w135 sel' v-model='subItem.TaxType' :placeholder="$t('pub.pleaseSel')"
@change="calculationPrice(subItem)" :disabled="IsEditHotel==0?true:false"> @change="calculationPrice(subItem)" :disabled="IsEditHotel==0?true:false">
<el-option label='请选择' :value='0'></el-option> <el-option :label="$t('pub.pleaseSel')" :value='0'></el-option>
<el-option label='税入' :value='1'></el-option> <el-option :label="$t('pub.SR')" :value='1'></el-option>
<el-option label='税别' :value='2'></el-option> <el-option :label="$t('pub.SB')" :value='2'></el-option>
</el-select> </el-select>
</td> </td>
</tr> </tr>
...@@ -353,18 +353,18 @@ ...@@ -353,18 +353,18 @@
<td colspan="2" style="height:5px;"></td> <td colspan="2" style="height:5px;"></td>
</tr> </tr>
<tr> <tr>
<td width="70" style="text-align:right;color:red">付款方式：</td> <td width="70" style="text-align:right;color:red">{{$t('fnc.fkfangshi')}}：</td>
<td> <td>
<el-select class='w135 sel' v-model='subItem.PayStyle' :placeholder="$t('pub.pleaseSel')" <el-select class='w135 sel' v-model='subItem.PayStyle' :placeholder="$t('pub.pleaseSel')"
:disabled="IsEditHotel==0?true:false" @change="PayChange(subItem)"> :disabled="IsEditHotel==0?true:false" @change="PayChange(subItem)">
<el-option label='请选择' :value='0'></el-option> <el-option :label="$t('pub.pleaseSel')" :value='0'></el-option>
<el-option label='现付' :value='1'></el-option> <el-option :label="$t('ground.xianfu')" :value='1'></el-option>
<el-option label='签单' :value='2'></el-option> <el-option :label="$t('ground.qiandan')" :value='2'></el-option>
<el-option label='实物抵扣' :value='3'></el-option> <el-option :label="$t('ground.shiwudk')" :value='3'></el-option>
<el-option label='预付' :value='4'></el-option> <el-option :label="$t('ground.yufu')" :value='4'></el-option>
<el-option label='预付款抵扣' :value='5'></el-option> <el-option :label="$t('ground.yufukuandk')" :value='5'></el-option>
<el-option label='领队导游垫付' :value='10'></el-option> <el-option :label="$t('ground.lingduidydf')" :value='10'></el-option>
<el-option label='刷卡' :value='11'></el-option> <el-option :label="$t('ground.shuaka')" :value='11'></el-option>
</el-select> </el-select>
</td> </td>
</tr> </tr>
...@@ -372,20 +372,20 @@ ...@@ -372,20 +372,20 @@
<td colspan="2" style="height:5px;"></td> <td colspan="2" style="height:5px;"></td>
</tr> </tr>
<tr> <tr>
<td width="70" style="text-align:right;">司导房付款方式：</td> <td width="70" style="text-align:right;">{{$t('ground.sidaoffkfs')}}：</td>
<td> <td>
<el-select class='w135 sel' v-model='subItem.DMCPayType' :placeholder="$t('pub.pleaseSel')" <el-select class='w135 sel' v-model='subItem.DMCPayType' :placeholder="$t('pub.pleaseSel')"
:disabled="IsEditHotel==0?true:false" @change="calculationPrice(subItem)"> :disabled="IsEditHotel==0?true:false" @change="calculationPrice(subItem)">
<el-option label='请选择' :value='0'></el-option> <el-option :label="$t('pub.pleaseSel')" :value='0'></el-option>
<el-option label='月结' :value='9'></el-option> <el-option :label="$t('ground.yuejie')" :value='9'></el-option>
<el-option label='现付' :value='1'></el-option> <el-option :label="$t('ground.xianfu')" :value='1'></el-option>
<el-option label='签单' :value='2'></el-option> <el-option :label="$t('ground.qiandan')" :value='2'></el-option>
<el-option label='实物抵扣' :value='3'></el-option> <el-option :label="$t('ground.shiwudk')" :value='3'></el-option>
<el-option label='预付' :value='4'></el-option> <el-option :label="$t('ground.yufu')" :value='4'></el-option>
<el-option label='预付款抵扣' :value='5'></el-option> <el-option :label="$t('ground.yufukuandk')" :value='5'></el-option>
<el-option label='公司合团支付' :value='6'></el-option> <el-option :label="$t('ground.gongsihetzf')" :value='6'></el-option>
<el-option label='领队导游垫付' :value='10'></el-option> <el-option :label="$t('ground.lingduidydf')" :value='10'></el-option>
<el-option label='刷卡' :value='11'></el-option> <el-option :label="$t('ground.shuaka')" :value='11'></el-option>
</el-select> </el-select>
</td> </td>
</tr> </tr>
...@@ -393,7 +393,7 @@ ...@@ -393,7 +393,7 @@
<td colspan="2" style="height:5px;"></td> <td colspan="2" style="height:5px;"></td>
</tr> </tr>
<tr v-show="subItem.PayStyle==6"> <tr v-show="subItem.PayStyle==6">
<td width="70" style="text-align:right;">付款团号：</td> <td width="70" style="text-align:right;">{{$t('ground.fukuanth')}}：</td>
<td> <td>
<el-input class='w135' v-model='subItem.PayTypeTCNUM' :disabled="IsEditHotel==0?true:false"> <el-input class='w135' v-model='subItem.PayTypeTCNUM' :disabled="IsEditHotel==0?true:false">
</el-input> </el-input>
...@@ -403,7 +403,7 @@ ...@@ -403,7 +403,7 @@
<td colspan="2" style="height:5px;"></td> <td colspan="2" style="height:5px;"></td>
</tr> </tr>
<tr> <tr>
<td width="70" style="text-align:right;">订团号：</td> <td width="70" style="text-align:right;">{{$t('ground.dingtuanhao')}}：</td>
<td> <td>
<el-input class='w135' v-model='subItem.ReserveNo'></el-input> <el-input class='w135' v-model='subItem.ReserveNo'></el-input>
</td> </td>
...@@ -412,13 +412,13 @@ ...@@ -412,13 +412,13 @@
<td colspan="2" style="height:5px;"></td> <td colspan="2" style="height:5px;"></td>
</tr> </tr>
<tr> <tr>
<td width="70" style="text-align:right;">提醒供应商:</td> <td width="70" style="text-align:right;">{{$t('ground.tixinggys')}}:</td>
<td> <td>
<el-select class='w135 sel' v-model='subItem.SupplierHotelStatus' <el-select class='w135 sel' v-model='subItem.SupplierHotelStatus'
:placeholder="$t('pub.pleaseSel')"> :placeholder="$t('pub.pleaseSel')">
<el-option label='请选择' :value='0'></el-option> <el-option :placeholder="$t('pub.pleaseSel')" :value='0'></el-option>
<el-option label='一般提醒' :value='1'></el-option> <el-option :label="$t('ground.yibantx')" :value='1'></el-option>
<el-option label='重要提醒' :value='2'></el-option> <el-option :label="$t('ground.zhongyaotx')" :value='2'></el-option>
</el-select> </el-select>
</td> </td>
</tr> </tr>
...@@ -426,13 +426,13 @@ ...@@ -426,13 +426,13 @@
<td colspan="2" style="height:5px;"></td> <td colspan="2" style="height:5px;"></td>
</tr> </tr>
<tr> <tr>
<td width="70" style="text-align:right;">对供应商备注：</td> <td width="70" style="text-align:right;">{{$t('ground.duigysbz')}}：</td>
<td> <td>
<el-input type='textarea' class='w135' v-model='subItem.Remarks'></el-input> <el-input type='textarea' class='w135' v-model='subItem.Remarks'></el-input>
</td> </td>
</tr> </tr>
<tr v-if="subItem.SupplierToDmcRemarks"> <tr v-if="subItem.SupplierToDmcRemarks">
<td width="70" style="text-align:right;">供应商对地接备注：</td> <td width="70" style="text-align:right;">{{$t('ground.gongysddjbz')}}：</td>
<td> <td>
<span <span
:class="{'rq_disImNote':subItem.SupplierToDmcHotelStatus==1&&DateMinus(subItem.SupplierToDmcHotelStatusTime)<=5,'rq_importNote':subItem.SupplierToDmcHotelStatus==2&&DateMinus(subItem.SupplierToDmcHotelStatusTime)<=5}"> :class="{'rq_disImNote':subItem.SupplierToDmcHotelStatus==1&&DateMinus(subItem.SupplierToDmcHotelStatusTime)<=5,'rq_importNote':subItem.SupplierToDmcHotelStatus==2&&DateMinus(subItem.SupplierToDmcHotelStatusTime)<=5}">
...@@ -441,11 +441,11 @@ ...@@ -441,11 +441,11 @@
</td> </td>
</tr> </tr>
<tr v-if="CurrentUserInfo.EmployeeId == 615"> <tr v-if="CurrentUserInfo.EmployeeId == 615">
<td width="70" style="text-align:right;">是否同步更新房间数:</td> <td width="70" style="text-align:right;">{{$t('ground.shifoutbgxfj')}}:</td>
<td> <td>
<el-select class='w135 sel' v-model='subItem.IsSyncHotelCount'> <el-select class='w135 sel' v-model='subItem.IsSyncHotelCount'>
<el-option label='同步更新' :value='0'></el-option> <el-option :label="$t('ground.tongbugx')" :value='0'></el-option>
<el-option label='不更新' :value='1'></el-option> <el-option :label="$t('gorund.bugengxin')" :value='1'></el-option>
</el-select> </el-select>
</td> </td>
</tr> </tr>
...@@ -454,17 +454,17 @@ ...@@ -454,17 +454,17 @@
<!-- 操作 --> <!-- 操作 -->
<td v-if="childIndex==0" :rowspan="5"> <td v-if="childIndex==0" :rowspan="5">
<template v-if="subItem.OPState==1"> <template v-if="subItem.OPState==1">
<span class="Hotel_red">OP-指定</span> <span class="Hotel_red">{{$t('salesModule.OPZD')}}</span>
</template> </template>
<template v-if="IsOperation!=1"> <template v-if="IsOperation!=1">
<el-tooltip class="item" effect="dark" content="保存" placement="top-start"> <el-tooltip class="item" effect="dark" :content="$t('pub.saveBtn')" placement="top-start">
<el-button icon="iconfont icon-baocun1" @click="SaveSingle(subItem)" type="primary"></el-button> <el-button icon="iconfont icon-baocun1" @click="SaveSingle(subItem)" type="primary"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="新增" v-if="subItem.OPState!=1" placement="top-start"> <el-tooltip class="item" effect="dark" :content="$t('pub.addBtn')" v-if="subItem.OPState!=1" placement="top-start">
<el-button @click='AddHotel(item,subIndex)' icon="iconfont icon-tianjia" type="primary"></el-button> <el-button @click='AddHotel(item,subIndex)' icon="iconfont icon-tianjia" type="primary"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip v-if="item.HotelOrderList.length>1 && subItem.OPState!=1" class="item" effect="dark" <el-tooltip v-if="item.HotelOrderList.length>1 && subItem.OPState!=1" class="item" effect="dark"
content="删除" placement="top-start"> :content="$t('system.table_delete')" placement="top-start">
<el-button type="primary" icon="iconfont icon-shanchu" @click='DeleteHotel(item,subIndex)'> <el-button type="primary" icon="iconfont icon-shanchu" @click='DeleteHotel(item,subIndex)'>
</el-button> </el-button>
</el-tooltip> </el-tooltip>
...@@ -472,7 +472,7 @@ ...@@ -472,7 +472,7 @@
<el-popover width="200" trigger="click" popper-class="Bus_HotelPop"> <el-popover width="200" trigger="click" popper-class="Bus_HotelPop">
<commonHotelLog :ref="'comHotelLog'+index+subIndex+''"> </commonHotelLog> <commonHotelLog :ref="'comHotelLog'+index+subIndex+''"> </commonHotelLog>
<div slot="reference" class="w80" style="cursor:pointer;text-decoration:underline;" <div slot="reference" class="w80" style="cursor:pointer;text-decoration:underline;"
@click="GetHotelLog(subItem,index,subIndex)">日志</div> @click="GetHotelLog(subItem,index,subIndex)">{{$t('fnc.rizhi')}}</div>
</el-popover> </el-popover>
</td> </td>
</tr> </tr>
...@@ -581,7 +581,7 @@ ...@@ -581,7 +581,7 @@
if (objData.list && objData.list.length > 0) { if (objData.list && objData.list.length > 0) {
var str = ""; var str = "";
objData.list.forEach((cItem, cIndex) => { objData.list.forEach((cItem, cIndex) => {
str += (cIndex == 0 ? "" : ",") + cItem.TCNUM + "使用了" + cItem.LastUseNum + "间"; str += (cIndex == 0 ? "" : ",") + cItem.TCNUM + "使用了" + cItem.LastUseNum + this.$t('hotel.hotel_room');
}); });
if (str != "") { if (str != "") {
this.Info(str); this.Info(str);
...@@ -615,7 +615,7 @@ ...@@ -615,7 +615,7 @@
this.calculationPrice(this.list[this.findex].HotelOrderList[this.childIndex]); this.calculationPrice(this.list[this.findex].HotelOrderList[this.childIndex]);
} }
} else { } else {
this.Error("请求参数错误!"); this.Error(this.$t('ground.qingqiucanscw'));
} }
}, err => {}) }, err => {})
}, },
...@@ -655,7 +655,7 @@ ...@@ -655,7 +655,7 @@
//删除酒店 //删除酒店
DeleteHotel(item, subIndex) { DeleteHotel(item, subIndex) {
var that = this; var that = this;
this.Confirm("是否删除?删除后将不能恢复", function () { this.Confirm(this.$t('sm.sfdeletenothf'), function () {
var subItem = item.HotelOrderList[subIndex]; var subItem = item.HotelOrderList[subIndex];
if (subItem.OrderID > 0) { if (subItem.OrderID > 0) {
that.apipost('dmcstatistics_post_DeleteHotelOrder', { that.apipost('dmcstatistics_post_DeleteHotelOrder', {
......
src/components/SalesModule/passengerHouse.vue
View file @ 43711976
...@@ -18,12 +18,12 @@ ...@@ -18,12 +18,12 @@
<div class='flexOne'> <div class='flexOne'>
<div class="passengerHouse"> <div class="passengerHouse">
<p> <p>
<em class="fnormal">房间分配</em> <em class="fnormal">{{$t('ground.fangjianfp')}}</em>
<span style="display: inline-block; width: 8px; height: 8px; background: #116799; margin: 0 5px 0 20px;"></span><span class="fz12 color000">男性占床</span> <span style="display: inline-block; width: 8px; height: 8px; background: #116799; margin: 0 5px 0 20px;"></span><span class="fz12 color000">{{$t('ground.nanxingzhanchuang')}}</span>
<span style="display: inline-block; width: 8px; height: 8px; background: #C62452; margin: 0 5px 0 20px;"></span><span class="fz12 color000">女性占床</span> <span style="display: inline-block; width: 8px; height: 8px; background: #C62452; margin: 0 5px 0 20px;"></span><span class="fz12 color000">{{$t('ground.nvxingzhanchuang')}}</span>
<span style="display: inline-block; width: 8px; height: 8px; background: #11998E; margin: 0 5px 0 20px;"></span><span class="fz12 color000">不占床</span> <span style="display: inline-block; width: 8px; height: 8px; background: #11998E; margin: 0 5px 0 20px;"></span><span class="fz12 color000">{{$t('ground.bzhanchuang')}}</span>
</p> </p>
<div class="fz14 alcenter mt20" v-show="orderHouseList.length==0">暂无数据</div> <div class="fz14 alcenter mt20" v-show="orderHouseList.length==0">{{$t('active.ld_noData')}}</div>
<div class="passengerHouseBg"> <div class="passengerHouseBg">
<div class="passengerHouseBgMiddle"> <div class="passengerHouseBgMiddle">
<div v-for="(item,index) in orderHouseList"> <div v-for="(item,index) in orderHouseList">
......
src/router/config.js
View file @ 43711976
...@@ -3975,6 +3975,13 @@ export default { ...@@ -3975,6 +3975,13 @@ export default {
} }
}, },
{ {
path: '/BuyingPrice',
name: 'BuyingPrice',
component: resolve => require(['@/components/Buying/BuyingPrice'], resolve),
meta: {
title: '商品价格'
}
},{
path: '/AdManageList', path: '/AdManageList',
name: 'AdManageList', name: 'AdManageList',
component: resolve => require(['@/components/Buying/AdManageList'], resolve), component: resolve => require(['@/components/Buying/AdManageList'], resolve),
......
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