机票生成财务单据未带出团问题修复

src/components/Ticketing/PassengerList.vue

@@ -486,9 +486,9 @@
         let orderObj = {
           OrderID: 0,
           OrderSource: 4,
-          Obj: {},
+          Obj: JSON.parse(this.$route.query.Obj),
           SourceID: this.$route.query.id,
-          TCIDList: [],
+          TCIDList: JSON.parse(this.$route.query.TCIDList),
           isFromPassenger:true,
         }
         this.$router.push({

src/components/Ticketing/TicketManager.vue

@@ -1530,7 +1530,7 @@
                       </div>
                     </li>
                     <li v-else-if="item.FinalPayment!=''">
-                      <div @click="goCustomList('PassengerList',item,'旅客名单')" :class="getClass(item.FinalPaymentStatus)">
+                      <div @click="goCustomList('PassengerList',item, 5,'旅客名单')" :class="getClass(item.FinalPaymentStatus)">
                         <el-tooltip effect="dark" :content="item.FinalPayment" placement="top" popper-class="max-w250">
                           <span>尾</span>
                         </el-tooltip>
@@ -2516,14 +2516,18 @@
         });
       },
       //跳转至旅客名单
-      goCustomList(path, obj, title){
+      goCustomList(path, obj, type, title){
+        console.log(obj.TCIDList)
         this.$router.push({
           name: path,
           query: {
             blank: 'y',
             isFromTk:true,
             id: obj.ID,
-            TCIDList: obj.TCIDList,
+            Obj: JSON.stringify({
+              Type: type
+            }),
+            TCIDList: JSON.stringify(obj.TCIDList),
             companyIDList: obj.OutBranchIdList,
             tab: title
           }

src/components/activity/MemberLevel.vue

 <template>
   <div class="flexOne">
     <div class="query-box">
-      <ul class="user_time_picker"> 
+      <ul class="user_time_picker">
         <li>
-          <input type="button" @click=" " class="hollowFixedBtn" value="查询">
-          <input type="button" @click="outerVisible = true,dialogTitle=$t('active.ad_addad'),resetInfo()" class="normalBtn" :value="$t('pub.addBtn')">
+          <span>
+            <em>等级名称</em>
+            <el-input v-model="msg.name" @keyup.enter.native="getList"></el-input>
+          </span>
+        </li>
+        <li>
+          <span>
+            <em>状态</em>
+            <el-select filterable v-model="msg.state">
+              <el-option label="不限" :value="-1"></el-option>
+              <el-option label="正常" :value="1"></el-option>
+              <el-option label="禁用" :value="0"></el-option>
+            </el-select>
+          </span>
+        </li>
+        <li>
+          <input type="button" @click="getList" class="hollowFixedBtn" value="查询">
+          <input type="button" @click="outerVisible = true,dialogTitle='新增等级',resetInfo()" class="normalBtn" :value="$t('pub.addBtn')">
         </li>
       </ul>
     </div>
@@ -13,27 +29,31 @@
     <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
       <tr>
         <th>会员等级</th>
-        <th>等级名称</th>
-        <th>积分</th>
-        <th>特权</th>
-        <th>升降级标准</th>
-        <th>星级有效期延长的条件</th>
+        <th>特权信息</th>
+        <th>交易金额要求</th>
+        <th>交易人头要求</th>
+        <th>等级说明</th>
+        <th>状态</th>
         <th>操作</th>
       </tr>
       <tr v-for="item in dataList">
-         <td>{{item.rank}}</td>
-         <td>{{item.awardName}}</td>
-         <td>{{item.awardCount}}</td>
-         <td>{{item.awardWinningCount}}</td>
-         <td>223</td>
-         <td>22</td>
+         <td>{{item.name}}</td>
+         <td>
+           <span v-for="son in item.jurisdictionList">
+            {{son.name}}
+           </span>
+         </td>
+         <td>{{item.tradeMoneyReq}}</td>
+         <td>{{item.tradePeopleReq}}</td>
+         <td>{{item.remark}}</td>
+         <td>{{item.state === 1 ? '正常' : '禁用'}}</td>
          <td>
             <el-tooltip class="item" effect="dark" :content="$t('active.ld_editInfo')" placement="top">
                 <el-button
                 type="primary"
                 icon="el-icon-edit"
                 circle
-                @click="outerVisible=true,dialogTitle=$t('active.ld_editInfo'),updateData(item)"
+                @click="outerVisible=true,dialogTitle='修改等级',updateData(item)"
                 ></el-button>
             </el-tooltip>
          </td>
@@ -48,33 +68,32 @@
       :title="dialogTitle"
       :visible.sync="outerVisible"
       center
-      :before-close="closeChangeMachie"
-    >
+      :before-close="closeChangeMachie">
       <el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="100px">
         <table class="layerTable layerNoIcon">
           <tr>
             <td>
-              <el-form-item label="会员等级" prop="memberLevel">
-                <el-input v-model="addMsg.memberLevel" class="w217" />
+              <el-form-item label="等级名称" prop="name">
+                <el-input v-model="addMsg.name" class="w217" />
               </el-form-item>
             </td>
             <td>
-              <el-form-item label="等级名称" prop="memberName">
-                <el-input v-model="addMsg.memberName" class="w217" />
+              <el-form-item label="	等级状态" prop="state">
+                <el-select filterable v-model="addMsg.state">
+                  <el-option label="正常" :value="1"></el-option>
+                  <el-option label="禁用" :value="0"></el-option>
+                </el-select>
               </el-form-item>
             </td>
           </tr>
             <td>
-              <el-form-item label="积分" prop="integral">
-                <el-input v-model="addMsg.integral" class="w217" />
+              <el-form-item label="交易金额要求" prop="tradeMoneyReq">
+                <el-input v-model="addMsg.tradeMoneyReq" placeholder="0为无要求" class="w217" />
               </el-form-item>
             </td>
             <td>
-              <el-form-item label="特权" prop="privilege"  >
-                <el-select filterable v-model="addMsg.privilege" class="w217" >
-                  <el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
-                  <el-option v-for="item in awardRelationList" :label="item.couponsName" :value="item.couponId" :key="item.couponId"></el-option>
-                </el-select>
+              <el-form-item label="交易人头数要求" prop="tradePeopleReq"  >
+                <el-input v-model="addMsg.tradePeopleReq" placeholder="0为无要求" class="w217" />
               </el-form-item>
             </td>
           </tr>
@@ -107,22 +126,23 @@ export default {
     return {
       //请求
       msg: {
-        lotteryId: '',
+        state: -1,
+        name: '',
       },
       addMsg:{
-          id:0,
-          memberLevel: '',
-          memberName: '',
-          integral: '',
-          privilege: '',
-          standard: '',
-          condition: ''
+        id:0,
+        name: '',
+        state: '',
+        tradeMoneyReq: '',
+        tradePeopleReq: '',
+        remark: '',
+        jurisdictionList: []
       },
      rules:{ 
         memberLevel: [{ required: true, message: '请输入会员等级', trigger: "blur" }],
-        memberName: [{ required: true, message: '请输入等级名称', trigger: "blur" }],
-        integral: [{required: true, message: '请输入积分', trigger: "blur"}],
-        privilege: [{ required: true, message: '请选择特选', trigger: "change" }],
+        name: [{ required: true, message: '请输入等级名称', trigger: "blur" }],
+        tradeMoneyReq: [{required: true, message: '交易金额要求', trigger: "blur"}],
+        tradePeopleReq: [{ required: true, message: '交易人头数要求', trigger: "change" }],
         standard: [{ required: true, message: '请输入升降级标准', trigger: "blur" }],
         condition: [{ required: true, message: '请输入星级有效期延长的条件', trigger: "blur" }],
       },
@@ -134,8 +154,7 @@ export default {
     };
   },
   mounted() {
-    this.msg.lotteryId = this.$route.query.lotteryId;
-    // this.getList();
+    this.getList();
   },
   filters: {
   },
@@ -144,7 +163,7 @@ export default {
     //获取数据
     getList() {
       this.loading = true;
-      this.apiJavaPost("/api/sell/lottery/getLotteryAwardList", this.msg, res => {
+      this.apiJavaPost("/api/member/getmemberrate", this.msg, res => {
         this.loading = false;
         if (res.data.resultCode === 1) {
           this.dataList = res.data.data;

src/components/leaderPay2.vue

@@ -161,7 +161,7 @@
                                 </div>
                             </td>
                             <td>
-                                <template v-for='(sitem,sindex) in item.ScenicStatisticsList'>
+                                <template v-for='(sitem,sindex) in item.DiningSummaryList'>
                                     {{sitem.Remarks}}
                                 </template>
                             </td>