Merge branch 'master' of http://gitlab.ldxit push -u or nyong.com/enterpriseManagement/lz_management_vue

src/views/common/dingtalklogin.vue

@@ -43,11 +43,20 @@ export default {
   },
   mounted () {
     if(this.isDingtalk()){
-      
-      console.log('走钉钉免登流程')
-      this.dingtalkLogin()
-      this.checkDingTalkLogin()
+      if(typeof this.$route.query.code == 'undefined'){
+        console.log('走钉钉免登流程')
+        this.dingtalkLogin()
+        this.checkDingTalkLogin()
+      } else {
+        this.loginJump()
+      }
     } else {
+      
+        this.loginJump()
+    }
+  },
+  methods: {
+    loginJump () {
       this.dataForm.verify = '验证中'
       console.log(this.$route.query)
       this.req.code = this.$route.query.code
@@ -68,10 +77,7 @@ export default {
             }
             this.hasSendCode = false;
           })
-
-    }
-  },
-  methods: {
+    },
     checkDingTalkLogin ()  {
       if(dingCode === null){
         if(this.tick < 30){
@@ -133,4 +139,3 @@ export default {
   }
 }
 </script>
-

src/views/modules/result/record/recorddetail.vue

@@ -20,7 +20,7 @@
         <div class="titleCenter">
           <span>考核月份：<b>{{checkMonth}}</b></span>
           <span>员工姓名：<b>{{ staffName }}</b></span>
-          <span>业务线：<b>{{ department1 }}</b></span>
+          <span>架构线：<b>{{ department1 }}</b></span>
           <span>一级部门：<b>{{ department2 }}</b></span>
           <span>二级部门：<b>{{ department3 }}</b></span>
           <span >直属上级:<b>{{ superStaff }}</b></span>