Commit Graph

1436 Commits

Author SHA1 Message Date
csyue 84299f69af 宁夏试运行问题修改 2024-06-05 13:30:17 +08:00
BianLzhaoMin 793d29c1ec Merge branch 'dev-cq' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq 2024-06-04 17:02:38 +08:00
BianLzhaoMin 55a471f328 修改打包配置,调试退料接收 2024-06-04 17:02:36 +08:00
15856 9df51c3993 重庆bug修复 2024-06-04 17:00:56 +08:00
赵福海 24b6c7be6e bug修复 2024-06-04 15:41:08 +08:00
hayu 351bcbfb12 测试问题修改 2024-06-04 09:01:38 +08:00
BianLzhaoMin b1b42b9a78 优化列表序号,分页时延续问题 2024-06-03 11:10:25 +08:00
BianLzhaoMin e7e8c6da07 修改列表序号翻页时延续问题 2024-06-03 11:03:34 +08:00
BianLzhaoMin e908f0e2df 退料申请退料人手机号码问题优化 2024-06-03 09:49:25 +08:00
csyue 7690b80b6b 测试问题项修改 2024-05-31 15:26:47 +08:00
赵福海 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
mashuai c350486773 Revert "bug"
This reverts commit 4c83705ab1.
2024-05-31 11:22:35 +08:00
mashuai 4c83705ab1 bug 2024-05-31 11:19:06 +08:00
mashuai 32b80e0d6c 手机号次数限制 2024-05-27 15:52:20 +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
mashuai dd8e0e788a 盘点入库,用户加解密 2024-05-25 16:32:27 +08:00
mashuai 4db960c1d6 盘点入库,用户加解密 2024-05-25 16:28:54 +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
mashuai 6ac2183854 bug 2024-05-24 15:16:52 +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
mashuai 772aad308d 用户加密漏洞 2024-05-22 16:45:04 +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
binbin_pan d7d248c198 增加海南省地图json数据 2024-05-17 10:25:54 +08:00
liang.chao eafeddae64 代码提交 2024-05-16 13:37:16 +08:00
liang.chao 2c14888e0d 领料申请代码codeview 2024-05-10 15:22:15 +08:00
liang.chao ecdacc0143 领料管理列表展示问题提交 2024-05-10 11:06:49 +08:00
liang.chao 54d057f5b2 领料申请删除bug修改 2024-05-10 09:59:04 +08:00
liang.chao 7ef53ff9fe app退料接收无数据bug修改 2024-05-09 13:29:20 +08:00
mashuai eda8eac15d 权限 2024-05-08 18:43:46 +08:00
mashuai 99761fb49c 权限 2024-05-08 18:23:47 +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 8ab553727b Merge branch 'dev-cq-bug' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq-bug 2024-05-07 16:31:11 +08:00
BianLzhaoMin 2463392124 测试问题优化 2024-05-07 16:31:07 +08:00
liang.chao 8b5519223f 测试问题bug修改 2024-05-07 16:29:36 +08:00