BianLzhaoMin
|
fb19d684bc
|
优化登录页样式，插槽使用规范等问题
|
2024-06-11 11:37:26 +08:00 |
|
BianLzhaoMin
|
d5eec60eff
|
解决测试bug
|
2024-06-06 16:08:25 +08:00 |
 binbin_pan
|
f0a94ac0db
|
盘点入库-查看详情
|
2024-06-05 14:20:20 +08:00 |
|
BianLzhaoMin
|
e7e8c6da07
|
修改列表序号翻页时延续问题
|
2024-06-03 11:03:34 +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 |
|
binbin_pan
|
a26ee4143a
|
fix: 1661 新购机具增加采购单时“采购人”无法选择，且采购人员无法添加，采购人下拉框能够选择“请选择”字段
|
2024-05-25 12:23:15 +08:00 |
|
binbin_pan
|
5fdccef83d
|
fix: 1672 库管员配置中未绑定的设备亦可解绑，建议未绑定时隐藏“解绑”按钮
|
2024-05-24 16:35:12 +08:00 |
|
binbin_pan
|
7a17cccd1c
|
fix: 1665 配件名称输入框为空时提示错误
|
2024-05-24 15:29:16 +08:00 |
|
BianLzhaoMin
|
1272ccda12
|
优化流程
|
2024-05-08 15:59:37 +08:00 |
|
BianLzhaoMin
|
f6c1bdb1c7
|
冲突合并
|
2024-05-07 16:38:53 +08:00 |
 hhui
|
e3c493cfaf
|
fix:修饰入库查询清空
|
2024-05-06 17:49:02 +08:00 |
|
BianLzhaoMin
|
83f78e85c8
|
页面优化
|
2024-05-06 15:21:37 +08:00 |
|
BianLzhaoMin
|
86935fa01f
|
代码合并 宁夏
|
2024-05-06 09:49:54 +08:00 |
|
BianLzhaoMin
|
688599a5b0
|
宁夏 冲突合并
|
2024-05-06 09:48:15 +08:00 |
|
BianLzhaoMin
|
f511ad6292
|
优化测试问题
|
2024-04-30 17:50:34 +08:00 |
|
binbin_pan
|
fc4e97d591
|
fix: 1417 设备绑定编码时，绑定几台设备重复展示几次数据
|
2024-04-29 17:38:07 +08:00 |
|
BianLzhaoMin
|
101e0d7ef6
|
页面优化
|
2024-04-29 17:14:44 +08:00 |
|
binbin_pan
|
c64e32b423
|
fix: 1421 输入框出现unknown
|
2024-04-29 15:58:21 +08:00 |
|
15856
|
bad5c11bdc
|
Merge remote-tracking branch 'origin/dev' into dev-cq-bug
|
2024-04-28 16:41:10 +08:00 |
|
BianLzhaoMin
|
eecb2f69f7
|
优化bug
|
2024-04-26 17:53:09 +08:00 |
|
BianLzhaoMin
|
1131c36f7e
|
Merge branch 'dev-cq-bug' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq-bug
|
2024-04-26 17:51:54 +08:00 |
|
BianLzhaoMin
|
51abc81b1e
|
优化测试问题
|
2024-04-26 17:51:49 +08:00 |
|
binbin_pan
|
c1a578302e
|
fix: 1360 若选择物品种类与设备类型，重置按钮无法重置设备类型内容
|
2024-04-26 17:48:25 +08:00 |
|
BianLzhaoMin
|
9e2f6da1de
|
处置功能开发 以及页面优化
|
2024-04-26 14:45:18 +08:00 |
|
15856
|
090fc6c17d
|
Merge remote-tracking branch 'origin/dev-cq-bug' into dev
|
2024-04-25 16:42:58 +08:00 |
|
BianLzhaoMin
|
358cbda9a2
|
冲突合并
|
2024-04-25 16:39:24 +08:00 |
|
BianLzhaoMin
|
b005744181
|
冲突合并
|
2024-04-25 16:29:21 +08:00 |
|
BianLzhaoMin
|
3797f88699
|
测试问题修改
|
2024-04-25 16:28:47 +08:00 |
 zzyuan
|
4357ae3307
|
手机号输入只能为数字11位
|
2024-04-25 16:21:40 +08:00 |
|
BianLzhaoMin
|
14bfda5e94
|
冲突合并
|
2024-04-25 16:03:49 +08:00 |
|
BianLzhaoMin
|
b162811f47
|
测试问题修改
|
2024-04-25 16:00:19 +08:00 |
|
zzyuan
|
41601ff933
|
Merge branch 'dev-cq-bug' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq-bug
|
2024-04-25 14:52:07 +08:00 |
|
zzyuan
|
83d7b2801e
|
序号改为顺序1
|
2024-04-25 14:51:15 +08:00 |
|
binbin_pan
|
f99aa9aa31
|
fix: 1315 若进入子页面，使用列表进入主页，再次点击其他数据的按钮，打开仍然时第一次的子页面
|
2024-04-25 14:36:57 +08:00 |
|
binbin_pan
|
6deca039fa
|
fix: 1309 已绑定的标签可以再次进行绑定操作（APP端二维码扫描出多个设备）
|
2024-04-25 14:05:28 +08:00 |
|
zzyuan
|
9df0dae379
|
删除提示框文案修改现在不携带编号类数据
|
2024-04-25 11:28:22 +08:00 |
|
zzyuan
|
2c0b35d7bc
|
treeselect查询英文结果改为中文
|
2024-04-25 11:10:36 +08:00 |
|
jackal
|
7737e18910
|
fix:新增供应商必填校验添加
|
2024-04-25 10:26:47 +08:00 |
liang.chao
|
37d0365868
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# sgzb-ui/vue.config.js
|
2024-04-24 14:09:26 +08:00 |
|
jackal
|
a34c11e3bf
|
feat:抱杆明细弹窗组件开发
|
2024-04-24 11:27:59 +08:00 |
|
jackal
|
ae0b637828
|
fix：新购工机具入库审核状态修改
|
2024-04-23 16:16:08 +08:00 |
|
zzyuan
|
6e6420c65c
|
前端修改问题修改
|
2024-04-23 13:44:50 +08:00 |
|
jackal
|
f080f72c32
|
fix:去除不通过原因字段
|
2024-04-20 14:53:47 +08:00 |
|
zzyuan
|
e95c1acf6b
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-20 14:31:46 +08:00 |
|
zzyuan
|
8dc56bcde9
|
前端领退料模块问题修改
|
2024-04-20 14:29:59 +08:00 |
|
binbin_pan
|
0d457afa9d
|
fix: 仓库管理-仓库货架管理-编辑下拉框报错
|
2024-04-20 14:01:11 +08:00 |
|
jackal
|
5a88bafd89
|
fix:配件新购入库bug修改
|
2024-04-20 13:41:35 +08:00 |
|
binbin_pan
|
66f8df4fba
|
fix: 标签绑定管理-标签绑定管理-设置禁用项
|
2024-04-20 13:40:04 +08:00 |
|
jackal
|
3efa283b3c
|
fix:修改pickerOptions方法，日期可选今天及以后
|
2024-04-20 13:10:30 +08:00 |
|
jackal
|
b8ff950a16
|
fix:新购工机具入库bug修改
|
2024-04-20 13:00:37 +08:00 |