Procházet zdrojové kódy

打卡异常数据标红

cyy před 11 měsíci
rodič
revize
6fcccad777
1 změnil soubory, kde provedl 10 přidání a 4 odebrání
  1. 10 4
      src/views/platform/bpmn/my-schedule/index.vue

+ 10 - 4
src/views/platform/bpmn/my-schedule/index.vue

@@ -97,11 +97,11 @@
             <div class="textSty">
             <div class="textSty">
               <div>出勤时间:</div>
               <div>出勤时间:</div>
               <div class="timeLine">
               <div class="timeLine">
-                  <p>上班({{ item.state && item.state.data&&item.state.data.da_ka_shi_jian_1_&&item.state.data.da_ka_shi_jian_1_.length===19 ? item.state.data.da_ka_shi_jian_1_.substr(-8,5) : !item.reissue.up?'未打卡':'已有补卡记录'}})
+                  <p>上班(<span :style="{color:!judgeReissueBtn(item.state.data,'am', unfoldInfo.date)?'red':'#000'}">{{ item.state && item.state.data&&item.state.data.da_ka_shi_jian_1_&&item.state.data.da_ka_shi_jian_1_.length===19 ? item.state.data.da_ka_shi_jian_1_.substr(-8,5) : !item.reissue.up?'未打卡':'已有补卡记录'}}</span>)
                     <span v-if="item.reissue&&item.state && item.state.data && !judgeReissueBtn(item.state.data,'am', unfoldInfo.date)&&!item.reissue.up" class="reissueBtn" @click="reissueShow(item,'上班')">补卡</span>
                     <span v-if="item.reissue&&item.state && item.state.data && !judgeReissueBtn(item.state.data,'am', unfoldInfo.date)&&!item.reissue.up" class="reissueBtn" @click="reissueShow(item,'上班')">补卡</span>
                   </p>
                   </p>
                   <div style="height: 5px;"></div>
                   <div style="height: 5px;"></div>
-                  <p>下班({{item.state && item.state.data&&item.state.data.shi_fou_kua_ri_==='Y'?'第二天':''}}{{item.state && item.state.data&&item.state.data.da_ka_shi_jian_2_&&item.state.data.da_ka_shi_jian_2_.length===19 ? item.state.data.da_ka_shi_jian_2_.substr(-8,5) : !item.reissue.down?'未打卡':'已有补卡记录'}})
+                  <p>下班(<span :style="{color:!judgeReissueBtn(item.state.data,'pm', unfoldInfo.date)?'red':'#000'}">{{item.state && item.state.data&&item.state.data.shi_fou_kua_ri_==='Y'?'第二天':''}}{{item.state && item.state.data&&item.state.data.da_ka_shi_jian_2_&&item.state.data.da_ka_shi_jian_2_.length===19 ? item.state.data.da_ka_shi_jian_2_.substr(-8,5) : !item.reissue.down?'未打卡':'已有补卡记录'}}</span>)
                     <span v-if="item.reissue&&item.state && item.state.data && !judgeReissueBtn(item.state.data,'pm',unfoldInfo.date)&&!item.reissue.down" class="reissueBtn" @click="reissueShow(item,'下班')">补卡</span>
                     <span v-if="item.reissue&&item.state && item.state.data && !judgeReissueBtn(item.state.data,'pm',unfoldInfo.date)&&!item.reissue.down" class="reissueBtn" @click="reissueShow(item,'下班')">补卡</span>
                   </p>
                   </p>
               </div>
               </div>
@@ -571,7 +571,7 @@ export default {
       const normTime = new Date(this.entryTime).getTime()
       const normTime = new Date(this.entryTime).getTime()
       const bzTime = val.hasOwnProperty(mid[1]) ? new Date(val[mid[1]]).getTime() : ''
       const bzTime = val.hasOwnProperty(mid[1]) ? new Date(val[mid[1]]).getTime() : ''
       const dkTime = val.hasOwnProperty(mid[0]) ? new Date(val[mid[0]]).getTime() : ''
       const dkTime = val.hasOwnProperty(mid[0]) ? new Date(val[mid[0]]).getTime() : ''
-      // console.log(pickDate, normDate, 'sasdsadas')
+      console.log(pickDate, normDate, 'sasdsadas')
       const diff = Math.abs(normDate - pickDate)
       const diff = Math.abs(normDate - pickDate)
       const days = Math.floor(diff / (1000 * 60 * 60 * 24))
       const days = Math.floor(diff / (1000 * 60 * 60 * 24))
       if (pickDate > normDate) {
       if (pickDate > normDate) {
@@ -586,8 +586,14 @@ export default {
         }
         }
       } else if (pickDate < normDate && days === 1 && val['shi_fou_kua_ri_'] === 'Y' && type === 'pm') {
       } else if (pickDate < normDate && days === 1 && val['shi_fou_kua_ri_'] === 'Y' && type === 'pm') {
         return true
         return true
-      } else if (pickDate < normDate && !val.hasOwnProperty(mid[0]) || !val.hasOwnProperty(mid[2])) {
+      } else if (pickDate < normDate && (!val.hasOwnProperty(mid[0]) || !val.hasOwnProperty(mid[2]))) {
         return false
         return false
+      } else if (pickDate < normDate) {
+        if (type === 'am' && (!val.hasOwnProperty(mid[0]) || (val.hasOwnProperty(mid[0]) && dkTime > bzTime))) {
+          return false
+        } else if (type === 'pm' && (val.hasOwnProperty(mid[0]) && dkTime < bzTime)) {
+          return false
+        }
       }
       }
       return true
       return true
     },
     },