zianxin/pj_admin_cloud
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,257 Commits 1 Branch 0 Tags
a68829e953071ad7cd2339bb58efc35ba0650e30
Commit Graph
248 Commits
Author SHA1 Message Date
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
zjf 5fd4d6534a Merge branch 'master' of https://gitea.zianxin.com/zax/biz-pc-cloud 2025-08-11 23:45:47 +08:00
weiwei 3a26de1e63 fix: 库存上限和下限都显示精确到小数点 2025-08-11 18:02:59 +08:00
weiwei 937e6065e6 fix: 采购退货 2025-08-11 17:31:18 +08:00
weiwei 370b2f80ab fix: 入库单里面显示规格；入库单的单据日期可以修改； 2025-08-11 16:13:00 +08:00
weiwei eaecfe4730 库存盘点 2025-08-11 10:32:22 +08:00
zjf c04cd449bb Merge branch 'master' of https://gitea.zianxin.com/zax/biz-pc-cloud 2025-08-11 10:04:36 +08:00
weiwei 89516f2da2 库存盘点 2025-08-08 18:13:35 +08:00
zjf 1dd2842b79 pd 2025-08-08 17:41:13 +08:00
weiwei cdc44f8284 库存盘点 2025-08-08 17:22:38 +08:00
weiwei 9cc989ed77 字段修改 2025-08-08 16:25:51 +08:00
weiwei e244b38645 1 2025-08-06 20:44:25 +08:00
weiwei 8537d38910 采购入库导出全部 2025-08-06 19:54:21 +08:00
weiwei 3d310eee9d 库存商品管理替换导入导出接口路径；增加覆盖导入库存商品 2025-08-06 15:55:27 +08:00
zjf 215a71f84d 超市库存商品列表成本单价去除金额转化 2025-08-06 13:47:56 +08:00
weiwei 6026e1ac78 库存商品导入成功刷新货商 2025-08-06 11:01:39 +08:00
weiwei f4e0ea65ca 入库去除经办人选项 2025-08-05 16:57:44 +08:00
weiwei 04d4fc4406 1 2025-08-04 16:38:38 +08:00
weiwei 0d824b0b24 库存商品字段调整；入库格局商品性质填写数量；入库时商品搜索后页码重置为1 2025-08-04 16:26:25 +08:00
weiwei bf54733b34 商品入库表尾合计 2025-08-04 15:20:15 +08:00
weiwei f2a8ec0d10 超市库存商品添加商品性质搜索 2025-08-04 11:17:36 +08:00
weiwei 07740940f2 1 2025-08-02 16:19:50 +08:00
weiwei 02f3d39825 1 2025-08-02 15:44:45 +08:00
weiwei 8e0cbefd6c 累计总金额可修改 2025-08-02 15:33:58 +08:00