Commit Graph

385 Commits

Author SHA1 Message Date
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
lSun 7d1736d9fa lsun 协议管理 2024-11-12 14:27:45 +08:00
weiweiw 2ee58cefb0 tokentime的输入大小进行限制 2024-11-12 10:53:58 +08:00
jjLv ac7f2bf296 Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui 2024-11-12 10:28:19 +08:00
jjLv a170b129cc 领料申请 2024-11-12 10:28:11 +08:00
zzyuan 9f5ccc7a06 新购接口参数 2024-11-12 09:58:20 +08:00
zzyuan 65aff8c6d7 新购管理接口参数修改 2024-11-11 18:32:47 +08:00
zzyuan 619ef2ad17 Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui 2024-11-11 18:12:53 +08:00
zzyuan 92badead39 退料管理,退料列表新增页面 2024-11-11 18:12:38 +08:00
jjLv 56dc6791fc 领料申请 2024-11-11 16:16:55 +08:00
jiang ae4a120987 用户登录问题修改 2024-11-11 13:42:53 +08:00
jjLv 9f7c29a2d9 领料管理 2024-11-11 12:12:48 +08:00
weiweiw 56d8178d32 角色和用户对内置属性进行开发 2024-11-11 11:55:02 +08:00
jjLv c7561b83e7 Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui 2024-11-11 09:52:21 +08:00
jjLv b4ea9dbf98 配件类型左侧树 2024-11-11 09:52:14 +08:00
weiweiw 2d898be6c4 告警功能增加 2024-11-11 09:49:34 +08:00
weiweiw daff010eb7 告警功能增加 2024-11-10 08:55:36 +08:00
zzyuan 3cb799255e Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui 2024-11-08 17:59:44 +08:00
zzyuan dc61d5d7a3 二级明细状态展示 2024-11-08 17:59:08 +08:00
BianLzhaoMin 543f3ce2d1 Merge branch 'dev-sy-11-8' into material-ui 2024-11-08 17:45:49 +08:00
zzyuan f12ac8ad1f Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui 2024-11-08 17:41:26 +08:00
BianLzhaoMin 8864dd40af 编码绑定页面完善 2024-11-08 17:41:07 +08:00
zzyuan 4d5b66281e 新购验收 2024-11-08 17:40:41 +08:00
jjLv 5d2a0e272b 站点配置 2024-11-08 17:27:11 +08:00
jjLv ce21f53e0e 站点配置 2024-11-08 16:13:43 +08:00
jjLv dec4a044b8 站点配置 2024-11-08 15:52:42 +08:00
zzyuan e710cbdac0 站点配置 2024-11-08 15:02:59 +08:00
jiang 68f09fcb7d 提交代码 2024-11-08 15:01:17 +08:00
jjLv 13714ee18e Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui 2024-11-08 14:29:31 +08:00