From cde0495ef5a1da03e06fa697f4a5f786912f13d8 Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Mon, 31 Aug 2020 17:32:31 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E9=92=89=E9=92=89=E5=85=8D=E7=99=BB?=
 =?UTF-8?q?=E9=92=88=E5=AF=B9=E6=89=8B=E6=9C=BA=E7=AB=AF=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/common/dingtalklogin.vue | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/views/common/dingtalklogin.vue b/src/views/common/dingtalklogin.vue
index 1179a69..9f8329f 100644
--- a/src/views/common/dingtalklogin.vue
+++ b/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){
@@ -97,7 +103,7 @@ export default {
     },
     dingtalkLogin () {
       dd.runtime.permission.requestAuthCode({
-        corpId: 'ding267474e759bbca1c35c2f4657eb6378f',
+        corpId: 'ding02853c26606ba7d4a1320dcb25e91351',
         onSuccess(result){
           
           dingCode = result
@@ -133,4 +139,3 @@ export default {
   }
 }
 </script>
-

From 2986868ddb7956cf3187d18356f8d4088b644bf7 Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Mon, 31 Aug 2020 17:36:51 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=85=AC?=
 =?UTF-8?q?=E5=8F=B8=E7=9A=84croipId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/common/dingtalklogin.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/common/dingtalklogin.vue b/src/views/common/dingtalklogin.vue
index 9f8329f..186dab5 100644
--- a/src/views/common/dingtalklogin.vue
+++ b/src/views/common/dingtalklogin.vue
@@ -103,7 +103,7 @@ export default {
     },
     dingtalkLogin () {
       dd.runtime.permission.requestAuthCode({
-        corpId: 'ding02853c26606ba7d4a1320dcb25e91351',
+        corpId: 'ding267474e759bbca1c35c2f4657eb6378f',
         onSuccess(result){
           
           dingCode = result

From 4e4a952b15f3083101e3141d869792913671c520 Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Mon, 31 Aug 2020 20:30:05 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=BA=BF=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=9C=AA=E6=9E=B6=E6=9E=84=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/result/record/recorddetail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/result/record/recorddetail.vue b/src/views/modules/result/record/recorddetail.vue
index c452763..e786486 100644
--- a/src/views/modules/result/record/recorddetail.vue
+++ b/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>