Commit Graph
1334 Commits
Author SHA1 Message Date
dzc c4f8c8b356 Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud 2025-03-28 20:50:47 +08:00
dzc 96474bee0b 11 2025-03-28 20:50:23 +08:00
weiwei 4f40fcae93 商户二级 2025-03-28 20:48:51 +08:00
dzc 192f8b8dca Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud
# Conflicts:
#	src/views/wallet/mch-manage/form.vue
#	src/views/wallet/mch-manage/index.vue
2025-03-28 19:59:17 +08:00
weiwei a6952ce49f Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud 2025-03-28 19:54:43 +08:00
weiwei 4d637a6b2b 商户二级信息表单 2025-03-28 19:53:31 +08:00
weiwei c478f6067b 部门树形下拉可以筛选查询 2025-03-28 19:29:06 +08:00
dzc 26da8b8306 feat:钱包规则 2025-03-28 18:49:53 +08:00
weiwei 256238c571 1 2025-03-28 15:29:07 +08:00
dzc f308b3c669 11 2025-03-28 14:48:56 +08:00
dzc e924c989b1 Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud 2025-03-28 13:51:36 +08:00
dzc a8ecca14ed 11 2025-03-28 13:51:14 +08:00
weiwei 1dc74c9a4d 超市流程表单操作行为hook 2025-03-28 10:28:54 +08:00
weiwei b8f94fd25b 商户收款二维码下载 2025-03-27 20:26:30 +08:00
dzc 937cea3c49 Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud 2025-03-27 18:25:15 +08:00
dzc c636a03d1b 111 2025-03-27 18:24:52 +08:00
weiwei 034eff45f6 Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud 2025-03-27 16:28:24 +08:00
weiwei 12843a60ec 包厢排期详情 2025-03-27 16:27:11 +08:00
dzc 29eb383e2c 11 2025-03-27 14:53:06 +08:00
dzc 3688e0b396 Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud 2025-03-26 18:41:05 +08:00
dzc 52ea4d3410 feat:订单搜索条件 2025-03-26 18:40:53 +08:00
weiwei cddb60e126 Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud 2025-03-26 15:32:28 +08:00
weiwei ce33abe5d1 货商导入权限 2025-03-26 15:32:22 +08:00
dzc 5240720174 Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud 2025-03-26 15:17:19 +08:00
dzc 0b8be8a363 feat:钱包规则页面 2025-03-26 15:17:15 +08:00
zjf 13042cdf5b Merge remote-tracking branch 'origin/master' 2025-03-26 13:42:47 +08:00
zjf e5f0f421ca feat:食堂新增字段是否显示 2025-03-26 13:42:14 +08:00
dzc f0cc250b98 feat:商户增加搜索条件 2025-03-26 09:46:27 +08:00
dzc 68abd5d0b1 Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud 2025-03-25 22:19:11 +08:00
dzc 2fe3b668e1 11 2025-03-25 22:19:06 +08:00
weiwei f147c561af Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud 2025-03-25 21:01:21 +08:00
weiwei c9c6b2ad1c 添加审批弹框 2025-03-25 21:01:08 +08:00
zjf 5bf5aa64e9 Merge remote-tracking branch 'origin/master' 2025-03-25 17:29:30 +08:00
zjf 3769d265b1 feat:食堂新增字段是否显示 2025-03-25 17:29:12 +08:00
weiwei 3a2e4342be Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud 2025-03-25 16:04:02 +08:00
weiwei 2a21372bee 采购管理和零售管理相关的详情查看和打印预览 2025-03-25 16:03:47 +08:00
zjf 2c0430b365 feat:工作流引入详情路由字段,食堂新增字段是否显示 2025-03-25 15:07:20 +08:00
dzc d79ff80e39 feat:商户导出权限 2025-03-25 10:42:53 +08:00
dzc b33aec5aa3 feat:设备交易记录、商户交易记录查询逻辑修改 2025-03-25 10:22:30 +08:00
dzc 4026400ffc feat:设备交易记录 2025-03-24 19:30:39 +08:00
dzc 4b2c247082 fix:是否同步到正元权限 2025-03-24 18:57:07 +08:00
dzc 49694f7489 Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud 2025-03-24 18:55:09 +08:00
dzc 854deda9b4 11 2025-03-24 18:55:04 +08:00
zjf ff6cd0cc32 Merge remote-tracking branch 'origin/master' 2025-03-24 18:15:09 +08:00
zjf 3e6f481110 feat:引入会议 2025-03-24 18:14:50 +08:00
dzc e2595abf94 feat:每日菜谱下拉只显示食堂 2025-03-24 16:46:03 +08:00
dzc d6c0c52885 feat:h5增加是否显示店铺 2025-03-24 11:31:57 +08:00
dzc 7c3ae331d6 11 2025-03-23 15:42:09 +08:00
dzc ef7f19c07e feat:每日菜谱只筛选食堂 2025-03-23 15:30:24 +08:00
dzc 5bb6c9731b 11 2025-03-22 14:54:16 +08:00