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

src/components/Supplier/roomQuery2.vue

@@ -11,13 +11,13 @@
         </li>
         <li style="position:absolute;right:10px;top:0;">
           <input type="button" class="normalBtn" value="查询" @click="getList()" />
-          <input type="button" class="normalBtn" value="下载" @click="DownLoadHotel()" />
+          <input type="button" class="normalBtn" value="下载" style="display:none;" @click="DownLoadHotel()" />
         </li>
       </ul>
     </div>
     <div style="width: 100%;  overflow-x: auto;padding-bottom: 10px; " class="ownScrollbarStyle">
       <div style="font-size:12px;padding:2px 4px 3px 20px;">
-        <div style="display:inline-block;color:red">注意事项:每次导出数据最好不要超过一个月。</div>
+        <div style="display:inline-block;color:red;display:none">注意事项:每次导出数据最好不要超过一个月。</div>
         <div class="rq_comSpan" style="display:inline-block;">颜色说明:
           <span class="rq_span1">未操作</span><span class="rq_span2">操作中</span><span class="rq_span3">操作完成</span><span
             class="rq_span4">机位数和人数不相符</span>
@@ -67,7 +67,7 @@
             <td>
               <el-tooltip class="item" effect="dark" content="酒店信息" placement="top-start">
                 <el-popover placement="bottom" width="800" trigger="click" popper-class="rq_HotelDetails">
-                  <table class="rq_HotelTable">
+                  <table class="rq_HotelTable" v-loading="HotelUseLoading">
                     <tr>
                       <th width="200">
                         时间
@@ -151,7 +151,7 @@
                     <tfoot>
                       <tr>
                          <td colspan="5">
-                            <input type="button" value="保存" @click="saveSupplierjourneyorder" class="normalBtn SaveR_Btn" />
+                            <input type="button" value="保存" @click="saveSupplierjourneyorder(HotelList)" class="normalBtn SaveR_Btn" />
                          </td>
                       </tr>
                     </tfoot>
@@ -184,7 +184,7 @@
           </tr>
           <tr>
             <td colspan="8" style="text-align:left;padding-left:5px;">
-              <div class="rQ_HtList" v-if="item.IsBookTeam==2&&item.Numbers>0&&isShowCancle">
+              <div class="rQ_HtList" v-if="item.IsBookTeam==2&&item.Numbers>=0">
                   <span v-for="subItem in item.Numbers"></span>
               </div>
               <div>注意事项： {{item.SupplierRemarks}}</div>
@@ -207,6 +207,7 @@
       return {
         loading: false,
         hotelLoading: false,
+        HotelUseLoading:false,
         total: 0,
         msg: {
           pageIndex: 1,
@@ -252,8 +253,7 @@
         //是否为今天
         isToday:false,
         todayDate:'',
-        showNum:0,
-        isShowCancle:false,
+        showNum:0
       }
     },
     methods: {
@@ -270,8 +270,17 @@
         // }, err => {})
       },
       //保存信息
-      saveSupplierjourneyorder()
-      {
+      saveSupplierjourneyorder(HotelList){
+        this.HotelUseLoading = true;
+        this.ApiPost2('dmcstatistics_post_SetSupplierjourneyorderService', HotelList, res => {
+          this.HotelUseLoading = false;
+          if (res.data.resultCode == 1) {
+            this.Success(res.data.message)
+            this.getList();
+          } else {
+            this.Error(res.data.message)
+          }
+        }, err => {})
 
       },
       getList() {
@@ -295,11 +304,6 @@
       　　var now = new Date(); 
       　　var days = now.getTime()-sdate.getTime(); 
       　　var day = Math.abs(parseInt(days / (1000 * 60 * 60 * 24))); 
-          if(day<=5){
-            this.isShowCancle=true;
-          }else{
-            this.isShowCancle=false;
-          }
       　　return day; 
       },
       //获取酒店列表
@@ -310,7 +314,7 @@
           TCID: TCID,
           NewCombinationNum: NewCombinationNum
         };
-        this.ApiPost2('dmcstatistics_post_GetSupplierHotelListService', qMsg, res => {
+        this.ApiPost2('dmcstatistics_post_GetSupplierHotelListService_V2', qMsg, res => {
           this.hotelLoading = false;
           if (res.data.resultCode == 1) {
             this.HotelList = res.data.data;
@@ -556,4 +560,8 @@
   background-color: red;
   border:1px solid #d1d1d1;
 }
+/* .rq_tBody tr:first-child td{
+  border-top-color: red;
+  border-left-color:red
+} */
 </style>