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

src/components/Restaurant/bookDinnerStatisticsDetails.vue

@@ -4,8 +4,8 @@
       <ul>
         <li>
           <template v-if="IsOperation != 1">
-            <input type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" :disabled="IsDisabled" />
-            <input type="button" class="fr normalBtn mb30" value="保存草稿" @click="saveList(0)" :disabled="IsDisabled" />
+            <input v-if="IsEditDinner==1" type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" :disabled="IsDisabled" />
+            <input v-if="IsEditDinner==0" type="button" class="fr normalBtn mb30" value="保存草稿" @click="saveList(0)" :disabled="IsDisabled" />
           </template>
           <template v-else>
             <span style="color:red;font-size:14px;">已制单，不能在修改!</span>
@@ -229,6 +229,7 @@
   export default {
     data() {
       return {
+        IsEditDinner: 0, //1有权限操作餐配
         defaultSelectValue: 0,
         list: [],
         roomList: [],
@@ -460,8 +461,19 @@
           }
         })
       },
+    GetAuth() {
+        this.apipost('dmcstatistics_get_GetGetDmcTotalTablePageAuth', {}, res => {
+          if (res.data.resultCode == 1) {
+            //this.IsDMCIsOpenHotel = res.data.data.IsDMCIsOpenHotel;
+            this.IsEditDinner = res.data.data.IsEditDinner;
+          } else {
+            this.$message.error(res.data.message);
+          }
+        }, err => {})
+      }
     },
     mounted() {
+      this.GetAuth();
       let userInfo = this.getLocalStorage();
       this.CurrentUserInfo = userInfo;
       this.TCNUM = this.$route.query.TCNUM;

src/components/ShoppingStore/ShoppingReimbursement.vue

@@ -448,6 +448,8 @@
         "-" +
         myDate.getDate();
       this.msg.StartDate = nowDate;
+      // this.msg.StartDate='';
+      // this.msg.TCNUM='NRTCA08190613A';
       this.getLineList();
       this.getList();
     },

src/components/ShoppingStore/ShoppingReimbursement2.vue

@@ -371,8 +371,8 @@
         parseInt(myDate.getMonth() + 1) +
         "-" +
         myDate.getDate();
-      //this.msg.StartDate = nowDate;
-      this.msg.TCNUM="NRTMU07190702A";
+      this.msg.StartDate = nowDate;
+      //this.msg.TCNUM="NRTMU07190702A";
       this.getLineList();
       this.getList();
     },

src/components/TravelManager/TravelList/PriceHotelWorkList.vue

@@ -37,7 +37,7 @@
               :picker-options="pickerBeginDateAfter"></el-date-picker>
           </span>
         </li>
-        <li><span>
+        <li style="display：none;"><span>
             <em>状态</em>
             <el-select v-model='msg.PriceStatus'>
               <el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
@@ -68,7 +68,7 @@
             </el-select>
           </span>
         </li>
-        <li>
+        <li style="display:none;">
           <span>
             <em>地接团号</em>
             <el-input v-model='msg.CombinationNum'></el-input>
@@ -142,7 +142,7 @@
                   </td>
                   <td>
                     <template v-if="childItem.HotelName!=childItem.NewHotelName && childItem.NewHotelName!=''">
-                      <span style="text-decoration:line-through"> {{childItem.HotelName}}</span>
+                      <span style="text-decoration:line-through red solid"> {{childItem.HotelName}}</span>
                     </template>
                     <template v-else>
                       {{childItem.HotelName}}
@@ -172,10 +172,11 @@
                       <span style="color:red;">地接-未操作</span>
                     </template>
                   </td>
-                  <td>
+                  <td :rowspan="subItem.SubList.length" v-if='childIndex==0'>
                     <el-popover placement="right" width="540" trigger="click" v-model="subItem.isShowPop">
                       <commonPriceHotelWork :ref="'commonPriceHotelWork_'+index+'_'+subIndex+'_'+childIndex+''"
-                        :DateStr="childItem.JourneyDate" :TCID="item.TCID" :DayNum="subItem.DayNum">
+                        :DateStr="childItem.JourneyDate" :TCID="item.TCID" :DayNum="subItem.DayNum" :TCNUM="item.TCNUM"
+                        v-on:childPriceHotel="priceHotelList">
                       </commonPriceHotelWork>
                       <el-button size="small" type="danger"
                         :data-index="'commonPriceHotelWork_'+index+'_'+subIndex+'_'+childIndex+''" slot="reference"
