Skip to content

S
SuperMan
Commit 1aa96b6b authored by liudong1993's avatar liudong1993
Browse files
Options

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

parents 158d5445 d7ce8819
Hide whitespace changes
Inline Side-by-side
Showing with 260 additions and 142 deletions
src/components/FinancialModule/accDetail/PoolAccDetail.vue
View file @ 1aa96b6b
...@@ -202,12 +202,21 @@ ...@@ -202,12 +202,21 @@
</tr> </tr>
<tr> <tr>
<td :colspan="5">{{$t('fnc.a_heji')}}（{{$t('hotel.hotel_totalRoom')}} {{ DataList.length }} {{$t('hotel.hotel_item')}}）</td> <td :colspan="5">{{$t('fnc.a_heji')}}（{{$t('hotel.hotel_totalRoom')}} {{ DataList.length }} {{$t('hotel.hotel_item')}}）</td>
<td></td> <!-- <td></td>
<td></td> <td></td>
<td> {{ moneyFormat(endRStartMoney) }} </td> <td> {{ moneyFormat(endRStartMoney) }} </td>
<td></td> <td></td>
<td></td> <td></td>
<td></td> <td></td>
<td> {{ moneyFormat(endStartMoney) }} </td> -->
<td> {{ moneyFormat(wShou) }} </td>
<td> {{ moneyFormat(wZhi) }} </td>
<td> {{ moneyFormat(endRStartMoney) }} </td>
<td></td>
<td> {{ moneyFormat(bShou) }} </td>
<td> {{ moneyFormat(bZhi) }} </td>
<td> {{ moneyFormat(endStartMoney) }} </td> <td> {{ moneyFormat(endStartMoney) }} </td>
</tr> </tr>
</table> </table>
...@@ -437,6 +446,10 @@ export default { ...@@ -437,6 +446,10 @@ export default {
allBPrice:0, allBPrice:0,
allWPrice:0, allWPrice:0,
userInfo:{}, userInfo:{},
wShou:0,
wZhi:0,
bShou:0,
bZhi:0,
} }
},created(){ },created(){
this.userInfo = this.getLocalStorage(); this.userInfo = this.getLocalStorage();
...@@ -584,23 +597,35 @@ export default { ...@@ -584,23 +597,35 @@ export default {
} }
this.endStartMoney = ''; this.endStartMoney = '';
this.endRStartMoney =''; this.endRStartMoney ='';
this.bShou = 0;
this.wShou = 0;
this.bZhi = 0;
this.wZhi = 0;
this.apipost('Financial_post_GetAccountDetailList',this.msg,res=>{ this.apipost('Financial_post_GetAccountDetailList',this.msg,res=>{
if(res.data.resultCode==1){ if(res.data.resultCode==1){
let data = res.data.data; let data = res.data.data;
if(data.length){ if(data.length){
this.StartMoney = data[0].StartMoney?data[0].StartMoney:0; // 外币 this.StartMoney = data[0].StartMoney?data[0].StartMoney:0; // 外币
this.RStartMoney = data[0].StartMoney?data[0].StartMoney:0; // 本位币 this.RStartMoney = data[0].RStartMoney?data[0].RStartMoney:0; // 本位币
let endStartMoney = 0, let endStartMoney = this.StartMoney;
endRStartMoney = 0; let endRStartMoney = this.RStartMoney;
data.forEach( ( x , i ) => { data.forEach( ( x , i ) => {
if(x.Type==1){ if(x.Type==1){
endRStartMoney = endStartMoney + x.OriginalMoney; // endRStartMoney = endStartMoney + x.OriginalMoney;
// endStartMoney = endStartMoney + x.Money;
// x.enRSMoney = endRStartMoney;
// x.enSMoney = endStartMoney;
this.bShou = this.bShou + x.Money;
this.wShou = this.wShou + x.OriginalMoney;
endRStartMoney = endRStartMoney + x.OriginalMoney;
endStartMoney = endStartMoney + x.Money; endStartMoney = endStartMoney + x.Money;
x.enRSMoney = endRStartMoney; x.enRSMoney = endRStartMoney;//外币收入
x.enSMoney = endStartMoney; x.enSMoney = endStartMoney;
}else if(x.Type==2){ }else if(x.Type==2){
endRStartMoney = endStartMoney - x.OriginalMoney; this.bZhi = this.bZhi + x.Money;
this.wZhi = this.wZhi + x.OriginalMoney;
endRStartMoney = endRStartMoney - x.OriginalMoney;
endStartMoney = endStartMoney - x.Money; endStartMoney = endStartMoney - x.Money;
x.enRSMoney = endRStartMoney; x.enRSMoney = endRStartMoney;
x.enSMoney = endStartMoney; x.enSMoney = endStartMoney;
......
src/components/FinancialModule/addFinancialProcess.vue
View file @ 1aa96b6b
...@@ -367,7 +367,7 @@ ...@@ -367,7 +367,7 @@
<div class="approval_page_title">{{$t('fnc.lcshezhi')}}</div> <div class="approval_page_title">{{$t('fnc.lcshezhi')}}</div>
<div class="approval_page_content"> <div class="approval_page_content">
<div class="approval_person_content"> <div class="approval_person_content">
<span class="approval_span_type">流程设置{{$t('fnc.mrspliucheng')}}</span> <span class="approval_span_type">{{$t('fnc.mrspliucheng')}}</span>
<span style="float:right"><el-button @click="Auditshow=true,EditAudit()" style="padding:4px" type="primary" icon="el-icon-edit" circle></el-button></span> <span style="float:right"><el-button @click="Auditshow=true,EditAudit()" style="padding:4px" type="primary" icon="el-icon-edit" circle></el-button></span>
<div class="approval_person_list fl"> <div class="approval_person_list fl">
......
src/components/Hotel/HotelProductManage2.vue
View file @ 1aa96b6b
...@@ -57,42 +57,45 @@ ...@@ -57,42 +57,45 @@
<div :class="stockColor(item,subItem)" <div :class="stockColor(item,subItem)"
:style="subItem.month===item.date&&msg2.DateList.indexOf(subItem.day)!==-1?'border-color: green':''" :style="subItem.month===item.date&&msg2.DateList.indexOf(subItem.day)!==-1?'border-color: green':''"
@click="calendarDayOn(item, subItem)"> @click="calendarDayOn(item, subItem)">
{{subItem.date.getDate()}}<br /> <el-popover placement="bottom" title="报价信息" width="400" trigger="hover"
v-if="subItem.data&&subItem.data.SubList && subItem.data.SubList[0]">
<div class="detailInfo" v-if="subItem.data&&subItem.data.SubList && subItem.data.SubList[0]"> <template>
<div class="triangle_border_up"></div> <table style="margin-left:3px;padding-top:2px;width:370px;">
<div class="popContent"> <tr>
<template v-if="subItem.data&&subItem.data.SubList && subItem.data.SubList[0]"> <th width="40" style="text-align:center">批次</th>
<div class="popList"> <th width="40" style="text-align:center">价格</th>
<table style="margin-left:3px;padding-top:2px;"> <th width="40" style="text-align:center">库存</th>
<tr> <th width="60" style="text-align:center">剩余<br/>库存</th>
<th width="50">批次</th> <th width="140" style="text-align:center">供应商</th>
<th width="50">价格</th> <th width="50" style="text-align:center">操作</th>
<th width="50">库存</th> </tr>
<th width="50">剩余库存</th> <tr v-for="(childItem,childIndex) in subItem.data.SubList">
</tr> <td style="text-align:center">
<tr v-for="(childItem,childIndex) in subItem.data.SubList"> {{childItem.BatchNumber}}
<td> </td>
{{childItem.BatchNumber}} <td style="text-align:center">
</td> {{childItem.CostPrice}}
<td> </td>
{{childItem.CostPrice}} <td style="text-align:center">
</td> {{childItem.Inventory}}
<td> </td>
{{childItem.Inventory}} <td style="text-align:center">
</td> {{childItem.RemainingInventory}}
<td> </td>
{{childItem.RemainingInventory}} <td style="text-align:left">
</td> {{childItem.SupplierName}}
</tr> </td>
</table> <td style="text-align:center">
<input type="button" class="hollowFixedBtn Htupbtn" value="修改" @click="goEdit('2', subItem.day,subItem.data.SubList[0].BatchNumber)"/> <a style="text-decoration:underline;cursor:pointer;color:blue;"
</div> @click="goEdit('2', subItem.day,childItem.BatchNumber)">修改</a>
</template> </td>
</div> </tr>
</div> </table>
<template v-if="subItem.data&&subItem.data.SubList && subItem.data.SubList[0]"> </template>
<span v-if="subItem.data.SubList.length>1"> {{subItem.data.SubList.length}} </span> <span slot="reference" >{{subItem.date.getDate()}}</span>
</el-popover>
<template v-else>
{{subItem.date.getDate()}}
</template> </template>
</div> </div>
</div> </div>
...@@ -148,7 +151,7 @@ ...@@ -148,7 +151,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="提前还房天数"> <el-form-item label="提前还房天数">
<el-input-number v-model="msg2.BeforeDay" :precision="2" :min="0" <el-input-number v-model="msg2.BeforeDay" :precision="2" :min="0"
@keyup.native="checkInteger(msg2,'BeforeDay')" maxlength="10"></el-input-number> @keyup.native="checkInteger(msg2,'BeforeDay')" maxlength="10"></el-input-number>
...@@ -159,12 +162,11 @@ ...@@ -159,12 +162,11 @@
<el-input-number v-model="msg2.FreeRoomNum" :precision="2" :min="0" <el-input-number v-model="msg2.FreeRoomNum" :precision="2" :min="0"
@keyup.native="checkPrice(msg2,'FreeRoomNum')" maxlength="10"></el-input-number> @keyup.native="checkPrice(msg2,'FreeRoomNum')" maxlength="10"></el-input-number>
</el-form-item> </el-form-item>
</el-col </el-col <el-col :span="6">
<el-col :span="6"> <el-form-item label="标准间成本价">
<el-form-item label="标准间成本价"> <el-input-number v-model="msg2.CostPrice" :precision="2" :min="0"
<el-input-number v-model="msg2.CostPrice" :precision="2" :min="0" @keyup.native="checkPrice(msg2,'CostPrice')" maxlength="10"></el-input-number>
@keyup.native="checkPrice(msg2,'CostPrice')" maxlength="10"></el-input-number> </el-form-item>
</el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
...@@ -225,6 +227,19 @@ ...@@ -225,6 +227,19 @@
<el-input v-model="msg2.CurrentRate" placeholder="汇率" style="width:80px;"></el-input> <el-input v-model="msg2.CurrentRate" placeholder="汇率" style="width:80px;"></el-input>
</el-form-item> </el-form-item>
</el-col> </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>
<el-row style="padding: 20px 0 0 0;border-top: 1px dashed #ccc;"> <el-row style="padding: 20px 0 0 0;border-top: 1px dashed #ccc;">
<el-col :span="6"> <el-col :span="6">
...@@ -449,6 +464,19 @@ ...@@ -449,6 +464,19 @@
<el-input v-model="msg.CurrentRate" placeholder="汇率" style="width:80px;"></el-input> <el-input v-model="msg.CurrentRate" placeholder="汇率" style="width:80px;"></el-input>
</el-form-item> </el-form-item>
</el-col> </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>
<el-row style="padding: 20px 0 0 0;border-top: 1px dashed #ccc;"> <el-row style="padding: 20px 0 0 0;border-top: 1px dashed #ccc;">
<el-col :span="6"> <el-col :span="6">
...@@ -607,8 +635,9 @@ ...@@ -607,8 +635,9 @@
SanKePrice: 0, //散客价 SanKePrice: 0, //散客价
BatchNumber: 1, //批次号 BatchNumber: 1, //批次号
TaxesPrice: 0, //税金 TaxesPrice: 0, //税金
BeforeDay:0,//提前还房天数 BeforeDay: 0, //提前还房天数
FreeRoomNum:0,//免间数 FreeRoomNum: 0, //免间数
PayStyle: 0, //付款方式
}, },
msg2: { msg2: {
Hotel: '0', Hotel: '0',
...@@ -639,8 +668,9 @@ ...@@ -639,8 +668,9 @@
SanKePrice: 0, //散客价 SanKePrice: 0, //散客价
BatchNumber: 1, //批次号 BatchNumber: 1, //批次号
TaxesPrice: 0, //税金 TaxesPrice: 0, //税金
BeforeDay:0,//提前还房天数 BeforeDay: 0, //提前还房天数
FreeRoomNum:0,//免间数 FreeRoomNum: 0, //免间数
PayStyle: 0, //付款方式
}, },
rules: { rules: {
InventoryType: { InventoryType: {
...@@ -880,7 +910,6 @@ ...@@ -880,7 +910,6 @@
}, res => { }, res => {
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
let json = res.data.data; let json = res.data.data;
this.hotelInfo.HotelName = json.HotelName; this.hotelInfo.HotelName = json.HotelName;
this.hotelInfo.TotalInventory = json.TotalInventory; this.hotelInfo.TotalInventory = json.TotalInventory;
this.hotelInfo.Validity = json.Validity; this.hotelInfo.Validity = json.Validity;
...@@ -964,8 +993,9 @@ ...@@ -964,8 +993,9 @@
this.msg.SanKePrice = data.SanKePrice; this.msg.SanKePrice = data.SanKePrice;
this.msg.BatchNumber = data.BatchNumber; this.msg.BatchNumber = data.BatchNumber;
this.msg.TaxesPrice = data.TaxesPrice; this.msg.TaxesPrice = data.TaxesPrice;
this.msg.BeforeDay=data.BeforeDay; this.msg.BeforeDay = data.BeforeDay;
this.msg.FreeRoomNum=data.FreeRoomNum; this.msg.FreeRoomNum = data.FreeRoomNum;
this.msg.PayStyle = data.PayStyle;
} }
}) })
}, },
...@@ -1007,7 +1037,7 @@ ...@@ -1007,7 +1037,7 @@
initSupplier() { initSupplier() {
this.apipost("supplier_post_GetAllList", { this.apipost("supplier_post_GetAllList", {
Type: 1, Type: 1,
Country:651 Country: 651
}, res => { }, res => {
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
this.SupplierList = res.data.data; this.SupplierList = res.data.data;
...@@ -1044,9 +1074,10 @@ ...@@ -1044,9 +1074,10 @@
this.msg.CostPrice = 0; this.msg.CostPrice = 0;
this.msg.SanKePrice = 0; this.msg.SanKePrice = 0;
this.msg.BatchNumber = 1; this.msg.BatchNumber = 1;
this.msg.TaxesPrice=0; this.msg.TaxesPrice = 0;
this.msg.BeforeDay=0; this.msg.BeforeDay = 0;
this.msg.FreeRoomNum=0; this.msg.FreeRoomNum = 0;
this.msg.PayStyle = 0;
} else { } else {
this.Error(res.data.message) this.Error(res.data.message)
} }
...@@ -1063,8 +1094,9 @@ ...@@ -1063,8 +1094,9 @@
this.msg2.SanKePrice = 0; this.msg2.SanKePrice = 0;
this.msg2.BatchNumber = 1; this.msg2.BatchNumber = 1;
this.msg2.TaxesPrice = 0; this.msg2.TaxesPrice = 0;
this.msg2.BeforeDay=0; this.msg2.BeforeDay = 0;
this.msg2.FreeRoomNum=0; this.msg2.FreeRoomNum = 0;
this.msg2.PayStyle = 0;
}, },
//批量删除 //批量删除
delete2Reset: function () { delete2Reset: function () {
...@@ -1079,8 +1111,9 @@ ...@@ -1079,8 +1111,9 @@
that.msg2.SanKePrice = 0; that.msg2.SanKePrice = 0;
that.msg2.BatchNumber = 1; that.msg2.BatchNumber = 1;
that.msg2.TaxesPrice = 0; that.msg2.TaxesPrice = 0;
that.msg2.BeforeDay=0; that.msg2.BeforeDay = 0;
that.msg2.FreeRoomNum=0; that.msg2.FreeRoomNum = 0;
that.msg2.PayStyle = 0;
} else { } else {
that.Error(res.data.message) that.Error(res.data.message)
} }
...@@ -1100,8 +1133,9 @@ ...@@ -1100,8 +1133,9 @@
this.msg2.SanKePrice = 0; this.msg2.SanKePrice = 0;
this.msg2.BatchNumber = 1; this.msg2.BatchNumber = 1;
this.msg2.TaxesPrice = 0; this.msg2.TaxesPrice = 0;
this.msg2.BeforeDay=0; this.msg2.BeforeDay = 0;
this.msg2.FreeRoomNum=0; this.msg2.FreeRoomNum = 0;
this.msg2.PayStyle = 0;
} else { } else {
this.Error(res.data.message) this.Error(res.data.message)
} }
...@@ -1148,6 +1182,7 @@ ...@@ -1148,6 +1182,7 @@
this.initSupplier(); this.initSupplier();
} }
} }
</script> </script>
<style> <style>
...@@ -1607,7 +1642,7 @@ ...@@ -1607,7 +1642,7 @@
.hotelProductManage2 .detailInfo { .hotelProductManage2 .detailInfo {
display: none; display: none;
position: absolute; position: absolute;
left: -70px; left: -145px;
top: 50px; top: 50px;
z-index: 999; z-index: 999;
} }
...@@ -1615,7 +1650,7 @@ ...@@ -1615,7 +1650,7 @@
.hotelProductManage2 .triangle_border_up { .hotelProductManage2 .triangle_border_up {
width: 0; width: 0;
height: 0; height: 0;
border-width: 0 103px 30px; border-width: 0 175px 30px;
border-style: solid; border-style: solid;
opacity: 0.75; opacity: 0.75;
border-color: transparent transparent rgba(233, 82, 82, 1); border-color: transparent transparent rgba(233, 82, 82, 1);
...@@ -1623,7 +1658,7 @@ ...@@ -1623,7 +1658,7 @@
} }
.hotelProductManage2 .detailInfo .popContent { .hotelProductManage2 .detailInfo .popContent {
width: 205px; width: 350px;
min-height: 80px; min-height: 80px;
background-color: #e95252; background-color: #e95252;
text-align: left; text-align: left;
...@@ -1647,7 +1682,11 @@ ...@@ -1647,7 +1682,11 @@
margin: 10px 10px 0 0; margin: 10px 10px 0 0;
text-align: right; 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> </style>
src/components/Restaurant/FoodOrder.vue
View file @ 1aa96b6b
...@@ -214,6 +214,12 @@ export default { ...@@ -214,6 +214,12 @@ export default {
this.currentPage = 1; this.currentPage = 1;
}, },
getList() { getList() {
if(!this.msg.startDate){
this.msg.startDate="";
}
if(!this.msg.endDate){
this.msg.endDate="";
}
this.loading = true; this.loading = true;
this.apiJavaPost("/api/erp/dining/getDiningOrder", this.msg, res => { this.apiJavaPost("/api/erp/dining/getDiningOrder", this.msg, res => {
this.loading = false; this.loading = false;
......
src/components/Supplier/HotelProductManage.vue
View file @ 1aa96b6b
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
<el-date-picker v-model="condition.month" type="month" value-format="yyyy-MM" :clearable="false" <el-date-picker v-model="condition.month" type="month" value-format="yyyy-MM" :clearable="false"
placeholder="选择月"></el-date-picker> placeholder="选择月"></el-date-picker>
</div> </div>
<input type="button" class="normalBtn" value="查询" @click="getMonths()"/> <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="批量编辑" style="margin-right:10px;" @click="goEdit('1')" />
</div> </div>
<div class="hotelProductManage2_tableBox"> <div class="hotelProductManage2_tableBox">
<table class="hotelProductManage2_table" border="0" cellspacing="0" cellpadding="0"> <table class="hotelProductManage2_table" border="0" cellspacing="0" cellpadding="0">
...@@ -55,42 +55,41 @@ ...@@ -55,42 +55,41 @@
<div :class="stockColor(item,subItem)" <div :class="stockColor(item,subItem)"
:style="subItem.month===item.date&&msg2.DateList.indexOf(subItem.day)!==-1?'border-color: green':''" :style="subItem.month===item.date&&msg2.DateList.indexOf(subItem.day)!==-1?'border-color: green':''"
@click="calendarDayOn(item, subItem)"> @click="calendarDayOn(item, subItem)">
{{subItem.date.getDate()}}<br /> <el-popover placement="bottom" title="报价信息" width="280" trigger="hover"
v-if="subItem.data&&subItem.data.SubList && subItem.data.SubList[0]">
<div class="detailInfo" v-if="subItem.data&&subItem.data.SubList && subItem.data.SubList[0]"> <template>
<div class="triangle_border_up"></div> <table style="margin-left:3px;padding-top:2px;width:270px;">
<div class="popContent"> <tr>
<template v-if="subItem.data&&subItem.data.SubList && subItem.data.SubList[0]"> <th width="50" style="text-align:center">批次</th>
<div class="popList"> <th width="50" style="text-align:center">价格</th>
<table style="margin-left:3px;padding-top:2px;"> <th width="50" style="text-align:center">库存</th>
<tr> <th width="60" style="text-align:center">剩余<br/>库存</th>
<th width="50">批次</th> <th width="50" style="text-align:center">操作</th>
<th width="50">价格</th> </tr>
<th width="50">库存</th> <tr v-for="(childItem,childIndex) in subItem.data.SubList">
<th width="50">剩余库存</th> <td style="text-align:center">
</tr> {{childItem.BatchNumber}}
<tr v-for="(childItem,childIndex) in subItem.data.SubList"> </td>
<td> <td style="text-align:center">
{{childItem.BatchNumber}} {{childItem.CostPrice}}
</td> </td>
<td> <td style="text-align:center">
{{childItem.CostPrice}} {{childItem.Inventory}}
</td> </td>
<td> <td style="text-align:center">
{{childItem.Inventory}} {{childItem.RemainingInventory}}
</td> </td>
<td> <td style="text-align:center">
{{childItem.RemainingInventory}} <a style="text-decoration:underline;cursor:pointer;color:blue;"
</td> @click="goEdit('2', subItem.day,childItem.BatchNumber)">修改</a>
</tr> </td>
</table> </tr>
<input type="button" class="hollowFixedBtn Htupbtn" value="修改" @click="goEdit('2', subItem.day,subItem.data.SubList[0].BatchNumber)"/> </table>
</div> </template>
</template> <span slot="reference" >{{subItem.date.getDate()}}</span>
</div> </el-popover>
</div> <template v-else>
<template v-if="subItem.data&&subItem.data.SubList && subItem.data.SubList[0]"> {{subItem.date.getDate()}}
<span v-if="subItem.data.SubList.length>1"> {{subItem.data.SubList.length}} </span>
</template> </template>
</div> </div>
</div> </div>
...@@ -146,7 +145,7 @@ ...@@ -146,7 +145,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="提前还房天数"> <el-form-item label="提前还房天数">
<el-input-number v-model="msg2.BeforeDay" :precision="2" :min="0" <el-input-number v-model="msg2.BeforeDay" :precision="2" :min="0"
@keyup.native="checkInteger(msg2,'BeforeDay')" maxlength="10"></el-input-number> @keyup.native="checkInteger(msg2,'BeforeDay')" maxlength="10"></el-input-number>
...@@ -157,12 +156,11 @@ ...@@ -157,12 +156,11 @@
<el-input-number v-model="msg2.FreeRoomNum" :precision="2" :min="0" <el-input-number v-model="msg2.FreeRoomNum" :precision="2" :min="0"
@keyup.native="checkPrice(msg2,'FreeRoomNum')" maxlength="10"></el-input-number> @keyup.native="checkPrice(msg2,'FreeRoomNum')" maxlength="10"></el-input-number>
</el-form-item> </el-form-item>
</el-col </el-col <el-col :span="6">
<el-col :span="6"> <el-form-item label="标准间成本价">
<el-form-item label="标准间成本价"> <el-input-number v-model="msg2.CostPrice" :precision="2" :min="0"
<el-input-number v-model="msg2.CostPrice" :precision="2" :min="0" @keyup.native="checkPrice(msg2,'CostPrice')" maxlength="10"></el-input-number>
@keyup.native="checkPrice(msg2,'CostPrice')" maxlength="10"></el-input-number> </el-form-item>
</el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
...@@ -223,6 +221,19 @@ ...@@ -223,6 +221,19 @@
<el-input v-model="msg2.CurrentRate" placeholder="汇率" style="width:80px;"></el-input> <el-input v-model="msg2.CurrentRate" placeholder="汇率" style="width:80px;"></el-input>
</el-form-item> </el-form-item>
</el-col> </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>
<el-row style="padding: 20px 0 0 0;border-top: 1px dashed #ccc;"> <el-row style="padding: 20px 0 0 0;border-top: 1px dashed #ccc;">
<el-col :span="6"> <el-col :span="6">
...@@ -251,7 +262,8 @@ ...@@ -251,7 +262,8 @@
<el-form-item label="供应商" prop="Supplier"> <el-form-item label="供应商" prop="Supplier">
<el-select v-model="msg2.Supplier" placeholder="请选择"> <el-select v-model="msg2.Supplier" placeholder="请选择">
<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" 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-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -447,6 +459,19 @@ ...@@ -447,6 +459,19 @@
<el-input v-model="msg.CurrentRate" placeholder="汇率" style="width:80px;"></el-input> <el-input v-model="msg.CurrentRate" placeholder="汇率" style="width:80px;"></el-input>
</el-form-item> </el-form-item>
</el-col> </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>
<el-row style="padding: 20px 0 0 0;border-top: 1px dashed #ccc;"> <el-row style="padding: 20px 0 0 0;border-top: 1px dashed #ccc;">
<el-col :span="6"> <el-col :span="6">
...@@ -475,7 +500,8 @@ ...@@ -475,7 +500,8 @@
<el-form-item label="供应商" prop="Supplier"> <el-form-item label="供应商" prop="Supplier">
<el-select v-model="msg.Supplier" placeholder="请选择"> <el-select v-model="msg.Supplier" placeholder="请选择">
<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" 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-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -576,7 +602,7 @@ ...@@ -576,7 +602,7 @@
data: {} data: {}
}, },
editShow: false, editShow: false,
userInfo:{}, userInfo: {},
msg: { msg: {
Hotel: '0', Hotel: '0',
Supplier: 30, Supplier: 30,
...@@ -606,9 +632,10 @@ ...@@ -606,9 +632,10 @@
SanKePrice: 0, //散客价 SanKePrice: 0, //散客价
BatchNumber: 1, //批次号 BatchNumber: 1, //批次号
TaxesPrice: 0, //税金 TaxesPrice: 0, //税金
BeforeDay:0,//提前还房天数 BeforeDay: 0, //提前还房天数
FreeRoomNum:0,//免间数 FreeRoomNum: 0, //免间数
OpType:1,//供应商操作 OpType: 1, //供应商操作
PayStyle:0,//付款方式
}, },
msg2: { msg2: {
Hotel: '0', Hotel: '0',
...@@ -639,9 +666,10 @@ ...@@ -639,9 +666,10 @@
SanKePrice: 0, //散客价 SanKePrice: 0, //散客价
BatchNumber: 1, //批次号 BatchNumber: 1, //批次号
TaxesPrice: 0, //税金 TaxesPrice: 0, //税金
BeforeDay:0,//提前还房天数 BeforeDay: 0, //提前还房天数
FreeRoomNum:0,//免间数 FreeRoomNum: 0, //免间数
OpType:1,//供应商操作 OpType: 1, //供应商操作
PayStyle:0,//付款方式
}, },
rules: { rules: {
InventoryType: { InventoryType: {
...@@ -874,10 +902,15 @@ ...@@ -874,10 +902,15 @@
this.msg2.DateList.splice(dayIndex, 1) this.msg2.DateList.splice(dayIndex, 1)
}, },
getData: function (date, key) { getData: function (date, key) {
var sId = 0;
if (this.getLocalStorageSupplier()) {
sId = this.getLocalStorageSupplier().SupplierId;
}
this.ApiPost2('hotelreport_get_GetHotelPriceMonthStatistics', { this.ApiPost2('hotelreport_get_GetHotelPriceMonthStatistics', {
HotelId: this.hotelId, HotelId: this.hotelId,
Year: date.split('-')[0], Year: date.split('-')[0],
Month: date.split('-')[1] Month: date.split('-')[1],
Supplier: sId
}, res => { }, res => {
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
let json = res.data.data; let json = res.data.data;
...@@ -965,8 +998,9 @@ ...@@ -965,8 +998,9 @@
this.msg.SanKePrice = data.SanKePrice; this.msg.SanKePrice = data.SanKePrice;
this.msg.BatchNumber = data.BatchNumber; this.msg.BatchNumber = data.BatchNumber;
this.msg.TaxesPrice = data.TaxesPrice; this.msg.TaxesPrice = data.TaxesPrice;
this.msg.BeforeDay=data.BeforeDay; this.msg.BeforeDay = data.BeforeDay;
this.msg.FreeRoomNum=data.FreeRoomNum; this.msg.FreeRoomNum = data.FreeRoomNum;
this.msg.PayStyle=data.PayStyle;
} }
}) })
}, },
...@@ -1044,9 +1078,10 @@ ...@@ -1044,9 +1078,10 @@
this.msg.CostPrice = 0; this.msg.CostPrice = 0;
this.msg.SanKePrice = 0; this.msg.SanKePrice = 0;
this.msg.BatchNumber = 1; this.msg.BatchNumber = 1;
this.msg.TaxesPrice=0; this.msg.TaxesPrice = 0;
this.msg.BeforeDay=0; this.msg.BeforeDay = 0;
this.msg.FreeRoomNum=0; this.msg.FreeRoomNum = 0;
this.msg.PayStyle=0;
} else { } else {
this.Error(res.data.message) this.Error(res.data.message)
} }
...@@ -1063,8 +1098,9 @@ ...@@ -1063,8 +1098,9 @@
this.msg2.SanKePrice = 0; this.msg2.SanKePrice = 0;
this.msg2.BatchNumber = 1; this.msg2.BatchNumber = 1;
this.msg2.TaxesPrice = 0; this.msg2.TaxesPrice = 0;
this.msg2.BeforeDay=0; this.msg2.BeforeDay = 0;
this.msg2.FreeRoomNum=0; this.msg2.FreeRoomNum = 0;
this.msg2.PayStyle=0;
}, },
//批量删除 //批量删除
delete2Reset: function () { delete2Reset: function () {
...@@ -1079,8 +1115,9 @@ ...@@ -1079,8 +1115,9 @@
that.msg2.SanKePrice = 0; that.msg2.SanKePrice = 0;
that.msg2.BatchNumber = 1; that.msg2.BatchNumber = 1;
that.msg2.TaxesPrice = 0; that.msg2.TaxesPrice = 0;
that.msg2.BeforeDay=0; that.msg2.BeforeDay = 0;
that.msg2.FreeRoomNum=0; that.msg2.FreeRoomNum = 0;
that.msg2.PayStyle=0;
} else { } else {
that.Error(res.data.message) that.Error(res.data.message)
} }
...@@ -1100,8 +1137,9 @@ ...@@ -1100,8 +1137,9 @@
this.msg2.SanKePrice = 0; this.msg2.SanKePrice = 0;
this.msg2.BatchNumber = 1; this.msg2.BatchNumber = 1;
this.msg2.TaxesPrice = 0; this.msg2.TaxesPrice = 0;
this.msg2.BeforeDay=0; this.msg2.BeforeDay = 0;
this.msg2.FreeRoomNum=0; this.msg2.FreeRoomNum = 0;
this.msg2.PayStyle=0;
} else { } else {
this.Error(res.data.message) this.Error(res.data.message)
} }
...@@ -1149,6 +1187,7 @@ ...@@ -1149,6 +1187,7 @@
this.initSupplier(); this.initSupplier();
} }
} }
</script> </script>
<style> <style>
...@@ -1644,7 +1683,11 @@ ...@@ -1644,7 +1683,11 @@
margin: 10px 10px 0 0; margin: 10px 10px 0 0;
text-align: right; 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> </style>
src/components/scenicSpot/ScenTicketOrder.vue
View file @ 1aa96b6b
...@@ -268,13 +268,18 @@ export default { ...@@ -268,13 +268,18 @@ export default {
this.currentPage = 1; this.currentPage = 1;
}, },
getList() { getList() {
if(!this.msg.startDate){
this.msg.startDate="";
}
if(!this.msg.endDate){
this.msg.endDate="";
}
this.loading = true; this.loading = true;
this.apiJavaPost("/api/erp/ticketCoupons/getTicketCouponsOrder", this.msg, res => { this.apiJavaPost("/api/erp/ticketCoupons/getTicketCouponsOrder", this.msg, res => {
this.loading = false; this.loading = false;
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
this.total = res.data.data.count; this.total = res.data.data.count;
this.dataList = res.data.data.pageData; this.dataList = res.data.data.pageData;
console.log(this.dataList,'datalist');
} else { } else {
this.Error(res.data.message) this.Error(res.data.message)
} }
......
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