bonus
/
bonus-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
526 Commits 22 Branches 0 Tags 133 MiB
Commit Graph

513 Commits

Author SHA1 Message Date
bb_pan e4271bd4ed 网省地图 2025-09-17 17:56:23 +08:00
bb_pan 6ccc4c1726 网省地图 2025-09-17 17:28:55 +08:00
bb_pan 856f789ae2 用户信息 2025-09-17 17:16:00 +08:00
bb_pan 215853e321 网省地图 2025-09-16 18:09:52 +08:00
zzyuan ef275b7441 地市大屏接口对接3 2025-09-16 00:17:47 +08:00
zzyuan 553892a1f1 Merge branch 'ma-mall-ui' of http://192.168.0.75:3000/bonus/bonus-ui into ma-mall-ui 2025-09-15 23:46:02 +08:00
zzyuan 2429f26b5c 地市大屏接口对2 2025-09-15 23:45:56 +08:00
BianLzhaoMin 61eb8ce32c 优化 2025-09-15 23:19:39 +08:00
BianLzhaoMin 35379a8a48 装备退役页面完善 2025-09-15 23:11:16 +08:00
BianLzhaoMin 44630ec7b6 页面优化 2025-09-15 22:04:04 +08:00
BianLzhaoMin 9424abb3b6 页面完善 2025-09-15 21:53:20 +08:00
zzyuan d766855c3c Merge branch 'ma-mall-ui' of http://192.168.0.75:3000/bonus/bonus-ui into ma-mall-ui 2025-09-15 17:50:07 +08:00
zzyuan 95796fbb84 地市大屏接口对接 2025-09-15 17:50:00 +08:00
BianLzhaoMin 02d08c2e32 装备流转记录页面完善 2025-09-15 11:00:09 +08:00
zzyuan 5853f12ce8 地级大屏页面初始化3 2025-09-15 10:49:50 +08:00
zzyuan 26c4fc819a Merge branch 'ma-mall-ui' of http://192.168.0.75:3000/bonus/bonus-ui into ma-mall-ui 2025-09-15 09:24:07 +08:00
zzyuan 2a92ac163f 地级大屏页面初始化2 2025-09-15 09:23:58 +08:00
BianLzhaoMin b18c8dec29 出库页面搭建以及接口调试 2025-09-14 22:15:53 +08:00
zzyuan 1ee6c36361 地级大屏页面初始化 2025-09-14 19:34:02 +08:00
BianLzhaoMin 883805c498 路由配置 2025-09-14 15:13:42 +08:00
zzyuan fd3f875751 大屏初始化 2025-09-14 15:07:01 +08:00
shengxian 83496cb4c3 feat: 增加大屏文件夹 2025-09-14 14:53:33 +08:00
jiang e6c16c24e7 装备类型管理 2025-08-12 19:15:51 +08:00
jiang 0ecafb4654 装备类型管理 2025-08-12 18:52:05 +08:00
lizhenhua 4dccab085b 基本配置修改 优化 2025-07-04 16:22:14 +08:00
lizhenhua cb18f8232d 基本配置修改 优化 2025-07-03 13:56:56 +08:00
jiang a2c5ceaf41 装备配置管理 2025-07-01 16:24:49 +08:00
lizhenhua 6aaa754c62 装备 2025-07-01 11:04:42 +08:00
lizhenhua b50d71cf11 装备配置管理 2025-06-27 17:46:55 +08:00
syruan 7361779af9 feat(notice): 公告内容使用富文本编辑器替换普通文本域 
- 用 Editor 组件替换了原有的 el-input textarea
- 添加了上传配置，支持文件上传
- 对富文本内容进行 URL 编码和解码，确保数据传输的正确性
-优化了表单提交逻辑，增加了错误处理
 2025-06-02 16:13:45 +08:00
