liang.chao
|
713bc6ece2
|
Merge branch 'dev' into test-sso
# Conflicts:
# sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java
# sgzb-ui/vue.config.js
|
2024-01-30 15:09:59 +08:00 |
zhouzy062
|
101dd0e27d
|
前端配置
|
2024-01-30 10:50:26 +08:00 |
|
zhouzy062
|
2ff85222c6
|
登录接口对接
|
2024-01-30 10:35:06 +08:00 |
|
zhouzy062
|
c8511a8e9d
|
前端问题修改
|
2024-01-30 09:16:55 +08:00 |
|
liang.chao
|
9a47a636ab
|
Merge branch 'dev' into test-sso
# Conflicts:
# sgzb-ui/vue.config.js
|
2024-01-29 17:15:36 +08:00 |
|
zhouzy062
|
9352a18f75
|
前端问题修改1.29
|
2024-01-29 17:08:39 +08:00 |
|
zhouzy062
|
ffa76924f2
|
接口变更
|
2024-01-29 14:34:31 +08:00 |
|
zhouzy062
|
14407d7f7e
|
南网登录
|
2024-01-29 10:21:25 +08:00 |
|
zhouzy062
|
e1197aedc1
|
南网打包地址
|
2024-01-26 19:44:33 +08:00 |
|
zhouzy062
|
567732d51e
|
登陆前端代码
|
2024-01-26 19:11:15 +08:00 |
|
liang.chao
|
ddae3a4261
|
Merge branch 'dev' into test-sso
|
2024-01-26 16:09:48 +08:00 |
|
liang.chao
|
b0105ff73f
|
领料审核通过
|
2024-01-26 15:59:51 +08:00 |
|
zhouzy062
|
70fe005e8d
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-01-26 13:08:02 +08:00 |
|
zhouzy062
|
1fd7600a81
|
修改问题提交
|
2024-01-26 13:07:02 +08:00 |
|
zhouzy062
|
2d6b540764
|
Merge branch 'test' of http://192.168.0.56:3000/bonus/devicesmgt into test
|
2024-01-23 20:34:36 +08:00 |
|
zhouzy062
|
49e80e1f1c
|
图片上传及头像
|
2024-01-23 20:33:02 +08:00 |
|
zhouzy062
|
3ccf84651d
|
上传地址优化
|
2024-01-23 13:40:20 +08:00 |
|
zhouzy062
|
629f937be7
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-01-23 10:25:20 +08:00 |
|
zhouzy062
|
7b2d465d72
|
前端问题修改
|
2024-01-23 10:15:48 +08:00 |
|
liang.chao
|
c1f3d612e6
|
代码还原
|
2024-01-22 17:42:47 +08:00 |
|
zhouzy062
|
6b07845e13
|
测试问题修改，导航切换
|
2024-01-22 09:18:46 +08:00 |
|
zhouzy062
|
03819147ae
|
领料列表问题修改
|
2024-01-19 10:36:52 +08:00 |
|
zhouzy062
|
eb1ca9b5d9
|
打印单修改，新购配件验收入库，测试问题修改
|
2024-01-19 10:22:39 +08:00 |
|
zhouzy062
|
dbe3c870af
|
前端流程问题修改
|
2024-01-14 14:51:21 +08:00 |
|
zhouzy062
|
db86f585c0
|
领料，退料，维修1
|
2024-01-12 10:07:35 +08:00 |
|
zhouzy062
|
49320db995
|
导出功能，短信登录，领料模块优化审批
|
2024-01-10 16:29:46 +08:00 |
zhouxain01
|
152226b4e9
|
提交树形搜索
|
2023-12-25 13:37:00 +08:00 |
|
zhouxain01
|
8672cf565d
|
提交修试管理bug
|
2023-12-25 11:29:19 +08:00 |
|
zhouxain01
|
dd7a91b9a7
|
提交树形结构只能选择叶子节点
|
2023-12-25 10:59:28 +08:00 |
|
zhouxain01
|
aabcf222b1
|
提交退库修改字段值新增计量单位unitNames
|
2023-12-25 10:38:00 +08:00 |
|
zhouxain01
|
0e12123327
|
提交退库修改字段值新增计量单位
|
2023-12-25 10:32:21 +08:00 |
|
zhouxain01
|
b427947bbf
|
提交退库修改字段值
|
2023-12-25 10:09:51 +08:00 |
 13218645326
|
d3682b99fc
|
页面优化
|
2023-12-24 21:15:04 +08:00 |
|
zhouzy062
|
88dd16d839
|
后台管理系统前端问题修改
|
2023-12-24 17:54:27 +08:00 |
|
zhouzy062
|
1da8faf169
|
机具问题修改
|
2023-12-24 02:23:07 +08:00 |
|
zhouzy062
|
f90f5bea54
|
机具管理问题修改
|
2023-12-24 00:15:02 +08:00 |
|
zhouxain01
|
82ffd828c1
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-23 23:24:42 +08:00 |
|
zhouxain01
|
922f246362
|
提交退库相关代码
|
2023-12-23 23:24:35 +08:00 |
|
zhouzy062
|
891246c5a9
|
新购机具问题修改
|
2023-12-23 21:41:58 +08:00 |
wlikett
|
419cf70b3b
|
领料申请管理2
|
2023-12-23 19:51:46 +08:00 |
|
zhouzy062
|
5aeed17564
|
前端问题修改
|
2023-12-23 19:42:57 +08:00 |
|
wlikett
|
fd12bca625
|
领料申请管理
|
2023-12-23 18:42:25 +08:00 |
|
zhouzy062
|
3aa081ddd0
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2023-12-23 16:04:01 +08:00 |
|
zhouzy062
|
58bce3e6a3
|
新购机具代码提交
|
2023-12-23 16:03:15 +08:00 |
|
13218645326
|
d18dc7f9c4
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2023-12-23 13:27:12 +08:00 |
|
13218645326
|
cab2ceb199
|
退料申请
|
2023-12-23 13:27:04 +08:00 |
|
zhouzy062
|
1666636cab
|
新购编码管理修改
|
2023-12-22 19:16:39 +08:00 |
|
zhouzy062
|
2700fceceb
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2023-12-22 18:58:23 +08:00 |
|
zhouzy062
|
294fbc4d3e
|
新购编码修改
|
2023-12-22 18:57:52 +08:00 |
|
zhouxain01
|
5adcc35655
|
修改标签绑定按钮判断
|
2023-12-22 18:26:50 +08:00 |