Commit Graph

368 Commits

Author SHA1 Message Date
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
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
YeMingfei666 c03a9a1992 update 2024-07-08 13:53:53 +08:00
duan e88ef7360a Merge branch 'dev' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into dwb 2024-07-08 11:29:46 +08:00
gyq 36c57f5ad1 优化操作出入库耗材多选 2024-07-08 11:21:50 +08:00
YeMingfei666 c4059d109c add(桌台统计,点歌) 2024-07-08 10:28:37 +08:00
duan dd4c301ec6 编辑限制耗材值输入 2024-07-06 17:34:51 +08:00
duan a9dd2d2374 Merge branch 'gyq' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into dwb 2024-07-06 16:14:37 +08:00
duan c9ac6eb138 添加预警值 2024-07-06 16:14:31 +08:00
gyq 10e3af1cb3 Merge branches 'gyq' and 'dwb' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq 2024-07-06 16:12:58 +08:00
gyq f1eda32158 新增耗材盘点 2024-07-06 16:12:05 +08:00
duan f37cd3b1dd 绑定商品取小数点后两位 2024-07-06 15:43:48 +08:00
YeMingfei666 addb27be82 数据报表增加会员充值展示,用户列表增加全部会员数和会员余额展示 2024-07-06 14:48:48 +08:00
duan ac1c17e958 隐藏拖拽、绑定商品多选 2024-07-06 10:31:14 +08:00
duan 065d159b49 优化耗材绑定添加 2024-07-05 16:42:31 +08:00
duan 8593295e21 更改库存数量 2024-07-05 16:15:11 +08:00
gyq a602398cb9 更新耗材记录 2024-07-05 16:14:39 +08:00
gyq 1bb073dc44 优化耗材 2024-07-05 15:22:07 +08:00
duan c9bbb2d8ad 修改耗材信息提示 2024-07-05 14:53:44 +08:00
gyq af774198d5 Merge branch 'dwb' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq 2024-07-05 14:48:56 +08:00
gyq ea2e040706 优化 2024-07-05 14:48:50 +08:00
duan 79a341b2a2 耗材列表添加代码输入 2024-07-05 14:47:31 +08:00
duan f91247a853 Merge branch 'gyq' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into dwb 2024-07-05 14:40:01 +08:00
duan f214412610 优化耗材 2024-07-05 14:39:47 +08:00
gyq 8dde3eea48 Merge branch 'dwb' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq 2024-07-05 14:14:20 +08:00
gyq 0935333d36 优化 2024-07-05 14:14:14 +08:00
duan fc0c361e94 优化绑定规格 2024-07-05 11:32:25 +08:00
duan 2ecd70c7ce 优化绑定商品 2024-07-05 10:47:19 +08:00
duan d127edaf55 Merge branch 'gyq' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into dwb 2024-07-05 10:47:07 +08:00
gyq f39fee341e 优化耗材记录 2024-07-05 10:46:26 +08:00
duan 456b262cbe 优化绑定商品 2024-07-05 10:15:39 +08:00
duan d6a8aca57f Merge branch 'gyq' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into dwb 2024-07-05 10:15:25 +08:00
gyq d12ecff83d 1.新增耗材记录查询所有 2024-07-05 09:43:32 +08:00
duan 4f927cd201 合并代码 2024-07-05 09:20:12 +08:00
gyq 2cb8006f8d Merge branch 'dwb' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq 2024-07-04 11:55:53 +08:00
gyq a6f6b1918c 优化进货账目详情 2024-07-04 11:55:48 +08:00
duan 010db705ac Merge branch 'gyq' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into dwb 2024-07-04 11:34:51 +08:00
duan 847a682a78 耗材列表新增修改 2024-07-04 11:34:39 +08:00
gyq 72cfbf259b Merge branch 'dwb' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq 2024-07-04 10:05:23 +08:00
gyq 7a3fd61550 1.新增商品库存库存盘点
2.操作出入库新增耗材操作
2024-07-04 10:05:17 +08:00
duan 6dd4146cc6 绑定商品 2024-07-04 09:55:05 +08:00
duan c14f7e45c0 Merge branch 'wwz' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into dwb 2024-07-04 09:54:32 +08:00
魏啾 6118d2ef91 更改size 2024-07-03 17:52:57 +08:00
魏啾 a06f3f3919 1 2024-07-03 17:47:02 +08:00
YeMingfei666 57e2eeb66d 增加操作记录剩余数量,修复商品库存分页 2024-07-03 15:01:15 +08:00
duan 9dc307b031 Merge branch 'gyq' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into dwb 2024-07-03 09:27:17 +08:00
魏啾 4750e500de 耗材管理 2024-07-02 17:56:20 +08:00
gyq 06101c6ed2 优化库存管理 2024-07-02 14:09:43 +08:00
魏啾 fb732f8ebe 更改记录 2024-07-02 09:55:49 +08:00
魏啾 ed9ec61ab4 宽度修改 2024-07-02 09:43:37 +08:00
gyq 67207be4f2 优化库存盘点 2024-07-02 09:36:47 +08:00
gyq 6c8e4d868a Merge branch 'wwz' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq 2024-07-01 18:10:31 +08:00
gyq d5e400d0cb 新增库存盘点 2024-07-01 18:10:04 +08:00
魏啾 402c1ad237 账单付款记录 2024-07-01 15:10:27 +08:00
duan c05707e6f0 Merge branch 'wwz' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into dwb 2024-06-28 18:11:47 +08:00
魏啾 9e23ae3915 information 2024-06-28 16:33:03 +08:00
duan a6113908b4 付款金额限制 2024-06-28 15:43:21 +08:00
duan 9c815458a5 优化支付问题 2024-06-28 15:03:09 +08:00
魏啾 ef518bafa0 修改名称 2024-06-28 12:00:32 +08:00
魏啾 0ae7fbb32d 耗材修改 2024-06-28 10:18:39 +08:00
duan 939702e998 优化问题 2024-06-27 17:55:33 +08:00
duan ad74689313 合并代码 2024-06-27 10:56:37 +08:00
魏啾 9c98052782 Merge branch 'dwb' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into wwz 2024-06-27 10:50:07 +08:00
魏啾 14e3a4d081 通知管理 2024-06-27 10:49:55 +08:00
duan fe9793b9f5 优化入库出库 2024-06-27 10:43:38 +08:00
gyq 747b408e7b Merge branch 'dwb' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq 2024-06-27 10:09:06 +08:00
gyq 5110bd6d57 更新拖拽 2024-06-27 10:08:40 +08:00
duan 3d4434dbbe 优化供应商管理重置 2024-06-27 09:36:42 +08:00
duan 55e696a6a2 优化问题 2024-06-26 16:48:52 +08:00
duan 5e283bb804 优化入库 2024-06-26 16:04:53 +08:00
魏啾 f9ae277ca8 add 2024-06-26 15:57:18 +08:00
魏啾 fe2aa7359b Merge branch 'dwb' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into wwz 2024-06-26 14:34:27 +08:00
魏啾 98c9b20e37 修改重置 2024-06-26 14:34:11 +08:00
duan 0d42d145af 优化操作入库 2024-06-26 13:57:10 +08:00
duan cf7bbfc030 合并代码 2024-06-26 11:12:51 +08:00
duan ac96e0f3e0 优化代码 2024-06-26 11:11:59 +08:00
duan 14bf3f4ac8 优化代码 2024-06-26 09:09:51 +08:00
魏啾 02f0401855 耗材管理 2024-06-25 15:50:35 +08:00
duan d51dd3382d 商品库存功能优化 2024-06-24 17:23:26 +08:00
duan e571869422 供应商管理 2024-06-22 18:25:48 +08:00
duan 72ed4be931 优化字段 2024-06-22 14:52:19 +08:00
duan 5045f11c53 Merge branch 'master' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into dwb 2024-06-22 10:40:01 +08:00
duan cf5860abbc 添加字段 2024-06-22 09:48:10 +08:00
duan 83658f712c 数据报表添加字段 2024-06-21 17:48:39 +08:00
gyq d53314b523 Merge branch 'dwb' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management 2024-06-21 17:43:45 +08:00
gyq 04bd127b95 优化 2024-06-21 17:43:40 +08:00
duan 15b9dddc4c 优化bug 2024-06-21 17:41:00 +08:00
duan 776ad6dc26 商品库存,添加规格 2024-06-21 14:42:16 +08:00
duan 0392fc7d25 数据报表,充值和支付金额 2024-06-21 14:35:17 +08:00
gyq eba0939005 优化进销存 2024-06-21 13:54:38 +08:00
gyq 7605011b63 优化进销存库存上传下载 2024-06-20 09:06:35 +08:00
gyq 2026193f0f 新增批量下载桌码 2024-06-14 11:42:07 +08:00
gyq 313ec6e6f9 新增下载桌码 2024-06-12 18:22:15 +08:00
gyq 49569e348f 新增下载桌码静态页面 2024-06-12 18:21:53 +08:00
gyq 56477f87b5 优化 2024-06-11 18:25:52 +08:00