Commit Graph

125 Commits (06a283390e422095137706128d5bc27bf3d47427)

Author SHA1 Message Date
wuyize 06a283390e 基本完成消息通知 2023-01-08 16:23:37 +08:00
白封羽 e71ca15397 Merge remote-tracking branch 'origin/main' 2023-01-07 13:02:31 +08:00
白封羽 11a1889ae4 修正了一些样式 2023-01-07 13:02:24 +08:00
wuyize 433d79de81 Merge remote-tracking branch 'origin/main' into main 2023-01-07 12:45:22 +08:00
wuyize 0c85217c62 初步对接消息列表 2023-01-07 12:45:14 +08:00
白封羽 a39d3ce14a 添加拉取部门的等待 2023-01-07 12:30:42 +08:00
白封羽 1f73983dfb Merge remote-tracking branch 'origin/main' 2023-01-07 11:39:22 +08:00
白封羽 eb9de2f1e3 修正部门配置 2023-01-07 11:39:11 +08:00
wuyize 70e01e3f1d Merge remote-tracking branch 'origin/main' into main 2023-01-06 22:35:20 +08:00
wuyize 7c9c8c2a77 初步完成消息列表布局 2023-01-06 22:35:14 +08:00
白封羽 ec17ab2e10 Merge remote-tracking branch 'origin/main' 2023-01-06 16:24:30 +08:00
白封羽 f784649d51 部门测试结束 2023-01-06 16:24:22 +08:00
wuyize 6075f39949 Merge remote-tracking branch 'origin/main' into main 2023-01-06 16:07:22 +08:00
wuyize fdce581746 试图解决退出登录的问题 2023-01-06 16:07:16 +08:00
白封羽 a18526141c 修正了全部记录 2023-01-06 15:57:14 +08:00
白封羽 ab4ebe68fa 修正了城市配置 2023-01-06 15:45:02 +08:00
白封羽 306736c42f Merge remote-tracking branch 'origin/main' 2023-01-06 15:32:26 +08:00
白封羽 b569844c4f 其他配置结束 2023-01-06 15:32:19 +08:00
wuyize 25c389d0c8 Merge remote-tracking branch 'origin/main' into main 2023-01-06 15:30:38 +08:00
wuyize df5ee3a3c6 解决财务员工导航菜单不匹配问题 2023-01-06 15:30:30 +08:00
白封羽 a6c7378398 Merge remote-tracking branch 'origin/main' 2023-01-06 15:26:01 +08:00
白封羽 358ea4d733 城市配置结束 2023-01-06 15:25:52 +08:00
wuyize 25f5cf453b Merge remote-tracking branch 'origin/main' into main 2023-01-06 15:04:16 +08:00
wuyize 586c4fa69e 解决了一些问题 2023-01-06 15:04:11 +08:00
白封羽 8d02ef7ecc 修正了我的报销搜索 2023-01-06 14:18:41 +08:00
白封羽 e63fa0153d 修正了我的报销搜索 2023-01-06 13:48:25 +08:00
白封羽 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