Commit Graph
271 Commits
Author SHA1 Message Date
dzc 1bd2ba3a8e feat:额外收费 2026-03-26 11:04:37 +08:00
ctw 310a54517f fix:字段修改 2025-11-04 17:44:58 +08:00
zjf e684883acd 更改字段名称 2025-10-26 21:54:58 +08:00
zjf 08cf048bde 超市报表 2025-10-20 17:03:08 +08:00
zjf 0dd4757a3a 超市报表 2025-10-20 12:16:00 +08:00
weiwei eabc3edc4a feat:入库出库单可以通过货商搜索,零售价可编辑 2025-10-15 15:27:41 +08:00
weiwei f5bf29ba9e fix:修复采购管理零售价表格列合计计算错误 2025-10-15 10:40:48 +08:00
zjf 8d96247c44 综合服务完善修改 2025-10-13 00:25:38 +08:00
zjf 78762f43d2 1 2025-10-11 12:59:39 +08:00
zjf 5431f2962e fix: 统一文件换行符为 LF 2025-10-11 12:58:03 +08:00
zjf 2dbce0a362 综合服务完善 2025-10-10 15:17:02 +08:00
zjf 0ebd6737fe 超市会议 2025-10-09 18:38:18 +08:00
zjf 3962ea78b4 完善 2025-09-30 17:20:40 +08:00
zjf 96e92eee20 Merge remote-tracking branch 'origin/master' 2025-09-28 19:01:11 +08:00
zjf 8bf898adec 访客 2025-09-28 19:00:53 +08:00
weiwei c1ee5ea960 fix:退货单输入数量和总金额,实际进价会自动变更 2025-09-28 17:23:44 +08:00
weiwei 7c6cc51751 fix:修复命令行报错 2025-09-26 10:52:22 +08:00
zjf c17731dd86 即时销售报表,毛利润报表 2025-09-23 20:38:00 +08:00
zjf 45c2bd0e88 即时销售报表 2025-09-22 19:32:29 +08:00
zjf ca3c0b2a13 零售价字段 2025-09-19 20:20:36 +08:00
zjf bf1bfcbfd0 零售退货筛选值 2025-09-18 18:05:24 +08:00
zjf ad89129ed2 1 2025-08-25 22:42:47 +08:00
weiwei 58e6f48738 chore:修改 2025-08-22 17:34:32 +08:00
weiwei a68829e953 2025-08-21 18:39:34 +08:00
zjf 7b9ab4ecd0 Merge branch 'master' of https://gitea.zianxin.com/zax/biz-pc-cloud
# Conflicts:
#	src/views/supermarketerp/supermarketSpu/components/package-unit.vue
2025-08-21 17:46:54 +08:00
zjf 54273cdc9a 1 2025-08-21 17:45:53 +08:00
weiwei 09ed9cd1a6 fix:修改冲突 2025-08-21 17:43:28 +08:00
zjf 341c6ed83d Merge branch 'master' of https://gitea.zianxin.com/zax/biz-pc-cloud
# Conflicts:
#	src/views/supermarketerp/supermarketSpu/components/package-unit.vue
2025-08-21 17:36:14 +08:00
zjf 017cba3a05 库存商品修改 2025-08-21 17:34:18 +08:00
weiwei 867cabdee8 fix:修复商品未添加口味时id读取错误 2025-08-21 17:29:06 +08:00
weiwei 6517d33d1c feat:口味字段和校验修改 2025-08-20 18:14:35 +08:00
weiwei ff3a47dcab feat:口味不能重复校验 2025-08-20 15:36:08 +08:00
weiwei f39279bf8a feat:库存商品不同口味的库存 2025-08-20 11:11:34 +08:00
weiwei 2a82e97cfe feat:库存商品口味 2025-08-19 16:46:03 +08:00
zjf e82a191e37 1.other.ts增加application/octet-stream白名单,增加口味模块代码 2025-08-19 12:44:37 +08:00
dzc 2b8a1f0755 Merge branch 'master' of https://gitea.zianxin.com/zax/biz-pc-cloud 2025-08-15 17:28:01 +08:00
dzc 6c3af87b7b fix:超市购物卡支付、选择钱包、称重商品小数精度不够的问题 2025-08-15 17:27:57 +08:00
weiwei 0e66d461a7 fix:入库的实际进价根据数量和总金额变动 2025-08-15 11:17:06 +08:00
weiwei ed6e3e61e6 Merge branch 'master' of https://gitea.zianxin.com/zax/biz-pc-cloud 2025-08-14 17:26:34 +08:00
weiwei 52aa57bf6f fix:入库出库表尾合计;导入每日菜品成功刷新分类 2025-08-14 17:26:22 +08:00
dzc 6d68dcc8ef Merge branch 'master' of https://gitea.zianxin.com/zax/biz-pc-cloud 2025-08-14 10:31:56 +08:00
dzc dd0d6a21cf feat:用户部门 2025-08-14 10:31:52 +08:00
weiwei 075b4f41bb feat: 入库商品选择弹窗显示规格 2025-08-14 09:59:50 +08:00
weiwei 6516b0490b fix: 样式修改 2025-08-13 11:30:06 +08:00
weiwei 5c7b2c7081 fix: 表格分页勾选 2025-08-12 19:01:19 +08:00
weiwei 01fb67fa1b Merge branch 'master' of https://gitea.zianxin.com/zax/biz-pc-cloud 2025-08-12 16:59:35 +08:00
weiwei fcf7609a66 feat: 线上预订菜品支持从每日菜品导入 2025-08-12 16:57:55 +08:00
zjf 91c96800b5 Merge remote-tracking branch 'origin/master' 2025-08-12 14:35:45 +08:00
weiwei ddfc8fe48b fix: 零售退货 2025-08-12 09:51:37 +08:00
weiwei 58f66bcf22 fix: 校验提示 2025-08-12 09:22:12 +08:00