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
Expand all 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 = {
qingxuanzgys: "请输选择供应商",
qingxuanzeriq: "请选择日期",
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;
\ No newline at end of file
src/assets/common/lang/zhTW/Ground.js
View file @ 43711976
......@@ -213,5 +213,61 @@ export const obj = {
qingxuanzgys: "請輸選擇供應商",
qingxuanzeriq: "請選擇日期",
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;
\ No newline at end of file
src/components/Buying/BuyingList.vue
View file @ 43711976
......@@ -100,6 +100,9 @@
<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-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-button type="danger" size="mini" class="iconfont icon-quxiao1" @click="setProS(4, item.Id)"></el-button>
</el-tooltip>
......@@ -145,6 +148,9 @@ export default {
},
methods: {
setPrice(id){
this.$router.push({ name: 'BuyingPrice',query:{blank: 'y', proId: id} })
},
setProS(t, id){
this.apipost("Shop_post_SetCommodityStatus",{CommodityId: id, Status: t},res => {
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
This diff is collapsed.
src/components/Hotel/roomQuery.vue
View file @ 43711976
......@@ -14,9 +14,9 @@
</li>
<li>
<span>
<em>系列</em>
<em>{{$t('advmanager.v_xilie')}}</em>
<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'
:key='item.LtID'>
</el-option>
......@@ -25,11 +25,11 @@
</li>
<li>
<span>
<em>团号</em>
<em>{{$t('visa.v_tuanhao')}}</em>
<el-input v-model='msg.TCNUM'></el-input>
</span>
</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"
:picker-options="pickerBeginDateBefore"></el-date-picker>
-
......@@ -38,7 +38,7 @@
</span>
</li>
<li><span>
<em>状态</em>
<em>{{$t('admin.admin_status')}}</em>
<el-select v-model='msg.PriceStatus'>
<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"
......@@ -48,7 +48,7 @@
</li>
<li>
<span>
<em>航空公司</em>
<em>{{$t('Airticket.Air_Airlines')}}</em>
<el-select v-model="msg.AirLineId" filterable :placeholder="$t('system.ph_buxian')">
<el-option :label="$t('system.ph_buxian')" :value="0">
</el-option>
......@@ -70,13 +70,13 @@
</li>
<li>
<span>
<em>地接团号</em>
<em>{{$t('salesModule.DJNum')}}</em>
<el-input v-model='msg.CombinationNum'></el-input>
</span>
</li>
<li>
<span>
<em>酒店</em>
<em>{{$t('hotel.hotel')}}</em>
<el-select v-model="msg.HotelId" :placeholder="$t('pub.pleaseSel')" filterable>
<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>
......@@ -85,23 +85,23 @@
</li>
<li>
<span>
<em>酒店状态</em>
<em>{{$t('salesModule.HotelStatus')}}</em>
<el-select v-model="msg.HotelStatus" :placeholder="$t('pub.pleaseSel')" filterable>
<el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
<el-option label="全部OK" :value='100'></el-option>
<el-option label="暂定一晚" :value='1'></el-option>
<el-option label="暂定两晚" :value='2'></el-option>
<el-option label="暂定三晚" :value='3'></el-option>
<el-option label="暂定四晚" :value='4'></el-option>
<el-option label="暂定五晚" :value='5'></el-option>
<el-option label="暂定六晚" :value='6'></el-option>
<el-option label="暂定七晚以上" :value='7'></el-option>
<el-option :label="$t('ground.jiudianztS[0]')" :value='100'></el-option>
<el-option :label="$t('ground.jiudianztS[1]')" :value='1'></el-option>
<el-option :label="$t('ground.jiudianztS[2]')" :value='2'></el-option>
<el-option :label="$t('ground.jiudianztS[3]')" :value='3'></el-option>
<el-option :label="$t('ground.jiudianztS[4]')" :value='4'></el-option>
<el-option :label="$t('ground.jiudianztS[5]')" :value='5'></el-option>
<el-option :label="$t('ground.jiudianztS[6]')" :value='6'></el-option>
<el-option :label="$t('ground.jiudianztS[7]')" :value='7'></el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>出团公司</em>
<em>{{$t('scen.sc_cp')}}</em>
<el-select v-model="msg.OutBranchIds" filterable multiple class="multiple_input"
:placeholder="$t('pub.pleaseSel')">
<el-option v-for="item in queryCommonData.BranchList" :label='item.BName' :value='item.Id' :key='item.Id'>
......@@ -110,31 +110,31 @@
</span>
</li>
<li>
<input type="button" class="normalBtn" value="查询" @click="getList();resetPageIndex()" />
<input type="button" class="normalBtn" value="下载" @click="DownLoadHotel()" />
<input type="button" class="normalBtn" :value="$t('pub.searchBtn')" @click="getList();resetPageIndex()" />
<input type="button" class="normalBtn" :value="$t('adm.adm_download')" @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 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'>
<tr>
<th width="120">序号</th>
<th width="100">出发地</th>
<th width="80">公司团号</th>
<th width="150">航班</th>
<th width="100">领队</th>
<th width="100">导游</th>
<th width="100">系列</th>
<th width="80">机位总数<br />(Y/E/F)</th>
<th width="100">使用时间</th>
<th width="120">酒店名称</th>
<th width="120">更换酒店</th>
<th width="100">OP状态</th>
<th width="100">地接状态</th>
<th width="120">{{$t('active.ad_xuhao')}}</th>
<th width="100">{{$t('sm.chufadi')}}</th>
<th width="80">{{$t('salesModule.CompanyNum')}}</th>
<th width="150">{{$t('visa.v_hangban')}}</th>
<th width="100">{{$t('leader.leader_Leader')}}</th>
<th width="100">{{$t('leader.leader_Guide')}}</th>
<th width="100">{{$t('advmanager.v_xilie')}}</th>
<th width="80">{{$t('ground.jiweishu')}}<br />(Y/E/F)</th>
<th width="100">{{$t('ground.shuyongsj')}}</th>
<th width="120">{{$t('hotel.hotel_name')}}</th>
<th width="120">{{$t('ground.genghuanjiudian')}}</th>
<th width="100">{{$t('salesModule.OPstatus')}}</th>
<th width="100">{{$t('salesModule.DJstatus')}}</th>
</tr>
<tr v-if="dataList.length==0">
<td colspan="13">暂无数据</td>
<td colspan="13">{{$t('active.ld_noData')}}</td>
</tr>
<template v-for="(outItem,outindex) in dataList">
<tbody :class="{roomQuerySplitTrCss:outindex%2!=0}">
......@@ -196,21 +196,21 @@
</td>
<td>
<template v-if="thirdItem.OPState==1">
<span style="color: green;">OP-指定</span>
<span style="color: green;">{{$t('salesModule.OPZD')}}</span>
</template>
<template v-else-if="thirdItem.OPState==2">
<span style="color:red;">OP-暂定</span>
<span style="color:red;">{{$t('salesModule.OPCD')}}</span>
</template>
</td>
<td>
<template v-if="thirdItem.DMCState==1">
<span style="color: green;">地接-OK</span>
<span style="color: green;">{{$t('salesModule.DJOK')}}</span>
</template>
<template v-else-if="thirdItem.DMCState==2">
<span style="color:red;">地接-暂定</span>
<span style="color:red;">{{$t('salesModule.DJZK')}}</span>
</template>
<template v-else-if="thirdItem.DMCState==0">
<span style="color:red;">地接-未操作</span>
<span style="color:red;">{{$t('salesModule.DJWCZ')}}</span>
</template>
</td>
</tr>
......@@ -408,7 +408,7 @@
queryMsg: this.msg,
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,
res => {
this.loading = false;
......
src/components/SalesModule/passengerHouse.vue
View file @ 43711976
......@@ -18,12 +18,12 @@
<div class='flexOne'>
<div class="passengerHouse">
<p>
<em class="fnormal">房间分配</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: #C62452; 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">不占床</span>
<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">{{$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">{{$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">{{$t('ground.bzhanchuang')}}</span>
</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="passengerHouseBgMiddle">
<div v-for="(item,index) in orderHouseList">
......
src/router/config.js
View file @ 43711976
......@@ -3975,6 +3975,13 @@ export default {
}
},
{
path: '/BuyingPrice',
name: 'BuyingPrice',
component: resolve => require(['@/components/Buying/BuyingPrice'], resolve),
meta: {
title: '商品价格'
}
},{
path: '/AdManageList',
name: 'AdManageList',
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