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

src/components/SalesModule/enrollTotal.vue

@@ -214,6 +214,10 @@
         </td>
         <td>
           {{item.guestNum}}/{{item.ySeatNum>0? item.ySeatNum+'Y ':''}}{{item.eSeatNum>0? item.eSeatNum+'E ':''}}{{item.fSeatNum>0? item.fSeatNum+'F ':''}}
+          <br/>
+                <span v-if="item.refuseVisaNum>0" style="color:red">
+                  (拒签 {{item.refuseVisaNum}}人)
+                </span>
         </td>
         <td style="color:#FF9C00">{{item.tC_Price}}</td>
         <td style="color:#FF9C00">￥{{item.unit_Price}}</td>

src/components/SalesModule/groupTourOrder.vue

@@ -1572,6 +1572,10 @@
                 @click="getMembersDetail(item)">{{item.guestNum}}/{{item.ySeatNum>0? item.ySeatNum+'Y ':''}}{{item.eSeatNum>0? item.eSeatNum+'E ':''}}{{item.fSeatNum>0? item.fSeatNum+'F ':''}}</span>
               <span v-if='item.guestNumStatus==3' style="color:#666;" class="personNo" slot="reference"
                 @click="getMembersDetail(item)">{{item.guestNum}}/{{item.ySeatNum>0? item.ySeatNum+'Y ':''}}{{item.eSeatNum>0? item.eSeatNum+'E ':''}}{{item.fSeatNum>0? item.fSeatNum+'F ':''}}</span>
+                <br/>
+                <span v-if="item.refuseVisaNum>0" style="color:red">
+                  (拒签 {{item.refuseVisaNum}}人)
+                </span>
               <!-- </el-popover> -->
             </td>
             <td style="color:#FF9C00">{{item.tC_Price}}</td>

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -1572,6 +1572,10 @@
               <span v-if='item.guestNumStatus==1' style="color:#1AA86B;" class="personNo" slot="reference" @click="getMembersDetail(item)">{{item.guestNum}}/{{item.ySeatNum>0? item.ySeatNum+'Y ':''}}{{item.eSeatNum>0? item.eSeatNum+'E ':''}}{{item.fSeatNum>0? item.fSeatNum+'F ':''}}</span>
               <span v-if='item.guestNumStatus==2' style="color:#E95252;" class="personNo" slot="reference" @click="getMembersDetail(item)">{{item.guestNum}}/{{item.ySeatNum>0? item.ySeatNum+'Y ':''}}{{item.eSeatNum>0? item.eSeatNum+'E ':''}}{{item.fSeatNum>0? item.fSeatNum+'F ':''}}</span>
               <span v-if='item.guestNumStatus==3' style="color:#666;" class="personNo" slot="reference" @click="getMembersDetail(item)">{{item.guestNum}}/{{item.ySeatNum>0? item.ySeatNum+'Y ':''}}{{item.eSeatNum>0? item.eSeatNum+'E ':''}}{{item.fSeatNum>0? item.fSeatNum+'F ':''}}</span>
+              <br/>
+                <span v-if="item.refuseVisaNum>0" style="color:red">
+                  (拒签 {{item.refuseVisaNum}}人)
+                </span>
               <!-- </el-popover> -->
             </td>
             <td style="color:#FF9C00">
@@ -1916,6 +1920,10 @@
               <span v-if='item.guestNumStatus==1' style="color:#1AA86B;" class="personNo" slot="reference" @click="getMembersDetail(item)">{{item.guestNum}}/{{item.ySeatNum>0? item.ySeatNum+'Y ':''}}{{item.eSeatNum>0? item.eSeatNum+'E ':''}}{{item.fSeatNum>0? item.fSeatNum+'F ':''}}</span>
               <span v-if='item.guestNumStatus==2' style="color:#E95252;" class="personNo" slot="reference" @click="getMembersDetail(item)">{{item.guestNum}}/{{item.ySeatNum>0? item.ySeatNum+'Y ':''}}{{item.eSeatNum>0? item.eSeatNum+'E ':''}}{{item.fSeatNum>0? item.fSeatNum+'F ':''}}</span>
               <span v-if='item.guestNumStatus==3' style="color:#666;" class="personNo" slot="reference" @click="getMembersDetail(item)">{{item.guestNum}}/{{item.ySeatNum>0? item.ySeatNum+'Y ':''}}{{item.eSeatNum>0? item.eSeatNum+'E ':''}}{{item.fSeatNum>0? item.fSeatNum+'F ':''}}</span>
