From 08ea58f58eacd793e9a35c858501d0a33d1f2d36 Mon Sep 17 00:00:00 2001
From: huichao <hui.chao@ebiz-digits.com>
Date: Sat, 25 Jul 2020 18:54:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=A0=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/attendance/Monthly.vue         |  27 +++--
 src/views/ebiz/performance/Performance.vue    | 108 +++++++++---------
 .../ebiz/performance/PerformanceList.vue      |   3 +-
 3 files changed, 73 insertions(+), 65 deletions(-)

diff --git a/src/views/ebiz/attendance/Monthly.vue b/src/views/ebiz/attendance/Monthly.vue
index e06a7bd29..f3519f151 100644
--- a/src/views/ebiz/attendance/Monthly.vue
+++ b/src/views/ebiz/attendance/Monthly.vue
@@ -39,13 +39,13 @@
           </div>
           <!-- <img class="w30 h20 ml15" src="@/assets/images/u1213.png" alt /> -->
           <div class="w41 h18 ml15 bg-blue-dark white fs13 text-center text1" v-if="flag=='0'">{{text}}</div>
-          <div class="w41 h18 ml15  white fs13 text-center text" v-if="flag=='1'||flag=='2'||flag=='3'">{{text}}</div>
+          <div class="w41 h18 ml15  white fs13 text-center text" v-if="flag=='1'||flag=='2'">{{text}}</div>
           <div class="fs14 fw500 ml15 mt50">
             打卡时间 <span v-if="flag=='0'">{{offWorkTime}}</span>
             <span class="c-gray-base">(下班 时间 {{workTimeOff}})</span>
           </div>
           <div class="w41 h18 ml15 bg-blue-dark white fs13 text-center text1" v-if="flag=='0'">{{text}}</div>
-           <div class="w41 h18 ml15  fs13 text-center text" v-if="flag=='1'||flag=='2'||flag=='3'">{{text}}</div>
+           <div class="w41 h18 ml15  fs13 text-center text" v-if="flag=='1'||flag=='3'">{{text}}</div>
         </div>
       </div>
     </div>
