wuzhen update test
This commit is contained in:
wuzhen committed
1 parent
098776b8c0
commit
138a250f28
12 files changed
+274
-63
No files matched your search
@@ -578,7 +578,7 @@ export default {
|
||||
|
||||
/** 状态变更 */
|
||||
handleStatusChange(row) {
|
||||
let text = row.status === '1' ? '启用' : '停用';
|
||||
const text = row.status === '1' ? '启用' : '停用';
|
||||
this.$modal
|
||||
.confirm('确认要"' + text + '""' + row.configName + '"配置吗？')
|
||||
.then(() => {
|
||||
|
||||
@@ -174,8 +174,8 @@
|
||||
<pagination
|
||||
v-show="projectTotal > 0"
|
||||
:total="projectTotal"
|
||||
:page.sync="queryParams.pageNum"
|
||||
:limit.sync="queryParams.pageSize"
|
||||
v-model:page="queryParams.pageNum"
|
||||
v-model:limit="queryParams.pageSize"
|
||||
@pagination="getProjectList"
|
||||
/>
|
||||
</el-tab-pane>
|
||||
|
||||
@@ -1871,8 +1871,8 @@ const submitForm = () => {
|
||||
/** 处理待关联的附件 */
|
||||
const handlePendingAttachments = async (orderId: string | number) => {
|
||||
let hasOperations = false;
|
||||
let successMessages: string[] = [];
|
||||
let errorMessages: string[] = [];
|
||||
const successMessages: string[] = [];
|
||||
const errorMessages: string[] = [];
|
||||
|
||||
// 处理待删除的附件（编辑模式）
|
||||
if (pendingDeleteAttachmentIds.value.length > 0) {
|
||||
|
||||
@@ -1,10 +1,5 @@
|
||||
<template>
|
||||
<el-dialog
|
||||
v-model="dialogVisible"
|
||||
title="申请详情"
|
||||
width="80%"
|
||||
:before-close="handleClose"
|
||||
>
|
||||
<el-dialog v-model="dialogVisible" title="申请详情" width="80%" :before-close="handleClose">
|
||||
<div v-loading="loading" class="application-detail">
|
||||
<template v-if="applicationData">
|
||||
<!-- 基本信息 -->
|
||||
@@ -130,12 +125,15 @@ const applicationData = ref<WorkStudyApplicationVO>();
|
||||
const dialogVisible = ref(false);
|
||||
|
||||
// 监听 visible 变化
|
||||
watch(() => props.visible, (newVal) => {
|
||||
dialogVisible.value = newVal;
|
||||
if (newVal && props.applicationId) {
|
||||
getDetail();
|
||||
watch(
|
||||
() => props.visible,
|
||||
(newVal) => {
|
||||
dialogVisible.value = newVal;
|
||||
if (newVal && props.applicationId) {
|
||||
getDetail();
|
||||
}
|
||||
}
|
||||
});
|
||||
);
|
||||
|
||||
// 监听 dialogVisible 变化
|
||||
watch(dialogVisible, (newVal) => {
|
||||
|
||||
@@ -68,38 +68,13 @@
|
||||
<template #default="{ row }">
|
||||
<div class="operation-buttons">
|
||||
<el-tooltip content="查看详情" placement="top">
|
||||
<el-button
|
||||
link
|
||||
type="primary"
|
||||
icon="View"
|
||||
size="small"
|
||||
@click="handleDetail(row)"
|
||||
|
||||
>
|
||||
详情
|
||||
</el-button>
|
||||
<el-button link type="primary" icon="View" size="small" @click="handleDetail(row)"> 详情 </el-button>
|
||||
</el-tooltip>
|
||||
<el-tooltip content="审核通过" placement="top">
|
||||
<el-button
|
||||
link
|
||||
type="success"
|
||||
icon="Check"
|
||||
size="small"
|
||||
@click="handleReview(row, 'approved')"
|
||||
>
|
||||
通过
|
||||
</el-button>
|
||||
<el-button link type="success" icon="Check" size="small" @click="handleReview(row, 'approved')"> 通过 </el-button>
|
||||
</el-tooltip>
|
||||
<el-tooltip content="审核拒绝" placement="top">
|
||||
<el-button
|
||||
link
|
||||
type="danger"
|
||||
icon="Close"
|
||||
size="small"
|
||||
@click="handleReview(row, 'rejected')"
|
||||
>
|
||||
拒绝
|
||||
</el-button>
|
||||
<el-button link type="danger" icon="Close" size="small" @click="handleReview(row, 'rejected')"> 拒绝 </el-button>
|
||||
</el-tooltip>
|
||||
</div>
|
||||
</template>
|
||||
@@ -245,7 +220,6 @@ const getList = async () => {
|
||||
} else {
|
||||
console.log('🔍 [调试] ⚠️ 列表为空！');
|
||||
}
|
||||
|
||||
} catch (error: any) {
|
||||
console.error('🔍 [调试] 获取待审核申请列表失败:', error);
|
||||
if (error?.response?.data) {
|
||||
|
||||
@@ -749,7 +749,7 @@ const getStudentLeaveInfo = async (id: string | number) => {
|
||||
try {
|
||||
//通过销假id获取请假id
|
||||
const leaveIdResp = await getLeaveIdByCancelLeaveId(id);
|
||||
let leaveId = leaveIdResp?.data;
|
||||
const leaveId = leaveIdResp?.data;
|
||||
console.log('通过销假ID获取到的请假ID:', leaveId);
|
||||
id = leaveId || id;
|
||||
|
||||
|
||||
@@ -257,7 +257,7 @@ function emitDateRangeChange() {
|
||||
// 本月第一天
|
||||
const firstDay = new Date(year, month, 1);
|
||||
// 本月第一天是星期几（0-6，0是星期日）
|
||||
let firstDayOfWeek = firstDay.getDay() || 7; // 转换为1-7，1是星期一
|
||||
const firstDayOfWeek = firstDay.getDay() || 7; // 转换为1-7，1是星期一
|
||||
|
||||
// 计算本月第一周的第一天（可能是上个月的日期）
|
||||
const firstDayOfCalendar = new Date(firstDay);
|
||||
@@ -266,7 +266,7 @@ function emitDateRangeChange() {
|
||||
// 计算本月最后一天
|
||||
const lastDay = new Date(year, month + 1, 0);
|
||||
// 本月最后一天是星期几（0-6，0是星期日）
|
||||
let lastDayOfWeek = lastDay.getDay() || 7; // 转换为1-7，1是星期一
|
||||
const lastDayOfWeek = lastDay.getDay() || 7; // 转换为1-7，1是星期一
|
||||
|
||||
// 计算本月最后一周的最后一天（可能是下个月的日期）
|
||||
const lastDayOfCalendar = new Date(lastDay);
|
||||
@@ -357,7 +357,7 @@ const monthDays = computed(() => {
|
||||
// 本月第一天
|
||||
const firstDay = new Date(year, month, 1);
|
||||
// 本月第一天是星期几（0-6，0是星期日）
|
||||
let firstDayOfWeek = firstDay.getDay() || 7; // 转换为1-7，1是星期一
|
||||
const firstDayOfWeek = firstDay.getDay() || 7; // 转换为1-7，1是星期一
|
||||
|
||||
// 计算本月第一周的第一天（可能是上个月的日期）
|
||||
const firstDayOfCalendar = new Date(firstDay);
|
||||
|
||||
@@ -445,7 +445,7 @@ async function viewMyAppointments() {
|
||||
console.log(`获取预约记录，添加时间戳${timestamp}强制刷新数据`);
|
||||
|
||||
// 尝试多种类型转换，确保能正确查询到记录
|
||||
let id = studentId.value;
|
||||
const id = studentId.value;
|
||||
|
||||
// 尝试使用原始studentId查询，强制刷新数据
|
||||
console.log('尝试使用原始studentId查询:', id);
|
||||
|
||||
@@ -623,7 +623,7 @@ const getCollegeName = (row: any): string => {
|
||||
}
|
||||
|
||||
// 如果有学院代码，尝试从映射表获取
|
||||
let collegeId = row.collegeId || row.college_id;
|
||||
const collegeId = row.collegeId || row.college_id;
|
||||
|
||||
if (collegeId) {
|
||||
const collegeMap: { [key: string]: string } = {
|
||||
|
||||
Reference in new issue
Block a user