 YeMingfei666
|
f66d4655d1
|
修改商品绑定耗材提交的id字段
|
2024-08-27 11:10:51 +08:00 |
duan
|
aa8d1b76e4
|
Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into dwb
|
2024-08-27 10:58:17 +08:00 |
|
duan
|
c5ec0da61c
|
修改充值文字。增减余额
|
2024-08-27 10:58:09 +08:00 |
|
YeMingfei666
|
483ff5d234
|
修改台桌裂变编辑状态为仅编辑时出现
|
2024-08-26 17:56:02 +08:00 |
|
YeMingfei666
|
da29e0b249
|
台桌列表增加编辑台桌里可修改台桌状态
|
2024-08-26 17:52:39 +08:00 |
|
YeMingfei666
|
c70a6b2f68
|
代客人下单增加过滤掉下架的单规格商品
|
2024-08-26 17:51:59 +08:00 |
 gyq
|
07a3c8e5f4
|
Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq
|
2024-08-26 17:06:07 +08:00 |
|
gyq
|
9d8e1e1bf2
|
更新员工优惠折扣
|
2024-08-26 17:05:58 +08:00 |
|
YeMingfei666
|
770c369ebd
|
Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into ymf
|
2024-08-26 11:15:34 +08:00 |
|
YeMingfei666
|
711bd0ca77
|
代客下单修复购物车里商品输入框输入数量数据未更新问题
|
2024-08-26 11:15:23 +08:00 |
|
duan
|
7542134ac7
|
余额增减修改输入小数点
|
2024-08-26 10:37:17 +08:00 |
|
duan
|
71b6d1929b
|
Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into dwb
|
2024-08-26 10:14:57 +08:00 |
|
duan
|
30656b3005
|
Merge branch 'dev' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into dwb
|
2024-08-26 10:14:47 +08:00 |
|
duan
|
2fe66b28a8
|
修改显示余额
|
2024-08-26 10:14:36 +08:00 |
|
YeMingfei666
|
5e14f29ecb
|
代客下单修改是否售尽判断
|
2024-08-26 09:51:03 +08:00 |
|
YeMingfei666
|
f2c73eca9a
|
代客下单
1.增加删除挂单判断当前挂单是否为当前订单
2.修复备注问题
|
2024-08-23 18:14:37 +08:00 |
|
YeMingfei666
|
ec75feddce
|
代客下单修复
确认挂单后再操作购物车再次存单时挂单列表数据未更新
|
2024-08-23 16:17:09 +08:00 |
|
YeMingfei666
|
423ad16727
|
代客下单
1.增加确认此单不删除本地订单
2.修改部分样式
|
2024-08-23 15:48:10 +08:00 |
|
YeMingfei666
|
963c1c81ba
|
代客下单修改部分样式
|
2024-08-23 15:28:08 +08:00 |
|
YeMingfei666
|
ab7c61231b
|
修改页面布局，增加全屏退出全屏功能
|
2024-08-23 15:22:19 +08:00 |
|
YeMingfei666
|
4c2d88ed99
|
修改会员余额支付文字为会员支付
|
2024-08-23 15:21:51 +08:00 |
|
YeMingfei666
|
d275c5ea3c
|
Merge branch 'dev' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into ymf
|
2024-08-23 14:32:07 +08:00 |
|
YeMingfei666
|
eaaf7f5c60
|
代客下单挂单增加参数tableID
|
2024-08-23 14:22:04 +08:00 |
|
YeMingfei666
|
335d604f5f
|
代客下单增加结账金钱输入键盘
|
2024-08-23 13:57:53 +08:00 |
|
YeMingfei666
|
34f18e0e07
|
代客下单增加关台时禁止点餐
|
2024-08-23 13:57:23 +08:00 |
|
gyq
|
d0f567209b
|
Merge branch 'dev' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq
|
2024-08-23 13:56:01 +08:00 |
|
gyq
|
f5b364b0f3
|
添加员工新增优惠类型
|
2024-08-23 13:55:50 +08:00 |
|
duan
|
ccd66bd2be
|
修改vip颜色
|
2024-08-23 11:45:54 +08:00 |
|
duan
|
82624d49b5
|
优化
|
2024-08-23 10:38:05 +08:00 |
|
YeMingfei666
|
d64555e905
|
暂时隐藏充值按钮
|
2024-08-23 10:21:10 +08:00 |
|
YeMingfei666
|
052d06bb75
|
增加会员余额支付方式
|
2024-08-23 10:20:52 +08:00 |
|
YeMingfei666
|
b0811452a4
|
Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into ymf
|
2024-08-23 09:57:43 +08:00 |
|
duan
|
dfc9667c90
|
修改活动管理编辑-是否赠送商品开关入参类型
|
2024-08-22 16:39:16 +08:00 |
|
YeMingfei666
|
5d1961d772
|
代客下单更新
1.筛选时去除头尾空格来匹配
|
2024-08-22 16:02:03 +08:00 |
|
YeMingfei666
|
a14a9877c2
|
代客下单修改
1.默认布局更改为图片文字布局
2.增加选择用户时点击用户或者选择都可选择用户
|
2024-08-22 14:20:42 +08:00 |
|
YeMingfei666
|
dba71a0f11
|
Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into ymf
|
2024-08-22 09:34:42 +08:00 |
|
YeMingfei666
|
9e4eaf1ebc
|
代客下单修改文字布局售完展示样式
|
2024-08-22 09:30:58 +08:00 |
|
YeMingfei666
|
f07b6ec29b
|
增加不同布局售尽样式
|
2024-08-21 18:26:30 +08:00 |
|
YeMingfei666
|
3f8a41f694
|
代客下单增加开台中状态
|
2024-08-21 15:55:11 +08:00 |
|
YeMingfei666
|
0b3084a3f9
|
代客下单后付款修复
|
2024-08-21 15:36:23 +08:00 |
|
YeMingfei666
|
0a36882c8b
|
代客下单增加先付费后付费选择
|
2024-08-21 15:23:10 +08:00 |
|
YeMingfei666
|
18c2c68c9f
|
更新客下单支付订单
|
2024-08-21 13:44:39 +08:00 |
|
YeMingfei666
|
1bc4cf134c
|
代客下单增加下单关闭回调，当点餐页面关闭刷新桌台状态
|
2024-08-21 13:30:09 +08:00 |
|
YeMingfei666
|
8a84a99272
|
代课下单代码优化，修复部分问题
|
2024-08-21 10:58:57 +08:00 |
|
duan
|
37f7e51f69
|
优化和会员问题
|
2024-08-21 08:58:08 +08:00 |
|
YeMingfei666
|
555d0ebaa0
|
代课下单修改存单取单以及用户切换时masterid相关逻辑
当是取出的订单状态时使用订单的masterID
|
2024-08-20 17:46:25 +08:00 |
|
duan
|
c563f646cc
|
Merge branch 'dev' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into dwb
|
2024-08-20 16:58:07 +08:00 |
|
duan
|
1fde054290
|
用户编辑和余额增加减
|
2024-08-20 16:57:26 +08:00 |
|
YeMingfei666
|
977b2e5cd7
|
Merge branch 'dev' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into ymf
|
2024-08-20 16:47:42 +08:00 |
|
YeMingfei666
|
5575b4be9d
|
代客下单增加更新规格限制
|
2024-08-20 16:45:13 +08:00 |
GYJ
|
c39792a0f6
|
活动页面增加自定义充值金额开关
|
2024-08-20 10:24:14 +08:00 |
|
YeMingfei666
|
28750b0a2d
|
代课下单增加多规格下架过滤
|
2024-08-20 09:52:22 +08:00 |
|
YeMingfei666
|
bcd5458db3
|
代客下单确认此单将masterid改为改订单的
|
2024-08-19 18:28:57 +08:00 |
|
YeMingfei666
|
0ae2fbe11b
|
代课下单-修改取消挂单
|
2024-08-19 18:03:33 +08:00 |
|
duan
|
c51d5cd064
|
广告功能
|
2024-08-19 17:54:21 +08:00 |
|
YeMingfei666
|
daa8de48b3
|
代课下单增加切换用户时逻辑
1.获取新的取餐码
2.更新用户id
|
2024-08-19 17:37:22 +08:00 |
|
YeMingfei666
|
51e410a4be
|
修改代课下单本地测试环境
|
2024-08-19 17:15:00 +08:00 |
|
YeMingfei666
|
e0be30bd02
|
台桌列表-代课下单禁止修改桌台号
|
2024-08-17 18:02:38 +08:00 |
|
YeMingfei666
|
4977dcb76b
|
增加代客下单功能
|
2024-08-17 17:57:59 +08:00 |
|
duan
|
13df97b949
|
Merge branch 'dev' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into dwb
|
2024-08-17 16:06:06 +08:00 |
|
duan
|
44e15448d9
|
耗材列表盘点
|
2024-08-17 16:05:41 +08:00 |
|
duan
|
21a9548e45
|
添加赠送商品
|
2024-08-16 15:23:14 +08:00 |
|
duan
|
ce546e09b2
|
修改所属商品字段
|
2024-08-16 15:22:29 +08:00 |
|
duan
|
b3a48a68af
|
售卖时间管控
|
2024-08-15 16:04:22 +08:00 |
|
duan
|
611194b587
|
售卖时间管控
|
2024-08-15 15:50:43 +08:00 |
|
duan
|
0bccf5db8a
|
总的统计未携带分类参数
|
2024-08-15 13:47:08 +08:00 |
|
duan
|
3b7dbe50a2
|
将耗材记录加入到耗材列表里
|
2024-08-14 16:02:52 +08:00 |
|
duan
|
1e52030f5e
|
通知中心
|
2024-08-12 15:54:16 +08:00 |
|
duan
|
b1bf21ccad
|
图库修改样式
|
2024-08-09 16:48:58 +08:00 |
魏啾
|
681d1c2c07
|
选择耗材
|
2024-08-09 15:01:58 +08:00 |
|
魏啾
|
7733dcf4e9
|
Merge branch 'dev' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into wwz
|
2024-08-09 14:06:16 +08:00 |
|
魏啾
|
5fc9443a4b
|
选择耗材
|
2024-08-09 14:06:02 +08:00 |
|
duan
|
2292bd6b82
|
Merge branch 'dev' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into dwb
|
2024-08-09 11:17:21 +08:00 |
|
duan
|
25b348ee12
|
修改样式
|
2024-08-09 11:17:10 +08:00 |
|
魏啾
|
14462f98ab
|
更改总数数量
|
2024-08-09 10:54:27 +08:00 |
|
duan
|
b6b80c3d43
|
修改图片
|
2024-08-09 09:48:06 +08:00 |
|
duan
|
c4b734ce12
|
优化样式
|
2024-08-08 14:28:45 +08:00 |
|
duan
|
69b19bfade
|
修改添加商品问题
|
2024-08-08 14:23:10 +08:00 |
|
duan
|
8c0ca8869a
|
图片样式优化
|
2024-08-08 11:27:54 +08:00 |
|
duan
|
4ab685fac3
|
编辑商品的问题
|
2024-08-08 10:50:33 +08:00 |
|
魏啾
|
87d2f8a7bb
|
Merge branch 'dev' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into wwz
|
2024-08-08 09:38:35 +08:00 |
|
魏啾
|
81f5c68fa7
|
出库入库修改
|
2024-08-08 09:38:23 +08:00 |
|
duan
|
9a55093516
|
商品单规格和多规格之间切换
|
2024-08-08 09:11:20 +08:00 |
|
duan
|
3b12a2ba06
|
更改图库功能
|
2024-08-07 15:51:33 +08:00 |
|
duan
|
7f54c59092
|
图库上传bug
|
2024-08-07 11:44:05 +08:00 |
|
duan
|
5377a76365
|
修改图库BUG
|
2024-08-07 09:41:13 +08:00 |
|
魏啾
|
d0cc82fdf5
|
Merge branch 'dev' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into wwz
|
2024-08-07 09:12:00 +08:00 |
|
duan
|
d1ef6fefa0
|
修改BUG
|
2024-08-06 17:56:29 +08:00 |
|
duan
|
6c4e992283
|
商品分页
|
2024-08-06 15:05:29 +08:00 |
|
duan
|
0971b67010
|
添加商品列表分页功能
|
2024-08-06 15:00:49 +08:00 |
|
duan
|
1d39576b34
|
商品列表-商品图片-选择图片增删改
|
2024-08-06 13:45:06 +08:00 |
|
魏啾
|
e38545be2d
|
交班时间 营业时间
|
2024-08-05 17:01:34 +08:00 |
|
魏啾
|
79e1282c68
|
11
|
2024-08-05 15:12:49 +08:00 |
|
gyq
|
e67e3525e4
|
Merge branch 'dev' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq
|
2024-08-03 18:11:19 +08:00 |
|
gyq
|
7427e2d913
|
耗材盘点传参更新，新增stockNumber
|
2024-08-03 18:11:14 +08:00 |
|
YeMingfei666
|
01c4c17d30
|
进销存商品绑定耗材已选择耗材后展示为黑色文字
|
2024-08-03 17:03:59 +08:00 |
|
gyq
|
671159277c
|
交班记录新增sort字段
|
2024-08-03 16:55:20 +08:00 |
|
gyq
|
b495926968
|
1.新增修改密码 2.取消出入库供应商校验
|
2024-08-03 16:49:57 +08:00 |
|
duan
|
6830529769
|
提出报错插件
|
2024-08-02 15:15:42 +08:00 |
|
gyq
|
4a6c0ca71d
|
Merge branch 'dev' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq
|
2024-08-02 15:12:08 +08:00 |
|
gyq
|
07551be485
|
更新商品设置热门
|
2024-08-02 15:11:27 +08:00 |
|
duan
|
64d321508e
|
Merge branch 'dev' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into dwb
|
2024-08-02 15:06:51 +08:00 |
|
duan
|
d8cac655a4
|
图库选择50%
|
2024-08-02 15:06:35 +08:00 |
|
duan
|
9a75cb474e
|
修改热门接口参数
|
2024-08-02 15:04:43 +08:00 |
|
gyq
|
744632324b
|
优化起售数量最低1
|
2024-08-02 10:41:44 +08:00 |
|
gyq
|
0a1af58fcd
|
优化编辑商品
|
2024-08-01 15:52:33 +08:00 |
|
duan
|
5bc744872b
|
拉取DEV代码
|
2024-08-01 15:50:15 +08:00 |
|
duan
|
2acf054b86
|
素材库添加-未完成
|
2024-08-01 15:48:45 +08:00 |
|
gyq
|
7de5f566b0
|
优化商品编辑
|
2024-08-01 15:29:30 +08:00 |
|
gyq
|
4818e2e927
|
Merge branch 'dev' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq
|
2024-07-30 16:00:13 +08:00 |
|
gyq
|
5d3fdd5acf
|
登录新增类型
|
2024-07-30 16:00:08 +08:00 |
|
魏啾
|
c505674e36
|
Merge branch 'dev' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into wwz
|
2024-07-30 15:46:26 +08:00 |
|
魏啾
|
20ed539215
|
交班记录
|
2024-07-30 15:46:14 +08:00 |
|
魏啾
|
9317ec1dfa
|
交班记录
|
2024-07-30 15:46:02 +08:00 |
|
gyq
|
d8b9d01aa7
|
进销存-操作出库记录中的耗材出库记录现有库存字段精度显示小数位数过多
|
2024-07-30 13:51:04 +08:00 |
|
gyq
|
77f75bbbeb
|
修复出入库类型错误
|
2024-07-29 17:47:57 +08:00 |
|
gyq
|
bf0da42707
|
1.限制添加员工优惠金额最大10W
|
2024-07-29 15:04:26 +08:00 |
|
gyq
|
f6a37259bb
|
添加员工，角色修改为必填项
|
2024-07-29 13:32:41 +08:00 |
|
YeMingfei666
|
8d5a54fe6f
|
添加商品页面增加商品备注，增加批量修改范围限制，修复批量修改时数据变化视图未更新问题
|
2024-07-26 14:12:41 +08:00 |
|
YeMingfei666
|
432ba32b4e
|
Merge branch 'dev' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into ymf
|
2024-07-26 13:43:08 +08:00 |
|
YeMingfei666
|
0ce365bbe8
|
进销存-商品库存-详情记录增加规格名称
|
2024-07-26 13:42:49 +08:00 |
|
gyq
|
502a18d5a3
|
添加员工设置密码
|
2024-07-26 11:14:59 +08:00 |
|
gyq
|
b88ae01878
|
Merge branch 'dev' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq
|
2024-07-26 09:46:33 +08:00 |
|
gyq
|
617dd317d3
|
店铺管理新增员工列表
|
2024-07-26 09:46:25 +08:00 |
|
duan
|
ee5178ccfe
|
上架多规格的子集没有，
|
2024-07-25 14:55:01 +08:00 |
|
YeMingfei666
|
79a0a2c1a2
|
去除添加商品打包费，虚拟销量输入时的最小值为0限制，改为输入完成后验证
|
2024-07-25 13:56:53 +08:00 |
|
YeMingfei666
|
6aea8a9c8e
|
优化-增加商品添加时数字输入框如果输入值超范围时重置数据的弹窗提醒
|
2024-07-25 13:52:30 +08:00 |
|
YeMingfei666
|
51c9c9e15c
|
Merge branch 'dev' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into ymf
|
2024-07-25 11:33:07 +08:00 |
|
YeMingfei666
|
016ebf7b62
|
商品管理-商品列表增加商品时对价格金额数量进行限制和数字格式化
|
2024-07-25 11:32:37 +08:00 |
|
duan
|
dbe8167822
|
Merge branch 'dev' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into dwb
|
2024-07-24 17:04:04 +08:00 |
|
duan
|
a6d3d4afbe
|
多规格上架按钮隐藏
|
2024-07-24 17:03:41 +08:00 |
|
YeMingfei666
|
54d06b72fe
|
修改商品管理-商品分组编辑商品分组后未将id置空问题
|
2024-07-24 10:54:53 +08:00 |
|
YeMingfei666
|
347f58828d
|
修改进销存操作记录，当返回数据不包含number字段时返回空字符串
|
2024-07-24 09:22:45 +08:00 |
|
YeMingfei666
|
72778ed68b
|
进销存操作记录修改回根据后台返回数据计算
|
2024-07-23 18:30:11 +08:00 |
|
YeMingfei666
|
3532d8dbf4
|
更改进销存操作记录为后台返回subType值，根据改值判断加减
|
2024-07-23 18:18:32 +08:00 |
|
YeMingfei666
|
c1beec0efc
|
优化耗材管理绑定商品页面同商品不同规格绑定耗材时未重置选中耗材
|
2024-07-23 18:09:43 +08:00 |
|
YeMingfei666
|
3ae0d7991b
|
Merge branch 'dev' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into ymf
|
2024-07-23 17:21:53 +08:00 |
|
YeMingfei666
|
496389f8bc
|
修改耗材管理-绑定商品绑定耗材提交的数据结构，修改筛选耗材输入id为选择分类
|
2024-07-23 17:21:00 +08:00 |
|
gyq
|
aa7a672e87
|
Merge branch 'dev' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq
|
2024-07-23 17:12:16 +08:00 |
|
gyq
|
dcb2eb36ea
|
优化编辑商品起售数量不显示和库存数量显示不准确
|
2024-07-23 17:12:11 +08:00 |
|
duan
|
04d23793d1
|
Merge branch 'dev' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into dwb
|
2024-07-23 17:03:26 +08:00 |
|
duan
|
6cbf407b88
|
扩展资料
|
2024-07-23 17:03:16 +08:00 |
|
YeMingfei666
|
a6d90bf36e
|
Merge branch 'ymf' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dev
|
2024-07-23 15:03:07 +08:00 |
|
YeMingfei666
|
7b679fb415
|
修复在查询耗材流水信息里时返回的商品id为null时报错导致耗材记录列表不显示的情况
|
2024-07-23 15:01:25 +08:00 |
|
duan
|
6f15f226ee
|
Merge branch 'dev' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into dev
|
2024-07-23 10:16:10 +08:00 |
|
duan
|
1ca47334f6
|
优化问题
|
2024-07-23 10:15:30 +08:00 |
|
gyq
|
52ed7edf08
|
优化出库入库数量限制
|
2024-07-22 17:13:44 +08:00 |
|
duan
|
2be2df7bc4
|
上架
|
2024-07-22 14:24:13 +08:00 |
|
duan
|
e335d634da
|
Merge branch 'dev' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into dev
|
2024-07-22 13:59:25 +08:00 |
|
duan
|
fa27401152
|
上架
|
2024-07-22 13:59:09 +08:00 |