页面修改

src/components/commonPage/commonHotelInfo.vue

@@ -68,6 +68,13 @@
             </td>
             <td style="text-align:left;padding-left:3px;">
               <span v-if="hotelSubItem.HotelName!='温馨的家'">
+                <template v-if="hotelSubItem.OPState==1">
+                  <a style="color:green">OP-指定</a>
+                </template>
+                <template v-else-if="hotelSubItem.OPState==2 && hotelSubItem.DMCState==0 ">
+                  <a style="color:red">OP-暂定</a>
+                </template>
+                <template v-else>
                   <template v-if="hotelSubItem.DMCState==1">
                     <a style="color:green">地接-OK</a>
                   </template>
@@ -75,11 +82,7 @@
                     <a style="color:red">地接-暂定</a>
                   </template>
                   <template v-else-if="hotelSubItem.DMCState==0">
-                  <template v-if="hotelSubItem.OPState==1">
-                    <a style="color:green">OP-指定</a>
-                  </template>
-                  <template v-else>
-                    <a style="color:red"> {{hotelSubItem.OPState==2?"OP-暂定":"地接-未操作"}}</a>
+                    <a style="color:red">地接-未操作</a>
                   </template>
                 </template>
               </span>
@@ -111,7 +114,8 @@
             <td v-if="showHotelObj.showPrice">
               <el-popover width="200" trigger="click" popper-class="Bus_HotelPop">
                 <commonHotelLog :ref="'comHotelLog'+index+hotelSubIndex+''"> </commonHotelLog>
-                <div slot="reference" class="w80" style="cursor:pointer;text-decoration:underline;" @click="GetHotelLog(hotelSubItem,index,hotelSubIndex)">日志</div>
+                <div slot="reference" class="w80" style="cursor:pointer;text-decoration:underline;"
+                  @click="GetHotelLog(hotelSubItem,index,hotelSubIndex)">日志</div>
               </el-popover>
             </td>
           </tr>
@@ -189,9 +193,9 @@
     },
     methods: {
       //调用子组件获取日志方法
-      GetHotelLog(subItem,index,hotelSubIndex) {
+      GetHotelLog(subItem, index, hotelSubIndex) {
         let str = `comHotelLog${index}${hotelSubIndex}`
-        this.$refs[str][0].getHotelLogsList(this.TCID,subItem.HotelId,subItem.UseDay);
+        this.$refs[str][0].getHotelLogsList(this.TCID, subItem.HotelId, subItem.UseDay);
       },
       DownLoadShouPeiShu() {
         this.loading = true;

src/components/dmc/manager/dmcTotalTable.vue

@@ -122,6 +122,22 @@
             </el-select>
           </span>
         </li>
+        <li>
+          <span>
+            <em>酒店状态</em>
+            <el-select v-model="msg.HotelStatus" :placeholder="$t('pub.pleaseSel')" filterable>
+              <el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
+              <el-option label="全部OK" :value='100'></el-option>
+              <el-option label="暂定一晚" :value='1'></el-option>
+              <el-option label="暂定两晚" :value='2'></el-option>
+              <el-option label="暂定三晚" :value='3'></el-option>
+              <el-option label="暂定四晚" :value='4'></el-option>
+              <el-option label="暂定五晚" :value='5'></el-option>
+              <el-option label="暂定六晚" :value='6'></el-option>
+              <el-option label="暂定七晚以上" :value='7'></el-option>
+            </el-select>
+          </span>
+        </li>
         <li>
           <input type="button" class="normalBtn" value="查询" @click="getList();resetPageIndex()" />
         </li>
@@ -508,6 +524,7 @@
           CreateBy: 0,
           LeaderType: 0, //领队导游类型
           QLeaderId: 0, //领队导游编号
+          HotelStatus: 0, //酒店状态
         },
         CheckedVaule: 1,
         UnCheckedVaule: 0,