修改roomquery

src/components/Supplier/roomQuery2.vue

@@ -100,16 +100,16 @@
       </div>
     </transition>
 
-    <el-dialog custom-class='w800' title="酒店信息" :visible.sync="hotelUseDetail" center>
+    <el-dialog custom-class='w1006' :title='"【"+NewCombinationNum+"】"+"酒店信息"' :visible.sync="hotelUseDetail" center>
           <table class="rq_HotelTable" v-loading="hotelLoading">
               <tr>
-                <th width="130">
+                <th width="120">
                   时间
                 </th>
                 <th width="150">
                   酒店
                 </th>
-                <th width="250">
+                <th width="300">
                   价格
                 </th>
                 <th width="100">
@@ -172,7 +172,7 @@
                       <td>
                         <template v-if="(childItem.DMCState==1 || childItem.OPState==1) && childItem.SupplierId!=UserInfo.SupplierId"></template>
                         <template v-else>
-                          <textarea class="w135" cols="25" rows="5" v-model='childItem.SupplierToDmcRemarks'></textarea>
+                          <textarea class="w135" cols="25" rows="3" v-model='childItem.SupplierToDmcRemarks'></textarea>
                         </template>
                       </td>
                       <td style="text-align:center;">
@@ -184,16 +184,19 @@
                                 <div v-if='LogsList.length>0' v-for="(item,index) in LogsList" :key="index">
                                   <div class="clearfix">
                                     <div class="Auditcircle" style="left: 6px!important;"></div>
-                                    <div class="operateName" style="color:#005CAA;">{{item.emName}}</div>
-                                    <div class="operateDate fz12 color666">{{item.x}}</div>
+                                    <div class="operateName" style="color:#005CAA;font-size:12px;">{{item.CreateTimeStr}}</div>
+                                    <!-- <div class="operateDate fz12 color666">{{item.x}}</div> -->
                                   </div>
-                                  <div class="fz12 color333">{{item.logInfo}}</div>
+                                  <div class="fz12 color333">{{item.Remarks}}</div>
                                 </div>
                                 <div v-if='LogsList.length==0'>暂无数据</div>
                               </div>
                             </div>
+                          <template v-if="(childItem.DMCState==1 || childItem.OPState==1) && childItem.SupplierId!=UserInfo.SupplierId"></template>
+                            <template v-else>
                               <el-button slot="reference"  @click='getLogsList(childItem.TCID,childItem.HotelId,subItem.UseTimeStr)' type="primary"
                                 style='background:#47BF8C; border-color:#47BF8C;padding:5px;' icon="iconfont icon-rizhi1"></el-button>
+                            </template>
                           </el-popover>
                         </el-tooltip>
                       </td>
@@ -215,7 +218,7 @@
             <input type="button" value="保存" @click="saveSupplierjourneyorder(HotelList)" class="normalBtn" />
           </div>
     </el-dialog>
-    <el-dialog custom-class='w500' title="对地接备注" :visible.sync="dijieDialog" center>
+    <el-dialog custom-class='w500' style="margin-top:18vh" :title='"【"+NewCombinationNum+"】"+"对地接备注"' :visible.sync="dijieDialog" center>
         <table>
           <tr>
             <td class="SP_RemarkTitle">
@@ -243,6 +246,7 @@
         hotelLoading: false,
         hotelUseDetail:false,
         dijieDialog:false,
+        NewCombinationNum:'',
         total: 0,
         top:0,
         msg: {
@@ -353,6 +357,7 @@
       },
       //获取酒店列表
       getHotelList(TCID, NewCombinationNum) {
+        this.NewCombinationNum = NewCombinationNum;
         this.hotelLoading = true;
         this.HotelList = [];
         var qMsg = {
@@ -371,6 +376,7 @@
       },
       //获取点击备注
       getClickItem(item) {
+        this.NewCombinationNum = item.NewCombinationNum;
         this.RemarkObj.TCID = item.TCID;
         this.RemarkObj.SupplierToDmcRemarks = item.SupplierToDmcRemarks;
       },
@@ -714,5 +720,12 @@
   .AuditLog {
     margin-left:15px;
   }
-
+  .Auditcircle {
+      position: absolute;
+      width: 10px;
+      height: 10px;
+      left: 16px;
+      background-color: #e95252;
+      border-radius: 50%;
+  }
 </style>