@@ -290,10 +291,29 @@
     methods: {
       //点击酒店
       getPriceHotel(index, subIndex, childIndex) {
-        console.log(index, subIndex, childIndex);
         let str = `commonPriceHotelWork_${index}_${subIndex}_${childIndex}`;
-        console.log("str", str);
-        //this.$refs[str].getCheckHotel();
+        this.$refs[str][0].getPriceHotelCheck();
+      },
+      //父页面方法
+      priceHotelList(obj) {
+        this.DataList.forEach(x => {
+          x.HotelOrderListReports.forEach(y => {
+            y.isShowPop = false;
+          })
+        });
+        var nMsg = {
+          TCID: obj.TCID,
+          DayNum: obj.DayNum,
+          HotelId: obj.ID
+        };
+        this.apipost("travel_post_SavePriceHotelService", nMsg, res => {
+          if (res.data.resultCode == 1) {
+            this.Success(res.data.message);
+            this.getList();
+          } else {
+            this.Error(res.data.message);
+          }
+        });
       },
       goUrlR(path, obj, title) {
         this.$router.push({
@@ -361,7 +381,6 @@
               });
             }
             this.DataList = sourceData;
-            console.log("this.dataList", this.DataList);
             this.$forceUpdate()
           } else {
             this.Error(res.data.message)
@@ -379,20 +398,12 @@
           }
         });
       },
