页面修改

src/components/SalesModule/groupTourOrder.vue

@@ -2936,22 +2936,29 @@
       //跳转至领取合同
       goContract(item, sItem) {
         let cid = 0;
-        if (sItem && sItem.id) {
-          cid = sItem.id;
+        let guestId = 0;
+        if (sItem) {
+          if (sItem.id) {
+            cid = sItem.id;
+          }
+          if (sItem.guestId) {
+            guestId = sItem.guestId;
+          }
         }
         var path = "TravelContractNew";
         if (item.lineId == 14) {
           path = "TravelContractNewRB";
         }
+        var pMsg = {
+          TCID: item.tcid,
+          guestId: guestId,
+          orderID: item.orderId,
+          Id: cid,
+          blank: "y",
+        }
         let routeData = this.$router.resolve({
           name: path,
-          query: {
-            TCID: item.tcid,
-            guestId: sItem.guestId,
-            orderID: item.orderId,
-            Id: cid,
-            blank: "y",
-          },
+          query: pMsg,
         });
         window.open(routeData.href, "_blank");
       },

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -2377,7 +2377,7 @@
                   </span>
                   <!--&&item==userId-->
                   <div v-if="item.contractNum && item.contractNum.length==0 &&item.isOwn==1" class="GO_Contract"
-                    @click="goContract(item)">
+                    @click="goContract(item,{})">
                     领取合同
                   </div>
                   <div>
@@ -5581,6 +5581,12 @@
       },
       //跳转至领取合同
       goContract(item, sItem) {
+        let guestId = 0;
+        if (sItem) {
+          if (sItem.guestId) {
+            guestId = sItem.guestId;
+          }
+        }
         var path = "TravelContractNew";
         if (item.lineId == 14) {
           path = "TravelContractNewRB";
@@ -5589,7 +5595,7 @@
           name: path,
           query: {
             TCID: item.tcid,
-            guestId: sItem.guestId,
+            guestId: guestId,
             orderID: item.orderId,
             blank: "y",
           },

src/components/clientConfirmRB.vue

@@ -1134,7 +1134,6 @@
       },
       //提交数据
       SaveMsg() {
-
         this.apipost("travelcontract_post_UpdateCompanySignatureService", this.dataList, res => {
           if (res.data.resultCode === 1) {
             this.Success(res.data.message);

src/components/index.vue

@@ -3919,7 +3919,6 @@
         this.$store.dispatch("logout")
         localStorage.removeItem("userInfo");
         localStorage.removeItem("previousPathInfo");
-        // this.$router.push({ path: "/login" });
         location.href = '/'
       },
       togglebox(e) {

src/plug/index.js

@@ -120,7 +120,7 @@ export default {
         let crmUrl = ""; //crm API
         let locationName = window.location.hostname;
         domainUrl = "http://192.168.10.25:8083"; // 刘东电脑
-        domainUrl = "http://192.168.10.226:8015";
+        domainUrl = "http://192.168.10.25:8083";
         // domainUrl = "http://reborn.oytour.com";
 
         let crmLocalFileStreamDownLoadUrl = "";
@@ -276,7 +276,13 @@ export default {
           this.$router.push({
             path: '/signature'
           })
-        } else if (this.$route.path == "/clientConfirm") {
+        } 
+        if (this.$route.path.toLowerCase() == "/signname") {
+          this.$router.push({
+            path: '/signname'
+          })
+        } 
+        else if (this.$route.path == "/clientConfirm") {
           let TCID = this.$route.query.TCID;
           let orderID = this.$route.query.orderID;
           let guestId = this.$route.query.guestId;