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

src/components/SalesModule/groupTourOrder.vue

@@ -1595,7 +1595,7 @@
           <td colspan="4" class="groupTourOrder_remarks" style="height: 40px;">
             <div>
               <div><span>备注：</span>
-                <p><span
+                <p><span v-if="item.tsId>0">投诉单号：<a href="javascript:void(0);" @click="goUrlTS('ComplaintsDetail',item.tsId,item.orderId,'投诉详情')">{{item.tsId}}</a> ;</span><span
                   v-if='item.clientSource==1&&item.brandName!=""'>{{item.brandName}}订单 {{item.platformOrder}};</span>{{item.remarks}}
                 </p></div>
               <div>
@@ -1962,6 +1962,18 @@
       }
     },
     methods: {
+      //跳转
+      goUrlTS (path, id, orderId, title) {
+        this.$router.push({
+          name: path,
+          query: {
+            'id': id,
+            'orderId': orderId,
+            blank: 'y',
+            tab: title
+          }
+        })
+      },
       getItem (obj) {
         this.checkedObj = obj
       },

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -1616,7 +1616,7 @@
         <tr>
           <td colspan="4" class="groupTourOrder_remarks" style="height: 40px;">
             <div>
-              <div><span>备注：</span><p><span v-if='item.clientSource==1&&item.brandName!=""'>{{item.brandName}}订单 {{item.platformOrder}};</span>{{item.remarks}}</p></div>
+              <div><span>备注：</span><p><span v-if="item.tsId>0">投诉单号：<a href="javascript:void(0);" @click="goUrlTS('ComplaintsDetail',item.tsId,item.orderId,'投诉详情')">{{item.tsId}}</a> ;</span><span v-if='item.clientSource==1&&item.brandName!=""'>{{item.brandName}}订单 {{item.platformOrder}};</span>{{item.remarks}}</p></div>
               <div>
                 <!-- <span>{{item.remarksName}}&ensp;{{item.rematksTime}}</span> -->
                 <el-popover width="600" placement="bottom-end" trigger="click">
@@ -2305,6 +2305,18 @@ export default {
     }
   },
   methods: {
+    //跳转
+      goUrlTS (path, id, orderId, title) {
+        this.$router.push({
+          name: path,
+          query: {
+            'id': id,
+            'orderId': orderId,
+            blank: 'y',
+            tab: title
+          }
+        })
+      },
     maxCommissionMinusRate: function () {
       this.TCMsg.CommissionMinusRate = this.TCMsg.CommissionMinusRate.replace(/[^\.\d]/g,'');
       this.TCMsg.CommissionMinusRate = this.TCMsg.CommissionMinusRate.replace('.','');

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -1707,6 +1707,7 @@
                 <div class="clearfix RL-MARK">
                   <span class="RL-remarkTitle">备注:</span>
                   <span class="RL-redType RL-remarkCon">
+                    <span v-if="childItem.TsId>0">投诉单号：<a href="javascript:void(0);" @click="goUrlTS('ComplaintsDetail',childItem.TsId,childItem.OrderId,'投诉详情')">{{childItem.TsId}}</a> ;</span>
                     <span v-if='childItem.ClientSource==1&&childItem.BrandName!=""'>{{childItem.BrandName}}订单
                       {{childItem.PlatformOrder}};</span>
                     {{childItem.Remarks}}
@@ -2488,6 +2489,18 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
       updateSalesMan:updateSalesMan
   },
     methods: {
+      //跳转
+      goUrlTS (path, id, orderId, title) {
+        this.$router.push({
+          name: path,
+          query: {
+            'id': id,
+            'orderId': orderId,
+            blank: 'y',
+            tab: title
+          }
+        })
+      },
       maxCommissionMinusRate: function () {
         this.TCMsg.CommissionMinusRate = this.TCMsg.CommissionMinusRate.replace(/[^\.\d]/g,'');
         this.TCMsg.CommissionMinusRate = this.TCMsg.CommissionMinusRate.replace('.','');