save

src/components/SalesModule/groupTourOrder.vue

@@ -2198,7 +2198,8 @@
             </td>
           </tr>
           <tr>
-            <td colspan="5" class="groupTourOrder_remarks" style="height: 40px">
+            <td colspan="5">
+              <div class="groupTourOrder_remarks">
               <div>
                 <div>
                   <span>{{ $t("pub.pubRemark") }}：</span>
@@ -2239,7 +2240,8 @@
                     </el-button>
                   </el-popover>
                 </div>
-              </div>
+              </div></div>
+                      <p style="font-size:10px;margin-top:5px;">联运备注：{{ item.unionRemark }}</p>
             </td>
             <td colspan="4" class="groupTourOrder_remarks" style="height: 40px">
               <div>

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -2457,6 +2457,9 @@
                         </template>
                       </p>
                     </div>
+                    <div style="color: red">
+                      <span>联运备注：{{ item.unionRemark }}</span>
+                    </div>
                   </div>
                   <div style="
                       float: right;

src/components/Ticketing/TicketManager.vue

@@ -1514,6 +1514,7 @@
                               <th>联运数量</th>
                               <th>已配数量</th>
                               <th>是否住宿</th>
+                              <th>联运备注</th>
                             </tr>
                             <tr v-for="(unionItem,x) in item.UnionDetailList" :key="x">
                               <td>{{unionItem.UnionCityName}}</td>
@@ -1524,6 +1525,7 @@
                                 <span v-if="unionItem.IsStay==1" class="_num3">是</span>
                                 <span v-else>否</span>
                               </td>
+                              <td>{{unionItem.UnionRemark}}</td>
                             </tr>
                           </table>
                           <p slot="reference" class="_wz _yiyong">联运</p>

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -2814,6 +2814,9 @@
                       {{ childItem.Remarks }}
                     </p>
                   </div>
+                    <div>
+                      <span>联运备注：{{ childItem.unionRemark }}</span>
+                    </div>
                 </div>
               </td>
               <td colspan="3" style="height: 40px">

src/components/orderCommon/orderlist.vue

@@ -639,6 +639,9 @@
                       </template>
                     </p>
                   </div>
+                    <div style="color: red">
+                      <span>联运备注：{{ item.unionRemark }}</span>
+                    </div>
                 </div>
                 <div style="
                       float: right;