 15856
|
8b433a699e
|
Merge remote-tracking branch 'origin/dev-cq' into dev
# Conflicts:
# sgzb-ui/src/api/claimAndRefund/receive.js
# sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApplyAddByCq.vue
# sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveExamineByCq.vue
# sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveManage.vue
# sgzb-ui/src/views/claimAndRefund/return/returnApplyAddByCq.vue
|
2024-04-30 13:12:50 +08:00 |
|
15856
|
1419b8c32d
|
Merge remote-tracking branch 'origin/dev-cq-bug' into dev
|
2024-04-30 13:11:10 +08:00 |
 mashuai
|
f23b73106a
|
bug
|
2024-04-30 11:29:00 +08:00 |
liang.chao
|
6b002958d6
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-04-30 11:23:54 +08:00 |
|
liang.chao
|
ffe7c67c6f
|
重庆领料审核修改后无数据bug
|
2024-04-30 11:23:49 +08:00 |
|
15856
|
bbf5d988f3
|
Merge remote-tracking branch 'origin/dev-cq-bug' into dev
|
2024-04-30 10:26:55 +08:00 |
|
liang.chao
|
763c003c34
|
新购验收查询接口添加
|
2024-04-30 09:09:34 +08:00 |
|
mashuai
|
88ac035ed7
|
bug
|
2024-04-29 18:43:22 +08:00 |
 zzyuan
|
dfd01cfd5f
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-29 18:05:15 +08:00 |
|
zzyuan
|
ec8993ab37
|
综合查询时间重置
|
2024-04-29 18:05:10 +08:00 |
BianLzhaoMin
|
958771084c
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-29 18:03:43 +08:00 |
|
BianLzhaoMin
|
bb5cfa3d0d
|
库存日志页面参数查询调试
|
2024-04-29 18:03:37 +08:00 |
|
zzyuan
|
e3820da708
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-29 17:57:15 +08:00 |
|
zzyuan
|
6d79f0f5e9
|
岗位编号改为序号
|
2024-04-29 17:57:04 +08:00 |
|
mashuai
|
d1ed28a088
|
bug
|
2024-04-29 17:42:02 +08:00 |
 binbin_pan
|
fc4e97d591
|
fix: 1417 设备绑定编码时，绑定几台设备重复展示几次数据
|
2024-04-29 17:38:07 +08:00 |
|
BianLzhaoMin
|
101e0d7ef6
|
页面优化
|
2024-04-29 17:14:44 +08:00 |
|
BianLzhaoMin
|
0cce767acd
|
优化
|
2024-04-29 17:06:02 +08:00 |
syruan
|
7cef74aa24
|
物资LOG日志修订
|
2024-04-29 16:50:07 +08:00 |
|
binbin_pan
|
c64e32b423
|
fix: 1421 输入框出现unknown
|
2024-04-29 15:58:21 +08:00 |
|
BianLzhaoMin
|
38ebf1ded7
|
库存日志页面接口调试 字段回显确认
|
2024-04-29 13:27:26 +08:00 |
|
binbin_pan
|
860b95d5dd
|
1399 基础管理新增页面存在错乱字符
|
2024-04-29 13:21:34 +08:00 |
|
zzyuan
|
f775acb88f
|
前端useNum修改
|
2024-04-29 10:38:57 +08:00 |
|
liang.chao
|
b6ac7ef9f2
|
代码提交
|
2024-04-29 10:35:34 +08:00 |
|
15856
|
bad5c11bdc
|
Merge remote-tracking branch 'origin/dev' into dev-cq-bug
|
2024-04-28 16:41:10 +08:00 |
|
15856
|
0c77aa4e46
|
Merge remote-tracking branch 'origin/dev-cq-bug' into dev-cq-bug
|
2024-04-28 16:23:50 +08:00 |
|
15856
|
660d90550a
|
Bug修复
|
2024-04-28 16:23:43 +08:00 |
|
liang.chao
|
c2aaa44f1b
|
app联调代码提交
|
2024-04-28 16:16:29 +08:00 |
|
BianLzhaoMin
|
f697659bd7
|
优化测试问题
|
2024-04-28 10:28:22 +08:00 |
|
liang.chao
|
a8d0461e37
|
退料申请查询在用量代码提交
|
2024-04-28 09:13:18 +08:00 |
|
zzyuan
|
f0d7d5d7ad
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-26 18:11:22 +08:00 |
|
zzyuan
|
5751307d15
|
退料接收优化zzy
|
2024-04-26 18:11:19 +08:00 |
|
15856
|
f5f2307232
|
Bug修复
|
2024-04-26 17:58:14 +08:00 |
|
liang.chao
|
86c204a632
|
字段别名添加
|
2024-04-26 17:52:15 +08:00 |
|
BianLzhaoMin
|
1131c36f7e
|
Merge branch 'dev-cq-bug' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq-bug
|
2024-04-26 17:51:54 +08:00 |
|
BianLzhaoMin
|
51abc81b1e
|
优化测试问题
|
2024-04-26 17:51:49 +08:00 |
|
binbin_pan
|
c1a578302e
|
fix: 1360 若选择物品种类与设备类型，重置按钮无法重置设备类型内容
|
2024-04-26 17:48:25 +08:00 |
|
zzyuan
|
e10c810281
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-26 17:22:19 +08:00 |
|
zzyuan
|
e95c7585c0
|
前端问题修改（退料申请机具类型选择筛选）
|
2024-04-26 17:22:16 +08:00 |
|
liang.chao
|
bf0992137d
|
成套机具和退料申请当前在用量代码提交
|
2024-04-26 17:00:29 +08:00 |
|
binbin_pan
|
5ea7738ef6
|
fix: 1338 状态显示完成，流程步骤显示确认为灰色
|
2024-04-26 09:45:00 +08:00 |
|
BianLzhaoMin
|
3edb63e8b8
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-25 18:23:44 +08:00 |
|
BianLzhaoMin
|
760a1085b1
|
优化
|
2024-04-25 18:23:40 +08:00 |
|
zzyuan
|
5f80f7e09e
|
前端环境
|
2024-04-25 18:00:54 +08:00 |
|
BianLzhaoMin
|
102c6b52a4
|
增加南网打包配置
|
2024-04-25 17:29:01 +08:00 |
|
zzyuan
|
da35634589
|
Merge branch 'dev-cq-bug' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-25 17:04:12 +08:00 |
|
zzyuan
|
c829701efc
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-25 17:03:59 +08:00 |
|
zzyuan
|
8048fc5ec9
|
Merge branch 'dev-cq-bug' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq-bug
|
2024-04-25 17:03:43 +08:00 |
|
zzyuan
|
dd0845a4d7
|
领料保存报错提示重复
|
2024-04-25 17:03:40 +08:00 |
|
15856
|
5051b6ae92
|
Merge remote-tracking branch 'origin/dev-cq-bug' into dev
|
2024-04-25 16:47:32 +08:00 |