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

src/components/Hotel/HotelWorkList.vue

@@ -131,18 +131,10 @@
               <template
                 v-if="scope.row.DayList[index].HotelJourneyOrderList&&scope.row.DayList[index].HotelJourneyOrderList.length>0">
                 <template v-for="(childItem,childIndex) in scope.row.DayList[index].HotelJourneyOrderList">
-                  <div :title="childItem.TCID+'【未操作】'" v-if="childItem.DMCState==0" slot="reference" class="w80"
-                    style="white-space:nowrap;color:red;cursor:pointer;text-decoration:underline;"
-                    @click="outerVisible=true,GetClickItem(item.DateAllStr,scope.row.Hotel,childItem.TCID)">
-                    {{childItem.BookGroup}}</div>
-                  <div :title="childItem.TCID+'【OK】'" v-if="childItem.DMCState==1" slot="reference" class="w80"
+                  <div :title="childItem.TCID+'【OK】'" v-if="childItem.DMCState==1||childItem.OPState==1" slot="reference" class="w80"
                     style="white-space:nowrap;color:green;cursor:pointer;text-decoration:underline;"
                     @click="outerVisible=true,GetClickItem(item.DateAllStr,scope.row.Hotel,childItem.TCID)">
                     {{childItem.BookGroup}} </div>
-                  <div :title="childItem.TCID+'【暂定】'" v-if="childItem.DMCState==2" slot="reference" class="w80"
-                    style="white-space:nowrap;color:#3333CC;;cursor:pointer;text-decoration:underline;"
-                    @click="outerVisible=true,GetClickItem(item.DateAllStr,scope.row.Hotel,childItem.TCID)">
-                    {{childItem.BookGroup}}</div>
                 </template>
               </template>
               <template v-else>