Commit Graph

443 Commits

Author SHA1 Message Date
ec2d1c373d Merge branch 'dev' of https://fcd.gdyditc.com/itc-framework/ma/2024/front into dev-zhaoDN/global-workflow-setting 2025-03-26 10:28:59 +08:00
7cb06c6cf8 Merge branch 'dev-zjc' into 'dev'
管理员修正数据功能/同意操作请求过程新增遮罩层

See merge request itc-framework/ma/2024/front!43
2025-03-25 03:28:13 +00:00
53582ce762 fix: 修复tab页下标重复问题 2025-03-25 08:43:34 +08:00
efa4cebaac feat:全局触发事件
1. 单一:终止事件,挂起、恢复事件
2. 复合原有事件后于原事件触发:用户节点 触发的 前后事件
3. 混合在审批流中:回退、审批
2025-03-19 16:38:35 +08:00
9f9b40c284 Merge branch 'dev-zhaoDN/insurance' into 'dev'
fixbug:生产代码,新增lowerFirst 的驼峰字段,配置对应格式使用的地方

See merge request itc-framework/ma/2024/front!45
2025-03-19 01:08:30 +00:00
f73f1c9ade Merge branch 'gaoang-2025-03' into 'dev'
feat: 流程数据修改 流程显示数据从系统表单获取

See merge request itc-framework/ma/2024/front!44
2025-03-18 07:51:56 +00:00
0c41bec152 Merge branch 'dev-zhangzx/IBNWJ7' into 'dev'
表单设计->添加更新表结构新的方式

See merge request itc-framework/ma/2024/front!39
2025-03-18 07:41:26 +00:00
3f185ccaaa Merge branch 'dev' of https://fcd.gdyditc.com/itc-framework/ma/2024/front into dev-zhaoDN/insurance 2025-03-17 11:41:11 +08:00
0151eac5a5 fixbug:生产代码,新增lowerFirst 的驼峰字段,配置对应格式使用的地方 2025-03-17 11:39:46 +08:00
0f828cff02 feat: set值方法使用form公共方法 2025-03-13 14:33:00 +08:00
561c56cdb1 feat: 修改主键获取,并对没有值情况进行判断 2025-03-11 18:22:14 +08:00
e45bf05331 feat: 流程数据修改 流程显示数据从系统表单获取 2025-03-11 17:24:50 +08:00
ed29f61d08 Merge branch 'dev-zhangzx/IBPGJ9' into 'dev'
角色管理添加人员-按组织结构选人-搜索后无法点击选项

See merge request itc-framework/ma/2024/front!40
2025-03-11 02:47:26 +00:00
48be0e883f 同意操作请求过程新增遮罩层 2025-03-11 09:39:30 +08:00
f7d3f9823e add:管理员修正数据功能-指派流程、修改审批人、加减签、审批记录、流程变更记录、未完成流程表单变更功能 2025-03-11 09:37:15 +08:00
654204708e Merge branch 'dev-zhangzx/IBLALD' into 'dev'
流程预审选人增加配置项

See merge request itc-framework/ma/2024/front!42
2025-03-06 09:40:52 +00:00
56e5e8da3d 流程预审选人增加配置项
https://e.gitee.com/gdyditc/projects/725584/tasks/table?issue=IBLALD
2025-03-06 17:38:16 +08:00
6382361490 Merge branch 'dev-zhaoDN/insurance' into 'dev'
feat:生成代码 权限优化

See merge request itc-framework/ma/2024/front!41
2025-03-04 06:04:13 +00:00
078825a206 feat:前端文件生成名字全小写问题
1. 驼峰处理className 来定义文件名
2. 前端控制	功能名称必须时首字母大写的英文数字内容
2025-03-04 12:24:04 +08:00
d236508b4d Merge branch 'dev' of https://fcd.gdyditc.com/itc-framework/ma/2024/front into dev-zhaoDN/insurance 2025-03-04 09:27:24 +08:00
a364b2240a 表单设计->添加更新表结构新的方式
https://e.gitee.com/gdyditc/projects/725584/tasks/table?issue=IBNWJ7
2025-03-03 18:35:19 +08:00
8b38cd8a0c feat:权限 管理
1. detail list 硬塞进menu——button
2.模板 controller page 和list 权限改成 :list
3. list index 的双击事件 需要校验view button 来return
补全旧事件. 前端 button configs list删除detail , 今天提交的部分去除
2025-03-03 18:01:06 +08:00
952c9172a6 Merge branch 'dev-zhangzx/IBLALD' into 'dev'
流程预审选人增加配置项

