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

src/assets/utils/travelFeature2.js

@@ -2,7 +2,7 @@ let travelFeatureTwo = {
   HotelInit: function (index, data) { // 酒店初始化
     let list = [];
     for (let item of data[index].HotelArray) {
-      if (item.HotelName && item.HotelName !== '' && item.HotelName!="温馨的家") {
+      if (item.HotelName && item.HotelName !== '' && item.HotelName!="温馨的家" &&item.HotelName!="机场附近酒店") {
         let obj = {
           name: '',
           description: '',

src/components/Hotel/HotelWorkList.vue

+<template>
+  <div>
+    <div class="query-box" style="border-bottom: none;">
+      <ul>
+        <li>
+          <span>
+            <em>时间</em>
+            <el-date-picker v-model="msg.YearMonthStr" type="month" value-format="yyyy-MM" placeholder="选择月">
+            </el-date-picker>
+          </span>
+        </li>
+        <li>
+          <input type="button" class="normalBtn" value="查询" @click="getList()" />
+          <!-- <input type="button" class="normalBtn" value="下载" @click="DownLoadHotelQuery()" /> -->
+        </li>
+      </ul>
+    </div>
+    <div class="hotelProductManage2_tableBox" style="margin-bottom: 20px;">
+      <span style="color: green; background-color:green ; padding: 2px 4px; border-radius: 5px;">OK</span> 
+      <span style="color: #F75000; background-color: #F75000; padding: 2px 4px; border-radius: 5px;">暂定</span>
+      <span style="color:red; background-color: red; padding: 2px 4px; border-radius: 5px;">未操作</span> 
+    </div>
+    <el-table :data="dataList" style="width:100%" border v-loading='loading' height="700">
+      <el-table-column fixed label="酒店名称" min-width="180">
+        <template slot-scope="scope">
+          <div style="text-decoration: underline;cursor:pointer" @click="GotoHotel(scope.row.Hotel)">
+            {{scope.row.HotelName}}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column v-for='(item,index) in dataList[0].DayList' :label="item.DateStr" :key='index' min-width="150">
+        <template slot-scope="scope">
+          <template v-if="scope.row.DayList[index].IsHaveStock==0">
+            <div style="background-color: #000!important;width:100%;height:100%;"></div>
+          </template>
+          <template v-else v-for="childItem in scope.row.DayList[index].HotelJourneyOrderList">
+            <div style="white-space:nowrap;color:red;" :title="childItem.TCID+'【未操作】'" v-if="childItem.DMCState==0">{{childItem.BookGroup}}</div>
+            <div style="white-space:nowrap;color:green;" :title="childItem.TCID+'【OK】'" v-if="childItem.DMCState==1">{{childItem.BookGroup}}</div>
+            <div style="white-space:nowrap;color:#F75000;" :title="childItem.TCID+'【暂定】'" v-if="childItem.DMCState==2">{{childItem.BookGroup}}</div>
+          </template>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="noDataNotice" v-if="dataList.length==0">
+      <i class="iconfont icon-kong"></i>
+      <p>{{$t("active.ld_noData")}}</p>
+    </div>
+  </div>
+</template>
+<script>
+  export default {
+    data() {
+      return {
+        //查询条件
+        msg: {
+          YearMonthStr: "",
+          CountryId: 651, //只查询日本
+        },
+        defaultSelectValue: 0,
+        dataList: [],
+        loading: false,
+      };
+    },
+    methods: {
+      GotoHotel(HotelId) {
+        this.$router.push({
+          path: "HotelManagement",
+          query: {
+            ID: HotelId,
+            tab: "酒店查询",
+            blank: 'y',
+          }
+        });
+      },
+      getList() {
+        this.loading = true;
+        this.dataList = [];
+        if (this.msg.YearMonthStr == "") {
+          this.msg.YearMonthStr = new Date().Format("yyyy-MM");
+        }
+        this.apipost("hotel_post_GetHotelWorkListService", this.msg,
+          res => {
+            this.loading = false;
+            if (res.data.resultCode == 1) {
+              this.dataList = res.data.data;
+              //console.log("this.dataList", this.dataList);
+            } else {
+              this.Error(res.data.message);
+            }
+          },
+          err => {}
+        );
+      },
+
+    },
+    mounted() {
+      this.msg.YearMonthStr = new Date().Format("yyyy-MM");
+      this.getList();
+    },
+  };
+
+</script>
+
+<style>
+
+</style>

src/components/Hotel/roomReservationsDetails.vue

@@ -286,7 +286,7 @@
                   <tr>
                     <td width="70" style="text-align:right;">币种：</td>
                     <td>
-                      <el-select v-model="subItem.CurrencyId" placeholder="请选择" class='w135 sel' style="display:none;">
+                      <el-select v-model="subItem.CurrencyId" placeholder="请选择" class='w135 sel'>
                         <el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
                         <el-option v-for="(item,index) in allCurrencyList" :key="index" :label="item.Name"
                           :value="item.ID">

src/components/Restaurant/RestaurantSalesBoard.vue

@@ -210,9 +210,18 @@
             </el-select>
           </span>
         </li>
+        <li >
+          <span>
+            <em>类型</em>
+            <el-select v-model="msg.QStatus" :placeholder="$t('pub.pleaseSel')" filterable>
+              <el-option  :key="0" label="地接餐厅订单" :value="0"></el-option>
+              <el-option  :key="1" label="行程餐厅" :value="1"></el-option>
+            </el-select>
+          </span>
+        </li>
         <li style="margin-right:50px;">
           <button class="normalBtn" type="button" @click="GetHoltelInventory()">{{$t('pub.searchBtn')}}</button>
-          <button class="normalBtn" type="button" @click="DownLoadDinnerSalesBoard()" >下载</button>
+          <button class="normalBtn" type="button" @click="DownLoadDinnerSalesBoard()">下载</button>
         </li>
       </ul>
     </div>
@@ -267,7 +276,8 @@
           Year: 0,
           Month: 0,
           DiningID: 0,
-          loading: false
+          QStatus:0,
+          loading: false,
         },
         //餐厅列表
         DinnerList: [],
@@ -347,7 +357,7 @@
         var that = this;
         this.msg.Year = this.currentYear;
         this.msg.Month = this.currentMonth;
-        this.DayData=[];
+        this.DayData = [];
         this.apipost(
           "order_post_GetDinnerMonthStatistics",
           this.msg,
@@ -363,7 +373,7 @@
                 d.getMonth() + 1,
                 d.getDate()
               );
-              dayItem.dayValue=[];
+              dayItem.dayValue = [];
               for (var j = 0; j < this.DayData.length; j++) {
                 if (this.DayData[j].Day == myDate) {
                   dayItem.dayValue = this.DayData[j].SubList;
@@ -381,7 +391,9 @@
       //获取酒店列表
       GetDinnerList() {
         this.apipost(
-          "dining_post_GetList", {QCountry:651},
+          "dining_post_GetList", {
+            QCountry: 651
+          },
           res => {
             if (res.data.resultCode == 1) {
               this.DinnerList = res.data.data;

src/components/commonPage/commonHotelInfo.vue

@@ -78,7 +78,7 @@
                 </template>
             </td>
             <td>
-              <span v-if="hotelSubItem.HotelName!='温馨的家'">
+              <span v-if="hotelSubItem.HotelName!='温馨的家' &&hotelSubItem.HotelName!='机场附近酒店'"> 
                 <template v-if="hotelSubItem.OPState==1">
                   <a style="color:green">OP-指定</a>
                 </template>
@@ -88,7 +88,7 @@
               </span>
             </td>
             <td>
-              <span v-if="hotelSubItem.HotelName!='温馨的家'">
+              <span v-if="hotelSubItem.HotelName!='温馨的家'&&hotelSubItem.HotelName!='机场附近酒店'">
                 <template v-if="hotelSubItem.DMCState==1">
                   <a style="color:green">地接-OK</a>
                 </template>

src/components/commonPage/fiveday.vue

@@ -138,7 +138,7 @@
             suffix = "或同級"
           }
         } else {
-          if (this.day.jiu2.length == 1 && this.day.jiu2[0].name != '温馨的家') {
+          if (this.day.jiu2.length == 1 && this.day.jiu2[0].name != '温馨的家' && this.day.jiu2[0].name != '机场附近酒店') {
             if (this.day.jiu2[0].status == 1) {
               suffix = "【保证入住】"
             } else {

src/components/commonPage/fourday.vue

@@ -136,7 +136,7 @@ export default {
           suffix = "或同級"
         }
       }else{
-        if(this.day.jiu2.length==1 && this.day.jiu2[0].name!='温馨的家'){
+        if(this.day.jiu2.length==1 && this.day.jiu2[0].name!='温馨的家'&& this.day.jiu2[0].name!='机场附近酒店'){
                if (this.day.jiu2[0].status == 1) {
               suffix = "【保证入住】"
             } else {

src/components/commonPage/oneday.vue

@@ -109,7 +109,7 @@
             suffix = "或同級"
           }
         } else {
-          if (this.day.jiu2.length == 1 && this.day.jiu2[0].name != '温馨的家') {
+          if (this.day.jiu2.length == 1 && this.day.jiu2[0].name != '温馨的家'&& this.day.jiu2[0].name!='机场附近酒店') {
             if (this.day.jiu2[0].status == 1) {
               suffix = "【保证入住】"
             } else {

src/components/commonPage/threeday.vue

@@ -176,7 +176,7 @@ export default {
           suffix = "或同級"
         }
       }else{
-        if(this.day.jiu2.length==1 && this.day.jiu2[0].name!='温馨的家'){
+        if(this.day.jiu2.length==1 && this.day.jiu2[0].name!='温馨的家'&& this.day.jiu2[0].name!='机场附近酒店'){
                if (this.day.jiu2[0].status == 1) {
               suffix = "【保证入住】"
             } else {

src/components/commonPage/twoday.vue

@@ -103,7 +103,7 @@ export default {
           suffix = "或同級"
         }
       }else{
-        if(this.day.jiu2.length==1 && this.day.jiu2[0].name!='温馨的家'){
+        if(this.day.jiu2.length==1 && this.day.jiu2[0].name!='温馨的家'&& this.day.jiu2[0].name!='机场附近酒店'){
           if (this.day.jiu2[0].status == 1) {
               suffix = "【保证入住】"
             } else {

src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue

@@ -871,27 +871,27 @@
             </td>
             <td style="text-align:left;padding-left:3px;">
               <span v-if="childItem.UseCount>0 && subItem.SubList.length==1">
-                  <template v-if="childItem.OPState==1&&childItem.HotelName!='温馨的家'">
+                  <template v-if="childItem.OPState==1&&childItem.HotelName!='温馨的家'&&childItem.HotelName!='机场附近酒店'">
                    <a style="color:green">【OP-指定】</a>
                   </template>
-                  <template v-else-if="childItem.OPState==2&&childItem.DMCState==0&&childItem.HotelName!='温馨的家'">
+                  <template v-else-if="childItem.OPState==2&&childItem.DMCState==0&&childItem.HotelName!='温馨的家'&&childItem.HotelName!='机场附近酒店'">
                     <a style="color:red">【OP-指定】</a>
                   </template>
                   <template v-else>
-                   <template v-if="childItem.DMCState==1&&childItem.HotelName!='温馨的家'">
+                   <template v-if="childItem.DMCState==1&&childItem.HotelName!='温馨的家'&&childItem.HotelName!='机场附近酒店'">
                       <a style="color:green">【地接-OK】</a>
                    </template>
-                    <template v-if="childItem.DMCState==2&&childItem.HotelName!='温馨的家'">
+                    <template v-if="childItem.DMCState==2&&childItem.HotelName!='温馨的家'&&childItem.HotelName!='机场附近酒店'">
                       <a style="color:red">【地接-暂定】</a>
                    </template>
-                      <template v-if="childItem.DMCState==0&&childItem.HotelName!='温馨的家'">
+                      <template v-if="childItem.DMCState==0&&childItem.HotelName!='温馨的家'&&childItem.HotelName!='机场附近酒店'">
                       <a style="color:red">【地接-未操作】</a>
                    </template>
                   </template>
                 【<span style="color:green">本团使用：{{childItem.UseCount}}
                   {{childItem.CostPrice!=0?"价格:"+childItem.CostPrice:""}}</span>】
               </span>
-              <span style="color:#E95252;" v-if="childItem.HotelName!='温馨的家'"> 【剩余：{{childItem.RemainingInventory}}】
+              <span style="color:#E95252;" v-if="childItem.HotelName!='温馨的家'&&childItem.HotelName!='机场附近酒店'"> 【剩余：{{childItem.RemainingInventory}}】
               </span>
             </td>
             <td>

src/components/scenicSpot/scenicSpotSalesBoard.vue

@@ -209,6 +209,15 @@
               <el-option v-for="item in ScenicList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
             </el-select>
           </span>
+        </li>
+         <li >
+          <span>
+            <em>类型</em>
+            <el-select v-model="msg.QStatus" :placeholder="$t('pub.pleaseSel')" filterable>
+              <el-option  :key="0" label="地接门票订单" :value="0"></el-option>
+              <el-option  :key="1" label="行程门票" :value="1"></el-option>
+            </el-select>
+          </span>
         </li>
         <li style="margin-right:50px;">
           <button class="normalBtn" type="button" @click="GetHoltelInventory()">{{$t('pub.searchBtn')}}</button>
@@ -267,6 +276,7 @@
           Year: 0,
           Month: 0,
           CouponsId: 0,
+          QStatus:0,
           loading: false
         },
         //餐厅列表

src/router/config.js

@@ -786,6 +786,14 @@ export default {
                                 title: '酒店查询统计'
                             },
                         },
+                        {
+                            path: '/HotelWorkList', //酒店工作表
+                            name: 'HotelWorkList',
+                            component: resolve => require(['@/components/Hotel/HotelWorkList'], resolve),
+                            meta: {
+                                title: '酒店工作表'
+                            },
+                        },
                         {
                             path: '/RestauranOrder', //餐厅订单信息
                             name: 'RestauranOrder',