 xiaoshi
|
702ff4ef47
|
优化代码
|
2025-01-08 10:32:40 +08:00 |
zhangzhiguo
|
2f17723ba5
|
1.功能开发
|
2025-01-07 15:31:45 +08:00 |
|
zhangzhiguo
|
ae61c06d4f
|
1.矿山组织下差旅报销单、费用报销单、对公报销单、预付单超预算提醒
2.科目的科目类型过滤
|
2025-01-03 18:48:28 +08:00 |
|
zhangzhiguo
|
2b4c11f1ef
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-01-03 15:34:48 +08:00 |
|
zhangzhiguo
|
4b27343203
|
1.矿山组织下差旅报销单、费用报销单、对公报销单、预付单超预算提醒
2.科目的科目类型过滤
|
2025-01-03 15:33:50 +08:00 |
|
xiaoshi
|
742be1d163
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-01-03 14:33:56 +08:00 |
|
xiaoshi
|
7d6415927e
|
优化代码 支出合同合作类型代码塞值 支出合同计量问题优化
|
2025-01-03 14:33:47 +08:00 |
|
zhangzhiguo
|
dd9a29bb62
|
1.增加职员出差天数统计台账
|
2025-01-02 18:44:51 +08:00 |
|
zhangzhiguo
|
cee3debf85
|
1.增加职员出差天数统计台账
|
2025-01-02 15:29:05 +08:00 |
|
zhangzhiguo
|
6d981ff250
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-12-31 18:30:51 +08:00 |
|
zhangzhiguo
|
0767caa6de
|
1.增加职员出差天数统计台账
|
2024-12-31 18:30:11 +08:00 |
|
xiaoshi
|
80816b7562
|
优化代码 付款申请校验取消 合同计量优化
|
2024-12-31 17:30:30 +08:00 |
|
zhangzhiguo
|
2fc98ac060
|
1.费用报销单和差旅报销单增加往来居家校验
|
2024-12-31 15:14:51 +08:00 |
|
xiaoshi
|
6a5ea5764b
|
优化代码 付款申请校验取消 合同计量优化
|
2024-12-30 17:08:13 +08:00 |
|
xiaoshi
|
82805a2a04
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-12-27 18:02:49 +08:00 |
|
xiaoshi
|
d239a30a42
|
优化代码
|
2024-12-27 18:02:38 +08:00 |
|
zhangzhiguo
|
a609a1a37a
|
.合同台账签约方默认为当前核算组织
|
2024-12-27 17:28:39 +08:00 |
|
zhangzhiguo
|
5f8a4a4c41
|
1.提取矿山组织判断逻辑至工具类
2.合同台账签约方默认为当前人组织
|
2024-12-27 17:16:32 +08:00 |
|
zhangzhiguo
|
c55ed5d85a
|
国外住宿标准增加自动取数
|
2024-12-27 11:09:08 +08:00 |
|
zhangzhiguo
|
b6adb20b87
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-12-27 09:19:05 +08:00 |
|
zhangzhiguo
|
3d451abc07
|
1.增加组织过滤，仅限矿山本部及以下单位
2.台账代码调整
3.增加自动取数
|
2024-12-27 09:18:28 +08:00 |
|
xiaoshi
|
d592f66778
|
优化代码
|
2024-12-26 17:46:45 +08:00 |
|
xiaoshi
|
febbc71fea
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-12-25 17:04:33 +08:00 |
|
xiaoshi
|
d1477ffbb7
|
优化代码 合同计量时间校验取消 合同结算锁定取消 项目增加业主全称
|
2024-12-25 17:04:25 +08:00 |
|
zhangzhiguo
|
0956b6d924
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-12-24 17:03:48 +08:00 |
|
zhangzhiguo
|
260fb1525b
|
1.增加审批人不能是提交人代码
2.修改台账逻辑
|
2024-12-24 17:03:06 +08:00 |
|
xiaoshi
|
e08cfdc9b4
|
优化代码 資源清單過濾與基於清單控制
|
2024-12-24 16:23:48 +08:00 |
|
xiaoshi
|
20565cbd5e
|
优化代码 合同计量与支出合同
|
2024-12-23 18:31:26 +08:00 |
|
xiaoshi
|
bb6b654434
|
优化代码 合同计量与支出合同
|
2024-12-23 17:48:26 +08:00 |
|
xiaoshi
|
fd6033a32a
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-12-23 09:35:17 +08:00 |
|
xiaoshi
|
22a04670b1
|
优化代码 合同结算
|
2024-12-23 09:35:07 +08:00 |
|
zhangzhiguo
|
605eecdcb3
|
职务消费台账功能调整
|
2024-12-20 18:00:32 +08:00 |
|
zhangzhiguo
|
108b3ebbfd
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-12-20 17:14:01 +08:00 |
|
zhangzhiguo
|
74d5389012
|
代码优化
|
2024-12-20 17:13:06 +08:00 |
|
xiaoshi
|
28ee9e2915
|
优化代码 合同结算
|
2024-12-19 20:09:29 +08:00 |
|
xiaoshi
|
ecbd06b147
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-12-19 16:00:06 +08:00 |
|
xiaoshi
|
1bac3290cd
|
优化代码 校验合同金额 多分录计量只能计量其一 资源清单过滤优化
|
2024-12-19 15:59:57 +08:00 |
|
zhangzhiguo
|
42eb31e767
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-12-17 21:52:21 +08:00 |
|
zhangzhiguo
|
ae456405d1
|
增加国外住宿标准提醒
|
2024-12-17 21:51:55 +08:00 |
|
xiaoshi
|
5fe89369d6
|
优化代码 计算问题解决
|
2024-12-17 18:03:25 +08:00 |
|
xiaoshi
|
0612c52985
|
优化代码
|
2024-12-17 17:12:21 +08:00 |
|
xiaoshi
|
050dcde6c8
|
优化代码
|
2024-12-17 14:33:58 +08:00 |
|
xiaoshi
|
5af47982cd
|
优化代码 提交校验
|
2024-12-17 11:14:09 +08:00 |
|
xiaoshi
|
e04585a124
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-12-17 09:34:35 +08:00 |
|
xiaoshi
|
d1aa5e8c5b
|
优化代码 资源清单过滤
|
2024-12-17 09:34:26 +08:00 |
|
zhangzhiguo
|
0900ed0e4e
|
台账bug修复
|
2024-12-16 19:57:21 +08:00 |
|
xiaoshi
|
edcc45ff26
|
优化代码 资源i清单监听
|
2024-12-16 19:32:17 +08:00 |
|
xiaoshi
|
2b4ef29849
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-12-16 17:48:24 +08:00 |
|
xiaoshi
|
be65ad6e6e
|
优化代码 资源i清单监听
|
2024-12-16 17:48:15 +08:00 |
 zhangzhiguo
