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

src/components/Supplier/roomQuery.vue

@@ -140,24 +140,44 @@
                 {{childItem.CheckInDateStr}}
               </td>
               <td class="tdLeft">
-                <template v-if="childItem.SupplierId==UserInfo.SupplierId"> {{childItem.NewHotelName}}</template>
+                <template v-if="childItem.SupplierId==UserInfo.SupplierId">
+                  <template v-if="childItem.SupplierHotelStatus==0"> {{childItem.NewHotelName}}</template>
+                  <template v-else-if="childItem.SupplierHotelStatus==1">
+                    <a style="color:#7abd53">{{childItem.NewHotelName}}</a></template>
+                  <template v-else-if="childItem.SupplierHotelStatus==2">
+                    <a style="color:blue">{{childItem.NewHotelName}}</a>
+                  </template>
+                  (
+                  <template v-if="subItem.TotalSeat/2!=childItem.SupplierBookNum">
+                    <a style="font-weight:bold; color:red;" title="总机位数和预订间数不相符"> {{childItem.SupplierBookNum}} </a>
+                  </template>
+                  <template v-else>
+                    <a style="font-weight:bold;"> {{childItem.SupplierBookNum}} </a>
+                  </template>
+                  间)</template>
                 <template v-else>
                   组团社自理
                 </template>
               </td>
               <td>
-                <span style="color:red;">
-                  <template v-if="childItem.SupplierId==UserInfo.SupplierId">
+                <!--<span >
+                 <template v-if="childItem.SupplierId==UserInfo.SupplierId">
                     <template v-if="childItem.OPState==1">[OP选房-OK]</template>
                     <template v-else-if="childItem.OPState==2&&childItem.DMCState==0">[OP-暂定]</template>
                     <template
                       v-else>{{childItem.DMCState==1?"[地接-OK]":(childItem.DMCState==0?"[地接-未操作]":"[地接-暂定]")}}</template>
-                  </template>
+                  </template> 
                 </span>
+                -->
+                <template v-if="childItem.SupplierId==UserInfo.SupplierId">
+                  <template v-if="childItem.SupplierHotelStatus==0">未操作</template>
+                  <template v-else-if="childItem.SupplierHotelStatus==1"><a style="color:#7abd53">操作中</a></template>
+                  <template v-else-if="childItem.SupplierHotelStatus==2"><a style="color:blue">操作完成</a></template>
+                </template>
               </td>
               <td v-if="childIndex==0"
                 :rowspan="subItem.SupplierRemarks!=''?subItem.hotelList.length+1:subItem.hotelList.length">
-                <el-tooltip class="item" effect="dark" content="操作信息" placement="top-start" style="display:none;">
+                <el-tooltip class="item" effect="dark" content="操作信息" placement="top-start">
                   <el-popover placement="bottom" width="460" trigger="click">
                     <table>
                       <tr>
@@ -174,7 +194,7 @@
                           状态
                         </th>
                       </tr>
-                      <tr v-for="opItem in subItem.hotelList">
+                      <tr v-for="opItem in CurrentHotelList">
                         <template v-if="opItem.SupplierId==UserInfo.SupplierId">
                           <td>
                             {{opItem.CheckInDateStr}}
@@ -202,9 +222,10 @@
                       </tr>
                     </table>
                     <p class="alcenter mt10">
-                      <input type="button" value="保存" @click="SaveSupplierData(subItem.hotelList)" class="normalBtn" />
+                      <input type="button" value="保存" @click="SaveSupplierData(CurrentHotelList)" class="normalBtn" />
                     </p>
-                    <a style="text-decoration:underline;color:blue;cursor:pointer" slot="reference">操作</a>
+                    <a style="text-decoration:underline;color:blue;cursor:pointer" slot="reference"
+                      @click="GetItemHotelData(subItem.hotelList)">操作</a>
                   </el-popover>
                 </el-tooltip>
                 <a style="text-decoration:underline;color:blue;cursor:pointer"
@@ -279,6 +300,8 @@
           AirlineList: [],
           EmployeeList: [],
         },
+        //当前酒店列表
+        CurrentHotelList: [],
         pickerBeginDateBefore: {
           disabledDate: time => {
             if (this.msg.EndDate == null) {
@@ -298,6 +321,9 @@
       }
     },
     methods: {
+      GetItemHotelData(hotelList) {
+        this.CurrentHotelList = JSON.parse(JSON.stringify(hotelList));
+      },
       //删除投诉
       DeleteSupplierComplain(Id) {
         if (Id > 0) {