Commit Graph

479 Commits

Author SHA1 Message Date
a11f035194 币种 2025-10-22 13:52:14 +08:00
aac1d599de 重新生成币种和价格 2025-10-22 13:38:25 +08:00
f84002c861 Merge remote-tracking branch 'origin/dev' into dev 2025-10-22 12:16:12 +08:00
280eac6a61 重新生成bank和region 2025-10-22 12:15:37 +08:00
de30033353 Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-web into dev
# Conflicts:
#	src/components/CreateCodeStep/src/ViewDesignStep.vue
2025-10-22 10:27:55 +08:00
dc4881e24a --修改数据优先时,没有表结构配置 2025-10-22 10:23:18 +08:00
8cd8af121b 代码生成功能模块报错 2025-10-22 09:35:36 +08:00
7629120548 style: lint格式化文件 2025-10-21 18:04:02 +08:00
f9ca969fec Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-web into dev 2025-10-21 17:59:57 +08:00
d9ea8d9604 --添加前端自动生成代码 按钮启用、作废、数据日志 2025-10-21 17:59:52 +08:00
e52bd384be 重新生成银行 2025-10-21 16:57:28 +08:00
24de24be52 重新生成region 2025-10-21 16:50:26 +08:00
e6a1fab6f5 币种 2025-10-21 15:02:09 +08:00
bc9b02cc03 countryRegion 2025-10-21 10:47:16 +08:00
fd01bc3eae priceTerms代码 2025-10-20 18:09:26 +08:00
bcdaac263e 生产bank代码 2025-10-17 18:39:21 +08:00
1dee461626 --添加全局数据版本字段 2025-10-14 19:12:21 +08:00
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