 zzyuan
|
4af501532f
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-24 14:10:21 +08:00 |
|
zzyuan
|
580e3a851a
|
退料接收1
|
2024-04-24 14:10:08 +08:00 |
liang.chao
|
37d0365868
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# sgzb-ui/vue.config.js
|
2024-04-24 14:09:26 +08:00 |
|
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 |
 jackal
|
a34c11e3bf
|
feat:抱杆明细弹窗组件开发
|
2024-04-24 11:27:59 +08:00 |
|
jackal
|
ae0b637828
|
fix：新购工机具入库审核状态修改
|
2024-04-23 16:16:08 +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
|
3e1db1b125
|
限制输入字数
|
2024-04-22 12:04:29 +08:00 |
|
zzyuan
|
6e1c80d8b0
|
前端修改zzy
|
2024-04-22 11:24:04 +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
|
45d551f864
|
fix: 岗位管理
|
2024-04-20 16:42:41 +08:00 |
|
binbin_pan
|
f2fe043738
|
fix: 往来单位管理-下拉框校验修复
|
2024-04-20 15:57:47 +08:00 |
|
binbin_pan
|
06ad1af47d
|
fix: 用户管理-增加导入失败的原因
|
2024-04-20 15:34:19 +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 |
|
jackal
|
f080f72c32
|
fix:去除不通过原因字段
|
2024-04-20 14:53:47 +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
|
0d457afa9d
|
fix: 仓库管理-仓库货架管理-编辑下拉框报错
|
2024-04-20 14:01:11 +08:00 |
|
jackal
|
5a88bafd89
|
fix:配件新购入库bug修改
|
2024-04-20 13:41:35 +08:00 |
|
binbin_pan
|
66f8df4fba
|
fix: 标签绑定管理-标签绑定管理-设置禁用项
|
2024-04-20 13:40:04 +08:00 |
|
jackal
|
3efa283b3c
|
fix:修改pickerOptions方法，日期可选今天及以后
|
2024-04-20 13:10:30 +08:00 |
|
jackal
|
b8ff950a16
|
fix:新购工机具入库bug修改
|
2024-04-20 13:00:37 +08:00 |
|
jackal
|
c39b231e09
|
fix:新购机具管理bug修改
|
2024-04-20 12:23:39 +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
|
c2dc2a5d40
|
抱杆配套管理
|
2024-04-19 11:08:25 +08:00 |
|
binbin_pan
|
bcf6710e01
|
领料申请-重置查询条件修复
|
2024-04-19 10:45:11 +08:00 |
|
binbin_pan
|
03ae671f7b
|
抱杆配套管理
|
2024-04-18 17:43:56 +08:00 |
|
jackal
|
4fdcf91a45
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-18 16:32:16 +08:00 |
|
jackal
|
1471b2c4ea
|
fix:领料出库页面出库按钮权限修改
|
2024-04-18 16:32:11 +08:00 |
|
binbin_pan
|
fc5aad9205
|
抱杆配套管理
|
2024-04-18 15:34:34 +08:00 |
|
jackal
|
a242f47045
|
fix:修改
|
2024-04-18 13:58:13 +08:00 |
|
binbin_pan
|
73637df9ac
|
盘点入库
|
2024-04-17 15:08:09 +08:00 |
|
binbin_pan
|
2dcbb2a6d3
|
盘点入库
|
2024-04-17 15:04:37 +08:00 |
|
jackal
|
edbc58d08d
|
feat:领料管理添加子数据展示
|
2024-04-17 13:51:05 +08:00 |
|
BianLzhaoMin
|
910e64ea51
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-17 13:23:10 +08:00 |
|
BianLzhaoMin
|
75c19d0d51
|
优化领料任务申请时保存bug
|
2024-04-17 13:23:05 +08:00 |
|
binbin_pan
|
e237ae54fa
|
抱杆配套管理
|
2024-04-17 11:16:29 +08:00 |
|
binbin_pan
|
84b7346386
|
盘点入库
|
2024-04-17 10:48:59 +08:00 |
|
binbin_pan
|
9deec6f550
|
抱杆配套管理
|
2024-04-16 18:01:02 +08:00 |
|
binbin_pan
|
2640c40b17
|
抱杆配套管理
|
2024-04-16 17:28:02 +08:00 |
|
zzyuan
|
c93b3fa75a
|
退料接收撤回功能
|
2024-04-15 17:47:54 +08:00 |
 hayu
