From 498752ed654adc28dabf4b1c3d953519f197c5e3 Mon Sep 17 00:00:00 2001 From: zhoutianchi <1305666981@qq.com> Date: Wed, 14 Jan 2026 18:42:54 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=8B=9B=E7=94=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/recruit/recruitplanmajor.ts | 119 ------------------ src/api/recruit/recruitstudentplan.ts | 52 +++++++- .../recruit/backSchoolCheckin/tabIndex.vue | 4 +- .../recruitImitateAdjustBatch/addMNStu.vue | 2 +- .../recruitImitateAdjustBatch/mnTable.vue | 2 +- .../recruit/recruitplanmajor/detaiform.vue | 8 +- src/views/recruit/recruitplanmajor/index.vue | 2 +- .../recruitplanmajor/majorGroupByDept.vue | 3 +- src/views/recruit/recruitprestudent/index.vue | 2 +- .../recruitstudentsignup/detaiform.vue | 2 +- .../recruit/recruitstudentsignup/index.vue | 2 +- .../recruitstudentsignup/indexClass.vue | 2 +- .../recruit/recruitstudentsignup/list.vue | 1 - .../recruitstudentsignup/majorChange.vue | 2 +- .../recruit/recruitstudentsignup/static.vue | 4 +- 15 files changed, 63 insertions(+), 144 deletions(-) delete mode 100644 src/api/recruit/recruitplanmajor.ts diff --git a/src/api/recruit/recruitplanmajor.ts b/src/api/recruit/recruitplanmajor.ts deleted file mode 100644 index eeafc17..0000000 --- a/src/api/recruit/recruitplanmajor.ts +++ /dev/null @@ -1,119 +0,0 @@ -import request from '/@/utils/request'; - -/** - * 获取列表 - * @param query - */ -export const fetchList = (query?: any) => { - return request({ - url: '/recruit/recruitplanmajor/page', - method: 'get', - params: query, - }); -}; - -/** - * 列表 - * @param query - */ -export const list = (query?: any) => { - return request({ - url: '/recruit/recruitplanmajor/list', - method: 'get', - params: query, - }); -}; - -/** - * 按统计获取列表 - * @param query - */ -export const fetchListByStatic = (query?: any) => { - return request({ - url: '/recruit/recruitplanmajor/fetchListByStatic', - method: 'get', - params: query, - }); -}; - -/** - * 按教育程度列表 - * @param query - */ -export const listByEdu = (query?: any) => { - return request({ - url: '/recruit/recruitplanmajor/listByEdu', - method: 'get', - params: query, - }); -}; - -/** - * 列表(城市) - * @param query - */ -export const listcz = (query?: any) => { - return request({ - url: '/recruit/recruitplanmajor/listcz', - method: 'get', - params: query, - }); -}; - -/** - * 新增 - * @param obj - */ -export const addObj = (obj: any) => { - return request({ - url: '/recruit/recruitplanmajor', - method: 'post', - data: obj, - }); -}; - -/** - * 获取详情 - * @param id - */ -export const getObj = (id: string | number) => { - return request({ - url: `/recruit/recruitplanmajor/${id}`, - method: 'get', - }); -}; - -/** - * 获取城市计划 - * @param obj - */ -export const getCityPlan = (obj?: any) => { - return request({ - url: '/recruit/recruitplanmajor/getCityPlan', - method: 'get', - params: obj, - }); -}; - -/** - * 删除 - * @param id - */ -export const delObj = (id: string | number) => { - return request({ - url: `/recruit/recruitplanmajor/${id}`, - method: 'delete', - }); -}; - -/** - * 更新 - * @param obj - */ -export const putObj = (obj: any) => { - return request({ - url: '/recruit/recruitplanmajor', - method: 'put', - data: obj, - }); -}; diff --git a/src/api/recruit/recruitstudentplan.ts b/src/api/recruit/recruitstudentplan.ts index 8210cd8..effd89c 100644 --- a/src/api/recruit/recruitstudentplan.ts +++ b/src/api/recruit/recruitstudentplan.ts @@ -18,7 +18,7 @@ export const fetchList = (query?: any) => { */ export const addObj = (obj: any) => { return request({ - url: '/recruit/recruitstudentplan', + url: '/recruit/recruitstudentplan/add', method: 'post', data: obj, }); @@ -30,8 +30,9 @@ export const addObj = (obj: any) => { */ export const getObj = (id: string | number) => { return request({ - url: `/recruit/recruitstudentplan/${id}`, + url: `/recruit/recruitstudentplan/getById`, method: 'get', + params: { id :id}, }); }; @@ -41,8 +42,9 @@ export const getObj = (id: string | number) => { */ export const delObj = (id: string | number) => { return request({ - url: `/recruit/recruitstudentplan/${id}`, - method: 'delete', + url: `/recruit/recruitstudentplan/deletById`, + method: 'post', + data: { id :id}, }); }; @@ -52,8 +54,46 @@ export const delObj = (id: string | number) => { */ export const putObj = (obj: any) => { return request({ - url: '/recruit/recruitstudentplan', - method: 'put', + url: '/recruit/recruitstudentplan/edit', + method: 'post', data: obj, }); }; + + + +/** + * 按教育程度列表 + * @param query + */ +export const listByEdu = (query?: any) => { + return request({ + url: '/recruit/recruitstudentplan/listByEdu', + method: 'get', + params: query, + }); +}; + +/** + * 按学历列表 初中 + * @param query + */ +export const listcz = (query?: any) => { + return request({ + url: '/recruit/recruitstudentplan/listcz', + method: 'get', + params: query, + }); +}; + +/** + * 列表 + * @param query + */ +export const listPlanByCondition = (query?: any) => { + return request({ + url: '/recruit/recruitstudentplan/listPlanByCondition', + method: 'get', + params: query, + }); +}; \ No newline at end of file diff --git a/src/views/recruit/backSchoolCheckin/tabIndex.vue b/src/views/recruit/backSchoolCheckin/tabIndex.vue index 77ac9bd..76416d8 100644 --- a/src/views/recruit/backSchoolCheckin/tabIndex.vue +++ b/src/views/recruit/backSchoolCheckin/tabIndex.vue @@ -239,11 +239,11 @@ import { useMessage, useMessageBox } from '/@/hooks/message' import { list } from '/@/api/recruit/recruitstudentplangroup' import { backPush, backSchoolStuPage, batchPushAll } from '/@/api/recruit/recruitstudentsignup' import { getDeptList } from '/@/api/basic/basicclass' -import { list as planMajor } from '/@/api/recruit/recruitplanmajor' +import { listPlanByCondition as planMajor } from '/@/api/recruit/recruitstudentplan' import { updateFs, updateAllFS } from '/@/api/finance/financenormalstu' import { getTypeValue } from '/@/api/admin/dict' // @ts-ignore -import global from '@/components/tools/commondict' +import global from '@/components/tools/commondict.vue' const StuCheckIn = defineAsyncComponent(() => import('./stu-check-in.vue')) diff --git a/src/views/recruit/recruitImitateAdjustBatch/addMNStu.vue b/src/views/recruit/recruitImitateAdjustBatch/addMNStu.vue index e1996b4..36b6782 100644 --- a/src/views/recruit/recruitImitateAdjustBatch/addMNStu.vue +++ b/src/views/recruit/recruitImitateAdjustBatch/addMNStu.vue @@ -99,7 +99,7 @@ import { ref, reactive, nextTick } from 'vue' import { ElNotification } from 'element-plus' import { addMNObj, getMNObj, putMNObj } from '@/api/recruit/recruitImitateAdjustBatch' import { getList } from "@/api/recruit/recruitstudentsignup" -import { list as planMajor, listByEdu } from "@/api/recruit/recruitplanmajor" +import { listPlanByCondition as planMajor, listByEdu } from "@/api/recruit/recruitstudentplan" // Emits const emit = defineEmits<{ diff --git a/src/views/recruit/recruitImitateAdjustBatch/mnTable.vue b/src/views/recruit/recruitImitateAdjustBatch/mnTable.vue index 6a97da8..a9d6db0 100644 --- a/src/views/recruit/recruitImitateAdjustBatch/mnTable.vue +++ b/src/views/recruit/recruitImitateAdjustBatch/mnTable.vue @@ -131,7 +131,7 @@ import { useUserInfo } from '/@/stores/userInfo' import { useMessage, useMessageBox } from '/@/hooks/message' import { Plus, Edit, Delete } from '@element-plus/icons-vue' import { getMNStuList, delMNObj } from '@/api/recruit/recruitImitateAdjustBatch' -import { list as planMajor } from "@/api/recruit/recruitplanmajor" +import { listPlanByCondition as planMajor } from "@/api/recruit/recruitstudentplan" import { getTypeValue } from "@/api/admin/dict" // @ts-ignore import global from '@/components/tools/commondict' diff --git a/src/views/recruit/recruitplanmajor/detaiform.vue b/src/views/recruit/recruitplanmajor/detaiform.vue index 3f75f7c..72a3cac 100644 --- a/src/views/recruit/recruitplanmajor/detaiform.vue +++ b/src/views/recruit/recruitplanmajor/detaiform.vue @@ -119,7 +119,7 @@ diff --git a/src/views/stuwork/dormbuilding/emptyRoomDialog.vue b/src/views/stuwork/dormbuilding/emptyRoomDialog.vue new file mode 100644 index 0000000..0a0b9a6 --- /dev/null +++ b/src/views/stuwork/dormbuilding/emptyRoomDialog.vue @@ -0,0 +1,182 @@ + + + + + + + + + + + {{ scope.row.isHaveAir === '1' || scope.row.isHaveAir === 1 ? '已安装' : '未安装' }} + + + + + + + + + + {{ scope.row.bedNo1 || '-' }} + + + + + {{ scope.row.bedNo2 || '-' }} + + + + + {{ scope.row.bedNo3 || '-' }} + + + + + {{ scope.row.bedNo4 || '-' }} + + + + + {{ scope.row.bedNo5 || '-' }} + + + + + {{ scope.row.bedNo6 || '-' }} + + + + + {{ scope.row.isHaveAir === '1' || scope.row.isHaveAir === 1 ? '已安装' : '未安装' }} + + + + + + + + + + + 关 闭 + + + + + + + diff --git a/src/views/stuwork/dormbuilding/form.vue b/src/views/stuwork/dormbuilding/form.vue new file mode 100644 index 0000000..a90468c --- /dev/null +++ b/src/views/stuwork/dormbuilding/form.vue @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + 取 消 + 确 认 + + + + + + + diff --git a/src/views/stuwork/dormbuilding/index.vue b/src/views/stuwork/dormbuilding/index.vue new file mode 100644 index 0000000..b3711d2 --- /dev/null +++ b/src/views/stuwork/dormbuilding/index.vue @@ -0,0 +1,251 @@ + + + + + + + + + 新 增 + + + + + + + + + + + + + + + + + + {{ scope.row.roomEmptyNum }} + + {{ scope.row.roomEmptyNum || 0 }} + + + + + + {{ scope.row.roomEmptyNum5 }} + + {{ scope.row.roomEmptyNum5 || 0 }} + + + + + + {{ scope.row.roomEmptyNum4 }} + + {{ scope.row.roomEmptyNum4 || 0 }} + + + + + + {{ scope.row.roomEmptyNum3 }} + + {{ scope.row.roomEmptyNum3 || 0 }} + + + + + + {{ scope.row.roomEmptyNum2 }} + + {{ scope.row.roomEmptyNum2 || 0 }} + + + + + + {{ scope.row.roomEmptyNum1 }} + + {{ scope.row.roomEmptyNum1 || 0 }} + + + + + + + 编辑 + + + 删除 + + + + + + + + + + + + + + + + + + diff --git a/src/views/stuwork/dormbuildingmanger/index.vue b/src/views/stuwork/dormbuildingmanger/index.vue new file mode 100644 index 0000000..333e042 --- /dev/null +++ b/src/views/stuwork/dormbuildingmanger/index.vue @@ -0,0 +1,77 @@ + + + + + + + + + + + + 删除 + + + + + + + + + + + + + diff --git a/src/views/stuwork/dormhygienedaily/form.vue b/src/views/stuwork/dormhygienedaily/form.vue new file mode 100644 index 0000000..1aa163a --- /dev/null +++ b/src/views/stuwork/dormhygienedaily/form.vue @@ -0,0 +1,173 @@ + + + + + + + + + + + + + + + + + + + + + + 取 消 + 确 认 + + + + + + + diff --git a/src/views/stuwork/dormhygienedaily/index.vue b/src/views/stuwork/dormhygienedaily/index.vue new file mode 100644 index 0000000..f118a14 --- /dev/null +++ b/src/views/stuwork/dormhygienedaily/index.vue @@ -0,0 +1,261 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + 查询 + 重置 + + + + + + + + + 新 增 + + + + + + + + + + + + + {{ scope.row.schoolTerm === '1' ? '第一学期' : scope.row.schoolTerm === '2' ? '第二学期' : scope.row.schoolTerm }} + + + + + + + {{ scope.row.recordDate ? scope.row.recordDate.split(' ')[0] : '-' }} + + + + + + + 编辑 + + + 删除 + + + + + + + + + + + + + + + diff --git a/src/views/stuwork/dormreform/form.vue b/src/views/stuwork/dormreform/form.vue new file mode 100644 index 0000000..e8934f9 --- /dev/null +++ b/src/views/stuwork/dormreform/form.vue @@ -0,0 +1,131 @@ + + + + + + + + + + + + + + + + 取 消 + 确 认 + + + + + + + diff --git a/src/views/stuwork/dormreform/index.vue b/src/views/stuwork/dormreform/index.vue new file mode 100644 index 0000000..3dc3d79 --- /dev/null +++ b/src/views/stuwork/dormreform/index.vue @@ -0,0 +1,309 @@ + + + + + + + + + + + + + + + + + + + + 查询 + 重置 + + + + + + + + + 新 增 + + + 导 出 + + + + + + + + + + + + + + + {{ scope.row.reformDate ? scope.row.reformDate.split(' ')[0] : '-' }} + + + + + + {{ formatReformStatus(scope.row.reformStatus) }} + + + + + + + 合格 + + + 不合格 + + + 未整改 + + + 编辑 + + + 删除 + + + + + + + + + + + + + + + + diff --git a/src/views/stuwork/dormroom/form.vue b/src/views/stuwork/dormroom/form.vue new file mode 100644 index 0000000..e10d16f --- /dev/null +++ b/src/views/stuwork/dormroom/form.vue @@ -0,0 +1,237 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 取 消 + 确 认 + + + + + + + diff --git a/src/views/stuwork/dormroom/index.vue b/src/views/stuwork/dormroom/index.vue new file mode 100644 index 0000000..aad0daf --- /dev/null +++ b/src/views/stuwork/dormroom/index.vue @@ -0,0 +1,379 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 查询 + 重置 + + + + + + + + + 新 增 + + + 学院安排 + + + 导 出 + + + + + + + + + + + + + + + + + + + + 编辑 + + + 删除 + + + + + + + + + + + + + + + + + + + + + + + + + 取 消 + 确 认 + + + + + + + diff --git a/src/views/stuwork/dormroomstudent/dormabnormal.vue b/src/views/stuwork/dormroomstudent/dormabnormal.vue new file mode 100644 index 0000000..54496d6 --- /dev/null +++ b/src/views/stuwork/dormroomstudent/dormabnormal.vue @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + 查看 + + + + + + + + + + diff --git a/src/views/stuwork/dormroomstudent/form.vue b/src/views/stuwork/dormroomstudent/form.vue new file mode 100644 index 0000000..7bd6861 --- /dev/null +++ b/src/views/stuwork/dormroomstudent/form.vue @@ -0,0 +1,327 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 取 消 + 确 认 + + + + + + + diff --git a/src/views/stuwork/dormroomstudent/index.vue b/src/views/stuwork/dormroomstudent/index.vue new file mode 100644 index 0000000..9ab6914 --- /dev/null +++ b/src/views/stuwork/dormroomstudent/index.vue @@ -0,0 +1,410 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 查询 + 重置 + + + + + + + + + 新增住宿生 + + + 打印宿舍卡 + + + 宿舍互换 + + + 导 出 + + + 名单导出 + + + + + + + + + + + + + + + + + + + + {{ scope.row.isLeader === '1' || scope.row.isLeader === 1 ? '是' : '否' }} + + + + + + + + 转宿 + + + 退宿 + + + + + + + + + + + + + + + + + + + diff --git a/src/views/stuwork/dormroomstudent/transfer.vue b/src/views/stuwork/dormroomstudent/transfer.vue new file mode 100644 index 0000000..ca51ce2 --- /dev/null +++ b/src/views/stuwork/dormroomstudent/transfer.vue @@ -0,0 +1,227 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 取 消 + 确 认 + + + + + + + diff --git a/src/views/stuwork/dormroomstudentchange/index.vue b/src/views/stuwork/dormroomstudentchange/index.vue new file mode 100644 index 0000000..1c30a18 --- /dev/null +++ b/src/views/stuwork/dormroomstudentchange/index.vue @@ -0,0 +1,245 @@ + + + + + + + + + + + + + + + + + + + + + + + 查询 + 重置 + + + + + + + + + + + + + + + + + + {{ scope.row.createTime ? scope.row.createTime.split(' ')[0] + ' ' + scope.row.createTime.split(' ')[1] : '-' }} + + + + + + + + + {{ formatChangeType(scope.row.changeType) }} + + + + + + + + + + 查看 + + + + + + + + + + diff --git a/src/views/stuwork/pendingwork/index.vue b/src/views/stuwork/pendingwork/index.vue new file mode 100644 index 0000000..fb9d7b2 --- /dev/null +++ b/src/views/stuwork/pendingwork/index.vue @@ -0,0 +1,195 @@ + + + + + + + + + + + + + + + + + + + + 查询 + 重置 + + + + + + + + + + + + + + + + + + + + + {{ scope.row.nums }} + {{ scope.row.nums || 0 }} + + + + + {{ scope.row.createTime ? scope.row.createTime.split(' ')[0] + ' ' + scope.row.createTime.split(' ')[1] : '-' }} + + + + + {{ scope.row.updateTime ? scope.row.updateTime.split(' ')[0] + ' ' + scope.row.updateTime.split(' ')[1] : '-' }} + + + + + + 查看详情 + + + + + + + + + + + + + diff --git a/src/views/stuwork/stuworkstudyalternate/form.vue b/src/views/stuwork/stuworkstudyalternate/form.vue new file mode 100644 index 0000000..71fbe40 --- /dev/null +++ b/src/views/stuwork/stuworkstudyalternate/form.vue @@ -0,0 +1,149 @@ + + + + + + + + + + + + + + + + + + + + + + 取 消 + 确 认 + + + + + + + diff --git a/src/views/stuwork/stuworkstudyalternate/index.vue b/src/views/stuwork/stuworkstudyalternate/index.vue new file mode 100644 index 0000000..5232df7 --- /dev/null +++ b/src/views/stuwork/stuworkstudyalternate/index.vue @@ -0,0 +1,317 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 查询 + 重置 + + + + + + + + + 新 增 + + + 指定带班教师 + + + + + + + + + + + + + + + + + + + {{ scope.row.startTime ? scope.row.startTime.split(' ')[0] : '-' }} + + + + + {{ scope.row.endTime ? scope.row.endTime.split(' ')[0] : '-' }} + + + + + {{ scope.row.attendanceTeacherName || '-' }} + + + + + + 删除 + + + + + + + + + + + + + + + + + + + diff --git a/src/views/stuwork/stuworkstudyalternate/teacher.vue b/src/views/stuwork/stuworkstudyalternate/teacher.vue new file mode 100644 index 0000000..83234d6 --- /dev/null +++ b/src/views/stuwork/stuworkstudyalternate/teacher.vue @@ -0,0 +1,211 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + 取 消 + 确 认 + + + + + + + diff --git a/src/views/stuwork/waterdetail/detail.vue b/src/views/stuwork/waterdetail/detail.vue new file mode 100644 index 0000000..0f80376 --- /dev/null +++ b/src/views/stuwork/waterdetail/detail.vue @@ -0,0 +1,114 @@ + + + + + + + + + + {{ scope.row.subWatFlagSum ? Number(scope.row.subWatFlagSum).toFixed(2) : '0.00' }} + + + + + {{ formatFlag(scope.row.flag) }} + + + + + {{ formatMeterNum(scope.row.meterNum) }} + + + + + + 关 闭 + + + + + + + diff --git a/src/views/stuwork/waterdetail/form.vue b/src/views/stuwork/waterdetail/form.vue new file mode 100644 index 0000000..8a2dee4 --- /dev/null +++ b/src/views/stuwork/waterdetail/form.vue @@ -0,0 +1,279 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 取 消 + 确 认 + + + + + + + diff --git a/src/views/stuwork/waterdetail/index.vue b/src/views/stuwork/waterdetail/index.vue new file mode 100644 index 0000000..a8ed834 --- /dev/null +++ b/src/views/stuwork/waterdetail/index.vue @@ -0,0 +1,335 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + 查询 + 重置 + + + + + + + + + 新 增 + + + 导 出 + + + 初始化本期水电补贴 + + + + + + + + + + + + + + + + {{ scope.row.oddbMoney ? Number(scope.row.oddbMoney).toFixed(2) : '0.00' }} + + + + + {{ scope.row.rechargeMoney ? Number(scope.row.rechargeMoney).toFixed(2) : '0.00' }} + + + + + {{ scope.row.costMoney ? Number(scope.row.costMoney).toFixed(2) : '0.00' }} + + + + + + {{ scope.row.effectiveMoney ? Number(scope.row.effectiveMoney).toFixed(2) : '0.00' }} + + + + + + + 编辑 + + + 明细 + + + 删除 + + + + + + + + + + + + + + + + + + + + + + + + + 取 消 + 确 认 + + + + + + + + diff --git a/src/views/stuwork/waterorder/form.vue b/src/views/stuwork/waterorder/form.vue new file mode 100644 index 0000000..f93abee --- /dev/null +++ b/src/views/stuwork/waterorder/form.vue @@ -0,0 +1,262 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 取 消 + 确 认 + + + + + + + diff --git a/src/views/stuwork/waterorder/index.vue b/src/views/stuwork/waterorder/index.vue new file mode 100644 index 0000000..dd8ccb3 --- /dev/null +++ b/src/views/stuwork/waterorder/index.vue @@ -0,0 +1,370 @@ + + + + + + + + + + + + + + + + + + + + + + + 查询 + 重置 + + + + + + + + + 新 增 + + + + + + + + + + + + + + {{ formatSchoolTerm(scope.row.period) }} + + + + + + {{ formatType(scope.row.type) }} + + + + + {{ formatPaymentType(scope.row.paymentCode) }} + + + + + + + + {{ formatChargeState(scope.row.chargeState) }} + + + + + {{ formatState(scope.row.state) }} + + + + + + 编辑 + + + 删除 + + + + + + + + + + + + + + + + diff --git a/src/views/stuwork/workstudyattendance/index.vue b/src/views/stuwork/workstudyattendance/index.vue new file mode 100644 index 0000000..3ef9c27 --- /dev/null +++ b/src/views/stuwork/workstudyattendance/index.vue @@ -0,0 +1,287 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + 查询 + 重置 + + + + + + + + + + + + + + + + + + + + + + + + + + {{ formatAttendanceType(scope.row.attendanceType) }} + + + + + {{ scope.row.remarks || '-' }} + + + + + + 查看详情 + + + + + + + + + + + + + From 8bdd7985d305453e2013f04088139a2560af4813 Mon Sep 17 00:00:00 2001 From: zhoutianchi <1305666981@qq.com> Date: Thu, 15 Jan 2026 11:23:00 +0800 Subject: [PATCH 3/3] 1 --- src/api/recruit/recruitstudentplan.ts | 12 +++ .../recruit/backSchoolCheckin/staticIndex.vue | 2 +- .../recruit/backSchoolCheckin/tabIndex.vue | 10 +- .../recruitImitateAdjustBatch/addMNStu.vue | 40 +++---- .../recruitImitateAdjustBatch/detaiform.vue | 2 +- .../recruitImitateAdjustBatch/mnTable.vue | 10 +- .../recruit/recruitplanmajor/detaiform.vue | 81 +++++++------- src/views/recruit/recruitplanmajor/index.vue | 46 ++++---- .../recruitplanmajor/majorGroupByDept.vue | 4 +- .../enrolplantemplate-form.vue | 26 ++--- src/views/recruit/recruitprestudent/index.vue | 4 +- .../recruit/recruitprestudent/static.vue | 2 +- .../recruit/recruitschoolcode/detaiform.vue | 4 +- .../recruit/recruitstudentplan/index.vue | 8 +- .../detaiform.vue | 2 +- .../recruitstudentschool/detaiform.vue | 4 +- .../recruitstudentsignup/detaiform.vue | 100 +++++++++--------- .../recruit/recruitstudentsignup/index.vue | 14 +-- .../recruitstudentsignup/indexClass.vue | 14 +-- .../recruitstudentsignup/juniorlneStatic.vue | 12 +-- .../recruit/recruitstudentsignup/list.vue | 6 +- .../recruitstudentsignup/majorChange.vue | 18 ++-- .../recruit/recruitstudentsignup/static.vue | 4 +- .../recruit/recruitstudentsignup/update.vue | 2 +- 24 files changed, 215 insertions(+), 212 deletions(-) diff --git a/src/api/recruit/recruitstudentplan.ts b/src/api/recruit/recruitstudentplan.ts index effd89c..57591b2 100644 --- a/src/api/recruit/recruitstudentplan.ts +++ b/src/api/recruit/recruitstudentplan.ts @@ -60,6 +60,18 @@ export const putObj = (obj: any) => { }); }; +/** + * 单字段快速更新 + * @param obj + */ +export const editQuickField = (obj: any) => { + return request({ + url: '/recruit/recruitstudentplan/editQuickField', + method: 'post', + data: obj, + }); +}; + /** diff --git a/src/views/recruit/backSchoolCheckin/staticIndex.vue b/src/views/recruit/backSchoolCheckin/staticIndex.vue index eec4ee0..322a95d 100644 --- a/src/views/recruit/backSchoolCheckin/staticIndex.vue +++ b/src/views/recruit/backSchoolCheckin/staticIndex.vue @@ -53,7 +53,7 @@ {{ getPlanName(scope.row.groupId) }} - + diff --git a/src/views/recruit/backSchoolCheckin/tabIndex.vue b/src/views/recruit/backSchoolCheckin/tabIndex.vue index 76416d8..feb22b7 100644 --- a/src/views/recruit/backSchoolCheckin/tabIndex.vue +++ b/src/views/recruit/backSchoolCheckin/tabIndex.vue @@ -44,9 +44,9 @@ @@ -311,8 +311,8 @@ const getDeptName = (deptCode: string) => { // 获取专业名称 const getMajorName = (majorCode: string) => { - const item = planMajorList.value.find(item => item.zydm === majorCode) - return item ? item.zymc : '' + const item = planMajorList.value.find(item => item.majorCode === majorCode) + return item ? item.majorName : '' } // 获取性别 diff --git a/src/views/recruit/recruitImitateAdjustBatch/addMNStu.vue b/src/views/recruit/recruitImitateAdjustBatch/addMNStu.vue index 36b6782..7e998ff 100644 --- a/src/views/recruit/recruitImitateAdjustBatch/addMNStu.vue +++ b/src/views/recruit/recruitImitateAdjustBatch/addMNStu.vue @@ -40,10 +40,10 @@ @@ -52,10 +52,10 @@ @@ -64,10 +64,10 @@ @@ -76,9 +76,9 @@ + :key="item.majorCode" + :label="item.majorName+' | '+item.learnYear+'年 | '+item.majorCode" + :value="item.majorCode"> @@ -151,10 +151,10 @@ const dataRule = { /** * 判断拟报专业是否已经占用,占用不可选 */ -const isDisable = (zydm: string) => { - if (zydm == dataForm.wishMajorOne - || zydm == dataForm.wishMajorTwo - || zydm == dataForm.wishMajorThree +const isDisable = (majorCode: string) => { + if (majorCode == dataForm.wishMajorOne + || majorCode == dataForm.wishMajorTwo + || majorCode == dataForm.wishMajorThree ) { return true } else { @@ -262,7 +262,7 @@ const dataFormSubmit = () => { // 初始化方法 const init = (id: string | null, groupId: string, batchNo: string) => { - dataForm.id = id || "" + dataForm.id = id || null dataForm.batchNo = batchNo dataForm.groupId = groupId visible.value = true diff --git a/src/views/recruit/recruitImitateAdjustBatch/detaiform.vue b/src/views/recruit/recruitImitateAdjustBatch/detaiform.vue index 7873c81..6c054f5 100644 --- a/src/views/recruit/recruitImitateAdjustBatch/detaiform.vue +++ b/src/views/recruit/recruitImitateAdjustBatch/detaiform.vue @@ -110,7 +110,7 @@ const dataFormSubmit = () => { // 初始化方法 const init = (id: string | null) => { - dataForm.id = id || "" + dataForm.id = id || null visible.value = true canSubmit.value = true initData() diff --git a/src/views/recruit/recruitImitateAdjustBatch/mnTable.vue b/src/views/recruit/recruitImitateAdjustBatch/mnTable.vue index a9d6db0..fbd55b2 100644 --- a/src/views/recruit/recruitImitateAdjustBatch/mnTable.vue +++ b/src/views/recruit/recruitImitateAdjustBatch/mnTable.vue @@ -55,7 +55,7 @@ align="center" label="拟报专业1"> - {{global.getLabelValueByPropes2(planMajorList,scope.row.wishMajorOne,{'key':'zydm','value':'zymc'})}} + {{global.getLabelValueByPropes2(planMajorList,scope.row.wishMajorOne,{'key':'majorCode','value':'majorName'})}} - {{global.getLabelValueByPropes2(planMajorList,scope.row.wishMajorTwo,{'key':'zydm','value':'zymc'})}} + {{global.getLabelValueByPropes2(planMajorList,scope.row.wishMajorTwo,{'key':'majorCode','value':'majorName'})}} @@ -76,7 +76,7 @@ width="100px" label="拟报专业3"> - {{global.getLabelValueByPropes2(planMajorList,scope.row.wishMajorThree,{'key':'zydm','value':'zymc'})}} + {{global.getLabelValueByPropes2(planMajorList,scope.row.wishMajorThree,{'key':'majorCode','value':'majorName'})}} - {{global.getLabelValueByPropes2(planMajorList,scope.row.oldConfirmedMajor,{'key':'zydm','value':'zymc'})}} + {{global.getLabelValueByPropes2(planMajorList,scope.row.oldConfirmedMajor,{'key':'majorCode','value':'majorName'})}} - {{global.getLabelValueByPropes2(planMajorList,scope.row.confirmedMajor,{'key':'zydm','value':'zymc'})}} + {{global.getLabelValueByPropes2(planMajorList,scope.row.confirmedMajor,{'key':'majorCode','value':'majorName'})}} - - + + - - - - - + + + + + - - + + - - + + {{ item.label }} - - + + - - - - - - + + + + + + + + + + + + @@ -150,51 +150,42 @@ const majorYears = ref([]) const dataForm = reactive({ id: "", groupId: "", - zydm: "", - zymc: "", - zygfmc: "", + majorCode: "", + majorName: "", deptCode: "", - xz: "", - cc: "", + learnYear: "", + majorLevel: "", isZd: "0", isOrder: "0", remarks: "", - offcialZydm: "", + stuworkMajorCode: "", isUnion: "0", tuitionFee: 0, - cityPlanId: null as string | null, - cityPlanIds: [] as string[], - cityPlanName: "", - cityPlanYear: "", sort: 0 }) const dataRule = { - zydm: [ + majorCode: [ { required: true, message: '专业代码不能为空', trigger: 'blur' }, { min: 1, max: 6, message: '专业代码长度不大于6个字符', trigger: 'blur' } ], tuitionFee: [ { required: true, message: '学费不能为空', trigger: 'blur' } ], - zymc: [ + majorName: [ { required: true, message: '专业名称不能为空', trigger: 'blur' }, { min: 1, max: 200, message: '专业名称长度不大于200个字符', trigger: 'blur' } ], - zygfmc: [ - { required: true, message: '专业规范名称不能为空', trigger: 'blur' }, - { min: 1, max: 200, message: '专业规范名称长度不大于200个字符', trigger: 'blur' } - ], groupId: [ { required: true, message: '招生计划不能为空', trigger: 'blur' } ], - xz: [ + learnYear: [ { required: true, message: '学制不能为空', trigger: 'blur' } ], deptCode: [ { required: true, message: '学院不能为空', trigger: 'blur' } ], - cc: [ + majorLevel: [ { required: true, message: '层次不能为空', trigger: 'blur' } ], isOrder: [ @@ -230,7 +221,7 @@ const initData = () => { list().then((data: any) => { planList.value = data.data if (!dataForm.id) { - dataForm.groupId = planList.value[0]?.id || "" + dataForm.groupId = planList.value[0]?.id || null } }) getMajorNameList().then((data: any) => { @@ -287,7 +278,7 @@ const dataFormSubmit = () => { // 初始化方法 const init = (id: string | null) => { - dataForm.id = id || "" + dataForm.id = id || null visible.value = true canSubmit.value = true initData() diff --git a/src/views/recruit/recruitplanmajor/index.vue b/src/views/recruit/recruitplanmajor/index.vue index 624fe39..ed9c1c7 100644 --- a/src/views/recruit/recruitplanmajor/index.vue +++ b/src/views/recruit/recruitplanmajor/index.vue @@ -40,14 +40,14 @@ /> - - + + - - + + - - + + 查询 @@ -83,16 +83,16 @@ {{ getPlanName(scope.row.groupId) }} - - + + {{ getDeptName(scope.row.deptCode) }} - - + + {{ getYesNoLabel(scope.row.isOrder) }} @@ -120,9 +120,9 @@ /> - + - {{ getMajorCodeName(scope.row.offcialZydm) }} + {{ getMajorCodeName(scope.row.stuworkMajorCode) }}