BianLzhaoMin
|
489085c3a8
|
优化导出等报错问题
|
2024-07-18 09:56:09 +08:00 |
|
BianLzhaoMin
|
9ba6c13880
|
优化大屏的打包配置
|
2024-07-17 10:59:10 +08:00 |
|
BianLzhaoMin
|
54077911c4
|
优化新购图片上传问题
|
2024-07-16 09:50:09 +08:00 |
 15856
|
57d55bbab2
|
合并优化
|
2024-07-15 15:46:41 +08:00 |
|
15856
|
a8097987df
|
Merge remote-tracking branch 'origin/dev-nw' into dev-nwcc
# Conflicts:
# sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/model/LoginUser.java
# sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java
# sgzb-auth/src/main/java/com/bonus/sgzb/auth/utils/RsaUtil.java
# sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/constant/Constants.java
# sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java
# sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/ParamsDto.java
# sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/InventoryAndWarehousingController.java
# sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/MachIneDto.java
# sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/InventoryAndWarehousingServiceImpl.java
# sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml
# sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/config/RsaUtil.java
# sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysConfigController.java
# sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysProfileController.java
# sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysUserController.java
# sgzb-ui/package.json
# sgzb-ui/src/api/claimAndRefund/return.js
# sgzb-ui/src/router/index.js
# sgzb-ui/src/store/modules/user.js
# sgzb-ui/src/utils/globalUrl.js
# sgzb-ui/src/views/base/section/index.vue
# sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue
# sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue
# sgzb-ui/src/views/index.vue
# sgzb-ui/src/views/oldLogin.vue
# sgzb-ui/src/views/resetPassword.vue
# sgzb-ui/src/views/system/config/index.vue
# sgzb-ui/src/views/system/user/index.vue
# sgzb-ui/src/views/warehouseManage/machinery/coding/index.vue
# sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/queryTools.vue
# sgzb-ui/vue.config.js
|
2024-07-15 10:21:48 +08:00 |
 binbin_pan
|
89f3c6f39c
|
IOT设备管理联调
|
2024-07-11 18:33:09 +08:00 |
|
binbin_pan
|
9adc2a5528
|
IOT设备管理页面搭建
|
2024-07-02 17:59:58 +08:00 |
|
BianLzhaoMin
|
cd1117c199
|
测试
|
2024-06-20 13:19:57 +08:00 |
|
BianLzhaoMin
|
ab988ecc69
|
优化审核步骤
|
2024-06-19 10:40:39 +08:00 |
|
BianLzhaoMin
|
9c054a3f0e
|
新购页面机具编码异常问题修改
|
2024-06-13 17:17:07 +08:00 |
|
binbin_pan
|
edf5a6ffd5
|
fix: 2048 新购配件入库重置按钮无法重置提交入库时间
|
2024-06-13 10:15:40 +08:00 |
|
BianLzhaoMin
|
bbd4ccba3e
|
优化维修数量校验问题
|
2024-06-13 09:29:29 +08:00 |
|
BianLzhaoMin
|
cd4679b92c
|
优化退料保存事件
|
2024-06-11 09:58:48 +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 |
|
binbin_pan
|
47cb821ccf
|
加解密
|
2024-06-05 10:43:30 +08:00 |
|
BianLzhaoMin
|
55a471f328
|
修改打包配置，调试退料接收
|
2024-06-04 17:02:36 +08:00 |
|
BianLzhaoMin
|
e908f0e2df
|
退料申请退料人手机号码问题优化
|
2024-06-03 09:49:25 +08:00 |
|
BianLzhaoMin
|
d33ca8df36
|
修改域名打包配置
|
2024-05-30 22:56:26 +08:00 |
|
BianLzhaoMin
|
05f15fcd5d
|
优化登录页面问题
|
2024-05-30 18:04:30 +08:00 |
|
BianLzhaoMin
|
ffa9ffd534
|
优化测试环境域名配置问题
|
2024-05-29 19:57:35 +08:00 |
|
BianLzhaoMin
|
3aec63eef9
|
优化新增用户时默认密码问题
|
2024-05-29 17:10:21 +08:00 |
|
BianLzhaoMin
|
7fb09c5166
|
更改新域名路径配置
|
2024-05-29 14:51:45 +08:00 |
|
BianLzhaoMin
|
0eff4bb89c
|
增加手机验证登录时校验参数以及图形验证码校验，以及登录页面优化
|
2024-05-27 15:59:09 +08:00 |
|
binbin_pan
|
b47c539b96
|
南网打包配置修改
|
2024-05-21 15:50:26 +08:00 |
|
BianLzhaoMin
|
f6c1bdb1c7
|
冲突合并
|
2024-05-07 16:38:53 +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 |
|
binbin_pan
|
f502ec3294
|
fix: 1454 内部维修只能添加配件不能删除多余页
|
2024-05-06 17:30:53 +08:00 |
 hhui
|
6015dd0ae5
|
fix:bug修改
|
2024-05-06 16:49:45 +08:00 |
|
BianLzhaoMin
|
83f78e85c8
|
页面优化
|
2024-05-06 15:21:37 +08:00 |
|
BianLzhaoMin
|
688599a5b0
|
宁夏 冲突合并
|
2024-05-06 09:48:15 +08:00 |
|
BianLzhaoMin
|
9e2f6da1de
|
处置功能开发 以及页面优化
|
2024-04-26 14:45:18 +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
|
102c6b52a4
|
增加南网打包配置
|
2024-04-25 17:29:01 +08:00 |
|
BianLzhaoMin
|
ae27ee7547
|
优化
|
2024-04-25 17:06:18 +08:00 |
|
BianLzhaoMin
|
358cbda9a2
|
冲突合并
|
2024-04-25 16:39:24 +08:00 |
|
jackal
|
ae0b637828
|
fix：新购工机具入库审核状态修改
|
2024-04-23 16:16:08 +08:00 |
|
BianLzhaoMin
|
60562a1fbb
|
优化
|
2024-04-23 10:21:21 +08:00 |
|
zzyuan
|
6e1c80d8b0
|
前端修改zzy
|
2024-04-22 11:24:04 +08:00 |
|
jackal
|
f080f72c32
|
fix:去除不通过原因字段
|
2024-04-20 14:53:47 +08:00 |
|
jackal
|
1a30d552ad
|
fix：协议管理导出修改
|
2024-04-20 14:30:43 +08:00 |
|
binbin_pan
|
0d457afa9d
|
fix: 仓库管理-仓库货架管理-编辑下拉框报错
|
2024-04-20 14:01:11 +08:00 |
|
jackal
|
b8ff950a16
|
fix:新购工机具入库bug修改
|
2024-04-20 13:00:37 +08:00 |
|
jackal
|
9ae1c69f71
|
fix:协议管理bug修改
|
2024-04-20 10:48:36 +08:00 |
|
jackal
|
edbc58d08d
|
feat:领料管理添加子数据展示
|
2024-04-17 13:51:05 +08:00 |
|
BianLzhaoMin
|
b677a7ff11
|
首页催办发送接口调试
|
2024-04-17 13:20:11 +08:00 |