From b21573362f7ee9e11632c361924a2a6b3cf5485b Mon Sep 17 00:00:00 2001
From: gzw <1571020389@qq.com>
Date: Wed, 24 May 2023 17:17:33 +0800
Subject: [PATCH] handle view

---
 .../controller/AttendanceController.java      | 22 +++++++-------
 ui/src/components/EditAttendance.vue          |  9 ++++--
 ui/src/pages/attendance/AttendanceHome.vue    | 29 +++++++++++++++----
 3 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/controller/AttendanceController.java b/Pinnacle/src/main/java/com/cfive/pinnacle/controller/AttendanceController.java
index d3b749e..0d0bda9 100644
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/controller/AttendanceController.java
+++ b/Pinnacle/src/main/java/com/cfive/pinnacle/controller/AttendanceController.java
@@ -33,16 +33,22 @@ public class AttendanceController {
         List<Attendance> attendances = attendanceService.getAllAttendanceAndUser();
         return ResponseResult.build(ResponseCode.DATABASE_SELECT_OK, "success", attendances);
     }
-
-    //模糊时间查询
+    //查询个人考勤
+    @GetMapping("/selectAttendance")
+    public ResponseResult findAttendanceAndUser() {
+        Long userId = WebUtil.getLoginUser().getUser().getId();
+        List<Attendance> attendances = attendanceService.getAttendanceAndUserByid(userId);
+        return ResponseResult.build(ResponseCode.DATABASE_SELECT_OK, "success", attendances);
+    }
+    //模糊时间查询所有考勤信息
     @GetMapping("/findAttendanceByTime")
-    public ResponseResult findAttendanceAndUser(String startTime,String endTime) {
+    public ResponseResult findAttendanceAndUserByTime(String startTime,String endTime) {
         List<Attendance> attendances = attendanceService.selectByTime(startTime, endTime);
         return ResponseResult.build(ResponseCode.DATABASE_SELECT_OK, "success", attendances);
     }
     //用户个人模糊时间查询
     @GetMapping("/findOneAttendanceByTime")
-    public ResponseResult findOneAttendanceAndUser(String startTime,String endTime) {
+    public ResponseResult findOneAttendanceAndUserByTime(String startTime,String endTime) {
         Long userId = WebUtil.getLoginUser().getUser().getId();
         List<Attendance> attendances = attendanceService.selectOneByTime(startTime, endTime,userId);
         System.out.println(attendances);
@@ -86,13 +92,7 @@ public class AttendanceController {
 
 
     }
-//查询个人考勤
-    @GetMapping("/selectAttendance")
-    public ResponseResult findAttendanceAndUser() {
-        Long userId = WebUtil.getLoginUser().getUser().getId();
-        List<Attendance> attendances = attendanceService.getAttendanceAndUserByid(userId);
-        return ResponseResult.build(ResponseCode.DATABASE_SELECT_OK, "success", attendances);
-    }
+
 
 
     //删除考勤信息
diff --git a/ui/src/components/EditAttendance.vue b/ui/src/components/EditAttendance.vue
index 9808df8..9f5a885 100644
--- a/ui/src/components/EditAttendance.vue
+++ b/ui/src/components/EditAttendance.vue
@@ -88,13 +88,18 @@ export default {
         },
         cancel() {
             this.resetForm()
+            ElMessage({
+                message: '取消操作',
+                type: 'warning'
+            })
             this.$emit('setDialogVisible', false)
         },
         resetForm() {
-            this.$refs.ruleForm.resetFields()
+            this.$nextTick(() => {
+                this.$refs.ruleForm.resetFields()
+            })
         }
     },
-
     created() {
         if (this.formData) {
             this.form = this.formData
diff --git a/ui/src/pages/attendance/AttendanceHome.vue b/ui/src/pages/attendance/AttendanceHome.vue
index 0ebf9cf..3c27b1a 100644
--- a/ui/src/pages/attendance/AttendanceHome.vue
+++ b/ui/src/pages/attendance/AttendanceHome.vue
@@ -128,7 +128,21 @@
 
         <div>
             <el-dialog
-                v-model="dialogFormVisible"
+                v-model="addDialogFormVisible"
+                title="考勤信息"
+                width="25% "
+                :close-on-click-modal="false"
+                :show-close="false"
+            >
+                <edit-attendance
+                    :users="users"
+                    :isDisabled="isDisabled"
+                    @addAttendance="addAttendance"
+                    @setDialogVisible="setDialogVisible"
+                ></edit-attendance>
+            </el-dialog>
+            <el-dialog
+                v-model="editDialogFormVisible"
                 title="考勤信息"
                 width="25% "
                 :close-on-click-modal="false"
@@ -170,7 +184,8 @@ export default {
             value1: '',
             users: [],
             tableData: [],
-            dialogFormVisible: false,
+            addDialogFormVisible: false,
+            editDialogFormVisible: false,
             form: {
                 userId: '',
                 userName: '',
@@ -281,13 +296,14 @@ export default {
             })
         },
         setDialogVisible(dialogVisible) {
-            this.dialogFormVisible = dialogVisible
+            this.addDialogFormVisible = dialogVisible
+            this.editDialogFormVisible = dialogVisible
             this.getAttendances()
         },
         // 打开添加弹窗
         handleAdd() {
             this.getFormData()
-            this.dialogFormVisible = true
+            this.addDialogFormVisible = true
             this.isDisabled = false
         },
         // 处理保存
@@ -305,14 +321,15 @@ export default {
         // 获取更改数据
         viewUpdate(row) {
             this.getFormData()
-            this.dialogFormVisible = true
+            this.editDialogFormVisible = true
             this.isDisabled = true
             this.form = row
+            this.form.userId = row.user.username
             this.form.status = row.status + ''
         },
         addAttendance(formData) {
             this.doSave(formData)
-            this.dialogFormVisible = false
+            this.addDialogFormVisible = false
         },
         // 点击取消
         cancel() {