11

src/assets/common/lang/zhCN/Ground.js

@@ -317,8 +317,8 @@ export const obj = {
   menpiaozhongl: "门票种类",
   youjia: "有价",
   jingdanxinx: "景点价格信息",
-  djmpdd:'地接门票订单',
-  xcmp:'行程订单',
+  djmpdd:'地接门票',
+  xcmp:'行程门票',
   mptj:'门票统计',
   hbsj:'航班时间',
   jwzs:'机位总数/(Y/E/F)',

src/components/scenicSpot/scenicSpotSalesBoard.vue

@@ -205,7 +205,7 @@
           <span>
             <em>{{$t('commonPickUp.Pick_attractions')}}</em>
             <el-select v-model="msg.CouponsIdList" :placeholder="$t('pub.pleaseSel')" multiple collapse-tags filterable
-              @change="getMultipleChoice">
+              @change="getMultipleChoice" @clear="getMultipleChoice">
               <el-option :label="$t('pub.unlimitedSel')" :value="defaultSelectValue"></el-option>
               <el-option v-for="item in ScenicList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
             </el-select>
@@ -300,6 +300,7 @@
     methods: {
       // 多选
       getMultipleChoice() {
+        this.msg.CouponsId = 0;
         if (this.msg.CouponsIdList.length > 1) {
           if (this.msg.CouponsIdList.at(-1) == 0) {
             this.msg.CouponsIdList = [0]
@@ -310,7 +311,7 @@
               }
             })
           }
-          this.msg.CouponsId = 0
+          this.msg.CouponsId = 0;
           this.msg.CouponsIds = this.msg.CouponsIdList.join(',')
         }
         if (this.msg.CouponsIdList.length == 1) {
@@ -408,7 +409,8 @@
       //获取酒店列表
       GetScenicList() {
         var postMsg = {
-          QCountrys: ""
+          QCountrys: "",
+          IsFree: 1,
         };
         if (this.userInfo.RB_Group_id == 2) {
           postMsg.QCountrys = "651";
@@ -429,15 +431,18 @@
           this.Info(this.$t('sm.qxzjingdian'));
           return;
         }
-        let url
+        let url="";
+        //单门票下载
         if (this.msg.CouponsId > 0) {
           url = 'ticketcouponsorder_post_DownLoadScenicMonthStatistics'
-        } else {
+        }
+        //多门票下载 
+        else {
           url = 'ticketcouponsorder_post_DownLoadScenicMonthStatisticsNew'
         }
         this.msg.loading = true;
         this.msg.uid = this.userInfo.EmployeeId;
-        let fileName = this.$t('objFill.v101.qxzjingdian')+ this.$commonUtils.getCurrentDate() + ".xls";
+        let fileName = "门票下载" + this.$commonUtils.getCurrentDate() + ".xls";
         this.GetLocalFile(url, this.msg, fileName,
           res => {
             this.msg.loading = false;