a232b6fe67
Merge branch 'dev' of https://git.yfgame.vip/r/hangtag into dev
...
# Conflicts:
# hangtag-ui/hangtag-ui-front/src/locales/en.ts
# hangtag-ui/hangtag-ui-front/src/views/oms/saleorder/index.vue
2024-12-15 12:52:55 +08:00
159153d49d
新增 下单页面多语言
2024-12-15 12:43:43 +08:00
8041ea0cc2
修改审核方法
2024-12-14 23:06:02 +08:00
c85d183e63
修改两位小数计算
2024-12-14 21:10:54 +08:00
e140c1fab7
增加前端英文多语言
2024-12-14 20:53:13 +08:00
ff677dda57
去除admin 语言栏切换
2024-12-14 18:27:28 +08:00
d30e981810
更新订单详情字段
2024-12-14 18:14:21 +08:00
a131e441c0
Merge branch 'dev' of https://git.yfgame.vip/r/hangtag into dev
2024-12-14 18:13:38 +08:00
d5b05b6d79
Merge branch 'dev' of https://git.yfgame.vip/r/hangtag into dev
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2024-12-14 17:53:14 +08:00
90e9d7bbc5
修改生成制单
2024-12-14 17:20:26 +08:00
359df015f1
新增合约类型
2024-12-14 15:47:24 +08:00
596af2202c
修改logo图片
2024-12-09 17:16:06 +08:00
d8d5c2b9ba
修改logo图片
2024-12-09 16:35:51 +08:00
3894c47452
增加忘记密码
2024-12-08 21:34:14 +08:00
5ad0473e03
增加忘记密码
2024-12-08 20:45:30 +08:00
47b6f6a8a5
提交20241207
2024-12-07 09:14:09 +08:00
8e24f48b52
优化 币种无效过滤
2024-12-02 23:50:46 +08:00
ab5b66e9b4
新增 币种和产品默认价格
2024-12-02 23:41:06 +08:00
116e703093
优化 没有选择模板时设置默认类型
2024-11-29 22:13:23 +08:00
e91dcc5788
新增 地区语言设置
2024-11-26 17:30:28 +08:00
d8d5ae857f
优化 稿件预览
2024-11-26 01:14:41 +08:00
e8b1bf2817
优化 护理项目列表
2024-11-26 00:58:50 +08:00
943324af03
优化
2024-11-25 23:57:48 +08:00
ba060c4031
修复
2024-11-25 09:09:54 +08:00
068e6c6e95
修复
2024-11-25 01:28:19 +08:00
554da610d2
优化 护理项目
2024-11-25 01:19:01 +08:00
698dd3f1a8
新增 护理流程类型
2024-11-25 00:59:29 +08:00
86f080e474
优化 下单动态属性配置
2024-11-24 23:35:27 +08:00
3920a5415d
fix 可输入控制条件
2024-11-21 23:34:26 +08:00
1d495c6e35
优化 变量输入，下单默认品牌
2024-11-21 23:22:09 +08:00
487e8250da
优化 稿件添加封面
2024-11-20 23:28:51 +08:00
91a9dd8f0e
优化 稿件变量属性控制
2024-11-20 21:58:27 +08:00
5b64e3b160
修复 不能下单问题
2024-11-20 08:56:02 +08:00
5984d5a9d7
新增 管理品牌跟单员，新增产品资料复制功能
2024-11-19 23:25:18 +08:00
8df7c5e026
去除权限校验
2024-11-18 10:02:25 +08:00
ec14990255
隐藏语言选择
2024-11-18 09:19:44 +08:00
1bece1b15d
Merge branch 'dev' of https://git.yfgame.vip/r/hangtag into dev
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2024-11-18 01:04:40 +08:00
c179177730
添加 批稿参数校验
2024-11-18 01:03:55 +08:00
be124b6763
优化用户维护品牌关系逻辑
2024-11-17 23:20:21 +08:00
bd5764b846
同步 本地话多语言配置
2024-11-16 22:47:56 +08:00
cf54cbf47c
Merge branch 'dev' of https://git.yfgame.vip/r/hangtag into dev
2024-11-16 14:06:06 +08:00
ad175a2393
新增 下单分不同类型添加sku,下单预览图设置背景
2024-11-16 14:04:38 +08:00
1c5bdd2989
增加跟单员
2024-11-13 21:32:57 +08:00
1e11697fd0
增加跟单员
2024-11-13 21:25:39 +08:00
63f493ec3d
增加跟单员
2024-11-13 20:53:40 +08:00
1b221bca72
销售订单增加导出PI功能
2024-11-03 20:29:09 +08:00
eb1cd78f07
销售订单增加导出PI功能
2024-10-29 23:13:48 +08:00
c0cc36772f
优化销售订单
2024-10-29 00:03:06 +08:00
0df79512fb
更新生产单信息
2024-10-27 22:38:33 +08:00
18ac4dcbef
增加打印日志
2024-10-27 21:41:59 +08:00
64c44b162e
增加打印日志
2024-10-27 21:39:47 +08:00
e9e5f68e41
修复 稿件背景颜色失效问题
2024-10-24 22:40:12 +08:00
03bb6c6acb
优化 批稿提交为图片上传
2024-10-24 21:13:32 +08:00
0e67114e15
优化 文字描述
2024-10-24 00:33:12 +08:00
7f7acfea0c
优化 去除图片转换逻辑
2024-10-24 00:12:48 +08:00
21a0ca112e
Merge branch 'dev' of https://git.yfgame.vip/r/hangtag into dev
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2024-10-23 23:58:42 +08:00
fd26dc46c1
优化 图稿大图问题
2024-10-23 23:57:47 +08:00
eeed462ef4
优化生产制单
2024-10-22 22:38:17 +08:00
476860c434
优化生产制单
2024-10-22 22:28:59 +08:00
6ff368298d
优化销售订单审核功能
2024-10-20 22:30:39 +08:00
6858a908c3
优化发票信息
2024-10-20 16:26:56 +08:00
55feb08407
修改客户新增页面排版
2024-10-20 15:02:15 +08:00
3514966d47
Merge branch 'dev' of https://git.yfgame.vip/r/hangtag into dev
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2024-10-18 10:09:50 +08:00
75aad6a93d
优化 下单页面，新增客户地址管理，新增查询条件构建工具类
2024-10-18 10:08:43 +08:00
fe600fe26e
客户基础资料增加发票信息字段
2024-10-14 18:00:24 +08:00
99275b6277
修改下单首页展示信息
2024-10-14 17:01:59 +08:00
637ebbcb20
Merge branch 'dev' of https://git.yfgame.vip/r/hangtag into dev
2024-10-14 16:55:51 +08:00
b61339d5c9
下单首页提交202410114
2024-10-14 16:55:27 +08:00
018f89c050
优化 修复表中图片预览层级错乱问题
2024-10-10 20:42:26 +08:00
20c6ca8beb
优化 更新表格允许拖宽，非必要字段不显示
2024-10-10 19:22:56 +08:00
5e13575dd3
修复 产品回显问题
2024-10-09 20:52:39 +08:00
932fbf9015
优化 稿件预览
2024-10-09 10:15:53 +08:00
0828d7376b
修复 稿件预览
2024-10-09 09:40:46 +08:00
7b3e0d944a
下单页面 接口对接
2024-10-08 23:41:50 +08:00
a12b47aeac
Merge branch 'dev' of https://git.yfgame.vip/r/hangtag into dev
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2024-10-06 08:44:33 +08:00
f314af7ad2
调整 稿件图片存储方式，新增产品工艺
2024-10-06 08:38:50 +08:00
0af809a013
增加下载pdf按钮
2024-09-24 23:51:16 +08:00
7550592b8a
新增前端下单首页
2024-09-24 23:45:30 +08:00
fe4019d27d
新增前端订单列表
2024-09-23 22:46:24 +08:00
3d64b4eaac
增加首页
2024-09-22 21:19:31 +08:00
fe54bd79b6
优化销售订单价格
2024-09-18 23:25:58 +08:00
1c17d7edae
Merge branch 'dev' of https://git.yfgame.vip/r/hangtag into dev
2024-09-17 17:36:20 +08:00
8f88c051c6
优化销售订单
2024-09-17 17:36:09 +08:00
c20846faf3
稿件 设计同步前台项目
2024-09-17 14:05:44 +08:00
457c955a19
修改 dialog 默认全屏
2024-09-17 11:31:31 +08:00
693b8a60e9
优化客户菜单
2024-09-16 14:12:42 +08:00
247ab3f00f
提交
2024-09-15 22:05:48 +08:00
355e94cc2e
提交
2024-09-15 21:42:05 +08:00
b33aea368a
提交
2024-09-15 21:40:39 +08:00
c39aa21b7f
增加pdf打印
2024-09-15 20:04:59 +08:00
20f13d7f5b
Merge branch 'dev' of https://git.yfgame.vip/r/hangtag into dev
2024-09-12 12:55:21 +08:00
11c705f7e6
新增pi推送邮件
2024-09-12 12:54:23 +08:00
2ffe759adb
优化 设计稿件
2024-09-11 23:10:05 +08:00
01819f1811
移除 无效的属性组
2024-09-11 22:47:58 +08:00
f4c0e96bcb
优化 图片加载
2024-09-11 22:23:28 +08:00
b2978d5acc
图片优化 测试
2024-09-11 21:11:38 +08:00
79e94961ae
Merge branch 'dev' of https://git.yfgame.vip/r/hangtag into dev
2024-09-08 23:13:04 +08:00
f1332e2765
新增生产制单
2024-09-08 23:12:47 +08:00
60734a8b61
恢复 环境配置
2024-09-08 19:11:21 +08:00
2a5390752c
临时 处理图片加载问题
2024-09-08 19:07:58 +08:00
87414ee9a8
测试
2024-09-08 18:38:27 +08:00
380e088a89
优化 测试
2024-09-08 18:26:03 +08:00
5a2bde6a69
优化 图稿预览图片加载问题
2024-09-08 18:05:23 +08:00
8c7cd9b152
修复 稿件预览图片无法显示
2024-09-08 17:59:04 +08:00
f30c3f233a
优化 预览稿件时图片加载慢导致无法显示
2024-09-08 17:48:48 +08:00
c1a7bee638
Merge branch 'dev' of https://git.yfgame.vip/r/hangtag into dev
...
# Conflicts:
# hangtag-ui/hangtag-ui-admin/src/utils/dict.ts
2024-09-08 16:42:12 +08:00
785bcede9f
改造 优化产品保养项，产品支持多稿件关联，产品保养预览数据结构优化
...
修复 已知错误
2024-09-08 16:34:49 +08:00
8d1ce49ac8
Merge branch 'dev' of https://git.yfgame.vip/r/hangtag into dev
2024-09-07 20:04:20 +08:00
9604e44645
优化销售订单
2024-09-07 20:04:01 +08:00
2cf2925c46
更新 api地址修改
2024-09-06 12:48:19 +08:00
aa9f2504f0
同步 admin端稿件管理代码
2024-09-05 21:59:51 +08:00
afa22d2286
Merge branch 'dev' of https://git.yfgame.vip/r/hangtag into dev
2024-09-05 15:44:17 +08:00
3d6c978db6
临时 提交
2024-09-05 15:43:05 +08:00
ff46f4d940
新增订单信息
2024-09-04 00:24:14 +08:00
5e9a1449ec
删除多余模块
2024-09-03 13:10:46 +08:00
fb0a227f9c
Merge branch 'dev' of https://git.yfgame.vip/r/hangtag into dev
2024-09-03 13:06:22 +08:00
96b087489f
增加生产制单
2024-09-03 13:05:57 +08:00
432362174e
fix 品牌接口
2024-09-02 10:30:41 +08:00
4d2689377b
Merge branch 'dev' of https://git.yfgame.vip/r/hangtag into dev
2024-09-02 10:17:44 +08:00
fb4e1f3fe1
优化 主页
2024-09-02 10:15:39 +08:00
2cfd3db67a
Merge branch 'dev' of https://git.yfgame.vip/r/hangtag into dev
...
# Conflicts:
# hangtag-module-oms/hangtag-module-oms-api/src/main/java/cn/hangtag/module/oms/enums/ErrorCodeConstants.java
# hangtag-module-system/hangtag-module-system-biz/target/generated-sources/annotations/cn/hangtag/module/system/convert/oauth2/OAuth2OpenConvertImpl.java
# hangtag-module-system/hangtag-module-system-biz/target/generated-sources/annotations/cn/hangtag/module/system/convert/social/SocialUserConvertImpl.java
2024-09-01 18:39:16 +08:00
250a06e19d
fix dialog组件文件
2024-09-01 15:51:14 +08:00
a2231b68de
Merge branch 'dev' of https://git.yfgame.vip/r/hangtag into dev
...
# Conflicts:
# hangtag-module-oms/hangtag-module-oms-api/src/main/java/cn/hangtag/module/oms/enums/ErrorCodeConstants.java
# hangtag-ui/hangtag-ui-front/src/components/DraftDesign/components/DesignPreviewDialog.vue
# hangtag-ui/hangtag-ui-front/src/components/DraftDesign/components/DesignPropEdit.vue
2024-09-01 15:20:38 +08:00
044df3161f
新增 产品保养项管理
...
新增 稿件预览组件
完善 产品资料管理功能
2024-09-01 15:12:47 +08:00
1c9bca7345
新增品牌关系表
2024-08-30 08:13:57 +08:00
320e76dad4
销售订单
2024-08-25 18:15:14 +08:00
9f44be32b0
提交20240824
2024-08-24 22:30:27 +08:00
778968620e
新增 稿件管理
2024-08-12 23:44:01 +08:00
5b73c0cd01
Merge branch 'dev' of https://git.yfgame.vip/r/hangtag into dev
...
# Conflicts:
# hangtag-module-oms/hangtag-module-oms-api/src/main/java/cn/hangtag/module/oms/enums/ErrorCodeConstants.java
2024-08-12 01:03:50 +08:00
ee85e1217b
优化 后台本地文件存储和访问路径，配置文件添加本地文件域名配置项
...
新增 [ui]
1.图稿设计图形图库管理
2.工具栏节点更多属性配置
3.使用技巧提示功能
3.右键菜单功能，
4.动态属性功能，右侧查看节点，和动态属性组功能,
5.优化访问资源的路径问题
2024-08-12 00:59:44 +08:00
e99bf68869
增加客户
2024-08-11 21:57:11 +08:00
877b451f4b
提交客户资料
2024-08-11 09:31:22 +08:00
a31b37910f
提交20240809
2024-08-09 17:48:35 +08:00
18f4f64ae5
新增 oms系统；产品类型，系统编码，品牌管理，产品管理，后端接口及前端页面，
...
更新sql以下 sql/mysql/20240720/*.sql
更新 忽略*/taget目录文件
2024-07-20 18:24:11 +08:00
573ed8f5b6
新增 图稿设计组件及相关依赖，
2024-07-19 21:31:33 +08:00
6b37e2f4e2
初始化提交项目
2024-06-30 17:57:40 +08:00
f10fb2f6d8
初始化提交项目
2024-06-30 17:55:22 +08:00
ada94a388a
新建模块
2024-06-30 17:42:47 +08:00
e54b86f097
新建模块
2024-06-30 17:36:37 +08:00
bd3addafde
新建模块
2024-06-30 17:25:23 +08:00
7f378a36d1
新建模块
2024-06-30 17:24:11 +08:00
ac398daa72
初始化提交项目
2024-06-30 16:39:31 +08:00
9ad1b6382d
初始化提交项目
2024-06-30 16:09:45 +08:00
yf
Mrking