Commit Graph

231 Commits

Author SHA1 Message Date
jhc
9846c33fd1 Merge branch 'jhc' into dev 2023-04-25 11:46:13 +08:00
jhc
abf38c47d6 修改 财务报表审批 2023-04-25 11:46:00 +08:00
jhc
007da446bd 修改冲突 2023-04-25 11:09:49 +08:00
jhc
5ae4913fca 添加 财务报表审批 2023-04-25 11:07:00 +08:00
jhc
a974e0def3 Merge branch 'jhc' into dev 2023-04-24 19:38:14 +08:00
jhc
b8ec6a70a6 修改 2023-04-24 19:37:56 +08:00
jhc
300e818750 Merge branch 'jhc' into dev 2023-04-24 19:04:21 +08:00
jhc
357db1c143 财务报表审批 设置 2023-04-24 19:04:04 +08:00
jhc
a769dd08bf oa 审批 未完成 2023-04-24 16:17:01 +08:00
jhc
131d247db7 Merge branch 'jhc' into dev 2023-04-24 15:52:57 +08:00
jhc
06f56fc0b0 添加 财务表报审批类型 2023-04-24 15:52:43 +08:00
jhc
da91d1e9be Merge branch 'jhc' into dev 2023-04-21 15:30:55 +08:00
jhc
611fecad5d 修改 类型 2023-04-21 15:30:42 +08:00
jhc
41f30a1193 Merge branch 'jhc' into dev 2023-04-21 15:11:28 +08:00
jhc
734b0a86a8 添加 oa 类型 2023-04-21 15:09:28 +08:00
jhc
eee8529c77 Merge branch 'jhc' into dev 2023-04-14 09:27:18 +08:00
jhc
44b76dc6ea 待阅读、已阅读列表 终极版 1.0 2023-04-14 09:26:09 +08:00
jhc
17f31ce8d0 Merge branch 'jhc' into dev 2023-04-14 09:21:47 +08:00
jhc
d157d072e5 待阅读、已阅读列表 终极版 2023-04-14 09:21:13 +08:00
jhc
28f61be90b Merge branch 'jhc' into dev 2023-04-14 09:03:22 +08:00
jhc
a018fc944f 取消 submitter 条件查询 2023-04-14 09:02:56 +08:00
jhc
dea66c18d1 Merge branch 'jhc' into dev 2023-04-13 20:15:15 +08:00
jhc
b8eb4ebd0c 修改 待阅读和阅读 4.0 2023-04-13 20:14:58 +08:00
jhc
e18b5efa84 Merge branch 'jhc' into dev 2023-04-13 20:09:11 +08:00
jhc
9adf5a9acb 修改 待阅读和阅读 3.0 2023-04-13 20:08:55 +08:00
jhc
7974f8cea0 Merge branch 'dev' of http://192.168.12.3:8090/bugmaker/management_system/fonchain-approval into dev 2023-04-13 19:06:27 +08:00
jhc
a6eb68c2ad 改回 1.0 2023-04-13 19:06:06 +08:00
jhc
8230c35dea 修改查询 已阅和待阅读 2.0 2023-04-13 18:58:04 +08:00
jhc
fb40e8f200 修改查询 已阅和待阅读 1.0 2023-04-13 18:42:21 +08:00
jhc
3a99d797d5 修改查询 已阅和待阅读 2023-04-13 18:33:11 +08:00
gy
b029be9a48 fix 2 2023-04-11 10:43:57 +08:00
gy
98cb3e36f4 1 2023-04-10 17:23:41 +08:00
gy
309523f6c3 fix 11 2023-04-10 17:18:53 +08:00
gy
bae6d83261 2023-04-10 17:09:25 +08:00
gy
cf71298bca fix update 2023-04-10 17:01:45 +08:00
gy
9279806673 fix 2023-04-10 16:55:16 +08:00
jhc
3eda8edeea Merge branch 'main' of http://192.168.12.3:8090/bugmaker/management_system/fonchain-approval 2023-04-07 09:43:09 +08:00
jhc
229ef3e809 修改 润格审批 2023-04-04 13:44:27 +08:00
jhc
9e8f13853f 添加润格审批总价 2023-04-04 09:59:15 +08:00
gy
7b7fe93567 feat 2023-03-31 10:53:42 +08:00
gy
5690a6697c feat 对已经申请过的进行处理 2023-03-27 14:57:26 +08:00
gy
2618dfa869 feat 版本号 2023-03-24 16:04:23 +08:00
gy
5cbc385afb feat 2023-03-24 15:03:38 +08:00
gy
91cbfd1a20 feat 2023-03-23 15:42:22 +08:00
gy
7569b37b1c feat 2023-03-23 09:23:07 +08:00
gy
add1d99f71 feat 2023-03-22 16:10:53 +08:00
gy
9352666fdf feat 2023-03-22 14:27:32 +08:00
gy
a9d7308263 feat 2023-03-22 14:23:44 +08:00
gy
b082f549dd feat 2023-03-22 10:24:24 +08:00
gy
f6416d552f feat 2023-03-20 18:26:13 +08:00