修改

src/components/Supplier/roomQuery2.vue

@@ -20,7 +20,7 @@
         <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_span3">酒店提醒</span>
         </div>
       </div><br />
       <table border="0" cellspacing="1" cellpadding="0" class="roomQuery_SupplierTable" v-loading='loading'>
@@ -93,14 +93,15 @@
                               {{subItem.UseTimeStr}}
                             </td>
                             <td>
-                              <template v-if="childItem.SupplierId==0||childItem.SupplierId==UserInfo.SupplierId">
+                              <template v-if="(childItem.DMCState==1 || childItem.OPState==1) && childItem.SupplierId!=UserInfo.SupplierId">业者自理</template>
+                              <template v-else>
                                 {{childItem.HotelName}}<br/>
                                 <div class="rq_changeName">{{childItem.NewHotelName!=childItem.HotelName?'更换为:'+childItem.NewHotelName:""}}</div>
                               </template>
-                              <template v-else>业者自理</template>
                             </td>
                             <td>
-                              <template v-if="childItem.SupplierId==0||childItem.SupplierId==UserInfo.SupplierId">
+                              <template v-if="(childItem.DMCState==1 || childItem.OPState==1) && childItem.SupplierId!=UserInfo.SupplierId"></template>
+                              <template v-else>
                                 <template v-for="(detailsItem,detailsIndex) in childItem.OrderDetailsList"
                                   v-if="detailsItem.HouseTypeCount>0">
                                   <template v-if="detailsItem.HouseType==1">单间</template>
@@ -116,13 +117,15 @@
                               </template>
                             </td>
                             <td>
-                              <template v-if="childItem.SupplierId==0||childItem.SupplierId==UserInfo.SupplierId">
+                              <template v-if="(childItem.DMCState==1 || childItem.OPState==1) && childItem.SupplierId!=UserInfo.SupplierId"></template>
+                              <template v-else>
                                 <template v-if="childItem.TaxType==1">税入</template>
                                 <template v-if="childItem.TaxType==2">税别</template>
                               </template>
                             </td>
                             <td>
-                              <template v-if="childItem.SupplierId==0||childItem.SupplierId==UserInfo.SupplierId">
+                              <template v-if="(childItem.DMCState==1 || childItem.OPState==1) && childItem.SupplierId!=UserInfo.SupplierId"></template>
+                              <template v-else>
                                 <select class="rq_status" v-model='childItem.SupplierToDmcHotelStatus'
                                   :placeholder="$t('pub.pleaseSel')">
                                   <option label='请选择' :value='0'></option>
@@ -132,7 +135,8 @@
                               </template>
                             </td>
                             <td>
-                              <template v-if="childItem.SupplierId==0||childItem.SupplierId==UserInfo.SupplierId">
+                              <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>
                               </template>
                             </td>
@@ -309,6 +313,7 @@
                 }
               })
             }
+            console.log(this.dataList,'data');
           } else {
             this.Error(res.data.message)
           }