liang.chao
|
6ffe2fb057
|
Merge remote-tracking branch 'origin/dev-cq-bug' into dev
# Conflicts:
# sgzb-ui/src/views/claimAndRefund/constructionSite/constructionSite.vue
# sgzb-ui/src/views/claimAndRefund/receive/receiveApply.vue
# sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApply.vue
|
2024-04-24 14:08:35 +08:00 |
 zzyuan
|
2ef3d4dbe4
|
前端退料接收编码退料
|
2024-04-23 14:53:54 +08:00 |
|
zzyuan
|
d2d9f5b6c4
|
退料接收按钮判断
|
2024-04-23 14:35:31 +08:00 |
|
zzyuan
|
6e6420c65c
|
前端修改问题修改
|
2024-04-23 13:44:50 +08:00 |
|
zzyuan
|
2a164bfcca
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-23 10:41:52 +08:00 |
|
zzyuan
|
a21e52816b
|
领料申请2
|
2024-04-23 10:41:45 +08:00 |
BianLzhaoMin
|
4408191900
|
无效json文件删除
|
2024-04-23 10:29:56 +08:00 |
|
liang.chao
|
62f2330ffb
|
成套机具代码提交
|
2024-04-23 09:19:37 +08:00 |
|
zzyuan
|
10994deeb4
|
退料接收3
|
2024-04-22 16:07:48 +08:00 |
|
zzyuan
|
06655c5eff
|
退料接收修改2
|
2024-04-22 15:47:54 +08:00 |
|
zzyuan
|
9d072eea63
|
退料接收判断
|
2024-04-22 14:28:40 +08:00 |
 binbin_pan
|
546eb704fb
|
退料接收管理-退料审核-批量审核
|
2024-04-22 10:07:03 +08:00 |
|
binbin_pan
|
62c669aa9f
|
fix: bug修复
|
2024-04-20 17:55:12 +08:00 |
|
zzyuan
|
8c7453aa23
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-20 17:03:39 +08:00 |
|
zzyuan
|
562bb16f2f
|
工地直转
|
2024-04-20 17:03:35 +08:00 |
|
binbin_pan
|
34aafe3095
|
fix: 退料接收管理-退料审核-工机具类型下拉框
|
2024-04-20 15:20:39 +08:00 |
|
BianLzhaoMin
|
b9d2ebd10a
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-20 14:54:34 +08:00 |
|
BianLzhaoMin
|
97e554d6ac
|
测试问题修改
|
2024-04-20 14:54:26 +08:00 |
|
binbin_pan
|
09f732bae0
|
fix: 退料接收管理-退料状态下拉项
|
2024-04-20 14:46:12 +08:00 |
|
zzyuan
|
4520e6d1bf
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-20 14:31:49 +08:00 |
|
zzyuan
|
e95c1acf6b
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-20 14:31:46 +08:00 |
 jackal
|
1a30d552ad
|
fix：协议管理导出修改
|
2024-04-20 14:30:43 +08:00 |
|
zzyuan
|
8dc56bcde9
|
前端领退料模块问题修改
|
2024-04-20 14:29:59 +08:00 |
|
jackal
|
0da44483df
|
fix:退料申请bug修改
|
2024-04-20 14:10:33 +08:00 |
|
binbin_pan
|
4d774e44c9
|
fix: 退料接收管理-退料申请-重置时间
|
2024-04-20 11:12:37 +08:00 |
|
jackal
|
9ae1c69f71
|
fix:协议管理bug修改
|
2024-04-20 10:48:36 +08:00 |
|
zzyuan
|
7b312fbffc
|
前端问题修改
|
2024-04-20 10:39:36 +08:00 |
|
zzyuan
|
ae327449a3
|
领退料问题修改
|
2024-04-20 10:23:04 +08:00 |
|
jackal
|
e4239f4955
|
fix:退料接受详情修改
|
2024-04-19 17:31:55 +08:00 |
|
binbin_pan
|
bcf6710e01
|
领料申请-重置查询条件修复
|
2024-04-19 10:45:11 +08:00 |
|
jackal
|
1471b2c4ea
|
fix:领料出库页面出库按钮权限修改
|
2024-04-18 16:32:11 +08:00 |
|
jackal
|
a242f47045
|
fix:修改
|
2024-04-18 13:58:13 +08:00 |
|
jackal
|
edbc58d08d
|
feat:领料管理添加子数据展示
|
2024-04-17 13:51:05 +08:00 |
|
BianLzhaoMin
|
75c19d0d51
|
优化领料任务申请时保存bug
|
2024-04-17 13:23:05 +08:00 |
|
zzyuan
|
c93b3fa75a
|
退料接收撤回功能
|
2024-04-15 17:47:54 +08:00 |
|
zzyuan
|
8bb53bf1d1
|
测试问题修改
|
2024-04-12 17:20:16 +08:00 |
|
zzyuan
|
a34c0f55e2
|
领退了测试问题修改
|
2024-04-12 13:18:29 +08:00 |
|
binbin_pan
|
e139c80eb3
|
退料申请+重庆-当前在用量无显示修复
|
2024-04-11 14:18:36 +08:00 |
zhouzy062
|
b6e5577d7b
|
领料审批修改2
|
2024-04-11 14:04:37 +08:00 |
|
BianLzhaoMin
|
ffaf9ccc18
|
优化日期查询 重置清空查询问题
|
2024-04-11 11:30:14 +08:00 |
|
jackal
|
6f9a52bece
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-11 09:44:41 +08:00 |
|
jackal
|
5d7df9f110
|
fix:协议管理页面无法预览附件图片
|
2024-04-11 09:43:05 +08:00 |
|
BianLzhaoMin
|
dd057e25e6
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-10 17:27:24 +08:00 |
|
BianLzhaoMin
|
95fd6e0a11
|
优化bug
|
2024-04-10 17:24:03 +08:00 |
|
zhouzy062
|
c69a2e9f5e
|
前端修改
|
2024-04-10 17:19:06 +08:00 |
|
zhouzy062
|
9e17aa838f
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-10 17:11:30 +08:00 |
|
zhouzy062
|
47b20769eb
|
测试问题前端修改
|
2024-04-10 17:04:07 +08:00 |
|
binbin_pan
|
b9dd07af15
|
领料出库-协议管理-修复输入框自动填充
|
2024-04-10 16:14:53 +08:00 |
|
jackal
|
c58b78a130
|
fix:协议管理页面编辑按钮失效修改
|
2024-04-10 16:01:12 +08:00 |
|
BianLzhaoMin
|
7671165df5
|
优化重置表单查询条件时，表单内容无法选择问题
|
2024-04-10 14:47:42 +08:00 |