See merge request itc-framework/ma/2024/front!38
2025-03-03 09:13:11 +00:00
363789d227 生成代码 配置detail 忽略detail的处理 2025-03-03 16:11:57 +08:00
18dba79463 流程预审选人增加配置项 去掉 == true
https://e.gitee.com/gdyditc/projects/725584/tasks/table?issue=IBLALD
2025-03-03 14:25:18 +08:00
f9943b3147 流程预审选人增加配置项
https://e.gitee.com/gdyditc/projects/725584/tasks/table?issue=IBLALD
2025-02-28 17:22:25 +08:00
fafe650d85 流程预审选人增加配置项
https://e.gitee.com/gdyditc/projects/725584/tasks/table?issue=IBLALD
2025-02-28 17:06:52 +08:00
72d43bf8cc Merge branch 'dev' into dev-zhangzx/IBLALD 2025-02-28 15:16:36 +08:00
941dc737a3 流程预审选人增加配置项
https://e.gitee.com/gdyditc/projects/725584/tasks/table?issue=IBLALD
2025-02-28 15:16:06 +08:00
a51dfef6a0 角色管理添加人员-按组织结构选人-搜索后无法点击选项
https://e.gitee.com/gdyditc/projects/725584/tasks/table?issue=IBPGJ9
2025-02-27 18:15:40 +08:00
2b4c4b5abd 表单设计->添加更新表结构新的方式
https://e.gitee.com/gdyditc/projects/725584/tasks/table?issue=IBNWJ7
2025-02-27 11:19:16 +08:00
bcec0c6dfc 流程预审选人增加配置项
https://e.gitee.com/gdyditc/projects/725584/tasks/table?issue=IBLALD
2025-02-26 16:04:20 +08:00
35a809e957 Merge branch 'dev-zhaoDN/version-workflow' into 'dev'
feat:流程-流程实例的版本问题

See merge request itc-framework/ma/2024/front!36
2025-02-26 07:56:02 +00:00
d84a9706b3 feat:流程版本
3.enabledMark: 1, 查询添加enable
2025-02-26 15:53:46 +08:00
4b5abdb35b Merge branch 'dev' of https://fcd.gdyditc.com/itc-framework/ma/2024/front into dev-zhaoDN/version-workflow 2025-02-26 15:39:30 +08:00
a67fa93234 feat:流程版本
3.查询list 全查调整为page
2025-02-26 15:38:10 +08:00
fc1b08dac0 Merge branch 'dev-zhaoDN/auto-agree' into 'dev'
feat:自动同意

See merge request itc-framework/ma/2024/front!37
2025-02-26 06:09:28 +00:00
e0683fb863 Merge branch 'dev' of https://fcd.gdyditc.com/itc-framework/ma/2024/front into dev-zhaoDN/auto-agree 2025-02-26 14:06:58 +08:00
d1a1386c9d feat:自动同意
@click="onApproveClick()" 加上括号,无参传值。才可以引入默认值
2025-02-26 14:04:59 +08:00
6b42b7ef04 Merge branch 'tenant-zn' into 'dev'
补充多租户参数

See merge request itc-framework/ma/2024/front!35
2025-02-26 03:32:18 +00:00
3c30812aad feat:流程-流程实例的版本问题
3.用vue.nextTick 来更新props 赋值延后问题
2025-02-26 10:31:39 +08:00
b7fb70f707 Merge branch 'dev' of https://fcd.gdyditc.com/itc-framework/ma/2024/front into dev-zhaoDN/version-workflow 2025-02-25 18:42:46 +08:00
2d240ccf0c feat:流程-流程实例的版本问题
1.流程变更后,新旧流程按版本执行,按各种版本的流程定义和流程配置继续流转
2.可以切换流程实例的版本
2025-02-25 18:42:40 +08:00
Je
f9410ec0a1 添加租户条件 2025-02-25 14:58:38 +08:00
Je
aad4b71991 Merge branch 'dev' into tenant-zn
# Conflicts:
#	src/components/DatePicker/src/DatePicker.vue
#	src/utils/env.ts
2025-02-25 11:33:36 +08:00
8bca9c62d8 Merge branch 'dev-zhaoDN/auto-agree' into 'dev'
feat:流程自动审批功能

See merge request itc-framework/ma/2024/front!33
2025-02-20 07:11:33 +00:00
2850e8abf5 feat:流程自动审批功能
改成同步事件
2025-02-20 09:37:04 +08:00
891a088476 feat:流程自动审批功能
把checkIsAutoAgree 方法提出来,作为方法增加实现功能
2025-02-19 18:18:39 +08:00
c1d342114b feat:流程自动审批功能
4.onApproveClick 传参处理错误
2025-02-19 08:52:29 +08:00
ba1f1ffee5 Merge branch 'dev' of https://fcd.gdyditc.com/itc-framework/ma/2024/front into dev-zhaoDN/auto-agree 2025-02-18 11:59:08 +08:00