From 6237f9878068060e5366b60ffbda107ef365501c Mon Sep 17 00:00:00 2001
From: zxj <zhang.xijie@iwhalecloud.com>
Date: Tue, 18 Nov 2025 15:14:38 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E7=A4=BE=E6=8B=9B=E6=96=B0=E5=91=98?=
 =?UTF-8?q?=E5=B7=A5=E9=A1=B9=E7=9B=AE=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/student/TableStudent.vue | 47 +++++++++++++++++++------
 src/views/projectcenter/ProjectAdd.vue  |  4 +--
 2 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue
index 54b68386..f57bf173 100644
--- a/src/components/student/TableStudent.vue
+++ b/src/components/student/TableStudent.vue
@@ -53,7 +53,7 @@
             <a-select
               v-model:value="tableParam.approvalResults"
               style="width: 260px; height: 40px"
-              placeholder="报名及HR审批结果"
+              placeholder="审核状态"
               :options="hrAuditResultList"
               allowClear
             ></a-select>
@@ -73,6 +73,22 @@
           </div>
         </a-form-item>
       </a-col>
+      <a-col v-if="isNewEmployee">
+        <a-form-item title="报名年份：">
+          <div class="select">
+            <a-date-picker
+              v-model:value="tableParam.enrollYear"
+              style="width: 260px; height: 40px"
+              placeholder="报名年份"
+              picker="year"
+              format="YYYY"
+              valueFormat="YYYY"
+              :disabledDate="disabledYear"
+              allowClear
+            ></a-date-picker>
+          </div>
+        </a-form-item>
+      </a-col>
       <a-col>
         <a-button
           class="cus-btn"
@@ -480,6 +496,7 @@
 </template>
 <script setup lang="jsx">
 import { computed, defineProps, onMounted, ref, watch } from "vue";
+import dayjs from "dayjs";
 import { delStudentList, getStuPage, batchUpdateStatus, auditStudentBatch, updateScore } from "@/api/index1";
 import ChangeGroupModal from "@/components/student/ChangeGroupModal.vue";
 import CommonStudent from "@/components/student/CommonStudent";
@@ -555,11 +572,11 @@ const topFlagList = ref([
 ]);
 
 const hrAuditResultList = ref([
-  {
-    id: 1,
-    value: 1,
-    label: "报名失败",
-  },
+  // {
+  //   id: 1,
+  //   value: 1,
+  //   label: "报名失败",
+  // },
   {
     id: 2,
     value: 2,
@@ -573,7 +590,7 @@ const hrAuditResultList = ref([
   {
     id: 4,
     value: 4,
-    label: "审核不通过",
+    label: "审核驳回",
   },
 ]);
 
@@ -722,10 +739,10 @@ const tablecolumns = ref([
     align: "center",
     customRender: ({ record: { hrAuditResult } }) =>
     ({
-      1: "报名失败",
+      // 1: "报名失败",
       2: "审核中",
       3: "审核通过",
-      4: "审核不通过",
+      4: "审核驳回",
     }[hrAuditResult]),
   },
   ...props.columns,
@@ -773,6 +790,7 @@ const tableParam = ref({
   studentDepartId: null, //部门
   studentDepartName: null, //部门名称
   topFlag: null, //是否是优秀学员
+  enrollYear: null, //报名年份
   pageNo: 1,
   status: 1,
   pageSize: 10,
@@ -781,6 +799,13 @@ const tableParam = ref({
   ...props.params
 });
 
+// 禁用未来年份
+const disabledYear = (current) => {
+  if (!current) return false;
+  const currentYear = dayjs().year();
+  return current.year() > currentYear;
+};
+
 const checkgroupParam = ref({
   changegroupV: false, //学员名称
   checkgroupList: "", //学员小组
@@ -886,7 +911,9 @@ function reset() {
   tableParam.value.studentDepartId = null; //部门
   tableParam.value.studentDepartName = null; //部门
   tableParam.value.topFlag = null; //是否是优秀学员
-  tableParam.value.hrAuditResult = null; //报名及HR审批结果
+  tableParam.value.approvalResults = null; //报名及HR审批结果
+  tableParam.value.studyStatus = null; //学习状态
+  tableParam.value.enrollYear = null; //报名年份
   getStuList();
 }
 
diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue
index 4496ec05..295dd3f3 100644
--- a/src/views/projectcenter/ProjectAdd.vue
+++ b/src/views/projectcenter/ProjectAdd.vue
@@ -279,7 +279,7 @@
               class="nameimg"
               src="../../assets/images/basicinfo/asterisk.png"
             />
-            <div class="inname" style="margin-top: 13px">选修课程数量</div>
+            <div class="inname" style="margin-top: 13px">完成选修课数量</div>
           </div>
           <div class="in">
             <a-input-number
@@ -837,7 +837,7 @@ export default {
       level: "请填写项目级别",
       systemId: "请填写项目培训体系",
       boeFlag: "请选择关联BOEU立项审批单",
-      electiveCourseCount: "请输入选修课程数量",
+      electiveCourseCount: "请输入完成选修课数量",
       // requiredCourseCount: "请输入必修课程数量",
     };