修改

src/components/Supplier/roomQuery2.vue

@@ -5,7 +5,7 @@
         <li>
           <span>
             <em>月份</em>
-            <el-date-picker v-model="msg.QMonthStr" type="month" value-format="yyyy-MM-dd" placeholder="选择月">
+            <el-date-picker v-model="msg.QMonthStr" type="month" value-format="yyyy-MM" placeholder="选择月">
             </el-date-picker>
           </span>
         </li>
@@ -66,7 +66,7 @@
                 <el-popover placement="bottom" width="800" trigger="click" popper-class="rq_HotelDetails">
                   <table class="rq_HotelTable">
                     <tr>
-                      <th width="160">
+                      <th width="180">
                         时间
                       </th>
                       <th width="200">
@@ -78,14 +78,14 @@
                       <th width="500">
                         价格
                       </th>
-                      <th width="100">
+                      <th width="120">
                         税入/税别
                       </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">
+                             <td v-if="childIndex==0" :rowspan="subItem.HotelOrderList.length+1" style="text-align:center;">
                                第{{subIndex+1}}天<br/>
                                {{subItem.UseTimeStr}}
                              </td>
@@ -104,17 +104,16 @@
                                     <template v-if="detailsItem.HouseType==4">司导间</template>
                                     {{detailsItem.HouseTypeCount}} 间
                                     价格: {{detailsItem.UnitPrice}} 
-                               
                                     返佣: {{detailsItem.RebateRatio}}
                                     <br/>
                                  </template>
                              </td>
                              <td>
                                  <template v-if="childItem.TaxType==1">税入</template>
-                                   <template v-if="childItem.TaxType==2">税别</template>
+                                 <template v-if="childItem.TaxType==2">税别</template>
                              </td>
                           </tr>
-                          <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>
@@ -128,8 +127,8 @@
             </td>
           </tr>
           <tr>
-            <td colspan="5" style="text-align:left;padding-left:5px;">
-              注意事项: {{item.SupplierRemarks}}
+            <td colspan="8" style="text-align:left;padding-left:5px;">
+              注意事项： {{item.SupplierRemarks}}
             </td>
           </tr>
         </tbody>
@@ -166,7 +165,7 @@
           TCNUM: '',
           PriceStatus: 0,
           CombinationNum: '',
-          QMonthStr: "" //月份字符串
+          QMonthStr: new Date().Format("yyyy-MM") //月份字符串
         },
         UserInfo: {}, //用户信息
         dataList: [], //数据列表
@@ -203,12 +202,13 @@
           if (res.data.resultCode == 1) {
             this.dataList = res.data.data;
           } else {
-            this.$message.error(res.data.message)
+            this.Error(res.data.message)
           }
         }, err => {})
       },
       //获取日志
       getHotelList(TCID, NewCombinationNum) {
+        console.log(TCID)
         this.hotelLoading=true;
         this.HotelList = [];
         var qMsg = {
@@ -220,6 +220,8 @@
           if (res.data.resultCode == 1) {
             this.HotelList = res.data.data;
              console.log("this.HotelList",this.HotelList);
+          }else{
+            this.Error(res.data.message);
           }
         }, err => {})
       },
@@ -240,15 +242,6 @@
     },
     mounted() {
       this.UserInfo = this.getLocalStorageSupplier();
-      let myDate = new Date();
-      let nowDate =
-        myDate.getFullYear() +
-        "-" +
-        parseInt(myDate.getMonth() + 1) +
-        "-" +
-        myDate.getDate();
-      this.msg.QMonthStr = myDate.getFullYear() + "-" + parseInt(myDate.getMonth() + 1);
-      console.log(this.msg.QMonthStr);
       this.getList();
     },
   }
@@ -268,6 +261,12 @@
     background-color: #fff;
     border: 1px solid #d1d1d1;
   }
+  .roomQuery_SupplierTable tbody:nth-child(2n+2){
+    background: #fafafa;
+  }
+  .roomQuery_SupplierTable tbody tr:last-child{
+    border-bottom:2px solid #333;
+  }
 
   .roomQuery_SupplierTable tr th {
     background: #E6E6E6;
@@ -329,7 +328,6 @@
   }
   .roomQuery .roomNowrap{
     white-space: nowrap;
-    margin-bottom:5px;
     display: block;
     text-align: left;
     padding-left:20px;
@@ -339,7 +337,7 @@
     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 th { background-color: #ededed; padding: 5px 10px;text-align: center;}
  .rq_HotelTable td { background-color: #ffffff; padding: 9px 10px;color: #333333;border: 1px solid #d2d2d2;}
  .rq_HotelDetails{
   max-height:400px;