Commit Graph

271 Commits

Author SHA1 Message Date
zhouzy062 15c8119f94 租赁平台登录 2024-02-27 18:02:33 +08:00
FrancisHu 6374843a63 2.27新增查询 2024-02-27 17:01:49 +08:00
zhouzy062 73e07c5bf8 退料 2024-02-27 14:13:21 +08:00
zhouzy062 df24c7e4bf 退料优化 2024-02-27 14:07:01 +08:00
zhouzy062 f77902ad2c 领料申请接口修改 2024-02-27 10:33:50 +08:00
zhouzy062 f42b926b71 Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev 2024-02-26 20:16:24 +08:00
zhouzy062 76ce215d1f 领料管理 2024-02-26 20:16:16 +08:00
bns_han cb2d8a551a 综合查询 2024-02-26 19:28:18 +08:00
zhouzy062 d4c9beff5e 领料审批权限 2024-02-26 18:43:14 +08:00
bonus 1856249b0e 综合查询-领料查询 2024-02-26 14:14:19 +08:00
bonus 2861b288be 综合查询 2024-02-26 14:06:58 +08:00
zhouzy062 ad775627c5 费用结算 2024-02-26 10:17:48 +08:00
liang.chao baa645f36b 退料申请表数据问题修改 2024-02-23 17:26:16 +08:00
zhouzy062 7942e4a93d 领料内部审核前端代码 2024-02-22 13:56:32 +08:00
zhouzy062 51d2ae84ca Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev 2024-02-21 18:28:49 +08:00
zhouzy062 ec04b2770e 新购验收机具配件验收入库驳回 2024-02-21 18:27:47 +08:00
zhouzy062 79ce2d3ce2 前台提交 2024-01-31 13:51:10 +08:00
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
zhouxain01 1a7fac7cb9 修改标签绑定代码提交 2023-12-22 17:29:57 +08:00
zhouxain01 aa2a2a7ab0 Merge remote-tracking branch 'origin/dev' into dev 2023-12-22 17:14:02 +08:00
zhouxain01 5ead43e5df 修改基础管理代码提交 2023-12-22 17:13:57 +08:00
wlikett 7bcd950052 设备级联搜索处理 2023-12-22 15:57:21 +08:00
13218645326 2a4b8420f6 退料 2023-12-22 15:55:19 +08:00
wlikett 9d8bd6d94b 领料任务详情接口对接 对接 2023-12-22 15:33:24 +08:00
zhouxain01 8aa87bdec8 修改标签相关代码 2023-12-22 14:05:57 +08:00
13218645326 5c50ce4706 编辑禁用上级选项 2023-12-21 20:44:28 +08:00
13218645326 4990efa585 Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev 2023-12-21 20:31:37 +08:00
13218645326 2ab516141f 接口调试配件管理 2023-12-21 20:31:22 +08:00
zhouzy062 bb40579796 新购验收编码管理-1221-zzy 2023-12-21 20:24:30 +08:00
wlikett bd608032e0 对接领料申请列表时间字段更新 2023-12-21 17:59:42 +08:00
wlikett 610ec741be 对接领料申请列表 和 提交领料申请 2023-12-21 17:57:21 +08:00
zhouxain01 87f8d807f8 修改修试相关代码 2023-12-21 17:54:28 +08:00
zhouxain01 347520897b 修改文件上传 2023-12-21 10:39:14 +08:00
zhouzy062 0ceae5c33b 上传接口对接 2023-12-21 10:00:48 +08:00
zhouzy062 dd36503472 Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev 2023-12-21 09:59:46 +08:00
zhouxain01 ad8385a9a7 修改页面尺寸 2023-12-20 21:25:30 +08:00
zhouxain01 e6d490f840 修改repairStatusCode 2023-12-20 21:23:05 +08:00
zhouxain01 7bdd7d5cef 基础管理代码提交增加typeId 2023-12-20 20:44:17 +08:00
zhouxain01 bfcbefb516 基础管理代码提交增加id 2023-12-20 20:41:12 +08:00
zhouzy062 532b1c27ad Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev 2023-12-20 20:30:50 +08:00
zhouzy062 57981b50af 前端后台管理修改-1220-zzy 2023-12-20 20:29:06 +08:00
zhouxain01 90660f5a1b 基础管理代码提交 2023-12-20 20:17:03 +08:00
zhouxain01 5d1c802cb6 提交新增接口base 2023-12-20 20:13:27 +08:00
zhouxain01 597be4eb52 新增弹框功能 2023-12-20 13:37:27 +08:00
zhouxain01 70ab2fffd2 提交修改代码 2023-12-20 13:36:52 +08:00
zhouxain01 63741800c3 提交修改代码 2023-12-20 13:36:23 +08:00
zhouxain01 f24fc22ec7 提交修改代码 2023-12-20 13:35:45 +08:00
zhouxain01 ec5c98d53d 提交修改代码 2023-12-20 13:35:15 +08:00
zhouxain01 972945d294 提交修改代码 2023-12-20 13:34:43 +08:00
zhouxain01 89e89ba3e0 提交已修改修试相关代码 2023-12-19 17:05:40 +08:00
zhouxain01 ed81f60582 提交已修改修试相关代码bug 2023-12-19 16:38:35 +08:00
zhouxain01 2a00a61069 提交修试相关代码已修改bug 2023-12-19 16:34:00 +08:00
zhouxain01 e56fc4993a 提交修试相关代码已修改bug 2023-12-19 15:16:00 +08:00
zhouxain01 9eefbb9c23 提交修试相关代码 2023-12-19 15:15:03 +08:00
zhouzy062 fc3027e160 前端后台管理提交12-19-zzy 2023-12-19 04:26:18 +08:00
zhouxain01 8fa742fb8c 提交修试代码 2023-12-18 18:54:46 +08:00
zhouxian b28eb2dc4f 提交修试代码 2023-12-18 18:49:33 +08:00
zhouxian c31b209a1b 提交修试代码 2023-12-18 18:48:17 +08:00
zhouxian b1abc0354d 提交修试代码 2023-12-18 18:33:36 +08:00
zhouxian 9716592887 提交修试代码 2023-12-18 18:31:36 +08:00
zhouxian 073e11c34c 提交修试代码 2023-12-18 18:27:54 +08:00
zhouxian 2d8d542967 提交修试代码 2023-12-18 18:24:34 +08:00
zhouxian d87308f247 提交修试代码 2023-12-18 18:19:19 +08:00
zhouxian d4de19921c 提交修试代码 2023-12-18 18:14:28 +08:00
zhouxian 3a270f21a0 提交修试相关代码 2023-12-18 18:12:02 +08:00
zhouxian f56e2e872a 提交修试相关代码 2023-12-18 18:10:04 +08:00
zhouxian e5a1caa356 提交修试相关代码 2023-12-18 17:47:47 +08:00
zhouxian b2dcd6be48 提交修试相关代码 2023-12-18 17:43:35 +08:00
zhouzy062 b12e79209b 前端代码接口对接 2023-12-16 23:00:28 +08:00
zhouzy062 bf414d519c 前端接口对接-基础,仓储模块-12-16 2023-12-16 14:48:20 +08:00
zhouzy062 7e3a300a31 前端页面提交 2023-12-12 13:36:08 +08:00
bonus 8920821ac5 项目第一次上传git 2023-11-28 20:33:38 +08:00