Commit Graph
100 Commits
Author SHA1 Message Date
pengyuthon cbf34d6486 花名册数量 2026-02-27 20:08:28 +08:00
pengyuthon ec1fc86aa8 Merge branch 'master' into dev 2026-02-27 19:46:26 +08:00
pengyuthon b4064467f0 Merge remote-tracking branch 'origin/dev' into dev 2026-02-27 19:46:23 +08:00
pengyuthon c92c7453f8 花名册数量 2026-02-27 19:46:03 +08:00
李鹏宇 78cbd926ef !9057 !9056 Merge branch 'dev' of <a href="https://gitee.com/jinan-pengyusen…
Merge pull request !9057 from 李鹏宇/dev
2026-02-27 11:40:12 +00:00
李鹏宇 e7e28ee274 !9056 Merge branch 'dev' of <a href="https://gitee.com/jinan-pengyusen-data/gzth">https://gitee.com/jinan-pengyusen-data/gzth</a> into dev_wang
Merge pull request !9056 from 李鹏宇/dev_wang
2026-02-27 11:39:45 +00:00
李鹏宇 efd035630f Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-02-27 19:38:54 +08:00
李鹏宇 34098517ad 小程序权限管理过滤、删除、菜单配置日期倒序 2026-02-27 19:38:21 +08:00
李鹏宇 02e271538a !9055 !9054 添加功能
Merge pull request !9055 from 李鹏宇/dev
2026-02-27 10:42:10 +00:00
李鹏宇 f825f9c50d !9054 添加功能
Merge pull request !9054 from 李鹏宇/dev_zhou
2026-02-27 10:41:53 +00:00
李鹏宇 df72f8e43b !9053 !9052 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyusen…
Merge pull request !9053 from 李鹏宇/dev
2026-02-27 10:20:20 +00:00
李鹏宇 2a6e4ee2f2 !9052 Merge branch 'dev' of <a href="https://gitee.com/jinan-pengyusen-data/gzth">https://gitee.com/jinan-pengyusen-data/gzth</a> into dev_wang
Merge pull request !9052 from 李鹏宇/dev_wang
2026-02-27 10:19:18 +00:00
李鹏宇 30041740fb Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-02-27 18:17:37 +08:00
李鹏宇 fb7a9066c3 固定资产导出,入库借用领用仓库限制 2026-02-27 18:16:33 +08:00
pengyuthon 918aeb4809 花名册数量 2026-02-27 17:53:14 +08:00
pengyuthon b86f45f325 Merge remote-tracking branch 'origin/dev' into dev 2026-02-27 17:52:44 +08:00
李鹏宇 70bc06c1dc 批量更新编号,字段只读修改 2026-02-27 16:33:22 +08:00
李鹏宇 f716ad8479 !9051 !9050 添加功能
Merge pull request !9051 from 李鹏宇/dev
2026-02-27 07:09:15 +00:00
李鹏宇 7331eef55f !9050 添加功能
Merge pull request !9050 from 李鹏宇/dev_zhou
2026-02-27 07:08:53 +00:00
李鹏宇 d99240dc86 !9049 !9048 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyusen…
Merge pull request !9049 from 李鹏宇/dev
2026-02-27 07:05:03 +00:00
李鹏宇 aa477646f6 !9048 Merge branch 'dev' of <a href="https://gitee.com/jinan-pengyusen-data/gzth">https://gitee.com/jinan-pengyusen-data/gzth</a> into dev_wang
Merge pull request !9048 from 李鹏宇/dev_wang
2026-02-27 07:04:35 +00:00
李鹏宇 c316eb2623 Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-02-27 15:02:20 +08:00
李鹏宇 42e15a6dfb 餐饮人员配置人数字段 2026-02-27 15:00:59 +08:00
李鹏宇 e77f58b6e7 !9047 !9046 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyusen…
Merge pull request !9047 from 李鹏宇/dev
2026-02-27 03:59:59 +00:00
李鹏宇 7a1f9753f2 !9046 Merge branch 'dev' of <a href="https://gitee.com/jinan-pengyusen-data/gzth">https://gitee.com/jinan-pengyusen-data/gzth</a> into dev_wang
Merge pull request !9046 from 李鹏宇/dev_wang
2026-02-27 03:59:35 +00:00
李鹏宇 5dc28c1c27 Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-02-27 11:58:39 +08:00
李鹏宇 cce40753a9 采购逻辑 2026-02-27 11:58:23 +08:00
李鹏宇 763745ae7c !9045 !9044 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyusen…
Merge pull request !9045 from 李鹏宇/dev
2026-02-27 01:41:41 +00:00
李鹏宇 52b308a045 !9044 Merge branch 'dev' of <a href="https://gitee.com/jinan-pengyusen-data/gzth">https://gitee.com/jinan-pengyusen-data/gzth</a> into dev_wang
Merge pull request !9044 from 李鹏宇/dev_wang
2026-02-27 01:41:17 +00:00
李鹏宇 2cebcb80cf Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-02-27 09:37:22 +08:00
李鹏宇 29ec7d22e2 列宽,列居中 2026-02-27 09:37:06 +08:00
李鹏宇 b7538efc3b !9043 !9042 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyusen…
Merge pull request !9043 from 李鹏宇/dev
2026-02-26 13:37:54 +00:00
李鹏宇 8a4ea40530 !9042 Merge branch 'dev' of <a href="https://gitee.com/jinan-pengyusen-data/gzth">https://gitee.com/jinan-pengyusen-data/gzth</a> into dev_wang
Merge pull request !9042 from 李鹏宇/dev_wang
2026-02-26 13:37:32 +00:00
李鹏宇 a2770d0979 Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-02-26 21:35:48 +08:00
李鹏宇 7bd8d1f08d 列宽 2026-02-26 21:35:23 +08:00
李鹏宇 35cace646d !9041 !9040 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyusen…
Merge pull request !9041 from 李鹏宇/dev
2026-02-26 13:22:10 +00:00
李鹏宇 1752ef7769 !9040 Merge branch 'dev' of <a href="https://gitee.com/jinan-pengyusen-data/gzth">https://gitee.com/jinan-pengyusen-data/gzth</a> into dev_wang
Merge pull request !9040 from 李鹏宇/dev_wang
2026-02-26 13:21:44 +00:00
李鹏宇 9371868c21 Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-02-26 21:20:58 +08:00
李鹏宇 7315fccd84 固定资产导出 2026-02-26 21:20:45 +08:00
李鹏宇 2f11e0e09b !9039 !9038 添加功能
Merge pull request !9039 from 李鹏宇/dev
2026-02-26 12:52:55 +00:00
李鹏宇 435590d448 !9038 添加功能
Merge pull request !9038 from 李鹏宇/dev_zhou
2026-02-26 12:52:34 +00:00
李鹏宇 9060691817 !9037 !9036 添加功能
Merge pull request !9037 from 李鹏宇/dev
2026-02-26 12:27:41 +00:00
李鹏宇 b0f1653274 !9036 添加功能
Merge pull request !9036 from 李鹏宇/dev_zhou
2026-02-26 12:27:19 +00:00
李鹏宇 3ee2dd22bc !9035 !9034 添加功能
Merge pull request !9035 from 李鹏宇/dev
2026-02-26 11:42:51 +00:00
李鹏宇 8648b03905 !9034 添加功能
Merge pull request !9034 from 李鹏宇/dev_zhou
2026-02-26 11:42:32 +00:00
李鹏宇 86848f2db4 !9033 !9032 添加功能
Merge pull request !9033 from 李鹏宇/dev
2026-02-26 11:25:12 +00:00
李鹏宇 a12ec56306 !9032 添加功能
Merge pull request !9032 from 李鹏宇/dev_zhou
2026-02-26 11:24:40 +00:00
李鹏宇 66da3251a0 !9031 !9030 添加功能
Merge pull request !9031 from 李鹏宇/dev
2026-02-26 11:12:35 +00:00
李鹏宇 5966c9b551 !9030 添加功能
Merge pull request !9030 from 李鹏宇/dev_zhou
2026-02-26 11:12:12 +00:00
李鹏宇 e2729150c7 !9029 !9028 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyusen…
Merge pull request !9029 from 李鹏宇/dev
2026-02-26 10:52:41 +00:00
李鹏宇 7f55e23177 !9028 Merge branch 'dev' of <a href="https://gitee.com/jinan-pengyusen-data/gzth">https://gitee.com/jinan-pengyusen-data/gzth</a> into dev_wang
Merge pull request !9028 from 李鹏宇/dev_wang
2026-02-26 10:52:20 +00:00
李鹏宇 74e401a423 Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-02-26 18:51:25 +08:00
李鹏宇 3bfe55ff7d 显隐 2026-02-26 18:51:08 +08:00
李鹏宇 06a72db65f !9027 !9026 添加功能
Merge pull request !9027 from 李鹏宇/dev
2026-02-26 10:37:44 +00:00
李鹏宇 4290c2f068 !9026 添加功能
Merge pull request !9026 from 李鹏宇/dev_zhou
2026-02-26 10:37:25 +00:00
李鹏宇 7248e0e9dc !9025 !9024 添加功能
Merge pull request !9025 from 李鹏宇/dev
2026-02-26 09:33:20 +00:00
李鹏宇 870040f0d7 !9024 添加功能
Merge pull request !9024 from 李鹏宇/dev_zhou
2026-02-26 09:32:03 +00:00
李鹏宇 c85b1c5954 !9023 !9022 添加功能
Merge pull request !9023 from 李鹏宇/dev
2026-02-26 09:17:31 +00:00
李鹏宇 bfb8c1e1ac !9022 添加功能
Merge pull request !9022 from 李鹏宇/dev_zhou
2026-02-26 09:17:08 +00:00
李鹏宇 830a87ef92 !9021 !9020 添加功能
Merge pull request !9021 from 李鹏宇/dev
2026-02-26 09:06:18 +00:00
李鹏宇 01e0188f3f !9020 添加功能
Merge pull request !9020 from 李鹏宇/dev_zhou
2026-02-26 09:06:00 +00:00
李鹏宇 a443b088b7 !9019 !9018 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyusen…
Merge pull request !9019 from 李鹏宇/dev
2026-02-26 08:56:17 +00:00
李鹏宇 aaf1efc544 !9018 Merge branch 'dev' of <a href="https://gitee.com/jinan-pengyusen-data/gzth">https://gitee.com/jinan-pengyusen-data/gzth</a> into dev_wang
Merge pull request !9018 from 李鹏宇/dev_wang
2026-02-26 08:55:53 +00:00
李鹏宇 93b178b402 Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-02-26 16:54:21 +08:00
李鹏宇 2b56b51cf6 源单据跳转 2026-02-26 16:54:03 +08:00
李鹏宇 ccbaac3d71 !9017 !9016 添加功能
Merge pull request !9017 from 李鹏宇/dev
2026-02-26 08:48:45 +00:00
李鹏宇 d9409a4ce2 !9016 添加功能
Merge pull request !9016 from 李鹏宇/dev_zhou
2026-02-26 08:47:14 +00:00
李鹏宇 7607fbf062 !9015 !9014 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyusen…
Merge pull request !9015 from 李鹏宇/dev
2026-02-26 08:20:34 +00:00
李鹏宇 96cf26c167 !9014 Merge branch 'dev' of <a href="https://gitee.com/jinan-pengyusen-data/gzth">https://gitee.com/jinan-pengyusen-data/gzth</a> into dev_wang
Merge pull request !9014 from 李鹏宇/dev_wang
2026-02-26 08:20:15 +00:00
李鹏宇 f6de1535f7 Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-02-26 16:19:36 +08:00
李鹏宇 2caaeb30d0 证明按钮一个 2026-02-26 16:19:18 +08:00
李鹏宇 68329a8bad !9013 !9012 附件设为不必填
Merge pull request !9013 from 李鹏宇/dev
2026-02-26 08:15:19 +00:00
李鹏宇 2431cd6d2d !9012 附件设为不必填
Merge pull request !9012 from 李鹏宇/dev_wang
2026-02-26 08:14:59 +00:00
李鹏宇 37d8226d83 附件设为不必填 2026-02-26 16:07:25 +08:00
李鹏宇 56005b24fe Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-02-26 16:04:24 +08:00
李鹏宇 707c72a648 验收时间、证明时间 2026-02-26 16:04:05 +08:00
李鹏宇 929cc62d5b !9011 !9010 添加功能
Merge pull request !9011 from 李鹏宇/dev
2026-02-26 07:47:47 +00:00
李鹏宇 4846975266 !9010 添加功能
Merge pull request !9010 from 李鹏宇/dev_zhou
2026-02-26 07:47:29 +00:00
李鹏宇 36dc0d904b !9009 !9008 添加功能
Merge pull request !9009 from 李鹏宇/dev
2026-02-26 07:15:08 +00:00
李鹏宇 aac7512ff3 !9008 添加功能
Merge pull request !9008 from 李鹏宇/dev_zhou
2026-02-26 07:14:43 +00:00
李鹏宇 c1537e234f !9007 !9006 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyusen…
Merge pull request !9007 from 李鹏宇/dev
2026-02-26 07:13:06 +00:00
李鹏宇 b83561747d !9006 Merge branch 'dev' of <a href="https://gitee.com/jinan-pengyusen-data/gzth">https://gitee.com/jinan-pengyusen-data/gzth</a> into dev_wang
Merge pull request !9006 from 李鹏宇/dev_wang
2026-02-26 07:12:23 +00:00
李鹏宇 fbead1c7eb Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-02-26 15:11:16 +08:00
李鹏宇 fb17bb66fd 累计欠收报表 2026-02-26 15:10:54 +08:00
李鹏宇 e368be612f !9005 !9004 添加功能
Merge pull request !9005 from 李鹏宇/dev
2026-02-26 06:53:14 +00:00
李鹏宇 0d3e7cd228 !9004 添加功能
Merge pull request !9004 from 李鹏宇/dev_zhou
2026-02-26 06:52:55 +00:00
李鹏宇 cba78d8476 !9003 !9002 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyusen…
Merge pull request !9003 from 李鹏宇/dev
2026-02-26 03:47:13 +00:00
李鹏宇 b079d7ba6f !9002 Merge branch 'dev' of <a href="https://gitee.com/jinan-pengyusen-data/gzth">https://gitee.com/jinan-pengyusen-data/gzth</a> into dev_wang
Merge pull request !9002 from 李鹏宇/dev_wang
2026-02-26 03:46:48 +00:00
李鹏宇 e0bd6e5dd8 Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-02-26 11:46:06 +08:00
李鹏宇 4582cd5953 人员岗位报表排序,标题 2026-02-26 11:45:49 +08:00
李鹏宇 cf1a10e019 !9001 !9000 添加功能
Merge pull request !9001 from 李鹏宇/dev
2026-02-26 03:33:15 +00:00
李鹏宇 6c24863771 !9000 添加功能
Merge pull request !9000 from 李鹏宇/dev_zhou
2026-02-26 03:32:17 +00:00
李鹏宇 97d8f7e172 !8999 !8998 添加功能
Merge pull request !8999 from 李鹏宇/dev
2026-02-26 03:28:42 +00:00
李鹏宇 d75c7020eb !8998 添加功能
Merge pull request !8998 from 李鹏宇/dev_zhou
2026-02-26 03:28:21 +00:00
李鹏宇 033c19ac40 !8997 !8996 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyusen…
Merge pull request !8997 from 李鹏宇/dev
2026-02-26 02:54:27 +00:00
李鹏宇 ed71e4483b !8996 Merge branch 'dev' of <a href="https://gitee.com/jinan-pengyusen-data/gzth">https://gitee.com/jinan-pengyusen-data/gzth</a> into dev_wang
Merge pull request !8996 from 李鹏宇/dev_wang
2026-02-26 02:54:02 +00:00
李鹏宇 869cd101e2 Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-02-26 10:53:20 +08:00
李鹏宇 cef752eba0 字段拼接修改 2026-02-26 10:52:42 +08:00
李鹏宇 c2b741e786 !8995 !8994 添加功能
Merge pull request !8995 from 李鹏宇/dev
2026-02-26 02:36:22 +00:00
李鹏宇 4c6a7c9332 !8994 添加功能
Merge pull request !8994 from 李鹏宇/dev_zhou
2026-02-26 02:35:54 +00:00