diff --git a/package.json b/package.json index 580c64f..62b69b0 100644 --- a/package.json +++ b/package.json @@ -41,6 +41,7 @@ "clipboard": "2.0.8", "core-js": "3.25.3", "crypto-js": "^4.2.0", + "dayjs": "^1.11.19", "echarts": "5.4.0", "element-ui": "2.15.14", "file-saver": "2.0.5", diff --git a/src/api/system/attMacManage.js b/src/api/system/attMacManage.js index e7c631c..9fa0781 100644 --- a/src/api/system/attMacManage.js +++ b/src/api/system/attMacManage.js @@ -160,3 +160,12 @@ export function getNoEntryAttendanceRecordListAPI(params) { params, }) } + +// 同步考勤记录 +export function syncAttendanceRecordAPI(data) { + return request({ + url: '/bmw/kqManager/getDevAttr', + method: 'post', + data, + }) +} diff --git a/src/components/TableModel/index.vue b/src/components/TableModel/index.vue index 8c5d82b..444f5a2 100644 --- a/src/components/TableModel/index.vue +++ b/src/components/TableModel/index.vue @@ -364,9 +364,15 @@ export default { /* 生成查询参数 */ this.formLabel.map((e) => { if (e.f_type === 'dateRange') { - this.$set(this.queryParams, e.dateType[0], '') - this.$set(this.queryParams, e.dateType[1], '') this.typeList = e.dateType + if (e.initValue && Array.isArray(e.initValue) && e.initValue.length === 2) { + this.$set(this.queryParams, e.dateType[0], e.initValue[0]) + this.$set(this.queryParams, e.dateType[1], e.initValue[1]) + this.$set(this.queryParams, e.f_model, e.initValue) + } else { + this.$set(this.queryParams, e.dateType[0], '') + this.$set(this.queryParams, e.dateType[1], '') + } if (this.isOneMonth) { this.pickerOptions = { diff --git a/src/views/construction-person/face-query/components/attendanceRecordList.vue b/src/views/construction-person/face-query/components/attendanceRecordList.vue index 1163f05..e8d744c 100644 --- a/src/views/construction-person/face-query/components/attendanceRecordList.vue +++ b/src/views/construction-person/face-query/components/attendanceRecordList.vue @@ -12,22 +12,94 @@ :isIndexShow="false" ref="tableRef" :pageSizes="[100, 200, 500]" - @selection-change="handleSelectionChange" > + + + + + diff --git a/src/views/system/AttMacManage/components/attendanceRecordList.vue b/src/views/system/AttMacManage/components/attendanceRecordList.vue index 4c5d51d..e8d744c 100644 --- a/src/views/system/AttMacManage/components/attendanceRecordList.vue +++ b/src/views/system/AttMacManage/components/attendanceRecordList.vue @@ -12,22 +12,94 @@ :isIndexShow="false" ref="tableRef" :pageSizes="[100, 200, 500]" - @selection-change="handleSelectionChange" > + + + + +