 binbin_pan
|
3e75f58a59
|
fix: 1468 无法进行勾选数据准确导出
|
2024-05-06 16:32:20 +08:00 |
BianLzhaoMin
|
369c0c95c1
|
Merge branch 'dev-cq-bug' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq-bug
|
2024-05-06 16:18:08 +08:00 |
|
BianLzhaoMin
|
ad4cda739b
|
测试bug优化
|
2024-05-06 16:18:05 +08:00 |
|
binbin_pan
|
f07c7663c9
|
fix: 1451 维修详情里的序号显示NaN
|
2024-05-06 15:50:11 +08:00 |
|
BianLzhaoMin
|
83f78e85c8
|
页面优化
|
2024-05-06 15:21:37 +08:00 |
|
BianLzhaoMin
|
3501c258f7
|
代码合并 宁夏
|
2024-05-06 09:51:10 +08:00 |
|
BianLzhaoMin
|
86935fa01f
|
代码合并 宁夏
|
2024-05-06 09:49:54 +08:00 |
|
BianLzhaoMin
|
688599a5b0
|
宁夏 冲突合并
|
2024-05-06 09:48:15 +08:00 |
 15856
|
834faeee43
|
Merge remote-tracking branch 'origin/dev-cq-bug' into dev
|
2024-04-30 17:51:44 +08:00 |
|
BianLzhaoMin
|
571771bcac
|
Merge branch 'dev-cq-bug' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq-bug
|
2024-04-30 17:50:39 +08:00 |
|
BianLzhaoMin
|
f511ad6292
|
优化测试问题
|
2024-04-30 17:50:34 +08:00 |
|
binbin_pan
|
e1d74486b7
|
fix: 1443 出库的状态与出库状态下拉框中数据不对应
|
2024-04-30 15:50:36 +08:00 |
|
BianLzhaoMin
|
43b159ca72
|
Merge branch 'dev-cq-bug' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq-bug
|
2024-04-30 15:10:43 +08:00 |
|
BianLzhaoMin
|
0634f707d1
|
优化二级库表单重置bug
|
2024-04-30 15:10:40 +08:00 |
|
binbin_pan
|
c3f97d83d4
|
fix: 1441 单位类型中第二页的数据，在往来单位新增页面下拉框不展示
|
2024-04-30 15:06:04 +08:00 |
 hhui
|
62a7113b70
|
Merge remote-tracking branch 'origin/dev-cq-bug' into dev
|
2024-04-30 15:03:10 +08:00 |
|
hhui
|
8514069663
|
feat:抱杆台账查询页面接口联调
|
2024-04-30 14:58:02 +08:00 |
|
15856
|
bbf5d988f3
|
Merge remote-tracking branch 'origin/dev-cq-bug' into dev
|
2024-04-30 10:26:55 +08:00 |
 zzyuan