|
b91aeb2ccf
|
新购入库问题修改
|
2024-04-15 09:40:05 +08:00 |
|
hayu
|
273780187a
|
新购入库问题修改
|
2024-04-13 13:31:25 +08:00 |
|
zzyuan
|
8bb53bf1d1
|
测试问题修改
|
2024-04-12 17:20:16 +08:00 |
|
jackal
|
5eb3fdf54a
|
fix:去除debugger
|
2024-04-12 17:11:36 +08:00 |
|
BianLzhaoMin
|
c83193c9a9
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-12 14:56:24 +08:00 |
|
BianLzhaoMin
|
1c89edaa77
|
优化测试bug
|
2024-04-12 14:56:20 +08:00 |
|
jackal
|
02d80977fe
|
feat:计划管理计划借调管理页面导出功能
|
2024-04-12 14:25:41 +08:00 |
|
binbin_pan
|
3fea17aa5e
|
标签绑定管理-需求隐藏解绑按钮
|
2024-04-12 13:22:30 +08:00 |
|
jackal
|
af2ac1b0b2
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-12 13:18:54 +08:00 |
|
zzyuan
|
a34c0f55e2
|
领退了测试问题修改
|
2024-04-12 13:18:29 +08:00 |
|
jackal
|
21005bbfed
|
feat:计划借调列表查询接口联调
|
2024-04-12 13:16:05 +08:00 |
zhouzy062
|
4683c1ca32
|
固定编码修改-zzy
|
2024-04-12 09:15:40 +08:00 |
|
jackal
|
3face37c91
|
feat:计划借调管理接口联调
|
2024-04-11 18:01:25 +08:00 |
|
BianLzhaoMin
|
02d87beddb
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-11 16:41:59 +08:00 |
|
BianLzhaoMin
|
65d7677fe6
|
日志管理页面接口添加
|
2024-04-11 16:41:47 +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
|
28d34ce4fa
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-11 11:30:18 +08:00 |
|
BianLzhaoMin
|
ffaf9ccc18
|
优化日期查询 重置清空查询问题
|
2024-04-11 11:30:14 +08:00 |
|
binbin_pan
|
a8a98ce041
|
领料查询-表单重置修复
|
2024-04-11 10:46:32 +08:00 |
|
BianLzhaoMin
|
ab0426e0f8
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-11 10:44:00 +08:00 |
|
BianLzhaoMin
|
47e5291148
|
修改结算管理金额展示问题
|
2024-04-11 10:41:14 +08:00 |
|
binbin_pan
|
0f1474569f
|
仓库管理-货架配置管理-查询修复
|
2024-04-11 09:47:04 +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 |
|
binbin_pan
|
5d53605f80
|
标段工程管理-修复新增按钮多次提交
|
2024-04-10 17:30:49 +08:00 |
|
BianLzhaoMin
|
dbae114b07
|
优化bug
|
2024-04-10 17:29:44 +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 |
|
binbin_pan
|
4ed4059fc2
|
工程项目管理-修复新增按钮多次提交
|
2024-04-10 17:22:09 +08:00 |
|
zhouzy062
|
c69a2e9f5e
|
前端修改
|
2024-04-10 17:19:06 +08:00 |
|
zhouzy062
|
eff89495bd
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-10 17:11:33 +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 |
|
binbin_pan
|
1a01065287
|
单位类型管理-修复新增按钮多次提交
|
2024-04-10 17:04:07 +08:00 |
|
zhouzy062
|
47b20769eb
|
测试问题前端修改
|
2024-04-10 17:04:07 +08:00 |
|
binbin_pan
|
f29da14bac
|
往来单位管理-修复新增按钮多次提交
|
2024-04-10 16:48:20 +08:00 |
|
binbin_pan
|
b9dd07af15
|
领料出库-协议管理-修复输入框自动填充
|
2024-04-10 16:14:53 +08:00 |
|
jackal
|
c58b78a130
|
fix:协议管理页面编辑按钮失效修改
|
2024-04-10 16:01:12 +08:00 |
|
jackal
|
ab8bd22d41
|
fix：计划管理
|
2024-04-10 15:12:25 +08:00 |
|
jackal
|
5443d78201
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-10 15:09:48 +08:00 |
|
BianLzhaoMin
|
7ef5aa2fb5
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-10 14:47:52 +08:00 |
|
BianLzhaoMin
|
7671165df5
|
优化重置表单查询条件时，表单内容无法选择问题
|
2024-04-10 14:47:42 +08:00 |
|
binbin_pan
|
bb8d41c879
|
往来单位管理-不能导出选中数据 修复
|
2024-04-10 14:43:40 +08:00 |
|
BianLzhaoMin
|
f832eb9f35
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-10 10:46:59 +08:00 |
|
BianLzhaoMin
|
e2acd9e40e
|
新增库存日志页面
|
2024-04-10 10:46:48 +08:00 |
|
zhouzy062
|
18bb04f1f7
|
领料接口对接
|
2024-04-09 17:51:39 +08:00 |
|
jackal
|
ad2c9e0db4
|
feat：计划管理新增页面开发
|
2024-04-09 15:10:31 +08:00 |
|
zhouzy062
|
95918a1669
|
退料接收接口对接
|
2024-04-08 17:21:40 +08:00 |
|
zhouzy062
|
a40363f3e5
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-08 09:01:57 +08:00 |
|
zhouzy062
|
2c9bf10d8f
|
前端上线代码优化
|
2024-04-08 09:01:54 +08:00 |
|
binbin_pan
|
5337305463
|
退料入库
|
2024-04-07 17:59:33 +08:00 |
|
binbin_pan
|
d936851fb6
|
退料入库
|
2024-04-07 17:46:16 +08:00 |
|
binbin_pan
|
816857a29d
|
退料入库
|
2024-04-07 15:32:29 +08:00 |
|
zhouzy062
|
4a5d3f299d
|
重庆领料审批前端修改
|
2024-04-07 14:26:47 +08:00 |
|
zhouzy062
|
943c8b60f5
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-07 09:39:35 +08:00 |
|
zhouzy062
|
597c6cfc96
|
测试问题修改
|
2024-04-07 09:39:32 +08:00 |
|
binbin_pan
|
e5cf171d6d
|
数量盘点入库-优化
|
2024-04-03 16:48:59 +08:00 |
 songyang
