App活动

src/components/FinancialModule/ChoiceAddFinancialDocuments2.vue

@@ -25,13 +25,13 @@
       <li :class="active==1?'_active':''" @click="active=1,tabData(1)">{{$t('fnc.shoukuandan')}}</li>
       <li :class="active==2?'_active':''" @click="active=2,tabData(2)">{{$t('fnc.fukuandan')}}</li>
       <li v-if="!visaShowTab" :class="active==3?'_active':''" @click="active=3,tabData(3)">挂账单</li>
-      <li v-if="!visaShowTab" :class="active==4?'_active':''" @click="active=4,tabData(4)">责让单</li>
+      <li v-if="!visaShowTab" :class="active==4?'_active':''" @click="active=4,tabData(4)">折让单</li>
     </ul>
     <ul class="_nav ceshi clearfix" v-else>
       <li :class="active==1?'_active':''"  v-if="showTab==1">{{$t('fnc.shoukuandan')}}</li>
       <li :class="active==2?'_active':''" v-if="showTab==2">{{$t('fnc.fukuandan')}}</li>
       <li :class="active==3?'_active':''" v-if="showTab==3">挂账单</li>
-      <li :class="active==4?'_active':''" v-if="showTab==4">责让单</li>
+      <li :class="active==4?'_active':''" v-if="showTab==4">折让单</li>
     </ul>
     <!-- 搜索框匹配 -->
     <div style="margin:10px 0;">

src/components/FinancialModule/RecPayQuery.vue

