mgw
|
e73fb5791a
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
|
2023-12-17 10:50:18 +08:00 |
|
mgw
|
6738a855bb
|
优化权限相关
|
2023-12-17 10:48:51 +08:00 |
|
jinling.yang
|
df2ba048f4
|
1.修复采购权限和销售权限2.销售新增审核向导
|
2023-12-15 17:38:40 +08:00 |
|
jinling.yang
|
b96723d9a5
|
修复销售权限组
|
2023-12-12 17:40:22 +08:00 |
|
jinling.yang
|
abd7364658
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增采购权限组
# Conflicts:
# sf_base/security/group_security.xml
# sf_sale/security/group_security.xml
|
2023-12-06 14:56:31 +08:00 |
|
龚启豪
|
61c3b16a69
|
Merge branch refs/heads/develop into refs/heads/feature/修改机床参数bug
|
2023-12-06 11:35:01 +08:00 |
|
jinling.yang
|
45df8f5bc2
|
新增采购权限
|
2023-12-04 17:34:23 +08:00 |
|
qihao.gong@jikimo.com
|
94c0b00c2d
|
机床注册按钮根据权限组区分
|
2023-12-04 17:28:54 +08:00 |
|
jinling.yang
|
07be7c3074
|
1.同步刀具标准库接口修改刀片形状，柄部类型，刀尖特征，压紧方式
|
2023-11-28 17:08:56 +08:00 |
|
jinling.yang
|
45d04e1a05
|
1.销售新增审核状态，选项为已审核和待审核，销售模型新增权限规则：销售总监查看所有的订单，销售经理只能查看自己的订单
2.报价单Form视图新增审核按钮，该按钮只有销售总监可以看到，且确认按钮只有在销售经理审核完才可显示，报价Tree视图新增审核状态
|
2023-11-23 17:28:58 +08:00 |
|
jinling.yang
|
5292826c72
|
新增销售权限
|
2023-11-22 17:58:41 +08:00 |
|
jinling.yang
|
6e6b0b66d3
|
去掉警告
|
2023-08-29 10:22:12 +08:00 |
|
jinling.yang
|
55504c2725
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增上传模型功能
|
2023-08-24 17:32:25 +08:00 |
|