From 190afa6abc098a82cc7874c11c4ce34bb8229644 Mon Sep 17 00:00:00 2001
From: huichao <hui.chao@ebiz-digits.com>
Date: Sat, 25 Jul 2020 16:29:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/attendance/Monthly.vue         |  32 ++--
 src/views/ebiz/performance/AttendanceInfo.vue | 169 +++++++++---------
 src/views/ebiz/performance/Performance.vue    |   6 +-
 .../ebiz/performance/PerformanceList.vue      |  12 --
 4 files changed, 111 insertions(+), 108 deletions(-)

diff --git a/src/views/ebiz/attendance/Monthly.vue b/src/views/ebiz/attendance/Monthly.vue
index 888e27b45..3623c9ae4 100644
--- a/src/views/ebiz/attendance/Monthly.vue
+++ b/src/views/ebiz/attendance/Monthly.vue
@@ -34,18 +34,18 @@
         </div>
         <div>
           <div class="fs14 fw500 ml15">
-            打卡时间 {{goWorkTime}}
+            打卡时间 <span v-if="flag=='0'">{{goWorkTime}}</span>
             <span class="c-gray-base">(上班 时间 {{workTime}})</span>
           </div>
           <!-- <img class="w30 h20 ml15" src="@/assets/images/u1213.png" alt /> -->
-          <div class="w41 h18 ml15 bg-blue-dark white fs13 text-center text" v-if="flag=='0'">{{text}}</div>
-          <div class="w41 h18 ml15 bg-blue-dark white fs13 text-center text" v-if="flag=='1'||flag=='2'||flag=='3'">{{text}}</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  white fs13 text-center text" v-if="flag=='1'||flag=='2'||flag=='3'">{{text}}</div>
           <div class="fs14 fw500 ml15 mt50">
-            打卡时间 {{offWorkTime}}
+            打卡时间 <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 text" v-if="flag=='0'">{{text}}</div>
-           <div class="w41 h18 ml15 bg-blue-dark white fs13 text-center text" v-if="flag=='1'||flag=='2'||flag=='3'">{{text}}</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>
       </div>
     </div>
