Commit Graph

57 Commits

Author SHA1 Message Date
TianyangZhang a790793c5f fix: bug--gx -修改 车辆预定时段 2025-12-11 10:47:07 +08:00
caoqianming 15d3e64f02 fix: mroombooking在初始状态编辑时slot问题 2025-12-01 13:49:03 +08:00
TianyangZhang 4a6b604e88 fix : srm 修改 提交专利审批和论文同时生成台账 2025-11-25 16:47:10 +08:00
caoqianming 606bc5e9a7 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-11-21 16:09:42 +08:00
caoqianming 8b2bd9adff feat: mroombooking wf_key 2025-11-21 16:09:41 +08:00
TianyangZhang 4bd3007e0d Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-11-21 14:33:21 +08:00
TianyangZhang af82feb7dc add : ofm -vehicle 修改车辆信息 2025-11-21 14:33:19 +08:00
caoqianming 171545b918 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-11-21 14:27:55 +08:00
caoqianming 0f0bd39e7b feat: 修改mroombooking表单名称 2025-11-21 14:27:33 +08:00
TianyangZhang f0b4d5f0bf fix: ofm 修改form name 2025-11-21 14:19:11 +08:00
TianyangZhang 46fbdef199 fix: ofm && srm 修改 form 名称 2025-11-21 14:10:24 +08:00
TianyangZhang ae8bd96320 fix: ofm 模块bug 修改已经功能完善 2025-11-19 13:49:33 +08:00
TianyangZhang a8d2e46e68 feat: fix srm ofm 修改审批信息 2025-11-13 09:52:48 +08:00
TianyangZhang a7cd474940 feat: ofm-- 修改form 表单 2025-11-10 10:56:06 +08:00
TianyangZhang b52985a844 feat: add ofm and srm 增加 localmode 2025-11-10 09:56:50 +08:00
TianyangZhang 0c46fda197 feat:ofm and srm 修改 workflow_key 增加 wf_ 2025-11-10 08:56:40 +08:00
caoqianming 84e447527a feat: 添加离职申请表 2025-11-09 22:37:18 +08:00
caoqianming 84f0cef581 feat: 优化会议室预定页面 2025-11-09 12:33:34 +08:00
TianyangZhang 11d019bb1e feat: ofm - fix bug 2025-11-07 09:26:35 +08:00
TianyangZhang a40dd9079a feat: ofm-veicle 修改车辆审批 2025-11-05 17:41:42 +08:00
TianyangZhang be9db47732 feat: ofm-seal 修改form 表单 2025-11-05 16:58:57 +08:00
TianyangZhang 3af6cba243 feat: ofm-seal bug fix 2025-11-05 16:10:12 +08:00
TianyangZhang fbad9178ff feat: booking 优化 2025-11-05 11:10:37 +08:00
shijing 8a33f72193 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-11-04 16:42:25 +08:00
shijing 296fdfb165 fix:会议室预定调整 2025-11-04 16:42:22 +08:00
TianyangZhang 2d6e8ad5a6 feat: srm- 增加科研管理审批模块 2025-11-04 13:40:00 +08:00
TianyangZhang 6a9cc84577 feat:ofm 增加论文申密 2025-10-30 15:39:27 +08:00
TianyangZhang 78e42d14fb feat: ofm--add 增加专利模块 2025-10-28 14:24:49 +08:00
caoqianming 2996a6b2e6 feat: booking审批表单更改2 2025-10-17 13:57:40 +08:00
caoqianming ce728f0d07 feat: 相关审批表单更改 2025-10-17 13:19:05 +08:00
zty 035230bddd feat:ofm 修改驳回到开始继续编辑 2025-10-16 16:09:33 +08:00
zty 3da6e02814 feat: ofm-borrow 修改档案借阅审批流 2025-10-15 15:43:02 +08:00
zty f3b24924f3 Revert "fix:预定功能完善" 恢复到当前最新版本
This reverts commit 1f63a0741d.
2025-10-15 15:18:54 +08:00
zty 4bb288cc16 Revert "fix:问题修正" 回退到 10-11 日最后一次提交
This reverts commit 8722d6de5d.
2025-10-15 13:40:21 +08:00
zty c33a1e3c80 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-10-14 16:48:25 +08:00
zty a1444ca06f feat: ofm 修改车辆 印章的审批管理 以及 反存ticket_data 2025-10-14 16:48:23 +08:00
shijing ed6501057b fix:审批详情处理 2025-10-14 10:31:57 +08:00
zty 8382275e67 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-10-13 14:30:28 +08:00
zty c68ce9998f feat: gx-ofm- 行政管理 + 宣传报道模块 2025-10-13 14:30:26 +08:00
shijing 1f63a0741d fix:预定功能完善 2025-10-13 10:15:41 +08:00
shijing 8722d6de5d fix:问题修正 2025-10-11 15:05:39 +08:00
zty b2b6346a9b feat: 光芯-行政管理 2025-10-10 09:19:50 +08:00
shijing 1c61925eac fix:预定页面调整 2025-10-09 09:03:20 +08:00
caoqianming ddb620a2f0 feat: 传入ticket_ 2025-09-28 09:02:09 +08:00
zty 4877082104 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-09-28 08:52:51 +08:00
zty cc0d813ae1 feat:印章管理 —增加审批 2025-09-28 08:52:49 +08:00
shijing f802f71800 fix:预定修改 2025-09-26 16:30:53 +08:00
shijing 5d26c5fee5 fix:预定修改 2025-09-26 16:30:40 +08:00
zty eda14df89c Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-09-26 14:49:51 +08:00
shijing 4b50910cdd fix:预定页面调整 2025-09-26 14:00:57 +08:00