no message

src/App.vue

@@ -122,20 +122,6 @@ export default {
       this.$router.push({
         path: '/login'
       })
-      // if(!window.location.href){
-      //   this.$router.push({
-      //     path: '/login'
-      //   })
-      // }
-      
-      // else{
-      //   let href = window.location.href;
-      //   if(href&&localStorage.crmuserInfo){
-      //     this.$router.push({
-      //       path: `/ChoiceAddFinancialDocuments?token=${data.token}&type=${data.type}&OtherType=${data.OtherType}&ReFinanceId=${data.ReFinanceId}&ReFinanceId2=${data.ReFinanceId2}&GuestId=${data.GuestId}`
-      //     });
-      //   }
-      // }
     }else{
       if(document.URL.indexOf("clientConfirm")!=-1||document.URL.indexOf("TravelContractConfirm")!=-1||document.URL.indexOf("ViittoContractConfirm")!=-1){
           localStorage.openMode=0

src/components/FinancialModule/ChoiceAddFinancialDocuments2.vue

@@ -103,6 +103,7 @@
         platformAccount:'',
         Handmsg:{},
         czmsg:{},
+        crmOrderObj: null,
       }
     },
     computed: {
@@ -133,17 +134,8 @@
 
           }
           else{
-            // 判断是否crm带参自动登录跳转
-            if(this.$route.query.orderObj&&this.$route.query.orderObj.GuestId){
-              let crmOrderObj = {
-                token: this.$route.query.orderObj.token,
-                type: this.$route.query.orderObj.type,
-                OtherType: this.$route.query.orderObj.OtherType,
-                ReFinanceId: this.$route.query.orderObj.ReFinanceId,
-                ReFinanceId2: this.$route.query.orderObj.ReFinanceId2,
-                GuestId: this.$route.query.orderObj.GuestId
-              }
-              console.log(JSON.stringify(crmOrderObj), '99988888')
+            // crm自动登陆传过来的参数
+            if(this.crmOrderObj){
               this.$router.push({ 
                 name: "addReceivablesDocuments",
                 query:{
@@ -152,7 +144,8 @@
                   "id":id,
                   "Name":Name,
                   "Type":Type,
-                  "crmOrderObj":JSON.stringify(crmOrderObj),
+                  "crmOrderObj":JSON.stringify(this.crmOrderObj),
+                  "orderObj":this.orderObj,
                   'path':this.$route.query.path,
                   'IsUploadPic':IsUploadPic,
                   'Cmd':this.$route.query.Cmd,
@@ -162,7 +155,6 @@
                 }
               })
             }else{
-              console.log('-----', '30000000033333333')
               this.$router.push({ 
                 name: "addReceivablesDocuments",
                 query:{
@@ -181,8 +173,6 @@
                 }
               })
             }
-            
-
           }
         }else if(this.active==2){
           // 付款单参数czmsg
@@ -313,11 +303,11 @@
       },
     }
     ,mounted(){
-      // 判断是否自动登陆跳转
-      if(this.$route.query.orderObj&&this.$route.query.orderObj.GuestId){
-        var data = JSON.parse(localStorage.crmuserInfo)
-        this.active = data.type
-        this.showTab = data.type
+      // crm自动登陆传过来的参数
+      if(this.$route.query.crmOrderObj){
+        this.crmOrderObj = this.$route.query.crmOrderObj
+        this.active = this.crmOrderObj.type
+        this.showTab = this.crmOrderObj.type
       }else{
         this.showTab = this.$route.query.Type?this.$route.query.Type:0;
         this.active = parseInt(this.$route.query.Type)?parseInt(this.$route.query.Type):1;

src/components/FinancialModule/addReceivablesDocuments.vue

@@ -804,6 +804,7 @@
         tradeWay: '',
         platformAccount: '',
         Handmsg: {},
+        crmOrderObj:{}
       }
     },
     methods: {
@@ -1321,6 +1322,13 @@
         this.msg.OrderTradeWay = this.tradeWay;
         this.msg.PlatformAccountId = this.platformAccount;
         this.loading = true;
+        // crm自动登陆传过来的参数
+        if(this.crmOrderObj){
+          this.msg.OtherType = this.crmOrderObj.OtherType
+          this.msg.ReFinanceId = this.crmOrderObj.ReFinanceId
+          this.msg.ReFinanceId2 = this.crmOrderObj.ReFinanceId2
+          this.msg.GuestId = this.crmOrderObj.GuestId
+        }
         this.apipost('Financial_post_Set', this.msg, res => {
           if (res.data.resultCode == 1) {
             this.$confirm(this.$t('tips.czcgsfjxzhidan'), this.$t('tips.tips'), {
@@ -1814,10 +1822,9 @@
       let that = this;
       this.tradeWay = this.$route.query.tradeWay ? this.$route.query.tradeWay : 0;
       this.platformAccount = this.$route.query.platformAccount ? this.$route.query.platformAccount : 0;
-      // 判断是否crm带参自动登录跳转
+      // crm自动登陆传过来的参数
       if(this.$route.query.crmOrderObj){
-        this.orderObj = JSON.parse(this.$route.query.crmOrderObj);
-        console.log(this.orderObj, '')
+        this.crmOrderObj = JSON.parse(this.$route.query.crmOrderObj);
       }else{
         this.orderObj = this.$route.query.orderObj ? JSON.parse(this.$route.query.orderObj) : null;
       }

src/components/automaticLogin.vue

@@ -31,7 +31,7 @@
           password: "",
           Domain: ""
         },
-        orderObj:{}
+        crmOrderObj:{}
       }
     },
     components: {
@@ -60,7 +60,7 @@
         this.autoLogin()
       }else{
         var data = JSON.parse(localStorage.crmuserInfo)
-        this.orderObj = {
+        this.crmOrderObj = {
           token: data.token,
           type: data.type,
           OtherType: data.OtherType,
@@ -72,7 +72,7 @@
         this.$router.push({
           path: `ChoiceAddFinancialDocuments`,
           query:{
-            orderObj: this.orderObj
+            crmOrderObj: this.crmOrderObj
           }
         });
       }
@@ -108,7 +108,7 @@
               localStorage.menu = JSON.stringify(firstTire)
               this.loginState = 0;
               var data = JSON.parse(localStorage.crmuserInfo)
-              this.orderObj = {
+              this.crmOrderObj = {
                 token: data.token,
                 type: data.type,
                 OtherType: data.OtherType,
@@ -120,7 +120,7 @@
               this.$router.push({
                 path: `ChoiceAddFinancialDocuments`,
                 query:{
-                  orderObj: this.orderObj
+                  crmOrderObj: this.crmOrderObj
                 }
               });
             } else {

src/plug/index.js

@@ -330,7 +330,7 @@ export default {
           })
           .then(res => {
             if (res.data.resultCode == 10000 || res.data.resultCode == 10001) {
-              if (!localStorage.crmuserInfo){
+              if (this.getLocalStorage()){
                 this.$router.push({
                   path: '/login'
                 });