BianLzhaoMin
|
54077911c4
|
优化新购图片上传问题
|
2024-07-16 09:50:09 +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
|
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 |
|
BianLzhaoMin
|
9c054a3f0e
|
新购页面机具编码异常问题修改
|
2024-06-13 17:17:07 +08:00 |
|
binbin_pan
|
9df7306cf7
|
fix: 2047 新购配件采购单填写完成后，建议返回上一级页面，否则多次点击保存按钮，采购单会被重复提交
|
2024-06-13 13:22:46 +08:00 |
|
binbin_pan
|
adb0dc355d
|
fix: 2027 新购机具验收时，上传的验收图片较大时，立即点击确定按钮会提示“验收图片不能为空”，稍等片刻后会提示接口请求超时
|
2024-06-12 09:00:48 +08:00 |
|
BianLzhaoMin
|
300c85c369
|
优化新购页面按钮不显示问题
|
2024-06-07 13:34:00 +08:00 |
|
BianLzhaoMin
|
c57c539f51
|
优化仓储管理菜单展示
|
2024-06-07 11:17:34 +08:00 |