Commit Graph

415 Commits

Author SHA1 Message Date
liang.chao 451b56c0ba 南网oss登录接口修改 2024-01-30 15:06:15 +08:00
1539530615@qq.com bd6e623737 代码规范修改 2024-01-30 14:10:58 +08:00
zhouzy062 c1dc8fe5ec Merge branch 'dev' into test 2024-01-30 13:57:31 +08:00
1539530615@qq.com 8bf9558fc5 问题修改 2024-01-30 13:21:41 +08:00
1539530615@qq.com 44e655e0b6 问题修改 2024-01-30 10:10:58 +08:00
1539530615@qq.com e1dc6d5512 Merge branch 'dev' into test 2024-01-29 17:59:12 +08:00
1539530615@qq.com 2e4972279a 问题修改 2024-01-29 17:58:33 +08:00
1539530615@qq.com def6b77903 问题修改 2024-01-29 17:36:17 +08:00
1539530615@qq.com 50740168aa Merge branch 'dev' into test 2024-01-29 17:20:03 +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
1539530615@qq.com 21ad852102 维修问题修改 2024-01-29 17:11:02 +08:00
bns_han 9e133cacc4 功能完善 2024-01-29 16:51:39 +08:00
bns_han a5a1a16b28 功能完善 2024-01-29 16:49:57 +08:00
bns_han 173a44055f 功能完善 2024-01-29 16:01:02 +08:00
bns_han 8d8101441e 功能完善 2024-01-29 15:59:43 +08:00
bns_han dcb492aee6 功能完善 2024-01-29 15:59:30 +08:00
liang.chao 3097ca3079 南网oss登录接口修改 2024-01-29 14:19:45 +08:00
liang.chao 14238ce4e2 领料审核通过 2024-01-27 13:10:08 +08:00
liang.chao bd16ff1485 单点登录处理 2024-01-27 11:03:18 +08:00
bns_han 008bbc2f28 功能完善 2024-01-26 18:38:50 +08:00
liang.chao b8f6578230 领料审核通过 2024-01-26 16:07:44 +08:00
liang.chao 327460186d 领料审核通过 2024-01-26 13:12:18 +08:00
1539530615@qq.com 3ed2f429a8 Merge branch 'dev' into test 2024-01-26 13:04:22 +08:00
1539530615@qq.com 1839e0537c 报废审核驳回修改 2024-01-26 13:03:26 +08:00
bns_han 57130c2559 功能完善 2024-01-26 11:27:27 +08:00
liang.chao 7c741a45af 线上bug修改 2024-01-25 14:11:30 +08:00
1539530615@qq.com 83dd51fb1c Merge branch 'dev' into test 2024-01-25 13:16:35 +08:00
1539530615@qq.com e62aa0f71c 维修审核驳回修改 2024-01-25 13:16:01 +08:00
liang.chao cffce178a3 登录日志增加用户昵称 2024-01-25 10:35:10 +08:00
liang.chao 12c90475af 领料审核通过 2024-01-25 09:58:08 +08:00
liang.chao e0c1718699 Merge branch 'dev' into test 2024-01-24 19:32:59 +08:00
1539530615@qq.com 214b92688b 漏洞修改 2024-01-24 19:27:55 +08:00
liang.chao 07ab9b64f1 Merge branch 'dev' into test 2024-01-24 18:44:39 +08:00
liang.chao b7f2c3ba4c 领料审核通过 2024-01-24 18:44:10 +08:00
bns_han 96020c4510 功能完善 2024-01-24 18:33:38 +08:00
1539530615@qq.com 24c927baa2 维修审核修改 2024-01-24 18:23:16 +08:00
1539530615@qq.com f8e8651894 维修修改 2024-01-24 16:13:32 +08:00
liang.chao 96b479c2f8 pom打包提交 2024-01-24 14:48:24 +08:00
1539530615@qq.com b0ab60c20f 维修修改 2024-01-24 14:39:17 +08:00
1539530615@qq.com 7370cab29a 维修修改 2024-01-24 14:19:18 +08:00
bns_han 367ad3f33e Merge remote-tracking branch 'origin/test' into dev 2024-01-24 11:30:37 +08:00
bns_han 382bc7b6f3 功能完善 2024-01-24 11:29:30 +08:00
1539530615@qq.com f20bb2ee9b 试验检验审核驳回修改 2024-01-24 11:16:21 +08:00
bns_han fdb6a9e329 功能完善 2024-01-24 09:59:58 +08:00
bns_han 61c5472b16 功能完善 2024-01-23 21:08:23 +08:00
1539530615@qq.com d595a6b80a 试验检验审核驳回修改 2024-01-23 21:07:13 +08:00
liang.chao 88e5c4a21c 头像上传 2024-01-23 16:09:25 +08:00
1539530615@qq.com be37865f2d 工机具图片上传修改 2024-01-23 13:47:10 +08:00
liang.chao bfd206a0b2 代码规范提交 2024-01-23 09:32:21 +08:00
1539530615@qq.com ffbe56adb5 app按钮修改 2024-01-23 09:20:54 +08:00
bns_han b333348e34 功能完善 2024-01-22 21:21:48 +08:00
liang.chao 268c5321e4 代码更新 2024-01-22 21:11:27 +08:00
bns_han 8472f12a30 功能完善 2024-01-22 21:02:51 +08:00
liang.chao e8d5664028 代码更新 2024-01-22 20:30:13 +08:00
liang.chao b5518394da Merge remote-tracking branch 'origin/dev' into dev 2024-01-22 20:29:50 +08:00
bns_han 968d639582 功能完善 2024-01-22 20:23:30 +08:00
liang.chao 30792c9ceb Merge remote-tracking branch 'origin/dev' into dev 2024-01-22 20:03:13 +08:00
liang.chao 76c079249f 配置更新 2024-01-22 20:03:01 +08:00
bns_han 25334526a5 功能完善 2024-01-22 19:56:33 +08:00
1539530615@qq.com 8e015c9bc6 领料出库处理提交 2024-01-22 19:55:27 +08:00
bns_han 62502471e7 功能完善 2024-01-22 18:47:05 +08:00
1539530615@qq.com bc72e60a58 领料出库处理提交 2024-01-22 18:45:49 +08:00
bns_han cf0d751327 功能完善 2024-01-22 18:25:23 +08:00
liang.chao c1f3d612e6 代码还原 2024-01-22 17:42:47 +08:00
1539530615@qq.com faf1b88628 代码规范修改提交 2024-01-22 15:27:57 +08:00
liang.chao a1ae4cc155 系统bug修改 2024-01-22 14:56:07 +08:00
1539530615@qq.com 338f5c7fc6 代码规范修改提交 2024-01-22 14:46:44 +08:00
liang.chao da293da762 领料分页bug修改 2024-01-22 11:08:22 +08:00
liang.chao 97b52206ba 代码规范修改 2024-01-22 10:25:58 +08:00
liang.chao 79361e219f 系统bug修改 2024-01-19 15:57:05 +08:00
bns_han 8509d2bb10 退料审核 2024-01-19 15:07:32 +08:00
bns_han aa3ca8b7c3 退料审核 2024-01-19 14:55:21 +08:00
bns_han 0733651fd4 退料审核 2024-01-19 13:29:02 +08:00
bns_han e229db14af 退料审核 2024-01-19 11:30:59 +08:00
1539530615@qq.com 346333eaac 1/19代码提交 2024-01-19 10:53:02 +08:00
bns_han 809a144923 新购配件入库 2024-01-19 10:24:57 +08:00
liang.chao 75db3516e3 app内部驳回操作 2024-01-18 17:00:26 +08:00
liang.chao 9200a1e869 内部审核添加审核状态 2024-01-18 15:53:08 +08:00
liang.chao 5cb891adf1 内部审核添加审核状态 2024-01-18 15:48:18 +08:00
1539530615@qq.com 8fbedfec49 app首页代码提交 2024-01-18 14:24:09 +08:00
bns_han d9e2109ddb 新购配件 2024-01-17 18:28:39 +08:00
liang.chao 2dcc9c5eb6 内部审核细节划分 2024-01-17 17:49:51 +08:00
liang.chao fa8410f12a app查询单个领料申请单 2024-01-17 13:52:10 +08:00
liang.chao fdd1f813e0 1 2024-01-16 20:08:34 +08:00
liang.chao 5781ddfee2 根据库管员进行领料发放 2024-01-16 20:06:21 +08:00
bns_han cd2e8b32d9 功能完善 2024-01-16 18:21:24 +08:00
bns_han a3dcf55260 新购配件入库 2024-01-16 17:11:57 +08:00
bns_han 8dc5fc562c 功能完善 2024-01-16 17:09:48 +08:00
bns_han 25477c1289 待办事项 2024-01-15 18:49:36 +08:00
1539530615@qq.com a954cbdb30 修试管理代码提交 2024-01-15 16:42:18 +08:00
liang.chao 4d4dfd55b9 app退料驳回 2024-01-15 15:32:06 +08:00
1539530615@qq.com 1b4cbfc091 维修代码提交 2024-01-15 10:51:41 +08:00
liang.chao 579c0bf5b1 领料详情工程不显示问题bug 2024-01-14 14:01:56 +08:00
1539530615@qq.com d54d79ea44 修试入库代码提交 2024-01-12 18:19:22 +08:00
1539530615@qq.com 351ad2904f 后台修试管理代码提交 2024-01-12 18:02:33 +08:00
1539530615@qq.com 8310504c52 后台修试管理代码提交 2024-01-12 17:13:55 +08:00
1539530615@qq.com 1115686d36 后台修试管理代码提交 2024-01-12 17:11:47 +08:00
bns_han d53020f434 功能优化 2024-01-12 17:08:34 +08:00
liang.chao 43c5f53816 Merge remote-tracking branch 'origin/dev' into dev 2024-01-12 17:07:37 +08:00
liang.chao 1450a2b5b1 代码提交 2024-01-12 17:07:30 +08:00