bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,930 Commits 17 Branches 0 Tags 43 MiB
Commit Graph

797 Commits

Author SHA1 Message Date
BianLzhaoMin 2c994c2bd4 优化插槽使用规范 2024-06-05 16:35:08 +08:00
binbin_pan 75e5a4d3f1 入库管理-审核弹框-操作按钮增加权限判断 2024-06-05 16:34:57 +08:00
binbin_pan c316048317 领料出库-增加手动出库结单 2024-06-05 15:41:36 +08:00
binbin_pan ed6da1696e 明文加解密 2024-06-05 14:52:16 +08:00
BianLzhaoMin 9f963fbdc8 领料页面优化 2024-06-05 14:03:17 +08:00
BianLzhaoMin 7cdd1e1e42 完善菜单权限 2024-06-05 10:08:46 +08:00
hayu facf7ffebc Merge remote-tracking branch 'origin/dev-nx' into dev-nx 
# Conflicts:
#	sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml
 2024-06-05 09:13:30 +08:00
BianLzhaoMin 24f60a356a 退料模块，权限菜单优化 2024-06-04 18:09:12 +08:00
BianLzhaoMin 76476069d5 领料管理菜单权限增加 2024-06-04 16:15:12 +08:00
BianLzhaoMin e4c4a9fd33 Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx 2024-06-04 15:02:44 +08:00
BianLzhaoMin d53bbaa645 领料退料菜单优化完成 2024-06-04 15:02:37 +08:00
binbin_pan a8fc887cd1 领料管理-查看详情-任务状态修改 2024-06-04 14:18:46 +08:00
binbin_pan d02a155852 解密初始密码 2024-06-04 14:05:26 +08:00
BianLzhaoMin f23f39483f Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx 2024-06-04 11:04:08 +08:00
BianLzhaoMin b168d5c1ac 仓库管理菜单梳理完成 2024-06-04 11:04:01 +08:00
binbin_pan 9fa92a9b22 弹框title统一改为:设备出库 2024-06-04 09:45:36 +08:00
hayu dd9d4d5c20 Merge remote-tracking branch 'origin/dev-nx' into dev-nx 
# Conflicts:
#	sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue
 2024-06-04 09:12:04 +08:00
