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

src/components/Supplier/roomQuery2.vue

@@ -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" v-loading="HotelUseLoading">
+                  <table class="rq_HotelTable" v-loading="hotelLoading">
                     <tr>
                       <th width="200">
                         时间
@@ -84,13 +84,14 @@
                       <th width="120">
                         税入/税别
                       </th>
+                      <th>提醒</th>
+                      <th>备注</th>
                     </tr>
                     <template v-for="(subItem,subIndex) in HotelList">
                       <tbody>
                         <template v-for="(childItem,childIndex) in subItem.HotelOrderList">
                           <tr>
-                            <td v-if="childIndex==0"
-                              :rowspan="subItem.HotelOrderList.length>1?subItem.HotelOrderList.length*3:subItem.HotelOrderList.length+2"
+                            <td 
                               style="text-align:center;">
                               第{{subIndex+1}}天 <br />
                               {{subItem.UseTimeStr}}
@@ -119,32 +120,27 @@
                               <template v-if="childItem.TaxType==1">税入</template>
                               <template v-if="childItem.TaxType==2">税别</template>
                             </td>
-                          </tr>
-                          <tr>
-                            <td colspan="4">
-                              <span style="display:inline-block;width:60px;vertical-align:top;">提示信息：</span>
-                              <span style="display:inline-block;width:87%;">{{childItem.Remarks}}</span></td>
-                          </tr>
-                           <tr>
-                            <td>
-                              提醒等级
-                            </td>
                             <td>
+                              <!-- 提醒等级
                               <el-select class='w135 sel' v-model='childItem.SupplierToDmcHotelStatus'
                                 :placeholder="$t('pub.pleaseSel')">
                                 <el-option label='请选择' :value='0'></el-option>
                                 <el-option label='一般提醒' :value='1'></el-option>
                                 <el-option label='重要提醒' :value='2'></el-option>
-                              </el-select>
+                              </el-select> -->
                             </td>
                             <td>
                               对地接备注
-                            </td>
-                            <td>
                               <el-input type='textarea' class='w135' v-model='childItem.SupplierToDmcRemarks'>
                               </el-input>
                             </td>
                           </tr>
+                          <!-- <tr>
+                            <td colspan="4">
+                              <span style="display:inline-block;width:60px;vertical-align:top;">提示信息：</span>
+                              <span style="display:inline-block;width:87%;" :class="{'rq_disImNote':childItem.SupplierHotelStatus==1&&DateMinus(subItem.UseTimeStr)<=5,'rq_importNote':childItem.SupplierHotelStatus==2&&DateMinus(subItem.UseTimeStr)<=5}">{{childItem.Remarks}}</span>
+                          </td>
+                          </tr> -->
                         </template>
                       </tbody>
                     </template>
@@ -253,7 +249,7 @@
         //是否为今天
         isToday:false,
         todayDate:'',
-        showNum:0
+        showNum:0,
       }
     },
     methods: {
@@ -281,7 +277,6 @@
             this.Error(res.data.message)
           }
         }, err => {})
-
       },
       getList() {
         this.loading = true;
@@ -318,6 +313,7 @@
           this.hotelLoading = false;
           if (res.data.resultCode == 1) {
             this.HotelList = res.data.data;
+            console.log(this.HotelList,'hotellist')
           } else {
             this.Error(res.data.message);
           }
@@ -560,8 +556,10 @@
   background-color: red;
   border:1px solid #d1d1d1;
 }
-/* .rq_tBody tr:first-child td{
-  border-top-color: red;
-  border-left-color:red
-} */
+.rq_importNote{
+  color: red;
+}
+.rq_disImNote{
+  color: #ea6d6d;
+}
 </style>