|
86f62f4921
|
修改新购验收通知参数
|
2024-04-03 16:41:20 +08:00 |
|
binbin_pan
|
9c8f44ff9f
|
数量盘点入库-优化
|
2024-04-03 15:02:34 +08:00 |
|
binbin_pan
|
126b500775
|
数量盘点入库-优化
|
2024-04-03 14:55:53 +08:00 |
|
binbin_pan
|
764d4acd98
|
数量盘点入库-优化
|
2024-04-03 14:53:03 +08:00 |
|
binbin_pan
|
46bf52d9e9
|
数量盘点入库-优化
|
2024-04-03 14:21:13 +08:00 |
|
binbin_pan
|
d141256dd7
|
数量盘点入库-优化
|
2024-04-03 10:53:52 +08:00 |
|
binbin_pan
|
2412194ab7
|
数量盘点入库-优化
|
2024-04-03 10:21:28 +08:00 |
|
binbin_pan
|
97b772d3dd
|
数量盘点入库-优化
|
2024-04-03 09:44:28 +08:00 |
|
zhouzy062
|
2aa900e10a
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-03 09:41:26 +08:00 |
|
zhouzy062
|
c6659d1167
|
机具类型添加厂家规格型号字段
|
2024-04-03 09:41:11 +08:00 |
|
binbin_pan
|
a8b1b32475
|
数量盘点入库
|
2024-04-03 09:23:27 +08:00 |
|
zhouzy062
|
5ed70b45b1
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-02 17:56:01 +08:00 |
|
zhouzy062
|
fe5d75a7db
|
退料接收页面
|
2024-04-02 17:55:56 +08:00 |
|
hayu
|
91a60339bc
|
综合查询-维修查询
|
2024-04-02 17:52:06 +08:00 |
|
zhouzy062
|
7da7ea0309
|
计划借调页面修改
|
2024-04-02 17:47:23 +08:00 |
|
zhouzy062
|
eead748fae
|
宁夏打包发布0402
|
2024-04-02 16:02:22 +08:00 |
|
zhouzy062
|
6060f6f0fb
|
前端修改
|
2024-04-02 13:54:49 +08:00 |
|
zhouzy062
|
f5bf791b1a
|
领料出库功能完善
|
2024-04-02 13:36:48 +08:00 |
|
zhouzy062
|
956cfee621
|
领料出库前端修改
|
2024-04-02 11:13:18 +08:00 |
|
binbin_pan
|
37c2e8ae11
|
数量盘点入库
|
2024-04-02 09:32:23 +08:00 |
|
binbin_pan
|
e8969befbc
|
数量盘点入库
|
2024-04-02 09:32:23 +08:00 |
|
binbin_pan
|
2cba276c88
|
编码盘点入库
|
2024-04-02 09:32:23 +08:00 |
|
zhouzy062
|
3478b57bd8
|
领料更改4
|
2024-04-02 09:32:23 +08:00 |
|
zhouzy062
|
1e633456e2
|
领料出库修改3
|
2024-04-02 09:32:23 +08:00 |
|
zhouzy062
|
2a649e921e
|
大屏跳转地址
|
2024-04-01 10:24:45 +08:00 |
|
zhouzy062
|
99c0691998
|
领料出库修改
|
2024-04-01 10:04:37 +08:00 |
|
zhouzy062
|
6fe77a66f9
|
领料出库接口参数
|
2024-04-01 09:56:14 +08:00 |
|
zhouzy062
|
4f88dd2bd8
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-01 09:44:36 +08:00 |
|
zhouzy062
|
9180e1386e
|
领料出库接口
|
2024-04-01 09:44:33 +08:00 |
|
binbin_pan
|
191d5d3e00
|
编码盘点入库
|
2024-03-29 15:18:28 +08:00 |