BianLzhaoMin 67ea808d43 Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx 2024-06-03 18:06:31 +08:00
BianLzhaoMin 41ac88dc18 菜单配置优化，新购验收菜单下新增，修改等跳页面跳转重构 2024-06-03 18:06:22 +08:00
binbin_pan 2e19924104 综合查询-领料查询-列表增加车牌号、领料单号字段 2024-06-03 17:48:17 +08:00
binbin_pan 52e8e95c45 维修管理-维修-维修人下拉接口更换 2024-06-03 16:21:05 +08:00
binbin_pan f148a8fd77 工机具管理-类型管理-维修员、库管员下拉问题 2024-06-03 13:38:30 +08:00
BianLzhaoMin 60610d8f64 解决预报废页面无法显示问题 2024-06-03 09:35:35 +08:00
BianLzhaoMin eba8462ae0 预报废审核页面调试 2024-06-03 09:18:18 +08:00
BianLzhaoMin 3818d7e237 Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx 2024-06-03 09:01:04 +08:00
mashuai df24e8cb71 前端页面刷新 2024-05-31 16:32:47 +08:00
hayu f4d2a37cfe 新购流程修改 2024-05-31 13:09:02 +08:00
BianLzhaoMin 8fa53f2dad 预报废页面bug修改 2024-05-31 10:35:43 +08:00
BianLzhaoMin 6f50c3a9c9 优化登录页输入框无法验证问题 2024-05-30 18:26:39 +08:00
BianLzhaoMin 72919c2ffa 解决页面插槽使用不规范问题 2024-05-30 10:39:59 +08:00
BianLzhaoMin 2a453c8f14 清除南网相关配置 2024-05-29 17:13:05 +08:00
BianLzhaoMin ac1d192df7 领料申请页面字段微调 2024-05-29 14:21:42 +08:00
BianLzhaoMin 3be3fd24eb 优化页面展示，增加分公司审核按钮判断 2024-05-29 10:47:32 +08:00
BianLzhaoMin 7de764f72c 盘点入库页面优化 2024-05-28 18:42:17 +08:00
BianLzhaoMin 85997e5401 增加盘点入库详情查询功能 2024-05-28 16:54:30 +08:00
BianLzhaoMin bf1ad92297 解决列表序号延续问题 2024-05-28 14:55:56 +08:00
BianLzhaoMin 7174769903 解除重置密码跳转逻辑 2024-05-28 11:27:39 +08:00
BianLzhaoMin 5d53a58d78 解除密码加密 2024-05-28 10:37:43 +08:00
BianLzhaoMin c0ac8806c8 优化登录页面图形验证码校验问题 2024-05-27 16:33:12 +08:00
binbin_pan 2d37e70125 去除采购员下拉 多余的请选择选项 2024-05-25 12:24:59 +08:00
binbin_pan aa395fed2b 密码明文加密 2024-05-24 19:30:37 +08:00
binbin_pan 65859bd0cb 密码明文加密 2024-05-24 19:11:11 +08:00
binbin_pan 8697321719 打开弹窗调用树接口 2024-05-24 18:27:34 +08:00
binbin_pan c6d4e9f551 nx暂不使用加密 2024-05-24 13:28:51 +08:00
binbin_pan 5f64adb61d 明文加密 2024-05-23 19:12:48 +08:00
binbin_pan 1c94382ae0 增加初始密码登录后重置初始密码页 2024-05-23 17:32:12 +08:00
BianLzhaoMin d13d7b2374 Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx 2024-05-23 17:17:22 +08:00
BianLzhaoMin d07edc2818 优化领料管理页面列表备注字段报错问题 2024-05-23 17:17:16 +08:00
binbin_pan f272f0638f 限制头像上传图片格式 2024-05-23 14:22:41 +08:00
binbin_pan 53d757ce59 密码框增加小眼睛查看密码 2024-05-23 09:36:49 +08:00
binbin_pan a74db9ac70 fix: 用户密码明文传输漏洞 2024-05-22 15:15:35 +08:00
BianLzhaoMin 7c741e09b1 优化环境变量配置问题 区分测试环境与生产环境 2024-05-17 14:40:37 +08:00
BianLzhaoMin e33e2c8094 Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx 2024-05-17 14:27:48 +08:00
BianLzhaoMin a71a21d070 优化用户权限以及页面等样式问题 2024-05-17 14:27:43 +08:00
binbin_pan 25089dac0a 修改密码增加校验 2024-05-17 14:25:27 +08:00
BianLzhaoMin d48d3e82c3 增加报废列表等导出功能，封装重复组件，优化页面 2024-05-16 17:44:30 +08:00
BianLzhaoMin 7e1dd910f2 测试问题修改 并新增维修报废 退料报废两个静态页面 2024-05-16 14:16:49 +08:00
binbin_pan 412cd85ae7 退料接收详情-查看接口 2024-05-15 15:13:17 +08:00
binbin_pan d163158826 去除多余字段 2024-05-15 13:45:52 +08:00
binbin_pan 4964d48407 fix: 1592 预报废审核无法进行导出 2024-05-15 12:09:37 +08:00
BianLzhaoMin 04553ab094 Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx 2024-05-15 11:29:25 +08:00
BianLzhaoMin 74664cd0b4 优化预报废列表字段展示问题 2024-05-15 11:29:17 +08:00
binbin_pan a377d31610 fix: bug 修复 2024-05-15 09:50:45 +08:00
BianLzhaoMin 244c850889 Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx 2024-05-15 08:46:47 +08:00
BianLzhaoMin 42a8e5c561 优化测试问题 2024-05-15 08:46:38 +08:00
binbin_pan e95995911c fix: 1594 报废列表中部分搜索条件无法进行搜索 2024-05-14 17:59:05 +08:00
BianLzhaoMin 2a284b8d52 合并冲突 2024-05-14 15:54:22 +08:00
BianLzhaoMin 5316d97e2b 优化权限数据流程 2024-05-14 15:53:42 +08:00
binbin_pan 0ce4cc37be 宁夏大屏跳转链接 2024-05-13 14:13:07 +08:00
binbin_pan ada8e96ccd 宁夏大屏不显示问题 2024-05-13 10:11:43 +08:00
BianLzhaoMin 12a1c479ee 优化审核问题 2024-05-11 18:05:49 +08:00
BianLzhaoMin f31c01c045 优化流程 2024-05-08 17:43:00 +08:00
BianLzhaoMin 360f2fc5cc 优化权限流程问题 2024-05-08 17:26:31 +08:00
BianLzhaoMin 3db5bbb1f0 优化权限流程 2024-05-08 16:50:01 +08:00
BianLzhaoMin 1272ccda12 优化流程 2024-05-08 15:59:37 +08:00
BianLzhaoMin 8731cdc995 优化 2024-05-07 21:17:16 +08:00
BianLzhaoMin d0d700208f 优化 2024-05-07 17:37:03 +08:00
BianLzhaoMin f6c1bdb1c7 冲突合并 2024-05-07 16:38:53 +08:00
BianLzhaoMin 2463392124 测试问题优化 2024-05-07 16:31:07 +08:00
BianLzhaoMin b340c8ec01 Merge branch 'dev-cq-bug' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq-bug 2024-05-07 11:14:15 +08:00
BianLzhaoMin 5a7856a150 测试问题优化 2024-05-07 11:14:11 +08:00
binbin_pan b5e0736479 fix: 1478 待报废中，先输写必填项内容，再将内容删除，点击保存按钮，页面提示操作成功 2024-05-07 09:15:23 +08:00
BianLzhaoMin 4686425fbb 冲突合并 2024-05-06 19:37:14 +08:00
BianLzhaoMin bbd4cd5409 优化测试问题 2024-05-06 19:32:16 +08:00
hhui b86f8fd839 fix:报废明细图片添加无数据展示 2024-05-06 17:56:22 +08:00
binbin_pan 2051c7c8d2 fix: 1474 待报废上传图片时，若选择超过3张图片，弹出2次提示 2024-05-06 17:52:21 +08:00
hhui e3c493cfaf fix:修饰入库查询清空 2024-05-06 17:49:02 +08:00
hhui 40ec1a1fc7 fix:维修数量校验 2024-05-06 17:34:41 +08:00
binbin_pan f502ec3294 fix: 1454 内部维修只能添加配件不能删除多余页 2024-05-06 17:30:53 +08:00
liang.chao d3ecfdeaa0 Merge branch 'dev' into dev-cq-bug 2024-05-06 17:09:37 +08:00
zzyuan 94deba2140 退料接收数量反显 2024-05-06 17:07:08 +08:00
binbin_pan f70f0462d6 fix: 1458 内部维修字段必填项，没有f必填项标识 2024-05-06 17:06:10 +08:00
hhui d1d7c93872 fix:bug修改 2024-05-06 17:03:01 +08:00
hhui 6015dd0ae5 fix:bug修改 2024-05-06 16:49:45 +08:00
binbin_pan 8a67438b15 fix: 1453 退料审核时被驳回，驳回后修改数据再次提交，审核时查看的数据依然是驳回前的数据 2024-05-06 16:42:25 +08:00
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