页面修改

src/components/SalesModule/groupTourOrder.vue

@@ -1959,7 +1959,7 @@
                     icon="iconfont icon-bianji-smal" @click="getDetail(item)"></el-button>
                 </el-tooltip>
                 <el-tooltip class="item" effect="dark" :content="$t('salesModule.UpRemarks')" placement="top-start">
-              
+
                   <el-button type="primary" style="background: green; border-color: green"
                     icon="iconfont icon-bianji-smal" @click="getRemarks(item)"></el-button>
                 </el-tooltip>
@@ -2492,7 +2492,7 @@
           configId: 0,
           cityId: 0,
           orderId: 0,
-          unionfid: 0,//订单旅客联运编号(rb_airticket_union表Id)
+          unionfid: 0, //订单旅客联运编号(rb_airticket_union表Id)
         },
         userId: "",
         customerId: "",
@@ -2935,6 +2935,7 @@
       goContract(item, sItem) {
         let cid = 0;
         let guestId = 0;
+        var path = "TravelContractNew";
         if (sItem) {
           if (sItem.id) {
             cid = sItem.id;
@@ -2942,11 +2943,10 @@
           if (sItem.guestId) {
             guestId = sItem.guestId;
           }
+          if (sItem.templateType == 1) {
+            path = "TravelContractNewRB";
+          }
         }
-        var path = "TravelContractNew";
-        // if (item.lineId == 14) {
-        //   path = "TravelContractNewRB";
-        // }
         var pMsg = {
           TCID: item.tcid,
           guestId: guestId,
@@ -4549,6 +4549,7 @@
           "sellorder_post_GetTravelOrderList",
           this.msg,
           (res) => {
+            console.log("sellorder_post_GetTravelOrderList", res);
             if (res.data.resultCode == 1) {
               this.loading = false;
               this.total = res.data.data.count;

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -5586,15 +5586,15 @@
       //跳转至领取合同
       goContract(item, sItem) {
         let guestId = 0;
+        var path = "TravelContractNew";
         if (sItem) {
           if (sItem.guestId) {
             guestId = sItem.guestId;
           }
+          if (sItem.templateType == 1) {
+            path = "TravelContractNewRB";
+          }
         }
-        var path = "TravelContractNew";
-        // if (item.lineId == 14) {
-        //   path = "TravelContractNewRB";
-        // }
         let routeData = this.$router.resolve({
           name: path,
           query: {

src/components/SalesModule/groupTourOrderOne.vue

@@ -2282,15 +2282,21 @@
       },
       //跳转至领取合同
       goContract(item, sItem) {
+        let guestId = 0;
         var path = "TravelContractNew";
-        // if (item.lineId == 14) {
-        //   path = "TravelContractNewRB";
-        // }
+        if (sItem) {
+          if (sItem.guestId) {
+            guestId = sItem.guestId;
+          }
+          if (sItem.templateType == 1) {
+            path = "TravelContractNewRB";
+          }
+        }
         let routeData = this.$router.resolve({
           name: path,
           query: {
             TCID: item.tcid,
-            guestId: sItem.guestId,
+            guestId: guestId,
             orderID: item.orderId,
             blank: "y",
           },

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -6414,7 +6414,7 @@
         }
         if (item.ContractNum) {
           var path = "TravelContractDetail";
-          if (item.LineId == 14) {
+          if (sItem.TemplateType == 1) {
             path = "TravelContractDetailRB";
           }
           let routeData = this.$router.resolve({

src/components/orderCommon/orderlist.vue

@@ -2236,15 +2236,21 @@
       },
       //跳转至领取合同
       goContract(item, sItem) {
+        let guestId = 0;
         var path = "TravelContractNew";
-        // if (item.lineId == 14) {
-        //   path = "TravelContractNewRB";
-        // }
+        if (sItem) {
+          if (sItem.guestId) {
+            guestId = sItem.guestId;
+          }
+          if (sItem.templateType == 1) {
+            path = "TravelContractNewRB";
+          }
+        }
         let routeData = this.$router.resolve({
           name: path,
           query: {
             TCID: item.tcid,
-            guestId: sItem.guestId,
+            guestId: guestId,
             orderID: item.orderId,
             blank: "y",
           },