Skip to content

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

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

# Conflicts:
#	src/plug/index.js
parents d1842968 a4d74ac9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 894 additions and 375 deletions
index.html
View file @ 51412b57
...@@ -9,9 +9,9 @@ ...@@ -9,9 +9,9 @@
<meta http-equiv="expires" content="-1, 26 Feb 1997 08:21:57 GMT"> <meta http-equiv="expires" content="-1, 26 Feb 1997 08:21:57 GMT">
<!--<meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" name="viewport">--> <!--<meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" name="viewport">-->
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=ZzGBZF6L0sgFDLlDohyvYhCnWy4dwksX" ></script> <script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=ZzGBZF6L0sgFDLlDohyvYhCnWy4dwksX" ></script>
<script type="text/javascript" src="http://api.map.baidu.com/library/CurveLine/1.5/src/CurveLine.min.js"></script> <script type="text/javascript" src="static/CurveLine.min.js"></script>
<script type="text/javascript" src="http://ditu.google.cn/maps/api/js?key=AIzaSyAZ5MIfzicStzKbIkbI3RcBBeZBjQFKsp0&language=zh-CN"></script> <script type="text/javascript" src="http://ditu.google.cn/maps/api/js?key=AIzaSyAZ5MIfzicStzKbIkbI3RcBBeZBjQFKsp0&language=zh-CN"></script>
<script src="http://code.jquery.com/jquery-2.1.1.min.js"></script> <script src="static/jquery.min.js"></script>
<title>四川和平国际旅行社</title> <title>四川和平国际旅行社</title>
</head> </head>
<body> <body>
......
package.json
View file @ 51412b57
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
"dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js", "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js",
"start": "npm run dev", "start": "npm run dev",
"lint": "eslint --ext .js,.vue src", "lint": "eslint --ext .js,.vue src",
"build": "node build/build.js" "build": "node --max-old-space-size=4096 build/build.js"
}, },
"dependencies": { "dependencies": {
"@riophae/vue-treeselect": "0.0.36", "@riophae/vue-treeselect": "0.0.36",
......
src/components/Hotel/HotelProductCalendar.vue
View file @ 51412b57
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
<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>剩余库存：{{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>
...@@ -110,6 +111,9 @@ ...@@ -110,6 +111,9 @@
this.$emit('goEdit', type, item.day) this.$emit('goEdit', type, item.day)
// this.$router.push({ name: 'HotelProductEdit', query: { type: type, HotelId: this.hotelId, day: item.day,blank: 'y', tab: '报价管理'} }); // this.$router.push({ name: 'HotelProductEdit', query: { type: type, HotelId: this.hotelId, day: item.day,blank: 'y', tab: '报价管理'} });
}, },
goUrlHotelTeam:function(item){
this.$router.push({ name: 'HotelsTeam', query: { HotelId: item.data.HotelId,StartDate:item.data.DayStr, blank: 'y', tab: '酒店相关团'} });
},
goUrlB: function (item) { goUrlB: function (item) {
this.$router.push({ name: 'HotelTotalStock', query: { HotelId: this.hotelId, blank: 'y', tab: '总库存看板'} }); this.$router.push({ name: 'HotelTotalStock', query: { HotelId: this.hotelId, blank: 'y', tab: '总库存看板'} });
} }
......
src/components/Hotel/HotelsTeam.vue 0 → 100644
View file @ 51412b57
This diff is collapsed.
src/components/Hotel/roomReservationsDetails.vue
View file @ 51412b57
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
<th width="80">地址</th> <th width="80">地址</th>
<th width="80">订团号</th> <th width="80">订团号</th>
<th width="80">备注</th> <th width="80">备注</th>
<th width="80">操作</th>
</tr> </tr>
<tr v-for="(item,index) in list"> <tr v-for="(item,index) in list">
<td :rowspan="list.length" v-if="index==0"> <td :rowspan="list.length" v-if="index==0">
...@@ -153,7 +154,10 @@ ...@@ -153,7 +154,10 @@
<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.Remarks'></el-input>
</div> </div>
</td> </td>
<td>
<input type="button" class="roomBtn" value="保存" @click="SaveSingle(item)"/>
</td>
</tr> </tr>
</table> </table>
</div> </div>
...@@ -274,12 +278,24 @@ export default { ...@@ -274,12 +278,24 @@ export default {
}) })
this.apipost('dmcstatistics_get_SetHotelOrder',this.list,res=>{ this.apipost('dmcstatistics_get_SetHotelOrder',this.list,res=>{
if(res.data.resultCode==1){ if(res.data.resultCode==1){
this.$message.success(res.data.message) this.Success(res.data.message)
}else{ }else{
this.$message.error(res.data.message) this.Error(res.data.message)
} }
},err=>{}) },err=>{})
}, },
//单条保存
SaveSingle(item){
item.HotelOrderState=1;
this.apipost('dmcstatistics_post_SetNewHotelOrder',item,res=>{
if(res.data.resultCode==1){
this.Success(res.data.message)
}else{
this.Error(res.data.message)
}
},err=>{})
}
}, },
created() { created() {
...@@ -295,6 +311,16 @@ export default { ...@@ -295,6 +311,16 @@ export default {
</script> </script>
<style> <style>
.roomReservationsDetailsTalbe .roomBtn{
color: #fff;
padding: 0 10px!important;
height: 30px!important;
background: #E95252;
border: 1px solid #E95252;
cursor: pointer;
border-radius: 15px;
margin:0 10px;
}
.roomReservationsDetailsTalbe{ background: #ddd;} .roomReservationsDetailsTalbe{ background: #ddd;}
.roomReservationsDetailsTalbe tr th{background: #eee;height:40px; font-size: 12px; color: #333;} .roomReservationsDetailsTalbe tr th{background: #eee;height:40px; font-size: 12px; color: #333;}
.roomReservationsDetailsTalbe tr{background: #fff;text-align: center; height: 40px;} .roomReservationsDetailsTalbe tr{background: #fff;text-align: center; height: 40px;}
......
src/components/SalesModule/enrollTotal.vue
View file @ 51412b57
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
</p> </p>
</div> </div>
</el-col> </el-col>
<el-col :span="5" class="groupTourOrder_count_col"> <el-col :span="4" class="groupTourOrder_count_col">
<div class="groupTourOrder_count_item"> <div class="groupTourOrder_count_item">
<div class="groupTourOrder_count_blue"> <div class="groupTourOrder_count_blue">
<i class="iconfont icon-baomingrenshu"></i> <i class="iconfont icon-baomingrenshu"></i>
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
</p> </p>
</div> </div>
</el-col> </el-col>
<el-col :span="5" class="groupTourOrder_count_col"> <el-col :span="4" class="groupTourOrder_count_col">
<div class="groupTourOrder_count_item"> <div class="groupTourOrder_count_item">
<div class="groupTourOrder_count_yellow"> <div class="groupTourOrder_count_yellow">
<i class="iconfont icon-baomingrenshu"></i> <i class="iconfont icon-baomingrenshu"></i>
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
</p> </p>
</div> </div>
</el-col> </el-col>
<el-col :span="5" class="groupTourOrder_count_col"> <el-col :span="4" class="groupTourOrder_count_col">
<div class="groupTourOrder_count_item"> <div class="groupTourOrder_count_item">
<div> <div>
<i class="iconfont icon-tongji1 groupTourOrder_count_gray"></i> <i class="iconfont icon-tongji1 groupTourOrder_count_gray"></i>
...@@ -143,6 +143,17 @@ ...@@ -143,6 +143,17 @@
</p> </p>
</div> </div>
</el-col> </el-col>
<el-col :span="3" class="groupTourOrder_count_col">
<div class="groupTourOrder_count_item">
<div>
<i class="iconfont icon-tongji1 groupTourOrder_count_gray"></i>
<span>累计提成</span>
</div>
<p>
<span>提成金额：{{countData.SumCommissionMoney}};</span>
</p>
</div>
</el-col>
</el-row> </el-row>
</div> </div>
<!-- 表格 --> <!-- 表格 -->
......
src/components/SalesModule/groupTourOrder.vue
View file @ 51412b57
...@@ -1325,7 +1325,7 @@ ...@@ -1325,7 +1325,7 @@
</p> </p>
</div> </div>
</el-col> </el-col>
<el-col :span="5" class="groupTourOrder_count_col"> <el-col :span="4" class="groupTourOrder_count_col">
<div class="groupTourOrder_count_item"> <div class="groupTourOrder_count_item">
<div class="groupTourOrder_count_blue"> <div class="groupTourOrder_count_blue">
<i class="iconfont icon-baomingrenshu"></i> <i class="iconfont icon-baomingrenshu"></i>
...@@ -1339,7 +1339,7 @@ ...@@ -1339,7 +1339,7 @@
</p> </p>
</div> </div>
</el-col> </el-col>
<el-col :span="5" class="groupTourOrder_count_col"> <el-col :span="4" class="groupTourOrder_count_col">
<div class="groupTourOrder_count_item"> <div class="groupTourOrder_count_item">
<div class="groupTourOrder_count_yellow"> <div class="groupTourOrder_count_yellow">
<i class="iconfont icon-baomingrenshu"></i> <i class="iconfont icon-baomingrenshu"></i>
...@@ -1353,6 +1353,7 @@ ...@@ -1353,6 +1353,7 @@
</p> </p>
</div> </div>
</el-col> </el-col>
<el-col :span="4" class="groupTourOrder_count_col"> <el-col :span="4" class="groupTourOrder_count_col">
<div class="groupTourOrder_count_item"> <div class="groupTourOrder_count_item">
<div> <div>
...@@ -1365,7 +1366,7 @@ ...@@ -1365,7 +1366,7 @@
</p> </p>
</div> </div>
</el-col> </el-col>
<el-col :span="5" class="groupTourOrder_count_col"> <el-col :span="4" class="groupTourOrder_count_col">
<div class="groupTourOrder_count_item"> <div class="groupTourOrder_count_item">
<div> <div>
<i class="iconfont icon-tongji1 groupTourOrder_count_gray"></i> <i class="iconfont icon-tongji1 groupTourOrder_count_gray"></i>
...@@ -1379,6 +1380,17 @@ ...@@ -1379,6 +1380,17 @@
</p> </p>
</div> </div>
</el-col> </el-col>
<el-col :span="3" class="groupTourOrder_count_col">
<div class="groupTourOrder_count_item">
<div>
<i class="iconfont icon-tongji1 groupTourOrder_count_gray"></i>
<span>累计提成</span>
</div>
<p>
<span>提成金额：{{countData.SumCommissionMoney}};</span>
</p>
</div>
</el-col>
</el-row> </el-row>
</div> </div>
<!-- 表格 --> <!-- 表格 -->
...@@ -1930,7 +1942,8 @@ ...@@ -1930,7 +1942,8 @@
DueinMoney: 0, DueinMoney: 0,
PreferPrice: 0, PreferPrice: 0,
InteriorNum: 0, InteriorNum: 0,
B2BNum: 0 B2BNum: 0,
SumCommissionMoney:0
}, },
// 订单转团 // 订单转团
transferData: { transferData: {
......
src/components/TravelManager/TravelList/TeamBalancePayment.vue
View file @ 51412b57
...@@ -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/CouponList.vue
View file @ 51412b57
...@@ -85,8 +85,8 @@ ...@@ -85,8 +85,8 @@
<th>数量</th> <th>数量</th>
<th>线路名称</th> <th>线路名称</th>
<th>类型</th> <th>类型</th>
<th>面额</th>
<th>满减/折扣</th> <th>满减/折扣</th>
<th>面额</th>
<!-- <th>使用状态</th> --> <!-- <th>使用状态</th> -->
<th>叠加使用</th> <th>叠加使用</th>
<th>生效日期</th> <th>生效日期</th>
...@@ -99,8 +99,8 @@ ...@@ -99,8 +99,8 @@
<td>{{item.couponCount}}</td> <td>{{item.couponCount}}</td>
<td>{{item.lineName}}</td> <td>{{item.lineName}}</td>
<td>{{item.couponsType ===1 ? "抵用券" : "折扣券"}}</td> <td>{{item.couponsType ===1 ? "抵用券" : "折扣券"}}</td>
<td>{{item.denomination}}</td>
<td>{{item.useCondition}}</td> <td>{{item.useCondition}}</td>
<td>{{item.denomination}}</td>
<!-- <td>{{item.useState}}</td> --> <!-- <td>{{item.useState}}</td> -->
<td>{{item.overlapUse === 1 ? "不允许" : "允许"}}</td> <td>{{item.overlapUse === 1 ? "不允许" : "允许"}}</td>
<td>{{item.effectDate}}</td> <td>{{item.effectDate}}</td>
...@@ -368,9 +368,9 @@ export default { ...@@ -368,9 +368,9 @@ export default {
}, null); }, null);
}, },
maxValue: function (val) { maxValue: function (val) {
if (this.addMsg.couponsType === 2 && val >= 1) { if (this.addMsg.couponsType === 2 && val >= 9.99) {
this.addMsg.denomination = 0.99 this.addMsg.denomination = 9.99
this.$message.error("折扣券最大折扣为0.99折") this.$message.error("折扣券最大折扣为99折")
} }
}, },
addData() { addData() {
......
src/components/activity/LuckyDraw.vue
View file @ 51412b57
<style> <style>
.w595{width:595px!important;} .w595{width:595px!important;}
</style> .LuckyDraw .singeRowTable i{
font-size:15px;
}
.LuckyDraw ._addUpload_box{
display: block;
margin: 10px 0 0 100px;
}
.LuckyDraw ._addUpload_box img{
width: 100%;
height:100%;
}
.LuckyDraw ._addUpload_box>div{
float: left;
width:138px;
height:92px;
border:1px dashed rgba(210,210,210,1);
border-radius:2px;
cursor: pointer;
margin-bottom: 10px;
padding: 5px;
margin-right: 10px;
position: relative;
}
.LuckyDraw ._addUpload_box .icon-guanbi1 {
font-size: 12px;
color: white;
display: inline-block;
margin-left: 15px;
position: absolute;
right: -6px;
top: -9px;
background-color: #f56c6c;
border-radius: 50%;
height: 20px;
width: 20px;
text-align: center;
line-height: 20px;
}
.LuckyDraw ._addUpload_box>div:hover{
background-color: #f5f5f5;
}
.LuckyDraw .el-upload-dragger{
font-size: 28px;
color: #8c939d;
width: 126px;
height: 80px;
line-height: 41px;
text-align: center;
}
.LuckyDraw ._show_img_box{
position: fixed;
background: rgba(0,0,0,.6);
left: 0;
top:0;
width: 100%;
height: 100%;
z-index: 9999;
text-align: center;
}
.LuckyDraw .ql-container{
min-height: 100px;
}
</style>
<template> <template>
<div class="flexOne"> <div class="flexOne LuckyDraw">
<div class="query-box"> <div class="query-box">
<ul class="user_time_picker"> <ul class="user_time_picker">
<li> <li>
...@@ -68,17 +130,19 @@ ...@@ -68,17 +130,19 @@
<tr> <tr>
<th>抽奖名称</th> <th>抽奖名称</th>
<th>公司名称</th> <th>公司名称</th>
<th>抽奖次数（每人）</th>
<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">
<td>{{item.lotteryName}}</td> <td>{{item.lotteryName}}</td>
<td>{{item.branchName}}</td> <td>{{item.branchName}}</td>
<td>{{item.endDate}}</td>
<td>{{item.lotteryCount}}</td> <td>{{item.lotteryCount}}</td>
<td>{{item.startDate}}</td>
<td>{{item.endDate}}</td>
<td>{{item.lotteryStatus==1?'正常':'禁用'}}</td> <td>{{item.lotteryStatus==1?'正常':'禁用'}}</td>
<td>{{item.remark}}</td> <td>{{item.remark}}</td>
<td> <td>
...@@ -173,6 +237,13 @@ ...@@ -173,6 +237,13 @@
</el-form-item> </el-form-item>
</td> </td>
</tr> </tr>
<tr>
<td colspan="2">
<el-form-item label="抽奖规则" prop="lotteryRules">
<quill-editor class="w595" :options="editorOption" v-model="addMsg.lotteryRules"></quill-editor>
</el-form-item>
</td>
</tr>
<tr> <tr>
<td colspan="2"> <td colspan="2">
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
...@@ -180,6 +251,29 @@ ...@@ -180,6 +251,29 @@
</el-form-item> </el-form-item>
</td> </td>
</tr> </tr>
<tr>
<td colspan="2">
<div class="_addUpload_box clearfix" >
<template>
<div v-if="addMsg.image!=''">
<div style="width:100%;height:100%;overflow: hidden;">
<img :src="addMsg.image" @click="showUpLoadFile()"/>
</div>
<span class="iconfont icon-guanbi1" @click="deleteUploadFile()"></span>
</div>
</template>
<div class="_pic_upload">
<el-upload
drag
:http-request="uploadFileBtn"
:multiple="false" :show-file-list="false" action="">
<i class="el-icon-plus avatar-uploader-icon"></i>
<div class="el-upload__text">点击/拖拽上传</div>
</el-upload>
</div>
</div>
</td>
</tr>
</table> </table>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
...@@ -187,6 +281,16 @@ ...@@ -187,6 +281,16 @@
<button class="normalBtn" @click="submitForm('addMsg')">保存</button> <button class="normalBtn" @click="submitForm('addMsg')">保存</button>
</div> </div>
</el-dialog> </el-dialog>
<div v-if='picIsShow' class="_show_img_box" @click="picIsShow=false">
<div style="position: absolute; width: 800px; height: 600px; left: 50%; top: 50%; margin-left: -400px; margin-top: -300px;">
<el-carousel height="600px" :interval="5000" trigger="click">
<el-carousel-item style="height: 600px;overflow:auto;">
<img :src="addMsg.image" style=""/>
</el-carousel-item>
</el-carousel>
</div>
</div>
</div> </div>
</template> </template>
<script> <script>
...@@ -214,7 +318,28 @@ export default { ...@@ -214,7 +318,28 @@ export default {
groupId:0, groupId:0,
branchId:'', branchId:'',
lotteryStatus:1, lotteryStatus:1,
lotteryPlatform:1 lotteryPlatform:1,
lotteryRules:'',
image:'',
},
toolbar: {
clean: true, //加粗
bold:true,
// italic: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" }],
...@@ -245,6 +370,7 @@ export default { ...@@ -245,6 +370,7 @@ export default {
companyList:[], companyList:[],
//线路 //线路
LineList:[], LineList:[],
picIsShow:false,
}; };
}, },
mounted() { mounted() {
...@@ -254,7 +380,6 @@ export default { ...@@ -254,7 +380,6 @@ export default {
}, },
filters: { filters: {
}, },
methods: { methods: {
//重置id //重置id
resSetInfo(){ resSetInfo(){
...@@ -268,7 +393,9 @@ export default { ...@@ -268,7 +393,9 @@ export default {
groupId:0, groupId:0,
branchId:'', branchId:'',
lotteryStatus:1, lotteryStatus:1,
lotteryPlatform:1 lotteryPlatform:1,
lotteryRules:'',
image:'',
} }
this.addMsg= newMsg; this.addMsg= newMsg;
}, },
...@@ -330,6 +457,7 @@ export default { ...@@ -330,6 +457,7 @@ export default {
this.resetForm("addMsg"); this.resetForm("addMsg");
this.Success(res.data.message); this.Success(res.data.message);
this.getList(); this.getList();
this.resSetInfo();
} else { } else {
this.Error(res.data.message) this.Error(res.data.message)
} }
...@@ -346,6 +474,8 @@ export default { ...@@ -346,6 +474,8 @@ export default {
this.addMsg.groupId = item.groupId; this.addMsg.groupId = item.groupId;
this.addMsg.branchId = item.branchId; this.addMsg.branchId = item.branchId;
this.addMsg.lotteryStatus = item.lotteryStatus; this.addMsg.lotteryStatus = item.lotteryStatus;
this.addMsg.lotteryRules = item.lotteryRules,
this.addMsg.image = item.image
}, },
//跳转至获取抽奖奖项信息列表 //跳转至获取抽奖奖项信息列表
goUrl(item){ goUrl(item){
...@@ -383,7 +513,45 @@ export default { ...@@ -383,7 +513,45 @@ export default {
}, },
resetForm(formName) { resetForm(formName) {
this.$refs[formName].resetFields(); this.$refs[formName].resetFields();
} },
deleteUploadFile(){ // 删除上传文件
this.addMsg.image='';
},
showUpLoadFile(){ // 预览上传文件
this.picIsShow= true;
},
//上传图片
uploadFileBtn(file) { //上传
if(file.file.size > 1024 * 1024 * 10) {
this.$message.warning('文件大小不能超过10M！')
return
}
// 1 文档 2 数据 3 图片
let typeArr=[
{stringArr:'GIF|JPG|JPEG|PNG|BMP',type:3},
]
let ft=file.file.name.substring(file.file.name.lastIndexOf('.')+1,file.file.name.length).toUpperCase();
let fileTypeNumber = 2;
let typeOk = false;
typeArr.forEach(x=>{
if(x.stringArr.indexOf(ft)!='-1')
{
fileTypeNumber=x.type
typeOk = true;
}
})
if (!typeOk) return this.$message.error('请上传图片！');
let newArr = [];
newArr.push(file.file)
let path = "/Upload/activity/"
this.$message.info('上传中...')
this.uploadFile(path, newArr, x => {
let fileSize = file.file.size<1024? file.file.size:(file.file.size / 1024).toFixed(0);
this.addMsg.image = x.res.requestUrls[0].split('?')[0]
this.$message.success('上传成功');
this.$forceUpdate();
});
},
} }
}; };
</script> </script>
\ No newline at end of file
src/components/activity/awardList.vue
View file @ 51412b57
...@@ -11,15 +11,21 @@ ...@@ -11,15 +11,21 @@
<div class="clearfix"></div> <div class="clearfix"></div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading"> <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
<tr> <tr>
<th>序号</th>
<th>奖项名</th> <th>奖项名</th>
<th>奖项数量</th> <th>奖项数量</th>
<th>中奖数量</th>
<th>剩余数量</th>
<th>奖项状态</th> <th>奖项状态</th>
<th>奖项类型</th> <th>奖项类型</th>
<th>操作</th> <th>操作</th>
</tr> </tr>
<tr v-for="item in dataList"> <tr v-for="item in dataList">
<td>{{item.rank}}</td>
<td>{{item.awardName}}</td> <td>{{item.awardName}}</td>
<td>{{item.awardCount}}</td> <td>{{item.awardCount}}</td>
<td>{{item.awardWinningCount}}</td>
<td>{{item.awardCount-item.awardWinningCount>=0?item.awardCount-item.awardWinningCount:0}}</td>
<td>{{item.awardStatus==1?'正常':'禁用'}}</td> <td>{{item.awardStatus==1?'正常':'禁用'}}</td>
<td v-if="item.awardType==1">谢谢参与</td> <td v-if="item.awardType==1">谢谢参与</td>
<td v-if="item.awardType==2">一般奖项</td> <td v-if="item.awardType==2">一般奖项</td>
...@@ -63,7 +69,7 @@ ...@@ -63,7 +69,7 @@
</tr> </tr>
<td> <td>
<el-form-item label="奖项类型" prop="awardType"> <el-form-item label="奖项类型" prop="awardType">
<el-select filterable v-model="addMsg.awardType" class="w217" @change="getAwardRelationId()"> <el-select filterable v-model="addMsg.awardType" class="w217" @change="getAwardRelationId(addMsg.awardType)">
<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="3"></el-option> <el-option label="优惠券" :value="3"></el-option>
...@@ -117,7 +123,7 @@ export default { ...@@ -117,7 +123,7 @@ export default {
awardName:'', awardName:'',
awardType:1, awardType:1,
//谢谢参与和一般奖项为0，优惠券 请求接口返回 //谢谢参与和一般奖项为0，优惠券 请求接口返回
awardRelationId:'', awardRelationId:0,
awardCount:'', awardCount:'',
awardStatus:1, awardStatus:1,
rank:'', rank:'',
...@@ -149,10 +155,10 @@ export default { ...@@ -149,10 +155,10 @@ export default {
getList() { getList() {
this.loading = true; this.loading = true;
this.apiJavaPost("/api/sell/lottery/getLotteryAwardList", this.msg, res => { this.apiJavaPost("/api/sell/lottery/getLotteryAwardList", this.msg, res => {
console.log(res,'getList');
this.loading = false; this.loading = false;
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
this.dataList = res.data.data; this.dataList = res.data.data;
console.log(this.dataList,'datalist');
} else { } else {
this.Error(res.data.message) this.Error(res.data.message)
} }
...@@ -176,7 +182,6 @@ export default { ...@@ -176,7 +182,6 @@ export default {
this.addMsg.awardRelationId = 0; this.addMsg.awardRelationId = 0;
} }
this.apiJavaPost("/api/sell/lottery/setLotteryAward", this.addMsg, res => { this.apiJavaPost("/api/sell/lottery/setLotteryAward", this.addMsg, res => {
console.log(res,'getList');
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
this.Success(res.data.message); this.Success(res.data.message);
this.outerVisible = false; this.outerVisible = false;
...@@ -188,6 +193,7 @@ export default { ...@@ -188,6 +193,7 @@ export default {
}, },
//修改信息 //修改信息
updateData(item){ updateData(item){
console.log(item);
this.addMsg.id=item.id; this.addMsg.id=item.id;
this.addMsg.lotteryId = item.lotteryId; this.addMsg.lotteryId = item.lotteryId;
this.addMsg.awardName = item.awardName; this.addMsg.awardName = item.awardName;
...@@ -196,12 +202,16 @@ export default { ...@@ -196,12 +202,16 @@ export default {
this.addMsg.awardCount = item.awardCount; this.addMsg.awardCount = item.awardCount;
this.addMsg.awardStatus = item.awardStatus; this.addMsg.awardStatus = item.awardStatus;
this.addMsg.rank = item.rank; this.addMsg.rank = item.rank;
this.getAwardRelationId(); this.getAwardRelationId(3);
}, },
//根据奖项类型请求关联Id //根据奖项类型请求关联Id
getAwardRelationId(){ getAwardRelationId(id){
let userInfo = localStorage.userInfo ? JSON.parse(localStorage.userInfo) : '';
let branchId = userInfo.RB_Branch_id ? userInfo.RB_Branch_id : 0
if(id==3){
let msg = { let msg = {
couponId:0 couponId:this.addMsg.awardRelationId,
branchId:branchId
} }
this.apiJavaPost("/api/sell/lottery/getCouponsList", msg, res => { this.apiJavaPost("/api/sell/lottery/getCouponsList", msg, res => {
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
...@@ -210,6 +220,7 @@ export default { ...@@ -210,6 +220,7 @@ export default {
this.Error(res.data.message) this.Error(res.data.message)
} }
}, null); }, null);
}
}, },
//重置信息 //重置信息
resetInfo(){ resetInfo(){
...@@ -218,7 +229,7 @@ export default { ...@@ -218,7 +229,7 @@ export default {
lotteryId:0, lotteryId:0,
awardName:'', awardName:'',
awardType:1, awardType:1,
awardRelationId:'', awardRelationId:0,
awardCount:'', awardCount:'',
awardStatus:1, awardStatus:1,
rank:'', rank:'',
......
src/plug/index.js
View file @ 51412b57
...@@ -115,11 +115,11 @@ export default { ...@@ -115,11 +115,11 @@ export default {
Vue.prototype.domainManager = function () { Vue.prototype.domainManager = function () {
let domainUrl = ''; let domainUrl = '';
let locationName = window.location.hostname; let locationName = window.location.hostname;
// domainUrl = "http://127.0.0.1"; //214主域名 domainUrl = "http://192.168.2.214:8082"; //214主域名
domainUrl = "http://192.168.2.16:8083";
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 = {
...@@ -293,13 +293,13 @@ export default { ...@@ -293,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'
...@@ -324,29 +324,11 @@ export default { ...@@ -324,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({ this.$http.post(apiNewurl, postData, {
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, {
headers: { headers: {
'Content-Type': 'application/json', 'Content-Type': 'application/json',
'Referer-Viitto': this.$route.path 'Referer-Viitto': this.$route.path
...@@ -374,8 +356,9 @@ export default { ...@@ -374,8 +356,9 @@ export default {
this.apiurl = apiurl; this.apiurl = apiurl;
var token = ""; var token = "";
var key = ""; var key = "";
let userInfo = localStorage.userInfo ? JSON.parse(localStorage.userInfo) : '' let userInfo = localStorage.userInfo ? JSON.parse(localStorage.userInfo) : '';
let uid = userInfo.EmployeeId ? userInfo.EmployeeId : 0 let groupId = userInfo.RB_Group_id ? userInfo.RB_Group_id : 0;
let uid = userInfo.EmployeeId ? userInfo.EmployeeId : 0;
if (this.getLocalStorage() != null) { if (this.getLocalStorage() != null) {
token = this.getLocalStorage().token; token = this.getLocalStorage().token;
key = this.getLocalStorage().SecretKey; key = this.getLocalStorage().SecretKey;
...@@ -387,7 +370,8 @@ export default { ...@@ -387,7 +370,8 @@ export default {
"timestamp": timestamp, "timestamp": timestamp,
"token": token, "token": token,
"sign": md5Str, "sign": md5Str,
"uid": uid "uid": uid,
"groupId":groupId
} }
if(localStorage.g && localStorage.g!='undefined'){ if(localStorage.g && localStorage.g!='undefined'){
postData.groupId = parseInt(JSON.parse(localStorage.g).i) postData.groupId = parseInt(JSON.parse(localStorage.g).i)
......
src/router/config.js
View file @ 51412b57
...@@ -659,6 +659,14 @@ export default { ...@@ -659,6 +659,14 @@ export default {
title: '酒店每日用房详情' title: '酒店每日用房详情'
}, },
}, },
{
path: '/HotelsTeam',
name: 'HotelsTeam',
component: resolve => require(['@/components/Hotel/HotelsTeam'], resolve),
meta: {
title: '酒店对应团'
}
},
{ {
path: '/lineManagement', //线路管理 path: '/lineManagement', //线路管理
name: 'lineManagement', name: 'lineManagement',
......
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