From 94b9a2a472d436aac2fd5ebc4967aa5a352c361f Mon Sep 17 00:00:00 2001
From: huichao <hui.chao@ebiz-digits.com>
Date: Tue, 28 Jul 2020 11:49:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=8E=86=E5=85=BC=E5=AE=B9ios?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/attendance/Monthly.vue         | 12 +++++------
 src/views/ebiz/performance/Performance.vue    | 21 ++++++++++++++++---
 .../ebiz/performance/PerformanceList.vue      |  5 ++---
 3 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/src/views/ebiz/attendance/Monthly.vue b/src/views/ebiz/attendance/Monthly.vue
index ba54f67be..ad407f8ae 100644
--- a/src/views/ebiz/attendance/Monthly.vue
+++ b/src/views/ebiz/attendance/Monthly.vue
@@ -234,13 +234,12 @@ export default {
               let workTime = res.content.rest[i].split(' ')
               let workTime1 = workTime[0]
               if (Date.parse(workTime1) < Date.parse(formatDate(new Date(), 'YY-MM-DD'))) {
-                let arr2 = res.content.rest.slice(0, i + 1)
-                obj1.date = arr2
-                // console.log(arr2)
+                date1.push(workTime1)
               }
             }
+            obj1.date=date1
             arr1.push(obj1)
-            // console.log(obj1)
+            console.log(obj1)
             // this.mask=arr1
             let arr = arr1
             let obj = {}
@@ -254,11 +253,10 @@ export default {
               //  console.log(date)
               obj.date = date
             }
+            console.log(obj)
             arr.push(obj)
-            // arr3=arr3.concat(arr1,arr)
-
             this.markDate = arr
-            console.log(this.markDate)
+            // console.log(this.markDate)
           }
         })
       }
diff --git a/src/views/ebiz/performance/Performance.vue b/src/views/ebiz/performance/Performance.vue
index 83278a773..c4498b185 100644
--- a/src/views/ebiz/performance/Performance.vue
+++ b/src/views/ebiz/performance/Performance.vue
@@ -96,7 +96,7 @@
   </div>
 </template>
 <script>
-import { getBaseAgentInfo,  getPerformanceDetail, getHeader } from '@/api/ebiz/performance/performance'
+import { getBaseAgentInfo, getPerformanceHeader, getPerformanceDetail, getHeader } from '@/api/ebiz/performance/performance'
 import utils from '@/assets/js/utils/date-utils'
 import { Popup, DatetimePicker } from 'vant'
 export default {
@@ -185,7 +185,9 @@ export default {
     
 
     // this.performanceData()
-    
+    if (this.code == '') {
+      this.getPerformanceHeader1()
+    }
     if(this.mask=="1"){
       this.getPerformanceDetailC()
     }
@@ -293,7 +295,20 @@ export default {
         }
       })
     },
-   
+    //获取代理人下级头像
+    getPerformanceHeader1() {
+      let date = {}
+      getPerformanceHeader(date).then((res) => {
+        console.log('==' + res)
+        if (res.result == 0) {
+          for (let i = 0; i < res.content.length; i++) {
+            res.content[i].isShowImg = true
+          }
+          this.headerList = res.content
+          console.log(this.headerList)
+        }
+      })
+    },
     getHeader1() {
       console.log(1111)
       let code = {
diff --git a/src/views/ebiz/performance/PerformanceList.vue b/src/views/ebiz/performance/PerformanceList.vue
index 379195fb7..e1d4a445d 100644
--- a/src/views/ebiz/performance/PerformanceList.vue
+++ b/src/views/ebiz/performance/PerformanceList.vue
@@ -125,9 +125,8 @@ export default {
     this.unitName=JSON.parse(window.localStorage.getItem('obj')).unitName
     this.code=JSON.parse(window.localStorage.getItem('obj')).code
     this.parmas.unitName=JSON.parse(window.localStorage.getItem('obj')).unitName
-    this.parmas.Name=JSON.parse(window.localStorage.getItem('obj')).unitName
-    console.log(typeof(this.titleTime))
-    console.log(this.agentGrade.slice(0,2))
+    // console.log(typeof(this.titleTime))
+    // console.log(this.agentGrade.slice(0,2))
     if(this.agentGrade.slice(0,2)=='A2'){
         this.teamName='直辖组'
     }else if(this.agentGrade.slice(0,2)=='A3'){