Skip to content

S
SuperMan
Commit a1d5d500 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

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

parents 700d4985 b02c88ca
Hide whitespace changes
Inline Side-by-side
Showing with 65 additions and 35 deletions
src/components/Hotel/HotelProductManage2.vue
View file @ a1d5d500
...@@ -30,15 +30,21 @@ ...@@ -30,15 +30,21 @@
</table> </table>
</div> </div>
<div class="hotelProductManage2_tableBox"> <div class="hotelProductManage2_tableBox">
<span style="color:#000000;background-color: #ff3737;padding:2px 4px;border-radius:5px">{{$t('ground.hongri')}}</span> <span
<span style="color:#000000;background-color: #ff99cc;padding:2px 4px;border-radius:5px">{{$t('ground.wangji')}}</span> style="color:#000000;background-color: #ff3737;padding:2px 4px;border-radius:5px">{{$t('ground.hongri')}}</span>
<span style="color:#000000;background-color: #bcd6ee;padding:2px 4px;border-radius:5px">{{$t('ground.pingji')}}</span> <span
<span style="color:#000000;background-color: #DDDDDD;padding:2px 4px;border-radius:5px">{{$t('ground.danji')}}</span> style="color:#000000;background-color: #ff99cc;padding:2px 4px;border-radius:5px">{{$t('ground.wangji')}}</span>
<span style="color:#000000;background-color: #02F78E;padding:2px 4px;border-radius:5px">{{$t('ground.tebiejia')}}</span> <span
style="color:#000000;background-color: #bcd6ee;padding:2px 4px;border-radius:5px">{{$t('ground.pingji')}}</span>
<span
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>
</div> </div>
<div class="hotelProductManage2_calendar"> <div class="hotelProductManage2_calendar">
<div class="hotelProductManage2_calendarItem" v-for="(item, index) in dayList" :key="index"> <div class="hotelProductManage2_calendarItem" v-for="(item, index) in dayList" :key="index">
<div class="calendarItem_month" :title="$t('ground.dianjichakanxq')" @click="calendarShow(item, index)">{{item.date}}</div> <div class="calendarItem_month" :title="$t('ground.dianjichakanxq')" @click="calendarShow(item, index)">
{{item.date}}</div>
<div class="hotelproductCkbox"> <div class="hotelproductCkbox">
<el-checkbox v-model="item.isCked" @change="changeHotelStatus(item,index)">全选</el-checkbox> <el-checkbox v-model="item.isCked" @change="changeHotelStatus(item,index)">全选</el-checkbox>
</div> </div>
...@@ -57,17 +63,18 @@ ...@@ -57,17 +63,18 @@
<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)">
<el-popover placement="bottom" :title="$t('ground.baojiaxinxi')" width="470" trigger="hover" <el-popover placement="bottom" :title="$t('ground.baojiaxinxi')" width="530" trigger="hover"
v-if="subItem.data&&subItem.data.SubList && subItem.data.SubList[0]"> v-if="subItem.data&&subItem.data.SubList && subItem.data.SubList[0]">
<template> <template>
<table style="margin-left:3px;padding-top:2px;width:450px;"> <table style="margin-left:3px;padding-top:2px;width:530px;">
<tr> <tr>
<th width="40" style="text-align:center">{{$t('ground.pici')}}</th> <th width="40" style="text-align:center">{{$t('ground.pici')}}</th>
<th width="100" style="text-align:center">{{$t('Operation.Op_price')}}</th> <th width="100" style="text-align:center">{{$t('Operation.Op_price')}}</th>
<th width="50" style="text-align:center">{{$t('hotel.hotel_Inventory')}}</th> <th width="50" style="text-align:center">{{$t('hotel.hotel_Inventory')}}</th>
<th width="80" style="text-align:center">{{$t('ground.shengyukucun')}}</th> <th width="80" style="text-align:center">{{$t('ground.shengyukucun')}}</th>
<th width="140" style="text-align:center">{{$t('hotel.hotel_Supplier')}}</th> <th width="140" style="text-align:center">{{$t('hotel.hotel_Supplier')}}</th>
<th width="50" style="text-align:center">{{$t('hotel.table_operat')}}</th> <th width="60" style="text-align:center">{{$t('hotel.table_operat')}}</th>
<th width="60" style="text-align:center">{{$t('fnc.rizhi')}}</th>
</tr> </tr>
<tr v-for="(childItem,childIndex) in subItem.data.SubList"> <tr v-for="(childItem,childIndex) in subItem.data.SubList">
<td style="text-align:center"> <td style="text-align:center">
...@@ -82,17 +89,24 @@ ...@@ -82,17 +89,24 @@
<td style="text-align:center;white-space:nowrap; "> <td style="text-align:center;white-space:nowrap; ">
{{childItem.RemainingInventory}} {{childItem.RemainingInventory}}
</td> </td>
<td style="text-align:left"> <td style="text-align:center">
{{childItem.SupplierName}} {{childItem.SupplierName}}
</td> </td>
<td style="text-align:center"> <td style="text-align:center">
<a style="text-decoration:underline;cursor:pointer;color:blue;" <a style="text-decoration:underline;cursor:pointer;color:blue;"
@click="goEdit('2', subItem.day,childItem.BatchNumber)">{{$t('pub.updateMsg')}}</a> @click="goEdit('2', subItem.day,childItem.BatchNumber)">{{$t('pub.updateMsg')}}</a>
</td> </td>
<td style="text-align:center">
<el-popover width="200" trigger="click" popper-class="Bus_HotelPop">
<commonHotelLog :ref="'comHotelLog'+index+index2+childIndex+''"> </commonHotelLog>
<div slot="reference" class="w80" style="cursor:pointer;text-decoration:underline;color:red"
@click="GetHotelLog(childItem,index,index2,childIndex)">{{$t('fnc.rizhi')}}</div>
</el-popover>
</td>
</tr> </tr>
</table> </table>
</template> </template>
<span slot="reference" >{{subItem.date.getDate()}}</span> <span slot="reference">{{subItem.date.getDate()}}</span>
</el-popover> </el-popover>
<template v-else> <template v-else>
{{subItem.date.getDate()}} {{subItem.date.getDate()}}
...@@ -216,7 +230,8 @@ ...@@ -216,7 +230,8 @@
<el-row> <el-row>
<el-col :span="6"> <el-col :span="6">
<el-form-item :label="$t('ground.chengbenbz')" prop="CurrencyId"> <el-form-item :label="$t('ground.chengbenbz')" prop="CurrencyId">
<el-select v-model="msg2.CurrencyId" :placeholder="$t('pub.pleaseSel')" style="width:100px;" @change="currency2Change"> <el-select v-model="msg2.CurrencyId" :placeholder="$t('pub.pleaseSel')" style="width:100px;"
@change="currency2Change">
<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" :value="item.ID"> <el-option v-for="(item,index) in allCurrencyList" :key="index" :label="item.Name" :value="item.ID">
</el-option> </el-option>
...@@ -225,7 +240,8 @@ ...@@ -225,7 +240,8 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item :label="$t('hotel.hotel_CurrentRate')" prop="CurrentRate"> <el-form-item :label="$t('hotel.hotel_CurrentRate')" prop="CurrentRate">
<el-input v-model="msg2.CurrentRate" :placeholder="$t('hotel.hotel_CurrentRate')" style="width:80px;"></el-input> <el-input v-model="msg2.CurrentRate" :placeholder="$t('hotel.hotel_CurrentRate')" style="width:80px;">
</el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
...@@ -287,7 +303,8 @@ ...@@ -287,7 +303,8 @@
</el-col> </el-col>
<el-col :span="18"> <el-col :span="18">
<el-form-item :label="$t('pub.pubRemark')" prop="Remark"> <el-form-item :label="$t('pub.pubRemark')" prop="Remark">
<el-input type="textarea" v-model="msg2.Remark" :rows="1" :placeholder="$t('ground.qingshurbznr')" style="width: 600px;"> <el-input type="textarea" v-model="msg2.Remark" :rows="1" :placeholder="$t('ground.qingshurbznr')"
style="width: 600px;">
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -319,12 +336,14 @@ ...@@ -319,12 +336,14 @@
<el-col :span="12" class="HotelProductEdit_date"> <el-col :span="12" class="HotelProductEdit_date">
<div v-show="msg.DayType==='1'||msg.DayType==='3'"> <div v-show="msg.DayType==='1'||msg.DayType==='3'">
<el-form-item :label="$t('pub.year')" prop="Year"> <el-form-item :label="$t('pub.year')" prop="Year">
<el-date-picker v-model="msg.Year" type="year" value-format="yyyy" :placeholder="$t('pub.pleaseSel')"></el-date-picker> <el-date-picker v-model="msg.Year" type="year" value-format="yyyy" :placeholder="$t('pub.pleaseSel')">
</el-date-picker>
</el-form-item> </el-form-item>
</div> </div>
<div v-show="msg.DayType==='2'"> <div v-show="msg.DayType==='2'">
<el-form-item :label="$t('pub.month')" prop="Month"> <el-form-item :label="$t('pub.month')" prop="Month">
<el-date-picker v-model="msg.Month" type="month" value-format="yyyy-MM" :placeholder="$t('pub.pleaseSel')"> <el-date-picker v-model="msg.Month" type="month" value-format="yyyy-MM"
:placeholder="$t('pub.pleaseSel')">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</div> </div>
...@@ -361,13 +380,13 @@ ...@@ -361,13 +380,13 @@
</div> </div>
<div v-show="msg.DayType==='4'"> <div v-show="msg.DayType==='4'">
<el-form-item :label="$t('ground.zidingyi')" prop="StartDate"> <el-form-item :label="$t('ground.zidingyi')" prop="StartDate">
<el-date-picker v-model="msg.StartDate" type="date" :placeholder="$t('ground.qingxuanzekssj')" format="yyyy-MM-dd" <el-date-picker v-model="msg.StartDate" type="date" :placeholder="$t('ground.qingxuanzekssj')"
value-format="yyyy-MM-dd"></el-date-picker> format="yyyy-MM-dd" value-format="yyyy-MM-dd"></el-date-picker>
</el-form-item> </el-form-item>
<em>-</em> <em>-</em>
<el-form-item label="" prop="EndDate"> <el-form-item label="" prop="EndDate">
<el-date-picker v-model="msg.EndDate" type="date" :placeholder="$t('ground.qingxuanzejssj')" format="yyyy-MM-dd" <el-date-picker v-model="msg.EndDate" type="date" :placeholder="$t('ground.qingxuanzejssj')"
value-format="yyyy-MM-dd"></el-date-picker> format="yyyy-MM-dd" value-format="yyyy-MM-dd"></el-date-picker>
</el-form-item> </el-form-item>
</div> </div>
</el-col> </el-col>
...@@ -463,7 +482,8 @@ ...@@ -463,7 +482,8 @@
<el-row> <el-row>
<el-col :span="6"> <el-col :span="6">
<el-form-item :label="$t('ground.chengbenbz')" prop="CurrencyId"> <el-form-item :label="$t('ground.chengbenbz')" prop="CurrencyId">
<el-select v-model="msg.CurrencyId" :placeholder="$t('pub.pleaseSel')" style="width:100px;" @change="currencyChange"> <el-select v-model="msg.CurrencyId" :placeholder="$t('pub.pleaseSel')" style="width:100px;"
@change="currencyChange">
<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" :value="item.ID"> <el-option v-for="(item,index) in allCurrencyList" :key="index" :label="item.Name" :value="item.ID">
</el-option> </el-option>
...@@ -534,7 +554,8 @@ ...@@ -534,7 +554,8 @@
</el-col> </el-col>
<el-col :span="18"> <el-col :span="18">
<el-form-item :label="$t('pub.pubRemark')" prop="Remark"> <el-form-item :label="$t('pub.pubRemark')" prop="Remark">
<el-input type="textarea" v-model="msg.Remark" :rows="1" :placeholder="$t('ground.qingshurbznr')" style="width: 600px;"> <el-input type="textarea" v-model="msg.Remark" :rows="1" :placeholder="$t('ground.qingshurbznr')"
style="width: 600px;">
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -546,9 +567,12 @@ ...@@ -546,9 +567,12 @@
<script> <script>
import HotelProductCalendar from './HotelProductCalendar.vue'; import HotelProductCalendar from './HotelProductCalendar.vue';
import commonHotelLog from "../commonPage/commonHotelLog.vue";
export default { export default {
components: { components: {
HotelProductCalendar HotelProductCalendar,
//日志组件
commonHotelLog
}, },
data() { data() {
var emptyJudge = (rule, value, callback) => { var emptyJudge = (rule, value, callback) => {
...@@ -891,13 +915,17 @@ ...@@ -891,13 +915,17 @@
} }
}, },
methods: { methods: {
//调用子组件获取日志方法
GetHotelLog(subItem, index, index2, childIndex) {
let str = `comHotelLog${index}${index2}${childIndex}`
this.$refs[str][0].getHotelLogsList(0, subItem.HotelId, subItem.DayStr);
},
goHotelDiscount(path) { goHotelDiscount(path) {
this.$router.push({ this.$router.push({
name: path, name: path,
query: { query: {
blank: "y", blank: "y",
NewHotelID:this.hotelId, NewHotelID: this.hotelId,
} }
}); });
}, },
...@@ -1030,7 +1058,7 @@ ...@@ -1030,7 +1058,7 @@
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; this.msg.PayStyle = data.PayStyle;
this.msg.PriceTaxType=data.PriceTaxType; this.msg.PriceTaxType = data.PriceTaxType;
} }
}) })
}, },
...@@ -1113,7 +1141,7 @@ ...@@ -1113,7 +1141,7 @@
this.msg.BeforeDay = 0; this.msg.BeforeDay = 0;
this.msg.FreeRoomNum = 0; this.msg.FreeRoomNum = 0;
this.msg.PayStyle = 0; this.msg.PayStyle = 0;
this.msg.PriceTaxType=0; this.msg.PriceTaxType = 0;
} else { } else {
this.Error(res.data.message) this.Error(res.data.message)
} }
...@@ -1133,7 +1161,7 @@ ...@@ -1133,7 +1161,7 @@
this.msg2.BeforeDay = 0; this.msg2.BeforeDay = 0;
this.msg2.FreeRoomNum = 0; this.msg2.FreeRoomNum = 0;
this.msg2.PayStyle = 0; this.msg2.PayStyle = 0;
this.msg2.PriceTaxType=0; this.msg2.PriceTaxType = 0;
}, },
//批量删除 //批量删除
delete2Reset: function () { delete2Reset: function () {
...@@ -1151,7 +1179,7 @@ ...@@ -1151,7 +1179,7 @@
that.msg2.BeforeDay = 0; that.msg2.BeforeDay = 0;
that.msg2.FreeRoomNum = 0; that.msg2.FreeRoomNum = 0;
that.msg2.PayStyle = 0; that.msg2.PayStyle = 0;
that.msg2.PriceTaxType=0; that.msg2.PriceTaxType = 0;
} else { } else {
that.Error(res.data.message) that.Error(res.data.message)
} }
...@@ -1174,7 +1202,7 @@ ...@@ -1174,7 +1202,7 @@
this.msg2.BeforeDay = 0; this.msg2.BeforeDay = 0;
this.msg2.FreeRoomNum = 0; this.msg2.FreeRoomNum = 0;
this.msg2.PayStyle = 0; this.msg2.PayStyle = 0;
this.msg2.PriceTaxType=0; this.msg2.PriceTaxType = 0;
} else { } else {
this.Error(res.data.message) this.Error(res.data.message)
} }
......
src/components/SalesVisa/VisaProductEditOrder.vue
View file @ a1d5d500
...@@ -171,7 +171,7 @@ ...@@ -171,7 +171,7 @@
<el-button v-show='item.visaManagementId>0' type="primary" style='background:#00a1f1; border-color:#00a1f1' @click='goUrlT(item)' icon="iconfont icon-bumen"></el-button> <el-button v-show='item.visaManagementId>0' type="primary" style='background:#00a1f1; border-color:#00a1f1' @click='goUrlT(item)' icon="iconfont icon-bumen"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip effect="dark" :content="$t('salesModule.ApplyInvoice')" placement="top-start"> <el-tooltip effect="dark" :content="$t('salesModule.ApplyInvoice')" placement="top-start">
<el-button v-show='item.visaManagementId>0' type="primary" style='background:#607D8B; border-color:#607D8B' @click='goUrlAdd("invoicesManagerAdd", item.id, item.visaId, item.CustomerId, 2)' icon="iconfont icon-rizhi1"></el-button> <el-button type="primary" style='background:#607D8B; border-color:#607D8B' @click='goUrlAdd("invoicesManagerAdd", item.id, item.visaId, item.CustomerId, 2)' icon="iconfont icon-rizhi1"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip v-if="item.income<=0&&(item.visaOrderStatus==1||item.visaOrderStatus==3)" class="item" effect="dark" :content="$t('pub.cancelBtn')" placement="top-start"> <el-tooltip v-if="item.income<=0&&(item.visaOrderStatus==1||item.visaOrderStatus==3)" class="item" effect="dark" :content="$t('pub.cancelBtn')" placement="top-start">
<el-button type="primary" style='background:#E95252; border-color:#E95252;' icon="iconfont icon-xingzhuangkaobei" @click='cancelOrder(item)'></el-button> <el-button type="primary" style='background:#E95252; border-color:#E95252;' icon="iconfont icon-xingzhuangkaobei" @click='cancelOrder(item)'></el-button>
......
src/components/SalesVisa/VisaProductOrder.vue
View file @ a1d5d500
...@@ -401,9 +401,11 @@ export default { ...@@ -401,9 +401,11 @@ export default {
}else{ }else{
this.dataList = res.data.data.pageData; this.dataList = res.data.data.pageData;
this.total = res.data.data.count; this.total = res.data.data.count;
this.loading = false; this.loading = false;
this.dataList.forEach(x=>{ this.dataList.forEach(x=>{
this.PreferPrice+=x.TotalPrice; if(x.VisaOrderStatus!=2){
this.PreferPrice+=x.TotalPrice;
}
this.IncomePrice+=(x.Income+x.PlatformTax-x.RefundMoney); this.IncomePrice+=(x.Income+x.PlatformTax-x.RefundMoney);
}) })
} }
......
src/components/clientConfirm.vue
View file @ a1d5d500
...@@ -276,7 +276,7 @@ ...@@ -276,7 +276,7 @@
<template> <template>
<div class="dic_content" :class="dialogVisible?'CisHideen':''"> <div class="dic_content" :class="dialogVisible?'CisHideen':''">
<!-- 签字 --> <!-- 签字 -->
<div v-show="signShow&&dataList.companySignature!=''" class="signSpan"> <div class="signSpan">
<div @click="goUrl" class="sign"> <div @click="goUrl" class="sign">
<!-- <span><span class="sp1"></span></p> --> <!-- <span><span class="sp1"></span></p> -->
<p><span style="font-size:3rem" class="iconfont icon-qianming"></span></p> <p><span style="font-size:3rem" class="iconfont icon-qianming"></span></p>
......
src/components/commonPage/commonHotelLog.vue
View file @ a1d5d500
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
<div class="operateName" style="color:#005CAA;font-size:12px;">{{item.CreateByName}} {{item.CreateTimeStr}} <div class="operateName" style="color:#005CAA;font-size:12px;">{{item.CreateByName}} {{item.CreateTimeStr}}
</div> </div>
</div> </div>
<div class="fz12 color333">{{item.Remarks}}</div> <div class="fz12 color333"><template v-if="item.TCID && item.TCID>0">【团号:{{item.TCID}}】</template>{{item.Remarks}}</div>
</div> </div>
<div v-if='HotelLogsList.length==0'>暂无数据</div> <div v-if='HotelLogsList.length==0'>暂无数据</div>
</div> </div>
......
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