|
dfd01cfd5f
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-29 18:05:15 +08:00 |
|
zzyuan
|
ec8993ab37
|
综合查询时间重置
|
2024-04-29 18:05:10 +08:00 |
|
BianLzhaoMin
|
958771084c
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-29 18:03:43 +08:00 |
|
BianLzhaoMin
|
bb5cfa3d0d
|
库存日志页面参数查询调试
|
2024-04-29 18:03:37 +08:00 |
|
zzyuan
|
e3820da708
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-29 17:57:15 +08:00 |
|
zzyuan
|
6d79f0f5e9
|
岗位编号改为序号
|
2024-04-29 17:57:04 +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 |
|
BianLzhaoMin
|
0cce767acd
|
优化
|
2024-04-29 17:06:02 +08:00 |
|
BianLzhaoMin
|
a687f53fb0
|
优化页面
|
2024-04-29 16:53:18 +08:00 |
|
binbin_pan
|
c64e32b423
|
fix: 1421 输入框出现unknown
|
2024-04-29 15:58:21 +08:00 |
|
BianLzhaoMin
|
38ebf1ded7
|
库存日志页面接口调试 字段回显确认
|
2024-04-29 13:27:26 +08:00 |
|
binbin_pan
|
860b95d5dd
|
1399 基础管理新增页面存在错乱字符
|
2024-04-29 13:21:34 +08:00 |
|
zzyuan
|
f775acb88f
|
前端useNum修改
|
2024-04-29 10:38:57 +08:00 |
liang.chao
|
b6ac7ef9f2
|
代码提交
|
2024-04-29 10:35:34 +08:00 |
|
BianLzhaoMin
|
459fc25d55
|
优化
|
2024-04-28 17:49:42 +08:00 |
|
BianLzhaoMin
|
83863f7e22
|
由阿胡
|
2024-04-28 16:55:12 +08:00 |
|
15856
|
bad5c11bdc
|
Merge remote-tracking branch 'origin/dev' into dev-cq-bug
|
2024-04-28 16:41:10 +08:00 |
|
BianLzhaoMin
|
f697659bd7
|
优化测试问题
|
2024-04-28 10:28:22 +08:00 |
|
BianLzhaoMin
|
8e964622fb
|
优化
|
2024-04-28 09:15:05 +08:00 |
|
zzyuan
|
5751307d15
|
退料接收优化zzy
|
2024-04-26 18:11:19 +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 |
|
zzyuan
|
e95c7585c0
|
前端问题修改（退料申请机具类型选择筛选）
|
2024-04-26 17:22:16 +08:00 |
|
BianLzhaoMin
|
df24cb9922
|
优化
|
2024-04-26 15:45:36 +08:00 |
|
BianLzhaoMin
|
9e2f6da1de
|
处置功能开发 以及页面优化
|
2024-04-26 14:45:18 +08:00 |
|
binbin_pan
|
5ea7738ef6
|
fix: 1338 状态显示完成，流程步骤显示确认为灰色
|
2024-04-26 09:45:00 +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
|
330447577a
|
优化
|
2024-04-25 17:48:06 +08:00 |
|
BianLzhaoMin
|
9c8d13a8a4
|
优化
|
2024-04-25 17:35:22 +08:00 |
|
BianLzhaoMin
|
102c6b52a4
|
增加南网打包配置
|
2024-04-25 17:29:01 +08:00 |
|
BianLzhaoMin
|
ae27ee7547
|
优化
|
2024-04-25 17:06:18 +08:00 |
|
zzyuan
|
da35634589
|
Merge branch 'dev-cq-bug' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-25 17:04:12 +08:00 |
|
zzyuan
|
dd0845a4d7
|
领料保存报错提示重复
|
2024-04-25 17:03:40 +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 |
|
binbin_pan
|
36c171adc0
|
fix: 手机号校验
|
2024-04-25 16:26:40 +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 |
|
binbin_pan
|
6fdb0b7fb1
|
fix: 1323 退料审核不通过原因无法输入
|
2024-04-25 15:41:28 +08:00 |
|
binbin_pan
|
9aab9d752f
|
fix: 1319 退料接收详情页面连点两次，页面卡死
|
2024-04-25 14:58:34 +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
|
c11d023886
|
fix: 1313 提示为往来单位，字段为领料单位
|
2024-04-25 14:14:30 +08:00 |
|
binbin_pan
|
6deca039fa
|
fix: 1309 已绑定的标签可以再次进行绑定操作（APP端二维码扫描出多个设备）
|
2024-04-25 14:05:28 +08:00 |
|
jackal
|
7ddb70360e
|
fix:长期领料已完成确认，但是页面图标未变成“√”修改
|
2024-04-25 13:40:11 +08:00 |
|
binbin_pan
|
646456b1c6
|
fix: 1310 填写协议的租赁期限的数字过大时，页面会报错
|
2024-04-25 13:19:04 +08:00 |
|
zzyuan
|
9df0dae379
|
删除提示框文案修改现在不携带编号类数据
|
2024-04-25 11:28:22 +08:00 |
|
zzyuan
|
10e57c23ae
|
Merge branch 'dev-cq-bug' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq-bug
|
2024-04-25 11:10:39 +08:00 |
|
zzyuan
|
2c0b35d7bc
|
treeselect查询英文结果改为中文
|
2024-04-25 11:10:36 +08:00 |
|
binbin_pan
|
e5076c061b
|
fix: 1285 删除一条数据，再新增数据时，用户编号不会连续
|
2024-04-25 10:59:17 +08:00 |
|
zzyuan
|
fa0a4148fc
|
Merge branch 'dev-cq-bug' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq-bug
|
2024-04-25 10:58:32 +08:00 |
|
zzyuan
|
0655ee501b
|
system模块前端问题修改
|
2024-04-25 10:58:28 +08:00 |
|
binbin_pan
|
f8a6621f06
|
fix: 1276 查询框不能查询
|
2024-04-25 10:56:44 +08:00 |
|
jackal
|
20a6b3318b
|
fix:用户管理页面导入失败提示修改
|
2024-04-25 10:46:47 +08:00 |
|
jackal
|
d8990a97e9
|
fix:treeselect组件修改
|
2024-04-25 10:36:07 +08:00 |
|
zzyuan
|
4cab68bba6
|
Merge branch 'dev-cq-bug' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq-bug
|
2024-04-25 10:32:50 +08:00 |
|
zzyuan
|
ee0aba24e6
|
往来单位在领退管理中改为对应字段
|
2024-04-25 10:32:47 +08:00 |
|
jackal
|
7737e18910
|
fix:新增供应商必填校验添加
|
2024-04-25 10:26:47 +08:00 |
|
zzyuan
|
82f8e5bb6c
|
宁夏退料在用量修改
|
2024-04-25 10:04:44 +08:00 |
|
zzyuan
|
2313d7baca
|
单位工程下拉查询bug'修改
|
2024-04-25 09:33:17 +08:00 |
|
BianLzhaoMin
|
7a81252dc1
|
宁夏报废模块优化
|
2024-04-25 09:24:31 +08:00 |
|
BianLzhaoMin
|
aaedeaa557
|
优化
|
2024-04-24 17:57:47 +08:00 |
|
zzyuan
|
4af501532f
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-24 14:10:21 +08:00 |
|
zzyuan
|
580e3a851a
|
退料接收1
|
2024-04-24 14:10:08 +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 |
|
liang.chao
|
6ffe2fb057
|
Merge remote-tracking branch 'origin/dev-cq-bug' into dev
# Conflicts:
# sgzb-ui/src/views/claimAndRefund/constructionSite/constructionSite.vue
# sgzb-ui/src/views/claimAndRefund/receive/receiveApply.vue
# sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApply.vue
|
2024-04-24 14:08:35 +08:00 |
|
jackal
|
a34c11e3bf
|
feat:抱杆明细弹窗组件开发
|
2024-04-24 11:27:59 +08:00 |
|
BianLzhaoMin
|
82ce5836ee
|
优化
|
2024-04-24 09:22:58 +08:00 |
|
BianLzhaoMin
|
afc93e38bd
|
优化
|
2024-04-24 08:46:24 +08:00 |
|
jackal
|
ae0b637828
|
fix：新购工机具入库审核状态修改
|
2024-04-23 16:16:08 +08:00 |
|
zzyuan
|
2ef3d4dbe4
|
前端退料接收编码退料
|
2024-04-23 14:53:54 +08:00 |
|
zzyuan
|
d2d9f5b6c4
|
退料接收按钮判断
|
2024-04-23 14:35:31 +08:00 |
|
zzyuan
|
6e6420c65c
|
前端修改问题修改
|
2024-04-23 13:44:50 +08:00 |
|
zzyuan
|
2a164bfcca
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-23 10:41:52 +08:00 |
|
zzyuan
|
a21e52816b
|
领料申请2
|
2024-04-23 10:41:45 +08:00 |
|
BianLzhaoMin
|
4408191900
|
无效json文件删除
|
2024-04-23 10:29:56 +08:00 |
|
BianLzhaoMin
|
60562a1fbb
|
优化
|
2024-04-23 10:21:21 +08:00 |
|
liang.chao
|
62f2330ffb
|
成套机具代码提交
|
2024-04-23 09:19:37 +08:00 |
|
BianLzhaoMin
|
8b8d2b9f54
|
优化
|
2024-04-22 18:15:42 +08:00 |
|
zzyuan
|
10994deeb4
|
退料接收3
|
2024-04-22 16:07:48 +08:00 |
|
zzyuan
|
06655c5eff
|
退料接收修改2
|
2024-04-22 15:47:54 +08:00 |
|
zzyuan
|
9d072eea63
|
退料接收判断
|
2024-04-22 14:28:40 +08:00 |
|
BianLzhaoMin
|
e49086d824
|
优化
|
2024-04-22 13:47:05 +08:00 |
|
binbin_pan
|
3e1db1b125
|
限制输入字数
|
2024-04-22 12:04:29 +08:00 |
|
BianLzhaoMin
|
0eabae89df
|
优化
|
2024-04-22 11:24:44 +08:00 |
|
zzyuan
|
6e1c80d8b0
|
前端修改zzy
|
2024-04-22 11:24:04 +08:00 |
|
binbin_pan
|
546eb704fb
|
退料接收管理-退料审核-批量审核
|
2024-04-22 10:07:03 +08:00 |
|
binbin_pan
|
62c669aa9f
|
fix: bug修复
|
2024-04-20 17:55:12 +08:00 |
|
zzyuan
|
8c7453aa23
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-20 17:03:39 +08:00 |
|
zzyuan
|
562bb16f2f
|
工地直转
|
2024-04-20 17:03:35 +08:00 |
|
BianLzhaoMin
|
f10ef57196
|
问题优化
|
2024-04-20 17:03:23 +08:00 |
|
binbin_pan
|
45d551f864
|
fix: 岗位管理
|
2024-04-20 16:42:41 +08:00 |
|
binbin_pan
|
f2fe043738
|
fix: 往来单位管理-下拉框校验修复
|
2024-04-20 15:57:47 +08:00 |
|
binbin_pan
|
06ad1af47d
|
fix: 用户管理-增加导入失败的原因
|
2024-04-20 15:34:19 +08:00 |
|
binbin_pan
|
34aafe3095
|
fix: 退料接收管理-退料审核-工机具类型下拉框
|
2024-04-20 15:20:39 +08:00 |
|
BianLzhaoMin
|
a18b6ce0b9
|
提交页面优化
|
2024-04-20 15:01:00 +08:00 |
|
BianLzhaoMin
|
b9d2ebd10a
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-20 14:54:34 +08:00 |
|
BianLzhaoMin
|
97e554d6ac
|
测试问题修改
|
2024-04-20 14:54:26 +08:00 |
|
jackal
|
f080f72c32
|
fix:去除不通过原因字段
|
2024-04-20 14:53:47 +08:00 |
|
binbin_pan
|
09f732bae0
|
fix: 退料接收管理-退料状态下拉项
|
2024-04-20 14:46:12 +08:00 |
|
zzyuan
|
4520e6d1bf
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-20 14:31:49 +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 |
|
jackal
|
1a30d552ad
|
fix：协议管理导出修改
|
2024-04-20 14:30:43 +08:00 |
|
zzyuan
|
8dc56bcde9
|
前端领退料模块问题修改
|
2024-04-20 14:29:59 +08:00 |
|
jackal
|
0da44483df
|
fix:退料申请bug修改
|
2024-04-20 14:10:33 +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 |
|
BianLzhaoMin
|
1202dc7ae7
|
提交预报废等页面
|
2024-04-20 13:26:48 +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 |
|
jackal
|
c39b231e09
|
fix:新购机具管理bug修改
|
2024-04-20 12:23:39 +08:00 |
|
binbin_pan
|
4d774e44c9
|
fix: 退料接收管理-退料申请-重置时间
|
2024-04-20 11:12:37 +08:00 |
|
jackal
|
9ae1c69f71
|
fix:协议管理bug修改
|
2024-04-20 10:48:36 +08:00 |
|
zzyuan
|
7b312fbffc
|
前端问题修改
|
2024-04-20 10:39:36 +08:00 |
|
zzyuan
|
ae327449a3
|
领退料问题修改
|
2024-04-20 10:23:04 +08:00 |
|
jackal
|
e4239f4955
|
fix:退料接受详情修改
|
2024-04-19 17:31:55 +08:00 |
|
binbin_pan
|
c2dc2a5d40
|
抱杆配套管理
|
2024-04-19 11:08:25 +08:00 |
|
binbin_pan
|
bcf6710e01
|
领料申请-重置查询条件修复
|
2024-04-19 10:45:11 +08:00 |
|
BianLzhaoMin
|
19edda855d
|
新增预报废页面
|
2024-04-18 17:58:05 +08:00 |
|
binbin_pan
|
03ae671f7b
|
抱杆配套管理
|
2024-04-18 17:43:56 +08:00 |
|
jackal
|
4fdcf91a45
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-18 16:32:16 +08:00 |
|
jackal
|
1471b2c4ea
|
fix:领料出库页面出库按钮权限修改
|
2024-04-18 16:32:11 +08:00 |
|
binbin_pan
|
fc5aad9205
|
抱杆配套管理
|
2024-04-18 15:34:34 +08:00 |
|
jackal
|
a242f47045
|
fix:修改
|
2024-04-18 13:58:13 +08:00 |
|
binbin_pan
|
73637df9ac
|
盘点入库
|
2024-04-17 15:08:09 +08:00 |
|
binbin_pan
|
2dcbb2a6d3
|
盘点入库
|
2024-04-17 15:04:37 +08:00 |
|
jackal
|
edbc58d08d
|
feat:领料管理添加子数据展示
|
2024-04-17 13:51:05 +08:00 |
|
BianLzhaoMin
|
910e64ea51
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-17 13:23:10 +08:00 |
|
BianLzhaoMin
|
75c19d0d51
|
优化领料任务申请时保存bug
|
2024-04-17 13:23:05 +08:00 |
|
BianLzhaoMin
|
b677a7ff11
|
首页催办发送接口调试
|
2024-04-17 13:20:11 +08:00 |
|
binbin_pan
|
e237ae54fa
|
抱杆配套管理
|
2024-04-17 11:16:29 +08:00 |
|
binbin_pan
|
84b7346386
|
盘点入库
|
2024-04-17 10:48:59 +08:00 |
|
BianLzhaoMin
|
ce1e2d59ff
|
首页心怎催办逻辑
|
2024-04-16 18:01:52 +08:00 |
|
binbin_pan
|
9deec6f550
|
抱杆配套管理
|
2024-04-16 18:01:02 +08:00 |
|
binbin_pan
|
2640c40b17
|
抱杆配套管理
|
2024-04-16 17:28:02 +08:00 |
|
BianLzhaoMin
|
f4068ec667
|
首页新增查看按钮跳转对应页面并携带参数
|
2024-04-15 18:03:00 +08:00 |
|
zzyuan
|
c93b3fa75a
|
退料接收撤回功能
|
2024-04-15 17:47:54 +08:00 |
 hayu
