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

src/components/Hotel/roomReservationsDetails.vue

@@ -22,7 +22,7 @@
       <ul>
         <li>
           <input v-if="IsOperation!=1" type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
-          <input style="display:none;" type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
+          <input  v-if="IsOperation==1&&CurrentUserInfo.EmployeeId==615" type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
           <span v-if="IsOperation==1" style="color:red;font-size:14px;">已制单，不能再修改!</span>
         </li>
       </ul>
@@ -694,7 +694,6 @@
             if (this.CurrentUserInfo.EmployeeId == 615) {
               this.IsEditHotel = 1;
               this.IsEditHotelPeople = 1;
-              
             }
             let list = res.data.data.HotelOrderListReport;
             this.CreateBy = res.data.data.CreateBy;

src/components/LeaderManagement/leaderReimbursement.vue

@@ -98,7 +98,7 @@
           {{item.StopPrice >= 0 && item.StopPrice !== null ? moneyFormat(item.StopPrice) : ''}}
         </td>
         <td>
-          {{moneyFormat((item.PayType === 1 ? (item.HighSpeedPayType === 1 ? item.HighSpeedPrice + Number(item.CostPrice) : Number(item.CostPrice)) : 0) + Number(item.StopPrice))}}
+          {{moneyFormat( item.HighSpeedPrice + Number(item.CostPrice) + Number(item.StopPrice))}}
           <!-- {{Number(moneyFormat((item.PayType === 1 ? Number(item.CostPrice) : 0) + (item.PayType === 1 ? Number(item.StopPrice) : 0) + (item.HighSpeedPayType === 1 ? Number(item.HighSpeedPrice) : 0))) <= 0 ? '' : moneyFormat((item.PayType === 1 ? Number(item.CostPrice) : 0) + (item.PayType === 1 ? Number(item.StopPrice) : 0) + (item.HighSpeedPayType === 1 ? Number(item.HighSpeedPrice) : 0))}} -->
         </td>
         <td v-if='index==0' :rowspan='list.BusList.length'>
@@ -750,8 +750,7 @@
       busTotalPrice(obj) { 
         let totalPrice = 0
         obj.forEach(item => {
-          totalPrice += (item.PayType === 1 ? Number(item.CostPrice) : 0) + (item.HighSpeedPayType === 1 ? Number(
-            item.HighSpeedPrice) : 0) + Number(item.StopPrice)
+          totalPrice += Number(item.CostPrice) +  Number(item.HighSpeedPrice) +  Number(item.StopPrice)
         })
         return this.moneyFormat(totalPrice)
       },

src/components/Restaurant/bookDinnerStatisticsDetails.vue

@@ -4,13 +4,13 @@
       <ul>
         <li>
           <template v-if="IsOperation != 1">
-            <input v-if="IsOperation != 1" type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
-            <input v-if="IsOperation != 1" type="button" class="fr normalBtn mb30" value="保存草稿" @click="saveList(0)" />
+            <input type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
+            <input type="button" class="fr normalBtn mb30" value="保存草稿" @click="saveList(0)" />
           </template>
           <template v-else>
-            <span v-if="IsOperation==1" style="color:red;font-size:14px;">已制单，不能在修改!</span>
+            <span style="color:red;font-size:14px;">已制单，不能在修改!</span>
+            <input v-if="CurrentUserInfo.EmployeeId==615" type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
           </template>
-          <input type="button" class="fr normalBtn mb30" style="display:none;" value="保存" @click="saveList(1)" />
         </li>
       </ul>
     </div>
@@ -192,6 +192,8 @@
         GuestNum: 0,
         loading: false,
         IsOperation: '',
