页面修改

src/components/scenicSpot/admissionStatistics.vue

@@ -2,10 +2,34 @@
   <div>
     <div class="query-box" style="border-bottom: none;">
       <ul>
-        <li><span><em>{{$t('advmanager.v_xilie')}}</em>
+        <li>
+          <span>
+            <em>{{$t('advmanager.v_line')}}</em>
+            <el-select v-model="msg.LineId" filterable :placeholder="$t('pub.pleaseSel')" @change="getLinePlaceList()">
+              <el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
+              <el-option v-for="item in queryCommonData.LineList" :label='item.LineName' :value='item.LineID'
+                :key='item.LineID'>
+              </el-option>
+            </el-select>
+          </span>
+        </li>
+        <li>
+          <span>
+            <em>{{$t('Operation.Op_Country')}}/{{$t('system.query_dest')}}</em>
+            <el-select v-model="msg.PlaceID" filterable :placeholder="$t('pub.pleaseSel')" @change="getLineTeamList()">
+              <el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
+              <el-option v-for="item in queryCommonData.PlaceList" :label="item.PlaceName" :value="item.PlaceID"
+                :key="item.LtID"></el-option>
+            </el-select>
+          </span>
+        </li>
+        <li>
+          <span>
+            <em>{{$t('advmanager.v_xilie')}}</em>
             <el-select v-model="msg.LineteamId" filterable :placeholder="$t('pub.pleaseSel')">
-              <el-option :label="$t('pub.unlimitedSel')" value='-1'></el-option>
-              <el-option v-for="item in LineTeamList" :label='item.LtName' :value='item.LtID' :key='item.LtID'>
+              <el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
+              <el-option v-for="item in queryCommonData.LineTeamList" :label='item.LtName' :value='item.LtID'
+                :key='item.LtID'>
               </el-option>
             </el-select>
           </span>
@@ -85,7 +109,8 @@
                           </tr>
                         </table>
                         <el-button slot="reference" class="normalBtn mt5"
-                          style='height:24px; padding: 0 10px; background: #2AAEF2; border-color: #2AAEF2;'>{{$t('fnc.xiangqing')}}
+                          style='height:24px; padding: 0 10px; background: #2AAEF2; border-color: #2AAEF2;'>
+                          {{$t('fnc.xiangqing')}}
                         </el-button>
                       </el-popover>
                     </td>
@@ -105,12 +130,14 @@
                       {{thirdItem.UseTimeStr}}
                     </td>
                     <td style="text-align:left;padding-left:3px;">
-                      {{thirdItem.ScenicName}} 【<span style="color:red">{{getUseTypeStr(thirdItem.TicketPriceList)}}</span>】
+                      {{thirdItem.ScenicName}} 【<span
+                        style="color:red">{{getUseTypeStr(thirdItem.TicketPriceList)}}</span>】
                     </td>
                     <td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0'>
                       <div class="link">
                         <div class="w80">
-                          <p @click="goUrl('admissionStatisticsDetails',item,outItem,'门票详情')">{{$t('fnc.xiangqing')}}</p>
+                          <p @click="goTicketDetails(item,outItem,'门票详情')">{{$t('fnc.xiangqing')}}
+                          </p>
                         </div>
                       </div>
                     </td>
@@ -140,6 +167,7 @@
   export default {
     data() {
       return {
+        userInfo: {}, //用户信息
         loading: false,
         currentPage: 1,
         total: 0,
@@ -147,13 +175,18 @@
           pageIndex: 1,
           pageSize: 5,
           SelectType: 3,
-          LineId: 14,
-          LineteamId: "-1",
+          LineId: 0,
+          PlaceID: 0,
+          LineteamId: 0,
           StartDate: '',
           EndDate: ''
         },
+        queryCommonData: {
+
+          PlaceList: [],
           LineList: [],
           LineTeamList: [],
+        },
         DataList: [],
       }
     },
@@ -172,35 +205,49 @@
             if (childItem.PeopleType == 3) {
               useStr = "小人"
             }
-            str+=useStr+":"+childItem.UsePeopleNum+"，";
+            str += useStr + ":" + childItem.UsePeopleNum + "，";
           });
         }
-        return str.substring(0,str.lastIndexOf('，'));
+        return str.substring(0, str.lastIndexOf('，'));
       },
       getLineList() {
         this.apipost("line_post_GetAllList", {}, res => {
           if (res.data.resultCode == 1) {
-            this.LineList = res.data.data;
+            this.queryCommonData.LineList = res.data.data;
+            this.queryCommonData.PlaceList = []
+            this.queryCommonData.LineTeamList = []
           } else {
-            this.$message.error(res.data.message);
+            this.Error(res.data.message);
           }
         });
       },
