|
|
ff727db3c8
|
Merge branch 'main' into dev
# Conflicts:
# src/components/SecondDev/OpinionDialog.vue
|
2025-10-13 16:08:47 +08:00 |
|
|
|
f933c7f09f
|
Merge branch 'main' of https://fcd.gdyditc.com/itc/GAS-SCM/front into main
# Conflicts:
# .env.development
# .env.production
# Dockerfile
# docs/index.html
# package.json
# src/api/system/login/index.ts
# src/api/system/subSystem/index.ts
# src/components/SecondDev/OpinionDialog.vue
# src/layouts/default/header/MultipleHeader.vue
# src/layouts/default/sider/index.vue
# src/model/workflow/workflowConfig.ts
# src/router/guard/paramMenuGuard.ts
# src/router/guard/permissionGuard.ts
# src/store/modules/permission.ts
# src/utils/env.ts
# src/utils/http/axios/Axios.ts
# src/utils/http/axios/index.ts
# src/views/secondDev/Login.vue
# src/views/secondDev/LoginForm.vue
# src/views/secondDev/approveFlowPage.vue
# src/views/system/loginSetting/loginInfo.vue
# src/views/workflow/design/bpmn/components/BasicPanel.vue
# src/views/workflow/design/bpmn/config/propertyConfig.ts
# src/views/workflow/design/bpmn/config/sequenceConfig.ts
# src/views/workflow/design/bpmn/panel/SequenceFlow.vue
# src/views/workflow/design/bpmn/panel/User.vue
# src/views/workflow/task/ProcessMonitor.vue
# src/views/workflow/task/components/flow/ProcessInformation.vue
# yarn.lock
|
2025-10-13 15:58:55 +08:00 |
|
|
|
e1326c7ce8
|
--添加测试模块
|
2025-10-13 11:53:54 +08:00 |
|
|
|
c3c93fe308
|
删除无用docker配置
|
2025-10-10 09:17:34 +08:00 |
|
|
|
cf62442906
|
-----
|
2025-10-10 09:16:54 +08:00 |
|
|
|
286e0851d0
|
---添加配置文件
|
2025-08-22 14:03:43 +08:00 |
|
|
|
87545a8baf
|
---初始化后台管理web页面项目
|
2025-08-20 14:39:30 +08:00 |
|
|
|
ad49711a7e
|
Initial commit
|
2025-08-20 10:40:59 +08:00 |
|
|
|
f660a35ca6
|
Merge branch 'dev-sugx-20250721' into 'dev'
流程设计-审批人-添加角色：增加根据租户选择角色的功能-补一个文件
See merge request itc-framework/ma/2024/front!103
|
2025-07-23 00:53:07 +00:00 |
|
|
|
92b0f0d56a
|
程设计-审批人-添加角色：增加根据租户选择角色的功能-补充一个文件
|
2025-07-22 16:47:07 +08:00 |
|
|
|
e034bc709a
|
Merge branch 'dev-lijianqi20250709' into 'dev'
签章图片修改处理BUG
See merge request itc-framework/ma/2024/front!102
|
2025-07-22 06:33:01 +00:00 |
|
|
|
32983d0a8a
|
Merge branch 'dev-sugx-20250721' into 'dev'
若干问题修改（同步最近在数字新能源项目中修改的问题）
See merge request itc-framework/ma/2024/front!100
|
2025-07-22 06:25:15 +00:00 |
|
|
|
bcfe0bdbaa
|
Merge branch 'ga-2025-07' into 'dev'
feat: 组织树多次点击后展开下级消失修复
See merge request itc-framework/ma/2024/front!101
|
2025-07-22 03:43:19 +00:00 |
|
|
|
6dff6aa798
|
签章图片修改处理BUG
|
2025-07-21 19:23:41 +08:00 |
|
|
|
f5752a3cdb
|
feat: 组织树多次点击后展开下级消失修复
|
2025-07-21 18:43:14 +08:00 |
|
|
|
2c6e63e7f1
|
查看流程图页面：改成v-if方式，这样每次打开都会重新渲染（之前测试人员发现将图片往底下拉之后，关闭了重新打开会看不到流程图）
|
2025-07-21 16:16:35 +08:00 |
|
|
|
ced288bf0f
|
渲染覆盖配置问题修正:
1.配置为null时，直接返回null
2.去掉匹配const
|
2025-07-21 16:06:16 +08:00 |
|
|
|
0c0091d49f
|
流程设计-审批人-添加角色：增加根据租户选择角色的功能
|
2025-07-21 16:02:55 +08:00 |
|
|
|
c4daab08a8
|
修正代码生成器菜单设置步骤加载不了菜单的问题
|
2025-07-21 15:17:06 +08:00 |
|
|
|
c2493dd526
|
1.公共组件DropDown加上一个限制文本宽度的配置属性
2.在切换租户的下拉列表中引入DropDown时传入限定宽度的配置。
|
2025-07-21 15:09:03 +08:00 |
|
|
|
51cf564820
|
表单设计:调整高度样式，使得分页器在页面的底部
|
2025-07-21 15:08:32 +08:00 |
|
|
|
cf47bb2892
|
Merge branch 'ga-2025-07' into 'dev'
feat: 组织搜索模糊搜索添加
See merge request itc-framework/ma/2024/front!93
|
2025-07-18 07:16:38 +00:00 |
|
|
|
86d1d72ad3
|
feat: 组织搜索去除无用参数
|
2025-07-18 15:13:02 +08:00 |
|
|
|
27561a949b
|
feat: 组织搜索逻辑修改
|
2025-07-17 18:39:34 +08:00 |
|
|
|
e7c5eb2631
|
升级开发版本号
|
2025-07-17 17:32:16 +08:00 |
|
|
|
83694d601d
|
提交版本号
|
2025-07-17 17:17:53 +08:00 |
|
|
|
c9f4d651f8
|
Merge branch 'lhq20250717' into 'dev'
添加附件上传显示提示以及配置项
See merge request itc-framework/ma/2024/front!97
|
2025-07-17 07:56:20 +00:00 |
|
|
|
a7bffe3b81
|
添加附件上传显示提示以及配置项
|
2025-07-17 15:30:56 +08:00 |
|
|
|
fcdde6291c
|
添加附件上传显示提示以及配置项
|
2025-07-17 14:56:20 +08:00 |
|
|
|
591b72e04c
|
Merge branch 'lhq20250717' into 'dev'
添加附件上传显示提示以及配置项
See merge request itc-framework/ma/2024/front!96
|
2025-07-17 06:32:40 +00:00 |
|
|
|
c1966414ab
|
添加附件上传显示提示以及配置项
|
2025-07-17 11:49:34 +08:00 |
|
|
|
d569a3bccf
|
feat: 部门选择优化
|
2025-07-17 10:24:26 +08:00 |
|
|
|
644af71167
|
Merge branch 'dev_dyd' into 'dev'
修改ProcVarManageModal.vue文件名
See merge request itc-framework/ma/2024/front!95
|
2025-07-17 01:54:26 +00:00 |
|
|
|
ac421d787c
|
修改ProcVarManageModal.vue文件名
|
2025-07-17 09:12:31 +08:00 |
|
|
|
c45709777e
|
增加登录页的保密提示
|
2025-07-16 16:18:53 +08:00 |
|
|
|
93e6902695
|
Merge branch 'dev-zhaoDN/feat-all-className-startwith-Up' into 'dev'
feat:功能名称 的四个位置，代码生产（数据优先/界面优先），移动端（功能页内的功能名称为代码生产带出），数据配置-数据表管理（生成代码）都配置为只支持大写
See merge request itc-framework/ma/2024/front!94
|
2025-07-15 03:24:13 +00:00 |
|
|
|
af6ce6d96e
|
Merge branch 'dev' of https://fcd.gdyditc.com/itc-framework/ma/2024/front into dev-zhaoDN/feat-all-className-startwith-Up
|
2025-07-15 11:17:12 +08:00 |
|
|
|
a2d4337277
|
feat:功能名称 的四个位置，代码生产（数据优先/界面优先），移动端（功能页内的功能名称为代码生产带出），数据配置-数据表管理（生成代码）都配置为只支持大写
|
2025-07-15 11:14:17 +08:00 |
|
|
|
0aee1f54f7
|
feat: 组织搜索模糊搜索添加
|
2025-07-14 15:56:46 +08:00 |
|
|
|
49901b7c3c
|
Merge branch 'dev-yjw/fix' into 'dev'
修正配置参数问题
See merge request itc-framework/ma/2024/front!92
|
2025-07-14 02:49:31 +00:00 |
|
|
|
33f609c270
|
修正配置参数问题
|
2025-07-11 17:34:09 +08:00 |
|
|
|
108689ab79
|
Merge branch 'gaoang2025-06' into 'dev'
人员选择器增加组织机构全选， 时间范围选择器，设置可以返回数组或字符串形式
See merge request itc-framework/ma/2024/front!85
|
2025-07-10 08:50:42 +00:00 |
|
|
|
500b35b25c
|
Merge branch 'dev_dyd' into 'dev'
#ICBR0A wps集成
See merge request itc-framework/ma/2024/front!84
|
2025-07-10 03:46:32 +00:00 |
|
|
|
866f2709c7
|
Merge branch 'dev-lijianqi20250709' into 'dev'
minio文件地址签名功能（使用签名地址）： 签章图片处理，桌面设计主页的图片显示地址
See merge request itc-framework/ma/2024/front!91
|
2025-07-10 01:06:06 +00:00 |
|
|
|
94b4c67f43
|
minio文件地址签名功能（使用签名地址）：
签章图片处理，桌面设计主页的图片显示地址
|
2025-07-09 18:58:37 +08:00 |
|
|
|
40d57ecf49
|
Merge branch 'dev' of https://fcd.gdyditc.com/itc-framework/ma/2024/front into dev_dyd
|
2025-07-08 14:23:12 +08:00 |
|
|
|
06b7329fcf
|
Merge branch 'yjw/dev/axios-version' into 'dev'
fix: 固定axios的版本，兼容es2015
See merge request itc-framework/ma/2024/front!89
|
2025-07-03 09:17:02 +00:00 |
|
|
|
12343db197
|
fix: 固定axios的版本，兼容es2015
|
2025-07-03 14:59:02 +08:00 |
|
|
|
a39551962a
|
Merge branches 'dev' and 'dev_dyd' of https://fcd.gdyditc.com/itc-framework/ma/2024/front into dev_dyd
|
2025-07-03 11:27:03 +08:00 |
|
|
|
1e84338fdf
|
Merge branch 'dev-zhaoDN/fixbug-setColor-tryCatch' into 'dev'
fixbug:【流程图】点开流程图查看报错
See merge request itc-framework/ma/2024/front!88
|
2025-07-03 01:27:43 +00:00 |
|
