Merge branch 'master' of http://119.23.210.103:3000/wy/zdqy_firm_former

src/views/business/attendance/makeUPVerify.vue

@@ -81,7 +81,7 @@ export default {
                     { prop: 'bu_ka_shi_jian_', label: '补卡时间', dateFormat: 'HH:mm', sortable: 'custom', width: 80 },
                     { prop: 'bu_ka_ban_ci_', label: '补卡班次', width: 80 },
                     { prop: 'bu_ka_shi_you_', label: '补卡事由', width: 300 },
-                    { prop: 'fu_jian_', label: '说明附件', width: 150 }
+                    // { prop: 'fu_jian_', label: '说明附件', width: 150 }
                 ],
                 rowHandle: {
                     effect: 'default',

src/views/system/homepage/components/banciDialog.vue

@@ -53,10 +53,10 @@
                     <div class="dakaBox">
                         <div>
                             <span>上班:</span> <span v-html="getAttendanceInfo(banci.attendance, 1)" />
-                            <button v-if="banci && banci.attendance && banci.attendance.zhuang_tai_1_!= '正常'" class="clock-btn" @click="bukaFun"> 补卡 </button>
+                            <button v-if="banci && banci.attendance && banci.attendance.zhuang_tai_1_!= '正常' && compareTime() " class="clock-btn" @click="bukaFun"> 补卡 </button>
                         </div>
                         <div><span>下班:</span> <span v-html="getAttendanceInfo(banci.attendance, 2)" />
-                            <button v-if="banci && banci.attendance && banci.attendance.zhuang_tai_2_!= '正常'" class="clock-btn" @click="bukaFun"> 补卡 </button>
+                            <button v-if="banci && banci.attendance && banci.attendance.zhuang_tai_2_!= '正常' && compareTime() " class="clock-btn" @click="bukaFun"> 补卡 </button>
                         </div>
                     </div>
                 </div>
@@ -113,6 +113,14 @@ export default {
 
             return data[status[type]] === '正常' ? `${data[time[type]]} 正常` : `${data[time[type]]} <span style="color: red;">${data[status[type]]}${data[duration[type]]}分钟</span>`
         },
+        compareTime () { // 比较班次时间和当前时间，过去日期的才显示。
+            const today = this.$common.getDateNow()
+            if (this.banciInfo.jieShuShiJian < today) {
+                return true
+            } else {
+                return false
+            }
+        },
         closeDialog () {
             this.$emit('closeBanciDialog', 'banci')
         },