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

src/components/EditTemplate.vue

@@ -193,7 +193,7 @@
           </select>
         </span>
         <span class="ql-formats" v-if="toolbar.fontColor||toolbar.fontBackgroundColor">
-          <span class="ql-color ql-picker ql-color-picker" v-if="toolbar.fontColor">
+          <span class="ql-color ql-picker ql-color-picker" v-if="toolbar.fontColor" style="display:none">
             <span class="ql-picker-label" tabindex="0" role="button" aria-expanded="false" aria-controls="ql-picker-options-35">
               <svg viewbox="0 0 18 18">
                 <line class="ql-color-label ql-stroke ql-transparent" x1="3" x2="15" y1="15" y2="15"></line>
@@ -237,7 +237,7 @@
                 tabindex="0" role="button" class="ql-picker-item" data-value="#002966" style="background-color: rgb(0, 41, 102);"></span><span
                 tabindex="0" role="button" class="ql-picker-item" data-value="#3d1466" style="background-color: rgb(61, 20, 102);"></span></span>
           </span>
-          <select class="ql-color" style="display: none;" v-if="toolbar.fontColor">
+          <select class="ql-color" v-if="toolbar.fontColor">
             <option selected="selected"></option>
             <option value="#e60000"></option>
             <option value="#ff9900"></option>
@@ -273,8 +273,8 @@
             <option value="#003700"></option>
             <option value="#002966"></option>
             <option value="#3d1466"></option>
-          </select>
-          <span class="ql-background ql-picker ql-color-picker" v-if="toolbar.fontBackgroundColor">
+          </select> 
+          <span class="ql-background ql-picker ql-color-picker" v-if="toolbar.fontBackgroundColor" style="display:none;">
             <span class="ql-picker-label" tabindex="0" role="button" aria-expanded="false" aria-controls="ql-picker-options-36">
               <svg viewbox="0 0 18 18">
                 <g class="ql-fill ql-color-label">
@@ -365,7 +365,7 @@
                 tabindex="0" role="button" class="ql-picker-item" data-value="#002966" style="background-color: rgb(0, 41, 102);"></span><span
                 tabindex="0" role="button" class="ql-picker-item" data-value="#3d1466" style="background-color: rgb(61, 20, 102);"></span></span>
           </span>
-          <select class="ql-background" style="display: none;" v-if="toolbar.fontBackgroundColor">
+          <select class="ql-background" v-if="toolbar.fontBackgroundColor">
             <option value="#000000"></option>
             <option value="#e60000"></option>
             <option value="#ff9900"></option>

src/components/SalesModule/addPassenger.vue

@@ -302,7 +302,7 @@
                 <el-option v-for="item in roomlist" :key="item.ID" :label="item.HouseInfo" :value="item.ID">
                 </el-option>
               </el-select>
-              <input type="button" value="新增" class="normalBtn" @click="addhouse()" />
+              <input type="button" value="新增房间" class="normalBtn" @click="addhouse()" title="需要拼房，但没有双人间（半间）的点击新增房间"/>
             </el-form-item>
           </li>
           <li>

src/components/SalesModule/groupTourOrder.vue

@@ -1723,8 +1723,11 @@
                       <div
                         @click='Discount(item.tcid),SOMsg.OrderId = item.orderId,SOMsg.OrderUnitPrice  = item.unit_Price'>
                         申请优惠</div>
-                      <div v-if="item.isOrder=='1'&&(item.orderState=='1'||item.orderState=='2'||item.orderState=='3')"
-                        @click='deleteItem(item)'>取消
+                      <div v-if="item.isOrder=='1'&&(item.orderState=='1'||item.orderState=='2'||item.orderState=='3') && item.isCanClear==0"
+                       @click='deleteItem(item)'>取消
+                      </div>
+                      <div v-if="item.isOrder=='1'&&(item.orderState=='1'||item.orderState=='2'||item.orderState=='3') && item.isCanClear==1" title="如需取消订单清联系OP" style="color:red;">
+                         订单已确认,取消请联系OP
                       </div>
 
                     </div>

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -1735,7 +1735,10 @@
                       </div>
                       <div v-if="item.orderState==2" @click='Discount(item.tcid),SOMsg.OrderId = item.orderId,SOMsg.OrderUnitPrice  = item.unit_Price'>申请优惠</div>
 
-                      <div v-if="item.isOrder=='1'&&(item.orderState=='1'||item.orderState=='2'||item.orderState=='3')" @click='deleteItem(item)'>取消</div>
+                      <div v-if="item.isOrder=='1'&&(item.orderState=='1'||item.orderState=='2'||item.orderState=='3')&& item.isCanClear==0" @click='deleteItem(item)'>取消</div>
+                      <div v-if="item.isOrder=='1'&&(item.orderState=='1'||item.orderState=='2'||item.orderState=='3') && item.isCanClear==1" title="如需取消订单清联系OP" style="color:red;">
+                          订单已确认,取消请联系OP
+                      </div>
                     </div>
                     <el-button slot="reference" type="primary" style='background:#297BEF; border-color:#297BEF;border-top-left-radius: 0;border-bottom-left-radius: 0;' icon="iconfont icon-more"></el-button>
                   </el-popover>