|
b91aeb2ccf
|
新购入库问题修改
|
2024-04-15 09:40:05 +08:00 |
|
hayu
|
273780187a
|
新购入库问题修改
|
2024-04-13 13:31:25 +08:00 |
|
zzyuan
|
8bb53bf1d1
|
测试问题修改
|
2024-04-12 17:20:16 +08:00 |
|
jackal
|
5eb3fdf54a
|
fix:去除debugger
|
2024-04-12 17:11:36 +08:00 |
|
BianLzhaoMin
|
c83193c9a9
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-12 14:56:24 +08:00 |
|
BianLzhaoMin
|
1c89edaa77
|
优化测试bug
|
2024-04-12 14:56:20 +08:00 |
|
jackal
|
02d80977fe
|
feat:计划管理计划借调管理页面导出功能
|
2024-04-12 14:25:41 +08:00 |
|
binbin_pan
|
3fea17aa5e
|
标签绑定管理-需求隐藏解绑按钮
|
2024-04-12 13:22:30 +08:00 |
|
jackal
|
af2ac1b0b2
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-12 13:18:54 +08:00 |
|
zzyuan
|
a34c0f55e2
|
领退了测试问题修改
|
2024-04-12 13:18:29 +08:00 |
|
jackal
|
21005bbfed
|
feat:计划借调列表查询接口联调
|
2024-04-12 13:16:05 +08:00 |
zhouzy062
|
4683c1ca32
|
固定编码修改-zzy
|
2024-04-12 09:15:40 +08:00 |
|
jackal
|
3face37c91
|
feat:计划借调管理接口联调
|
2024-04-11 18:01:25 +08:00 |
|
BianLzhaoMin
|
02d87beddb
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-11 16:41:59 +08:00 |
|
BianLzhaoMin
|
65d7677fe6
|
日志管理页面接口添加
|
2024-04-11 16:41:47 +08:00 |
|
binbin_pan
|
e139c80eb3
|
退料申请+重庆-当前在用量无显示修复
|
2024-04-11 14:18:36 +08:00 |
|
zhouzy062
|
b6e5577d7b
|
领料审批修改2
|
2024-04-11 14:04:37 +08:00 |
|
BianLzhaoMin
|
28d34ce4fa
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-11 11:30:18 +08:00 |
|
BianLzhaoMin
|
ffaf9ccc18
|
优化日期查询 重置清空查询问题
|
2024-04-11 11:30:14 +08:00 |
|
binbin_pan
|
a8a98ce041
|
领料查询-表单重置修复
|
2024-04-11 10:46:32 +08:00 |
|
BianLzhaoMin
|
ab0426e0f8
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-11 10:44:00 +08:00 |
|
BianLzhaoMin
|
47e5291148
|
修改结算管理金额展示问题
|
2024-04-11 10:41:14 +08:00 |
|
binbin_pan
|
0f1474569f
|
仓库管理-货架配置管理-查询修复
|
2024-04-11 09:47:04 +08:00 |
|
jackal
|
6f9a52bece
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-11 09:44:41 +08:00 |
|
jackal
|
5d7df9f110
|
fix:协议管理页面无法预览附件图片
|
2024-04-11 09:43:05 +08:00 |
|
binbin_pan
|
5d53605f80
|
标段工程管理-修复新增按钮多次提交
|
2024-04-10 17:30:49 +08:00 |
|
BianLzhaoMin
|
dbae114b07
|
优化bug
|
2024-04-10 17:29:44 +08:00 |
|
BianLzhaoMin
|
dd057e25e6
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-10 17:27:24 +08:00 |
|
BianLzhaoMin
|
95fd6e0a11
|
优化bug
|
2024-04-10 17:24:03 +08:00 |
|
binbin_pan
|
4ed4059fc2
|
工程项目管理-修复新增按钮多次提交
|
2024-04-10 17:22:09 +08:00 |
|
zhouzy062
|
c69a2e9f5e
|
前端修改
|
2024-04-10 17:19:06 +08:00 |
|
zhouzy062
|
eff89495bd
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-10 17:11:33 +08:00 |
|
zhouzy062
|
9e17aa838f
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-10 17:11:30 +08:00 |
|
binbin_pan
|
1a01065287
|
单位类型管理-修复新增按钮多次提交
|
2024-04-10 17:04:07 +08:00 |
|
zhouzy062
|
47b20769eb
|
测试问题前端修改
|
2024-04-10 17:04:07 +08:00 |
|
binbin_pan
|
f29da14bac
|
往来单位管理-修复新增按钮多次提交
|
2024-04-10 16:48:20 +08:00 |
|
binbin_pan
|
b9dd07af15
|
领料出库-协议管理-修复输入框自动填充
|
2024-04-10 16:14:53 +08:00 |
|
jackal
|
c58b78a130
|
fix:协议管理页面编辑按钮失效修改
|
2024-04-10 16:01:12 +08:00 |
|
jackal
|
ab8bd22d41
|
fix：计划管理
|
2024-04-10 15:12:25 +08:00 |
|
jackal
|
5443d78201
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-10 15:09:48 +08:00 |
|
BianLzhaoMin
|
7ef5aa2fb5
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-10 14:47:52 +08:00 |
|
BianLzhaoMin
|
7671165df5
|
优化重置表单查询条件时，表单内容无法选择问题
|
2024-04-10 14:47:42 +08:00 |
|
binbin_pan
|
bb8d41c879
|
往来单位管理-不能导出选中数据 修复
|
2024-04-10 14:43:40 +08:00 |
|
BianLzhaoMin
|
f832eb9f35
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-10 10:46:59 +08:00 |
|
BianLzhaoMin
|
e2acd9e40e
|
新增库存日志页面
|
2024-04-10 10:46:48 +08:00 |
|
zhouzy062
|
18bb04f1f7
|
领料接口对接
|
2024-04-09 17:51:39 +08:00 |
|
jackal
|
ad2c9e0db4
|
feat：计划管理新增页面开发
|
2024-04-09 15:10:31 +08:00 |
|
zhouzy062
|
95918a1669
|
退料接收接口对接
|
2024-04-08 17:21:40 +08:00 |
|
zhouzy062
|
a40363f3e5
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-08 09:01:57 +08:00 |
|
zhouzy062
|
2c9bf10d8f
|
前端上线代码优化
|
2024-04-08 09:01:54 +08:00 |
|
binbin_pan
|
5337305463
|
退料入库
|
2024-04-07 17:59:33 +08:00 |
|
binbin_pan
|
d936851fb6
|
退料入库
|
2024-04-07 17:46:16 +08:00 |
|
binbin_pan
|
816857a29d
|
退料入库
|
2024-04-07 15:32:29 +08:00 |
|
zhouzy062
|
4a5d3f299d
|
重庆领料审批前端修改
|
2024-04-07 14:26:47 +08:00 |
|
zhouzy062
|
943c8b60f5
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-07 09:39:35 +08:00 |
|
zhouzy062
|
597c6cfc96
|
测试问题修改
|
2024-04-07 09:39:32 +08:00 |
|
binbin_pan
|
e5cf171d6d
|
数量盘点入库-优化
|
2024-04-03 16:48:59 +08:00 |
 songyang
