f5083ca420
优化 文本不在单词中间进行换行
2025-01-05 21:10:30 +08:00
41bc20a3a8
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.
2025-01-04 22:42:13 +08:00
c2285e42e4
新增 产品信息导入，稿件下载功能
2025-01-04 22:41:06 +08:00
a2ea5282a2
优生产制单备注
2025-01-04 17:10:31 +08:00
86a118a785
优生产制单备注
2025-01-04 16:23:34 +08:00
0b956eb7b1
提交20250104
2025-01-04 15:04:19 +08:00
22888ef18c
新增 销售订单sku行备注，
2025-01-03 02:24:51 +08:00
1fbc4ebe52
提交20241230
2024-12-30 22:03:12 +08:00
cc27de49b7
提交20241230
2024-12-30 19:59:28 +08:00
7695075607
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-30 14:23:00 +08:00
fbe565f3e2
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-30 14:22:14 +08:00
9b75e76f6b
修改权限项
2024-12-16 18:56:00 +08:00
f8249576d1
提示信息 添加多语言配置
2024-12-16 15:33:43 +08:00
00ff1749d9
修复 下单校验逻辑
2024-12-16 15:22:50 +08:00
16dc6b2ddd
隐藏岗位
2024-12-16 15:04:33 +08:00
c0d8cdc3aa
隐藏岗位
2024-12-16 15:01:32 +08:00
50b54c5f43
还原覆盖代码
2024-12-16 09:57:57 +08:00
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
yf
wwb