 zzyuan
|
94deba2140
|
退料接收数量反显
|
2024-05-06 17:07:08 +08:00 |
liang.chao
|
0cce5cc793
|
退料审核代码提交
|
2024-05-06 17:07:03 +08:00 |
 binbin_pan
|
f70f0462d6
|
fix: 1458 内部维修字段必填项，没有f必填项标识
|
2024-05-06 17:06:10 +08:00 |
 hhui
|
d1d7c93872
|
fix:bug修改
|
2024-05-06 17:03:01 +08:00 |
|
hhui
|
6015dd0ae5
|
fix:bug修改
|
2024-05-06 16:49:45 +08:00 |
|
binbin_pan
|
8a67438b15
|
fix: 1453 退料审核时被驳回，驳回后修改数据再次提交，审核时查看的数据依然是驳回前的数据
|
2024-05-06 16:42:25 +08:00 |
|
binbin_pan
|
3e75f58a59
|
fix: 1468 无法进行勾选数据准确导出
|
2024-05-06 16:32:20 +08:00 |
BianLzhaoMin
|
369c0c95c1
|
Merge branch 'dev-cq-bug' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq-bug
|
2024-05-06 16:18:08 +08:00 |
|
BianLzhaoMin
|
ad4cda739b
|
测试bug优化
|
2024-05-06 16:18:05 +08:00 |
|
binbin_pan
|
f07c7663c9
|
fix: 1451 维修详情里的序号显示NaN
|
2024-05-06 15:50:11 +08:00 |
|
BianLzhaoMin
|
54c2460965
|
Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx
|
2024-05-06 15:21:41 +08:00 |
|
BianLzhaoMin
|
83f78e85c8
|
页面优化
|
2024-05-06 15:21:37 +08:00 |
 15856
|
40736e1c85
|
催办，退料报废，维修报废，预报废审核，报废审核
|
2024-05-06 10:35:08 +08:00 |
|
15856
|
382a4fb6a1
|
Merge remote-tracking branch 'origin/dev-nx' into dev-nx
|
2024-05-06 10:33:55 +08:00 |
 mashuai
|
4c8a65cd54
|
大屏
|
2024-05-06 10:04:58 +08:00 |
|
liang.chao
|
33cce0d866
|
退料审核代码提交
|
2024-05-06 09:57:28 +08:00 |
|
BianLzhaoMin
|
3501c258f7
|
代码合并 宁夏
|
2024-05-06 09:51:10 +08:00 |
|
15856
|
2ee57ad53f
|
Merge remote-tracking branch 'origin/dev-nx' into dev-nx
|
2024-05-06 09:51:01 +08:00 |
|
BianLzhaoMin
|
86935fa01f
|
代码合并 宁夏
|
2024-05-06 09:49:54 +08:00 |
|
BianLzhaoMin
|
688599a5b0
|
宁夏 冲突合并
|
2024-05-06 09:48:15 +08:00 |
|
liang.chao
|
52745e9a4e
|
退料审核代码提交
|
2024-05-06 09:42:49 +08:00 |
|
15856
|
ef45941890
|
Merge remote-tracking branch 'origin/dev-nx' into dev-nx
|
2024-05-06 09:28:40 +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 |