Commit Graph

300 Commits

Author SHA1 Message Date
TianyangZhang f475974d49 feat: gx-人员请假申请 2026-01-07 16:01:51 +08:00
caoqianming 85693bbfde feat: 添加科研项目页面 2026-01-06 14:18:57 +08:00
shijing e77e6c716d fix:排棒日志填写时,批次更新为棒的编号 2026-01-05 13:45:36 +08:00
TianyangZhang ec45398088 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2026-01-04 14:11:31 +08:00
TianyangZhang 42c009451e feat:光芯OA-新增报价单审核功能 2026-01-04 14:11:28 +08:00
shijing d8899317a8 fix: 2025-12-31 09:30:23 +08:00
caoqianming d87662ce33 feat: 打印机设置支持ip 2025-12-30 10:38:14 +08:00
TianyangZhang 58cc8076b3 feat:修改人员交接单 2025-12-25 09:41:52 +08:00
caoqianming 7749abd60b feat: 添加assetlogin form 2025-12-24 15:40:58 +08:00
caoqianming 919c2d453f feat: 添加固定资产相关页面 2025-12-19 18:42:52 +08:00
caoqianming 4bb44903fc Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-12-16 11:23:21 +08:00
caoqianming 793a151a18 feat: 维修记录初步完成 2025-12-16 11:23:20 +08:00
TianyangZhang dd6c769b86 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-12-16 09:23:09 +08:00
TianyangZhang 00f7a66620 feat: pum 人员需求页面 2025-12-16 09:23:09 +08:00
shijing b65fc2c7be Merge branch 'gzerp' 2025-12-15 10:47:49 +08:00
caoqianming d1cf6b2afb feat: 原route页面添加dag图 2025-12-12 13:59:08 +08:00
caoqianming 9797b51ded feat: base 添加ticketCount接口 2025-12-12 10:32:23 +08:00
caoqianming d817601437 feat: base 优化工作流配置的参与人选择等 2025-12-03 13:25:08 +08:00
TianyangZhang a0189dbe95 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-11-19 13:49:35 +08:00
TianyangZhang ae8bd96320 fix: ofm 模块bug 修改已经功能完善 2025-11-19 13:49:33 +08:00
caoqianming 0567d98b93 feat: base 添加工作流分组select 2025-11-18 11:24:58 +08:00
TianyangZhang a8d2e46e68 feat: fix srm ofm 修改审批信息 2025-11-13 09:52:48 +08:00
caoqianming 7d9f86a8ab feat: 添加供应商审核 2025-11-10 14:08:09 +08:00
caoqianming 83fe31b76a feat: resignation支持删除操作 2025-11-09 23:15:36 +08:00
caoqianming 7db573871d feat: 添加离职申请表 2025-11-07 17:05:47 +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
zty eda14df89c Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-09-26 14:49:51 +08:00
shijing db46b1d878 fix:预定页面提取 2025-09-25 17:19:08 +08:00
shijing b412841492 fix:会议室预约 2025-09-25 08:54:41 +08:00
zty cfc8529681 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-09-24 14:32:39 +08:00
zty 6fe7d72986 add: ofm-新增 车辆等信息 2025-09-24 14:19:06 +08:00
shijing eed04718d2 fix:声明mroom的update接口 2025-09-24 09:38:27 +08:00
shijing 6981147670 fix:日志提交时若无结束时间,则获取服务器当前时间,更新后再提交日志 2025-09-11 15:23:10 +08:00
zty b0063b6052 feat: 添加会议预定相关页面 2025-09-05 10:44:15 +08:00
zty 8cd7bdb879 Merge branch 'master' of http://10.0.11.51:3000/zcdsj/factory_web 2025-08-28 16:21:41 +08:00
shijing 1323dbd396 feat 2025-08-27 15:35:11 +08:00
zty 605d05e7c0 feat:增加凌源箱线图 和更改 tkx的测点 2025-08-27 14:00:39 +08:00
caoqianming 1e82e0eb7d feat: 导入出入库明细 2025-08-18 13:42:24 +08:00
shijing 631cba19a0 fix:快速创建日志接口声明 2025-08-18 08:36:14 +08:00
shijing 977f5b0584 fix:发货打印 2025-08-08 17:02:21 +08:00
shijing 07f369198a fix:禅道37 2025-08-07 14:27:44 +08:00
caoqianming ceea2e2674 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-08-05 15:28:00 +08:00
caoqianming 58403f3fb8 feat: ichat获取返回结果 2025-08-05 14:24:14 +08:00
shijing 921bf52761 fix:分配出库对外编号接口声明 2025-07-31 16:08:04 +08:00
shijing bce8253aba fix:获取最新编码接口声明 2025-07-30 15:38:36 +08:00
shijing 69e7513a77 fix: 2025-07-09 14:05:05 +08:00
shijing d8d9fbf914 fix:出入库记录do_out、other_in、pur_in中mioitem可以撤回并删除 2025-06-27 14:52:23 +08:00
shijing eb9396f2f8 fix:交接撤消 2025-06-20 15:01:12 +08:00