Commit Graph

261 Commits

Author SHA1 Message Date
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
duan 29affe432a 盘点备注 2024-07-22 13:57:12 +08:00
YeMingfei666 9479f1c987 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dev 2024-07-22 13:50:35 +08:00
YeMingfei666 30b309dcf3 增加耗材分类名称禁止输入空格 2024-07-22 13:49:33 +08:00
duan 3ea683b7bd 合并 2024-07-22 13:34:32 +08:00
duan aaea042bca Merge branch 'dev' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into dev 2024-07-22 10:32:49 +08:00
YeMingfei666 4bffe64149 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dev 2024-07-22 10:22:58 +08:00
YeMingfei666 9de4251981 操作入库选择多规格商品后商品名称后面追加规格名称 2024-07-22 10:22:23 +08:00
duan 33e2e7b761 扩展参数 2024-07-22 10:10:15 +08:00
YeMingfei666 dd7f4c32ac Merge branch 'ymf' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dev 2024-07-20 18:33:50 +08:00
YeMingfei666 ecf800bf76 更新耗材修改单位 2024-07-20 18:33:18 +08:00
YeMingfei666 a059e97a45 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dev 2024-07-20 18:22:51 +08:00
YeMingfei666 000def6dc2 更新修改耗材信息提交数据格式 2024-07-20 18:22:11 +08:00
YeMingfei666 a53c688513 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dev 2024-07-20 17:59:27 +08:00
YeMingfei666 949a310c71 更新样式 2024-07-20 17:58:59 +08:00
YeMingfei666 fb63eabb33 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dev 2024-07-20 17:49:42 +08:00
YeMingfei666 a427cfff76 修复耗材记录服务器上居中失效 2024-07-20 17:49:11 +08:00
YeMingfei666 f3faa70c59 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dev 2024-07-20 17:43:59 +08:00
YeMingfei666 015ca6ae4e 更新耗材记录所属商品 2024-07-20 17:41:54 +08:00
YeMingfei666 bb2e166af2 更新耗材 2024-07-20 17:35:55 +08:00
YeMingfei666 97685234d4 耗材记录增加所属商品,样式居中 2024-07-20 17:33:30 +08:00
YeMingfei666 914a6389e7 删除测试数据 2024-07-20 17:31:53 +08:00
YeMingfei666 1a4eb34824 订单列表增加备注 2024-07-20 15:53:05 +08:00
YeMingfei666 3888b95248 删除耗材类型代码 2024-07-20 15:16:38 +08:00
gyq fcae02fe4a Merge branch 'dev' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq 2024-07-19 18:21:03 +08:00
gyq 63effa002d 优化 2024-07-19 18:20:57 +08:00
YeMingfei666 f13dbd580a 增加耗材单位 2024-07-19 17:56:50 +08:00
YeMingfei666 58bf05d7c4 修改部分样式 2024-07-19 09:04:36 +08:00
YeMingfei666 cc32bc79a3 修改选择耗材弹窗样式 2024-07-18 18:16:23 +08:00
YeMingfei666 e7ff989d03 修复样式问题 2024-07-18 18:05:18 +08:00
YeMingfei666 2f0006571f 修改耗材绑定商品 2024-07-18 17:31:38 +08:00
YeMingfei666 5d0bbba194 耗材修改 2024-07-17 18:28:18 +08:00
duan 7cadb25712 从商品库存-库存记录-点击订单号跳转过来 2024-07-17 18:06:13 +08:00
duan cfa32e18ba 安全信息保存后重置 2024-07-15 10:35:35 +08:00
魏啾 abe786d155 page 改为30 2024-07-14 11:04:06 +08:00
gyq a347a2a38f 优化 2024-07-12 13:56:46 +08:00
gyq ea8c0021db 优化添加耗材 2024-07-11 19:14:58 +08:00
gyq f6b0bcc5f1 优化耗材列表编辑 2024-07-11 18:39:31 +08:00
gyq 4d1029cd6e 优化 2024-07-11 18:21:16 +08:00
gyq b265faa4bc 优化上传耗材按钮图标 2024-07-11 18:19:02 +08:00
gyq 7c8942942d 优化编辑商品 2024-07-11 17:57:37 +08:00
gyq bbd8405605 优化 2024-07-11 17:43:58 +08:00
gyq e640d10830 Merge branch 'dev' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq 2024-07-11 17:30:20 +08:00
gyq eead4de81f 新增耗材导入导出 2024-07-11 17:28:49 +08:00
duan 0bbe08306a 耗材列表新增修改 2024-07-11 15:57:47 +08:00
duan 78a51f3b81 安全设置添加md5加密 2024-07-11 14:59:05 +08:00
gyq d0a43f7f43 Merge branch 'dev' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq 2024-07-11 14:31:26 +08:00
duan f8fbe4fe83 安全设置接口联调 2024-07-11 14:17:46 +08:00
duan 8581e454aa 店铺管理-店铺配置-安全设置页面 2024-07-11 13:43:39 +08:00
gyq 7035f09192 Merge branch 'dev' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq 2024-07-11 10:35:08 +08:00
gyq 8d7d3c8ea1 优化商品 2024-07-11 10:35:03 +08:00
duan c626bca335 优化绑定商品耗材负数 2024-07-10 18:30:04 +08:00
duan 74a180cba1 优化绑定商品 2024-07-10 18:20:47 +08:00
duan 2150cacf1c Merge branch 'dev' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into dwb 2024-07-10 16:53:48 +08:00
duan 8099e17e2c 优化绑定商品的名称 2024-07-10 16:53:25 +08:00
duan 146e6ec2b1 Merge branch 'dev' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into dev 2024-07-10 16:19:32 +08:00
duan 1172883260 优化绑定商品多选 2024-07-10 16:18:58 +08:00
YeMingfei666 3c9fa6cc3f 更新新增歌曲未重置数据 2024-07-10 16:18:21 +08:00
YeMingfei666 8a3a30807a 更新歌手页面,接口 2024-07-10 15:55:19 +08:00
gyq bcf5d09b3b 优化商品编辑,规格编辑 2024-07-10 13:33:17 +08:00
gyq 66f8f95cda 优化 2024-07-10 09:48:24 +08:00
YeMingfei666 c1eda32f29 重置记录跳转 2024-07-09 16:46:52 +08:00
YeMingfei666 9c1a2a1de7 充值记录页面 2024-07-09 16:46:34 +08:00
YeMingfei666 8d2950e3f2 增加部分接口 2024-07-09 16:46:19 +08:00
duan d955593106 Merge branch 'dev' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into dwb 2024-07-09 16:14:54 +08:00
duan be980f153c 添加台桌号 2024-07-09 16:14:46 +08:00
YeMingfei666 ffd1a57c11 增加消费记录页面 2024-07-09 16:04:25 +08:00
YeMingfei666 c00c4858f7 增加充值记录页面 2024-07-09 16:04:11 +08:00
YeMingfei666 2ed4b046af 增加跳转(暂时不展示) 2024-07-09 16:03:21 +08:00
YeMingfei666 401f9b4daa 样式修改 2024-07-09 16:01:37 +08:00
gyq 8b908cdc08 Merge branch 'dev' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq 2024-07-09 14:56:03 +08:00
gyq 1f06dffae3 耗材列表增加编辑功能 2024-07-09 14:55:58 +08:00
YeMingfei666 6f1c8bf455 更新文字 2024-07-09 11:53:38 +08:00
gyq 2ae72a8ae6 Merge branch 'dev' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq 2024-07-09 11:27:51 +08:00
gyq f723b25933 优化 2024-07-09 11:27:41 +08:00
YeMingfei666 233eb98ff1 更新接口传参以及部分信息展示 2024-07-09 11:18:15 +08:00
YeMingfei666 8b84a14032 增加点击订单数量跳转到订单列表页面 2024-07-09 11:15:20 +08:00
YeMingfei666 0408ccf5e5 增加接收桌台参数 2024-07-09 11:14:54 +08:00
YeMingfei666 a821d74884 增加会员列表会员总数传参 2024-07-09 09:43:38 +08:00
gyq d96cef1970 Merge branch 'gyq' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into dev 2024-07-08 18:24:04 +08:00
gyq 1ebd4c6c45 优化 2024-07-08 18:23:05 +08:00
YeMingfei666 bb32631a25 修改歌曲添加部分文字 2024-07-08 18:16:04 +08:00
YeMingfei666 dd77b5e154 修改桌台统计展示,修改添加歌曲文字展示 2024-07-08 18:15:04 +08:00
gyq 0be1523119 优化耗材出入库 2024-07-08 17:49:23 +08:00
gyq 5eff7a0dc1 优化 2024-07-08 17:42:03 +08:00
YeMingfei666 aff6bd0998 Merge branch 'dev' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into ymf 2024-07-08 16:21:32 +08:00
gyq dddc60f5a5 优化各项分页效果 2024-07-08 16:16:15 +08:00
gyq 397832c9fe 优化 2024-07-08 14:50:10 +08:00