bb_pan 527a31753f 优化 2025-06-02 15:50:57 +08:00
hongchao 2b43764020 bug修复 2025-05-26 15:45:27 +08:00
bb_pan 36ec4193eb 优化 2025-04-21 13:20:14 +08:00
bb_pan 8f00a8fd70 优化 2025-04-21 11:17:40 +08:00
bb_pan e3d019ec7d 优化 2025-04-17 10:47:43 +08:00
bb_pan 8414d1c2ce 优化 2025-04-16 18:13:53 +08:00
bb_pan e255c670cf bug 修复 2025-04-08 09:43:02 +08:00
bb_pan d9e319d378 图片大小 2025-03-31 12:20:48 +08:00
bb_pan a6e3ca99bb 图片格式 2025-03-31 12:17:46 +08:00
BianLzhaoMin f2a731f9e8 bug修复 2025-03-26 17:31:53 +08:00
BianLzhaoMin 938efea6b4 bug修复 2025-03-26 10:40:27 +08:00
bb_pan a8e4987812 上传地址问题优化 2025-03-25 09:50:32 +08:00
bb_pan 3db2a66c28 去除首页官网信息 2025-03-19 09:26:54 +08:00
BianLzhaoMin 8e9cdbecb8 页面问题修复 2025-03-17 16:09:06 +08:00
bb_pan 0f53867576 公告 2025-03-12 18:12:27 +08:00
bb_pan 1a0a566a4f 跳转优化 2025-02-26 17:02:18 +08:00
bb_pan 74e442730a 出租设备查询 2025-02-24 13:50:46 +08:00
bb_pan 8782263054 打包配置 2025-02-14 18:02:50 +08:00
bb_pan 8915f0081d 宏源打包配置 2025-02-14 11:08:31 +08:00
bb_pan 207865f79a bug修复 2025-02-13 14:46:44 +08:00
bb_pan bb84f4b136 bug修复与登录页内容修改 2025-02-13 14:31:39 +08:00
BianLzhaoMin 4747e467e8 轮播图装修问题修复 2025-01-16 13:17:31 +08:00
BianLzhaoMin 9ee8de8321 冲突合并 2025-01-16 10:42:18 +08:00
BianLzhaoMin 58c6baae4c 轮播图代码优化 2025-01-16 10:39:48 +08:00
BianLzhaoMin 18ca4de3e0 代码优化 2025-01-16 09:49:20 +08:00
BianLzhaoMin 7e30890122 轮播图接口增加 2025-01-16 09:24:53 +08:00
BianLzhaoMin 546f1f4ea1 增加轮播图配置 2025-01-15 13:16:34 +08:00
BianLzhaoMin 28b58646c2 增加配置 2025-01-15 10:09:35 +08:00
BianLzhaoMin d1cab21626 增加上传入口 2025-01-15 10:07:56 +08:00
BianLzhaoMin 24d6b536a2 轮播图配置页面增加以及打包iws修改 2025-01-15 10:05:56 +08:00
BianLzhaoMin 72a93cf695 样式问题优化 2025-01-10 15:54:16 +08:00
BianLzhaoMin e07c237201 代码优化 2025-01-09 17:28:20 +08:00
BianLzhaoMin 1346c150fe 优化 2025-01-09 15:11:12 +08:00
BianLzhaoMin 5f0f633adb 代码优化 2025-01-09 15:10:55 +08:00
BianLzhaoMin 8852031f72 代码修复 2025-01-09 15:08:16 +08:00
BianLzhaoMin bd1b55d4db 问题清单修复 2025-01-08 17:11:53 +08:00
BianLzhaoMin 9b37f1a3fd 权限模板功能调试 2025-01-08 14:51:27 +08:00
BianLzhaoMin 9704d0d055 公司管理功能完善 2025-01-08 13:15:29 +08:00
BianLzhaoMin 75787c5aac 冲突合并 2025-01-08 09:26:32 +08:00
sxu 571c4fead2 公司管理 2025-01-06 14:36:27 +08:00
weiweiw 7d78be85eb 根据机具项目的要求回滚"增加顶级部门",因为新增了多公司管理 2025-01-06 11:17:08 +08:00
BianLzhaoMin fb239b925f 代码优化 2025-01-03 17:56:43 +08:00
BianLzhaoMin 08f18189fc 代码优化 2025-01-03 17:24:15 +08:00
BianLzhaoMin 60facdcc5c 优化 2025-01-03 15:26:27 +08:00
BianLzhaoMin 5dd0386da4 优化 2025-01-03 15:17:33 +08:00
BianLzhaoMin 2bce41582e 公司管理模块完善 2025-01-03 15:03:10 +08:00
BianLzhaoMin 81753f5a0c 代码还原 2025-01-03 09:43:29 +08:00
BianLzhaoMin 8252f4b63b 公司管理页面晚上 2024-12-31 17:49:45 +08:00
hongchao 34ebf96d6e bug修复 2024-12-31 17:05:06 +08:00
BianLzhaoMin 5b64a7f3e9 页面完善 2024-12-30 18:14:06 +08:00
BianLzhaoMin 72cddc1d17 公司注册功页面提交 2024-12-30 18:07:53 +08:00
BianLzhaoMin 63630742cb 代码修复 2024-12-26 18:26:05 +08:00
hongchao c7d6631857 bug修复 2024-12-20 11:06:40 +08:00
hongchao abc4e5db4c Merge branch 'ma-mall-ui' of http://192.168.0.56:3000/bonus/bonus-ui into ma-mall-ui 2024-12-19 16:09:18 +08:00
hongchao dcee05ea36 综合查询中租赁订单查询（居中未解决） 2024-12-19 16:09:08 +08:00
BianLzhaoMin 8a7134450f 打包配置修改 2024-12-18 18:12:55 +08:00
hongchao f64914152a 综合查询 2024-12-18 18:09:06 +08:00
hongchao ae6f19e332 新增属性bug修复 2024-12-16 12:23:53 +08:00
sxu 6e5d37ec91 glweb change 2024-12-16 10:47:52 +08:00
jiang 85477dbeb9 用户登录问题修改 2024-12-15 16:44:52 +08:00
BianLzhaoMin 90d5b498a6 代码优化 2024-12-13 17:02:02 +08:00
jjLv a98fcd1702 Merge branch 'ma-mall-ui' of http://192.168.0.56:3000/bonus/bonus-ui into ma-mall-ui 2024-12-11 13:05:45 +08:00
jjLv 0f251e1974 新增属性功能优化 2024-12-11 13:05:25 +08:00
BianLzhaoMin e7ed45b13c Merge branch 'ma-mall-ui' of http://192.168.0.56:3000/bonus/bonus-ui into ma-mall-ui 2024-12-10 14:02:16 +08:00
BianLzhaoMin d36ec65fed 安全证书功能完善 2024-12-10 14:02:08 +08:00
jjLv 7eec96468e bug修复 2024-12-10 11:10:18 +08:00
jjLv 17b907ff52 bug 2024-12-10 11:02:31 +08:00
jjLv 3cb5273ca0 二级新增属性 2024-12-10 10:53:23 +08:00
BianLzhaoMin 6e1893f596 装备改价功能开发 2024-12-09 14:10:58 +08:00
jiang cb7c8ca427 用户登录问题修改 2024-12-08 17:35:17 +08:00
zzyuan fc28dca8c4 装备类型接口对接 2024-11-27 17:56:15 +08:00
zzyuan 9578dbdd81 Merge branch 'ma-mall-ui' of http://192.168.30.2:3000/bonus/bonus-ui into ma-mall-ui 2024-11-27 14:52:49 +08:00
zzyuan 49e66c91ff 装备类型 2024-11-27 14:52:35 +08:00
sxu 83550454bc fix conflict 2024-11-27 12:32:34 +08:00
zzyuan fb44ac12fd 装备列表新增参数修改 2024-11-26 14:56:36 +08:00
zzyuan ab87fbd2f0 Merge branch 'ma-mall-ui' of http://192.168.30.2:3000/bonus/bonus-ui into ma-mall-ui 2024-11-26 14:26:45 +08:00
zzyuan 631f13fefd 装备列表接口修改 2024-11-26 14:26:34 +08:00
jjLv 5a35954dc9 Merge branch 'ma-mall-ui' of http://192.168.0.56:3000/bonus/bonus-ui into ma-mall-ui 2024-11-26 13:34:49 +08:00
jjLv cfaa20bd68 承租方订单 2024-11-26 13:34:39 +08:00
zzyuan ce52f40c31 装备列表接口对接 2024-11-26 08:58:16 +08:00
jjLv 9f8650b8cc Merge branch 'ma-mall-ui' of http://192.168.0.56:3000/bonus/bonus-ui into ma-mall-ui 2024-11-25 18:23:57 +08:00
jjLv 24a86eeab3 订单详情 2024-11-25 18:23:50 +08:00
zzyuan 3ac370bdd0 Merge branch 'ma-mall-ui' of http://192.168.30.2:3000/bonus/bonus-ui into ma-mall-ui 2024-11-25 17:43:48 +08:00
zzyuan 496e833267 装备列表功能完善接口对接 2024-11-25 17:43:35 +08:00
jjLv 1f5ef4499f 订单出租 2024-11-25 17:20:12 +08:00
jjLv 7e408e4645 订单出租 2024-11-25 16:45:59 +08:00
jjLv 3aca071d40 订单出租 2024-11-25 14:31:16 +08:00
jjLv 3a5652e51d 订单出租页面搭建 2024-11-25 13:14:13 +08:00
liang.chao f9fa2c5c71 设备上下架开发 2024-11-23 17:44:59 +08:00
zzyuan 4c10944e92 装备管理列表新增编辑删除 2024-11-22 18:58:17 +08:00
zzyuan 491edf48db 装备新增 2024-11-22 14:23:41 +08:00
zzyuan f9b094594d 出租方初始列表文件夹 2024-11-22 10:37:21 +08:00
zzyuan 757fba9a51 退料修改 2024-11-20 17:51:26 +08:00
weiweiw 9e48b04404 具有审计管理和系统管理角色的用户应不允许被修改和删除 2024-11-20 11:35:35 +08:00
zzyuan 6bff12a6de Merge branch 'material-ui' of http://192.168.30.2:3000/bonus/bonus-ui into material-ui 2024-11-20 10:07:29 +08:00
zzyuan 07001f3125 退料编码类型改为表格勾选选择 2024-11-20 10:07:18 +08:00
jjLv 10ca309ef6 Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui 2024-11-19 18:27:13 +08:00
jjLv 2a59185686 维修管理 2024-11-19 18:27:04 +08:00
lSun 4190ef23d8 lsun 协议管理-树结构修改 2024-11-19 14:59:28 +08:00
lSun 80f6434927 lsun 协议管理-树结构修改 2024-11-19 13:38:57 +08:00
lSun 19f85a82a5 lsun 协议管理-树结构修改 2024-11-19 11:12:52 +08:00
jjLv 8c5cf9aac4 Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui 2024-11-19 10:42:55 +08:00
jjLv b3c1870869 维修 2024-11-19 10:42:45 +08:00
zzyuan 40b1702b9e 新购一级列表分页 2024-11-19 10:10:23 +08:00
zzyuan 6626ee3aac 新购前端问题修改 2024-11-19 09:12:57 +08:00
zzyuan 6735bbddaf 退料批量提交按钮隐藏 2024-11-18 15:10:21 +08:00
zzyuan b0c5e9a9d9 新购入库 2024-11-18 14:29:16 +08:00
zzyuan 5abd6c1b7f 新购编码入库 2024-11-18 14:21:13 +08:00
zzyuan d733f047a6 新购编码入库 2024-11-18 13:49:05 +08:00
zzyuan 2598daaa9a 编码入库 2024-11-18 13:47:20 +08:00
zzyuan b72fb1c1c4 新购入库编码入库 2024-11-18 10:19:25 +08:00
weiweiw 666cbbdde9 用户和角色list 对id 为1 或内置的 不能删除或修改 2024-11-18 09:49:49 +08:00
zzyuan 3938b14243 Merge branch 'material-ui' of http://192.168.30.2:3000/bonus/bonus-ui into material-ui 2024-11-16 18:16:37 +08:00
zzyuan acc549943f 领料申请出库数量判断 2024-11-16 18:14:00 +08:00
jjLv bfcdd158b1 编码出库状态传1 2024-11-16 16:11:28 +08:00
zzyuan b998cf5b55 领料出库添加leaseType 2024-11-16 16:07:37 +08:00
zzyuan 145d6feaf6 新购参数修改 2024-11-16 15:48:33 +08:00
zzyuan 2e009ddc19 新购入库 2024-11-16 15:25:23 +08:00
jjLv 5832a7f9ca 领料出库 2024-11-16 14:01:15 +08:00
zzyuan 21eb93dc29 Merge branch 'material-ui' of http://192.168.30.2:3000/bonus/bonus-ui into material-ui 2024-11-15 19:29:00 +08:00
zzyuan 4328eb32c9 退料单 2024-11-15 19:28:43 +08:00
jjLv cba02963da Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui 2024-11-15 19:07:17 +08:00
jjLv d1fd246499 领料申请 2024-11-15 19:07:10 +08:00
lSun 6d368377d8 lsun 领料出库-数量出库 2024-11-15 18:53:30 +08:00
zzyuan b9603f1ccc Merge branch 'material-ui' of http://192.168.30.2:3000/bonus/bonus-ui into material-ui 2024-11-15 18:33:42 +08:00
zzyuan 879f1f4661 退料接口对接，维修接口对接 2024-11-15 18:33:30 +08:00
jjLv f9425a1188 验收 2024-11-15 17:50:37 +08:00
jjLv 00460397fb 验收 2024-11-15 17:45:08 +08:00
jjLv f32baffd4e 验收 2024-11-15 17:41:14 +08:00
jjLv 499dd3fe78 验收管理模式 2024-11-15 17:37:34 +08:00
jjLv f6bad9b43d 联调 2024-11-15 17:03:07 +08:00
jjLv 31c8917d86 绑定bug修复 2024-11-15 16:43:33 +08:00
jjLv 64fa253bcf 绑定 2024-11-15 16:02:29 +08:00
jjLv 576f6d11b9 绑定 2024-11-15 15:22:57 +08:00
jjLv 8e2381ce29 领料出库细节优化 2024-11-15 14:30:49 +08:00
jjLv ad1108ae23 修饰审核二级页面 2024-11-15 13:53:51 +08:00
weiweiw e2e439ba30 用户和角色list 对id 为1 或内置的 不能删除或修改 2024-11-15 11:24:37 +08:00
jjLv 4229d9a236 领料出库 2024-11-15 09:25:43 +08:00
jjLv 73354af9bc 领料出库 2024-11-15 09:22:11 +08:00
jjLv edf3233332 Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui 2024-11-15 09:03:29 +08:00
jjLv 3ef6e9ae58 修试审核 2024-11-15 09:03:22 +08:00
zzyuan f58951364a Merge branch 'material-ui' of http://192.168.30.2:3000/bonus/bonus-ui into material-ui 2024-11-14 18:06:21 +08:00
zzyuan 3e54607772 退料联调代码提交 2024-11-14 18:06:10 +08:00
jjLv d481bb6f40 Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui 2024-11-14 17:31:53 +08:00
jjLv aa73d0d6a0 领料出库 2024-11-14 17:31:45 +08:00
zzyuan 3511ca822c 维修任务管理一级二级页面绘制 2024-11-14 17:22:44 +08:00
jjLv cca3b4a1e9 出库 2024-11-14 16:11:28 +08:00
jjLv 14bb2ffb55 领料出库 2024-11-14 15:30:10 +08:00
lSun 0e95fcebbf lsun 维修管理 2024-11-14 15:26:24 +08:00
jjLv 7affaf9a39 租赁工程下拉框 2024-11-14 13:20:52 +08:00
jjLv 18628e8288 领料申请 2024-11-14 12:57:47 +08:00
lSun 0b500b85af lsun 维修管理 2024-11-14 11:06:10 +08:00
lSun 67f2029cd8 lsun 维修管理 2024-11-14 10:38:52 +08:00
zzyuan 0e8ebc3559 退料接受接口对接 2024-11-14 10:31:33 +08:00
jjLv 882b72ad1b 领料出库 2024-11-14 08:49:14 +08:00
lSun e193a6cfe4 lsun 协议管理 2024-11-13 18:19:51 +08:00
lSun e8b2118da1 lsun 协议管理 2024-11-13 18:12:12 +08:00
lSun 86f2803c26 lsun 协议管理 2024-11-13 16:34:16 +08:00
jjLv 6d2104dff3 领料申请 2024-11-13 16:05:29 +08:00
jjLv 94b92c7f84 领料 2024-11-13 14:40:58 +08:00
lSun 7a66eb028e lsun 协议管理 2024-11-13 14:20:15 +08:00
jjLv 82bf1bfa51 领料权限 2024-11-13 14:04:19 +08:00
jjLv ef9733ef31 Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui 2024-11-13 14:00:41 +08:00
jjLv 5ee4f3a9ca 领料 2024-11-13 14:00:32 +08:00
lSun 3bce0ae649 lsun 协议管理 2024-11-13 13:56:53 +08:00
lSun 9d5bcd5b4f lsun 协议管理 2024-11-12 18:43:01 +08:00
lSun 4ddaf1aee1 lsun 协议管理 2024-11-12 18:27:02 +08:00
jjLv 2710040308 Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui 2024-11-12 15:05:28 +08:00
jjLv 12acf2d76b 领料出库 2024-11-12 15:05:17 +08:00
weiweiw 5691d366f9 手机号脱敏显示 2024-11-12 14:56:22 +08:00