Commit Graph
995 Commits
Author SHA1 Message Date
weiwei 84f92965a2 修复 2025-06-09 18:42:18 +08:00
weiwei 9904fa9cdc Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud 2025-06-09 17:39:54 +08:00
weiwei d79c7e582d 超市商户选择修复 2025-06-09 17:39:48 +08:00
dzc cbd853abbe 11 2025-06-06 20:06:48 +08:00
dzc 7f63941291 Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud 2025-06-05 12:07:04 +08:00
dzc a9d5036455 1 2025-06-05 12:07:00 +08:00
zjf 7cab441b5e Merge remote-tracking branch 'origin/master' 2025-06-04 20:25:09 +08:00
zjf e70c75cb7e 超市修复 2025-06-04 20:24:53 +08:00
weiwei a6c8b58801 1 2025-05-30 19:31:23 +08:00
weiwei 7ff95c7d4c Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud 2025-05-30 19:28:53 +08:00
weiwei d55502f6da 部分名称修改 2025-05-30 19:28:48 +08:00
dzc 0dd1928b8e Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud 2025-05-30 11:41:57 +08:00
dzc eb9b1d5a89 feat:未知用户处理 2025-05-30 11:41:53 +08:00
weiwei 6786013bb1 超市货商选择 2025-05-30 11:37:41 +08:00
weiwei 3f61ca4c26 修改商品选择和修改字段命名 2025-05-30 11:34:58 +08:00
weiwei 490d1ae51d 超市入库审批结构调整 2025-05-30 10:16:38 +08:00
dzc 0e835b93ea feat:订单多次退款 2025-05-29 18:45:49 +08:00
dzc 344fe2601c feat:人员调动tab 2025-05-29 15:42:00 +08:00
weiwei b84f5e4392 减少货商和经办人下拉选择一次性加载数据的数量防止页面卡住时间过长 2025-05-28 17:27:32 +08:00
weiwei 9031f92404 修改食材入库的表单中下拉选择加载缓慢导致的卡顿 2025-05-28 16:06:57 +08:00
weiwei edf9d8bc15 食材分类回显 2025-05-28 14:52:40 +08:00
weiwei 5a41e6244c 食材入库”验收状态“字段 2025-05-28 14:19:20 +08:00
zjf 393f52090b 验收 2025-05-28 14:02:37 +08:00
zjf 3590100cc8 Merge remote-tracking branch 'origin/master' 2025-05-28 13:03:50 +08:00
zjf 848a233d19 包厢 2025-05-28 13:03:37 +08:00
weiwei aa6cb653d9 食材管理添加食材分类 2025-05-28 12:56:56 +08:00
zjf c2ee643ce4 Merge remote-tracking branch 'origin/master' 2025-05-28 11:38:02 +08:00
zjf ec2e56263f 食堂分类 2025-05-28 11:37:45 +08:00
weiwei b70c1549ba 超市商品管理的修改 2025-05-27 20:00:38 +08:00
weiwei 4e02c9bbea 超市商品管理的修改 2025-05-27 18:37:32 +08:00
zjf 64dff29f1b Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud 2025-05-27 11:52:22 +08:00
weiwei 3a38bd19ee Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud 2025-05-26 19:11:43 +08:00
weiwei dff63144ea useComputed 2025-05-26 19:11:23 +08:00
weiwei e410669492 useComputed 2025-05-26 19:09:57 +08:00
zjf ba579b5de7 Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud 2025-05-25 21:05:47 +08:00
zjf b2f1101d1c 进销 2025-05-25 21:05:36 +08:00
dzc 61041d4ae4 Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud 2025-05-23 14:32:16 +08:00
dzc dfd92eec89 feat:外来人员、跨单位 2025-05-23 14:32:12 +08:00
weiwei fcc4311a3b Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud 2025-05-23 12:27:20 +08:00
weiwei 7fb8187256 入库部分字段值修改 2025-05-23 12:27:15 +08:00
dzc f44824fc66 Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud 2025-05-23 11:04:23 +08:00
dzc 8832c1f157 feat:外来人员、跨单为修改适配 2025-05-23 11:04:20 +08:00
zjf 91922eeffd Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/views/canteen/canteenErpMaterial/index.vue
2025-05-23 10:26:21 +08:00
zjf d1faa5ba1b 进销 2025-05-23 10:24:04 +08:00
weiwei 5a1850f9a4 食材入库字段修改 2025-05-23 10:20:54 +08:00
weiwei 0a7cfe3df0 食材管理进价字段修改 2025-05-23 10:13:14 +08:00
weiwei a9cee3fc0b Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud 2025-05-23 09:57:36 +08:00
weiwei 0c46b250c0 修复食材入库的原进价显示 2025-05-23 09:56:34 +08:00
zjf b4ee4d114d Merge remote-tracking branch 'origin/master' 2025-05-22 23:22:49 +08:00
zjf 13888518d9 进销 2025-05-22 23:22:35 +08:00