Commit Graph

500 Commits

Author SHA1 Message Date
231ba89c53 恢复银行新增表单代码 2025-10-25 20:32:08 +08:00
568755b4f7 Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-web into dev 2025-10-24 17:24:33 +08:00
19cc342e6f 管道气 2025-10-24 17:24:12 +08:00
fd908c460c Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-web into dev 2025-10-24 17:19:06 +08:00
112a34944d 港口、LNG气源地调试 2025-10-24 17:19:02 +08:00
d882d9b5b6 删除日志打印console 2025-10-24 15:25:43 +08:00
2988d179ac 生成管道气上载点前端代码 2025-10-24 14:57:10 +08:00
bd17824058 生成港口 品种等前端代码 2025-10-24 11:05:26 +08:00
53854c519f 修改数据日志全局组件,并添加自动代码生成模板 2025-10-24 08:30:42 +08:00
3df6e12184 税率 2025-10-23 17:41:19 +08:00
6f2a425ef4 Merge remote-tracking branch 'origin/dev' into dev 2025-10-23 14:57:58 +08:00
a9d8084791 税率和费用名称 2025-10-23 14:55:02 +08:00
f1c5cded22 币种、价格条款加顺序字段 2025-10-23 14:36:12 +08:00
e3fa9e517c Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-web into dev 2025-10-23 14:03:24 +08:00
39953e5648 银行 国家地区 2025-10-23 14:02:27 +08:00
883dfdd43f feat: 币种、价格条款页面调试 2025-10-22 16:56:58 +08:00
9e824f2294 提交时忽略.bak文件 2025-10-22 15:15:34 +08:00
4bb82bf779 重新生成price 2025-10-22 14:24:59 +08:00
f54d083784 update 2025-10-22 14:02:26 +08:00
eda6c5aa48 生产bank代码 2025-10-22 13:58:03 +08:00
3ec4bcb148 币种 2025-10-22 13:54:41 +08:00
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