From 62088a620946ac67c1311629c09e669b93e0eb74 Mon Sep 17 00:00:00 2001
From: wangzhibiao <wangzhibiao@gitlab.com>
Date: Mon, 21 Sep 2026 17:06:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=A4=E4=BA=92=EF=BC=9A?=
 =?UTF-8?q?=E5=AF=B9=E9=BD=90=E5=8F=82=E8=AE=AD=E7=8A=B6=E6=80=81=E4=B8=8E?=
 =?UTF-8?q?=E8=80=83=E5=8B=A4=E6=93=8D=E4=BD=9C=E5=8F=AF=E8=BE=BE=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build_ui/src/views/train/checkin/index.vue    | 23 +++++++++++++++++--
 .../train/plan/components/EnrollmentPanel.vue | 12 ++++++++--
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/build_ui/src/views/train/checkin/index.vue b/build_ui/src/views/train/checkin/index.vue
index 1ba5aae4b..57748824f 100644
--- a/build_ui/src/views/train/checkin/index.vue
+++ b/build_ui/src/views/train/checkin/index.vue
@@ -55,8 +55,16 @@
       <el-table-column label="备注/调整说明" prop="remark" min-width="150" show-overflow-tooltip>
         <template slot-scope="scope">{{ scope.row.remark || "-" }}</template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="140">
         <template slot-scope="scope">
+          <el-button
+            v-if="scope.row.signInTime && !scope.row.signOutTime"
+            v-hasPermi="['train:attendance:checkin']"
+            size="mini"
+            type="text"
+            icon="el-icon-circle-check"
+            @click="handleSignOut(scope.row)"
+          >签退</el-button>
           <el-button
             v-hasPermi="['train:attendance:edit']"
             size="mini"
@@ -116,7 +124,7 @@
 
 <script>
 import { listCheckin } from '@/api/train/checkin'
-import { adjustAttendance } from '@/api/train/attendance'
+import { adjustAttendance, signOutAttendance } from '@/api/train/attendance'
 
 export default {
   name: 'Checkin',
@@ -206,6 +214,17 @@ export default {
           this.adjustSubmitting = false
         })
       })
+    },
+    handleSignOut(row) {
+      this.$modal.confirm(`确认对学员【${row.studentName}】执行课次签退？`).then(() => {
+        return signOutAttendance({
+          enrollmentId: row.enrollmentId,
+          lessonId: row.lessonId
+        })
+      }).then(() => {
+        this.$modal.msgSuccess('签退成功')
+        this.getList()
+      }).catch(() => {})
     }
   }
 }
diff --git a/build_ui/src/views/train/plan/components/EnrollmentPanel.vue b/build_ui/src/views/train/plan/components/EnrollmentPanel.vue
index 7c99a3036..5cf2632b5 100644
--- a/build_ui/src/views/train/plan/components/EnrollmentPanel.vue
+++ b/build_ui/src/views/train/plan/components/EnrollmentPanel.vue
@@ -120,6 +120,7 @@
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item command="2" :disabled="scope.row.enrollmentStatus === 2">标记请假</el-dropdown-item>
               <el-dropdown-item command="3" :disabled="scope.row.enrollmentStatus === 3">标记退训</el-dropdown-item>
+              <el-dropdown-item v-if="scope.row.enrollmentStatus === 2 || scope.row.enrollmentStatus === 3" command="resume">恢复参训</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
           <!-- 开班前支持移除 -->
@@ -469,8 +470,15 @@ export default {
     },
     // ---- 变更参训状态 ----
     handleStatusAction(command, row) {
-      const status = Number(command)
-      const label = status === 2 ? '请假' : '退训'
+      let status
+      let label
+      if (command === 'resume') {
+        status = row.joinTime ? 1 : 0
+        label = row.joinTime ? '恢复已报到归队' : '恢复待报到'
+      } else {
+        status = Number(command)
+        label = status === 2 ? '请假' : '退训'
+      }
       this.$prompt(`请输入将学员【${row.studentName}】标记为【${label}】的备注原因：`, '变更参训状态', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',