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

src/components/SalesModule/groupTourOrder.vue

@@ -2231,6 +2231,10 @@
               </div>
               <p v-if="item.unionRemark" style="color: red;font-size:10px;margin-top:5px;">联运备注：{{ item.unionRemark }}
               </p>
+              <p v-if="item.airticketUnionNotes||item.configNum>0" style="color: red;font-size:10px;margin-top:5px;">
+                票务备注：<span style="color: red">已配联运{{item.configNum}}人,{{item.airticketUnionNotes}}</span>
+              </p>
+
             </td>
             <td colspan="4" class="groupTourOrder_remarks" style="height: 40px">
               <div>

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -2432,6 +2432,10 @@
                     <div v-if="item.unionRemark" style="color: red">
                       <span>联运备注：{{ item.unionRemark }}</span>
                     </div>
+
+                    <div v-if="item.airticketUnionNotes||item.configNum>0"  style="color: red">
+                      票务备注：<span style="color: red">已配联运{{item.configNum}}人,{{item.airticketUnionNotes}}</span>
+                    </div>
                   </div>
                   <div style="
                       float: right;