|
86f62f4921
|
修改新购验收通知参数
|
2024-04-03 16:41:20 +08:00 |
|
binbin_pan
|
9c8f44ff9f
|
数量盘点入库-优化
|
2024-04-03 15:02:34 +08:00 |
|
binbin_pan
|
126b500775
|
数量盘点入库-优化
|
2024-04-03 14:55:53 +08:00 |
|
binbin_pan
|
764d4acd98
|
数量盘点入库-优化
|
2024-04-03 14:53:03 +08:00 |
|
binbin_pan
|
46bf52d9e9
|
数量盘点入库-优化
|
2024-04-03 14:21:13 +08:00 |
|
binbin_pan
|
d141256dd7
|
数量盘点入库-优化
|
2024-04-03 10:53:52 +08:00 |
|
binbin_pan
|
2412194ab7
|
数量盘点入库-优化
|
2024-04-03 10:21:28 +08:00 |
|
binbin_pan
|
97b772d3dd
|
数量盘点入库-优化
|
2024-04-03 09:44:28 +08:00 |
|
zhouzy062
|
2aa900e10a
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-03 09:41:26 +08:00 |
|
zhouzy062
|
c6659d1167
|
机具类型添加厂家规格型号字段
|
2024-04-03 09:41:11 +08:00 |
|
binbin_pan
|
a8b1b32475
|
数量盘点入库
|
2024-04-03 09:23:27 +08:00 |
|
zhouzy062
|
5ed70b45b1
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-02 17:56:01 +08:00 |
|
zhouzy062
|
fe5d75a7db
|
退料接收页面
|
2024-04-02 17:55:56 +08:00 |
|
hayu
|
91a60339bc
|
综合查询-维修查询
|
2024-04-02 17:52:06 +08:00 |
|
zhouzy062
|
7da7ea0309
|
计划借调页面修改
|
2024-04-02 17:47:23 +08:00 |
|
zhouzy062
|
eead748fae
|
宁夏打包发布0402
|
2024-04-02 16:02:22 +08:00 |
|
zhouzy062
|
6060f6f0fb
|
前端修改
|
2024-04-02 13:54:49 +08:00 |
|
zhouzy062
|
f5bf791b1a
|
领料出库功能完善
|
2024-04-02 13:36:48 +08:00 |
|
zhouzy062
|
956cfee621
|
领料出库前端修改
|
2024-04-02 11:13:18 +08:00 |
|
binbin_pan
|
37c2e8ae11
|
数量盘点入库
|
2024-04-02 09:32:23 +08:00 |
|
binbin_pan
|
e8969befbc
|
数量盘点入库
|
2024-04-02 09:32:23 +08:00 |
|
binbin_pan
|
2cba276c88
|
编码盘点入库
|
2024-04-02 09:32:23 +08:00 |
|
zhouzy062
|
3478b57bd8
|
领料更改4
|
2024-04-02 09:32:23 +08:00 |
|
zhouzy062
|
1e633456e2
|
领料出库修改3
|
2024-04-02 09:32:23 +08:00 |
|
zhouzy062
|
2a649e921e
|
大屏跳转地址
|
2024-04-01 10:24:45 +08:00 |
|
zhouzy062
|
99c0691998
|
领料出库修改
|
2024-04-01 10:04:37 +08:00 |
|
zhouzy062
|
6fe77a66f9
|
领料出库接口参数
|
2024-04-01 09:56:14 +08:00 |
|
zhouzy062
|
4f88dd2bd8
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-01 09:44:36 +08:00 |
|
zhouzy062
|
9180e1386e
|
领料出库接口
|
2024-04-01 09:44:33 +08:00 |
|
binbin_pan
|
191d5d3e00
|
编码盘点入库
|
2024-03-29 15:18:28 +08:00 |
|
zhouzy062
|
72f643c670
|
领料出库2
|
2024-03-28 18:23:35 +08:00 |
|
zhouzy062
|
2123723729
|
领料出库数量出库
|
2024-03-28 18:12:07 +08:00 |
|
zhouzy062
|
59043e9b67
|
领料出库接口对接，退料接收页面开发
|
2024-03-28 17:59:26 +08:00 |
|
zhouzy062
|
546b65a536
|
前端代码修改，领料出库对接
|
2024-03-28 10:02:48 +08:00 |
 FrancisHu
