Commit Graph

1202 Commits

Author SHA1 Message Date
binbin_pan f07c7663c9 fix: 1451 维修详情里的序号显示NaN 2024-05-06 15:50:11 +08:00
liang.chao 33cce0d866 退料审核代码提交 2024-05-06 09:57:28 +08:00
liang.chao 52745e9a4e 退料审核代码提交 2024-05-06 09:42:49 +08:00
15856 834faeee43 Merge remote-tracking branch 'origin/dev-cq-bug' into dev 2024-04-30 17:51:44 +08:00
BianLzhaoMin 571771bcac Merge branch 'dev-cq-bug' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq-bug 2024-04-30 17:50:39 +08:00
BianLzhaoMin f511ad6292 优化测试问题 2024-04-30 17:50:34 +08:00
liang.chao bc8420e094 bug修改提交 2024-04-30 16:43:40 +08:00
binbin_pan 18168f0c46 删除重复接口 2024-04-30 15:59:35 +08:00
binbin_pan e1d74486b7 fix: 1443 出库的状态与出库状态下拉框中数据不对应 2024-04-30 15:50:36 +08:00
mashuai 1ed94a6706 bug 2024-04-30 15:14:27 +08:00
BianLzhaoMin 43b159ca72 Merge branch 'dev-cq-bug' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq-bug 2024-04-30 15:10:43 +08:00
BianLzhaoMin 0634f707d1 优化二级库表单重置bug 2024-04-30 15:10:40 +08:00
binbin_pan c3f97d83d4 fix: 1441 单位类型中第二页的数据,在往来单位新增页面下拉框不展示 2024-04-30 15:06:04 +08:00
hhui 62a7113b70 Merge remote-tracking branch 'origin/dev-cq-bug' into dev 2024-04-30 15:03:10 +08:00
hhui 8514069663 feat:抱杆台账查询页面接口联调 2024-04-30 14:58:02 +08:00
15856 9bc4bc2f6e Merge remote-tracking branch 'origin/dev' into dev 2024-04-30 14:32:33 +08:00
15856 25f84100e6 bug修复 2024-04-30 14:32:17 +08:00
liang.chao 1030c78305 app领料申请详情bug提交 2024-04-30 14:09:40 +08:00
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