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

src/components/SalesModule/enrollTotal.vue

@@ -350,6 +350,7 @@
             </p>
             <p v-if="item.lureEmpName">引流人：{{ item.lureEmpName }}</p>
             <p>{{ $t("hotel.hotel_StartTeam") }}：{{ item.startDate }}</p>
+            <p>{{item.status==1?"未结团":(item.status==2?"已结团    ":(item.status==5?"待结团审核":""))}}{{item.status==2?item.outGroupAuditDate:""}}</p>
             <p v-if="item.tradeWay == 1">{{ item.platformOrder }}</p>
             <!-- <p v-if="item.commissionMoney" style="color: red;">
               {{ $t("salesModule.CommissionNum") }}：{{ item.commissionMoney }}

src/components/SalesModule/groupTourOrder.vue

@@ -1692,6 +1692,7 @@
                 ">
                 {{ item.tcnum }}
               </p>
+             
               <p class="fz12 over_ellipsis" style="width: 100%">
                 {{ item.commissionSPeopleName }}
               </p>
@@ -1700,6 +1701,7 @@
                 {{ $t("hotel.hotel_StartTeam") }}：{{ item.startDate }}
               </p>
               <p>{{ $t("restaurant.res_oderTime") }}：{{ item.createDate }}</p>
+              <p>{{item.status==1?"未结团":(item.status==2?"已结团    ":(item.status==5?"待结团审核":""))}}{{item.status==2?item.outGroupAuditDate:""}}</p>
               <p v-if="item.tradeWay == 1">{{ item.platformOrder }}</p>
               <p v-if="item.commissionMoney" style="color: red;cursor: pointer;">
                 <span style="float: left;">{{ $t("salesModule.Commission") }}：</span>

src/components/myOrdersAllType/components/OrderList.vue

@@ -19,6 +19,7 @@
           <p class=" fz14" :class="{'cursor-pointer c059FF6':scope.row.OrderType==2}"
             @click="scope.row.OrderType==2?goTuanDetails(scope.row):''">{{scope.row.TCNUM}}</p>
           <p>出发日期：{{scope.row.StartDate}}</p>
+          <p v-if="scope.row.OrderType==2">{{scope.row.Status==1?"未结团":(scope.row.Status==2?"已结团    ":(scope.row.Status==5?"待结团审核":""))}}{{scope.row.Status==2?scope.row.OutGroupAuditDate:""}}</p>
         </div>
       </template>
     </el-table-column>