Commit Graph

105 Commits (c01d602bc3c3bc6d5370be9c9f5bf12795b25ee5)

Author SHA1 Message Date
白封羽 c01d602bc3 修正了两处bug 2023-01-06 13:18:47 +08:00
wuyize c770c86eaf 部分完成用户配置 2023-01-06 12:36:58 +08:00
白封羽 81079aba5d Merge remote-tracking branch 'origin/main' 2023-01-05 23:02:05 +08:00
白封羽 02c9127c8f 修复了【其他配置】循环更新的问题 2023-01-05 23:01:54 +08:00
wuyize 2fbdc8cadd Merge remote-tracking branch 'origin/main' into main
# Conflicts:
#	src/pages/configuration/Configuration.tsx
2023-01-05 22:40:12 +08:00
wuyize 0c91c3d29d 财务统计接入后端 2023-01-05 22:39:11 +08:00
白封羽 d6230497c0 Merge remote-tracking branch 'origin/main' 2023-01-05 20:09:55 +08:00
白封羽 9e87f4861b 其他配置框架 2023-01-05 20:09:45 +08:00
yang.yongquan 1ed138eb0e 修改submitCheck了==为=== 2023-01-05 19:52:30 +08:00
yang.yongquan ac67f16655 修复了小bug 2023-01-05 19:45:38 +08:00
白封羽 2b3b45835a Merge remote-tracking branch 'origin/main' 2023-01-05 17:35:33 +08:00
白封羽 4ba5bff205 城市配置框架 2023-01-05 17:35:23 +08:00
wuyize 0579658b6f 调整了一些布局 2023-01-05 16:24:02 +08:00
wuyize 33b68690af 解决发票管理换页不保留搜索的问题 2023-01-05 14:53:11 +08:00
wuyize 65e321b0c0 导航菜单加上总经理的情况 2023-01-05 13:10:44 +08:00
wuyize 17b7ec0882 Merge remote-tracking branch 'origin/main' into main 2023-01-05 12:47:22 +08:00
wuyize eac61bc7ba 完成统计页,待后端上线 2023-01-05 12:47:16 +08:00
白封羽 ae6f8470fa 添加了系统配置,待添加至侧栏 2023-01-05 12:45:20 +08:00
白封羽 4d5d5be95f Merge remote-tracking branch 'origin/main' 2023-01-05 12:02:06 +08:00
白封羽 e7ac6d7b82 没有部门 2023-01-05 12:01:57 +08:00
wuyize b30fbc9fb9 Merge remote-tracking branch 'origin/main' into main 2023-01-04 20:24:25 +08:00
wuyize 47ef702eab 解决上传发票的问题 2023-01-04 20:24:18 +08:00
白封羽 e44b27f239 Merge remote-tracking branch 'origin/main' 2023-01-04 18:55:54 +08:00
白封羽 1590505d2c 豆蘸盐牛 2023-01-04 18:55:43 +08:00
wuyize 5db802be6c 移除一些不必要的依赖 2023-01-04 18:14:07 +08:00
wuyize 6578760a87 Merge remote-tracking branch 'origin/main' into main 2023-01-04 18:06:40 +08:00
wuyize 1206b23280 完成财务统计页的布局 2023-01-04 18:06:32 +08:00
白封羽 90b0d121ee 鲸鱼来咯 2023-01-03 21:34:05 +08:00
白封羽 fcba9e958b 蹦蹦炸弹 2023-01-03 21:26:54 +08:00
yang.yongquan ca60ee536b 修复了小bug 2023-01-03 20:23:32 +08:00
yang.yongquan d2ec511675 Merge remote-tracking branch 'origin/main' 2023-01-03 20:16:45 +08:00
yang.yongquan 2f23041aac 添加了一个树形列表组件 2023-01-03 20:16:32 +08:00
白封羽 fd3e327df7 沧海之约 2023-01-03 20:14:30 +08:00
白封羽 5a90b4d1a1 帮帮忙 2023-01-03 17:04:07 +08:00
白封羽 37541eb53b Merge remote-tracking branch 'origin/main' 2023-01-03 17:02:36 +08:00
白封羽 80f28e57a5 再等等 2023-01-03 17:02:28 +08:00
yang.yongquan 7cad47c256 添加了报销单提交的check内容 2023-01-03 16:18:41 +08:00
白封羽 eb0d64b251 Merge remote-tracking branch 'origin/main' 2023-01-03 15:49:46 +08:00
白封羽 d08fd60427 快报销好了 2023-01-03 15:49:34 +08:00
wuyize 0a522d1fe6 完善我的发票和发票管理 2023-01-03 14:39:32 +08:00
白封羽 c95fb9ab79 Merge remote-tracking branch 'origin/main' 2023-01-02 23:33:37 +08:00
白封羽 08001d5f32 仍在报销 2023-01-02 23:33:23 +08:00
wuyize fd873c0c13 我的发票添加撤回 2023-01-02 23:20:48 +08:00
wuyize 9079f39014 初步完成发票管理 2023-01-02 22:49:16 +08:00
wuyize 3f64451add Merge remote-tracking branch 'origin/main' into main 2023-01-02 21:03:16 +08:00
wuyize a9ba72b612 完成显示发票详情 2023-01-02 21:03:10 +08:00
白封羽 30cd60c925 完善了搜索 2023-01-02 19:11:12 +08:00
白封羽 9b6d5f2361 更新了报销提交后的刷新机制 2023-01-02 18:38:11 +08:00
白封羽 c81d5e9020 可以报销了 2023-01-02 18:28:46 +08:00
wuyize e711d03dd6 staff中加入staffBase 2023-01-02 14:35:45 +08:00