src/components/SalesModule/passengerSaleList.vue

@@ -67,7 +67,7 @@
         </tbody>
         <tbody v-show="tableList.length===0" class="passengerSaleList_table_noInfo">
           <tr>
-            <td colspan="17" class="">暂无数据</td>
+            <td colspan="18" class="">暂无数据</td>
           </tr>
         </tbody>
       </table>

src/components/Supplier/roomQuery2.vue

@@ -5,15 +5,12 @@
         <li>
           <span>
             <em>月份</em>
-            <el-date-picker
-              v-model="msg.Month"
-              type="month"
-              placeholder="选择月">
+            <el-date-picker v-model="msg.Month" type="month" placeholder="选择月">
             </el-date-picker>
-        </span>
+          </span>
         </li>
         <li style="position:absolute;right:10px;top:0;">
-          <input type="button" class="normalBtn" value="查询" @click="getList();resetPageIndex()" />
+          <input type="button" class="normalBtn" value="查询" @click="getList()" />
           <input type="button" class="normalBtn" value="下载" @click="DownLoadHotel()" />
         </li>
       </ul>
@@ -28,21 +25,109 @@
       </div><br />
       <table border="0" cellspacing="1" cellpadding="0" class="roomQuery_SupplierTable" v-loading='loading'>
         <tr>
-          <th width="100">序号</th>
-          <th width="120">出发地</th>
+          <th width="100">订团号</th>
           <th width="100">公司团号</th>
-          <th width="80">团队状态</th>
-          <th width="100">系列</th>
-          <th width="120">机位总数<br />(Y/E/F)</th>
-          <th width="100">时间</th>
-          <th width="150">酒店</th>
-          <th width="100">酒店使用情况</th>
-          <th width="100">操作</th>
+          <th width="100">航班</th>
+          <th width="120">机位总数</th>
+          <th width="100">当前人数</th>
+          <th width="100">导游</th>
+          <th width="100">领队</th>
+          <th width="150">酒店详情</th>
         </tr>
-      
+        <tbody v-for="(item,index) in dataList">
+          <tr>
+            <td>
+              {{item.NewCombinationNum}}
+            </td>
+            <td>
+              {{item.TCNUMS}}({{item.TCID}})
+            </td>
+            <td>
+              <template v-for="(subItem,subIndex) in item.FlightList2">
+                <span class="roomNowrap"><span class="roomFlightNumber">{{subItem.Flight_number}}</span> {{subItem.TicketDepartureTime}} {{subItem.DepartureName}}({{subItem.DIATA}})
+                {{subItem.TicketArrivalTime}} {{subItem.ArrivalCityName}}({{subItem.AIATA}})</span>
+              </template>
+            </td>
+            <td>
+              {{item.TotalSeat}}
+            </td>
+            <td>
+              {{item.RealNum}}
+            </td>
+            <td>
+              {{item.GuideName}} <template v-if="item.GuideTel">(电话: {{item.GuideTel}})</template>
+            </td>
+            <td>
+              {{item.LeaderName}} <template v-if="item.LeaderTel">(电话: {{item.LeaderTel}})</template>
+            </td>
+            <td>
+              <el-tooltip class="item" effect="dark" content="酒店信息" placement="top-start">
+                <el-popover placement="bottom" width="500" trigger="click" popper-class="rq_HotelDetails">
+                  <table class="rq_HotelTable">
+                    <tr>
+                      <th width="160">
+                        时间
+                      </th>
+                      <th width="200">
+                        酒店
+                      </th>
+                      <th width="200">
+                        更换名称
+                      </th>
+                      <th width="250">
+                        价格
+                      </th>
+                    </tr>
+                    <template v-for="(subItem,subIndex) in HotelList">
+                       <tbody  v-for="(childItem,childIndex) in subItem.HotelOrderList">
+                          <tr>
+                             <td v-if="childIndex==0" :rowspan="subItem.HotelOrderList.length">
+                               第{{subIndex+1}}天<br/>
+                               {{subItem.UseTimeStr}}
+                             </td>
+                             <td>
+                                {{childItem.HotelName}}
+                             </td>
+                               <td>
+                                {{childItem.NewHotelName}}
+                             </td>
+                             <td>
+                                 <template v-for="(detailsItem,detailsIndex) in childItem.OrderDetailsList" v-if="detailsItem.HouseTypeCount>0" >
+                                    <template v-if="detailsItem.HouseType==1">单间</template>
+                                    <template v-if="detailsItem.HouseType==2">标准双人间</template>
+                                    <template v-if="detailsItem.HouseType==3">大床房</template>
+                                    <template v-if="detailsItem.HouseType==4">三人间</template>
+                                    <template v-if="detailsItem.HouseType==4">司导间</template>
+                                    {{detailsItem.HouseTypeCount}} 间
+                                    价格: {{detailsItem.UnitPrice}} 
+                                    税入/税别
+                                    返佣: {{detailsItem.RebateRatio}}
+                                    <br/>
+                                 </template>
+                             </td>
+                          </tr>
+                          <tr >
+                            <td colspan="4">
+                              <span style="display:inline-block;width:40px;vertical-align:top;">备注：</span>
+                              <span style="display:inline-block;width:400px;">{{childItem.Remarks}}</span></td>
+                          </tr>
+                       </tbody>
+                    </template>
+                  </table>
+                  <a class="hotelLink" slot="reference" @click="getHotelList(item.TCID,item.NewCombinationNum)">酒店使用情况</a>
+                </el-popover>
+              </el-tooltip>
+            </td>
+          </tr>
+          <tr>
+            <td colspan="5" style="text-align:left;padding-left:5px;">
+              注意事项: {{item.SupplierRemarks}}
+            </td>
+          </tr>
+        </tbody>
       </table>
     </div>
