Commit Graph

401 Commits

Author SHA1 Message Date
syruan 3c9bf5de20 API 2024-12-10 17:23:07 +08:00
syruan a112a45fd4 API 2024-12-10 17:22:22 +08:00
zzyuan 845dbd8de9 Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui 2024-12-10 16:43:43 +08:00
zzyuan 3746d95761 维修弹窗修改 2024-12-10 16:43:32 +08:00
syruan 65c016f593 工地直转页面 2024-12-09 18:20:38 +08:00
syruan ca4de9560c BUG修复 2024-12-06 18:23:17 +08:00
zzyuan 9737b3a598 结算管理代码文件结构优化 2024-12-06 17:23:40 +08:00
zzyuan 297b91f20e 退料新增接口调节 2024-12-06 15:46:26 +08:00
zzyuan 26e1e91d83 测试问题修改,设备类型加计量方式小数整数 2024-12-06 11:23:15 +08:00
zzyuan de0edb532a 结算管理对接 2024-12-05 17:52:22 +08:00
zzyuan e429e80e14 物资管理问题修改,结算管理页面绘制 2024-12-04 18:05:59 +08:00
zzyuan dd1f966c1f 领料数量问题修改2 2024-12-04 11:07:44 +08:00
zzyuan 69d95f2707 领料数量问题修改 2024-12-04 11:06:23 +08:00
zzyuan 939f3c3dd2 测试问题修改 2024-12-04 10:42:34 +08:00
zzyuan 1efb239d74 维修模块前端修改 2024-12-04 09:33:35 +08:00
bonus 4815dc8484 修改修试审核数据字典 2024-12-04 08:54:48 +08:00
bonus 8381a79ab3 维修单修改 2024-12-03 19:13:59 +08:00
zzyuan 84dae5a3fc Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui 2024-12-03 18:41:43 +08:00
zzyuan b65aa5b75b 测试问题修改zzy 2024-12-03 18:41:30 +08:00
bonus e56dedc5ba Merge branch 'material-ui' of http://192.168.30.2:3000/bonus/bonus-ui into material-ui 2024-12-03 17:49:04 +08:00
bonus f5da08f165 修改退料单打印状态 2024-12-03 17:48:15 +08:00
zzyuan 720e979d7e 测试问题修改,物资类型 2024-12-03 17:41:58 +08:00
bonus 512f5243b9 样式修改 2024-12-03 13:53:28 +08:00
zzyuan ac9dc6b851 新购模块测试问题修改 2024-12-03 10:18:11 +08:00
syruan 74a0d87455 BUG修复 2024-12-03 09:18:08 +08:00
zzyuan 2c622722ac 测试bug修改2 2024-12-02 12:10:24 +08:00
zzyuan 8ba6fb2a13 测试问题修改zzy' 2024-12-02 11:08:27 +08:00
zzyuan d4cb578751 Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui 2024-11-29 17:04:55 +08:00
zzyuan 7665908991 机具大融合问题修改 2024-11-29 17:03:51 +08:00
jjLv 47860e17be Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui 2024-11-29 16:56:37 +08:00
jjLv 61394340fe 修试后入库以及维修数量管理有效性 2024-11-29 16:56:30 +08:00
bonus 40eedf86ef 1基础管理人员配置权限功能修改 2024-11-29 14:11:03 +08:00
jjLv 9263107c7c Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui 2024-11-29 13:55:19 +08:00
jjLv 15c7ffd52d 新购绑定二维码,维修数量检验 2024-11-29 13:55:10 +08:00
bonus 288ac73cbb 1基础管理2物资管理权限功能修改 2024-11-29 13:39:19 +08:00
zzyuan 663800aadd 测试问题修改 2024-11-29 11:23:13 +08:00
zzyuan 1732b2a5de 维修问题修改 2024-11-28 16:03:11 +08:00
zzyuan 4ed595a377 测试问题修改 2024-11-28 16:01:52 +08:00
bonus 2f8c6a6060 冲突合并 2024-11-27 18:31:42 +08:00
bonus d8c440ae0a delete请求修改post请求 2024-11-27 18:28:00 +08:00
BianLzhaoMin 0563089229 冲突合并 2024-11-26 10:22:33 +08:00
jjLv 3023310edd 修试后入库 2024-11-25 17:29:45 +08:00
jjLv fdb9cd241b 外层修试通过接口 2024-11-25 16:50:32 +08:00
jjLv ffcff6ab25 auditid 2024-11-25 14:32:01 +08:00
jjLv 5662d354cb 修试审核参数补全 2024-11-25 14:27:30 +08:00
jjLv f6347e6f4a 修试审核通过 2024-11-25 14:22:23 +08:00
jjLv 9b4999fe00 修试审核页面联调 2024-11-25 14:02:34 +08:00
jjLv e37a66e623 合格刷新页面 2024-11-25 13:16:53 +08:00
jjLv 353247efb2 修试审核状态 2024-11-25 11:22:14 +08:00
jjLv ad05b5389d 维修勾选限定 2024-11-25 11:10:50 +08:00
jjLv 7f885d25c4 维修合格 2024-11-25 10:48:52 +08:00
jjLv d43507f7f0 维修管理 2024-11-25 10:46:48 +08:00
jjLv 4dbfef45b7 维修合格 2024-11-25 09:47:08 +08:00
jjLv 051b4cb8c1 维修管理 2024-11-23 11:11:53 +08:00
jjLv e782a52db5 维修管理bug修复 2024-11-22 17:03:53 +08:00
jjLv 4caac39667 分页与省略 2024-11-22 14:07:50 +08:00
jjLv 6e15db37dd 维修任务查看页面 2024-11-22 13:43:37 +08:00
jjLv e8d1aa05e0 Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui 2024-11-22 10:18:45 +08:00
jjLv 6c95b8e2c3 修试后入库 2024-11-22 10:18:37 +08:00
zzyuan b5242d634c 退料相关修改 2024-11-22 09:04:26 +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