Commit Graph

135 Commits

Author SHA1 Message Date
xuhaihui d708326083 优化 2025-08-04 16:31:42 +08:00
xuhaihui 8962e95bac 对公报销单提交操作插件:冲预付时预付单支付日期与开票日期和当前日期的对比校验 2025-08-04 16:15:14 +08:00
xuhaihui 0138cbf94a 优化 2025-08-04 13:56:39 +08:00
xuhaihui f8b1191489 Merge remote-tracking branch 'origin/dev' into dev 2025-08-04 13:54:15 +08:00
xuhaihui 846145ee2f 费用报销单、差旅报销单、对公报销单提交操作插件:开票日期与当前日期的对比校验逻辑 2025-08-04 13:54:07 +08:00
zhangzhiguo ba93f9fb5e 余额表取数 2025-08-01 16:45:51 +08:00
xuhaihui 31f7ebf78d 费用报销单申请人需与个人的收款信息中的收款人一致逻辑优化 2025-08-01 14:05:15 +08:00
xuhaihui 5efb378c94 Merge remote-tracking branch 'origin/dev' into dev 2025-08-01 10:43:37 +08:00
xuhaihui 62587e3f63 针对矿山组织的过滤逻辑添加基础资料判断条件;费用报销单收款人(个人逻辑优化 2025-08-01 10:43:20 +08:00
zhangzhiguo 3ab2957c62 1.组织工具类优化
2.职务消费台账功能优化
3.计算扣除餐补天数优化
2025-07-31 18:46:13 +08:00
xuhaihui 2e98950f6f 科目属性逻辑优化 2025-07-30 13:51:59 +08:00
zhangzhiguo c2a9b82dc5 Merge remote-tracking branch 'origin/dev' into dev 2025-07-24 11:19:18 +08:00
xuhaihui 7318b04339 科目分类通用插件优化,添加差旅报销单:行程信息分录编辑页插件;费用项目过滤和科目属性过滤与赋值插件 2025-07-23 16:56:00 +08:00
zhangzhiguo 09119816f2 预付单增加收款人信息校验 2025-07-23 16:50:59 +08:00
xuhaihui d9e9c80ca2 科目分类通用插件去除差旅报销单逻辑 2025-07-23 16:11:17 +08:00
xuhaihui 31b70ffe22 科目分类通用插件性能优化 2025-07-23 14:28:35 +08:00
xuhaihui c6ec93c2bf 科目分类通用插件优化 2025-07-23 10:07:49 +08:00
xuhaihui f477b3ff90 科目分类通用插件优化 2025-07-23 10:00:52 +08:00
zhangzhiguo f05be78785 Merge remote-tracking branch 'origin/dev' into dev 2025-07-23 09:33:59 +08:00
zhangzhiguo 0d74173d41 司库付款校验功能关闭 2025-07-22 18:25:28 +08:00
xuhaihui bcd2e4acfc 科目分类通用插件优化 2025-07-22 18:17:06 +08:00
xuhaihui 11d72a8bc5 科目分类通用插件优化 2025-07-22 18:02:01 +08:00
xuhaihui 0ec46b3a82 科目分类通用插件优化 2025-07-22 16:50:06 +08:00
xuhaihui 77eff0c809 科目分类通用插件优化 2025-07-22 14:55:11 +08:00
xuhaihui 85478571da 科目分类通用插件优化 2025-07-22 11:31:38 +08:00
zhangzhiguo 82c1c1bf54 报销单费用项目过滤 2025-07-22 10:42:06 +08:00
zhangzhiguo 3a6bfaa1f8 收款人类型重定义 2025-07-22 10:41:17 +08:00
zhangzhiguo be399a1454 查询台账单,只查询当前公司下的人员 2025-07-22 10:39:16 +08:00
zhangzhiguo 940957083d Merge remote-tracking branch 'origin/dev' into dev 2025-07-22 10:31:33 +08:00
xuhaihui c268823e60 费用报销单优化费用项目过滤和科目属性赋值逻辑 2025-07-22 10:29:51 +08:00
zhangzhiguo 50e9729283 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/OutContractFinaceConfirmePlugin.java
2025-07-21 18:24:16 +08:00
xuhaihui 56ffe5eba6 1:支出合同确认单添加费用项目过滤和费用项目清空时的避免报错;2:费用报销单:费用项目过滤和科目属性赋值过滤逻辑添加 2025-07-21 18:21:40 +08:00
zhangzhiguo 006298e711 Merge remote-tracking branch 'origin/dev' into dev 2025-07-18 17:15:18 +08:00
xuhaihui 2c018c66bb 费用报销单提交校验优化 2025-07-17 15:25:16 +08:00
zhangzhiguo 582d0ca002 Merge remote-tracking branch 'origin/dev' into dev 2025-07-17 14:25:00 +08:00
xuhaihui d90a8cde7a 费用报销单提交校验优化 2025-07-17 14:19:21 +08:00
zhangzhiguo 7e704c2a70 Merge remote-tracking branch 'origin/dev' into dev 2025-07-16 17:46:51 +08:00
xuhaihui 02ed45c2e5 用款申请单插件优化 2025-07-16 17:46:23 +08:00
xuhaihui 6e29a3ed3c 用款申请单插件优化 2025-07-16 15:49:04 +08:00
xuhaihui d27a17abc3 用款申请单插件优化 2025-07-16 15:37:17 +08:00
zhangzhiguo e115fd8cd4 提交司库状态“同步成功” 或 已付款,才能审批通过 2025-07-16 15:28:39 +08:00
zhangzhiguo 567273b4d9 1、费用报销单;2、差旅报销单;3、对公报销单;4、预付单
增加科目分类字段,按费用与科目分类进行过滤可选的科目分类
2025-07-16 15:28:04 +08:00
zhangzhiguo f350619bea 费用报销单,收款信息的收款人类型,把供应商,客户隐藏 2025-07-16 15:27:43 +08:00
xuhaihui f8c601d531 用款申请单插件 2025-07-16 14:49:32 +08:00
xuhaihui 0660fc913a 用款申请单业务组织赋值 2025-07-16 10:17:59 +08:00
xuhaihui a746bc7661 用款申请单业务组织赋值 2025-07-15 18:44:54 +08:00
xuhaihui ee55e6dd24 费用报销单提交校验逻辑:申请人需与个人的收款信息中的收款人一致 2025-07-15 18:28:21 +08:00
xuhaihui a15bdb2293 添加仅针对矿山下组织下的逻辑 2025-07-15 18:15:34 +08:00
xuhaihui 32ee5602e9 Merge remote-tracking branch 'origin/dev' into dev 2025-07-15 17:30:44 +08:00
xuhaihui 89f4fd31a5 对公报销单提交校验插件:校验往来单位与开票公司是否一致,不一致需填写特殊说明 2025-07-15 17:30:38 +08:00