@@ -119,9 +119,9 @@ export default {
                 this.flag=res.content.flag,
                 this.goWorkTime=res.content.goWorkTime,
                 this.offWorkTime=res.content.offWorkTime
-                this.goWorkTime=this.goWorkTime.split('T')[1].split('.')[0]
-                this.offWorkTime=this.offWorkTime.split('T')[1].split('.')[0]
                 if(this.flag=='0'){
+                  this.goWorkTime=this.goWorkTime.split(' ')[0]
+                  this.offWorkTime=this.offWorkTime.split(' ')[0]
                   this.text='正常'
                 }else if(this.flag=='1'){
                   this.text='缺勤'
@@ -149,10 +149,10 @@ export default {
                 this.amount=res.content.amount,
                 this.flag=res.content.flag,
                 this.goWorkTime=res.content.goWorkTime,
-                this.offWorkTime=res.content.offWorkTime,
-                this.goWorkTime=this.goWorkTime.split('T')[1].split('.')[0]
-                this.offWorkTime=this.offWorkTime.split('T')[1].split('.')[0]
+                this.offWorkTime=res.content.offWorkTime
                 if(this.flag=='0'){
+                   this.goWorkTime=this.goWorkTime.split(' ')[0]
+                  this.offWorkTime=this.offWorkTime.split(' ')[0]
                   this.text='正常'
                 }else if(this.flag=='1'){
                   this.text='缺勤'
@@ -177,7 +177,7 @@ export default {
               let arr1=[]
               let obj1={}
               let date1=[]
-              obj1.color='yellow'
+              obj1.color='orange'
              for(let i=0;i<res.content.rest.length;i++){
                 let workTime=res.content.rest[i].split(' ')
                 let workTime1=workTime[0]
@@ -242,5 +242,13 @@ export default {
 .text{
   line-height: 18px;
   border-radius: 10px;
+  background:orange;
+  color:white
+}
+.text1{
+   line-height: 18px;
+  border-radius: 10px;
+  background:blue;
+  color:white
 }
 </style>
\ No newline at end of file
diff --git a/src/views/ebiz/performance/AttendanceInfo.vue b/src/views/ebiz/performance/AttendanceInfo.vue
index 6a9d470b5..a822ed129 100644
--- a/src/views/ebiz/performance/AttendanceInfo.vue
+++ b/src/views/ebiz/performance/AttendanceInfo.vue
@@ -25,22 +25,24 @@
         />
       </van-popup>
     </div>
-    <div class="c-gray-base fs16 ml25 footer">
+    <div class="c-gray-base fs16 pl25 footer">
       所在机构：
       <span class="red">{{unitName}}</span>
     </div>
-    <div class="crew-list-container ml15 mt90">
-      <van-sticky flex>
-        <div class="directly2 fs14">直辖组</div>
-        <table class="top-table fw500">
-          <tr>
-            <td>
-              <div class="name">承保标保（元）</div>
-            </td>
-            <td>
-              <div class="date">寿险承保件数</div>
-            </td>
-            <!-- <td>
+    <div class="flex">
+      <div class="w15 kong"></div>
+      <div class="crew-list-container ml15 mt90">
+        <van-sticky flex>
+          <div class="directly2 fs14">直辖组</div>
+          <table class="top-table fw500 bg-white">
+            <tr>
+              <td>
+                <div class="name">承保标保（元）</div>
+              </td>
+              <td>
+                <div class="date">寿险承保件数</div>
+              </td>
+              <!-- <td>
               <div class="date">承保FYC（元）</div>
             </td>
             <td>
@@ -48,52 +50,53 @@
             </td>
             <td>
               <div class="date">综合开拓承保保费（元）</div>
-            </td> -->
-            <td>
-              <div class="date">本月预收标保</div>
-            </td>
-            <td>
-              <div class="date">本月预收件数</div>
-            </td>
-            <!-- <td>
+              </td>-->
+              <td>
+                <div class="date">本月预收标保</div>
+              </td>
+              <td>
+                <div class="date">本月预收件数</div>
+              </td>
+              <!-- <td>
               <div class="date">本月预收FYC（元）</div>
-            </td> -->
-            <td>
-              <div class="date">操作</div>
-            </td>
-          </tr>
-        </table>
-      </van-sticky>
-      <div >
-        <div class="directly fs14" >
-            <div class="directly1" v-for="item in data">{{item.name}}</div>
+              </td>-->
+              <td>
+                <div class="date">操作</div>
+              </td>
+            </tr>
+          </table>
+        </van-sticky>
+        <div>
+          <div class="directly fs14">
+            <div class="directly1 bg-white" v-for="item in data" :key="item">{{item.name}}</div>
+          </div>
+          <table class="main-table bg-white">
+            <tr v-for="item1 in list" :key="item1">
+              <td>
+                <div class="name">{{item1.cbbb}}</div>
+              </td>
+              <td>
+                <div class="date">{{item1.cbjs}}</div>
+              </td>
+              <td>
+                <div class="date">{{item1.ysbb}}</div>
+              </td>
+              <td>
+                <div class="date">{{item1.ysjs}}</div>
+              </td>
+              <td>
+                <div class="date red" @click="details(item1)">查看</div>
+              </td>
+            </tr>
+          </table>
         </div>
-        <table class="main-table">
-          <tr v-for="item1 in list">
-            <td >
-              <div class="name">{{item1.cbbb}}</div>
-            </td>
-            <td>
-              <div class="date">{{item1.cbjs}}</div>
-            </td>
-            <td>
-              <div class="date">{{item1.ysbb}}</div>
-            </td>
-            <td>
-              <div class="date">{{item1.ysjs}}</div>
-            </td>
-            <td>
-              <div class="date red" @click="details(item1)">查看</div>
-            </td>
-          </tr>
-        </table>
       </div>
     </div>
   </div>
 </template>
 <script>
 import { Popup, DatetimePicker, Sticky } from 'vant'
-import { getBranchInfos,getPerformanceDetail } from '@/api/ebiz/performance/performance'
+import { getBranchInfos, getPerformanceDetail } from '@/api/ebiz/performance/performance'
 import utils from '@/assets/js/utils/date-utils'
 export default {
   name: 'attendance',
@@ -111,14 +114,14 @@ export default {
       data: [1, 2, 3, 4, 5, 6, 7, 8, 9, 9, 0],
       titleTime: '',
       code: '',
-      arr:[],
-      dateTime:'',
-      list:[],
-      cbbb:'',
-      cbjs:'',
-      ysbb:'',
-      ysjs:'',
-      parmas:{}
+      arr: [],
+      dateTime: '',
+      list: [],
+      cbbb: '',
+      cbjs: '',
+      ysbb: '',
+      ysjs: '',
+      parmas: {},
     }
   },
   created() {
@@ -138,7 +141,7 @@ export default {
     //开始时间
     handleEndDateConfirm(e) {
       this.dateShow = false
-       this.titleTime = utils.formatDate(e, 'yyyy-MM')
+      this.titleTime = utils.formatDate(e, 'yyyy-MM')
       this.dateTime = utils.formatDate(e, 'yyyy-MM-dd')
       console.log(e)
       // this.titleTime = dateFormat(this.currentDate, 'yyyy-MM')
@@ -157,10 +160,8 @@ export default {
     //跳转查看
     details(parmas) {
       console.log(parmas)
-      this.parmas.code=parmas.code,
-      this.parmas.date=this.dateTime
-      this.parmas.mask='1',
-      this.parmas.Name=this.unitName
+      ;(this.parmas.code = parmas.code), (this.parmas.date = this.dateTime)
+      ;(this.parmas.mask = '1'), (this.parmas.Name = this.unitName)
       this.$jump({
         flag: 'h5',
         extra: {
@@ -179,20 +180,19 @@ export default {
         console.log(res)
         if (res.result == 0) {
           this.data = res.content
-          let arr=[]
-          for(let i=0;i<res.content.length;i++){
-            let code=res.content[i].code
-              arr.push(code)
-              // console.log(arr)
+          let arr = []
+          for (let i = 0; i < res.content.length; i++) {
+            let code = res.content[i].code
+            arr.push(code)
+            // console.log(arr)
           }
-          this.arr=arr
+          this.arr = arr
           // console.log(this.arr)
           this.getPerformanceDetailC()
         }
       })
-      
     },
-             //获取代理人相关信息
+    //获取代理人相关信息
     getPerformanceDetailC() {
       // console.log(this.agentCode)
       let code = {
@@ -203,7 +203,7 @@ export default {
       getPerformanceDetail(code).then((res) => {
         console.log(res)
         if (res.result == 0) {
-          this.list=res.content.list
+          this.list = res.content.list
         }
       })
     },
@@ -258,19 +258,26 @@ export default {
   width: 99px;
   position: fixed;
 }
-.directly1{
-   width: 99px;
+.directly1 {
+  width: 99px;
   height: 27px;
-   border: 0.5px solid #ccc;
-    text-align: center;
+  border: 0.5px solid #ccc;
+  text-align: center;
   line-height: 27px;
 }
-.directly2{
-   width: 99px;
+.directly2 {
+  width: 99px;
   position: fixed;
   height: 27px;
-   border: 0.5px solid #ccc;
-    text-align: center;
+  border: 0.5px solid #ccc;
+  text-align: center;
   line-height: 27px;
+  background: white;
+}
+.kong{
+  position: fixed;
+  height:100vh;
+  background:rgb(247, 246, 246);
+
 }
 </style>
\ No newline at end of file
diff --git a/src/views/ebiz/performance/Performance.vue b/src/views/ebiz/performance/Performance.vue
index 6de51cb64..d70abce6c 100644
--- a/src/views/ebiz/performance/Performance.vue
+++ b/src/views/ebiz/performance/Performance.vue
@@ -32,10 +32,10 @@
       <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" v-for="item in headerList">
+      <div class="w40 h60 ml15 text-center" v-for="item in headerList" :key='item'>
         <div @click="(InfoDetails(item.agentCode))">
-          <img v-if="item.agentHeadUrl!==null" class="h40 w40" :src="item.agentHeadUrl" alt />
-          <img v-if="item.agentHeadUrl == null" class="h40 w40" src="@/assets/images/u188.png" alt />
+          <!-- <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="fs13">{{item.agentName}}</div>
         </div>
       </div>
diff --git a/src/views/ebiz/performance/PerformanceList.vue b/src/views/ebiz/performance/PerformanceList.vue
index 300dfbeb1..7ee8da323 100644
--- a/src/views/ebiz/performance/PerformanceList.vue
+++ b/src/views/ebiz/performance/PerformanceList.vue
@@ -135,18 +135,6 @@ export default {
       } else {
         this.isShow = true
       }
-    setTimeout(() => {
-      // eslint-disable-next-line no-undef
-      EWebBridge.webCallAppInJs('webview_right_button', {
-        btns: [
-          {
-            title: '考勤记录',
-            titleColor:'FF0000',
-            route: { flag: '', extra: {} },
-          },
-        ],
-      })
-    }, 1000)
     // this.performanceData()
     this.formatDate1()
     this.getBranchInfos1()