-  
+
   </div>
 </template>
 <script>
@@ -50,6 +135,7 @@
     data() {
       return {
         loading: false,
+        hotelLoading:false,
         total: 0,
         msg: {
           pageIndex: 1,
@@ -74,15 +160,9 @@
           CombinationNum: '',
           Month: "" //月份字符串
         },
-        UserInfo: {},
-        //分公司类表
-        companyList: [],
-        //酒店列表
-        HotelList: [],
-        LineList: [],
-        LineTeamList: [],
-        thLengthTitle: [],
-        dataList: [],
+        UserInfo: {}, //用户信息
+        dataList: [], //数据列表
+        HotelList: [], //酒店列表
         //日志信息
         LogsList: [],
         queryLogMsg: {
@@ -93,22 +173,9 @@
           HotelId: 0,
           TCID: 0
         },
-        queryCommonData: {
-          //公司数据
-          BranchList: [],
-          //国家
-          PlaceList: [],
-          LineList: [],
-          LineTeamList: [],
-          AirlineList: [],
-          EmployeeList: [],
-        },
-        //当前酒店列表
-        CurrentHotelList: [],
- 
       }
     },
-    methods: { 
+    methods: {
       //获取日志
       getLogsList(TCID) {
         // if (TCID) {
@@ -125,16 +192,29 @@
         this.loading = true;
         this.ApiPost2('dmcstatistics_post_GetUniteCombinationNumService_Supplier_V2', this.msg, res => {
           this.loading = false;
-          console.log(res.data);
           if (res.data.resultCode == 1) {
-      
-            // this.total = res.data.data.count;
-            // this.dataList = res.data.data.pageData;
+            this.dataList = res.data.data;
           } else {
             this.$message.error(res.data.message)
           }
         }, err => {})
       },
+      //获取日志
+      getHotelList(TCID, NewCombinationNum) {
+        this.hotelLoading=true;
+        this.HotelList = [];
+        var qMsg = {
+          TCID: TCID,
+          NewCombinationNum: NewCombinationNum
+        };
+        this.ApiPost2('dmcstatistics_post_GetSupplierHotelListService', qMsg, res => {
+          this.hotelLoading=false;
+          if (res.data.resultCode == 1) {
+            this.HotelList = res.data.data;
+             console.log("this.HotelList",this.HotelList);
+          }
+        }, err => {})
+      },
       //下载Excel
       DownLoadHotel() {
         this.loading = true;
@@ -159,17 +239,7 @@
         parseInt(myDate.getMonth() + 1) +
         "-" +
         myDate.getDate();
-      if (this.$route.query.hotelId) {
-        this.msg.HotelId = this.$route.query.hotelId;
-      }
-      if (this.$route.query.dateStr) {
-        this.msg.DateStr = this.$route.query.dateStr;
-      }
-      if (this.$route.query.hotelId || this.$route.query.dateStr) {
-        this.msg.StartDate = "";
-      } else {
-        this.msg.StartDate = nowDate;
-      }
+      this.msg.Month = myDate.getFullYear() + "-" + parseInt(myDate.getMonth() + 1);
       this.getList();
     },
   }
@@ -243,4 +313,27 @@
     background-color: red;
   }
 
