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

src/components/FinancialModule/addReceivablesDocuments.vue

@@ -600,7 +600,7 @@
                   </el-option>
                 </el-select>
               </span> </p>
-             
+
               <!-- msg.TemplateId==27&&msg.CourseId&&orderObj&&orderObj.OrderID&&orderObj.OrderSource==8 -->
             <template v-if="isReceivablesAccount">
               <!--
@@ -644,7 +644,7 @@
             </span>
             </p>
             </template>
-            
+
             <template v-if="(orderObj&&!orderObj.isPrestore)||msg.SigningCustomerId||msg.DepositCustomerId||RB_Branch_Id==1218 || showSigningCustomer">
               <template v-if="!msg.DepositCustomerId||RB_Branch_Id==1218 || showSigningCustomer">
                 <p v-if="CustomerIdList&&CustomerIdList.length" style="margin-left: 15px;">签约客户：<span>
@@ -686,7 +686,7 @@
                 <span style="margin-left: 20px;color: red;">注：只有帮其他公司{{this.$route.query.Type==1?'代收':'代付'}}的需选择此项，非代收代付则忽略此项</span>
               </p>
             </div>
-        
+
           </template>
           <table v-if="ContractCustomer" class="Receipt_table" border="1" bordercolor="#c94052"
             style="border-collapse:collapse;margin-top: 10px;">
@@ -1649,6 +1649,8 @@
 
       },
       Financial_post_Set(){
+        console.log(this.msg,'=====------msg')
+        // return
         this.loading = true;
         this.apipost('Financial_post_Set', this.msg, res => {
           if (res.data.resultCode == 1) {
@@ -1991,9 +1993,9 @@
             if(!this.$route.query.edit){
             this.msg.RB_Branch_Id = this.msg.RB_Branch_Id == 0 || this.msg.RB_Branch_Id == ParentCompanyId ? this
               .getLocalStorage().RB_Branch_id : this.msg.RB_Branch_Id;
-             
+
             }
-           
+
             if (this.orderObj && this.orderObj.companyIDList && this.orderObj.companyIDList.length > 0) {
               this.msg.RB_Branch_Id = this.orderObj.companyIDList[0];
             } else if (this.$route.query.companyID) {

src/components/automaticLogin.vue

@@ -37,9 +37,32 @@
 
     },
     mounted() {
-
+      if (!this.getLocalStorage()) {
+        this.getLogin(false)
+        this.autoLogin()
+      } else {
+        this.getLogin(true)
+        var data = JSON.parse(localStorage.crmuserInfo)
+        let query
+        console.log(data.parameter,'---parameter')
+        if(data.parameter.FeatureType){
+          query = {
+            ...data.parameter
+          }
+        }else{
+          query = {
+            crmOrderObj: JSON.stringify(data.parameter),
+            Type: data.parameter.type
+          }
+        }
+        this.$router.push({
+          path: data.parameter.path,
+          query
+        });
+      }
     },
     created() {
+      this.getLogin(false)
       if (this.$route.query) {
         let param = JSON.parse(this.$route.query.data);
         this.obj.token = this.$route.query.token;
@@ -51,20 +74,18 @@
           }
         }
       }
-      if (!this.getLocalStorage()) {
-        this.autoLogin()
-      } else {
-        var data = JSON.parse(localStorage.crmuserInfo)
-        this.$router.push({
-          path: data.parameter.path,
-          query: {
-            crmOrderObj: JSON.stringify(data.parameter),
-            Type: data.parameter.type
-          }
-        });
-      }
+
+
     },
     methods: {
+      getLogin(state){
+        let href = this.domainManager().CarUrl
+        window.parent.postMessage({
+        event_id: 'login',
+        data: {
+          loginState: state,
+        }}, `${href}`)
+      },
       autoLogin() {
         this.apipostLogin(
           "admin_get_GetErpAutoLoginInfo",
@@ -92,14 +113,26 @@
               localStorage.menu = JSON.stringify(firstTire)
               this.loginState = 0;
               var data = JSON.parse(localStorage.crmuserInfo)
-              this.$router.push({
-                path: data.parameter.path,
-                query: {
-                  crmOrderObj: JSON.stringify(data.parameter),
+              let crmOrderObj = JSON.parse(JSON.stringify(data.parameter))
+              let query = {}
+              console.log(data,'---data.parameter.tradeObj')
+              if(data.parameter.FeatureType){
+                query = {
+                  ...data.parameter
+                }
+              }else{
+                query = {
+                  crmOrderObj: JSON.stringify(crmOrderObj),
                   Type: data.parameter.type
                 }
+              }
+              this.$router.push({
+                path: data.parameter.path,
+                query
               });
+              this.getLogin(true)
             } else {
+              this.getLogin(false)
               this.$notify.error({
                 title: "提示",
                 customClass: "msgTips",

src/components/index.vue

@@ -65,7 +65,7 @@
 
 <template>
   <div style="position: relative;" class="myIndexStyle" ref="firstParent">
-    <div class="nav">
+    <div class="nav" v-if="!typeSystem">
       <div class="nav-left">
         <img class="GroupPic" v-if="userInfo.GroupPic!='' " :src="userInfo.GroupPic" :onerror='defaultHeadImg' />
       </div>
@@ -957,7 +957,7 @@
         <source src="/static/music/msgMusic.mp3" type="audio/mpeg">
       </audio>
     </div>
-    <div class="temDivs">
+    <div class="temDivs" :style="{'top':!typeSystem?'58px':'0px'}">
       <router-view></router-view>
     </div>
 
@@ -1271,6 +1271,7 @@
     },
     data() {
       return {
+        typeSystem: 0,
         TemplateUrl: '',
         dialogPptistVisible: false,
         ExamineThePriceMsg: {
@@ -1752,6 +1753,12 @@
       },
     },
     mounted() {
+      let crmuserInfo = JSON.parse(localStorage.crmuserInfo)
+      if(crmuserInfo
+      &&crmuserInfo.parameter
+      &&crmuserInfo.parameter.typeSystem) {
+        this.typeSystem = crmuserInfo.parameter.typeSystem
+      }
       let that = this;
       this.qjGroupId = this.QjGroupId();
       this.apipost('user_post_GetNowVote', {}, r => {