Commit Graph

680 Commits

Author SHA1 Message Date
zzyuan 35e47bc019 菜谱优化 2025-12-17 15:14:41 +08:00
zzyuan bdf353e6b8 Merge branch 'bonus-jyy-smart-canteen' of http://192.168.0.75:3000/bonus/bonus-ui into bonus-jyy-smart-canteen 2025-12-11 11:31:16 +08:00
zzyuan e8b20092a7 菜谱问题修改 2025-12-11 11:31:06 +08:00
lizhenhua 550e023c86 Merge remote-tracking branch 'origin/bonus-jyy-smart-canteen' into bonus-jyy-smart-canteen 2025-12-11 09:43:21 +08:00
lizhenhua 6d538bd79a 晨健视频 2025-12-11 09:42:12 +08:00
zzyuan b7dd2a72f8 Merge branch 'bonus-jyy-smart-canteen' of http://192.168.0.75:3000/bonus/bonus-ui into bonus-jyy-smart-canteen 2025-12-11 09:12:55 +08:00
zzyuan 088541951c 问题修改 2025-12-11 09:11:19 +08:00
lizhenhua 25302d4539 补贴批量 功能开发 2025-12-09 17:46:29 +08:00
lizhenhua b28cc97ee8 Merge remote-tracking branch 'origin/bonus-jyy-smart-canteen' into bonus-jyy-smart-canteen
# Conflicts:
#	src/views/canteen/accountCenter/butie/butie/index.vue
2025-12-09 15:55:17 +08:00
lizhenhua 2c9c5e6ae3 补贴批量 功能开发 2025-12-09 15:53:20 +08:00
lizhenhua 7f335c8610 补贴批量 功能开发 2025-12-09 15:52:58 +08:00
zzyuan 10a4b38b7d 钱包充值1 2025-12-04 17:53:03 +08:00
zzyuan fb444ba226 充值问题i修改 2025-12-04 17:46:09 +08:00
zzyuan 1383548c58 线上问题修改 2025-12-04 17:38:47 +08:00
liux 9cf10c7835 增加员工编码字段 2025-11-28 16:48:16 +08:00
liux a5731d7c48 人员信息添加核验状态 2025-11-28 16:23:44 +08:00
liux 474e796242 海康门禁人脸照片限制200k 2025-11-28 16:11:52 +08:00
zzyuan 7f43d82d49 Merge branch 'bonus-jyy-smart-canteen' of http://192.168.0.75:3000/bonus/bonus-ui into bonus-jyy-smart-canteen 2025-11-24 09:13:52 +08:00
zzyuan 71fd126c45 经研院食堂线上问题修改 2025-11-24 09:13:45 +08:00
jiask b2fcf4ae4f jsk 小票打印机提交 2025-11-21 10:41:40 +08:00
zzyuan 73308c98ee Merge branch 'bonus-jyy-smart-canteen' of http://14.103.246.124:16000/bonus/bonus-ui into bonus-jyy-smart-canteen 2025-11-19 13:15:39 +08:00
zzyuan e2dc0cb89d 线上问题优化zzy 2025-11-19 13:15:22 +08:00
jiask 3527c743e6 jsk 线下消费添加支付方式 2025-11-18 10:16:12 +08:00
jiask 191f831685 Merge branch 'bonus-jyy-smart-canteen' of http://192.168.30.2:3000/bonus/bonus-ui into bonus-jyy-smart-canteen 2025-11-13 15:57:43 +08:00
zzyuan 6889f80321 页面问题修改 2025-11-07 16:23:21 +08:00
zzyuan 5116fcf7c1 测试问题修改优化 2025-11-06 10:20:09 +08:00
zzyuan cac93fef29 bug修改 2025-10-30 19:05:35 +08:00
zzyuan 18dd923bfa 测试问题修改 2025-10-30 16:50:49 +08:00
zzyuan a46d22933a Bug修改 2025-10-28 17:54:16 +08:00
jjLv 64d6d81279 领料人、入库人、供应商人员选择修改 2025-10-24 19:28:50 +08:00
zzyuan e2e0bdc22e 生成验货处理 2025-10-23 16:17:10 +08:00
zzyuan 702c0d6484 Merge branch 'bonus-jyy-smart-canteen' of http://192.168.0.75:3000/bonus/bonus-ui into bonus-jyy-smart-canteen 2025-10-23 14:56:46 +08:00
zzyuan 38e5992aba 采购订单接口修改 2025-10-23 14:56:37 +08:00
liux 181d4c0f80 添加订单列表查询条件 2025-10-23 09:29:42 +08:00
zzyuan f1885a11fb 验货流程修改 2025-10-22 18:14:01 +08:00
zzyuan 268b3f852b 订单完成按钮操作 2025-10-22 17:50:57 +08:00
zzyuan 27a032af9f 验货导入订单 2025-10-22 17:39:48 +08:00
zzyuan 0b819ec0eb 验货数量限制修改,采购订单状态新增 2025-10-22 13:11:26 +08:00
zzyuan 845cf8cc77 验货数量更改3 2025-10-21 18:16:45 +08:00
zzyuan dba6ed21e9 验货数量更改2 2025-10-21 17:45:44 +08:00
zzyuan 7c96dde561 验货数量更改 2025-10-21 17:32:12 +08:00
jjLv c8fa83bd0f 供应链增加人员配置、供应商人员 2025-10-17 08:58:23 +08:00
jjLv 171c87d447 供应商、订单采购加入供应商筛选等 2025-10-14 18:08:20 +08:00
zzyuan 9c71f3fe98 bug修改3 2025-09-29 14:47:04 +08:00
zzyuan 0967d6d5df bug修改2 2025-09-29 14:41:36 +08:00
zzyuan e3716f792b 线上订单注释核销退单等功能(无法推送优尔) 2025-09-29 14:36:21 +08:00
zzyuan 4bee0c3580 Bug修改 2025-09-29 13:20:15 +08:00
zzyuan 597ae9277c 页面修改 2025-09-28 09:16:19 +08:00
jiask b84c461298 Merge branch 'bonus-jyy-smart-canteen' of http://192.168.30.2:3000/bonus/bonus-ui into bonus-jyy-smart-canteen 2025-09-25 14:21:24 +08:00
zzyuan 9b2a0f5d61 健康一体级/设备类型修改 2025-09-25 14:20:18 +08:00