-
-      getChildHotel(index, subIndex) {
-        this.findex = index;
-        this.childIndex = subIndex;
-        let str = `comCheckHotel${index}${subIndex}`
-        this.$refs[str][0].getCheckHotel();
-      },
-
       //获取目的地列表
       getLinePlaceList() {
         this.msg.PlaceID = 0;
         this.msg.LineteamId = 0;
         let msg = {
-          lineID: this.msg.LineId,
+          lineID: 14,
         }
         this.apipost('team_post_GetLinePlace', msg, res => {
           if (res.data.resultCode == 1) {
@@ -405,7 +416,7 @@
       getLineTeamList() {
         this.msg.LineteamId = 0
         let msg = {
-          lineID: this.msg.LineId,
+          lineID: 14,
           placeID: this.msg.PlaceID,
           isTOOP: 1
         }
@@ -476,8 +487,8 @@
         parseInt(myDate.getMonth() + 1) +
         "-" +
         myDate.getDate();
-
-      this.msg.StartGroupDate = nowDate;
+      //this.msg.StartGroupDate = nowDate;
+      this.msg.StartGroupDate='2019-12-05';
       let width = window.innerWidth - 50;
       let height = window.innerHeight - 65 - 164;
       this.boxHeight = height;

src/components/commonPage/commonPriceHotelWork.vue

 <style>
 
-  .comCheckHotel .comCheckHotel {
+  .commonPriceHotelWork .comCheckHotel {
     width: 100%;
     height: 150px;
     overflow: auto
   }
 
-  .comCheckHotel .comCk_list {
+  .commonPriceHotelWork .comCk_list {
     padding: 0 20px;
     margin: 0 15px 5px 0;
   }
 
-  .comCheckHotel .cm_Inventory {
+  .commonPriceHotelWork .cm_Inventory {
     margin-left: 20px;
     color: red;
     display: inline-block;
   }
 
-  .comCheckHotel .cm_hotelTitle {
+  .commonPriceHotelWork .cm_hotelTitle {
     width: 100%;
     text-align: center;
     margin-bottom: 20px;
@@ -25,15 +25,15 @@
     padding: 0 20px 10px 20px;
   }
 
-  .comCheckHotel .com_SaveBtn {
+  .commonPriceHotelWork .com_SaveBtn {
     margin: 10px 20px 0 45%;
   }
 
-  .comCheckHotel .ckedList {
+  .commonPriceHotelWork .ckedList {
     background-color: #E95252;
     color: #fff;
   }
-  .comCheckHotel .Ck_hotelInfo{
+  .commonPriceHotelWork .Ck_hotelInfo{
     width:100%;
     height:40px;
     background-color: #F6F8FB;
@@ -41,17 +41,13 @@
     line-height: 40px;
     margin-bottom:10px;
   }
-  .comCheckHotel .ck_goUrl{
-      color:blue;
-      cursor: pointer;
-      margin-left:10px;
-  }
+ 
 </style>
 
 <template>
-  <div class="comCheckHotel">
+  <div class="commonPriceHotelWork">
     <div class="Ck_hotelInfo">
-      <span style="color:red">{{DateStr}}</span> 酒店库存信息
+      <span style="color:red">{{TCNUM}} 【{{DateStr}}】</span> 酒店库存信息
     </div>
     <div class="cm_hotelTitle clearfix">
       <div style="float:left;">
@@ -77,7 +73,7 @@
                 <label :for="'H'+index+'_'+subIndex" style="cursor: pointer">{{subItem.Name}}</label>
                 <span class="cm_Inventory">{{subItem.Inventory}}</span>
                 <span class="cm_Inventory">剩余:{{subItem.RemainingInventory}}</span>
-                <span class="ck_goUrl" @click="goUrl(subItem.ID)">新增库存</span>
+                <span class="cm_Inventory">价格:{{subItem.CostPrice}}</span>
               </div>
           </div>
         </el-tab-pane>
@@ -88,7 +84,7 @@
 </template>
  <script>
    export default {
-     props: ["TCID", "DateStr","DayNum"],
+     props: ["TCID", "DateStr","DayNum","TCNUM"],
      data() {
       return {
         loading:false,
@@ -103,7 +99,7 @@
       };
     },
     methods: {
-      getCheckHotel() {
+      getPriceHotelCheck() {
         this.loading=true;
         this.IsShow=false;
         this.dataList = [];
@@ -115,7 +111,7 @@
           IsAllHotel: 1,
           Province: this.qMsg.ProvinceId,
           Name:this.qMsg.Name,
-          sDate: this.UseDate
+          sDate: this.DateStr
         }, res => {
           this.loading=false;
           this.IsShow=true;
@@ -155,8 +151,11 @@
             ckHotelObj.RebateRatio=this.ckedHotel.RebateRatio;
             ckHotelObj.RebateCount=this.ckedHotel.RebateCount;
             ckHotelObj.CostPrice=this.ckedHotel.CostPrice;
+            ckHotelObj.TCID=this.TCID;
+            ckHotelObj.DateStr=this.DateStr;
+            ckHotelObj.DayNum=this.DayNum;
         }
-        this.$emit("childHotel", ckHotelObj);
+        this.$emit("childPriceHotel", ckHotelObj);
       },
       //获取日本下面的市->下拉框用
       getProvinceList() {
@@ -172,19 +171,6 @@
           },
           err => {}
         );
-      },
-      goUrl(ID){
-         this.$router.push({
-          path: 'HotelProductManage2',
-          query: {
-            id: ID,
-            Country: 651,
-            IsSelfBook: 1,
-            blank: 'y',
-            tab: '报价详情'
-          }
-        });
-
       }
     },
     mounted() {

src/components/dmc/manager/dmcTotalTable.vue

@@ -162,10 +162,10 @@
           <th width="75">出发地</th>
           <th width="80">航班时间</th>
           <th width="140">公司团号</th>
-          <th width="90">同业<br/>会员价</th>
+          <th width="90">同业<br />会员价</th>
           <th width="75">线路<br />负责人</th>
           <th width="75">进出点</th>
-          <th width="50">订单<br/>人数</th>
+          <th width="50">订单<br />人数</th>
           <th width="100">机位总数<br />(Y/E/F/单地接)</th>
           <th width="60">领队</th>
           <th width="60">导游</th>
@@ -238,7 +238,7 @@
               </td>
               <td>
                 <div class="link">
-                  <p @click="goUrlT('productQuery',item.TCNUMS,'产品查询')">{{item.TCNUMS}}<br/>({{item.TCID}})</p>
+                  <p @click="goUrlT('productQuery',item.TCNUMS,'产品查询')">{{item.TCNUMS}}<br />({{item.TCID}})</p>
                 </div>
               </td>
               <td style="color: #47BF8C;white-space: nowrap;">
@@ -290,8 +290,8 @@
                 <a style="text-decoration:underline;cursor:pointer;" title="点击下载旅客名单"
                   @click="DownLoadGuestList(item,outItem,index)">出境名单</a>
 
-                 <a style="text-decoration:underline;cursor:pointer;margin-top:5px;display:inline-block;" title="点击下载电话名单"
-                  @click="DownLoadGuestTelList(item,outItem,index)">电话名单</a>
+                <a style="text-decoration:underline;cursor:pointer;margin-top:5px;display:inline-block;"
+                  title="点击下载电话名单" @click="DownLoadGuestTelList(item,outItem,index)">电话名单</a>
               </td>
               <td>
                 <div class="fz16 fbold linkspan">
@@ -338,7 +338,7 @@
                 </div>
               </td>
               <td>
-                <div class="fz16 fbold linkspan" @click="goUrl('bookDinnerStatisticsDetails',item,outItem,'餐厅详情')">
+                <div class="fz16 fbold linkspan" @click="goDinnerUrl(item,outItem)">
                   <span style="color: #4BCA81;" v-if="item.FoodsResult==1">√</span>
                   <span class="colorE95252" v-else>{{item.FoodsResult=='-1'?"x":"O"}}</span>
                 </div>
@@ -454,7 +454,8 @@
                       <el-button @click='openChart(item)' icon="iconfont icon-wechat" type="primary"
                         style="background:#6DD875; border-color:#6DD875"></el-button>
                     </el-tooltip>
-                    <el-tooltip class="item" effect="dark" content="酒店操作" placement="top-start" v-if="item.LineId==14">
+                    <el-tooltip class="item" effect="dark" content="酒店操作" placement="top-start"
+                      v-if="item.LineId==14 && IsDMCIsOpenHotel==1">
                       <el-popover placement="bottom" width="300" trigger="click" v-model="item.isShowPop">
                         <table class="dmcSetTable">
                           <tr>
@@ -491,39 +492,6 @@
                           style="background:green; border-color:green"></el-button>
                       </el-popover>
                     </el-tooltip>
-
-                    <el-tooltip class="item" effect="dark" content=" 领队/导游配置" placement="top-start"
-                      v-if="item.LineId==14&&outItem.PriceCommonList.length>1" style="display:none;">
-                      <el-popover placement="bottom" width="800" trigger="click">
-                        <table class="dmcSetTable">
-                          <template v-if="TeamHotelList&&TeamHotelList.length>0">
-                            <tr>
-                              <th>团号/时间</th>
-                              <template v-for="(hItem,hIndex) in TeamHotelList">
-                                <th>
-                                  {{hItem.TCNUM}}<br />({{hItem.TCID}})
-                                </th>
-                              </template>
-                            </tr>
-                          </template>
-                          <template v-for="(hItem,hIndex) in TeamHotelList">
-                            <template v-for="(hSubItem,hSubIndex) in hItem.dayList">
-                              <tr>
-                                <td>{{hSubItem.UseTime}}</td>
-                                <td>
-                                  <template v-if="hSubItem.subList&&hSubItem.subList.length>0">
-                                    {{hSubItem.subList[0].NewHotelName}}
-                                  </template>
-                                </td>
-                              </tr>
-                            </template>
-                          </template>
-                        </table>
-                        <el-button @click="GetTeamHotelList(outItem.TCIDS)" slot="reference"
-                          icon="iconfont icon-guanli2" type="primary" style="background:green; border-color:green">
-                        </el-button>
-                      </el-popover>
-                    </el-tooltip>
                   </el-button-group>
                 </div>
               </td>
@@ -579,6 +547,8 @@
   export default {
     data() {
       return {
+        IsDMCIsOpenHotel: 0, //1-有权限开启或关闭酒店操作
+        IsEditDinner: 0, //1有权限操作餐配
         loading: false,
         currentPage: 1,
         total: 0,
@@ -699,6 +669,28 @@
       commonTeamInfo
     },
     methods: {
+      goDinnerUrl(obj, outItem) {
+        // if (this.IsEditDinner == 1) {
+         this.$router.push({
+          name: 'bookDinnerStatisticsDetails',
+          query: {
+            "id": obj.TCIDS,
+            'TCNUM': obj.TCNUMS,
+            'flightTotal': obj.TotalSeat,
+            'GuestNum': obj.OrderGuestNum,
+            'NewCombinationNum': outItem.NewCombinationNum,
+            'LeaderName': obj.LeaderName,
+            'GuideName': obj.GuideName,
+            'IsCombine': outItem.PriceCommonList.length > 1,
+            'NewTCIDs': outItem.TCIDS,
+            blank: 'y',
+            tab: "餐厅详情"
+          }
+         })
+        // } else {
+        //    this.Error("请联系地接部操作!");
+        // }
+      },
       getLeaderTypeStr: function (clas) {
         if (clas == 1) {
           return "（同行领队）"
@@ -1125,12 +1117,22 @@
             this.loading = false;
           });
       },
-      goRoomTip()
-      {
+      goRoomTip() {
         this.Error("请联系组团OP提供分房表文件!");
+      },
+      GetAuth() {
+        this.apipost('dmcstatistics_get_GetGetDmcTotalTablePageAuth', {}, res => {
+          if (res.data.resultCode == 1) {
+            this.IsDMCIsOpenHotel = res.data.data.IsDMCIsOpenHotel;
+            this.IsEditDinner = res.data.data.IsEditDinner;
+          } else {
+            this.$message.error(res.data.message);
+          }
+        }, err => {})
       }
     },
     mounted() {
+      this.GetAuth();
       let myDate = new Date();
       let nowDate =
         myDate.getFullYear() +