fix:社招新员工项目字段调整

This commit is contained in:
zxj
2025-11-18 15:14:38 +08:00
parent b20d91737e
commit 6237f98780
2 changed files with 39 additions and 12 deletions

View File

@@ -53,7 +53,7 @@
<a-select <a-select
v-model:value="tableParam.approvalResults" v-model:value="tableParam.approvalResults"
style="width: 260px; height: 40px" style="width: 260px; height: 40px"
placeholder="报名及HR审批结果" placeholder="审核状态"
:options="hrAuditResultList" :options="hrAuditResultList"
allowClear allowClear
></a-select> ></a-select>
@@ -73,6 +73,22 @@
</div> </div>
</a-form-item> </a-form-item>
</a-col> </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-col>
<a-button <a-button
class="cus-btn" class="cus-btn"
@@ -480,6 +496,7 @@
</template> </template>
<script setup lang="jsx"> <script setup lang="jsx">
import { computed, defineProps, onMounted, ref, watch } from "vue"; import { computed, defineProps, onMounted, ref, watch } from "vue";
import dayjs from "dayjs";
import { delStudentList, getStuPage, batchUpdateStatus, auditStudentBatch, updateScore } from "@/api/index1"; import { delStudentList, getStuPage, batchUpdateStatus, auditStudentBatch, updateScore } from "@/api/index1";
import ChangeGroupModal from "@/components/student/ChangeGroupModal.vue"; import ChangeGroupModal from "@/components/student/ChangeGroupModal.vue";
import CommonStudent from "@/components/student/CommonStudent"; import CommonStudent from "@/components/student/CommonStudent";
@@ -555,11 +572,11 @@ const topFlagList = ref([
]); ]);
const hrAuditResultList = ref([ const hrAuditResultList = ref([
{ // {
id: 1, // id: 1,
value: 1, // value: 1,
label: "报名失败", // label: "报名失败",
}, // },
{ {
id: 2, id: 2,
value: 2, value: 2,
@@ -573,7 +590,7 @@ const hrAuditResultList = ref([
{ {
id: 4, id: 4,
value: 4, value: 4,
label: "审核不通过", label: "审核驳回",
}, },
]); ]);
@@ -722,10 +739,10 @@ const tablecolumns = ref([
align: "center", align: "center",
customRender: ({ record: { hrAuditResult } }) => customRender: ({ record: { hrAuditResult } }) =>
({ ({
1: "报名失败", // 1: "报名失败",
2: "审核中", 2: "审核中",
3: "审核通过", 3: "审核通过",
4: "审核不通过", 4: "审核驳回",
}[hrAuditResult]), }[hrAuditResult]),
}, },
...props.columns, ...props.columns,
@@ -773,6 +790,7 @@ const tableParam = ref({
studentDepartId: null, //部门 studentDepartId: null, //部门
studentDepartName: null, //部门名称 studentDepartName: null, //部门名称
topFlag: null, //是否是优秀学员 topFlag: null, //是否是优秀学员
enrollYear: null, //报名年份
pageNo: 1, pageNo: 1,
status: 1, status: 1,
pageSize: 10, pageSize: 10,
@@ -781,6 +799,13 @@ const tableParam = ref({
...props.params ...props.params
}); });
// 禁用未来年份
const disabledYear = (current) => {
if (!current) return false;
const currentYear = dayjs().year();
return current.year() > currentYear;
};
const checkgroupParam = ref({ const checkgroupParam = ref({
changegroupV: false, //学员名称 changegroupV: false, //学员名称
checkgroupList: "", //学员小组 checkgroupList: "", //学员小组
@@ -886,7 +911,9 @@ function reset() {
tableParam.value.studentDepartId = null; //部门 tableParam.value.studentDepartId = null; //部门
tableParam.value.studentDepartName = null; //部门 tableParam.value.studentDepartName = null; //部门
tableParam.value.topFlag = null; //是否是优秀学员 tableParam.value.topFlag = null; //是否是优秀学员
tableParam.value.hrAuditResult = null; //报名及HR审批结果 tableParam.value.approvalResults = null; //报名及HR审批结果
tableParam.value.studyStatus = null; //学习状态
tableParam.value.enrollYear = null; //报名年份
getStuList(); getStuList();
} }

View File

@@ -279,7 +279,7 @@
class="nameimg" class="nameimg"
src="../../assets/images/basicinfo/asterisk.png" src="../../assets/images/basicinfo/asterisk.png"
/> />
<div class="inname" style="margin-top: 13px">选修课数量</div> <div class="inname" style="margin-top: 13px">完成选修课数量</div>
</div> </div>
<div class="in"> <div class="in">
<a-input-number <a-input-number
@@ -837,7 +837,7 @@ export default {
level: "请填写项目级别", level: "请填写项目级别",
systemId: "请填写项目培训体系", systemId: "请填写项目培训体系",
boeFlag: "请选择关联BOEU立项审批单", boeFlag: "请选择关联BOEU立项审批单",
electiveCourseCount: "请输入选修课数量", electiveCourseCount: "请输入完成选修课数量",
// requiredCourseCount: "请输入必修课程数量", // requiredCourseCount: "请输入必修课程数量",
}; };