+  .roomQuery .hotelLink {
+    color: blue;
+    text-decoration: underline;
+    cursor: pointer;
+  }
+  .roomQuery .roomNowrap{
+    white-space: nowrap;
+    margin-bottom:5px;
+    display: block;
+    text-align: left;
+    padding-left:20px;
+  }
+  .roomQuery .roomFlightNumber{
+    color:#FF0066;
+    font-weight: bold;
+  }
+ .rq_HotelTable { padding: 10px 0 0 20px; background-color: #ededed; border-collapse: collapse; border: 1px solid #d2d2d2; font-size: 12px;}
+ .rq_HotelTable th { background-color: #ededed; padding: 5px 10px;}
+ .rq_HotelTable td { background-color: #ffffff; padding: 9px 10px;color: #333333;border: 1px solid #d2d2d2;}
+ .rq_HotelDetails{
+  max-height:400px;
+  overflow: auto;
+}
 </style>

src/components/activity/IntegralMall.vue

@@ -54,6 +54,7 @@
       <tr>
         <th width='80'>商品编号</th>
         <th>商品名称</th>
+        <th>商品数量</th>
         <th>购买等级要求</th>
         <th>价格</th>
         <th>市场价</th>
@@ -66,6 +67,7 @@
       <tr v-for="item in dataList">
          <td>{{item.id}}</td>
          <td>{{item.name}}</td>
+         <td>{{item.storeNum}}</td>
          <td>{{item.isReqRate === -1 ? '不限' : `${item.isReqRate}级`}}</td>
          <td>{{item.price}}{{item.priceUnit === 1 ? '人民币' : '积分'}}</td>
          <td>{{item.marketPrice}}</td>

src/components/activity/addIntegralMall.vue

@@ -194,6 +194,9 @@
 .addIntegralMall .bottom_sub {
   padding-top: 25px;
 }
+.addIntegralMall .ql-editor{
+  min-height: 200px;
+}
 </style>
 <template>
   <el-row class="addIntegralMall">
@@ -240,6 +243,9 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="商品数量" prop="storeNum">
+          <el-input v-model="addMsg.storeNum" class="w217"/>
+        </el-form-item>
         <el-form-item label="商品状态">
           <el-select filterable v-model="addMsg.state">
             <el-option label="上架" :value="1" :key="1"></el-option>
@@ -313,8 +319,11 @@
         </div>
         <p class="tips tips2">最多上传5张图片</p>
         <span class="resource-lititle resource-lititle2">商品描述</span>
-        <quill-editor :options="editorOption" v-model="addMsg.description"></quill-editor>
-        <span class="resource-lititle resource-lititle2">图片介绍</span>
+
+        <my-edit v-on:edit-value="addMsg.description = arguments[0]" v-bind:editValue="addMsg.description"
+          v-bind:toolbarShow="toolbar" v-bind:placeholder="placeholder"></my-edit>
+          
+        <!-- <span class="resource-lititle resource-lititle2">图片介绍</span>
         <div class="resource-imglist clearfix">
           <div class="re-img re-img2" v-for="(item,index) in DiningImageArray2" :key="index">
             <img v-if="!item" src="../../assets/img/bg_c3@3x.png">
@@ -361,7 +370,7 @@
               </div>
             </div>
           </div>
-        </div>
+        </div> -->
       </div>
       <div class="bottom_sub">
         <button
@@ -378,9 +387,23 @@
 </template>
 <script>
 import { setInterval, setTimeout } from "timers";
+import MyEdit from "../EditTemplate.vue";
 export default {
   data() {
     return {
+      toolbar: {
+        clean: true, 
+        font: false, //字体
+        narrative: false, //叙述,
+        image:true,
+        bold: true, //加粗
+        underline: true, //下划线
+        header1: true, //H1
+        header2: true, //H2
+        fontColor: true, //字体颜色
+        fontBackgroundColor: true, //背景颜色
+      },
+      placeholder: "请输入内容",
       editorOption: {
         modules: {
           toolbar: [
@@ -410,6 +433,7 @@ export default {
         quota: 0,
         ishot: 0,
         descripImg: '',
+        storeNum:''
       },
       MenberList: [],
       GoodsTypeList: [],
@@ -431,7 +455,8 @@ export default {
         tradePeopleReq: [
           { required: true, message: "交易人头数要求", trigger: "blur" }
         ],
-        remark: [{ required: true, message: "请输入备注", trigger: "blur" }]
+        remark: [{ required: true, message: "请输入备注", trigger: "blur" }],
+        storeNum:[{ required: true, message: "请输入商品数量", trigger: "blur" }]
       },
       //上传的文件数组
       DiningImageArray: [],
@@ -446,6 +471,9 @@ export default {
       GoodsSeriesList: [],
     };
   },
+  components: {
+    "my-edit": MyEdit
+  },
   methods: {
     getGoodsSeries() {
       this.loading = true;

src/components/scenicSpot/scenicSpotList.vue

 <style>
   .scenicSpotList .clearfix:after {
-  content: "\0020";
-  display: block;
-  height: 0;
-  clear: both;
-}
-.scenicSpotList .hotelResource {
-  width: 100%;
-  min-height: 500px;
-  margin-top: 20px;
-}
-.scenicSpotList .resourceList {
-  width: 215px;
-  height: 240px;
-  background-color: #fff;
-  border: 1px dashed #ededed;
-  border-radius: 4px;
-  margin: 0 20px 20px 0;
-  font-size: 12px;
-  color: #333333;
-  float: left;
-}
-.scenicSpotList .resourceList:hover {
-  box-shadow: 0px 0px 20px rgba(191, 191, 191, 1);
-  transition: all linear 0.5s;
-}
-.scenicSpotList .reTopInfo {
-  width: 100%;
-  height: 123px;
-  position: relative;
-}
-.scenicSpotList .reTopInfo img {
-  position: absolute;
-  width: 100%;
-  height: 100%;
-  top: 0;
-  border-top-left-radius: 4px;
-  border-top-right-radius: 4px;
-}
-.scenicSpotList .resTypeList {
-  position: absolute;
-  top: 10px;
-  left: 10px;
-}
-.scenicSpotList .resTypeList span {
-  display: inline-block;
-  padding: 1px 5px;
-  border-radius: 10px;
-  color: #fff;
-  margin-right: 10px;
-}
-.scenicSpotList .L1 {
-  background-color: #e95252;
-}
-.scenicSpotList .L2 {
-  background-color: #47bf8c;
-}
-.scenicSpotList .L3 {
-  background-color: #2aaef2;
-}
-.scenicSpotList .L4 {
-  background-color: #9cf;
-}
-.scenicSpotList .L5 {
-  background-color: #00c6ff;
-  margin-top:5px;
-}
-
-.scenicSpotList .starSu {
-  position: absolute;
-  bottom: 8px;
-  right: 10px;
-  display: flex;
-}
-.scenicSpotList .starSu .star {
-  margin-left: 5px;
-}
-.scenicSpotList .sushe {
-  background-color: #ffc800;
-  display: inline-block;
-  padding: 1px 5px;
-  border-radius: 10px;
-  color: #fff;
-}
-.scenicSpotList .hotelTitle {
-  margin: 20px 16px 0 16px;
-  font-size: 14px;
-  color: #333333;
-  height: 20px;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-.scenicSpotList .brandList i {
-  position: relative;
-  top: 2px;
-}
-.scenicSpotList .brand {
-  float: left;
-  width: 49%;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  text-align: center;
-}
-.scenicSpotList .dayNum {
-  float: right;
-  text-align: center;
-  width: 50%;
-}
-.scenicSpotList .iconfont {
-  margin-right: 5px;
-}
-.scenicSpotList .dieline {
-  color: #2aaef2;
-  font-size: 14px;
-  top: 1px !important;
-}
-.scenicSpotList .AddressInner {
-  float: right;
-  width: 160px;
-  height: 18px;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  display: -webkit-box;
-  -webkit-line-clamp: 1;
-  -webkit-box-orient: vertical;
-}
-.scenicSpotList .btnList {
-  margin-top: 20px;
-  text-align: center;
-}
-.scenicSpotList .hotelBtn {
-  width: 80px;
-  height: 28px;
-  background: #f76f6f;
-  border-radius: 14px;
-  color: #fff;
-  cursor: pointer;
-}
-.scenicSpotList .hotelBtn:first-child {
-  margin-right: 19px;
-}
-.scenicSpotList .w150 .el-input {
-  width: 150px !important;
-}
-.scenicSpotList .SupportCount {
-  color: #4bca81;
-  font-size: 18px;
-  font-weight: bold;
-  margin: 0 5px 5px 0;
-  display: inline-block;
-}
-.scenicSpotList .dayNumber {
-  color: #2aaef2;
-  font-size: 18px;
-  font-weight: bold;
-  margin: 0 5px 5px 5px;
-  display: inline-block;
-}
-.scenicSpotList .line {
-  float: left;
-  width: 1px;
-  height: 35px;
-  background-color: #ededed;
-  margin-top: 6px;
-}
-.scenicSpotList .foodList {
-  display: inline-block;
-  padding: 1px 5px;
-  background-color: #ff9c00;
-  color: #fff;
-  margin-right: 6px;
-  border-radius: 2px;
-}
-.scenicSpotList .foodList:last-child {
-  margin-right: 0;
-}
-.scenicSpotList .delScien {
-  position: absolute;
-  right: 10px;
-  top: 10px;
-  display: none;
-}
-.scenicSpotList .delScien:hover {
-  color: #f76f6f;
-  cursor: pointer;
-}
-.scenicSpotList .resourceList:hover .delScien {
-  display: block;
-}
-.scenicSpotList .comCursorUrl {
-  cursor: pointer;
-}
-/* 景区列表 */
+    content: "\0020";
+    display: block;
+    height: 0;
+    clear: both;
+  }
+
+  .scenicSpotList .hotelResource {
+    width: 100%;
+    min-height: 500px;
+    margin-top: 20px;
+  }
+
+  .scenicSpotList .resourceList {
+    width: 215px;
+    height: 240px;
+    background-color: #fff;
+    border: 1px dashed #ededed;
+    border-radius: 4px;
+    margin: 0 20px 20px 0;
+    font-size: 12px;
+    color: #333333;
+    float: left;
+  }
+
+  .scenicSpotList .resourceList:hover {
+    box-shadow: 0px 0px 20px rgba(191, 191, 191, 1);
+    transition: all linear 0.5s;
+  }
+
+  .scenicSpotList .reTopInfo {
+    width: 100%;
+    height: 123px;
+    position: relative;
+  }
+
+  .scenicSpotList .reTopInfo img {
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    top: 0;
+    border-top-left-radius: 4px;
+    border-top-right-radius: 4px;
+  }
+
+  .scenicSpotList .resTypeList {
+    position: absolute;
+    top: 10px;
+    left: 10px;
+  }
+
+  .scenicSpotList .resTypeList span {
+    display: inline-block;
+    padding: 1px 5px;
+    border-radius: 10px;
+    color: #fff;
+    margin-right: 10px;
+  }
+
+  .scenicSpotList .L1 {
+    background-color: #e95252;
+  }
+
+  .scenicSpotList .L2 {
+    background-color: #47bf8c;
+  }
+
+  .scenicSpotList .L3 {
+    background-color: #2aaef2;
+  }
+
+  .scenicSpotList .L4 {
+    background-color: #9cf;
+  }
+
+  .scenicSpotList .L5 {
+    background-color: #00c6ff;
+    margin-top: 5px;
+  }
+
+  .scenicSpotList .starSu {
+    position: absolute;
+    bottom: 8px;
+    right: 10px;
+    display: flex;
+  }
+
+  .scenicSpotList .starSu .star {
+    margin-left: 5px;
+  }
+
+  .scenicSpotList .sushe {
+    background-color: #ffc800;
+    display: inline-block;
+    padding: 1px 5px;
+    border-radius: 10px;
+    color: #fff;
+  }
+
+  .scenicSpotList .hotelTitle {
+    margin: 20px 16px 0 16px;
+    font-size: 14px;
+    color: #333333;
+    height: 20px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+
+  .scenicSpotList .brandList i {
+    position: relative;
+    top: 2px;
+  }
+
+  .scenicSpotList .brand {
+    float: left;
+    width: 49%;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    text-align: center;
+  }
+
+  .scenicSpotList .dayNum {
+    float: right;
+    text-align: center;
+    width: 50%;
+  }
+
+  .scenicSpotList .iconfont {
+    margin-right: 5px;
+  }
+
+  .scenicSpotList .dieline {
+    color: #2aaef2;
+    font-size: 14px;
+    top: 1px !important;
+  }
+
+  .scenicSpotList .AddressInner {
+    float: right;
+    width: 160px;
+    height: 18px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-line-clamp: 1;
+    -webkit-box-orient: vertical;
+  }
+
+  .scenicSpotList .btnList {
+    margin-top: 20px;
+    text-align: center;
+  }
+
+  .scenicSpotList .hotelBtn {
+    width: 80px;
+    height: 28px;
+    background: #f76f6f;
+    border-radius: 14px;
+    color: #fff;
+    cursor: pointer;
+  }
+
+  .scenicSpotList .hotelBtn:first-child {
+    margin-right: 19px;
+  }
+
+  .scenicSpotList .w150 .el-input {
+    width: 150px !important;
+  }
+
+  .scenicSpotList .SupportCount {
+    color: #4bca81;
+    font-size: 18px;
+    font-weight: bold;
+    margin: 0 5px 5px 0;
+    display: inline-block;
+  }
+
+  .scenicSpotList .dayNumber {
+    color: #2aaef2;
+    font-size: 18px;
+    font-weight: bold;
+    margin: 0 5px 5px 5px;
+    display: inline-block;
+  }
+
+  .scenicSpotList .line {
+    float: left;
+    width: 1px;
+    height: 35px;
+    background-color: #ededed;
+    margin-top: 6px;
+  }
+
+  .scenicSpotList .foodList {
+    display: inline-block;
+    padding: 1px 5px;
+    background-color: #ff9c00;
+    color: #fff;
+    margin-right: 6px;
+    border-radius: 2px;
+  }
+
+  .scenicSpotList .foodList:last-child {
+    margin-right: 0;
+  }
+
+  .scenicSpotList .delScien {
+    position: absolute;
+    right: 10px;
+    top: 10px;
+    display: none;
+  }
+
+  .scenicSpotList .delScien:hover {
+    color: #f76f6f;
+    cursor: pointer;
+  }
+
+  .scenicSpotList .resourceList:hover .delScien {
+    display: block;
+  }
+
+  .scenicSpotList .comCursorUrl {
+    cursor: pointer;
+  }
+
+  /* 景区列表 */
+
 </style>
 <template>
   <div class="flexOne scenicSpotList">
@@ -202,71 +238,27 @@
         <li>
           <span class="hotel_name">
             <em>{{$t('scen.sc_resName')}}</em>
-            <el-input
-              maxlength="50"
-              @keyup.native.enter="resetPageIndex(),selectResource()"
-              v-model="msg.Name"
-            ></el-input>
+            <el-input maxlength="50" @keyup.native.enter="resetPageIndex(),selectResource()" v-model="msg.Name">
+            </el-input>
           </span>
         </li>
         <li>
           <span>
             <em>{{$t('system.quety_area')}}</em>
-            <el-select
-              v-model="msg.QCountry"
-              clearable
-              class="w150"
-              filterable
-              @change="getProvinceList(msg.QCountry,1)"
-              :placeholder="$t('hotel.hotel_country')"
-            >
-              <el-option
-                v-for="item in countryList"
-                :key="item.ID"
-                :label="item.Name"
-                :value="item.ID"
-              ></el-option>
+            <el-select v-model="msg.QCountry" clearable class="w150" filterable
+              @change="getProvinceList(msg.QCountry,1)" :placeholder="$t('hotel.hotel_country')">
+              <el-option v-for="item in countryList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
             </el-select>
-            <el-select
-              v-model="msg.QProvince"
-              class="w150"
-              filterable
-              @change="getProvinceList(msg.QProvince,2)"
-              :placeholder="$t('hotel.hotel_province')"
-            >
-              <el-option
-                v-for="item in provinceList"
-                :key="item.ID"
-                :label="item.Name"
-                :value="item.ID"
-              ></el-option>
+            <el-select v-model="msg.QProvince" class="w150" filterable @change="getProvinceList(msg.QProvince,2)"
+              :placeholder="$t('hotel.hotel_province')">
+              <el-option v-for="item in provinceList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
             </el-select>
-            <el-select
-              v-model="msg.QCity"
-              class="w150"
-              filterable
-              @change="getProvinceList(msg.QCity,3)"
-              :placeholder="$t('hotel.hotel_city')"
-            >
-              <el-option
-                v-for="item in cityList"
-                :key="item.ID"
-                :label="item.Name"
-                :value="item.ID"
-              ></el-option>
+            <el-select v-model="msg.QCity" class="w150" filterable @change="getProvinceList(msg.QCity,3)"
+              :placeholder="$t('hotel.hotel_city')">
+              <el-option v-for="item in cityList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
             </el-select>
-            <el-select
-              v-model="msg.QDistrict"
-              class="w150"
-              filterable
-              :placeholder="$t('hotel.hotel_area')"
-            >
-              <el-option
-                v-for="item in district"
-                :key="item.ID"
-                :label="item.Name"
-                :value="item.ID"
-              ></el-option>
+            <el-select v-model="msg.QDistrict" class="w150" filterable :placeholder="$t('hotel.hotel_area')">
+              <el-option v-for="item in district" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
             </el-select>
           </span>
         </li>
@@ -275,19 +267,14 @@
             <em>{{$t('hotel.hotel_status')}}</em>
             <el-select v-model="msg.Status" class="w210" :placeholder="$t('pub.unlimitedSel')">
               <el-option :label="$t('pub.unlimitedSel')" value="-1"></el-option>
-              <el-option
-                v-for="item in status"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              ></el-option>
+              <el-option v-for="item in status" :key="item.value" :label="item.label" :value="item.value"></el-option>
             </el-select>
           </span>
         </li>
-           <li>
+        <li>
           <span>
             <em>门票总类</em>
-              <el-select v-model="msg.IsFree" class='multiple_input w210' :placeholder="$t('pub.pleaseSel')">
+            <el-select v-model="msg.IsFree" class='multiple_input w210' :placeholder="$t('pub.pleaseSel')">
               <!-- <el-option :label="$t('pub.unlimitedSel')" :value='-1'></el-option> -->
               <el-option v-for="item in IsFreeList" :key="item.value" :label="item.label" :value="item.value">
               </el-option>
@@ -295,16 +282,11 @@
           </span>
         </li>
         <li>
-          <button
-            class="hollowFixedBtn"
-            type="button"
-            @click="resetPageIndex(),selectResource()"
-          >{{$t('pub.searchBtn')}}</button>
-          <button
-            class="normalBtn"
-            type="button"
-            @click="$router.push('scenicSpotInfoManage')"
-          >{{$t('pub.addBtn')}}</button>
+          <button class="hollowFixedBtn" type="button"
+            @click="resetPageIndex(),selectResource()">{{$t('pub.searchBtn')}}</button>
+          <button class="normalBtn" type="button"
+            @click="$router.push('scenicSpotInfoManage')">{{$t('pub.addBtn')}}</button>
+          <button class="hollowFixedBtn" type="button" @click="DownLoadFile()">下载</button>
         </li>
       </ul>
     </div>
@@ -314,24 +296,17 @@
           <img v-if="!item.PicPath" src="../../assets/img/bg_c3@3x.png">
           <img v-else :src='compressImg(item.PicPath, "filt", 213, "")' :onerror="defaultImg">
           <div class="resTypeList">
-            <span
-              v-for="(items,index) in item.OpenPlatformList"
+            <span v-for="(items,index) in item.OpenPlatformList"
               :class="{'L1':items.ID==1,'L2':items.ID==2,'L3':items.ID==3,'L4':items.ID==4,'L5':items.ID==5}"
-              :key="index"
-            >{{items.Name}}</span>
+              :key="index">{{items.Name}}</span>
           </div>
           <div class="delScien" @click.stop="isdelete(item.ID)">
             <i class="iconfont icon-xingzhuang"></i>
           </div>
           <div class="starSu">
             <div class="star" v-if="item.newAr[0].Aname!=''" v-for="(items,index) in item.newAr">
-              <el-tooltip
-                class="item"
-                effect="dark"
-                :content="items.Bname"
-                placement="bottom-start"
-                popper-class="max-w250"
-              >
+              <el-tooltip class="item" effect="dark" :content="items.Bname" placement="bottom-start"
+                popper-class="max-w250">
                 <span class="foodList" :key="items.subCode" v-if="index<3">{{items.Aname}}</span>
               </el-tooltip>
             </div>
@@ -339,33 +314,18 @@
             <span v-if="item.Star==9" class="sushe">{{$t('restaurant.res_SpringHotel')}}</span>
           </div>
         </div>
-        <el-tooltip
-          class="item"
-          effect="dark"
-          :content="item.Name"
-          placement="top-start"
-          popper-class="max-w250"
-        >
+        <el-tooltip class="item" effect="dark" :content="item.Name" placement="top-start" popper-class="max-w250">
           <div class="hotelTitle">{{item.Name}}</div>
         </el-tooltip>
         <div class="btnList">
-          <button
-            @click="goUrl('scenicSpotInfoManage',item.ID)"
-            class="hotelBtn"
-          >{{$t('pub.updateMsg')}}</button>
+          <button @click="goUrl('scenicSpotInfoManage',item.ID)" class="hotelBtn">{{$t('pub.updateMsg')}}</button>
           <button @click="goUrlT('ticketManagement',item.ID)" class="hotelBtn">{{$t('scen.sc_piao')}}</button>
         </div>
       </div>
       <div class="noData" v-show="noData">{{$t('system.content_noData')}}</div>
     </div>
-    <el-pagination
-      background
-      @current-change="handleCurrentChange"
-      :current-page.sync="msg.currentPage"
-      :page-size="msg.pageSize"
-      layout="total,prev, pager, next, jumper"
-      :total="msg.total"
-    ></el-pagination>
+    <el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.currentPage"
+      :page-size="msg.pageSize" layout="total,prev, pager, next, jumper" :total="msg.total"></el-pagination>
   </div>
 </template>
 <script>
@@ -389,10 +349,10 @@
             label: "删除"
           }
         ],
-           IsFreeList: [{
+        IsFreeList: [{
             value: "-1",
             label: "不限"
-          },{
+          }, {
             value: "0",
             label: "免费"
           },
@@ -407,7 +367,7 @@
           pageIndex: 1,
           pageSize: 14,
           Name: "",
-          IsFree:"-1",
+          IsFree: "-1",
           QCountry: "",
           QProvince: "",
           QCity: "",
@@ -489,6 +449,23 @@
           );
         });
       },
+      DownLoadFile() {
+        this.loading = true;
+        let myDate = new Date();
+        let _year = myDate.getFullYear();
+        let _month = myDate.getMonth() >= 9 ? myDate.getMonth() + 1 : '0' + (myDate.getMonth() + 1);
+        let _date = myDate.getDate() > 9 ? myDate.getDate() : '0' + myDate.getDate();
+        let _hours = myDate.getHours() > 9 ? myDate.getHours() : '0' + myDate.getHours();
+        let _minutes = myDate.getMinutes() > 9 ? myDate.getMinutes() : '0' + myDate.getMinutes();
+        let _seconds = myDate.getSeconds() > 9 ? myDate.getSeconds() : '0' + myDate.getSeconds();
+        let downDate = _year + _month + _date + _hours + _minutes + _seconds;
+
+        var fileName = "景点价格信息" + downDate + ".xls";
+        this.GetLocalFile("dmcstatistics_post_GetTicketCouponsExport", this.msg, fileName,
+          res => {
+            this.loading = false;
+          });
+      },
       selectResource() {
         this.loading = true;
         if (this.msg.Status == "") {
@@ -530,18 +507,18 @@
           path: path,
           query: {
             id: id,
-            blank:'y',
-            tab:'修改景区信息'
+            blank: 'y',
+            tab: '修改景区信息'
           }
         });
       },
-      goUrlT(path, id){
+      goUrlT(path, id) {
         this.$router.push({
           path: path,
           query: {
             id: id,
-            blank:'y',
-            tab:'门票管理'
+            blank: 'y',
+            tab: '门票管理'
           }
         });
 
@@ -563,4 +540,5 @@
       this.selectResource();
     }
   };
+
 </script>