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

src/components/TravelManager/Ticket/TravelMyTicket.vue

@@ -901,7 +901,7 @@
             <el-row :gutter="0">
               <el-col :span="8">
                 <div class="TCID_cont PingFangSC">
-                  {{$t('visa.v_tuanhao')}}：<span v-if="item.TCNUM!=''">{{item.TCNUM}}</span>
+                  {{$t('visa.v_tuanhao')}}：<span v-if="item.TCNUM!=''">（{{item.TCID}}）{{item.TCNUM}}</span>
                 </div>
               </el-col>
               <el-col :span="4">

src/components/activity/CouponList.vue

@@ -131,7 +131,8 @@
         <th>{{$t('hotel.hotel_remark')}}</th>
         <th>{{$t('system.table_operation')}}</th>
       </tr>
-      <tr v-for="(item,index) in DataList" v-loading="loading">
+      <tbody v-loading="loading">
+        <tr v-for="(item,index) in DataList" :key="index">
           <td>{{item.couponsName}}</td>
           <td>{{item.couponCount}}</td>
           <td>
@@ -153,7 +154,6 @@
             <span v-if="item.couponEffectStatus === 2" style="color: gray">{{$t('active.cl_wsxiao')}}</span>
             <span v-if="item.couponEffectStatus === 3" style="color: red">{{$t('active.cl_ygqi')}}</span>
           </td>
-
           <td>{{item.expirationDate}}</td>
           <td>
             <span v-if="item.couponsUseScope == 1">{{$t('MarketingActi.alltongyong')}}</span>
@@ -209,6 +209,7 @@
             </el-tooltip>
           </td>
         </tr>
+      </tbody>
     </table>
     <div class="noDataNotice" v-if="DataList.length<1">
       <i class="iconfont icon-kong"></i>
@@ -403,7 +404,6 @@
             <el-form-item label="订单类型" prop="lineId">
               <el-select filterable v-model="addMsg.expansionModel.orderType">
                 <el-option label="小包团" :value="2"></el-option>
-
               </el-select>
             </el-form-item>
           </el-col>
@@ -571,7 +571,7 @@
           checkInLineList: [],
           isExpansion: 0,
           expansionModel: {
-            orderTyperderType: "",
+            orderType: "",
             denomination: "",
             orderGuestNum: ""
           }
@@ -665,7 +665,7 @@
       EditItem(item) {
         if (item.expansionModel === null) {
           item.expansionModel = {
-            orderTyperderType: "",
+            orderType: "",
             denomination: "",
             orderGuestNum: ""
           }
@@ -823,7 +823,7 @@
         this.addMsg.lineteamIdList = item.lineteamIdList
         if (item.expansionModel === null) {
           this.addMsg.expansionModel = {
-            orderTyperderType: "",
+            orderType: "",
             denomination: "",
             orderGuestNum: ""
           }