From 6721fe85d86dc62c9a6be50b80a5e4256e5e992b Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Thu, 18 Sep 2025 16:23:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E9=9C=80=E6=B1=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entry-and-exit-manage/person-exit.js      |  2 +-
 .../card-replacement-apply/index.vue          |  1 +
 .../select-person-and-date.vue                | 68 ++++++++++++++++++-
 .../person-entry/add-or-edit-form.vue         |  2 +-
 .../person-exit/index.vue                     |  2 +-
 5 files changed, 70 insertions(+), 5 deletions(-)

diff --git a/src/api/construction-person/entry-and-exit-manage/person-exit.js b/src/api/construction-person/entry-and-exit-manage/person-exit.js
index 7250bd3..3cabb63 100644
--- a/src/api/construction-person/entry-and-exit-manage/person-exit.js
+++ b/src/api/construction-person/entry-and-exit-manage/person-exit.js
@@ -12,7 +12,7 @@ export const addEntryPersonAPI = (data) => {
 
 // 人员出场 批量出场
 export const batchExitPersonAPI = (data) => {
-    return requestFormData({
+    return request({
         url: '/bmw/workerExit/exit/batchExit',
         method: 'POST',
         data,
diff --git a/src/views/construction-person/attendance-manage/card-replacement-apply/index.vue b/src/views/construction-person/attendance-manage/card-replacement-apply/index.vue
index 29280e4..4a74ac0 100644
--- a/src/views/construction-person/attendance-manage/card-replacement-apply/index.vue
+++ b/src/views/construction-person/attendance-manage/card-replacement-apply/index.vue
@@ -298,6 +298,7 @@ export default {
 
         // 关闭弹框
         handleCloseDialogOuter() {
+            this.selectProjectId = ''
             this.dialogConfig.outerVisible = false
         },
     },
diff --git a/src/views/construction-person/attendance-manage/card-replacement-apply/select-person-and-date.vue b/src/views/construction-person/attendance-manage/card-replacement-apply/select-person-and-date.vue
index 82fa2a2..7d402dd 100644
--- a/src/views/construction-person/attendance-manage/card-replacement-apply/select-person-and-date.vue
+++ b/src/views/construction-person/attendance-manage/card-replacement-apply/select-person-and-date.vue
@@ -58,6 +58,25 @@
             <span> ({{ idNumber }}) </span>
         </div>
 
+        <div class="legend">
+            <div class="legend-item">
+                <span class="legend-mark active"></span>
+                <span>已打卡</span>
+            </div>
+            <div class="legend-item">
+                <span class="legend-mark inactive"></span>
+                <span>未打卡</span>
+            </div>
+            <div class="legend-item">
+                <span class="legend-mark not-in-range"></span>
+                <span>已在其他工程打卡</span>
+            </div>
+            <div class="legend-item">
+                <span class="legend-mark is-no-att"></span>
+                <span>不在场</span>
+            </div>
+        </div>
+
         <!-- 补卡日历 -->
         <div class="date-ist" v-if="cardReplacementDateList.length > 0">
             <div
@@ -81,6 +100,7 @@
                 >
                     {{ item.month }}月
                 </span>
+
                 <div
                     class="item"
                     :ref="`item${index}`"
@@ -88,7 +108,9 @@
                         height: initHeight + 'px',
                         backgroundColor: item.inRange
                             ? item.isActive == 1
-                                ? '#19be6b'
+                                ? item.isSamePro == 1
+                                    ? '#19be6b'
+                                    : '#ff9900'
                                 : '#f56c6c'
                             : '#999',
                         cursor:
@@ -266,8 +288,9 @@ export default {
                             month: key.split('-')[1],
                             date: key.split('-')[2],
                             inRange: res[key].inRange,
-                            isActive: res[key].isActive,
                             currentDate: key,
+                            isActive: res[key].isActive,
+                            isSamePro: res[key].isSamePro,
                             isChecked: this.editRepairDateList.includes(key),
                         })
                     }
@@ -280,6 +303,7 @@ export default {
                             isActive: res[key].isActive,
                             currentDate: key,
                             isChecked: false,
+                            isSamePro: res[key].isSamePro,
                         })
                     }
                 }
@@ -442,4 +466,44 @@ export default {
         background-color: #b58bae !important;
     }
 }
+
+/* 图例样式 */
+.legend {
+    display: flex;
+    justify-content: center;
+    gap: 10px;
+    margin-bottom: 10px;
+    padding-bottom: 10px;
+}
+
+.legend-item {
+    display: flex;
+    align-items: center;
+    gap: 5px;
+    font-size: 14px;
+    color: #666;
+}
+
+.legend-mark {
+    display: inline-block;
+    width: 24px;
+    height: 24px;
+    border-radius: 3px;
+}
+
+.legend-mark.active {
+    background-color: #19be6b;
+}
+
+.legend-mark.inactive {
+    background-color: #f56c6c;
+}
+
+.legend-mark.not-in-range {
+    background-color: #ff9900;
+}
+
+.is-no-att {
+    background-color: #999;
+}
 </style>
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 cf7ca6c..6411865 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
@@ -1444,7 +1444,7 @@ export default {
         async getEntryPersonDetail() {
             const { data: res } = await getEntryPersonDetailAPI({
                 id: this.queryDetailsId,
-                proId: this.proId,
+                proId: this.proId || 0, // 当没有工程id时给默认值为0 否则报错
             })
 
             // 身份证基本信息
diff --git a/src/views/construction-person/entry-and-exit-manage/person-exit/index.vue b/src/views/construction-person/entry-and-exit-manage/person-exit/index.vue
index 47827a3..cc784ce 100644
--- a/src/views/construction-person/entry-and-exit-manage/person-exit/index.vue
+++ b/src/views/construction-person/entry-and-exit-manage/person-exit/index.vue
@@ -214,7 +214,7 @@ export default {
             const res = await batchExitPersonAPI(params)
 
             if (res.code === 200) {
-                this.$modal.msgWarning(res.msg)
+                this.$modal.msgSuccess(res.msg)
                 this.$refs.personExitTableRef.getTableList()
             } else {
                 this.$modal.msgError(res.msg)