Skip to content

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

新酒店价格相关字段

parent aea6857a
Show whitespace changes
Inline Side-by-side
Showing with 120 additions and 40 deletions
src/components/Hotel/HotelProductCalendar.vue
View file @ ca74421e
......@@ -30,13 +30,15 @@
<template v-for="(childItem,childIndex) in item.data.SubList">
<p>
<span title="点击修改价格和库存信息">
价格：<span @click="goUrlA('2', item,childItem.BatchNumber)" class="text_underLine">{{childItem.CostPrice}}（{{childItem.CurrencyName}}）</span>
</span><br/>
价格：<span @click="goUrlA('2', item,childItem.BatchNumber)"
class="text_underLine">{{childItem.CostPrice}}（{{childItem.CurrencyName}}）</span>
</span><br />
<span title="点击跳转到总库存看板">
总库存：<span class="text_underLine" @click="goUrlB(item)">{{childItem.Inventory}}（间）</span>
</span><br/>
</span><br />
<span title="点击跳转到酒店查询">
剩余库存：<span class="text_underLine" @click="goUrlHotelTeam(item)">{{childItem.RemainingInventory}}（间）</span>
剩余库存：<span class="text_underLine"
@click="goUrlHotelTeam(item)">{{childItem.RemainingInventory}}（间）</span>
</span>
</p>
</template>
......@@ -83,14 +85,16 @@
return 'hasStock hasStock_4'
} else if (type === 5) {
return 'hasStock hasStock_5'
} else if (type === 6) {
return 'hasStock hasStock_6'
}
},
calendarHide: function () {
this.calendar.show = false
this.calendar.data = {}
},
goUrlA: function (type, item,BatchNumber) {
this.$emit('goEdit', type, item.day,BatchNumber)
goUrlA: function (type, item, BatchNumber) {
this.$emit('goEdit', type, item.day, BatchNumber)
},
goUrlHotelTeam: function (item) {
this.$router.push({
......@@ -115,7 +119,6 @@
}
}
}
</script>
<style scoped>
......@@ -296,6 +299,11 @@
background-color: #02F78E;
}
.hotelProductCalendar_day>div>.hasStock_6 {
background-color: #808000;
}
.hotelProductCalendar_day>div>.noStock {
padding: 30px 0 0 0;
width: 100%;
......
src/components/Hotel/HotelProductManage2.vue
View file @ ca74421e
......@@ -40,6 +40,7 @@
style="color:#000000;background-color: #DDDDDD;padding:2px 4px;border-radius:5px">{{$t('ground.danji')}}</span>
<span
style="color:#000000;background-color: #02F78E;padding:2px 4px;border-radius:5px">{{$t('ground.tebiejia')}}</span>
<span style="color:#000000;background-color: #808000;padding:2px 4px;border-radius:5px">行前日</span>
</div>
<div class="hotelProductManage2_calendar">
<div class="hotelProductManage2_calendarItem" v-for="(item, index) in dayList" :key="index">
......@@ -149,6 +150,7 @@
<el-option :label="$t('ground.pingji')" value="3"></el-option>
<el-option :label="$t('ground.danji')" value="4"></el-option>
<el-option :label="$t('ground.tebiejia')" value="5"></el-option>
<el-option label="行前日" value="6"></el-option>
</el-select>
</el-form-item>
</el-col>
......@@ -162,39 +164,32 @@
<el-select v-model="msg2.BatchNumber" :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('ground.diyipi')" :value="1"></el-option>
<el-option :label="$t('ground.dierpi')" :value="2"></el-option>
<!-- <el-option label="第三批" :value="3"></el-option> -->
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('ground.tiqianhuanfangts')">
<el-input-number v-model="msg2.BeforeDay" :precision="2" :min="0"
maxlength="10"></el-input-number>
<el-input-number v-model="msg2.BeforeDay" :precision="2" :min="0" maxlength="10"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('ground.mianjianshu')">
<el-input-number v-model="msg2.FreeRoomNum" :precision="2" :min="0"
maxlength="10"></el-input-number>
<el-input-number v-model="msg2.FreeRoomNum" :precision="2" :min="0" maxlength="10"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('ground.biaozhunjiancb')">
<el-input-number v-model="msg2.CostPrice" :precision="2" :min="0"
maxlength="10"></el-input-number>
<el-input-number v-model="msg2.CostPrice" :precision="2" :min="0" maxlength="10"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('ground.sankejia')">
<el-input-number v-model="msg2.SanKePrice" :precision="2" :min="0"
maxlength="10"></el-input-number>
<el-input-number v-model="msg2.SanKePrice" :precision="2" :min="0" maxlength="10"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('ground.shuijin')">
<el-input-number v-model="msg2.TaxesPrice" :precision="2" :min="0"
maxlength="10"></el-input-number>
<el-input-number v-model="msg2.TaxesPrice" :precision="2" :min="0" maxlength="10"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
......@@ -227,6 +222,21 @@
<el-input-number v-model="msg2.GuideRoomPrice" :precision="2" :min="0"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="入汤税">
<el-input-number v-model="msg2.PriceInTangTax" :precision="2" :min="0"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="早餐">
<el-checkbox v-model="msg2.PriceIsBreakfast" :true-label="1" :false-label="0"></el-checkbox>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="晚餐">
<el-checkbox v-model="msg2.PriceIsDinner" :true-label="1" :false-label="0"></el-checkbox>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
......@@ -309,6 +319,13 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="18">
<el-form-item label="注意事项">
<el-input type="textarea" v-model="msg2.TipContent" :rows="1" :placeholder="$t('ground.qingshurbznr')"
style="width: 600px;">
</el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
......@@ -401,6 +418,7 @@
<el-option :label="$t('ground.pingji')" value="3"></el-option>
<el-option :label="$t('ground.danji')" value="4"></el-option>
<el-option :label="$t('ground.tebiejia')" value="5"></el-option>
<el-option label="行前日" value="6"></el-option>
</el-select>
</el-form-item>
</el-col>
......@@ -414,39 +432,33 @@
<el-select v-model="msg.BatchNumber" :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('ground.diyipi')" :value="1"></el-option>
<el-option :label="$t('ground.dierpi')" :value="2"></el-option>
<!-- <el-option label="第三批" :value="3"></el-option> -->
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('ground.tiqianhuanfangts')">
<el-input-number v-model="msg.BeforeDay" :precision="2" :min="0"
@keyup.native="checkInteger(msg,'BeforeDay')" maxlength="10"></el-input-number>
<el-input-number v-model="msg.BeforeDay" :precision="2" :min="0" maxlength="10"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('ground.mianjianshu')">
<el-input-number v-model="msg.FreeRoomNum" :precision="2" :min="0"
@keyup.native="checkPrice(msg,'FreeRoomNum')" maxlength="10"></el-input-number>
<el-input-number v-model="msg.FreeRoomNum" :precision="2" :min="0" maxlength="10"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('ground.biaozhunjiancb')">
<el-input-number v-model="msg.CostPrice" :precision="2" :min="0"
@keyup.native="checkPrice(msg,'CostPrice')" maxlength="10"></el-input-number>
<el-input-number v-model="msg.CostPrice" :precision="2" :min="0" maxlength="10"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('ground.sankejia')">
<el-input-number v-model="msg.SanKePrice" :precision="2" :min="0"
@keyup.native="checkPrice(msg,'SanKePrice')" maxlength="10"></el-input-number>
<el-input-number v-model="msg.SanKePrice" :precision="2" :min="0" maxlength="10"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('ground.shuijin')">
<el-input-number v-model="msg.TaxesPrice" :precision="2" :min="0"
@keyup.native="checkPrice(msg,'TaxesPrice')" maxlength="10"></el-input-number>
<el-input-number v-model="msg.TaxesPrice" :precision="2" :min="0" maxlength="10"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
......@@ -479,6 +491,21 @@
<el-input-number v-model="msg.GuideRoomPrice" :precision="2" :min="0"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="入汤税">
<el-input-number v-model="msg.PriceInTangTax" :precision="2" :min="0"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="早餐">
<el-checkbox v-model="msg.PriceIsBreakfast" :true-label="1" :false-label="0"></el-checkbox>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="晚餐">
<el-checkbox v-model="msg.PriceIsDinner" :true-label="1" :false-label="0"></el-checkbox>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
......@@ -560,6 +587,13 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="18">
<el-form-item label="注意事项">
<el-input type="textarea" v-model="msg.TipContent" :rows="1" :placeholder="$t('ground.qingshurbznr')"
style="width: 600px;">
</el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
......@@ -686,6 +720,10 @@
FreeRoomNum: 0, //免间数
PayStyle: 0, //付款方式
PriceTaxType: 0, //税入税别
PriceInTangTax: 0, //入汤税
PriceIsBreakfast: 1, //是否含早餐(1-含,0-不含)
PriceIsDinner: 0, //是否含晚餐(1-含,0-不含)
TipContent: "", //注意事项
},
msg2: {
Hotel: '0',
......@@ -720,6 +758,10 @@
FreeRoomNum: 0, //免间数
PayStyle: 0, //付款方式
PriceTaxType: 0, //税入税别
PriceInTangTax: 0, //入汤税
PriceIsBreakfast: 1, //是否含早餐(1-含,0-不含)
PriceIsDinner: 0, //是否含晚餐(1-含,0-不含)
TipContent: "", //注意事项
},
rules: {
InventoryType: {
......@@ -944,6 +986,8 @@
return 'hasStock_4';
} else if (type === 5) {
return 'hasStock_5';
} else if (type === 6) {
return 'hasStock_6';
}
} else {
return;
......@@ -1060,6 +1104,10 @@
this.msg.FreeRoomNum = data.FreeRoomNum;
this.msg.PayStyle = data.PayStyle;
this.msg.PriceTaxType = data.PriceTaxType;
this.msg.PriceInTangTax = data.PriceInTangTax;
this.msg.PriceIsBreakfast = data.PriceIsBreakfast;
this.msg.PriceIsDinner = data.PriceIsDinner;
this.msg.TipContent = data.TipContent;
}
})
},
......@@ -1143,6 +1191,10 @@
this.msg.FreeRoomNum = 0;
this.msg.PayStyle = 0;
this.msg.PriceTaxType = 0;
this.msg.PriceInTangTax = 0;
this.msg.PriceIsBreakfast = 1;
this.msg.PriceIsDinner = 0;
this.msg.TipContent = "";
} else {
this.Error(res.data.message)
}
......@@ -1163,6 +1215,11 @@
this.msg2.FreeRoomNum = 0;
this.msg2.PayStyle = 0;
this.msg2.PriceTaxType = 0;
this.msg2.PriceTaxType = 0;
this.msg2.PriceInTangTax = 0;
this.msg2.PriceIsBreakfast = 1;
this.msg2.PriceIsDinner = 0;
this.msg2.TipContent = "";
},
//批量删除
delete2Reset: function () {
......@@ -1181,6 +1238,10 @@
that.msg2.FreeRoomNum = 0;
that.msg2.PayStyle = 0;
that.msg2.PriceTaxType = 0;
that.msg2.PriceInTangTax = 0;
that.msg2.PriceIsBreakfast = 1;
that.msg2.PriceIsDinner = 0;
that.msg2.TipContent = "";
} else {
that.Error(res.data.message)
}
......@@ -1451,6 +1512,10 @@
background-color: #02F78E;
}
.hotelProductManage2_calendarItem>.calendarItem_day>div>.hasStock_6 {
background-color: #808000;
}
/* 页面编辑 */
.hotelProductManage2_edit2 {
margin: 20px 0 0 0;
......
src/components/Hotel/HotelSalesBoard.vue
View file @ ca74421e
......@@ -199,6 +199,10 @@
background-color: #02F78E;
}
.hotelSalesBoard .hasStock_6 {
background-color: #808000;
}
.hotelSalesBoard .stock1 {
color: red;
}
......@@ -258,9 +262,11 @@
</li>
<li style="margin-right:50px;">
<button class="normalBtn" type="button" @click="GetHoltelInventory()">{{$t('pub.searchBtn')}}</button>
<input type="button" class="normalBtn" :value="$t('ground.xiazaidangejiud')" @click="DownLoadHotelSalesBoard()" />
<input type="button" class="normalBtn" :value="$t('ground.xiazaidangejiud')"
@click="DownLoadHotelSalesBoard()" />
<input type="button" class="normalBtn" :value="$t('ground.xiazaixuanbu')" @click="DownLoadAllHotelSalesBoard()" />
<input type="button" class="normalBtn" :value="$t('ground.xiazaixuanbu')"
@click="DownLoadAllHotelSalesBoard()" />
</li>
</ul>
</div>
......@@ -275,6 +281,7 @@
<span class="hasStock_3" style="padding:2px 4px;border-radius:5px">{{$t('ground.pingji')}}</span>
<span class="hasStock_4" style="padding:2px 4px;border-radius:5px">{{$t('ground.danji')}}</span>
<span class="hasStock_5" style="padding:2px 4px;border-radius:5px">{{$t('ground.tebiejia')}}</span>
<span class="hasStock_6" style="padding:2px 4px;border-radius:5px">行前日</span>
</div>
<div class="month">
<ul>
......
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