|
562e35a952
|
3.27盘点入库修改
|
2024-03-27 15:56:31 +08:00 |
|
zhouzy062
|
db5a6079c0
|
前端更改
|
2024-03-27 14:10:36 +08:00 |
|
zhouzy062
|
7e870bacc7
|
更改当前在用量-退料
|
2024-03-27 09:12:57 +08:00 |
|
zhouzy062
|
ba6ea3ef26
|
前端问题修改2
|
2024-03-27 09:10:54 +08:00 |
|
zhouzy062
|
7d8f9d9bee
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-03-27 09:08:31 +08:00 |
|
zhouzy062
|
baebb94716
|
前端问题修改
|
2024-03-27 09:06:10 +08:00 |
|
hayu
|
85cb92670f
|
二级库功能修复
|
2024-03-26 18:06:37 +08:00 |
|
FrancisHu
|
6dd04121b7
|
3.26新增盘点入库
|
2024-03-26 16:24:39 +08:00 |
|
zhouzy062
|
caa1d0881f
|
代码提交审查
|
2024-03-26 13:19:03 +08:00 |
|
zhouzy062
|
f30cde0cec
|
代码审查问题修改
|
2024-03-26 13:15:36 +08:00 |
|
zhouzy062
|
1baf4d5e50
|
前端问题修改
|
2024-03-26 11:32:17 +08:00 |
|
zhouzy062
|
df2f7805e4
|
前端bug修改3.26
|
2024-03-26 11:29:39 +08:00 |
|
zhouzy062
|
a78e50c8b3
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-03-26 11:29:14 +08:00 |
|
hayu
|
f64ebf1aea
|
功能修复
|
2024-03-25 18:20:42 +08:00 |
|
zhouzy062
|
54c25d1997
|
前端问题修改
|
2024-03-25 16:04:51 +08:00 |
|
hayu
|
c96e26c635
|
功能修复
|
2024-03-22 18:00:57 +08:00 |
|
zhouzy062
|
369b8f08b0
|
前端修改新购入库驳回
|
2024-03-22 16:53:05 +08:00 |
|
zhouzy062
|
abb791c1a0
|
前台问题修改，重庆领料新增
|
2024-03-22 16:31:46 +08:00 |
|
zhouzy062
|
2dba2b1314
|
基础管理导出接口，重庆退料审批领料修改
|
2024-03-22 15:25:38 +08:00 |
|
zhouzy062
|
18b0804b2c
|
前端问题修改2
|
2024-03-22 10:48:22 +08:00 |
|
zhouzy062
|
c3ce3db52b
|
前端bug单修改
|
2024-03-22 09:07:07 +08:00 |
|
zhouzy062
|
4d6e721fce
|
验收通知人员
|
2024-03-21 13:56:02 +08:00 |
|
zhouzy062
|
a83d4c0170
|
前端问题修改
|
2024-03-21 11:28:17 +08:00 |
|
zhouzy062
|
bd3fad2270
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-03-20 19:12:00 +08:00 |
|
zhouzy062
|
4ac3ba6fd0
|
前端问题修改
|
2024-03-20 19:11:56 +08:00 |
|
bns_han
|
b980c97b58
|
功能完善
|
2024-03-20 13:58:09 +08:00 |
|
bns_han
|
a6830079e1
|
综合服务中心审核
|
2024-03-20 11:17:46 +08:00 |
|
zhouzy062
|
623e84d3e0
|
前端修改接口名
|
2024-03-20 10:27:52 +08:00 |
|
zhouzy062
|
a4faf1a1ed
|
前端问题修改
|
2024-03-19 16:54:31 +08:00 |
|
zhouzy062
|
cfc7cded3a
|
前端试运行问题修改
|
2024-03-19 11:12:02 +08:00 |
|
zhouzy062
|
34d55b59e0
|
工地直转直转单接口对接
|
2024-03-19 09:07:55 +08:00 |
|
zhouzy062
|
92447485dc
|
重庆审批流程2
|
2024-03-18 10:22:37 +08:00 |
|
zhouzy062
|
85a1fe9cfb
|
重庆审批流修改
|
2024-03-16 13:35:57 +08:00 |
|
zhouzy062
|
a9de36b025
|
重庆领料审批更改2
|
2024-03-16 13:04:28 +08:00 |
|
zhouzy062
|
f0654697b7
|
添加重庆审批流1
|
2024-03-16 11:19:19 +08:00 |
|
zhouzy062
|
5844b8845a
|
报废图片上传
|
2024-03-15 18:33:30 +08:00 |
|
zhouzy062
|
f0842a417f
|
试运行问题修改
|
2024-03-15 16:30:03 +08:00 |
|
zhouzy062
|
ea01e0cd8d
|
前端提交
|
2024-03-13 19:57:14 +08:00 |
|
zhouzy062
|
e81a81c460
|
前端问题修改
|
2024-03-13 17:50:41 +08:00 |
|
zhouzy062
|
b01f424e4d
|
输入框限制
|
2024-03-11 14:57:03 +08:00 |
|
zhouzy062
|
5706069158
|
工地直转
|
2024-03-08 18:17:05 +08:00 |
|
zhouzy062
|
1f36650c1c
|
退料驳回，工地直转接口对接
|
2024-03-08 17:13:59 +08:00 |
|
zhouzy062
|
f55234d3ad
|
前端bug修改
|
2024-03-08 14:21:03 +08:00 |
|
zhouzy062
|
7f03a31a87
|
二级库相关导出
|
2024-03-07 16:46:16 +08:00 |
|
zhouzy062
|
01106d4c5b
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-03-07 13:31:29 +08:00 |
|
zhouzy062
|
6dcf7aae60
|
费用结算导出接口对接
|
2024-03-07 13:31:26 +08:00 |
|
bns_han
|
197964ee1b
|
功能优化
|
2024-03-07 11:38:10 +08:00 |
|
zhouzy062
|
7f33b1a081
|
前端问题修改
|
2024-03-07 10:44:18 +08:00 |
|
zhouzy062
|
51e0dd0681
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-03-07 09:19:52 +08:00 |
|
zhouzy062
|
f8bf0ba857
|
问题修改:验收图片上传，接入大屏
|
2024-03-07 09:19:47 +08:00 |
|
bns_han
|
14dedcf440
|
功能完善
|
2024-03-06 17:59:51 +08:00 |
|
bns_han
|
a3e922936f
|
问题修复及综合查询
|
2024-03-05 18:41:35 +08:00 |
|
zhouzy062
|
2da530bc41
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-03-05 09:10:29 +08:00 |
|
zhouzy062
|
d5ca3c7b95
|
二维码扫码2
|
2024-03-05 09:10:14 +08:00 |
|
FrancisHu
|
e066ccce92
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-03-04 17:23:35 +08:00 |
|
FrancisHu
|
c296fc3bbd
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-03-04 17:22:58 +08:00 |
|
FrancisHu
|
acc80d900b
|
3.4修改
|
2024-03-04 16:46:53 +08:00 |
|
zhouzy062
|
5d02291e72
|
测试问题修改3/4
|
2024-03-04 16:39:06 +08:00 |
|
zhouzy062
|
7f59083e7b
|
二维码跳转页面查看设备信息
|
2024-03-04 16:38:39 +08:00 |
|
zhouzy062
|
b02eb4a588
|
二级库模块
|
2024-03-01 18:17:50 +08:00 |
|
zhouzy062
|
3c778be029
|
二级库模块接口对接
|
2024-03-01 14:46:21 +08:00 |
|
zhouzy062
|
1f5869efe5
|
二级库1
|
2024-02-29 18:24:06 +08:00 |
|
zhouzy062
|
0467efb452
|
退料
|
2024-02-29 17:35:46 +08:00 |
|
zhouzy062
|
6d5c5238d3
|
退料5
|
2024-02-29 16:17:56 +08:00 |
|
zhouzy062
|
188cc9672d
|
退料5
|
2024-02-29 16:14:58 +08:00 |
|
zhouzy062
|
c29db53cc7
|
退料4
|
2024-02-29 16:11:48 +08:00 |
|
zhouzy062
|
bc79ea26ab
|
退料3
|
2024-02-29 16:05:42 +08:00 |
|
zhouzy062
|
20568326b4
|
退料3
|
2024-02-29 16:03:02 +08:00 |
|
zhouzy062
|
4ea4c1f81b
|
退料2
|
2024-02-29 15:51:29 +08:00 |
|
zhouzy062
|
dd91266e73
|
退料修改
|
2024-02-29 15:41:18 +08:00 |
|
zhouzy062
|
78d5489af9
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-02-29 13:30:23 +08:00 |
|
zhouzy062
|
e9d8939263
|
前端ip配置
|
2024-02-29 13:30:01 +08:00 |
|
zhouzy062
|
9d056e4498
|
退料审批，结算审核
|
2024-02-29 13:29:34 +08:00 |
|
FrancisHu
|
2b82d31bf1
|
2.28新增查询
|
2024-02-28 13:31:56 +08:00 |
|
FrancisHu
|
abd8c517a5
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-02-28 09:52:02 +08:00 |
|
zhouzy062
|
15c8119f94
|
租赁平台登录
|
2024-02-27 18:02:33 +08:00 |
|
FrancisHu
|
6374843a63
|
2.27新增查询
|
2024-02-27 17:01:49 +08:00 |
|
zhouzy062
|
73e07c5bf8
|
退料
|
2024-02-27 14:13:21 +08:00 |
|
zhouzy062
|
df24c7e4bf
|
退料优化
|
2024-02-27 14:07:01 +08:00 |
|
zhouzy062
|
f77902ad2c
|
领料申请接口修改
|
2024-02-27 10:33:50 +08:00 |
|
zhouzy062
|
f42b926b71
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-02-26 20:16:24 +08:00 |
|
zhouzy062
|
76ce215d1f
|
领料管理
|
2024-02-26 20:16:16 +08:00 |
|
bns_han
|
cb2d8a551a
|
综合查询
|
2024-02-26 19:28:18 +08:00 |
|
zhouzy062
|
d4c9beff5e
|
领料审批权限
|
2024-02-26 18:43:14 +08:00 |
 bonus
