 dzc
|
e55aadc127
|
Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud
|
2025-01-21 09:11:29 +08:00 |
|
|
dzc
|
bb0317fbc8
|
feat:充值流水分页
|
2025-01-21 09:11:25 +08:00 |
|
 ctw
|
fdde0bee85
|
Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud
|
2025-01-20 21:04:29 +08:00 |
|
|
ctw
|
cad822e674
|
移除终止流程
|
2025-01-20 21:04:20 +08:00 |
|
|
dzc
|
dd6082e521
|
feat:充值流水统计
|
2025-01-20 20:30:36 +08:00 |
|
|
dzc
|
1832ab74d5
|
feat:申请按钮权限
|
2025-01-20 17:06:04 +08:00 |
|
|
ctw
|
d847967ef8
|
修改
|
2025-01-20 16:05:30 +08:00 |
|
|
ctw
|
378bc6a659
|
修改
|
2025-01-20 16:02:59 +08:00 |
|
|
dzc
|
db6b0ac96d
|
Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud
# Conflicts:
# src/views/wallet/wallet-recharge-apply/preview-excel.vue
|
2025-01-20 15:57:28 +08:00 |
|
|
dzc
|
eb295d35f9
|
feat:申请备注
|
2025-01-20 15:56:50 +08:00 |
|
|
ctw
|
6c2e9b60a4
|
Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud
|
2025-01-20 15:11:48 +08:00 |
|
|
ctw
|
ad53819215
|
修改
|
2025-01-20 15:11:43 +08:00 |
|
 zjf
|
fa7829c6ab
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# .env.development
|
2025-01-20 11:27:09 +08:00 |
|
|
zjf
|
f23553686f
|
登录页
|
2025-01-20 11:26:35 +08:00 |
|
|
ctw
|
491eaed6ae
|
Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud
|
2025-01-20 10:29:54 +08:00 |
|
|
ctw
|
fad6c2a6d3
|
钱包数据表格行尾合计
|
2025-01-20 10:29:47 +08:00 |
|
|
dzc
|
9bf7f7af6d
|
Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud
|
2025-01-19 21:19:30 +08:00 |
|
|
dzc
|
ebff17f4ab
|
fix：修改
|
2025-01-19 21:19:24 +08:00 |
|
|
ctw
|
8aeae2cb89
|
Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud
|
2025-01-19 17:42:02 +08:00 |
|
|
ctw
|
6dfeb5a9e2
|
每次菜品选择添加点击行选择
|
2025-01-19 17:41:56 +08:00 |
|
|
dzc
|
e2988f7354
|
fix:去掉邮箱必填
|
2025-01-19 16:43:12 +08:00 |
|
|
dzc
|
c0d9b6a7b1
|
fix:人员查询bug修改
|
2025-01-19 16:18:27 +08:00 |
|
|
dzc
|
238776cd2c
|
feat:用户根据当前部门和当前部门及其子部门查询
|
2025-01-19 15:50:26 +08:00 |
|
|
ctw
|
26045f9a28
|
Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud
|
2025-01-19 15:34:51 +08:00 |
|
|
ctw
|
7f48dbbc1c
|
添加查全部
|
2025-01-19 15:34:44 +08:00 |
|
|
dzc
|
3c349ac1e3
|
Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud
|
2025-01-19 15:34:35 +08:00 |
|
|
dzc
|
c4f10ac9fe
|
feat:配置权限
|
2025-01-19 15:34:30 +08:00 |
|
|
ctw
|
fe2884f161
|
Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud
|
2025-01-19 13:37:38 +08:00 |
|
|
ctw
|
1beb70d4aa
|
添加按钮权限
|
2025-01-19 13:37:13 +08:00 |
|
|
dzc
|
7d780d9f0c
|
Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud
# Conflicts:
# .env.development
|
2025-01-19 11:55:12 +08:00 |
|
|
dzc
|
ef3dea40fa
|
feat:钱包、设备权限
|
2025-01-19 11:54:56 +08:00 |
|
|
ctw
|
0fa67d4d02
|
修改菜品分类接口
|
2025-01-17 15:00:14 +08:00 |
|
|
zjf
|
ea2daab109
|
Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud
# Conflicts:
# .env.development
|
2025-01-17 14:17:31 +08:00 |
|
|
zjf
|
ef65369441
|
env
|
2025-01-17 14:17:14 +08:00 |
|
|
ctw
|
373de198e4
|
修改每日菜谱问题和调整首页布局以及移除不必要的导入
|
2025-01-17 14:15:01 +08:00 |
|
|
ctw
|
611f1d634d
|
每日菜品选择改为分页并保存勾选状态
|
2025-01-16 18:24:43 +08:00 |
|
|
ctw
|
3872bfd959
|
Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud
|
2025-01-16 12:13:34 +08:00 |
|
|
ctw
|
cad68a0301
|
修改菜谱选择商品问题
|
2025-01-16 12:13:28 +08:00 |
|
|
dzc
|
2b52329aaf
|
Merge branches 'master', 'master' and 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud
|
2025-01-16 12:08:20 +08:00 |
|
|
dzc
|
8acb5144fb
|
feat:打印
|
2025-01-16 12:08:16 +08:00 |
|
|
zjf
|
2c6c5214ed
|
Merge remote-tracking branch 'origin/master'
|
2025-01-16 11:15:13 +08:00 |
|
|
zjf
|
e76e3cc77c
|
整理
|
2025-01-16 11:14:50 +08:00 |
|
|
ctw
|
03f52b4a57
|
修改每日菜品删除提示。页面加载默认获取当日数据。
|
2025-01-16 10:18:43 +08:00 |
|
|
ctw
|
b6c6174c35
|
Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud
|
2025-01-16 09:54:48 +08:00 |
|
|
ctw
|
628fa5bfdc
|
使用图片懒加载
|
2025-01-16 09:54:43 +08:00 |
|
|
ctw
|
ff545909c0
|
使用图片懒加载
|
2025-01-16 09:33:55 +08:00 |
|
|
ctw
|
b6f313ed78
|
样式修改
|
2025-01-15 22:03:48 +08:00 |
|
|
ctw
|
439eea31b6
|
Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud
|
2025-01-15 20:00:40 +08:00 |
|
|
ctw
|
1d6f7b8db7
|
每日菜谱添加loading效果，默认选中当天
|
2025-01-15 20:00:36 +08:00 |
|
|
dzc
|
2acb0eb403
|
11
|
2025-01-15 18:45:33 +08:00 |
|