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

src/App.vue

@@ -173,7 +173,7 @@ export default {
 }
 </script>
 <style>
-  @import "//at.alicdn.com/t/font_635492_4ra0qfyvnej.css";
+  @import "//at.alicdn.com/t/font_635492_qywlhd3a0cr.css";
   @import "./assets/css/Semibold.css";
   @import "./assets/css/global/config.css";
   @import "./assets/css/fileIcon.css";

src/components/TravelManager/TravelList/PriceHotelWorkList.vue

+<style>
+  .HotelWorkP{
+    display: inline-block;
+    text-decoration: underline;
+    cursor: pointer;
+  }
+</style>
+
 <template>
   <div class="PriceHotelWorkList">
     <div class="query-box" style="border-bottom: none;">
@@ -37,7 +45,7 @@
               :picker-options="pickerBeginDateAfter"></el-date-picker>
           </span>
         </li>
-        <li style="display：none;"><span>
+        <li style="display:none;"><span>
             <em>状态</em>
             <el-select v-model='msg.PriceStatus'>
               <el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
@@ -127,8 +135,13 @@
             <template v-for="(subItem,subIndex) in item.HotelOrderListReports">
               <template v-for="(childItem,childIndex) in subItem.SubList">
                 <tr>
-                  <td :rowspan="item.rootRowspan" v-if='subIndex==0&&childIndex==0'>{{item.LtName}}</td>
-                  <td :rowspan="item.rootRowspan" v-if='subIndex==0&&childIndex==0'>{{item.TCNUM}}({{item.TCID}})</td>
+                  <td :rowspan="item.rootRowspan" v-if='subIndex==0&&childIndex==0'>
+                    <div>出团公司：{{item.OutBranchName}}</div>
+                    <div>{{item.LtName}}</div>
+                  </td>
+                  <td :rowspan="item.rootRowspan" v-if='subIndex==0&&childIndex==0'>
+                    <p class="HotelWorkP" @click="goUrlT('TravelControlList',item.TCNUM,'团控列表')">{{item.TCNUM}}({{item.TCID}})</p>
+                  </td>
                   <td :rowspan="item.rootRowspan" v-if='subIndex==0&&childIndex==0'>{{item.DMCNum}} </td>
                   <td :rowspan="item.rootRowspan" v-if='subIndex==0&&childIndex==0'
                     style="text-align:left; padding-left:5px;">
@@ -142,7 +155,7 @@
                   </td>
                   <td>
                     <template v-if="childItem.HotelName!=childItem.NewHotelName && childItem.NewHotelName!=''">
-                      <span style="text-decoration:line-through red solid"> {{childItem.HotelName}}</span>
+                      <span style="text-decoration:line-through;"> {{childItem.HotelName}}</span>
                     </template>
                     <template v-else>
                       {{childItem.HotelName}}
@@ -306,7 +319,9 @@
           DayNum: obj.DayNum,
           HotelId: obj.ID
         };
+        this.loading=true;
         this.apipost("travel_post_SavePriceHotelService", nMsg, res => {
+          this.loading=false;
           if (res.data.resultCode == 1) {
             this.Success(res.data.message);
             this.getList();
@@ -315,37 +330,11 @@
           }
         });
       },
-      goUrlR(path, obj, title) {
-        this.$router.push({
-          name: path,
-          query: {
-            "ID": obj,
-            blank: 'y',
-            tab: title
-          }
-        })
-      },
-      goUrlT(path, obj, title) {
-        this.$router.push({
-          name: path,
-          query: {
-            "id": obj,
-            blank: 'y',
-            tab: title
-          }
-        })
-      },
-      goUrl(path, obj, outItem, title) {
+      goUrlT(path, TCNUMS, title) {
         this.$router.push({
           name: path,
           query: {
-            "id": obj.TCIDS,
-            'TCNUM': obj.TCNUMS,
-            'flightTotal': obj.TotalSeat,
-            'GuestNum': obj.CommonReport.HouseStatistics.RealityNum,
-            'NewCombinationNum': outItem.NewCombinationNum,
-            'LeaderName': obj.LeaderName,
-            'GuideName': obj.GuideName,
+            tcmun: TCNUMS,
             blank: 'y',
             tab: title
           }
@@ -487,8 +476,8 @@
         parseInt(myDate.getMonth() + 1) +
         "-" +
         myDate.getDate();
-      //this.msg.StartGroupDate = nowDate;
-      this.msg.StartGroupDate='2019-12-05';
+      this.msg.StartGroupDate = nowDate;
+      //this.msg.StartGroupDate='2019-12-05';
       let width = window.innerWidth - 50;
       let height = window.innerHeight - 65 - 164;
       this.boxHeight = height;

src/components/commonPage/commonPriceHotelWork.vue

@@ -106,7 +106,7 @@
         this.HotelList = [];
         this.apipost('hotel_post_GetHasStockHotelList_V2', {
           //1-只查询有库存的酒店
-          IsMoreThanZero: 0,
+          IsMoreThanZero: 1,
           Country: "651",
           IsAllHotel: 1,
           Province: this.qMsg.ProvinceId,