BianLzhaoMin
|
e6188797f6
|
优化密码校验
|
2024-07-18 18:17:48 +08:00 |
|
BianLzhaoMin
|
274837d9a4
|
优化页面字段
|
2024-07-18 11:17:40 +08:00 |
|
BianLzhaoMin
|
489085c3a8
|
优化导出等报错问题
|
2024-07-18 09:56:09 +08:00 |
|
BianLzhaoMin
|
9ba6c13880
|
优化大屏的打包配置
|
2024-07-17 10:59:10 +08:00 |
|
BianLzhaoMin
|
5783dde87a
|
更改大屏跳转地址
|
2024-07-16 17:48:23 +08:00 |
|
BianLzhaoMin
|
d35f8799ae
|
优化页面字段
|
2024-07-16 10:46:02 +08:00 |
|
BianLzhaoMin
|
54077911c4
|
优化新购图片上传问题
|
2024-07-16 09:50:09 +08:00 |
|
BianLzhaoMin
|
e0487ad332
|
优化字典页面新增 删除问题
|
2024-07-15 16:03:51 +08:00 |
|
BianLzhaoMin
|
3bac5f119a
|
解决打包报错问题
|
2024-07-15 11:26:34 +08:00 |
|
BianLzhaoMin
|
081608c4b0
|
解决冲突
|
2024-07-15 11:22:34 +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
|
40eb75962a
|
数据推送
|
2024-07-10 17:23:54 +08:00 |
|
binbin_pan
|
aa9aac7459
|
数据推送
|
2024-07-09 17:06:32 +08:00 |
|
binbin_pan
|
8eea5b7ad4
|
数据推送
|
2024-07-08 18:08:41 +08:00 |
|
binbin_pan
|
36c5b6eecc
|
推送租赁
|
2024-07-05 16:48:26 +08:00 |
|
binbin_pan
|
b551fe3475
|
领料出库-定位页面+推送
|
2024-07-05 11:00:28 +08:00 |
|
binbin_pan
|
d04f23454b
|
定位页面开发
|
2024-07-03 20:05:33 +08:00 |
|
binbin_pan
|
6adb1dc728
|
定位页面搭建
|
2024-07-03 17:10:50 +08:00 |
|
binbin_pan
|
22ec75cbf2
|
定位页面搭建
|
2024-07-03 11:04:35 +08:00 |
|
binbin_pan
|
9adc2a5528
|
IOT设备管理页面搭建
|
2024-07-02 17:59:58 +08:00 |
 hayu
|
8a053e86e9
|
通知公告及用户管理问题修改
|
2024-06-28 15:17:00 +08:00 |
|
binbin_pan
|
38e7330b04
|
fix: 2216 添加通知人员时，人员序号混乱
|
2024-06-28 09:47:10 +08:00 |
|
binbin_pan
|
237df25eb6
|
fix: 2214 角色管理中分配用户有缓存问题
|
2024-06-28 09:38:53 +08:00 |
|
BianLzhaoMin
|
bf1123f732
|
增加标段工程导入功能
|
2024-06-21 14:31:24 +08:00 |
|
BianLzhaoMin
|
75111c0ec0
|
增加导入功能
|
2024-06-20 14:49:04 +08:00 |
|
binbin_pan
|
d915b9056a
|
优化
|
2024-06-20 13:47:15 +08:00 |
|
BianLzhaoMin
|
87daec20aa
|
组件同步
|
2024-06-20 13:40:57 +08:00 |
|
BianLzhaoMin
|
ba4400a0fc
|
组件同步
|
2024-06-20 13:31:51 +08:00 |
|
BianLzhaoMin
|
87698622cd
|
增加配置组件
|
2024-06-20 13:28:34 +08:00 |
|
BianLzhaoMin
|
e1ca6fdde4
|
代码同步（领退料，仓储管理）
|
2024-06-20 13:24:44 +08:00 |
|
BianLzhaoMin
|
b4b8a79df0
|
优化首页查看跳转报错问题
|
2024-06-19 14:42:17 +08:00 |
|
binbin_pan
|
d6e6d0deef
|
优化序号问题
|
2024-06-19 11:06:10 +08:00 |
|
BianLzhaoMin
|
c82f214e93
|
Merge branch 'dev-cq' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq
|
2024-06-19 10:40:45 +08:00 |
|
BianLzhaoMin
|
ab988ecc69
|
优化审核步骤
|
2024-06-19 10:40:39 +08:00 |
|
binbin_pan
|
ee066b0495
|
动态配置大屏跳转地址
|
2024-06-19 10:02:46 +08:00 |
|
binbin_pan
|
84022ffe21
|
新购配件管理缓存问题优化
|
2024-06-18 17:58:21 +08:00 |
|
hayu
|
bc45f6bf07
|
综合服务中心导出功能修改
|
2024-06-18 17:42:02 +08:00 |
|
binbin_pan
|
948b3a524c
|
维修管理-内部维修-维修数量根据是否选择配件来确认必填与禁用
|
2024-06-18 14:04:12 +08:00 |
|
binbin_pan
|
1667fca06c
|
去除重庆默认密码登录转跳重置密码页
|
2024-06-18 11:00:10 +08:00 |
|
binbin_pan
|
bfb48eb5f7
|
fix: 2094 点击二级库中的进厂数量的数字，进入二级页面，页面标题为“退库”
|
2024-06-14 18:04:11 +08:00 |
|
binbin_pan
|
fa1aed07f8
|
fix: 2043 下拉框显示有问题
|
2024-06-14 17:41:56 +08:00 |
|
binbin_pan
|
cc8e909a1f
|
fix: 2085 不填写任何东西就可以提交
|
2024-06-14 15:56:27 +08:00 |
|
binbin_pan
|
073227f5ac
|
优化-标签绑定管理多选框 类型管理-维修员,资产属性回显
|
2024-06-14 14:21:19 +08:00 |
|
binbin_pan
|
4ec79b9c1e
|
fix: 1975 编码出库时会代入上次出库的设备编码
|
2024-06-14 11:22:02 +08:00 |
|
binbin_pan
|
a6409cd1f5
|
fix: 1975 编码出库时会代入上次出库的设备编码
|
2024-06-14 11:21:11 +08:00 |
|
binbin_pan
|
03097f4b61
|
类型管理-新增-管理模式下拉优化
|
2024-06-14 10:22:29 +08:00 |
|
binbin_pan
|
f6fe1a0a36
|
标签绑定管理-绑定弹框-设备编码去除自动生成编码
|
2024-06-14 10:16:49 +08:00 |
|
binbin_pan
|
a6173d17f5
|
维修-内部维修-维修人下拉接口更换
|
2024-06-13 17:30:38 +08:00 |
|
BianLzhaoMin
|
86e5ff1515
|
Merge branch 'dev-cq' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq
|
2024-06-13 17:17:09 +08:00 |