@@ -86,17 +86,14 @@ export default {
       text:'',
       goWorkTime:'',
       offWorkTime:'',
-      flag:''
+
     }
   },
   created(){
-    this. isShowCalendar=true,
     this.date1=new Date(JSON.parse(this.$route.params.obj).time)
     this.time=JSON.parse(this.$route.params.obj).time
     this.name=JSON.parse(this.$route.params.obj).name
-    setTimeout(()=>{
-      this.getMonthDetail1();
-    },1000)
+    this.getMonthDetail1();
     this.time=utils.formatDate(this.currentDate, 'yyyy-MM-dd')
   },
   methods: {
@@ -175,7 +172,7 @@ export default {
         }
         if(Date.parse(this.time)<=Date.parse(utils.formatDate(new Date(), 'yyyy-MM-dd'))){
             getMonthDetail(date).then(res=>{
-            console.log(res)
+            // console.log(res)
             if(res.result == 0){
               let arr1=[]
               let obj1={}
@@ -184,13 +181,15 @@ export default {
              for(let i=0;i<res.content.rest.length;i++){
                 let workTime=res.content.rest[i].split(' ')
                 let workTime1=workTime[0]
-                if(Date.parse(workTime1)<=Date.parse(utils.formatDate(new Date(), 'yyyy-MM-dd'))){
-                    let arr2=res.content.rest.slice(0,i+1)
+                if(Date.parse(workTime1)<Date.parse(utils.formatDate(new Date(), 'yyyy-MM-dd'))){
+                    let arr2=res.content.rest.slice(0,i)
                     obj1.date=arr2
+                    // console.log(arr2)
                 }
               }
               arr1.push(obj1)
-              console.log(arr1)
+              // console.log(obj1)
+              // this.mask=arr1
               let arr=arr1
               let obj={}
               let date=[]
@@ -200,10 +199,14 @@ export default {
                  let workTime=res.content.normal[t].split(' ')
                 let workTime1=workTime[0]
                  date.push(workTime1)
+                //  console.log(date)
                  obj.date=date
               }
-              arr.push(obj)  
+              arr.push(obj)
+              // arr3=arr3.concat(arr1,arr)
+              
               this.mask=arr
+              // console.log(this.mask)
             }
         })  
         }
diff --git a/src/views/ebiz/performance/Performance.vue b/src/views/ebiz/performance/Performance.vue
index 6e962f02d..6179ed568 100644
--- a/src/views/ebiz/performance/Performance.vue
+++ b/src/views/ebiz/performance/Performance.vue
@@ -29,10 +29,15 @@
     </div>
     <div class="c-gray-base fs13 ml25 mt10" v-if="mask=='1'">
       所在机构：
-      <span v-if="Name!==''">{{Name}}></span><span class="red">{{unitName}}</span>
+      <span v-if="Name!==''">{{Name}}></span>
+      <span class="red">{{unitName}}</span>
     </div>
     <div class="flex align-items-c h86 content1 bg-white mt10" v-if="mask=='1'">
-      <div class="w40 h60 ml15 text-center relative" v-for="(item, index) in headerList" :key="index">
+      <div
+        class="w40 h60 ml15 text-center relative"
+        v-for="(item, index) in headerList"
+        :key="index"
+      >
         <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 />
@@ -93,7 +98,7 @@
   </div>
 </template>
 <script>
-import { getBaseAgentInfo, getPerformanceHeader, 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 {
@@ -127,9 +132,9 @@ export default {
       mask: '',
       headerList: [],
       unitName: '',
-      Name:'',
-      code:'',
-      isShowImg:true
+      Name: '',
+      code: '',
+      isShowImg: true,
     }
   },
   created() {
@@ -139,8 +144,8 @@ export default {
       ;(this.titleTime = JSON.parse(this.$route.params.parmas).date.slice(0, 7)),
         (this.dateTime = JSON.parse(this.$route.params.parmas).date),
         (this.unitName = JSON.parse(this.$route.params.parmas).unitName),
-        this.Name=JSON.parse(this.$route.params.parmas).Name,
-        this.code=JSON.parse(this.$route.params.parmas).code
+        (this.Name = JSON.parse(this.$route.params.parmas).Name),
+        (this.code = JSON.parse(this.$route.params.parmas).code)
     }
 
     if (this.mask !== '1') {
@@ -150,7 +155,7 @@ export default {
           btns: [
             {
               title: '考勤记录',
-              titleColor:'FF0000',
+              titleColor: 'FF0000',
               route: { flag: '', extra: {} },
             },
           ],
@@ -159,12 +164,12 @@ export default {
     }
 
     // this.performanceData()
-    if(this.code==''){
-       this.getPerformanceHeader1()
+    if (this.code == '') {
+      this.getPerformanceHeader1()
     }
     this.formatDate1()
     this.getBaseAgentInfo1()
-    if(this.code!==''){
+    if (this.code !== '') {
       this.getHeader1()
     }
   },
@@ -244,15 +249,13 @@ export default {
             (this.agentCode = res.jobNo),
             (this.obj.agentGrade = this.agentGrade),
             (this.obj.agentCode = this.agentCode),
-            this.branchCode=res.branchCode,
-            this.deptCode=res.deptCode,
-            this.areaCode=res.areaCode
+            (this.branchCode = res.branchCode),
+            (this.deptCode = res.deptCode),
+            (this.areaCode = res.areaCode)
           if (this.agentGrade.slice(0, 2) == 'A2') {
-            this.obj.unitName = this.unitName,
-            this.obj.code=this.branchCode
+            ;(this.obj.unitName = this.unitName), (this.obj.code = this.branchCode)
           } else if (this.agentGrade.slice(0, 2) == 'A3') {
-            this.obj.unitName = this.saleArea,
-             this.obj.code=this.deptCode
+            ;(this.obj.unitName = this.saleArea), (this.obj.code = this.deptCode)
           } else if (this.agentGrade.slice(0, 2) == 'A4') {
           }
           if (this.agentGrade == 'A101') {
@@ -266,29 +269,29 @@ export default {
     getPerformanceHeader1() {
       let date = {}
       getPerformanceHeader(date).then((res) => {
-        console.log("=="+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)
+          for (let i = 0; i < res.content.length; i++) {
+            res.content[i].isShowImg = true
+          }
+          this.headerList = res.content
+          console.log(this.headerList)
         }
       })
     },
-    getHeader1(){
+    getHeader1() {
       console.log(1111)
-      let code={
-          agentgroup:this.code
+      let code = {
+        agentgroup: this.code,
       }
-      getHeader(code).then(res=>{
-          console.log(res)
-          if (res.result == 0) {
-          for(let i=0;i<res.content.length;i++){
-            res.content[i].isShowImg=true
-            res.content[0].isShowImg=false
-         }
-         this.headerList = res.content
+      getHeader(code).then((res) => {
+        console.log(res)
+        if (res.result == 0) {
+          for (let i = 0; i < res.content.length; i++) {
+            res.content[i].isShowImg = true
+            res.content[0].isShowImg = false
+          }
+          this.headerList = res.content
         }
       })
     },
@@ -300,23 +303,23 @@ export default {
         agentCode: this.agentCode,
       }
       getPerformanceDetail(code).then((res) => {
-        // console.log(res)
+        console.log(res)
         if (res.result == 0) {
           ;(this.cbbb = res.content.list[0].cbbb),
             (this.cbjs = res.content.list[0].cbjs),
             (this.ysjs = res.content.list[0].ysjs),
-            (this.agentCode = res.content.list[0].code)
+            (this.ysbb = res.content.list[0].ysbb),(this.agentCode = res.content.list[0].code)
         }
       })
     },
     //点击头像
     InfoDetails(item) {
       console.log(item)
-      for(let i=0;i<this.headerList.length;i++){
-            this.headerList[i].isShowImg=true
-         }
-        this.headerList[item].isShowImg=false
-    
+      for (let i = 0; i < this.headerList.length; i++) {
+        this.headerList[i].isShowImg = true
+      }
+      this.headerList[item].isShowImg = false
+
       let code = {
         date: this.timeCode,
         agentCode: this.headerList[item].agentCode,
@@ -327,6 +330,7 @@ export default {
           ;(this.cbbb = res.content.list[0].cbbb),
             (this.cbjs = res.content.list[0].cbjs),
             (this.ysjs = res.content.list[0].ysjs),
+            (this.ysbb = res.content.list[0].ysbb),
             (this.agentCode = res.content.list[0].code)
         }
       })
@@ -349,14 +353,14 @@ export default {
   width: 100%;
   overflow-x: scroll;
 }
-.active{
-     width: 40px;
-    height: 40px;
-    z-index: 100;
-    background: #ccc;
-    opacity: 0.5;
-    top: 0px;
-    border-radius: 20px;
-    position: absolute;
+.active {
+  width: 40px;
+  height: 40px;
+  z-index: 100;
+  background: #ccc;
+  opacity: 0.5;
+  top: 0px;
+  border-radius: 20px;
+  position: absolute;
 }
 </style>
\ No newline at end of file
diff --git a/src/views/ebiz/performance/PerformanceList.vue b/src/views/ebiz/performance/PerformanceList.vue
index 7ee8da323..a45f11726 100644
--- a/src/views/ebiz/performance/PerformanceList.vue
+++ b/src/views/ebiz/performance/PerformanceList.vue
@@ -203,7 +203,7 @@ export default {
     getPerformanceDetail1() {
       let code = {
         date: this.dateTime,
-        agentCode: this.code,
+        groupCode: this.code,
       }
       getPerformanceDetail(code).then((res) => {
         console.log(res)
@@ -211,6 +211,7 @@ export default {
             this.cbbb=res.content.list[0].cbbb,
             this.cbjs=res.content.list[0].cbjs,
             this.ysjs=res.content.list[0].ysjs,
+            this.ysbb = res.content.list[0].ysbb,
             this.agentCode=res.content.list[0].code,
             this.parmas.code=this.agentCode
         }