From 7e2eb219bdfe5d49cede0abb21e76cea3c519c74 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Tue, 18 Nov 2025 10:12:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../attendance-manage/attendance-count.js     |  9 ++++
 .../attendance-count/attendance-details.vue   | 41 ++++++++++++++++++-
 .../attendance-count/index.vue                |  4 +-
 .../person-entry/add-or-edit-form.vue         |  2 +-
 .../contract-witness-upload.vue               |  2 +-
 .../month-detail/components/att-details.vue   | 20 +++++++++
 6 files changed, 74 insertions(+), 4 deletions(-)

diff --git a/src/api/construction-person/attendance-manage/attendance-count.js b/src/api/construction-person/attendance-manage/attendance-count.js
index 1a944b4..7346f28 100644
--- a/src/api/construction-person/attendance-manage/attendance-count.js
+++ b/src/api/construction-person/attendance-manage/attendance-count.js
@@ -48,3 +48,12 @@ export const getAttendanceDetailsListAPI = (data) => {
         params: data,
     })
 }
+
+// 取消考勤
+export const cancelAttendanceAPI = (data) => {
+    return request({
+        url: '/bmw/workerLight/cancelWorkerAtt',
+        method: 'POST',
+        data,
+    })
+}
diff --git a/src/views/construction-person/attendance-manage/attendance-count/attendance-details.vue b/src/views/construction-person/attendance-manage/attendance-count/attendance-details.vue
index e594f62..f966814 100644
--- a/src/views/construction-person/attendance-manage/attendance-count/attendance-details.vue
+++ b/src/views/construction-person/attendance-manage/attendance-count/attendance-details.vue
@@ -113,6 +113,20 @@
                             </template>
                         </template>
                     </el-table-column>
+
+                    <el-table-column align="center" label="操作">
+                        <template slot-scope="{ row }">
+                            <el-button
+                                type="text"
+                                @click="handleCancelAtt(row)"
+                                v-if="row.isAtt == 1 || row.isAtt == 2"
+                            >
+                                取消考勤
+                            </el-button>
+
+                            <span v-else> - </span>
+                        </template>
+                    </el-table-column>
                 </el-table>
             </el-col>
         </el-row>
@@ -121,7 +135,10 @@
 
 <script>
 import AttendanceCalendar from '@/components/AttendanceCalendar'
-import { getAttendanceDetailsListAPI } from '@/api/construction-person/attendance-manage/attendance-count'
+import {
+    cancelAttendanceAPI,
+    getAttendanceDetailsListAPI,
+} from '@/api/construction-person/attendance-manage/attendance-count'
 export default {
     name: 'AttendanceDetails',
     components: {
@@ -266,6 +283,28 @@ export default {
                 }
             }
         },
+
+        // 取消考勤
+        handleCancelAtt(row) {
+            this.$confirm('确定取消该考勤吗？', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning',
+            }).then(async () => {
+                console.log('确定')
+
+                const res = await cancelAttendanceAPI({
+                    proId: this.proId,
+                    workerId: this.workerId,
+                    attDay: row.einDay,
+                })
+
+                if (res.code === 200) {
+                    this.$message.success('取消考勤成功')
+                    this.getAttendanceDetailsListData()
+                }
+            })
+        },
     },
 
     created() {
diff --git a/src/views/construction-person/attendance-manage/attendance-count/index.vue b/src/views/construction-person/attendance-manage/attendance-count/index.vue
index a925fec..ebe110f 100644
--- a/src/views/construction-person/attendance-manage/attendance-count/index.vue
+++ b/src/views/construction-person/attendance-manage/attendance-count/index.vue
@@ -18,7 +18,9 @@
             </template>
 
             <template v-for="item in slots" :slot="item" slot-scope="{ data }">
-                <span :key="item">{{ data[item] }}</span>
+                <template>
+                    <span :key="item">{{ data[item] }}</span>
+                </template>
             </template>
         </TableModel>
 
diff --git a/src/views/construction-person/entry-and-exit-manage/person-entry/add-or-edit-form.vue b/src/views/construction-person/entry-and-exit-manage/person-entry/add-or-edit-form.vue
index a8ffc28..a534786 100644
--- a/src/views/construction-person/entry-and-exit-manage/person-entry/add-or-edit-form.vue
+++ b/src/views/construction-person/entry-and-exit-manage/person-entry/add-or-edit-form.vue
@@ -1089,7 +1089,7 @@ export default {
                                                 if (valid4) {
                                                     let fieldsToCheck_1 = [
                                                         // 'contractCode', // 合同编号
-                                                        'wageCriterion', // 工资核定标准
+                                                        // 'wageCriterion', // 工资核定标准
                                                         'contractStopDate', // 合同终止日期
                                                         'contractStartDate', // 合同签订日期
                                                     ]
diff --git a/src/views/construction-person/red-green-light-mange/contract-witness/contract-witness-upload.vue b/src/views/construction-person/red-green-light-mange/contract-witness/contract-witness-upload.vue
index 454eaec..c855494 100644
--- a/src/views/construction-person/red-green-light-mange/contract-witness/contract-witness-upload.vue
+++ b/src/views/construction-person/red-green-light-mange/contract-witness/contract-witness-upload.vue
@@ -275,7 +275,7 @@ export default {
             // 检查图片是否有上传（排除附件）
             let fieldsList = [
                 // 'contractCode', // 合同编号
-                'wageCriterion', // 工资核定标准
+                // 'wageCriterion', // 工资核定标准
                 'contractStopDate', // 合同终止日期
                 'contractStartDate', // 合同签订日期
             ]
diff --git a/src/views/synthesize-query/three-and-one/month-detail/components/att-details.vue b/src/views/synthesize-query/three-and-one/month-detail/components/att-details.vue
index e1e6e45..1b247e1 100644
--- a/src/views/synthesize-query/three-and-one/month-detail/components/att-details.vue
+++ b/src/views/synthesize-query/three-and-one/month-detail/components/att-details.vue
@@ -103,6 +103,14 @@
                     label="其他备注"
                     fixed="right"
                 />
+
+                <el-table-column align="center" label="操作" fixed="right">
+                    <template slot-scope="{ row }">
+                        <el-button type="text" @click="handleDelete(row)">
+                            删除
+                        </el-button>
+                    </template>
+                </el-table-column>
             </el-table>
 
             <!-- <div style="padding-right: 20px">
@@ -246,6 +254,18 @@ export default {
                 }
             })
         },
+
+        // 删除
+        handleDelete(row) {
+            console.log(row)
+            this.$confirm('确定删除该记录吗？', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning',
+            }).then(() => {
+                console.log('确定')
+            })
+        },
     },
 }
 </script>