+      //获取目的地列表
+      getLinePlaceList() {
+        this.msg.PlaceID = 0;
+        this.msg.LineteamId = 0;
+        let msg = {
+          lineID: this.msg.LineId,
+        }
+        this.apipost('team_post_GetLinePlace', msg, res => {
+          if (res.data.resultCode == 1) {
+            this.queryCommonData.PlaceList = res.data.data
+            this.queryCommonData.LineTeamList = []
+          }
+        })
+      },
       //获取系列列表
-      getLineTeamList(lineId) {
-        this.LineTeamList = [];
-        this.apipost(
-          "team_post_GetList", {
-            lineID: 14,
+      getLineTeamList() {
+        this.msg.LineteamId = 0
+        let msg = {
+          lineID: this.msg.LineId,
+          placeID: this.msg.PlaceID,
           isTOOP: 1
-          },
-          res => {
-            if (res.data.resultCode == 1) {
-              this.msg.LineteamId = "-1";
-              this.LineTeamList = res.data.data;
         }
+        this.apipost('team_post_GetList', msg, res => {
+          if (res.data.resultCode == 1) {
+            this.queryCommonData.LineTeamList = res.data.data
           }
-        );
+        })
       },
       goUrlT(path, obj, title) {
         this.$router.push({
@@ -212,7 +259,11 @@
           }
         })
       },
-      goUrl(path, obj, outItem, title) {
+      goTicketDetails(obj, outItem, title) {
+        var path = "admissionStatisticsDetails";
+        if (this.userInfo.RB_Group_id == 91) {
+          path = "admissionStatisticsDetails_SWT";
+        }
         this.$router.push({
           name: path,
           query: {
@@ -264,6 +315,10 @@
       },
     },
     mounted() {
+      this.userInfo = this.getLocalStorage();
+      if (this.userInfo.RB_Group_id == 2) {
+        this.msg.LineId = 14;
+      }
       let myDate = new Date();
       let nowDate =
         myDate.getFullYear() +
@@ -272,6 +327,7 @@
         "-" +
         myDate.getDate();
       this.msg.StartDate = nowDate;
+      this.getLineList();
       this.getList()
     },
   }

src/components/scenicSpot/scenicSpotSalesBoard.vue

@@ -210,7 +210,7 @@
             </el-select>
           </span>
         </li>
-         <li >
+        <li>
           <span>
             <em>{{$t('advmanager.v_type')}}</em>
             <el-select v-model="msg.QStatus" :placeholder="$t('pub.pleaseSel')" filterable>
@@ -221,7 +221,8 @@
         </li>
         <li style="margin-right:50px;">
           <button class="normalBtn" type="button" @click="GetHoltelInventory()">{{$t('pub.searchBtn')}}</button>
-          <button class="normalBtn" type="button" @click="DownLoadDinnerSalesBoard()" >{{$t('adm.adm_download')}}</button>
+          <button class="normalBtn" type="button"
+            @click="DownLoadDinnerSalesBoard()">{{$t('adm.adm_download')}}</button>
         </li>
       </ul>
     </div>
@@ -272,12 +273,14 @@
   export default {
     data() {
       return {
+        userInfo: {}, //当前用户登录信息
         msg: {
           Year: 0,
           Month: 0,
           CouponsId: 0,
-          QStatus:0,
-          loading: false
+          QStatus: 0,
+          loading: false,
+          uid:0,
         },
         //餐厅列表
         ScenicList: [],
@@ -353,7 +356,7 @@
         var that = this;
         this.msg.Year = this.currentYear;
         this.msg.Month = this.currentMonth;
-        this.DayData=[];
+        this.DayData = [];
         this.apipost(
           "ticketcouponsorder_post_GetScenicMonthStatistics",
           this.msg,
@@ -367,7 +370,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;
@@ -382,7 +385,9 @@
       //获取酒店列表
       GetScenicList() {
         this.apipost(
-          "ticketcoupons_post_GetList", {QCountry:651},
+          "ticketcoupons_post_GetList", {
+            QCountrys: "651,1252"
+          },
           res => {
             if (res.data.resultCode == 1) {
               this.ScenicList = res.data.data;
@@ -398,6 +403,7 @@
           return;
         }
         this.msg.loading = true;
+        this.msg.uid=this.userInfo.EmployeeId;
         let fileName = "门票下载" + this.$commonUtils.getCurrentDate() + ".xls";
         this.GetLocalFile("ticketcouponsorder_post_DownLoadScenicMonthStatistics", this.msg, fileName,
           res => {
@@ -406,6 +412,7 @@
       }
     },
     mounted() {
+      this.userInfo = this.getLocalStorage();
       //初始化日历
       let myDate = new Date();
       this.currentYear = myDate.getFullYear();