BianLzhaoMin
|
0be2776cf6
|
iot定位设备地图弹框页面完善
|
2024-08-06 14:23:32 +08:00 |
|
BianLzhaoMin
|
01e5924e0e
|
iot设备定位页面完善
|
2024-08-06 13:10:54 +08:00 |
|
BianLzhaoMin
|
dc8546d7c4
|
iot页面调试
|
2024-08-05 18:10:34 +08:00 |
|
BianLzhaoMin
|
34511e5972
|
代码调试
|
2024-08-05 16:55:28 +08:00 |
|
BianLzhaoMin
|
0982fb226d
|
接收详情页优化
|
2024-08-01 09:35:39 +08:00 |
|
BianLzhaoMin
|
bea1a53543
|
设备接收接口调试完成
|
2024-07-31 18:03:57 +08:00 |
|
BianLzhaoMin
|
6f7a589268
|
调试数据推送接口
|
2024-07-26 13:55:09 +08:00 |
|
BianLzhaoMin
|
8aac72612e
|
增加设备编码处按钮操作
|
2024-07-24 10:44:25 +08:00 |
|
BianLzhaoMin
|
5b27e5202f
|
优化项目启动时警告问题
|
2024-07-23 10:40:28 +08:00 |
|
BianLzhaoMin
|
d35f8799ae
|
优化页面字段
|
2024-07-16 10:46:02 +08:00 |
|
BianLzhaoMin
|
54077911c4
|
优化新购图片上传问题
|
2024-07-16 09:50:09 +08:00 |
|
BianLzhaoMin
|
3bac5f119a
|
解决打包报错问题
|
2024-07-15 11:26: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 |
|
binbin_pan
|
38e7330b04
|
fix: 2216 添加通知人员时，人员序号混乱
|
2024-06-28 09:47:10 +08:00 |
|
BianLzhaoMin
|
e1ca6fdde4
|
代码同步（领退料，仓储管理）
|
2024-06-20 13:24:44 +08:00 |
|
binbin_pan
|
d6e6d0deef
|
优化序号问题
|
2024-06-19 11:06:10 +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
|
073227f5ac
|
优化-标签绑定管理多选框 类型管理-维修员,资产属性回显
|
2024-06-14 14:21:19 +08:00 |
|
binbin_pan
|
03097f4b61
|
类型管理-新增-管理模式下拉优化
|
2024-06-14 10:22:29 +08:00 |
|
binbin_pan
|
f6fe1a0a36
|
标签绑定管理-绑定弹框-设备编码去除自动生成编码
|
2024-06-14 10:16:49 +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 |
|
BianLzhaoMin
|
9c054a3f0e
|
新购页面机具编码异常问题修改
|
2024-06-13 17:17:07 +08:00 |
|
binbin_pan
|
2e59c9e2c6
|
入库管理-修试入库优化
|
2024-06-13 15:50:20 +08:00 |
|
binbin_pan
|
82e59ac310
|
fix: 2059 退料驳回后，重新驳回提交建议代入驳回前的数据，便于驳回后重新提交
|
2024-06-13 14:54:44 +08:00 |
|
binbin_pan
|
9df7306cf7
|
fix: 2047 新购配件采购单填写完成后，建议返回上一级页面，否则多次点击保存按钮，采购单会被重复提交
|
2024-06-13 13:22:46 +08:00 |
|
binbin_pan
|
57efbcfbf9
|
fix: 1960 新增抱杆类型时无法确定是数量管理or编码管理
|
2024-06-13 10:17:09 +08:00 |
|
binbin_pan
|
edf5a6ffd5
|
fix: 2048 新购配件入库重置按钮无法重置提交入库时间
|
2024-06-13 10:15:40 +08:00 |
|
binbin_pan
|
1fd8e4d0a4
|
盘点入库优化
|
2024-06-12 18:48:45 +08:00 |
|
binbin_pan
|
490751d143
|
优化检验时间选择
|
2024-06-12 14:53:09 +08:00 |
|
binbin_pan
|
9e3b086f9e
|
测试问题优化
|
2024-06-12 13:32:26 +08:00 |
|
BianLzhaoMin
|
6b5eadb963
|
Merge branch 'dev-cq' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq
|
2024-06-12 09:05:30 +08:00 |
|
binbin_pan
|
adb0dc355d
|
fix: 2027 新购机具验收时，上传的验收图片较大时，立即点击确定按钮会提示“验收图片不能为空”，稍等片刻后会提示接口请求超时
|
2024-06-12 09:00:48 +08:00 |
|
BianLzhaoMin
|
1d86a0e757
|
优化页面字段
|
2024-06-11 17:03:55 +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
|
300c85c369
|
优化新购页面按钮不显示问题
|
2024-06-07 13:34:00 +08:00 |