ソースを参照

考勤功能-打卡改为接口调用

zhonghuizhen 1 年間 前
コミット
e4e9d4e59e

+ 9 - 2
src/views/system/dashboard/components/util.js

@@ -11,6 +11,7 @@ import newPng from '@/assets/images/homepage/new.png'
 import { BASE_URL } from '@/constant'
 import dayjs from 'dayjs'
 import { scheduleType } from '@/views/constants/schedule'
+import { attendanceDetailClockIn } from '@/api/business/attendance'
 import { lifeTimeData } from '@/views/business/deviceManagement/constants/simulated'
 
 /**
@@ -728,6 +729,13 @@ export function buildComponent (name, column, preview, vm) {
                         this.$message.warning('考勤数据异常!')
                         return
                     }
+                    // 更新打卡请求
+                    attendanceDetailClockIn(attendance.id_).then(() => {
+                        this.$message.success('打卡成功!')
+                    }).catch(() => {
+                        this.$message.warning('打卡失败')
+                    })
+                    /*
                     // 获取当前时间
                     const currentDate = new Date()
                     const hours = currentDate.getHours()
@@ -757,8 +765,6 @@ export function buildComponent (name, column, preview, vm) {
                         attendance.da_ka_shi_jian_2_ = dakashijian
                         attendance.zhuang_tai_2_ = '正常'
                     }
-
-                    // 更新打卡请求
                     const tableName = ' t_attendance_detail'
                     const updateParams = {
                         tableName,
@@ -781,6 +787,7 @@ export function buildComponent (name, column, preview, vm) {
                     this.$common.request('update', updateParams).then(() => {
                         this.$message.success(str)
                     })
+                */
                 },
                 getTimeDifferenceInMinutes (startTimeStr, endTimeStr) { // 时间相减分钟数
                     const startTime = new Date(startTimeStr)

+ 16 - 0
src/views/system/homepage/index.vue

@@ -179,6 +179,7 @@ import CalendarAlert from '@/views/system/dashboard/components/calendar-alert.vu
 import mySchedule from './components/mySchedule.vue'
 import makeUpEdit from '@/views/business/attendance/makeUpEdit.vue'
 import dakaDialog from '@/views/business/attendance/dakaDialog.vue'
+import { attendanceDetailClockIn } from '@/api/business/attendance'
 
 const _import = require('@/utils/util.import.' + process.env.NODE_ENV)
 export default {
@@ -750,6 +751,20 @@ export default {
             this.$refs.schedule.openDialog()
         },
         dakaSingle (selectedValue) {
+            const today = this.$common.getDateNow()
+            const { first, second } = this.$store.getters.level || {}
+            // 查询该班次对应的考勤数据
+            const sql = `select a.* FROM t_attendance_detail a JOIN t_schedule b ON a.pai_ban_id_ = b.id_ AND b.status_ = '已发布' WHERE a.di_dian_ = '${second || first}' AND a.ri_qi_ = '${today}' AND a.yong_hu_id_ = '${this.$store.getters.userId}' and a.ban_ci_bie_ming_ = '${selectedValue}' `
+            this.$common.request('sql', sql).then(res => {
+                const data = res.variables.data[0] || {}
+                // 更新打卡请求
+                attendanceDetailClockIn(data.id_).then(() => {
+                    this.$message.success('打卡成功!')
+                }).catch(() => {
+                    this.$message.warning('打卡失败')
+                })
+            })
+            /*
             const today = this.$common.getDateNow()
             const { first, second } = this.$store.getters.level || {}
             // 查询该班次对应的考勤数据
@@ -809,6 +824,7 @@ export default {
                 })
             }).catch(() => {
             })
+            */
         },
         handleDakaConfirm (selectedValue) {
             this.dakaSingle(selectedValue)