Skip to content

S
SuperMan
Commit d7ce8819 authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

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

parents c340fb89 62c91e1b
Hide whitespace changes
Inline Side-by-side
Showing with 215 additions and 133 deletions
src/components/Hotel/HotelProductManage2.vue
View file @ d7ce8819
......@@ -57,42 +57,45 @@
<div :class="stockColor(item,subItem)"
:style="subItem.month===item.date&&msg2.DateList.indexOf(subItem.day)!==-1?'border-color: green':''"
@click="calendarDayOn(item, subItem)">
{{subItem.date.getDate()}}<br />
<div class="detailInfo" v-if="subItem.data&&subItem.data.SubList && subItem.data.SubList[0]">
<div class="triangle_border_up"></div>
<div class="popContent">
<template v-if="subItem.data&&subItem.data.SubList && subItem.data.SubList[0]">
<div class="popList">
<table style="margin-left:3px;padding-top:2px;">
<tr>
<th width="50">批次</th>
<th width="50">价格</th>
<th width="50">库存</th>
<th width="50">剩余库存</th>
</tr>
<tr v-for="(childItem,childIndex) in subItem.data.SubList">
<td>
{{childItem.BatchNumber}}
</td>
<td>
{{childItem.CostPrice}}
</td>
<td>
{{childItem.Inventory}}
</td>
<td>
{{childItem.RemainingInventory}}
</td>
</tr>
</table>
<input type="button" class="hollowFixedBtn Htupbtn" value="修改" @click="goEdit('2', subItem.day,subItem.data.SubList[0].BatchNumber)"/>
</div>
</template>
</div>
</div>
<template v-if="subItem.data&&subItem.data.SubList && subItem.data.SubList[0]">
<span v-if="subItem.data.SubList.length>1"> {{subItem.data.SubList.length}} </span>
<el-popover placement="bottom" title="报价信息" width="400" trigger="hover"
v-if="subItem.data&&subItem.data.SubList && subItem.data.SubList[0]">
<template>
<table style="margin-left:3px;padding-top:2px;width:370px;">
<tr>
<th width="40" style="text-align:center">批次</th>
<th width="40" style="text-align:center">价格</th>
<th width="40" style="text-align:center">库存</th>
<th width="60" style="text-align:center">剩余<br/>库存</th>
<th width="140" style="text-align:center">供应商</th>
<th width="50" style="text-align:center">操作</th>
</tr>
<tr v-for="(childItem,childIndex) in subItem.data.SubList">
<td style="text-align:center">
{{childItem.BatchNumber}}
</td>
<td style="text-align:center">
{{childItem.CostPrice}}
</td>
<td style="text-align:center">
{{childItem.Inventory}}
</td>
<td style="text-align:center">
{{childItem.RemainingInventory}}
</td>
<td style="text-align:left">
{{childItem.SupplierName}}
</td>
<td style="text-align:center">
<a style="text-decoration:underline;cursor:pointer;color:blue;"
@click="goEdit('2', subItem.day,childItem.BatchNumber)">修改</a>
</td>
</tr>
</table>
</template>
<span slot="reference" >{{subItem.date.getDate()}}</span>
</el-popover>
<template v-else>
{{subItem.date.getDate()}}
</template>
</div>
</div>
......@@ -148,7 +151,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="6">
<el-form-item label="提前还房天数">
<el-input-number v-model="msg2.BeforeDay" :precision="2" :min="0"
@keyup.native="checkInteger(msg2,'BeforeDay')" maxlength="10"></el-input-number>
......@@ -159,12 +162,11 @@
<el-input-number v-model="msg2.FreeRoomNum" :precision="2" :min="0"
@keyup.native="checkPrice(msg2,'FreeRoomNum')" maxlength="10"></el-input-number>
</el-form-item>
</el-col
<el-col :span="6">
<el-form-item label="标准间成本价">
<el-input-number v-model="msg2.CostPrice" :precision="2" :min="0"
@keyup.native="checkPrice(msg2,'CostPrice')" maxlength="10"></el-input-number>
</el-form-item>
</el-col <el-col :span="6">
<el-form-item label="标准间成本价">
<el-input-number v-model="msg2.CostPrice" :precision="2" :min="0"
@keyup.native="checkPrice(msg2,'CostPrice')" maxlength="10"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
......@@ -225,6 +227,19 @@
<el-input v-model="msg2.CurrentRate" placeholder="汇率" style="width:80px;"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="付款方式 ">
<el-select class='w135 sel' v-model='msg2.PayStyle' :placeholder="$t('pub.pleaseSel')">
<el-option label='请选择' :value='0'></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-select>
</el-form-item>
</el-col>
</el-row>
<el-row style="padding: 20px 0 0 0;border-top: 1px dashed #ccc;">
<el-col :span="6">
......@@ -449,6 +464,19 @@
<el-input v-model="msg.CurrentRate" placeholder="汇率" style="width:80px;"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="付款方式 ">
<el-select class='w135 sel' v-model='msg.PayStyle' :placeholder="$t('pub.pleaseSel')">
<el-option label='请选择' :value='0'></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-select>
</el-form-item>
</el-col>
</el-row>
<el-row style="padding: 20px 0 0 0;border-top: 1px dashed #ccc;">
<el-col :span="6">
......@@ -607,8 +635,9 @@
SanKePrice: 0, //散客价
BatchNumber: 1, //批次号
TaxesPrice: 0, //税金
BeforeDay:0,//提前还房天数
FreeRoomNum:0,//免间数
BeforeDay: 0, //提前还房天数
FreeRoomNum: 0, //免间数
PayStyle: 0, //付款方式
},
msg2: {
Hotel: '0',
......@@ -639,8 +668,9 @@
SanKePrice: 0, //散客价
BatchNumber: 1, //批次号
TaxesPrice: 0, //税金
BeforeDay:0,//提前还房天数
FreeRoomNum:0,//免间数
BeforeDay: 0, //提前还房天数
FreeRoomNum: 0, //免间数
PayStyle: 0, //付款方式
},
rules: {
InventoryType: {
......@@ -880,7 +910,6 @@
}, res => {
if (res.data.resultCode === 1) {
let json = res.data.data;
this.hotelInfo.HotelName = json.HotelName;
this.hotelInfo.TotalInventory = json.TotalInventory;
this.hotelInfo.Validity = json.Validity;
......@@ -964,8 +993,9 @@
this.msg.SanKePrice = data.SanKePrice;
this.msg.BatchNumber = data.BatchNumber;
this.msg.TaxesPrice = data.TaxesPrice;
this.msg.BeforeDay=data.BeforeDay;
this.msg.FreeRoomNum=data.FreeRoomNum;
this.msg.BeforeDay = data.BeforeDay;
this.msg.FreeRoomNum = data.FreeRoomNum;
this.msg.PayStyle = data.PayStyle;
}
})
},
......@@ -1007,7 +1037,7 @@
initSupplier() {
this.apipost("supplier_post_GetAllList", {
Type: 1,
Country:651
Country: 651
}, res => {
if (res.data.resultCode === 1) {
this.SupplierList = res.data.data;
......@@ -1044,9 +1074,10 @@
this.msg.CostPrice = 0;
this.msg.SanKePrice = 0;
this.msg.BatchNumber = 1;
this.msg.TaxesPrice=0;
this.msg.BeforeDay=0;
this.msg.FreeRoomNum=0;
this.msg.TaxesPrice = 0;
this.msg.BeforeDay = 0;
this.msg.FreeRoomNum = 0;
this.msg.PayStyle = 0;
} else {
this.Error(res.data.message)
}
......@@ -1063,8 +1094,9 @@
this.msg2.SanKePrice = 0;
this.msg2.BatchNumber = 1;
this.msg2.TaxesPrice = 0;
this.msg2.BeforeDay=0;
this.msg2.FreeRoomNum=0;
this.msg2.BeforeDay = 0;
this.msg2.FreeRoomNum = 0;
this.msg2.PayStyle = 0;
},
//批量删除
delete2Reset: function () {
......@@ -1079,8 +1111,9 @@
that.msg2.SanKePrice = 0;
that.msg2.BatchNumber = 1;
that.msg2.TaxesPrice = 0;
that.msg2.BeforeDay=0;
that.msg2.FreeRoomNum=0;
that.msg2.BeforeDay = 0;
that.msg2.FreeRoomNum = 0;
that.msg2.PayStyle = 0;
} else {
that.Error(res.data.message)
}
......@@ -1100,8 +1133,9 @@
this.msg2.SanKePrice = 0;
this.msg2.BatchNumber = 1;
this.msg2.TaxesPrice = 0;
this.msg2.BeforeDay=0;
this.msg2.FreeRoomNum=0;
this.msg2.BeforeDay = 0;
this.msg2.FreeRoomNum = 0;
this.msg2.PayStyle = 0;
} else {
this.Error(res.data.message)
}
......@@ -1148,6 +1182,7 @@
this.initSupplier();
}
}
</script>
<style>
......@@ -1607,7 +1642,7 @@
.hotelProductManage2 .detailInfo {
display: none;
position: absolute;
left: -70px;
left: -145px;
top: 50px;
z-index: 999;
}
......@@ -1615,7 +1650,7 @@
.hotelProductManage2 .triangle_border_up {
width: 0;
height: 0;
border-width: 0 103px 30px;
border-width: 0 175px 30px;
border-style: solid;
opacity: 0.75;
border-color: transparent transparent rgba(233, 82, 82, 1);
......@@ -1623,7 +1658,7 @@
}
.hotelProductManage2 .detailInfo .popContent {
width: 205px;
width: 350px;
min-height: 80px;
background-color: #e95252;
text-align: left;
......@@ -1647,7 +1682,11 @@
margin: 10px 10px 0 0;
text-align: right;
}
.hotelProductManage2 .Htupbtn{
padding:0 10px;height:25px;margin:10px 0 0 75px;
.hotelProductManage2 .Htupbtn {
padding: 0 10px;
height: 25px;
margin: 10px 0 0 75px;
}
</style>
src/components/Supplier/HotelProductManage.vue
View file @ d7ce8819
......@@ -6,8 +6,8 @@
<el-date-picker v-model="condition.month" type="month" value-format="yyyy-MM" :clearable="false"
placeholder="选择月"></el-date-picker>
</div>
<input type="button" class="normalBtn" value="查询" @click="getMonths()"/>
<input type="button" class="normalBtn" value="批量编辑" style="margin-right:10px;" @click="goEdit('1')"/>
<input type="button" class="normalBtn" value="查询" @click="getMonths()" />
<input type="button" class="normalBtn" value="批量编辑" style="margin-right:10px;" @click="goEdit('1')" />
</div>
<div class="hotelProductManage2_tableBox">
<table class="hotelProductManage2_table" border="0" cellspacing="0" cellpadding="0">
......@@ -55,42 +55,41 @@
<div :class="stockColor(item,subItem)"
:style="subItem.month===item.date&&msg2.DateList.indexOf(subItem.day)!==-1?'border-color: green':''"
@click="calendarDayOn(item, subItem)">
{{subItem.date.getDate()}}<br />
<div class="detailInfo" v-if="subItem.data&&subItem.data.SubList && subItem.data.SubList[0]">
<div class="triangle_border_up"></div>
<div class="popContent">
<template v-if="subItem.data&&subItem.data.SubList && subItem.data.SubList[0]">
<div class="popList">
<table style="margin-left:3px;padding-top:2px;">
<tr>
<th width="50">批次</th>
<th width="50">价格</th>
<th width="50">库存</th>
<th width="50">剩余库存</th>
</tr>
<tr v-for="(childItem,childIndex) in subItem.data.SubList">
<td>
{{childItem.BatchNumber}}
</td>
<td>
{{childItem.CostPrice}}
</td>
<td>
{{childItem.Inventory}}
</td>
<td>
{{childItem.RemainingInventory}}
</td>
</tr>
</table>
<input type="button" class="hollowFixedBtn Htupbtn" value="修改" @click="goEdit('2', subItem.day,subItem.data.SubList[0].BatchNumber)"/>
</div>
</template>
</div>
</div>
<template v-if="subItem.data&&subItem.data.SubList && subItem.data.SubList[0]">
<span v-if="subItem.data.SubList.length>1"> {{subItem.data.SubList.length}} </span>
<el-popover placement="bottom" title="报价信息" width="280" trigger="hover"
v-if="subItem.data&&subItem.data.SubList && subItem.data.SubList[0]">
<template>
<table style="margin-left:3px;padding-top:2px;width:270px;">
<tr>
<th width="50" style="text-align:center">批次</th>
<th width="50" style="text-align:center">价格</th>
<th width="50" style="text-align:center">库存</th>
<th width="60" style="text-align:center">剩余<br/>库存</th>
<th width="50" style="text-align:center">操作</th>
</tr>
<tr v-for="(childItem,childIndex) in subItem.data.SubList">
<td style="text-align:center">
{{childItem.BatchNumber}}
</td>
<td style="text-align:center">
{{childItem.CostPrice}}
</td>
<td style="text-align:center">
{{childItem.Inventory}}
</td>
<td style="text-align:center">
{{childItem.RemainingInventory}}
</td>
<td style="text-align:center">
<a style="text-decoration:underline;cursor:pointer;color:blue;"
@click="goEdit('2', subItem.day,childItem.BatchNumber)">修改</a>
</td>
</tr>
</table>
</template>
<span slot="reference" >{{subItem.date.getDate()}}</span>
</el-popover>
<template v-else>
{{subItem.date.getDate()}}
</template>
</div>
</div>
......@@ -146,7 +145,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="6">
<el-form-item label="提前还房天数">
<el-input-number v-model="msg2.BeforeDay" :precision="2" :min="0"
@keyup.native="checkInteger(msg2,'BeforeDay')" maxlength="10"></el-input-number>
......@@ -157,12 +156,11 @@
<el-input-number v-model="msg2.FreeRoomNum" :precision="2" :min="0"
@keyup.native="checkPrice(msg2,'FreeRoomNum')" maxlength="10"></el-input-number>
</el-form-item>
</el-col
<el-col :span="6">
<el-form-item label="标准间成本价">
<el-input-number v-model="msg2.CostPrice" :precision="2" :min="0"
@keyup.native="checkPrice(msg2,'CostPrice')" maxlength="10"></el-input-number>
</el-form-item>
</el-col <el-col :span="6">
<el-form-item label="标准间成本价">
<el-input-number v-model="msg2.CostPrice" :precision="2" :min="0"
@keyup.native="checkPrice(msg2,'CostPrice')" maxlength="10"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
......@@ -223,6 +221,19 @@
<el-input v-model="msg2.CurrentRate" placeholder="汇率" style="width:80px;"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="付款方式 ">
<el-select class='w135 sel' v-model='msg2.PayStyle' :placeholder="$t('pub.pleaseSel')">
<el-option label='请选择' :value='0'></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-select>
</el-form-item>
</el-col>
</el-row>
<el-row style="padding: 20px 0 0 0;border-top: 1px dashed #ccc;">
<el-col :span="6">
......@@ -251,7 +262,8 @@
<el-form-item label="供应商" prop="Supplier">
<el-select v-model="msg2.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" v-if="userInfo.SupplierId==item.ID">
<el-option v-for="(item,index) in SupplierList" :key="index" :label="item.Name" :value="item.ID"
v-if="userInfo.SupplierId==item.ID">
</el-option>
</el-select>
</el-form-item>
......@@ -447,6 +459,19 @@
<el-input v-model="msg.CurrentRate" placeholder="汇率" style="width:80px;"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="付款方式 ">
<el-select class='w135 sel' v-model='msg.PayStyle' :placeholder="$t('pub.pleaseSel')">
<el-option label='请选择' :value='0'></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-select>
</el-form-item>
</el-col>
</el-row>
<el-row style="padding: 20px 0 0 0;border-top: 1px dashed #ccc;">
<el-col :span="6">
......@@ -475,7 +500,8 @@
<el-form-item label="供应商" prop="Supplier">
<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" v-if="userInfo.SupplierId==item.ID">
<el-option v-for="(item,index) in SupplierList" :key="index" :label="item.Name" :value="item.ID"
v-if="userInfo.SupplierId==item.ID">
</el-option>
</el-select>
</el-form-item>
......@@ -576,7 +602,7 @@
data: {}
},
editShow: false,
userInfo:{},
userInfo: {},
msg: {
Hotel: '0',
Supplier: 30,
......@@ -606,9 +632,10 @@
SanKePrice: 0, //散客价
BatchNumber: 1, //批次号
TaxesPrice: 0, //税金
BeforeDay:0,//提前还房天数
FreeRoomNum:0,//免间数
OpType:1,//供应商操作
BeforeDay: 0, //提前还房天数
FreeRoomNum: 0, //免间数
OpType: 1, //供应商操作
PayStyle:0,//付款方式
},
msg2: {
Hotel: '0',
......@@ -639,9 +666,10 @@
SanKePrice: 0, //散客价
BatchNumber: 1, //批次号
TaxesPrice: 0, //税金
BeforeDay:0,//提前还房天数
FreeRoomNum:0,//免间数
OpType:1,//供应商操作
BeforeDay: 0, //提前还房天数
FreeRoomNum: 0, //免间数
OpType: 1, //供应商操作
PayStyle:0,//付款方式
},
rules: {
InventoryType: {
......@@ -874,10 +902,15 @@
this.msg2.DateList.splice(dayIndex, 1)
},
getData: function (date, key) {
var sId = 0;
if (this.getLocalStorageSupplier()) {
sId = this.getLocalStorageSupplier().SupplierId;
}
this.ApiPost2('hotelreport_get_GetHotelPriceMonthStatistics', {
HotelId: this.hotelId,
Year: date.split('-')[0],
Month: date.split('-')[1]
Month: date.split('-')[1],
Supplier: sId
}, res => {
if (res.data.resultCode === 1) {
let json = res.data.data;
......@@ -965,8 +998,9 @@
this.msg.SanKePrice = data.SanKePrice;
this.msg.BatchNumber = data.BatchNumber;
this.msg.TaxesPrice = data.TaxesPrice;
this.msg.BeforeDay=data.BeforeDay;
this.msg.FreeRoomNum=data.FreeRoomNum;
this.msg.BeforeDay = data.BeforeDay;
this.msg.FreeRoomNum = data.FreeRoomNum;
this.msg.PayStyle=data.PayStyle;
}
})
},
......@@ -1044,9 +1078,10 @@
this.msg.CostPrice = 0;
this.msg.SanKePrice = 0;
this.msg.BatchNumber = 1;
this.msg.TaxesPrice=0;
this.msg.BeforeDay=0;
this.msg.FreeRoomNum=0;
this.msg.TaxesPrice = 0;
this.msg.BeforeDay = 0;
this.msg.FreeRoomNum = 0;
this.msg.PayStyle=0;
} else {
this.Error(res.data.message)
}
......@@ -1063,8 +1098,9 @@
this.msg2.SanKePrice = 0;
this.msg2.BatchNumber = 1;
this.msg2.TaxesPrice = 0;
this.msg2.BeforeDay=0;
this.msg2.FreeRoomNum=0;
this.msg2.BeforeDay = 0;
this.msg2.FreeRoomNum = 0;
this.msg2.PayStyle=0;
},
//批量删除
delete2Reset: function () {
......@@ -1079,8 +1115,9 @@
that.msg2.SanKePrice = 0;
that.msg2.BatchNumber = 1;
that.msg2.TaxesPrice = 0;
that.msg2.BeforeDay=0;
that.msg2.FreeRoomNum=0;
that.msg2.BeforeDay = 0;
that.msg2.FreeRoomNum = 0;
that.msg2.PayStyle=0;
} else {
that.Error(res.data.message)
}
......@@ -1100,8 +1137,9 @@
this.msg2.SanKePrice = 0;
this.msg2.BatchNumber = 1;
this.msg2.TaxesPrice = 0;
this.msg2.BeforeDay=0;
this.msg2.FreeRoomNum=0;
this.msg2.BeforeDay = 0;
this.msg2.FreeRoomNum = 0;
this.msg2.PayStyle=0;
} else {
this.Error(res.data.message)
}
......@@ -1149,6 +1187,7 @@
this.initSupplier();
}
}
</script>
<style>
......@@ -1644,7 +1683,11 @@
margin: 10px 10px 0 0;
text-align: right;
}
.hotelProductManage2 .Htupbtn{
padding:0 10px;height:25px;margin:10px 0 0 75px;
.hotelProductManage2 .Htupbtn {
padding: 0 10px;
height: 25px;
margin: 10px 0 0 75px;
}
</style>
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