|
@@ -164,7 +164,7 @@ export default {
|
|
|
labelWidth: 80,
|
|
labelWidth: 80,
|
|
|
itemWidth: 200,
|
|
itemWidth: 200,
|
|
|
forms: [
|
|
forms: [
|
|
|
- { prop: 'Q^kao_qin_zhuang_ta^SL', label: '考勤状态', fieldType: 'select', options: [{ value: '正常', label: '正常' }, { value: '异常', label: '异常' }] },
|
|
|
|
|
|
|
+ { prop: 'Q^kao_qin_zhuang_ta^S', label: '考勤状态', fieldType: 'select', options: [{ value: '正常', label: '正常' }, { value: '异常', label: '异常' }] },
|
|
|
// { prop: 'Q^yong_hu_id_^S', label: '姓名', fieldType: 'select', options: userOption },
|
|
// { prop: 'Q^yong_hu_id_^S', label: '姓名', fieldType: 'select', options: userOption },
|
|
|
{ prop: '', label: '姓名', fieldType: 'slot', slotName: 'userSlot' },
|
|
{ prop: '', label: '姓名', fieldType: 'slot', slotName: 'userSlot' },
|
|
|
{ prop: 'Q^gong_hao_^S', label: '工号' },
|
|
{ prop: 'Q^gong_hao_^S', label: '工号' },
|
|
@@ -195,7 +195,12 @@ export default {
|
|
|
this.listData.forEach(item => {
|
|
this.listData.forEach(item => {
|
|
|
item.userName = this.getUserLabel(item.yong_hu_id_)
|
|
item.userName = this.getUserLabel(item.yong_hu_id_)
|
|
|
item.deptName = this.getDeptLabel(item.bu_men_)
|
|
item.deptName = this.getDeptLabel(item.bu_men_)
|
|
|
|
|
+ // 考勤状态-缺勤
|
|
|
|
|
+ if (item.kao_qin_zhuang_ta === '') {
|
|
|
|
|
+ item.kao_qin_zhuang_ta = '异常'
|
|
|
|
|
+ }
|
|
|
})
|
|
})
|
|
|
|
|
+ debugger
|
|
|
this.pagination.totalCount = this.listData[0]?.total_count
|
|
this.pagination.totalCount = this.listData[0]?.total_count
|
|
|
}).finally(() => {
|
|
}).finally(() => {
|
|
|
this.loading = false
|
|
this.loading = false
|
|
@@ -257,8 +262,13 @@ export default {
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
})
|
|
})
|
|
|
-
|
|
|
|
|
|
|
+ debugger
|
|
|
if (conditions.length > 0) { // 正常查询条件一定会大于0,因为地点必查
|
|
if (conditions.length > 0) { // 正常查询条件一定会大于0,因为地点必查
|
|
|
|
|
+ conditions.forEach((condition, index) => {
|
|
|
|
|
+ if (condition.includes('异常')) {
|
|
|
|
|
+ conditions[index] = `(kao_qin_zhuang_ta = '异常' or kao_qin_zhuang_ta = '') `
|
|
|
|
|
+ }
|
|
|
|
|
+ })
|
|
|
let wherestr = ' WHERE ' + conditions.join(' AND ')
|
|
let wherestr = ' WHERE ' + conditions.join(' AND ')
|
|
|
if (this.searchXinMing) {
|
|
if (this.searchXinMing) {
|
|
|
wherestr += `and yong_hu_id_ in ('` + this.searchXinMing.split(',').join("','") + `')`
|
|
wherestr += `and yong_hu_id_ in ('` + this.searchXinMing.split(',').join("','") + `')`
|