 mashuai
|
338d1e6a20
|
bug
|
2024-06-11 13:15:03 +08:00 |
BianLzhaoMin
|
6a6459eadd
|
Merge branch 'dev-cq' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq
|
2024-06-11 11:37:32 +08:00 |
|
BianLzhaoMin
|
fb19d684bc
|
优化登录页样式，插槽使用规范等问题
|
2024-06-11 11:37:26 +08:00 |
|
mashuai
|
5a96f46e6a
|
bug
|
2024-06-11 11:19:51 +08:00 |
 binbin_pan
|
d2cc5721f2
|
优化资产属性下拉回显
|
2024-06-11 11:02:43 +08:00 |
|
binbin_pan
|
7f1b3bbc8b
|
1991 机具设备管理点击导出按钮无反应
|
2024-06-11 10:51:55 +08:00 |
|
BianLzhaoMin
|
eaa21c323e
|
Merge branch 'dev-cq' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq
|
2024-06-11 10:17:38 +08:00 |
|
BianLzhaoMin
|
b57f5a4152
|
优化页面样式
|
2024-06-11 10:17:33 +08:00 |
|
binbin_pan
|
aedf651435
|
1979 机具设备管理厂家信息回显的错误
|
2024-06-11 10:05:50 +08:00 |
|
BianLzhaoMin
|
cd4679b92c
|
优化退料保存事件
|
2024-06-11 09:58:48 +08:00 |
|
BianLzhaoMin
|
f905176aa4
|
Merge branch 'dev-cq' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq
|
2024-06-07 17:59:50 +08:00 |
|
BianLzhaoMin
|
72871bfba7
|
退料菜单优化
|
2024-06-07 17:59:46 +08:00 |
|
mashuai
|
6020a1929d
|
注释注册接口
|
2024-06-07 17:14:57 +08:00 |
|
mashuai
|
2fa88dc1cd
|
bug
|
2024-06-07 17:05:36 +08:00 |
|
BianLzhaoMin
|
69c17b101c
|
增加优化页面
|
2024-06-07 14:11:43 +08:00 |
|
BianLzhaoMin
|
13fb468240
|
Merge branch 'dev-cq' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq
|
2024-06-07 13:34:02 +08:00 |
|
BianLzhaoMin
|
300c85c369
|
优化新购页面按钮不显示问题
|
2024-06-07 13:34:00 +08:00 |
 csyue
|
b6a404753b
|
重庆新购无法绑定编码问题修改
|
2024-06-07 13:29:51 +08:00 |
|
BianLzhaoMin
|
c57c539f51
|
优化仓储管理菜单展示
|
2024-06-07 11:17:34 +08:00 |
|
binbin_pan
|
f69ccc2b63
|
fix: 1453 退料审核时被驳回，驳回后修改数据再次提交，审核时查看的数据依然是驳回前的数据
|
2024-06-06 16:24:38 +08:00 |
|
BianLzhaoMin
|
d5eec60eff
|
解决测试bug
|
2024-06-06 16:08:25 +08:00 |
|
binbin_pan
|
a96647b29f
|
图形验证码问题
|
2024-06-06 15:54:54 +08:00 |
|
mashuai
|
ff0d34952d
|
Merge remote-tracking branch 'origin/dev-nw' into dev-nw
|
2024-06-06 15:52:18 +08:00 |
|
mashuai
|
147c10476f
|
短信过期时效，图形验证码缓存清理
|
2024-06-06 15:52:11 +08:00 |
|
binbin_pan
|
db82be8297
|
明文加解密
|
2024-06-05 17:41:29 +08:00 |
|
mashuai
|
37e8761508
|
重置，修改加解密
|
2024-06-05 17:40:33 +08:00 |
|
mashuai
|
a5e306a0f9
|
盘点入库详情
|
2024-06-05 14:32:17 +08:00 |
|
binbin_pan
|
a790ba40e8
|
优化
|
2024-06-05 14:24:27 +08:00 |
|
binbin_pan
|
f0a94ac0db
|
盘点入库-查看详情
|
2024-06-05 14:20:20 +08:00 |
|
mashuai
|
47831720ed
|
盘点入库详情
|
2024-06-05 14:06:45 +08:00 |
|
binbin_pan
|
fd668b51ee
|
明文加解密
|
2024-06-05 14:01:33 +08:00 |
|
mashuai
|
82d80aa1b7
|
重庆用户加解密
|
2024-06-05 13:42:32 +08:00 |
|
mashuai
|
a5f7806154
|
重庆用户加解密
|
2024-06-05 13:37:52 +08:00 |
|
csyue
|
84299f69af
|
宁夏试运行问题修改
|
2024-06-05 13:30:17 +08:00 |
|
mashuai
|
e8d364f707
|
Merge remote-tracking branch 'origin/dev-nw' into dev-nw
|
2024-06-05 10:48:17 +08:00 |
|
mashuai
|
b8138072d4
|
修改重置加解密
|
2024-06-05 10:48:08 +08:00 |
|
binbin_pan
|
47cb821ccf
|
加解密
|
2024-06-05 10:43:30 +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 |
|
binbin_pan
|
bc2ee69dd7
|
解密初始密码
|
2024-06-04 14:01:19 +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 |