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

578 Commits

Author SHA1 Message Date
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