|
|
@@ -241,7 +241,8 @@ export default {
|
|
|
// let config = JSON.parse(item.config_)
|
|
|
dArr.forEach((t, n) => {
|
|
|
const midClockArr = clockData.filter(y => y.ri_qi_ === t && y.pai_ban_id_ === item.fid) || []
|
|
|
- const midReissueArr = reissueDataIn.filter(y => y.bu_ka_ri_qi_ === t && y.pai_ban_id_ === item.fid) || []
|
|
|
+ const midReissueArr = reissueDataIn.filter(y => y.bu_ka_ri_qi_ === t && y.detailPan_ban_id_ === item.fid) || []
|
|
|
+ console.log(t, reissueDataIn, midReissueArr, item.fid)
|
|
|
const isAbnormal = midClockArr.length > 0 ? midClockArr.filter(y => y.kao_qin_zhuang_ta === '异常' || !y.hasOwnProperty('da_ka_shi_jian_1_') || !y.hasOwnProperty('da_ka_shi_jian_2_')).length > 0 : true
|
|
|
const clockDataAll = { isAbnormal: isAbnormal, data: midClockArr }
|
|
|
// if (midClockArr.length === 0) {
|
|
|
@@ -403,7 +404,7 @@ export default {
|
|
|
async reissue() {
|
|
|
const min = this.$common.getFormatDate('string', 10, this.minDate)
|
|
|
const max = this.$common.getFormatDate('string', 10, this.maxDate)
|
|
|
- const sql = `select * FROM t_attendance_reissue WHERE bian_zhi_ren_ = '${this.userId}' AND CAST(bu_ka_ri_qi_ AS DATE) between '${min}' and '${max}' and zhuang_tai_ != '已撤销'`
|
|
|
+ const sql = `select a.*, b.pai_ban_id_ as detailPan_ban_id_ FROM t_attendance_reissue a left join t_attendance_detail b on a.kao_qin_id_ = b.id_ WHERE a.bian_zhi_ren_ = '${this.userId}' AND CAST(a.bu_ka_ri_qi_ AS DATE) between '${min}' and '${max}' and a.zhuang_tai_ != '已撤销'`
|
|
|
return new Promise((resolve, reject) => {
|
|
|
this.$common.request(dbSqlConfig ? 'query' : 'sql', dbSqlConfig ? { key: 'yddpbymbksjqq', params: [this.userId, min, max] } : sql).then(res => {
|
|
|
const data = res.variables.data || []
|
cyy