|
1856249b0e
|
综合查询-领料查询
|
2024-02-26 14:14:19 +08:00 |
|
bonus
|
2861b288be
|
综合查询
|
2024-02-26 14:06:58 +08:00 |
|
zhouzy062
|
ad775627c5
|
费用结算
|
2024-02-26 10:17:48 +08:00 |
|
liang.chao
|
baa645f36b
|
退料申请表数据问题修改
|
2024-02-23 17:26:16 +08:00 |
|
zhouzy062
|
7942e4a93d
|
领料内部审核前端代码
|
2024-02-22 13:56:32 +08:00 |
|
zhouzy062
|
51d2ae84ca
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-02-21 18:28:49 +08:00 |
|
zhouzy062
|
ec04b2770e
|
新购验收机具配件验收入库驳回
|
2024-02-21 18:27:47 +08:00 |
|
zhouzy062
|
79ce2d3ce2
|
前台提交
|
2024-01-31 13:51:10 +08:00 |
|
liang.chao
|
713bc6ece2
|
Merge branch 'dev' into test-sso
# Conflicts:
# sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java
# sgzb-ui/vue.config.js
|
2024-01-30 15:09:59 +08:00 |
|
zhouzy062
|
101dd0e27d
|
前端配置
|
2024-01-30 10:50:26 +08:00 |
|
zhouzy062
|
2ff85222c6
|
登录接口对接
|
2024-01-30 10:35:06 +08:00 |
|
zhouzy062
|
c8511a8e9d
|
前端问题修改
|
2024-01-30 09:16:55 +08:00 |
|
liang.chao
|
9a47a636ab
|
Merge branch 'dev' into test-sso
# Conflicts:
# sgzb-ui/vue.config.js
|
2024-01-29 17:15:36 +08:00 |
|
zhouzy062
|
9352a18f75
|
前端问题修改1.29
|
2024-01-29 17:08:39 +08:00 |
|
zhouzy062
|
ffa76924f2
|
接口变更
|
2024-01-29 14:34:31 +08:00 |
|
zhouzy062
|
14407d7f7e
|
南网登录
|
2024-01-29 10:21:25 +08:00 |
|
zhouzy062
|
e1197aedc1
|
南网打包地址
|
2024-01-26 19:44:33 +08:00 |
|
zhouzy062
|
567732d51e
|
登陆前端代码
|
2024-01-26 19:11:15 +08:00 |
|
liang.chao
|
ddae3a4261
|
Merge branch 'dev' into test-sso
|
2024-01-26 16:09:48 +08:00 |
|
liang.chao
|
b0105ff73f
|
领料审核通过
|
2024-01-26 15:59:51 +08:00 |
|
zhouzy062
|
70fe005e8d
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-01-26 13:08:02 +08:00 |
|
zhouzy062
|
1fd7600a81
|
修改问题提交
|
2024-01-26 13:07:02 +08:00 |
|
zhouzy062
|
2d6b540764
|
Merge branch 'test' of http://192.168.0.56:3000/bonus/devicesmgt into test
|
2024-01-23 20:34:36 +08:00 |
|
zhouzy062
|
49e80e1f1c
|
图片上传及头像
|
2024-01-23 20:33:02 +08:00 |
|
zhouzy062
|
3ccf84651d
|
上传地址优化
|
2024-01-23 13:40:20 +08:00 |
|
zhouzy062
|
629f937be7
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-01-23 10:25:20 +08:00 |
|
zhouzy062
|
7b2d465d72
|
前端问题修改
|
2024-01-23 10:15:48 +08:00 |
|
liang.chao
|
c1f3d612e6
|
代码还原
|
2024-01-22 17:42:47 +08:00 |
|
zhouzy062
|
6b07845e13
|
测试问题修改，导航切换
|
2024-01-22 09:18:46 +08:00 |
|
zhouzy062
|
03819147ae
|
领料列表问题修改
|
2024-01-19 10:36:52 +08:00 |
|
zhouzy062
|
eb1ca9b5d9
|
打印单修改，新购配件验收入库，测试问题修改
|
2024-01-19 10:22:39 +08:00 |
|
zhouzy062
|
dbe3c870af
|
前端流程问题修改
|
2024-01-14 14:51:21 +08:00 |
|
zhouzy062
|
db86f585c0
|
领料，退料，维修1
|
2024-01-12 10:07:35 +08:00 |
|
zhouzy062
|
49320db995
|
导出功能，短信登录，领料模块优化审批
|
2024-01-10 16:29:46 +08:00 |
zhouxain01
|
152226b4e9
|
提交树形搜索
|
2023-12-25 13:37:00 +08:00 |
|
zhouxain01
|
8672cf565d
|
提交修试管理bug
|
2023-12-25 11:29:19 +08:00 |
|
zhouxain01
|
dd7a91b9a7
|
提交树形结构只能选择叶子节点
|
2023-12-25 10:59:28 +08:00 |
|
zhouxain01
|
aabcf222b1
|
提交退库修改字段值新增计量单位unitNames
|
2023-12-25 10:38:00 +08:00 |
|
zhouxain01
|
0e12123327
|
提交退库修改字段值新增计量单位
|
2023-12-25 10:32:21 +08:00 |
|
zhouxain01
|
b427947bbf
|
提交退库修改字段值
|
2023-12-25 10:09:51 +08:00 |
 13218645326
