bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,369 Commits 17 Branches 0 Tags 43 MiB
Commit Graph

543 Commits

Author SHA1 Message Date
赵福海 0000bf3752 Merge remote-tracking branch 'origin/dev' into dev-cq 
# Conflicts:
#	sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java
#	sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/SavePutInfoDto.java
#	sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/InventoryAndWarehousingMapper.java
#	sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/InventoryAndWarehousingServiceImpl.java
#	sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysSmsServiceImpl.java
#	sgzb-ui/package.json
#	sgzb-ui/prettier.config.js
#	sgzb-ui/src/router/index.js
#	sgzb-ui/src/utils/request.js
#	sgzb-ui/src/views/base/comeAndGo/index.vue
#	sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApply.vue
#	sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApplyAddByCq.vue
#	sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveManage.vue
#	sgzb-ui/src/views/login.vue
#	sgzb-ui/src/views/repairTest/repair/dialogOneForm.vue
#	sgzb-ui/src/views/store/newBuy/newDevices/newDevicesArrival.vue
#	sgzb-ui/src/views/store/tools/keeper.vue
#	sgzb-ui/src/views/system/user/index.vue
#	sgzb-ui/vue.config.js
 2024-05-31 15:19:38 +08:00
BianLzhaoMin 397b31a548 优化手机号码登录时图形验证码校验问题 2024-05-27 15:40:46 +08:00
BianLzhaoMin 8290727283 优化手机登录时图形验证码校验问题 2024-05-27 15:34:25 +08:00
BianLzhaoMin 4a1b0e8c54 优化手机号码登录时校验验证码的问题 2024-05-27 14:42:19 +08:00
BianLzhaoMin 80feb4032b 页面样式优化 优化新建往来单位时单位类型不全问题 2024-05-27 09:44:17 +08:00
binbin_pan a26ee4143a fix: 1661 新购机具增加采购单时“采购人”无法选择，且采购人员无法添加，采购人下拉框能够选择“请选择”字段 2024-05-25 12:23:15 +08:00
binbin_pan 1821f36767 密码明文加密 2024-05-24 19:31:29 +08:00
binbin_pan abcb736322 密码明文加密 2024-05-24 19:04:39 +08:00
binbin_pan 5fdccef83d fix: 1672 库管员配置中未绑定的设备亦可解绑，建议未绑定时隐藏“解绑”按钮 2024-05-24 16:35:12 +08:00
binbin_pan 7a17cccd1c fix: 1665 配件名称输入框为空时提示错误 2024-05-24 15:29:16 +08:00
binbin_pan 1d99cc5561 fix: 1482 内部维修中选择配件输入框提示“选择上级” 2024-05-24 15:08:24 +08:00
binbin_pan 1e9479a9d6 密码加密+增加密码重置页 2024-05-24 09:35:06 +08:00
binbin_pan 21068b0b60 限制头像上传图片格式 2024-05-23 14:23:51 +08:00
binbin_pan 68c2cd6097 fix: 用户密码明文传输漏洞 2024-05-22 15:20:05 +08:00
binbin_pan de0ae37060 修改密码增加校验 2024-05-17 14:26:49 +08:00
BianLzhaoMin f31c01c045 优化流程 2024-05-08 17:43:00 +08:00
BianLzhaoMin 360f2fc5cc 优化权限流程问题 2024-05-08 17:26:31 +08:00
BianLzhaoMin 3db5bbb1f0 优化权限流程 2024-05-08 16:50:01 +08:00
BianLzhaoMin 1272ccda12 优化流程 2024-05-08 15:59:37 +08:00
BianLzhaoMin 8731cdc995 优化 2024-05-07 21:17:16 +08:00
BianLzhaoMin d0d700208f 优化 2024-05-07 17:37:03 +08:00
BianLzhaoMin f6c1bdb1c7 冲突合并 2024-05-07 16:38:53 +08:00
BianLzhaoMin 2463392124 测试问题优化 2024-05-07 16:31:07 +08:00
BianLzhaoMin b340c8ec01 Merge branch 'dev-cq-bug' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq-bug 2024-05-07 11:14:15 +08:00
BianLzhaoMin 5a7856a150 测试问题优化 2024-05-07 11:14:11 +08:00
binbin_pan b5e0736479 fix: 1478 待报废中，先输写必填项内容，再将内容删除，点击保存按钮，页面提示操作成功 2024-05-07 09:15:23 +08:00
BianLzhaoMin 4686425fbb 冲突合并 2024-05-06 19:37:14 +08:00
BianLzhaoMin bbd4cd5409 优化测试问题 2024-05-06 19:32:16 +08:00
hhui b86f8fd839 fix:报废明细图片添加无数据展示 2024-05-06 17:56:22 +08:00
binbin_pan 2051c7c8d2 fix: 1474 待报废上传图片时，若选择超过3张图片，弹出2次提示 2024-05-06 17:52:21 +08:00
hhui e3c493cfaf fix:修饰入库查询清空 2024-05-06 17:49:02 +08:00
hhui 40ec1a1fc7 fix:维修数量校验 2024-05-06 17:34:41 +08:00
binbin_pan f502ec3294 fix: 1454 内部维修只能添加配件不能删除多余页 2024-05-06 17:30:53 +08:00
liang.chao d3ecfdeaa0 Merge branch 'dev' into dev-cq-bug 2024-05-06 17:09:37 +08:00
zzyuan 94deba2140 退料接收数量反显 2024-05-06 17:07:08 +08:00
binbin_pan f70f0462d6 fix: 1458 内部维修字段必填项，没有f必填项标识 2024-05-06 17:06:10 +08:00
hhui d1d7c93872 fix:bug修改 2024-05-06 17:03:01 +08:00
hhui 6015dd0ae5 fix:bug修改 2024-05-06 16:49:45 +08:00
binbin_pan 8a67438b15 fix: 1453 退料审核时被驳回，驳回后修改数据再次提交，审核时查看的数据依然是驳回前的数据 2024-05-06 16:42:25 +08:00
binbin_pan 3e75f58a59 fix: 1468 无法进行勾选数据准确导出 2024-05-06 16:32:20 +08:00
BianLzhaoMin 369c0c95c1 Merge branch 'dev-cq-bug' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq-bug 2024-05-06 16:18:08 +08:00
BianLzhaoMin ad4cda739b 测试bug优化 2024-05-06 16:18:05 +08:00
binbin_pan f07c7663c9 fix: 1451 维修详情里的序号显示NaN 2024-05-06 15:50:11 +08:00
BianLzhaoMin 83f78e85c8 页面优化 2024-05-06 15:21:37 +08:00
BianLzhaoMin 3501c258f7 代码合并 宁夏 2024-05-06 09:51:10 +08:00
BianLzhaoMin 86935fa01f 代码合并 宁夏 2024-05-06 09:49:54 +08:00
BianLzhaoMin 688599a5b0 宁夏 冲突合并 2024-05-06 09:48:15 +08:00
15856 834faeee43 Merge remote-tracking branch 'origin/dev-cq-bug' into dev 2024-04-30 17:51:44 +08:00
BianLzhaoMin 571771bcac Merge branch 'dev-cq-bug' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq-bug 2024-04-30 17:50:39 +08:00
BianLzhaoMin f511ad6292 优化测试问题 2024-04-30 17:50:34 +08:00
binbin_pan e1d74486b7 fix: 1443 出库的状态与出库状态下拉框中数据不对应 2024-04-30 15:50:36 +08:00
BianLzhaoMin 43b159ca72 Merge branch 'dev-cq-bug' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq-bug 2024-04-30 15:10:43 +08:00
BianLzhaoMin 0634f707d1 优化二级库表单重置bug 2024-04-30 15:10:40 +08:00
binbin_pan c3f97d83d4 fix: 1441 单位类型中第二页的数据，在往来单位新增页面下拉框不展示 2024-04-30 15:06:04 +08:00
hhui 62a7113b70 Merge remote-tracking branch 'origin/dev-cq-bug' into dev 2024-04-30 15:03:10 +08:00
hhui 8514069663 feat:抱杆台账查询页面接口联调 2024-04-30 14:58:02 +08:00
15856 bbf5d988f3 Merge remote-tracking branch 'origin/dev-cq-bug' into dev 2024-04-30 10:26:55 +08:00
zzyuan dfd01cfd5f Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev 2024-04-29 18:05:15 +08:00
zzyuan ec8993ab37 综合查询时间重置 2024-04-29 18:05:10 +08:00
BianLzhaoMin 958771084c Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev 2024-04-29 18:03:43 +08:00
BianLzhaoMin bb5cfa3d0d 库存日志页面参数查询调试 2024-04-29 18:03:37 +08:00
zzyuan e3820da708 Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev 2024-04-29 17:57:15 +08:00
zzyuan 6d79f0f5e9 岗位编号改为序号 2024-04-29 17:57:04 +08:00
binbin_pan fc4e97d591 fix: 1417 设备绑定编码时，绑定几台设备重复展示几次数据 2024-04-29 17:38:07 +08:00
BianLzhaoMin 101e0d7ef6 页面优化 2024-04-29 17:14:44 +08:00
BianLzhaoMin 0cce767acd 优化 2024-04-29 17:06:02 +08:00
BianLzhaoMin a687f53fb0 优化页面 2024-04-29 16:53:18 +08:00
binbin_pan c64e32b423 fix: 1421 输入框出现unknown 2024-04-29 15:58:21 +08:00
BianLzhaoMin 38ebf1ded7 库存日志页面接口调试 字段回显确认 2024-04-29 13:27:26 +08:00
binbin_pan 860b95d5dd 1399 基础管理新增页面存在错乱字符 2024-04-29 13:21:34 +08:00
zzyuan f775acb88f 前端useNum修改 2024-04-29 10:38:57 +08:00
liang.chao b6ac7ef9f2 代码提交 2024-04-29 10:35:34 +08:00
BianLzhaoMin 459fc25d55 优化 2024-04-28 17:49:42 +08:00
BianLzhaoMin 83863f7e22 由阿胡 2024-04-28 16:55:12 +08:00
15856 bad5c11bdc Merge remote-tracking branch 'origin/dev' into dev-cq-bug 2024-04-28 16:41:10 +08:00
BianLzhaoMin f697659bd7 优化测试问题 2024-04-28 10:28:22 +08:00
BianLzhaoMin 8e964622fb 优化 2024-04-28 09:15:05 +08:00
zzyuan 5751307d15 退料接收优化zzy 2024-04-26 18:11:19 +08:00
BianLzhaoMin eecb2f69f7 优化bug 2024-04-26 17:53:09 +08:00
BianLzhaoMin 1131c36f7e Merge branch 'dev-cq-bug' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq-bug 2024-04-26 17:51:54 +08:00
BianLzhaoMin 51abc81b1e 优化测试问题 2024-04-26 17:51:49 +08:00
binbin_pan c1a578302e fix: 1360 若选择物品种类与设备类型，重置按钮无法重置设备类型内容 2024-04-26 17:48:25 +08:00
zzyuan e95c7585c0 前端问题修改（退料申请机具类型选择筛选） 2024-04-26 17:22:16 +08:00
BianLzhaoMin df24cb9922 优化 2024-04-26 15:45:36 +08:00
BianLzhaoMin 9e2f6da1de 处置功能开发 以及页面优化 2024-04-26 14:45:18 +08:00
binbin_pan 5ea7738ef6 fix: 1338 状态显示完成，流程步骤显示确认为灰色 2024-04-26 09:45:00 +08:00
BianLzhaoMin 3edb63e8b8 Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev 2024-04-25 18:23:44 +08:00
BianLzhaoMin 760a1085b1 优化 2024-04-25 18:23:40 +08:00
zzyuan 5f80f7e09e 前端环境 2024-04-25 18:00:54 +08:00
BianLzhaoMin 330447577a 优化 2024-04-25 17:48:06 +08:00
BianLzhaoMin 9c8d13a8a4 优化 2024-04-25 17:35:22 +08:00
BianLzhaoMin 102c6b52a4 增加南网打包配置 2024-04-25 17:29:01 +08:00
BianLzhaoMin ae27ee7547 优化 2024-04-25 17:06:18 +08:00
zzyuan da35634589 Merge branch 'dev-cq-bug' of http://192.168.0.56:3000/bonus/devicesmgt into dev 2024-04-25 17:04:12 +08:00
zzyuan dd0845a4d7 领料保存报错提示重复 2024-04-25 17:03:40 +08:00
15856 090fc6c17d Merge remote-tracking branch 'origin/dev-cq-bug' into dev 2024-04-25 16:42:58 +08:00
BianLzhaoMin 358cbda9a2 冲突合并 2024-04-25 16:39:24 +08:00
BianLzhaoMin b005744181 冲突合并 2024-04-25 16:29:21 +08:00
BianLzhaoMin 3797f88699 测试问题修改 2024-04-25 16:28:47 +08:00
binbin_pan 36c171adc0 fix: 手机号校验 2024-04-25 16:26:40 +08:00