@@ -920,7 +920,7 @@ export default {
             this.transactionDate[0]=this.$route.query.StartDate;
             this.transactionDate[1]=this.$route.query.StartDate;
             if(this.$route.query.BankID==''){
-                // 费用类型：机票责让费
+                // 费用类型：机票折让费
                 this.msg.CostTypeID=197;
             }
         }

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -528,7 +528,7 @@ tr._item_list td:last-child {
                 <el-option value="9" v-if="isShowType" label="酒店住宿"></el-option>
                 <el-option value="10" v-if="isShowType" label="景点门票"></el-option>
                 <el-option value="11" v-if="isShowType" label="餐厅美食"></el-option>
-                <el-option value="13" label="机票责让"></el-option>
+                <el-option value="13" label="机票折让"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -698,7 +698,7 @@ Vue.component("TCNUMJump", {
   <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===6" @click="goRec('RecPayQuery',rowData)">{{rowData.TCNUM}}</span>
   <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===7" @click="goRec('RecPayQuery',rowData)">{{rowData.TCNUM}}</span>
   <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===12" @click="goRec('RecPayQuery',rowData)">{{rowData.TCNUM}}</span>
-  <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===13" @click="goRec('RecPayQuery',rowData)">机票责让{{rowData.TCNUM}}</span>
+  <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===13" @click="goRec('RecPayQuery',rowData)">机票折让{{rowData.TCNUM}}</span>
   <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===8" @click="goAIR('RecPayQuery',rowData)">{{rowData.TCNUM}}</span>
   <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===9">{{rowData.TCNUM}}</span>
   <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===10">{{rowData.TCNUM}}</span>
@@ -728,7 +728,7 @@ Vue.component("TCNUMJump", {
       if(rowData.DataType===12){
         BankID=19;
       }
-      // 机票责让费
+      // 机票折让费
       if(rowData.DataType===13){
         BankID="";
         StartDate=moment(rowData.StartDate).format("YYYY-MM-DD");

src/components/TravelManager/TravelList/TeamBalancePayment.vue

@@ -611,7 +611,7 @@
         <div class="clearfix TB_PrintDiv">
           <div class="TB_comtitle TB-Title">成本</div>
           <template v-if="IsHaveAuth">
-            <input type="button" value="团队责让" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn" @click="TDZR" />
+            <input type="button" value="团队折让" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn" @click="TDZR" />
             <input type="button" value="新增" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn" @click="AddOutDetail" />
           </template>
         </div>
@@ -1037,7 +1037,7 @@
             </tr>
           </template>
         </table>
-        <!-- 团队责让 -->
+        <!-- 团队折让 -->
          <div class="clearfix TB_PrintDiv">
           <div class="TB_comtitle TB-Title">内部结算：
             <span v-if="moneyAll.tdzryf>0 || moneyAll.tdzrsf>0">
@@ -1058,7 +1058,7 @@
             <th width="200">当前审核人</th>
           </tr>
           <template v-for="item in DataList.FinicePayList">
-            <tr v-if="isExists(item.CostTypeList,'机票责让费')">
+            <tr v-if="isExists(item.CostTypeList,'机票折让费')">
               <td>
                 <el-checkbox v-model="item.checked"></el-checkbox>
                 <span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span>
@@ -1112,7 +1112,7 @@
           </tr>
           <template v-for="item in DataList.FinicePayList">
             <tr
-              v-if="NotExists(item.CostTypeList,'机票责让费')&&NotExists(item.CostTypeList,'签证费')&&NotExists(item.CostTypeList,'签证佣金') && NotExists(item.CostTypeList,'地接费（领取）') && NotExists(item.CostTypeList,'地接费（结算）') && NotExists(item.CostTypeList,'提成') && NotExists(item.CostTypeList,'国内联运')&& NotExists(item.CostTypeList,'车资') && NotExists(item.CostTypeList,'邀请函费用') && NotExists(item.CostTypeList,'名单表费') && NotExists(item.CostTypeList,'领队佣金') && NotExists(item.CostTypeList,'导游佣金') &&item.OrderSource!==4 &&  NotExists(item.CostTypeList,'国际段机票')  && NotExists(item.CostTypeList,'机票退税') && NotExists(item.CostTypeList,'机票罚金') && NotExists(item.CostTypeList,'机票税金') && item.OrderSource!==11 && NotExists(item.CostTypeList,'赔偿') && NotExists(item.CostTypeList,'保险费') && NotExists(item.CostTypeList,'旅游责任险')">
+              v-if="NotExists(item.CostTypeList,'机票折让费')&&NotExists(item.CostTypeList,'签证费')&&NotExists(item.CostTypeList,'签证佣金') && NotExists(item.CostTypeList,'地接费（领取）') && NotExists(item.CostTypeList,'地接费（结算）') && NotExists(item.CostTypeList,'提成') && NotExists(item.CostTypeList,'国内联运')&& NotExists(item.CostTypeList,'车资') && NotExists(item.CostTypeList,'邀请函费用') && NotExists(item.CostTypeList,'名单表费') && NotExists(item.CostTypeList,'领队佣金') && NotExists(item.CostTypeList,'导游佣金') &&item.OrderSource!==4 &&  NotExists(item.CostTypeList,'国际段机票')  && NotExists(item.CostTypeList,'机票退税') && NotExists(item.CostTypeList,'机票罚金') && NotExists(item.CostTypeList,'机票税金') && item.OrderSource!==11 && NotExists(item.CostTypeList,'赔偿') && NotExists(item.CostTypeList,'保险费') && NotExists(item.CostTypeList,'旅游责任险')">
               <td>
                 <el-checkbox v-model="item.checked"></el-checkbox>
                 <span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span>
@@ -1859,7 +1859,7 @@ this.moneyAll.otheryTotalsf+=item.PayMoney;
                 this.moneyAll.baoxiansf += item.PayMoney;
               }
                // 保险费
-              if (that.isExists(item.CostTypeList, '机票责让费')) {
+              if (that.isExists(item.CostTypeList, '机票折让费')) {
                 this.moneyAll.tdzryf += item.Money;
                 this.moneyAll.tdzrsf += item.PayMoney;
               }
@@ -1874,7 +1874,7 @@ this.moneyAll.otheryTotalsf+=item.PayMoney;
                   .CostTypeList, '国际段机票') && that.NotExists(item.CostTypeList, '机票退税') && that.NotExists(item
                   .CostTypeList, '机票罚金') && that.NotExists(item.CostTypeList, '机票税金') && item.OrderSource !==
                 11 && that.NotExists(item.CostTypeList, '赔偿') && that.NotExists(item.CostTypeList, '保险费') &&
-                that.NotExists(item.CostTypeList, '旅游责任险') && that.NotExists(item.CostTypeList, '机票责让费')) {
+                that.NotExists(item.CostTypeList, '旅游责任险') && that.NotExists(item.CostTypeList, '机票折让费')) {
                 this.moneyAll.otheryf += item.Money;
                 this.moneyAll.othersf += item.PayMoney;
               }
@@ -1926,7 +1926,7 @@ this.moneyAll.otheryTotalsf+=item.PayMoney;
           }
         });
       },
-      //团队责让
+      //团队折让
       TDZR() {
         var TCArr = [this.TCID];
         let orderObj = {

src/components/activity/CouponList.vue

@@ -136,6 +136,7 @@
         <th>{{$t('admin.admin_status')}}</th>
         <th>{{$t('active.cl_addPp')}}</th>
         <th>换购价</th>
+        <th>活动时间</th>
         <th>备注</th>
         <th>{{$t('system.table_operation')}}</th>
       </tr>
@@ -177,6 +178,10 @@
         </td>
         <td>{{item.createUserName}}</td>
         <td>{{item.redemptionPrice}}</td>
+        <td>
+            <p>开始时间：{{item.activityStartDate}}</p>
+            <p>结束时间：{{item.activityEndDate}}</p>
+        </td>
         <td>{{item.remark}}</td>
         <td class="text_al_left">
           <!-- <el-button-group> -->

src/router/config.js

@@ -3798,6 +3798,14 @@ export default {
                                 title: '优惠券列表'
                             }
                         },
+                        {
+                            path: '/AppActivityExclusive',
+                            name: 'AppActivityExclusive',
+                            component: resolve => require(['@/components/activity/AppActivityExclusive'], resolve),
+                            meta: {
+                                title: 'APP专享活动'
+                            }
+                        },
                         {
                             path: '/CouponDetail',
                             name: 'CouponDetail',