|
d3682b99fc
|
页面优化
|
2023-12-24 21:15:04 +08:00 |
|
zhouzy062
|
88dd16d839
|
后台管理系统前端问题修改
|
2023-12-24 17:54:27 +08:00 |
|
zhouzy062
|
1da8faf169
|
机具问题修改
|
2023-12-24 02:23:07 +08:00 |
|
zhouzy062
|
f90f5bea54
|
机具管理问题修改
|
2023-12-24 00:15:02 +08:00 |
|
zhouxain01
|
82ffd828c1
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-23 23:24:42 +08:00 |
|
zhouxain01
|
922f246362
|
提交退库相关代码
|
2023-12-23 23:24:35 +08:00 |
|
zhouzy062
|
891246c5a9
|
新购机具问题修改
|
2023-12-23 21:41:58 +08:00 |
wlikett
|
419cf70b3b
|
领料申请管理2
|
2023-12-23 19:51:46 +08:00 |
|
zhouzy062
|
5aeed17564
|
前端问题修改
|
2023-12-23 19:42:57 +08:00 |
|
wlikett
|
fd12bca625
|
领料申请管理
|
2023-12-23 18:42:25 +08:00 |
|
zhouzy062
|
3aa081ddd0
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2023-12-23 16:04:01 +08:00 |
|
zhouzy062
|
58bce3e6a3
|
新购机具代码提交
|
2023-12-23 16:03:15 +08:00 |
|
13218645326
|
d18dc7f9c4
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2023-12-23 13:27:12 +08:00 |
|
13218645326
|
cab2ceb199
|
退料申请
|
2023-12-23 13:27:04 +08:00 |
|
zhouzy062
|
1666636cab
|
新购编码管理修改
|
2023-12-22 19:16:39 +08:00 |
|
zhouzy062
|
2700fceceb
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2023-12-22 18:58:23 +08:00 |
|
zhouzy062
|
294fbc4d3e
|
新购编码修改
|
2023-12-22 18:57:52 +08:00 |
|
zhouxain01
|
5adcc35655
|
修改标签绑定按钮判断
|
2023-12-22 18:26:50 +08:00 |
|
zhouxain01
|
1a7fac7cb9
|
修改标签绑定代码提交
|
2023-12-22 17:29:57 +08:00 |
|
zhouxain01
|
aa2a2a7ab0
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-22 17:14:02 +08:00 |
|
zhouxain01
|
5ead43e5df
|
修改基础管理代码提交
|
2023-12-22 17:13:57 +08:00 |
|
wlikett
|
7bcd950052
|
设备级联搜索处理
|
2023-12-22 15:57:21 +08:00 |
|
13218645326
|
2a4b8420f6
|
退料
|
2023-12-22 15:55:19 +08:00 |
|
wlikett
|
9d8bd6d94b
|
领料任务详情接口对接 对接
|
2023-12-22 15:33:24 +08:00 |
|
zhouxain01
|
8aa87bdec8
|
修改标签相关代码
|
2023-12-22 14:05:57 +08:00 |
|
13218645326
|
5c50ce4706
|
编辑禁用上级选项
|
2023-12-21 20:44:28 +08:00 |
|
13218645326
|
4990efa585
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2023-12-21 20:31:37 +08:00 |
|
13218645326
|
2ab516141f
|
接口调试配件管理
|
2023-12-21 20:31:22 +08:00 |
|
zhouzy062
|
bb40579796
|
新购验收编码管理-1221-zzy
|
2023-12-21 20:24:30 +08:00 |
|
wlikett
|
bd608032e0
|
对接领料申请列表时间字段更新
|
2023-12-21 17:59:42 +08:00 |
|
wlikett
|
610ec741be
|
对接领料申请列表 和 提交领料申请
|
2023-12-21 17:57:21 +08:00 |
|
zhouxain01
|
87f8d807f8
|
修改修试相关代码
|
2023-12-21 17:54:28 +08:00 |
|
zhouxain01
|
347520897b
|
修改文件上传
|
2023-12-21 10:39:14 +08:00 |
|
zhouzy062
|
0ceae5c33b
|
上传接口对接
|
2023-12-21 10:00:48 +08:00 |
|
zhouzy062
|
dd36503472
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2023-12-21 09:59:46 +08:00 |
|
zhouxain01
|
ad8385a9a7
|
修改页面尺寸
|
2023-12-20 21:25:30 +08:00 |
|
zhouxain01
|
e6d490f840
|
修改repairStatusCode
|
2023-12-20 21:23:05 +08:00 |
|
zhouxain01
|
7bdd7d5cef
|
基础管理代码提交增加typeId
|
2023-12-20 20:44:17 +08:00 |
|
zhouxain01
|
bfcbefb516
|
基础管理代码提交增加id
|
2023-12-20 20:41:12 +08:00 |
|
zhouzy062
|
532b1c27ad
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2023-12-20 20:30:50 +08:00 |
|
zhouzy062
|
57981b50af
|
前端后台管理修改-1220-zzy
|
2023-12-20 20:29:06 +08:00 |
|
zhouxain01
|
90660f5a1b
|
基础管理代码提交
|
2023-12-20 20:17:03 +08:00 |
|
zhouxain01
|
5d1c802cb6
|
提交新增接口base
|
2023-12-20 20:13:27 +08:00 |
|
zhouxain01
|
597be4eb52
|
新增弹框功能
|
2023-12-20 13:37:27 +08:00 |
|
zhouxain01
|
70ab2fffd2
|
提交修改代码
|
2023-12-20 13:36:52 +08:00 |
|
zhouxain01
|
63741800c3
|
提交修改代码
|
2023-12-20 13:36:23 +08:00 |
|
zhouxain01
|
f24fc22ec7
|
提交修改代码
|
2023-12-20 13:35:45 +08:00 |
|
zhouxain01
|
ec5c98d53d
|
提交修改代码
|
2023-12-20 13:35:15 +08:00 |
|
zhouxain01
|
972945d294
|
提交修改代码
|
2023-12-20 13:34:43 +08:00 |
|
zhouxain01
|
89e89ba3e0
|
提交已修改修试相关代码
|
2023-12-19 17:05:40 +08:00 |
|
zhouxain01
|
ed81f60582
|
提交已修改修试相关代码bug
|
2023-12-19 16:38:35 +08:00 |
|
zhouxain01
|
2a00a61069
|
提交修试相关代码已修改bug
|
2023-12-19 16:34:00 +08:00 |
|
zhouxain01
|
e56fc4993a
|
提交修试相关代码已修改bug
|
2023-12-19 15:16:00 +08:00 |
|
zhouxain01
|
9eefbb9c23
|
提交修试相关代码
|
2023-12-19 15:15:03 +08:00 |
|
zhouzy062
|
fc3027e160
|
前端后台管理提交12-19-zzy
|
2023-12-19 04:26:18 +08:00 |
|
zhouxain01
|
8fa742fb8c
|
提交修试代码
|
2023-12-18 18:54:46 +08:00 |
zhouxian
|
b28eb2dc4f
|
提交修试代码
|
2023-12-18 18:49:33 +08:00 |
|
zhouxian
|
c31b209a1b
|
提交修试代码
|
2023-12-18 18:48:17 +08:00 |
|
zhouxian
|
b1abc0354d
|
提交修试代码
|
2023-12-18 18:33:36 +08:00 |
|
zhouxian
|
9716592887
|
提交修试代码
|
2023-12-18 18:31:36 +08:00 |
|
zhouxian
|
073e11c34c
|
提交修试代码
|
2023-12-18 18:27:54 +08:00 |
|
zhouxian
|
2d8d542967
|
提交修试代码
|
2023-12-18 18:24:34 +08:00 |
|
zhouxian
|
d87308f247
|
提交修试代码
|
2023-12-18 18:19:19 +08:00 |
|
zhouxian
|
d4de19921c
|
提交修试代码
|
2023-12-18 18:14:28 +08:00 |
|
zhouxian
|
3a270f21a0
|
提交修试相关代码
|
2023-12-18 18:12:02 +08:00 |
|
zhouxian
|
f56e2e872a
|
提交修试相关代码
|
2023-12-18 18:10:04 +08:00 |
|
zhouxian
|
e5a1caa356
|
提交修试相关代码
|
2023-12-18 17:47:47 +08:00 |
|
zhouxian
|
b2dcd6be48
|
提交修试相关代码
|
2023-12-18 17:43:35 +08:00 |
|
zhouzy062
|
b12e79209b
|
前端代码接口对接
|
2023-12-16 23:00:28 +08:00 |
|
zhouzy062
|
bf414d519c
|
前端接口对接-基础，仓储模块-12-16
|
2023-12-16 14:48:20 +08:00 |