|
61874f6be2
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-12-15 20:44:32 +08:00 |
|
zhangzhiguo
|
198dcf6db7
|
1.上浮20%控制
2.附件必填校验
|
2024-12-15 20:44:22 +08:00 |
|
xiaoshi
|
0333a9698e
|
优化代码
|
2024-12-14 18:42:04 +08:00 |
|
xiaoshi
|
718f345f16
|
优化代码
|
2024-12-14 17:06:07 +08:00 |
|
xiaoshi
|
ad571b823a
|
优化代码
|
2024-12-14 17:00:37 +08:00 |
|
xiaoshi
|
c02c675a48
|
优化代码
|
2024-12-14 15:46:54 +08:00 |
|
xiaoshi
|
5018e48d38
|
优化代码 承包工序
|
2024-12-13 16:07:24 +08:00 |
|
xiaoshi
|
e19f96774d
|
优化代码 解决合同计量行带出有误的问题
|
2024-12-13 15:55:26 +08:00 |
|
xiaoshi
|
fed724c980
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-12-13 10:55:58 +08:00 |
|
xiaoshi
|
630d2af080
|
优化代码 解决合同计量行带出有误的问题
|
2024-12-13 10:55:47 +08:00 |
|
zhangzhiguo
|
738b93e597
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-12-13 09:35:40 +08:00 |
|
zhangzhiguo
|
9aad5b82b7
|
1.上浮20%控制
2.附件必填校验
|
2024-12-13 09:35:25 +08:00 |
|
xiaoshi
|
7eb7bc216b
|
优化代码
|
2024-12-12 21:31:34 +08:00 |
|
xiaoshi
|
de4a2d76a6
|
优化代码 合同支出报错处理 供应商变更改为乙方
|
2024-12-12 20:31:57 +08:00 |
|
xiaoshi
|
cbd1fda133
|
优化代码
|
2024-12-12 18:46:01 +08:00 |
|
xiaoshi
|
99704e85eb
|
优化代码
|
2024-12-12 18:19:57 +08:00 |
|
xiaoshi
|
c6013debf5
|
优化代码 支出合同计量增加计算功能
|
2024-12-12 18:04:46 +08:00 |
|
xiaoshi
|
ef047b67f1
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-12-12 11:42:20 +08:00 |
|
xiaoshi
|
3fc910857d
|
优化代码
|
2024-12-12 11:42:06 +08:00 |
|
zhangzhiguo
|
74268c7dd1
|
1.报销单问题修复
2.台账查询报错修复
|
2024-12-11 20:14:50 +08:00 |
|
xiaoshi
|
e0c6e8ab2e
|
资源清单过滤
|
2024-12-11 19:39:14 +08:00 |
|
xiaoshi
|
2d22fd11a1
|
各插件标注位置
|
2024-12-11 18:52:12 +08:00 |
|
xiaoshi
|
c288a28fe1
|
合同过滤
|
2024-12-11 18:02:00 +08:00 |
|
xiaoshi
|
0bbf0a2447
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-12-11 17:01:24 +08:00 |
|
xiaoshi
|
6d1e5eb8b7
|
收入合同计量报错
|
2024-12-11 17:00:44 +08:00 |
|
zhangzhiguo
|
c7e3186fdb
|
1.报销单问题修复
2.台账查询报错修复
|
2024-12-10 18:17:40 +08:00 |
|
xiaoshi
|
fd3b56c285
|
收入合同计量报错
|
2024-12-10 17:21:53 +08:00 |
|
xiaoshi
|
aef7266a65
|
项目经理工作流
|
2024-12-10 16:08:01 +08:00 |
|
xiaoshi
|
9be2440b6d
|
收入合同计算与供应商变更
|
2024-12-10 16:02:06 +08:00 |
|
zhangzhiguo
|
d597a997da
|
动态制定审批人
|
2024-12-10 14:54:02 +08:00 |
|
zhangzhiguo
|
b195128499
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-12-10 13:51:22 +08:00 |
|
zhangzhiguo
|
5db8d9ce0c
|
费用报销和对公报销费用项目和会计科目关联
|
2024-12-10 13:51:10 +08:00 |
|
xiaoshi
|
48f9bfb69f
|
合同变更供应商变更
|
2024-12-09 19:00:16 +08:00 |
|
xiaoshi
|
112474c20a
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-12-09 18:59:37 +08:00 |
|
xiaoshi
|
ac25877ad7
|
合同变更供应商变更
|
2024-12-09 18:59:28 +08:00 |
|
zhangzhiguo
|
f229e5b383
|
费用报销和对公报销费用项目和会计科目关联
|
2024-12-09 10:44:55 +08:00 |
|
xiaoshi
|
a2782869eb
|
合同支付分录过滤
|
2024-12-06 17:48:51 +08:00 |
|
xiaoshi
|
30715b4dc3
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-12-06 15:54:39 +08:00 |
|
xiaoshi
|
5385dc37d4
|
收入与支出合同计量清单代码优化
|
2024-12-06 15:54:22 +08:00 |
|
zhangzhiguo
|
08ad13751a
|
探亲休假台账增加休假天数
|
2024-12-06 09:59:00 +08:00 |
|
zhangzhiguo
|
e076419ead
|
费用项目与会计科目映射配置
|
2024-12-05 20:02:32 +08:00 |
|
zhangzhiguo
|
43687bf827
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-12-05 18:50:13 +08:00 |
|
zhangzhiguo
|
f789d6765d
|
费用项目与会计科目映射配置
|
2024-12-05 18:49:56 +08:00 |
|
xiaoshi
|
f64ab9497c
|
收入与支出合同计量清单过滤
|
2024-12-05 18:44:11 +08:00 |
|
xiaoshi
|
feefdde77f
|
收入与支出合同计量清单过滤
|
2024-12-05 18:42:42 +08:00 |
|
xiaoshi
|
7f1ab2e51a
|
收入与支出合同结算校验去除
|
2024-12-05 18:11:22 +08:00 |
|
xiaoshi
|
a056e71046
|
收入与支出合同计量校验去除
|
2024-12-05 17:47:55 +08:00 |
|
xiaoshi
|
5c05a986fb
|
已开发功能优化
|
2024-12-04 19:38:18 +08:00 |
|
xiaoshi
|
469940ddc6
|
已开发功能优化
|
2024-12-04 19:35:59 +08:00 |
小石
|
c73c174a87
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-12-03 19:12:11 +08:00 |
|
小石
|
1f58305837
|
收入支出合同界面插件
|
2024-12-03 19:11:55 +08:00 |