368 Commits

Author	SHA1	Message	Date
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
YeMingfei666	b08e7edfa2	Merge branch 'dev' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dev	2024-07-25 14:57:27 +08:00
duan	ee5178ccfe	上架多规格的子集没有，	2024-07-25 14:55:01 +08:00
YeMingfei666	a7c2194ec2	去除在保留两位小数时的四舍五入	2024-07-25 14:35:09 +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
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