 xiaoshi
|
fb487fb726
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-01-13 09:50:24 +08:00 |
|
xiaoshi
|
97416d354f
|
优化代码 项目更新项目经理
|
2025-01-13 09:50:12 +08:00 |
zhangzhiguo
|
1feb440837
|
1.功能开发
|
2025-01-13 09:49:01 +08:00 |
|
zhangzhiguo
|
a3399800c3
|
1.功能开发
|
2025-01-11 14:11:19 +08:00 |
|
zhangzhiguo
|
afa260f40d
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-01-09 20:12:55 +08:00 |
|
zhangzhiguo
|
97fe253709
|
1.功能开发
|
2025-01-09 20:12:17 +08:00 |
|
xiaoshi
|
7ec830c713
|
优化代码 支出合同合作类型代码塞值
|
2025-01-09 17:18:57 +08:00 |
|
xiaoshi
|
1b7e75fb29
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-01-08 10:32:49 +08:00 |
|
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 |