Skip to content

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

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

parents 9e1aa3ca 96fd3fea
Expand all Show whitespace changes
Inline Side-by-side
Showing with 393 additions and 361 deletions
src/components/Hotel/HotelProductCalendar.vue
View file @ 82696862
...@@ -35,7 +35,8 @@ ...@@ -35,7 +35,8 @@
<div :class="stockColor(item.data.InventoryType)" v-if="item.data&&item.month===calendar.data.date"> <div :class="stockColor(item.data.InventoryType)" v-if="item.data&&item.month===calendar.data.date">
<p><span @click="goUrlA('2', item)" class="text_underLine">价格：{{item.data.CostPrice}}（{{item.data.CurrencyName}}）</span></p> <p><span @click="goUrlA('2', item)" class="text_underLine">价格：{{item.data.CostPrice}}（{{item.data.CurrencyName}}）</span></p>
<p><span class="text_underLine" @click="goUrlB(item)">总库存：{{item.data.Inventory}}（间）</span></p> <p><span class="text_underLine" @click="goUrlB(item)">总库存：{{item.data.Inventory}}（间）</span></p>
<p><span class="text_underLine" @click="goUrlHotelTeam(item)">剩余库存：{{item.data.RemainingInventory}}（间）</span></p> <!-- <p><span class="text_underLine" @click="goUrlHotelTeam(item)">剩余库存：{{item.data.RemainingInventory}}（间）</span></p> -->
<p><span>剩余库存：{{item.data.RemainingInventory}}（间）</span></p>
<p><span v-if="item.data.Inventory!==item.data.RemainingInventory" class="text_underLine">已使用库存：{{item.data.UseAmount}}（间）</span></p> <p><span v-if="item.data.Inventory!==item.data.RemainingInventory" class="text_underLine">已使用库存：{{item.data.UseAmount}}（间）</span></p>
<p><span v-if="item.data.Inventory!==item.data.RemainingInventory">欠房数量：{{item.data.OweAmount}}（间）</span></p> <p><span v-if="item.data.Inventory!==item.data.RemainingInventory">欠房数量：{{item.data.OweAmount}}（间）</span></p>
<p><span v-if="item.data.Inventory!==item.data.RemainingInventory" class="text_underLine">已确定：{{item.data.SureAmount}}（间）</span></p> <p><span v-if="item.data.Inventory!==item.data.RemainingInventory" class="text_underLine">已确定：{{item.data.SureAmount}}（间）</span></p>
......
src/components/Hotel/HotelsTeam.vue
View file @ 82696862
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
</tr> </tr>
<tr v-for="(item,index) in dataList"> <tr v-for="(item,index) in dataList">
<td><div class="w80">{{index}}</div></td> <td><div class="w80">{{index}}</div></td>
<td><div class="w120">{{item.TCNUMS}}</div></td> <td><div class="w120">{{item.CommonReport.HotelList[0].TCNUM}}</div></td>
<td><div class="w120">{{item.StartCityNames}}</div></td> <td><div class="w120">{{item.StartCityNames}}</div></td>
<td><div class="w120">{{item.LeaderName}}</div></td> <td><div class="w120">{{item.LeaderName}}</div></td>
<td><div class="w120">{{item.GuideName}}</div></td> <td><div class="w120">{{item.GuideName}}</div></td>
...@@ -61,42 +61,42 @@ ...@@ -61,42 +61,42 @@
</td> </td>
<td> <td>
<div class="w80"> <div class="w80">
<p class="pHouseStyle" v-for="o in item.CommonReport.HotelList[0].OrderDetailsList"> <p class="pHouseStyle" v-if="item.CommonReport.HotelList[0].OrderDetailsList.length>0" v-for="o in item.CommonReport.HotelList[0].OrderDetailsList">
<el-input class='w50 tcenter' @keyup.native="checkInteger(o,'HouseTypeCount')" v-model='o.HouseTypeCount'></el-input> <el-input class='w50 tcenter' @keyup.native="checkInteger(o,'HouseTypeCount')" v-model='o.HouseTypeCount'></el-input>
</p> </p>
</div> </div>
</td> </td>
<td> <td>
<div class="w80"> <div class="w80">
<p class="pHouseStyle" :class="{colorRed:o.HouseTypeCount-item.CommonReport.HouseStatistics.HouseTypeList[index].HouseTypeCount<0}" v-for="(o,index) in item.CommonReport.HotelList[0].OrderDetailsList"> <p class="pHouseStyle" v-if="item.CommonReport.HotelList[0].OrderDetailsList.length>0" :class="{colorRed:o.HouseTypeCount-item.CommonReport.HouseStatistics.HouseTypeList[index].HouseTypeCount<0}" v-for="(o,index) in item.CommonReport.HotelList[0].OrderDetailsList">
{{o.HouseTypeCount-item.CommonReport.HouseStatistics.HouseTypeList[index].HouseTypeCount}} {{o.HouseTypeCount-item.CommonReport.HouseStatistics.HouseTypeList[index].HouseTypeCount}}
</p> </p>
</div> </div>
</td> </td>
<td> <td>
<div class="w120"> <div class="w120">
<p class="pHouseStyle" v-for="(o,index) in item.CommonReport.HotelList[0].OrderDetailsList"> <p class="pHouseStyle" v-if="item.CommonReport.HotelList[0].OrderDetailsList.length>0" v-for="(o,index) in item.CommonReport.HotelList[0].OrderDetailsList" @input="calculationPrice(item)">
<el-input @keyup.native="checkInteger(o,'UnitPrice')" class='w80 tcenter' v-model='o.UnitPrice'></el-input> <el-input @keyup.native="checkInteger(o,'UnitPrice')" class='w80 tcenter' v-model='o.UnitPrice'></el-input>
</p> </p>
</div> </div>
</td> </td>
<td> <td>
<div class="w80"> <div class="w80">
<p class="pHouseStyle" v-for="(o,index) in item.CommonReport.HotelList[0].OrderDetailsList"> <p class="pHouseStyle" v-if="item.CommonReport.HotelList[0].OrderDetailsList.length>0" v-for="(o,index) in item.CommonReport.HotelList[0].OrderDetailsList" @input="calculationPrice(item)">
<el-input class='w50' @keyup.native="checkInteger(o,'HotelDiscount')" v-model='o.HotelDiscount'></el-input> <el-input class='w50' @keyup.native="checkInteger(o,'HotelDiscount')" v-model='o.HotelDiscount'></el-input>
</p> </p>
</div> </div>
</td> </td>
<td> <td>
<div class="w80"> <div class="w80">
<p class="pHouseStyle" v-for="(o,index) in item.CommonReport.HotelList[0].OrderDetailsList"> <p class="pHouseStyle" v-if="item.CommonReport.HotelList[0].OrderDetailsList.length>0" v-for="(o,index) in item.CommonReport.HotelList[0].OrderDetailsList">
{{o.UnitPrice*(o.HouseGuestNum-o.HotelDiscount)}} {{o.UnitPrice*(o.HouseGuestNum-o.HotelDiscount)}}
</p> </p>
</div> </div>
</td> </td>
<td> <td>
<div class="w80"> <div class="w80">
<p class="pHouseStyle link" v-for="(o,index) in item.CommonReport.HotelList[0].OrderDetailsList"> <p class="pHouseStyle link" v-if="item.CommonReport.HotelList[0].OrderDetailsList.length>0" v-for="(o,index) in item.CommonReport.HotelList[0].OrderDetailsList" @input="calculationPrice(item)">
<span class="spanlink" v-if='o.IsRebateRatio==0' @click="goUrl('HotelInfo',o,'酒店管理')">设置</span> <span class="spanlink" v-if='o.IsRebateRatio==0' @click="goUrl('HotelInfo',o,'酒店管理')">设置</span>
<span v-if='o.IsRebateRatio!=0'>{{o.RebateRatio}}</span> <span v-if='o.IsRebateRatio!=0'>{{o.RebateRatio}}</span>
</p> </p>
...@@ -109,12 +109,12 @@ ...@@ -109,12 +109,12 @@
</td> </td>
<td> <td>
<div class="w120"> <div class="w120">
<el-select class='w100 sel' v-model='item.PayStyle' :placeholder="$t('pub.pleaseSel')"> <el-select class='w100 sel' v-model='item.CommonReport.HotelList[0].PayStyle' :placeholder="$t('pub.pleaseSel')">
<el-option label='请选择' value='0' ></el-option> <el-option label='请选择' :value='0' ></el-option>
<el-option label='现付' value='1' ></el-option> <el-option label='现付' :value='1' ></el-option>
<el-option label='签单' value='2' ></el-option> <el-option label='签单' :value='2' ></el-option>
<el-option label='实物抵扣' value='5' ></el-option> <el-option label='实物抵扣' :value='5' ></el-option>
<el-option label='预付' value='4' ></el-option> <el-option label='预付' :value='4' ></el-option>
</el-select> </el-select>
</div> </div>
</td> </td>
...@@ -126,12 +126,12 @@ ...@@ -126,12 +126,12 @@
</td> </td>
<td> <td>
<div class="w150"> <div class="w150">
<el-input class='w120' v-model='item.ReserveNo'></el-input> <el-input class='w120' v-model='item.CommonReport.HotelList[0].ReserveNo'></el-input>
</div> </div>
</td> </td>
<td> <td>
<div class="w150"> <div class="w150">
<el-input type='textarea' class='w120' v-model='item.Remarks'></el-input> <el-input type='textarea' class='w120' v-model='item.CommonReport.HotelList[0].Remarks'></el-input>
</div> </div>
</td> </td>
<td> <td>
...@@ -140,7 +140,7 @@ ...@@ -140,7 +140,7 @@
</tr> </tr>
<tbody v-if="dataList.length===0"> <tbody v-if="dataList.length===0">
<tr> <tr>
<td :colspan="3">暂无数据</td> <td :colspan="24">暂无数据</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
...@@ -162,8 +162,10 @@ ...@@ -162,8 +162,10 @@
}, },
methods: { methods: {
getList(){ getList(){
this.loading = true;
this.apipost("dmcstatistics_post_GetHotelByIDAndUseTime", this.msg, res => { this.apipost("dmcstatistics_post_GetHotelByIDAndUseTime", this.msg, res => {
console.log(res); console.log(res);
this.loading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.dataList = res.data.data; this.dataList = res.data.data;
}else{ }else{
...@@ -184,15 +186,23 @@ ...@@ -184,15 +186,23 @@
//单条保存 //单条保存
SaveSingle(item){ SaveSingle(item){
item.CommonReport.HotelList[0].HotelOrderState=1; item.CommonReport.HotelList[0].HotelOrderState=1;
this.apipost('dmcstatistics_post_SetNewHotelOrder',item,res=>{ this.apipost('dmcstatistics_post_SetNewHotelOrder',item.CommonReport.HotelList[0],res=>{
if(res.data.resultCode==1){ if(res.data.resultCode==1){
this.Success(res.data.message) this.Success(res.data.message)
}else{ }else{
this.Error(res.data.message) this.Error(res.data.message)
} }
},err=>{}) },err=>{})
},
} //计算总价
calculationPrice(obj){
let totalPrice=0
obj.CommonReport.HotelList[0].OrderDetailsList.forEach(item=>{
totalPrice+=item.UnitPrice*(item.HouseGuestNum-item.HotelDiscount)*(1-item.RebateRatio/100)
})
obj.TotalPrice=totalPrice.toFixed(2)
this.$forceUpdate()
},
}, },
mounted: function () { mounted: function () {
this.msg.HotelId = this.$route.query.HotelId; this.msg.HotelId = this.$route.query.HotelId;
......
src/components/TravelManager/TravelList/TeamBalancePayment.vue
View file @ 82696862
...@@ -221,7 +221,7 @@ ...@@ -221,7 +221,7 @@
</td> </td>
<td style="font-size:14px;"> <td style="font-size:14px;">
应收：{{item.Money}}<br /> 应收：{{item.Money}}<br />
实收：{{item.Money}} 实收：{{item.PayMoney}}
</td> </td>
<td>{{item.TradeDate}}</td> <td>{{item.TradeDate}}</td>
<td> <td>
...@@ -265,7 +265,7 @@ ...@@ -265,7 +265,7 @@
</td> </td>
<td style="font-size:14px;"> <td style="font-size:14px;">
应收：{{item.Money}}<br /> 应收：{{item.Money}}<br />
实收：{{item.Money}} 实收：{{item.PayMoney}}
</td> </td>
<td>{{item.TradeDate}}</td> <td>{{item.TradeDate}}</td>
<td> <td>
...@@ -309,7 +309,7 @@ ...@@ -309,7 +309,7 @@
</td> </td>
<td style="font-size:14px;"> <td style="font-size:14px;">
应收：{{item.Money}}<br /> 应收：{{item.Money}}<br />
实收：{{item.Money}} 实收：{{item.PayMoney}}
</td> </td>
<td>{{item.TradeDate}}</td> <td>{{item.TradeDate}}</td>
<td> <td>
...@@ -353,7 +353,7 @@ ...@@ -353,7 +353,7 @@
</td> </td>
<td style="font-size:14px;"> <td style="font-size:14px;">
应收：{{item.Money}}<br /> 应收：{{item.Money}}<br />
实收：{{item.Money}} 实收：{{item.PayMoney}}
</td> </td>
<td>{{item.TradeDate}}</td> <td>{{item.TradeDate}}</td>
<td> <td>
...@@ -397,7 +397,7 @@ ...@@ -397,7 +397,7 @@
</td> </td>
<td style="font-size:14px;"> <td style="font-size:14px;">
应收：{{item.Money}}<br /> 应收：{{item.Money}}<br />
实收：{{item.Money}} 实收：{{item.PayMoney}}
</td> </td>
<td>{{item.TradeDate}}</td> <td>{{item.TradeDate}}</td>
<td> <td>
...@@ -441,7 +441,7 @@ ...@@ -441,7 +441,7 @@
</td> </td>
<td style="font-size:14px;"> <td style="font-size:14px;">
应收：{{item.Money}}<br /> 应收：{{item.Money}}<br />
实收：{{item.Money}} 实收：{{item.PayMoney}}
</td> </td>
<td>{{item.TradeDate}}</td> <td>{{item.TradeDate}}</td>
<td> <td>
...@@ -494,7 +494,7 @@ ...@@ -494,7 +494,7 @@
</td> </td>
<td style="font-size:14px;"> <td style="font-size:14px;">
应付：{{item.Money}}<br /> 应付：{{item.Money}}<br />
实付：{{item.Money}} 实付：{{item.PayMoney}}
</td> </td>
<td>{{item.TradeDate}}</td> <td>{{item.TradeDate}}</td>
<td> <td>
...@@ -541,7 +541,7 @@ ...@@ -541,7 +541,7 @@
</td> </td>
<td style="font-size:14px;"> <td style="font-size:14px;">
应付：{{item.Money}}<br /> 应付：{{item.Money}}<br />
实付：{{item.Money}} 实付：{{item.PayMoney}}
</td> </td>
<td>{{item.TradeDate}}</td> <td>{{item.TradeDate}}</td>
<td> <td>
...@@ -588,7 +588,7 @@ ...@@ -588,7 +588,7 @@
</td> </td>
<td style="font-size:14px;"> <td style="font-size:14px;">
应付：{{item.Money}}<br /> 应付：{{item.Money}}<br />
实付：{{item.Money}} 实付：{{item.PayMoney}}
</td> </td>
<td>{{item.TradeDate}}</td> <td>{{item.TradeDate}}</td>
<td> <td>
...@@ -635,7 +635,7 @@ ...@@ -635,7 +635,7 @@
</td> </td>
<td style="font-size:14px;"> <td style="font-size:14px;">
应付：{{item.Money}}<br /> 应付：{{item.Money}}<br />
实付：{{item.Money}} 实付：{{item.PayMoney}}
</td> </td>
<td>{{item.TradeDate}}</td> <td>{{item.TradeDate}}</td>
<td> <td>
...@@ -682,7 +682,7 @@ ...@@ -682,7 +682,7 @@
</td> </td>
<td style="font-size:14px;"> <td style="font-size:14px;">
应付：{{item.Money}}<br /> 应付：{{item.Money}}<br />
实付：{{item.Money}} 实付：{{item.PayMoney}}
</td> </td>
<td>{{item.TradeDate}}</td> <td>{{item.TradeDate}}</td>
<td> <td>
...@@ -729,7 +729,7 @@ ...@@ -729,7 +729,7 @@
</td> </td>
<td style="font-size:14px;"> <td style="font-size:14px;">
应付：{{item.Money}}<br /> 应付：{{item.Money}}<br />
实付：{{item.Money}} 实付：{{item.PayMoney}}
</td> </td>
<td>{{item.TradeDate}}</td> <td>{{item.TradeDate}}</td>
<td> <td>
...@@ -776,7 +776,7 @@ ...@@ -776,7 +776,7 @@
</td> </td>
<td style="font-size:14px;"> <td style="font-size:14px;">
应付：{{item.Money}}<br /> 应付：{{item.Money}}<br />
实付：{{item.Money}} 实付：{{item.PayMoney}}
</td> </td>
<td>{{item.TradeDate}}</td> <td>{{item.TradeDate}}</td>
<td> <td>
...@@ -823,7 +823,7 @@ ...@@ -823,7 +823,7 @@
</td> </td>
<td style="font-size:14px;"> <td style="font-size:14px;">
应付：{{item.Money}}<br /> 应付：{{item.Money}}<br />
实付：{{item.Money}} 实付：{{item.PayMoney}}
</td> </td>
<td>{{item.TradeDate}}</td> <td>{{item.TradeDate}}</td>
<td> <td>
...@@ -877,7 +877,7 @@ ...@@ -877,7 +877,7 @@
</td> </td>
<td style="font-size:14px;"> <td style="font-size:14px;">
应付：{{item.Money}}<br /> 应付：{{item.Money}}<br />
实付：{{item.Money}} 实付：{{item.PayMoney}}
</td> </td>
<td>{{item.TradeDate}}</td> <td>{{item.TradeDate}}</td>
<td> <td>
...@@ -924,7 +924,7 @@ ...@@ -924,7 +924,7 @@
</td> </td>
<td style="font-size:14px;"> <td style="font-size:14px;">
应付：{{item.Money}}<br /> 应付：{{item.Money}}<br />
实付：{{item.Money}} 实付：{{item.PayMoney}}
</td> </td>
<td>{{item.TradeDate}}</td> <td>{{item.TradeDate}}</td>
<td> <td>
......
src/components/activity/LuckyDraw.vue
View file @ 82696862
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
<th>开始日期</th> <th>开始日期</th>
<th>结束日期</th> <th>结束日期</th>
<th>抽奖状态</th> <th>抽奖状态</th>
<th>备注</th> <th width="400">备注</th>
<th>操作</th> <th>操作</th>
</tr> </tr>
<tr v-for="item in dataList"> <tr v-for="item in dataList">
...@@ -240,7 +240,7 @@ ...@@ -240,7 +240,7 @@
<tr> <tr>
<td colspan="2"> <td colspan="2">
<el-form-item label="抽奖规则" prop="lotteryRules"> <el-form-item label="抽奖规则" prop="lotteryRules">
<quill-editor class="w595" v-model="addMsg.lotteryRules"></quill-editor> <quill-editor class="w595" :options="editorOption" v-model="addMsg.lotteryRules"></quill-editor>
</el-form-item> </el-form-item>
</td> </td>
</tr> </tr>
...@@ -323,10 +323,23 @@ export default { ...@@ -323,10 +323,23 @@ export default {
image:'', image:'',
}, },
toolbar: { toolbar: {
clean: false, //加粗 clean: true, //加粗
font: false, //字体 bold:true,
narrative: true, //叙述, // italic:true,
image: true fontColor:true,
align:true,
leftIndent:true,
rightIndent:true,
headSize:true,
narrative: false, //叙述,
},
editorOption:{
modules:{
toolbar:[
['bold', 'italic', 'underline', 'strike'], // toggled buttons
['blockquote', 'code-block','align']
]
}
}, },
rules:{ rules:{
branchId: [{ required: true, message: "请选择公司", trigger: "change" }], branchId: [{ required: true, message: "请选择公司", trigger: "change" }],
...@@ -367,7 +380,6 @@ export default { ...@@ -367,7 +380,6 @@ export default {
}, },
filters: { filters: {
}, },
methods: { methods: {
//重置id //重置id
resSetInfo(){ resSetInfo(){
......
src/plug/index.js
View file @ 82696862
...@@ -117,8 +117,9 @@ export default { ...@@ -117,8 +117,9 @@ export default {
let locationName = window.location.hostname; let locationName = window.location.hostname;
domainUrl = "http://192.168.2.214:8082"; //214主域名 domainUrl = "http://192.168.2.214:8082"; //214主域名
if (locationName.indexOf('oytour')!==-1) { if (locationName.indexOf('oytour')!==-1) {
domainUrl = "https://reborn.oytour.com"; domainUrl = "http://webapi.viitto.com";
}else if (locationName.indexOf('viitto')!==-1) { }
else if (locationName.indexOf('viitto')!==-1) {
domainUrl = "https://test.viitto.com"; domainUrl = "https://test.viitto.com";
} }
var obj = { var obj = {
...@@ -292,13 +293,13 @@ export default { ...@@ -292,13 +293,13 @@ export default {
}, },
Vue.prototype.JueryPost=function (cmd, msg, successCall, faildCall) { Vue.prototype.ApiPost2=function (cmd, msg, successCall, faildCall) {
if (msg == null || msg == "") { if (msg == null || msg == "") {
msg = {} msg = {}
} }
var apiurl = this.domainManager().PostUrl; var apiNewurl = this.domainManager().DomainUrl;
var timestamp = (new Date()).valueOf(); var timestamp = (new Date()).valueOf();
this.apiurl = apiurl; apiNewurl = apiNewurl+"/Api/Trip/"+cmd;
if (this.$route.path.toLowerCase() == "/signature") { if (this.$route.path.toLowerCase() == "/signature") {
this.$router.push({ this.$router.push({
path: '/signature' path: '/signature'
...@@ -323,29 +324,11 @@ export default { ...@@ -323,29 +324,11 @@ export default {
"cmd": cmd, "cmd": cmd,
"timestamp": timestamp, "timestamp": timestamp,
"token": token, "token": token,
"sign": md5Str "sign": md5Str,
} "uid":this.getLocalStorage().EmployeeId
$.ajax({
url: apiurl,
type: "POST",
data: msg,
datatype: "jsonP",
success: function (res) {
if (res.data.resultCode == 10000 || res.data.resultCode == 10001) {
this.$router.push({
path: '/login'
});
} else if (res.resultCode == 10005) {
this.$router.go(-1);
} else {
successCall(res);
} }
},
faildCall
});
this.$http.post(apiurl, postData, { this.$http.post(apiNewurl, postData, {
headers: { headers: {
'Content-Type': 'application/json', 'Content-Type': 'application/json',
'Referer-Viitto': this.$route.path 'Referer-Viitto': this.$route.path
......
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