Commit Graph

468 Commits

Author SHA1 Message Date
吴红兵
99282b3c1b rebuild all 2026-03-06 11:01:24 +08:00
吴红兵
dad11c8131 fix 2026-03-06 10:40:33 +08:00
吴红兵
9da3a92b69 跟新 2026-03-06 10:04:47 +08:00
吴红兵
ac4df43795 恢复更新 2026-03-06 03:38:01 +08:00
吴红兵
a5a77b509b fix 2026-03-06 02:50:46 +08:00
吴红兵
9a4490b2c6 fix 2026-03-06 01:50:07 +08:00
吴红兵
3a86e24722 fix 2026-03-06 01:33:49 +08:00
吴红兵
e637d19037 Merge branch 'developer' of ssh://code.cyweb.top:30033/scj/zhxy/v3/cloud-ui into developer 2026-03-06 01:15:48 +08:00
吴红兵
83ed9dad05 跟新 2026-03-06 01:15:40 +08:00
wangdongjun
b088900886 rebuild all 2026-03-05 23:26:43 +08:00
王栋俊
fdabc8efcc Merge branch 'developer' into 'master'
rebuild all

See merge request scj/zhxy/v3/cloud-ui!2
2026-03-05 14:43:23 +00:00
wangdongjun
57085824b6 rebuild all 2026-03-05 22:43:04 +08:00
王栋俊
8767ec8593 Merge branch 'developer' into 'master'
Developer

See merge request scj/zhxy/v3/cloud-ui!1
2026-03-05 13:30:22 +00:00
wangdongjun
ca3092c685 rebuild all 2026-03-05 21:26:33 +08:00
wangdongjun
618fee859a Merge branch 'developer' of ssh://code.cyweb.top:30033/scj/zhxy/v3/cloud-ui into developer 2026-03-05 21:25:57 +08:00
吴红兵
25f31978e5 跟新 2026-03-05 20:02:15 +08:00
吴红兵
450e1be7bd 跟新 2026-03-05 19:45:43 +08:00
yaojian
9bbfc6e736 学籍比对 2026-03-05 18:16:08 +08:00
吴红兵
44256b55cc 跟新 2026-03-05 18:15:31 +08:00
吴红兵
ea7e48fc49 跟新 2026-03-05 17:34:02 +08:00
yaojian
f63ce726c1 班主任考核学期统计 2026-03-05 15:37:17 +08:00
吴红兵
700c2e6a83 Merge remote-tracking branch 'origin/developer' into developer 2026-03-05 15:00:25 +08:00
吴红兵
2317909261 fix 2026-03-05 15:00:19 +08:00
yaojian
5125ea04c9 宿舍月卫生 2026-03-05 14:46:55 +08:00
吴红兵
bff8907f88 跟新 2026-03-05 09:37:01 +08:00
吴红兵
cc9e0a1022 fix 2026-03-05 02:05:50 +08:00
吴红兵
1e6d6ae981 fix 2026-03-05 01:20:15 +08:00
吴红兵
c3daa41f10 fix 2026-03-05 00:15:04 +08:00
吴红兵
48b31285c8 fix 2026-03-04 23:20:40 +08:00
吴红兵
7f61c9bdce fix 2026-03-04 22:10:41 +08:00
吴红兵
69439fdfab feat: 采购模块8项功能优化
1. 履约评价按钮:仅在审核状态完成时显示
2. 流程审批:申请人可编辑表单
3. 部门代表弹窗:增加身份选择(采购代表/评委)
4. 履约验收上传:改为仅支持PDF格式
5. 采购申请列表:增加采购形式字段显示(el-tag)
6. 采购申请提交:防止重复点击(已存在loading)
2026-03-04 20:19:03 +08:00
吴红兵
e3437921e5 Merge branch 'developer' of ssh://code.cyweb.top:30033/scj/zhxy/v3/cloud-ui into developer 2026-03-04 19:20:00 +08:00
吴红兵
9ecb26732f 跟新 2026-03-04 19:19:54 +08:00
zhoutianchi
4a1e096925 Merge branch 'developer' of ssh://code.cyweb.top:30033/scj/zhxy/v3/cloud-ui into developer 2026-03-04 18:22:48 +08:00
zhoutianchi
39bab0f1c2 1 2026-03-04 18:22:46 +08:00
吴红兵
e15601c13c fix 2026-03-04 17:45:49 +08:00
吴红兵
1600b44440 Merge branch 'feature-purchase' into developer 2026-03-04 17:10:43 +08:00
吴红兵
4bddbfe24f fix: 修复采购规则阈值获取逻辑,支持 amountMax 字段
DEPT_PURCHASE_THRESHOLD 规则配置的是 amountMax=50000,原代码只检查
amountMin 导致规则存在但报错缺失的问题。
2026-03-04 17:10:14 +08:00
吴红兵
809c0dc4cc Merge branch 'feature-purchase' into developer 2026-03-04 17:01:55 +08:00
吴红兵
72160787f9 fix: 优化采购申请页面会议纪要字段及动态配置
1. 统一会议纪要字段名称为校党委会议纪要
2. 部门自行采购会议纪要使用动态配置替代硬编码2000
3. 动态配置获取不到值时直接报错而非使用默认值
4. 调整部门自行采购会议纪要显示条件为金额>=2000
2026-03-04 17:00:37 +08:00
yaojian
3395bf6591 班主任跟踪情况 2026-03-04 16:49:41 +08:00
吴红兵
f6b7b4b2ca Merge branch 'feature-purchase' into developer 2026-03-04 15:49:54 +08:00
吴红兵
338610dc51 feat(purchase): 优化更新材料功能-去掉确认按钮/限制上传1个文件/自动提交 2026-03-04 15:48:39 +08:00
吴红兵
9146770a9d Merge branch 'feature-purchase' into developer 2026-03-04 15:34:20 +08:00
吴红兵
19ab4f94a6 feat(purchase): 上传材料大小限制从5MB提升到50MB 2026-03-04 15:31:34 +08:00
yaojian
ce6f6ca15b 单个查询 2026-03-04 15:28:25 +08:00
yaojian
28f7c1945e 单个毕业学生确认 2026-03-04 14:54:19 +08:00
yaojian
749c7b1294 1 2026-03-04 14:00:22 +08:00
吴红兵
40587cfa50 Merge branch 'feature-purchase' into developer 2026-03-04 13:20:38 +08:00
吴红兵
7509bae979 fix: 修复更新材料页面的两个问题
- 修复文件名称显示为File的问题,使用fileTitle字段
- 排除履约验收(110)和采购文件(130)类型不显示
2026-03-04 13:19:34 +08:00