From 0225630bf9864b10c32d47a6994692b2e9bd06e1 Mon Sep 17 00:00:00 2001
From: huichao <hui.chao@ebiz-digits.com>
Date: Tue, 28 Jul 2020 09:51:08 +0800
Subject: [PATCH] =?UTF-8?q?bug=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/attendance/Monthly.vue         |  8 +++---
 src/views/ebiz/performance/Performance.vue    | 28 +++++--------------
 .../ebiz/performance/PerformanceInfo.vue      |  7 +++--
 .../ebiz/performance/PerformanceList.vue      | 12 ++++----
 4 files changed, 22 insertions(+), 33 deletions(-)

diff --git a/src/views/ebiz/attendance/Monthly.vue b/src/views/ebiz/attendance/Monthly.vue
index c3a086afe..ba54f67be 100644
--- a/src/views/ebiz/attendance/Monthly.vue
+++ b/src/views/ebiz/attendance/Monthly.vue
@@ -23,7 +23,7 @@
       ></DatetimePicker>
     </van-sticky>
     <div class="footer" v-if="flagGo!=='4'">
-      <div class="fs12 c-gray-base h30 line-height ml15">班次：正常 09:00-18:00</div>
+      <div class="fs12 c-gray-base h30 line-height ml15">班次：正常 {{workTime}}-{{workTimeOff}}</div>
       <div class="h40 flex align-items-c border-gb footer-bg">
         <img class="h15 w15 ml15" src="@/assets/images/u20046.png" alt />
         <div class="fs14 ml5">今日打卡{{count}}次，工时共计{{Number(amount).toFixed(2)}}小时</div>
@@ -218,7 +218,7 @@ export default {
     },
     //月历
     getMonthDetail1() {
-      console.log('================' + this.time)
+      // console.log('================' + this.time)
       let date = {
         date: this.time,
       }
@@ -229,7 +229,7 @@ export default {
             let arr1 = []
             let obj1 = {}
             let date1 = []
-            obj1.color = '#000000'
+            obj1.color = '#FFA500'
             for (let i = 0; i < res.content.rest.length; i++) {
               let workTime = res.content.rest[i].split(' ')
               let workTime1 = workTime[0]
@@ -258,7 +258,7 @@ export default {
             // arr3=arr3.concat(arr1,arr)
 
             this.markDate = arr
-            console.log(this.mask)
+            console.log(this.markDate)
           }
         })
       }
diff --git a/src/views/ebiz/performance/Performance.vue b/src/views/ebiz/performance/Performance.vue
index fc868b8b5..83278a773 100644
--- a/src/views/ebiz/performance/Performance.vue
+++ b/src/views/ebiz/performance/Performance.vue
@@ -91,12 +91,12 @@
     </div>
     <div
       class="h40 bg-red footer absolute bottom0 text-center fs14 fw500 white"
-      @click="checkTeam(obj)"
+      @click="checkTeam(obj)" v-if="mask1!==1"
     >查看团队业绩</div>
   </div>
 </template>
 <script>
-import { getBaseAgentInfo, getPerformanceHeader, getPerformanceDetail, getHeader } from '@/api/ebiz/performance/performance'
+import { getBaseAgentInfo,  getPerformanceDetail, getHeader } from '@/api/ebiz/performance/performance'
 import utils from '@/assets/js/utils/date-utils'
 import { Popup, DatetimePicker } from 'vant'
 export default {
@@ -133,7 +133,8 @@ export default {
       Name: '',
       code: '',
       isShowImg: true,
-      buName:''
+      buName:'',
+      mask1:''
     }
   },
   created() {
@@ -184,9 +185,7 @@ export default {
     
 
     // this.performanceData()
-    if (this.code == '') {
-      this.getPerformanceHeader1()
-    }
+    
     if(this.mask=="1"){
       this.getPerformanceDetailC()
     }
@@ -288,26 +287,13 @@ export default {
           } else if (this.agentGrade.slice(0, 2) == 'A4') {
           }
           if (this.agentGrade == 'A101') {
-            this.mask = 1
+            this.mask1 = 1
           }
           this.getPerformanceDetailC()
         }
       })
     },
-    //获取代理人下级头像
-    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/PerformanceInfo.vue b/src/views/ebiz/performance/PerformanceInfo.vue
index 14a8babf5..8bdcff2c5 100644
--- a/src/views/ebiz/performance/PerformanceInfo.vue
+++ b/src/views/ebiz/performance/PerformanceInfo.vue
@@ -41,7 +41,7 @@
         <div @click="(InfoDetails(index))">
           <!-- <img v-if="item.agentHeadUrl!==null" class="h40 w40" :src="item.agentHeadUrl" alt /> -->
           <img class="h40 w40" src="@/assets/images/u188.png" alt />
-           <div class="absolute  h60 top15 left8  fs13 white captain" v-if="String(item.agentName)==String(Name).split('组')[0]">团队长</div>
+           <div class="absolute  fs12 white captain" v-if="String(item.agentName)==String(Name).split('组')[0]">团队长</div>
           <div :class="[item.isShowImg?'active':'']"></div>
           <div class="fs13">{{item.agentName}}</div>
         </div>
@@ -381,6 +381,9 @@ export default {
 .captain{
     z-index: 2000;
     text-align: center;
-    width:26px;
+    width:40px;
+    margin-top:-14px;
+    margin-left:2px;
+    background:red;
 }
 </style>
\ No newline at end of file
diff --git a/src/views/ebiz/performance/PerformanceList.vue b/src/views/ebiz/performance/PerformanceList.vue
index a5b6d68e4..379195fb7 100644
--- a/src/views/ebiz/performance/PerformanceList.vue
+++ b/src/views/ebiz/performance/PerformanceList.vue
@@ -142,7 +142,7 @@ export default {
       }
     // this.performanceData()
     this.formatDate1()
-    this.getBranchInfos1()
+    // this.getBranchInfos1()
     this.getPerformanceDetail1()
   },
   mounted() {
@@ -203,11 +203,11 @@ export default {
          localStorage.parmas1 = JSON.stringify(parmas)
       }
     },
-    getBranchInfos1(code) {
-      getBranchInfos(code).then((res) => {
-        // console.log(res)
-      })
-    },
+    // getBranchInfos1(code) {
+    //   getBranchInfos(code).then((res) => {
+    //     // console.log(res)
+    //   })
+    // },
     getPerformanceDetail1() {
       let code = {
         date: this.dateTime,