+              <br/>
+                <span v-if="item.refuseVisaNum>0" style="color:red">
+                  (拒签 {{item.refuseVisaNum}}人)
+                </span>
               <!-- </el-popover> -->
             </td>
             <td style="color:#FF9C00">

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -1554,6 +1554,10 @@
                 slot="reference">{{item.GuestNum}}/{{item.YSeatNum>0? item.YSeatNum+'Y ':''}}{{item.ESeatNum>0? item.ESeatNum+'E ':''}}{{item.FSeatNum>0? item.FSeatNum+'F ':''}}</span>
               <span v-if='item.GuestNumStatus==3' style="color:#666; " class="personNo nowrap"
                 slot="reference">{{item.GuestNum}}/{{item.YSeatNum>0? item.YSeatNum+'Y ':''}}{{item.ESeatNum>0? item.ESeatNum+'E ':''}}{{item.FSeatNum>0? item.FSeatNum+'F ':''}}</span>
+                <br/>
+                <span v-if="item.RefuseVisaNum>0" style="color:red">
+                  (拒签 {{item.RefuseVisaNum}}人)
+                </span>
             </td>
             <td>{{item.TC_Price}}</td>
             <td>{{item.Unit_Price}}</td>
@@ -1797,6 +1801,10 @@
                   slot="reference">{{childItem.GuestNum}}/{{childItem.YSeatNum>0? childItem.YSeatNum+'Y ':''}}{{childItem.ESeatNum>0? childItem.ESeatNum+'E ':''}}{{childItem.FSeatNum>0? childItem.FSeatNum+'F ':''}}</span>
                 <span v-if='childItem.GuestNumStatus==3' style="color:#666; " class="personNo nowrap"
                   slot="reference">{{childItem.GuestNum}}/{{childItem.YSeatNum>0? childItem.YSeatNum+'Y ':''}}{{childItem.ESeatNum>0? childItem.ESeatNum+'E ':''}}{{childItem.FSeatNum>0? childItem.FSeatNum+'F ':''}}</span>
+                <br/>
+                <span v-if="childItem.RefuseVisaNum>0" style="color:red">
+                  (拒签 {{childItem.RefuseVisaNum}}人)
+                </span>
                 <!-- </el-popover> -->
               </td>
               <td class="nowrap">{{childItem.TC_Price}}</td>
@@ -2131,6 +2139,10 @@
                 slot="reference">{{item.GuestNum}}/{{item.YSeatNum>0? item.YSeatNum+'Y ':''}}{{item.ESeatNum>0? item.ESeatNum+'E ':''}}{{item.FSeatNum>0? item.FSeatNum+'F ':''}}</span>
               <span v-if='item.GuestNumStatus==3' style="color:#666;" class="personNo"
                 slot="reference">{{item.GuestNum}}/{{item.YSeatNum>0? item.YSeatNum+'Y ':''}}{{item.ESeatNum>0? item.ESeatNum+'E ':''}}{{item.FSeatNum>0? item.FSeatNum+'F ':''}}</span>
+                <br/>
+                <span v-if="item.RefuseVisaNum>0" style="color:red">
+                  (拒签 {{item.RefuseVisaNum}}人)
+                </span>
               <!-- </el-popover> -->
             </td>
             <td>{{item.TC_Price}}</td>

src/components/TravelManager/TravelList/todayOrderTotal.vue

@@ -231,7 +231,11 @@
             </p>
             <p style="max-width: 160px;display: block;text-decoration:underline;cursor:pointer;" title="点击跳转到报名清单" class="over_ellipsis" :title="item.ltName"  @click="goUrlX('团报名清单', 'RegistrationList',item.tcid,item.tcnum)">{{item.ltName}}</p>
           </td>
-          <td>{{item.guestNum}}</td>
+          <td>{{item.guestNum}}
+                <span v-if="item.refuseVisaNum>0" style="color:red">
+                  (拒签 {{item.refuseVisaNum}}人)
+                </span>
+          </td>
           <td style="color:#FF9C00">{{item.tC_Price}}</td>
           <td style="color:#FF9C00">￥{{item.unit_Price}}</td>
           <td>