+        //当前登录人信息
+        CurrentUserInfo:{},
       };
     },
     methods: {
@@ -343,6 +345,8 @@
       },
     },
     mounted() {
+      let userInfo = this.getLocalStorage();
+      this.CurrentUserInfo = userInfo;
       this.TCNUM = this.$route.query.TCNUM;
       this.GuestNum = this.$route.query.GuestNum;
       this.getList();

src/components/SalesModule/groupTourOrder.vue

@@ -932,8 +932,8 @@
           </el-col>
           <el-col :span="4">
             <el-form-item label="单男单女">
-              <el-radio v-model="addMsg.OneSex" :label="1">男</el-radio>
-              <el-radio v-model="addMsg.OneSex" :label="2">女</el-radio>
+              <el-radio v-model="addMsg.OneSex" @click.native.prevent="setDanren(1)" :label="1">男</el-radio>
+              <el-radio v-model="addMsg.OneSex" @click.native.prevent="setDanren(2)" :label="2">女</el-radio>
             </el-form-item>
           </el-col>
         </el-row>
@@ -2262,6 +2262,9 @@
       }
     },
     methods: {
+      setDanren(e){
+        e === this.addMsg.OneSex ? this.addMsg.OneSex = 0 : this.addMsg.OneSex = e
+      },
       gourlTip(path,id){
         this.$router.push({
           name: path,

src/components/SalesModule/investigationYouDetail.vue

@@ -33,13 +33,10 @@
 </style>
 <template>
   <div class="investigationYouDetail">
-    <div v-if="details.GuestTravelLableList" v-for="(item, index) in details.GuestTravelLableList" :key="index" class="item">
+    <div v-for="(item, index) in details.GuestTravelLableList" :key="index" class="item">
       <div class="_lable" v-if="item.Name">{{item.Name}}：</div>
       <div :class="{_content: item.Name}">{{item.Content}}</div>
     </div>
-    <div v-else>
-      <p>未填写</p>
-    </div>
     <el-row class="img-box" :gutter="15">
       <el-col :span="8" v-for="(item, index) in details.NotesPics" :key="index">
         <img :src="item"  @click="showImg(item)" alt>

src/components/SalesModule/productQuery.vue

@@ -340,8 +340,8 @@
           </el-col>
           <el-col :span="4">
             <el-form-item label="单男单女">
-              <el-radio v-model="addMsg.OneSex" label="1">男</el-radio>
-              <el-radio v-model="addMsg.OneSex" label="2">女</el-radio>
+              <el-radio v-model="addMsg.OneSex" @click.native.prevent="setDanren(1)" label="1">男</el-radio>
+              <el-radio v-model="addMsg.OneSex" @click.native.prevent="setDanren(1)" label="2">女</el-radio>
             </el-form-item>
           </el-col>
         </el-row>
@@ -1174,6 +1174,9 @@
       }
     },
     methods: {
+      setDanren(e){
+        e === this.addMsg.OneSex ? this.addMsg.OneSex = 0 : this.addMsg.OneSex = e
+      },
       groupTypeChange: function (val) {
         if (val === '4') {
           this.addMsg.ManNum = 0

src/components/TravelManager/TravelLeader/Leader.vue

@@ -195,7 +195,7 @@
   z-index: 20;
 }
 .Leader ._sanjiao_:after {
-  content: '外';
+  content: '同';
   position: absolute;
   top: -15px;
   left: -14px;
@@ -289,7 +289,7 @@
     </el-pagination>
     <el-dialog custom-class='addCompany' :title="dialogTitle" :visible.sync="outerVisible" center :before-close="closeChangeMachie">
       <el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="100px">
-        <el-form-item :label="$t('system.query_workType')" prop="Type">
+        <el-form-item :label="$t('system.query_workType')" prop="LeaderGuidClass">
           <el-select v-model="addMsg.LeaderGuidClass" :placeholder="$t('admin.admin_workType')" class="w210">
             <el-option key="0" label="公司领队" :value="0"></el-option>
             <el-option key="1" label="同行领队" :value="1"></el-option>
@@ -506,7 +506,7 @@ export default {
             trigger: "change"
           }
         ],
-        Type: [
+        LeaderGuidClass: [
           {
             required: true,
             message: "请选择工作类型",

src/components/TravelManager/TravelList/HotelOrderTotal.vue

@@ -294,8 +294,8 @@
         <th>订单号</th>
         <th>第三方订单号</th>
         <th>房间数</th>
-        <th>总价</th>
-        <th>已收</th>
+        <th>总额</th>
+        <th>实收</th>
         <th>大红包</th>
         <th>优惠金额</th>
         <th>待收金额</th>

src/components/TravelManager/TravelList/OpHotelOrder.vue

@@ -73,8 +73,8 @@
         <th>订单号</th>
         <th>客户信息</th>
         <th>房间数</th>
-        <th>总价格</th>
-        <th>总收入</th>
+        <th>总额</th>
+        <th>实收</th>
         <th>抵扣金额</th>
         <th>优惠金额</th>
         <th>待收金额</th>

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -1397,7 +1397,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            &nbsp;
+            <el-form-item label="单男单女">
+              <el-radio v-model="addMsg.OneSex" @click.native.prevent="setDanren(1)" :label="1">男</el-radio>
+              <el-radio v-model="addMsg.OneSex" @click.native.prevent="setDanren(2)" :label="2">女</el-radio>
+            </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
@@ -2482,7 +2485,7 @@
             <div class="RL_ListDiv">
               <div class="LeaderSpan" :class="{'ckedClass':ckedIndex==index}" v-for="(item,index) in leaderListArr"
                 @click="getLeaderInfo(index,item.LeaderId)" :key="item.subCode">
-                <span class="RL_LeaderName">{{item.LeaderName}}【{{item.Type==2?"领兼导":"领队"}}】</span>
+                <span class="RL_LeaderName">{{item.LeaderName}}【{{getLeaderTypeStr(item.Type, item.LeaderGuidClass)}}】</span>
               </div>
             </div>
           </div>
@@ -2945,6 +2948,7 @@
           //订单归属【HK新加，报名清单页面修改使用】
           CreateBy: 0,
           RefuseVisaNum: 0, //拒签人数
+          OneSex: ""
         },
         //行程下载使用
         travelControlTripLayerShow: false,
@@ -3217,6 +3221,20 @@
       commonShouSun: commonShouSun
     },
     methods: {
+      setDanren(e){
+        e === this.addMsg.OneSex ? this.addMsg.OneSex = 0 : this.addMsg.OneSex = e
+      },
+      getLeaderTypeStr: function (type, clas){
+        if (type == 2) {
+          return "领兼地"
+        } else if (type == 1 && clas == 0) {
+          return "领队"
+        } else if (type == 1 && clas == 1) {
+          return "同行领队"
+        } else if (type == 1 && clas == 2) {
+          return "临时领队"
+        }
+      },
       gourlTip(path,id){
         this.$router.push({
           name: path,

src/components/TravelManager/TravelList/TravelpassengerList.vue

 <style>
-.PT_teamTable {
+  .PT_teamTable {
     width: 800px;
     border-collapse: collapse;
-}
-.PT_teamTable td,
-.PT_teamTable th {
+  }
+
+  .PT_teamTable td,
+  .PT_teamTable th {
     border: 1px solid #dcdcdc;
     padding: 5px;
     height: 30px;
-}
-.PT_teamTable tr th {
+  }
+
+  .PT_teamTable tr th {
     background: #eee;
     height: 30px;
     border: 1px solid #dcdcdc;
-}
-.PT_teamTable tr td{background: #fff;}
-.travelpassengerlist{font-size: 12px; background: #dcdcdc;}
-.travelpassengerlist tr th {
+  }
+
+  .PT_teamTable tr td {
+    background: #fff;
+  }
+
+  .travelpassengerlist {
+    font-size: 12px;
+    background: #dcdcdc;
+  }
+
+  .travelpassengerlist tr th {
     height: 30px;
-}
-.travelpassengerlist tr td{background: #fff; text-align: center;}
-/*拒签人员*/
- .travelpassengerlist .redTr td{
+  }
+
+  .travelpassengerlist tr td {
+    background: #fff;
+    text-align: center;
+  }
+
+  /*拒签人员*/
+  .travelpassengerlist .redTr td {
     color: #E95252;
   }
+
 </style>
 
 <template>
@@ -39,7 +55,8 @@
               <th width="120">出发日期</th>
             </tr>
             <tr v-for="item in QueryMsg.TeamInfoData">
-              <td><a @click="goUrlTravelControl('团控列表','TravelControlList',item.TCID,item.TCNUM)" style="cursor:pointer;color:blue;">{{item.TCNUM}}</a></td>
+              <td><a @click="goUrlTravelControl('团控列表','TravelControlList',item.TCID,item.TCNUM)"
+                  style="cursor:pointer;color:blue;">{{item.TCNUM}}</a></td>
               <td>{{item.Title}}</td>
               <td>{{item.Inventory}}人</td>
               <td>{{item.StartDate}} {{item.WeekStr}}</td>
@@ -51,13 +68,7 @@
         </li>
       </ul>
     </div>
-    <table
-      class="travelpassengerlist"
-      border="0"
-      cellspacing="1"
-      cellpadding="0"
-      v-loading="QueryMsg.loading"
-    >
+    <table class="travelpassengerlist" border="0" cellspacing="1" cellpadding="0" v-loading="QueryMsg.loading">
       <tr>
         <th width="50">房间数</th>
         <th width="50">房号</th>
@@ -94,9 +105,9 @@
               {{getHouseTypeStr(subItem.HouseType)}}
             </template>
             <template v-else>
-              {{getHouseTypeStr(subItem.SingleRoomType)}} <br/><span style="color:red;">(指定)</span>
+              {{getHouseTypeStr(subItem.SingleRoomType)}} <br /><span style="color:red;">(指定)</span>
             </template>
-            <template v-if="subItem.IsBed==0"><br/><span style="color:red;">(不占床)</span></template>
+            <template v-if="subItem.IsBed==0"><br /><span style="color:red;">(不占床)</span></template>
           </td>
           <td>{{subItem.GuestName}}</td>
           <td>{{subItem.ESurName}}</td>
@@ -124,7 +135,7 @@
   </div>
 </template>
 <script>
-export default {
+  export default {
     data() {
       return {
         //请求数据
@@ -135,8 +146,8 @@ export default {
           OrderId: 0,
           currentPage: 1
         },
-      IsHaveLeader:1,//1-有领队,0-无领队
-      IsLeaderGuide:0,//1-领兼导,0-领队
+        IsHaveLeader: 1, //1-有领队,0-无领队
+        IsLeaderGuide: 0, //1-领兼导,0-领队
         TCID: 0,
         QueryMsg: {
           loading: true,
@@ -150,7 +161,6 @@ export default {
       };
     },
     methods: {
-
       goUrlTravelControl(name, path, id, tcmun) {
         this.$router.push({
           name: path,
@@ -181,14 +191,11 @@ export default {
           str = "标准双人间";
         } else if (HouseType == 3) {
           str = "大床房";
-      } 
-      else if (HouseType == 4) {
+        } else if (HouseType == 4) {
           str = "三人间";
-      } 
-      else if (HouseType== 5) {
+        } else if (HouseType == 5) {
           str = "拼凑双人间";
-      } 
-      else {
+        } else {
           str = "未分配";
         }
         return str;
@@ -203,14 +210,15 @@ export default {
             this.QueryMsg.loading = false;
             if (res.data.resultCode == 1) {
               this.QueryMsg.dataList = res.data.data.pageData.result;
-            this.IsHaveLeader=res.data.data.pageData.IsHaveLeader;
-            this.IsLeaderGuide=res.data.data.pageData.IsLeaderGuide;
+              this.IsHaveLeader = res.data.data.pageData.IsHaveLeader;
+              this.IsLeaderGuide = res.data.data.pageData.IsLeaderGuide;
             }
           },
           err => {}
         );
       },
       exportExcel() {
+        this.QueryMsg.loading = true;
         //导出报表
         let msg = {
           TCID: this.msg.TCID
@@ -220,7 +228,9 @@ export default {
           fileName =
             "【" + this.QueryMsg.TeamInfoData[0].TCNUM + "】旅客名单.xls";
         }
-      this.GetLocalFile("travel_get_GetTravelGuestExport", msg, fileName);
+        this.GetLocalFile("travel_get_GetTravelGuestExport", msg, fileName, res => {
+          this.QueryMsg.loading = false;
+        });
       },
 
       //获取团期信息
@@ -247,5 +257,6 @@ export default {
       this.getTeamInfo();
       this.getList();
     }
-};
+  };
+
 </script>

src/components/commonPage/commonTeamInfo.vue

 <style>
-@import "../../assets/css/trip/index.css";
+  @import "../../assets/css/trip/index.css";
+
 </style>
 
 <template>
@@ -13,7 +14,12 @@
     </div>
     <div class="trip-block-commonTeam" v-for="(item,i) in tripList" :key="i">
       <div class="trip-title">
-                <div class="day">第<span v-if='item.dayNum<10'>0</span>{{item.dayNum}}天</div>
+        <div>
+          <p class="day">第<span v-if='item.dayNum<10'>0</span>{{item.dayNum}}天</p>
+          <template v-if="startDate&&startDate!=''">
+            <p>{{GetDayStr(startDate,item.dayNum-1)}}</p>
+          </template>
+        </div>
         <div class="desc" v-html="item.title"></div>
       </div>
       <oneday v-if="item.details && item.details.length==1" :day='item'></oneday>
@@ -25,17 +31,18 @@
   </div>
 </template>
 <script>
-import oneday from "../commonPage/TravelTripPreview/oneday";
-import twoday from "../commonPage/TravelTripPreview/twoday";
-import threeday from "../commonPage/TravelTripPreview/threeday";
-import fourday from "../commonPage/TravelTripPreview/fourday";
-import fiveday from "../commonPage/TravelTripPreview/fiveday";
-export default {
+  import oneday from "../commonPage/TravelTripPreview/oneday";
+  import twoday from "../commonPage/TravelTripPreview/twoday";
+  import threeday from "../commonPage/TravelTripPreview/threeday";
+  import fourday from "../commonPage/TravelTripPreview/fourday";
+  import fiveday from "../commonPage/TravelTripPreview/fiveday";
+  export default {
     props: ["subConfig"],
     data() {
       return {
         tripList: [],
-      loading:false
+        loading: false,
+        startDate: ""
       };
     },
     components: {
@@ -47,19 +54,31 @@ export default {
     },
     mounted() {},
     methods: {
-    GetTrip(id) {
-      this.tripList=[];
+      GetDayStr(dateStr, dayNum) {
+        return this.$commonUtils.AddDay(dateStr, dayNum);
+      },
+      GetTrip(id, TCID) {
+        this.tripList = [];
+        this.startDate = '';
+        var nTCID = 0;
+        if (TCID) {
+          nTCID = TCID;
+        }
+        var msg = {
+          configId: id,
+          tcid: nTCID
+        };
         if (id !== undefined) {
           //根据ID 获取行程内容
-        this.loading=true;
+          this.loading = true;
           this.apipost(
-          "b2b_get_GetB2BTravelInfoNoDes",
-          {
-            configId: id
-          },
+            "b2b_get_GetB2BTravelInfoNoDes", msg,
             res => {
-            this.loading=false;
+              this.loading = false;
               if (res.data.resultCode == 1) {
+                if (res.data.data.priceList && res.data.data.priceList.length > 0) {
+                  this.startDate = res.data.data.priceList[0].startDate;
+                }
                 this.tripList = res.data.data.dayList;
                 this.init();
               }
@@ -224,10 +243,8 @@ export default {
               let obj = {
                 title: y.childItem.title,
                 content: y.childItem.description,
-              img:
-                y.childItem.imaArray && y.childItem.imaArray.length > 0
-                  ? y.childItem.imaArray[0].url
-                  : "",
+                img: y.childItem.imaArray && y.childItem.imaArray.length > 0 ?
+                  y.childItem.imaArray[0].url : "",
                 ticketName: "",
                 playTimeHour: null,
                 playTimeMinutes: null
@@ -358,11 +375,11 @@ export default {
             details = activy;
           }
           x.title =
-          dadian.length > 0
-            ? dadian[0].title
-            : jiao.length > 0
-              ? jiao[0].title
-              : "集合出发";
+            dadian.length > 0 ?
+            dadian[0].title :
+            jiao.length > 0 ?
+            jiao[0].title :
+            "集合出发";
           x.details = details;
 
           if (x.details.length == 0) {
@@ -415,5 +432,6 @@ export default {
         }
       }
     }
-};
+  };
+
 </script>

src/components/dmc/manager/dmcTotalTable.vue

@@ -257,7 +257,7 @@
               <td>
                 <div class="link">
                   <p v-if='!item.LeaderName' @click="goUrlT('RegistrationList',item.TCID,'报名清单')">配置领队</p>
-                  <p v-else @click="goUrlT('RegistrationList',item.TCID,'报名清单')">{{item.LeaderName}}</p>
+                  <p v-else @click="goUrlT('RegistrationList',item.TCID,'报名清单')">{{item.LeaderName}}{{getLeaderTypeStr(item.LeaderGuidClass)}}</p>
                 </div>
               </td>
               <td>
@@ -330,6 +330,7 @@
                   <span style="color: #4BCA81;" v-if="item.FoodsResult==1">√</span>
                   <span class="colorE95252" v-else>{{item.FoodsResult=='-1'?"x":"O"}}</span>
                 </div>
+                 <a style="text-decoration:underline;cursor:pointer;" title="点击下载旅客名单" @click="DownLoadDinner(item)">餐配下载</a>
               </td>
 
               <td>
@@ -514,7 +515,7 @@
             <tr>
               <td colspan="22" style="text-align: left!important;padding:0 20px;">
                 <div class="link">
-                  <p @click="getJourney(item.ConfigID,item.Title)" style="padding-top:4px;">{{item.Title}}</p>
+                  <p @click="getJourney(item)" style="padding-top:4px;">{{item.Title}}</p>
                   <div v-if="outItem.PriceCommonList[index].DMCNum && outItem.PriceCommonList[index].DMCNum!=''"
                     class="colorE95252" style="padding-top:5px;">地接备注团号:{{outItem.PriceCommonList[index].DMCNum}}
                   </div>
@@ -682,11 +683,18 @@
       commonTeamInfo
     },
     methods: {
-      getJourney(id, title) {
+      getLeaderTypeStr: function (clas){
+        if (clas == 1) {
+          return "（同行领队）"
+        } else if (clas == 2) {
+          return "（临时领队）"
+        }
+      },
+      getJourney(item) {
         var that = this;
-        this.tripTitle = title;
+        this.tripTitle = item.Title;
         this.$nextTick(() => {
-          that.$refs.comTeam.GetTrip(id);
+          that.$refs.comTeam.GetTrip(item.ConfigID,item.TCID);
         });
         that.teamVisible = true;
       },
@@ -1051,7 +1059,26 @@
             tab: "手配依赖书"
           }
         })
+      },
+      DownLoadDinner(item)
+      {
+        this.loading = true;
+        //导出报表
+        let msg = {
+          TCID: item.TCID,
+          StartDate:item.StartDateStr,
+          DayNum:item.DayNum
+        };
+        var fileName = "餐配下载.xls";
+        if (item.TCNUMS != null) {
+          fileName =
+            "【" + item.TCNUMS + "】餐配下载.xls";
         }
+        this.GetLocalFile("travel_get_GetTravelDinnerDownLoad", msg, fileName,
+          res => {
+            this.loading = false;
+          });
+      },
     },
     mounted() {
       let myDate = new Date();
@@ -1062,7 +1089,6 @@
         "-" +
         myDate.getDate();
       this.msg.StartDate = nowDate;
-      //this.msg.CombinationNum = 'JVS0727OTC-MUA';
       this.getLineList();
       this.getList();
       this.getCompanyList();

src/components/scenicSpot/admissionStatistics.vue

@@ -105,7 +105,7 @@
                       {{thirdItem.UseTimeStr}}
                     </td>
                     <td style="text-align:left;padding-left:3px;">
-                      {{thirdItem.ScenicName}}
+                      {{thirdItem.ScenicName}} 【<span style="color:red">{{getUseTypeStr(thirdItem.TicketPriceList)}}</span>】
                     </td>
                     <td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0'>
                       <div class="link">
@@ -143,6 +143,8 @@
         loading: false,
         currentPage: 1,
         total: 0,
+          //当前登录用户
+        CurrentUserInfo: {},
         msg: {
           pageIndex: 1,
           pageSize: 5,
@@ -158,6 +160,25 @@
       }
     },
     methods: {
+      getUseTypeStr(item) {
+        var str = '';
+        if (item) {
+          item.forEach(childItem => {
+            var useStr = "";
+            if (childItem.PeopleType == 1) {
+              useStr = "成人"
+            }
+            if (childItem.PeopleType == 2) {
+              useStr = "中人"
+            }
+            if (childItem.PeopleType == 3) {
+              useStr = "小人"
+            }
+            str+=useStr+":"+childItem.UsePeopleNum+"，";
+          });
+        }
+        return str.substring(0,str.lastIndexOf('，'));
+      },
       getLineList() {
         this.apipost("line_post_GetAllList", {}, res => {
           if (res.data.resultCode == 1) {
@@ -245,6 +266,8 @@
       },
     },
     mounted() {
+            let userInfo = this.getLocalStorage()
+      this.CurrentUserInfo = userInfo;
       let myDate = new Date();
       let nowDate =
         myDate.getFullYear() +
@@ -284,10 +307,12 @@
   .admissionStatisticsTalbe tr td {
     font-size: 12px;
   }
+
   .admissionStatisticsTalbe tr td .link p:hover {
     text-decoration: underline;
     cursor: pointer;
   }
+
   .admissionStatistics_tripDetails {
     padding: 0;
     box-shadow: 0px 1px 3px 0px #dedede;

src/components/scenicSpot/admissionStatisticsDetails.vue

@@ -9,8 +9,8 @@
           </template>
           <template v-else>
             <span style="color:red;font-size:14px;">已制单，不能在修改!</span>
+            <input v-if="CurrentUserInfo.EmployeeId == 615" type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
           </template>
-          <input style="display:none;" type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
         </li>
       </ul>
     </div>

src/components/systemManagement/destinationManagement.vue

@@ -212,7 +212,7 @@ export default {
       let msg = {
         IsShow: -1
       };
-      this.apipost("line_post_GetAllList", msg, res => {
+      this.apipost("line_post_GetAllList_V3", msg, res => {
         this.lineList = res.data.data;
       });
     },

src/components/systemManagement/seriesManagement.vue

@@ -301,7 +301,7 @@ export default {
       let msg = {
         IsShow: -1
       };
-      this.apipost("line_post_GetAllList", msg, res => {
+      this.apipost("line_post_GetAllList_V3", msg, res => {
         this.lineList = res.data.data;
       });
     },

src/router/config.js

@@ -3533,6 +3533,14 @@ export default {
                                 title: '轮播图管理'
                             }
                         },
+                        {
+                            path: '/PersonnelManagement',
+                            name: 'PersonnelManagement',
+                            component: resolve => require(['@/components/activity/PersonnelManagement'], resolve),
+                            meta: {
+                                title: '人员管理'
+                            }
+                        },
                         {
                             path: '/BmenuManagement',
                             name: 'BmenuManagement',
@@ -3661,7 +3669,8 @@ export default {
                             meta: {
                                 title: '票务规则配置'
                             }
-                        }
+                        },
+                        
                     ]
                 },
                 {
@@ -3705,6 +3714,7 @@ export default {
                 title: '领队报账'
             }
         },
+        
         {
             path: '/supplierLogin', //供应商登录
             name: 'supplierLogin',