 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 |
|
|
weiwei
|
0484050c69
|
Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud
|
2025-05-22 17:09:14 +08:00 |
|
|
weiwei
|
8b7617bb44
|
食材采购修改和样式优化
|
2025-05-22 17:09:08 +08:00 |
|
|
dzc
|
d7ef218251
|
feat:非食堂用户不能看到所有食堂
|
2025-05-22 15:59:42 +08:00 |
|
|
zjf
|
da3d1842c7
|
Merge remote-tracking branch 'origin/master'
|
2025-05-21 17:06:57 +08:00 |
|
|
zjf
|
3cd1201dbb
|
会议
|
2025-05-21 17:06:33 +08:00 |
|
|
dzc
|
bee9fefa1d
|
Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud
|
2025-05-20 17:37:37 +08:00 |
|
|
dzc
|
238341b45b
|
feat:人脸审批显示部门
|
2025-05-20 17:37:34 +08:00 |
|
|
zjf
|
e19c32176e
|
Merge remote-tracking branch 'origin/master'
|
2025-05-20 15:06:31 +08:00 |
|
|
zjf
|
44dcebfe36
|
会议
|
2025-05-20 15:01:31 +08:00 |
|
|
dzc
|
5577d55801
|
feat:充值申请删除
|
2025-05-20 10:17:58 +08:00 |
|
|
dzc
|
944eeeffe7
|
Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud
|
2025-05-19 17:43:01 +08:00 |
|
|
dzc
|
5fdfbe0f54
|
feat:离职自动转账
|
2025-05-19 17:42:57 +08:00 |
|
|
weiwei
|
759e100cbf
|
设备指纹显示
|
2025-05-19 16:30:08 +08:00 |
|
|
weiwei
|
1e0fe0617c
|
Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud
|
2025-05-19 11:11:43 +08:00 |
|
|
weiwei
|
c037de727c
|
|
2025-05-19 11:11:37 +08:00 |
|
|
dzc
|
eee91b191f
|
feat:食堂搜索条件
|
2025-05-19 09:51:09 +08:00 |
|
|
dzc
|
448a799223
|
Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud
|
2025-05-16 16:35:14 +08:00 |
|
|
dzc
|
b4803a92a2
|
11
|
2025-05-16 16:35:11 +08:00 |
|
|
zjf
|
7dd4a0c08c
|
Merge remote-tracking branch 'origin/master'
|
2025-05-16 16:10:34 +08:00 |
|
|
zjf
|
1f493466a1
|
食堂进销
|
2025-05-16 16:10:19 +08:00 |
|
|
dzc
|
6fb1e8cccc
|
Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud
|
2025-05-15 16:10:28 +08:00 |
|
|
dzc
|
a2234e8e18
|
feat:自定义额外支付
|
2025-05-15 16:10:24 +08:00 |
|
|
zjf
|
14373975aa
|
Merge remote-tracking branch 'origin/master'
|
2025-05-15 15:13:21 +08:00 |
|
|
zjf
|
28853ee80e
|
食堂进销
|
2025-05-15 15:13:07 +08:00 |
|
|
dzc
|
71a67191c4
|
Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud
|
2025-05-14 19:36:27 +08:00 |
|
|
dzc
|
9c79b3fa1b
|
feat:用户商户部门
|
2025-05-14 19:36:24 +08:00 |
|