Commit Graph

1413 Commits

Author SHA1 Message Date
bb_pan 61dbeb0315 优化 2025-11-10 15:53:57 +08:00
bb_pan d580421cc7 优化 2025-11-10 09:31:34 +08:00
hayu 1739543c5e 协议分部工程字段去除 2025-11-10 09:04:49 +08:00
bb_pan c346179492 日期选择更换为2个 2025-11-08 16:18:58 +08:00
bb_pan fafc306476 优化 2025-11-07 17:14:50 +08:00
bb_pan b084517aeb 优化 2025-11-07 17:02:05 +08:00
mashuai 253b813b57 优化 2025-11-07 16:45:54 +08:00
hongchao 636da4818a Merge branch 'material-ui' of http://192.168.30.2:3000/bonus/bonus-ui into material-ui 2025-11-07 16:25:54 +08:00
hongchao dde99b5a4c 业务联系单pdf导出 2025-11-07 16:25:46 +08:00
bb_pan fbaf1a31b4 领料出库-增加查询条件 2025-11-07 15:26:54 +08:00
hayu f7ec877efa 授权文件校验 2025-11-07 10:35:43 +08:00
hayu e00afb3606 退料、维修、维修审核页面 2025-11-07 09:19:14 +08:00
hongchao 0e4b980e49 Merge branch 'material-ui' of http://192.168.30.2:3000/bonus/bonus-ui into material-ui 2025-11-06 17:22:48 +08:00
hongchao 40ff5283d1 结算全部打印,未结算报表zip导出,盘点入库编号设置 2025-11-06 17:22:45 +08:00
syruan 1909bd68e1 未结算历史报表的导出 2025-11-06 13:40:10 +08:00
hongchao 532a1395af Merge branch 'material-ui' of http://192.168.30.2:3000/bonus/bonus-ui into material-ui 2025-11-05 18:02:27 +08:00
hongchao 1cf9136589 结算审批页面,导出,直转审核导出 2025-11-05 18:02:22 +08:00
hayu 30250b7570 保有量查询增加筛选条件 2025-11-05 10:59:46 +08:00
hongchao 2c18753063 Merge branch 'material-ui' of http://192.168.30.2:3000/bonus/bonus-ui into material-ui 2025-11-04 17:06:17 +08:00
hongchao 998aeac196 结算全部导出,结算权限页面 2025-11-04 17:06:13 +08:00
bb_pan 933784a30a 优化 2025-11-04 11:10:14 +08:00
bb_pan 57d2eed420 优化 2025-11-04 10:40:56 +08:00
bb_pan ffaee4ff03 新购验收权限 2025-11-04 10:02:45 +08:00
mashuai 9ba223fe1f 优化 2025-11-03 17:17:34 +08:00
hongchao 7ee7f6527e 直转审核页面查询优化 2025-11-03 17:15:25 +08:00
hongchao d1fee9fab4 Merge branch 'material-ui' of http://192.168.30.2:3000/bonus/bonus-ui into material-ui 2025-11-03 16:03:19 +08:00
hongchao 188ddd898d 配件领料单修复 2025-11-03 16:03:14 +08:00
mashuai 49f439351f 优化 2025-11-03 14:17:10 +08:00
hayu 626ddc27a5 材料站出库--二维码下载与生成 2025-11-01 14:36:28 +08:00
hongchao fc65fc81c2 维修单缓存验收单问题修复 2025-11-01 13:30:31 +08:00
hongchao fbf9002ca6 缓存添加 2025-11-01 13:15:47 +08:00
hayu be2d7f7685 修改 2025-10-31 20:56:57 +08:00
bb_pan ea5921eadf 修饰后入库-导出 2025-10-31 16:56:51 +08:00
bb_pan f216915484 修饰后入库-导出 2025-10-31 15:38:37 +08:00
bb_pan fb7349d8bb 新增协议增加提示 2025-10-31 15:22:29 +08:00
syruan 22219febee Merge remote-tracking branch 'origin/material-ui' into material-ui 2025-10-31 14:44:09 +08:00
bb_pan 78094622b8 优化 2025-10-31 14:39:57 +08:00
hayu 2cfd4e657e 修改 2025-10-31 10:00:34 +08:00
hayu 3ab9ac039c 工程直转修改 2025-10-30 19:47:14 +08:00
bb_pan bc71705627 协议书导出 Word 2025-10-30 16:56:32 +08:00
syruan 654b92ae69 Merge remote-tracking branch 'origin/material-ui' into material-ui 2025-10-30 14:30:28 +08:00
syruan 15e6e5c85b 增加产线错误日志打印,分析问题 2025-10-30 10:49:56 +08:00
hayu 9f24743e4f 报告查询 2025-10-30 10:12:16 +08:00
bb_pan 4fc8bb6606 价格优化 2025-10-28 17:19:18 +08:00
bb_pan 6e1e1c0971 出门证加单号, 新购到货验收加删除 2025-10-28 16:11:19 +08:00
hongchao 3190439d88 维修记录单修复 2025-10-28 10:30:01 +08:00
hongchao 4e5f761dbd 维修记录单打印功能修复 2025-10-28 10:24:55 +08:00
mashuai 33d7138a26 优化 2025-10-27 16:30:16 +08:00
bb_pan b5f3acd515 新购入库报表-增加状态筛选 2025-10-27 16:14:56 +08:00
bb_pan 01bb842ed6 设备管理-导出 2025-10-27 09:46:27 +08:00
bb_pan 0a97ae9147 更换材料站 领料新增工程下拉接口 2025-10-24 10:00:47 +08:00
hayu 2b8d5df9e9 修改 2025-10-23 20:01:33 +08:00
hayu a3a96581cc 修改 2025-10-23 19:50:21 +08:00
hongchao 0dc41d8d2f 配置修正 2025-10-23 18:57:06 +08:00
hayu 2d2de874d2 配件库存、维修单签名、报废附件校验、报告loding 2025-10-23 18:47:45 +08:00
bb_pan 58739a7637 打印优化 2025-10-23 18:05:32 +08:00
hongchao bfbc454563 Merge branch 'material-ui' of http://192.168.30.2:3000/bonus/bonus-ui into material-ui 2025-10-23 17:51:29 +08:00
hongchao c791c8ae15 维修记录表修正 2025-10-23 17:51:25 +08:00
bb_pan 74e8a0e230 打印优化 2025-10-23 17:45:08 +08:00
mashuai c2b97818e9 优化 2025-10-23 17:41:43 +08:00
bb_pan 1b3fab221a 优化 2025-10-23 17:22:03 +08:00
hayu 4fead746ce 修改 2025-10-23 17:09:36 +08:00
bb_pan 14b248fd21 协议书-Excel 2025-10-23 09:57:09 +08:00
mashuai 579a838361 优化 2025-10-22 19:26:34 +08:00
hongchao a570d12c44 台账修改 2025-10-22 14:35:31 +08:00
hongchao 0bde50e6fa 未结算问题修复 2025-10-21 18:32:26 +08:00
syruan 1fccf4e792 结算导出修改 2025-10-21 18:03:30 +08:00
hayu d4cd5e7382 修改 2025-10-21 17:42:16 +08:00
hongchao 5412daaca0 未结算一键导出zip 2025-10-21 17:39:25 +08:00
hongchao 1f73f483e0 问题修复 2025-10-20 19:59:45 +08:00
hayu 033771ff6c 修改 2025-10-20 19:49:38 +08:00
hayu fa1ecce732 修改 2025-10-20 17:55:04 +08:00
syruan a3ad51346e 修正结算申请查询逻辑 2025-10-20 15:47:09 +08:00
hayu e5c49dee65 增加备注 2025-10-20 14:44:06 +08:00
hongchao 9e9196c8c5 Merge branch 'material-ui' of http://192.168.30.2:3000/bonus/bonus-ui into material-ui 2025-10-20 11:31:45 +08:00
hongchao 5a57b46163 机具费用推送修改 2025-10-20 11:31:41 +08:00
syruan eff76d8e59 导出修改 2025-10-17 18:14:56 +08:00
hongchao f4040380bd 丢失提示 2025-10-17 18:07:20 +08:00
hongchao 812aaaf722 编码处理 2025-10-16 18:31:12 +08:00
hongchao 3e7271cf65 直转,新购问题修复 2025-10-16 18:07:49 +08:00
hongchao d98b052928 出库修复 2025-10-16 09:49:32 +08:00
hongchao 7f697c41c3 租赁费用结算下拉问题修正 2025-10-15 17:49:22 +08:00
hongchao b438bf543c 退料,领料,结算,维修问题修复 2025-10-15 17:13:19 +08:00
hongchao 0bd067695f Merge branch 'material-ui' of http://192.168.30.2:3000/bonus/bonus-ui into material-ui 2025-10-15 01:27:20 +08:00
hongchao 2e2978f24b 结算 2025-10-15 01:27:16 +08:00
hayu 2048f5ba83 修改 2025-10-15 00:12:37 +08:00
hongchao 6795ee0cd7 结算修复 2025-10-14 22:45:13 +08:00
hongchao 921d797f35 问题修复 2025-10-14 22:41:20 +08:00
hongchao 0407b57efb Merge branch 'material-ui' of http://192.168.30.2:3000/bonus/bonus-ui into material-ui 2025-10-14 21:55:58 +08:00
hongchao 91737243dd 结算修改 2025-10-14 21:55:55 +08:00
hayu be409d2a08 修改 2025-10-14 21:44:32 +08:00
mashuai 69755e9cdf 优化 2025-10-14 17:32:42 +08:00
hongchao 07849089ca Merge branch 'material-ui' of http://192.168.30.2:3000/bonus/bonus-ui into material-ui 2025-10-14 17:31:17 +08:00
hongchao aebd03168f 材料站修改 2025-10-14 17:31:13 +08:00
hayu 9ad9af7f98 Merge remote-tracking branch 'origin/material-ui' into material-ui 2025-10-13 22:56:11 +08:00
hayu 360fc6ae85 修改 2025-10-13 22:55:53 +08:00
hongchao fd4e0736ac 合并 2025-10-13 22:22:52 +08:00
hongchao 71e75dd856 结算重置 2025-10-13 22:20:20 +08:00
hayu a70834e09f 修改 2025-10-13 22:10:37 +08:00
hayu fe8a95e431 Merge remote-tracking branch 'origin/material-ui' into material-ui 2025-10-13 22:08:46 +08:00
hongchao 1911763394 结算修改 2025-10-13 21:41:30 +08:00
bb_pan b093220a70 二级弹框传参 2025-10-13 21:25:39 +08:00
bb_pan 495740d140 过滤站内库存选项 2025-10-13 21:12:24 +08:00
hayu d22a0e54df 修改 2025-10-13 18:47:31 +08:00
hayu 40aed280d7 修改 2025-10-13 18:46:21 +08:00
bb_pan d2dab3747a 优化 2025-10-11 17:34:19 +08:00
bb_pan c665410d53 优化 2025-10-11 11:19:20 +08:00
bb_pan 070db3d099 优化 2025-10-10 21:54:49 +08:00
hayu d87d9f3453 退料单审核人 2025-10-10 21:51:04 +08:00
bb_pan 779a36c3f2 优化 2025-10-10 21:48:07 +08:00
liang.chao a50511be45 Merge remote-tracking branch 'origin/material-ui' into material-ui 2025-10-10 21:41:59 +08:00
liang.chao 132fa3cbc6 修改状态 2025-10-10 21:41:54 +08:00
bb_pan 81e668ae9a 优化 2025-10-10 21:39:20 +08:00
bb_pan 7c14015e22 优化 2025-10-10 21:22:22 +08:00
bb_pan a23b895156 优化 2025-10-10 21:20:31 +08:00
jjLv abb8203986 导出功能(发料记录汇总、维修任务管理、维修审核管理) 2025-10-10 20:59:57 +08:00
liux 5739eaed29 退料导出 2025-10-10 20:59:09 +08:00
jjLv abf201eb56 formatTime修改 2025-10-10 18:00:17 +08:00
hayu 3f2eba0154 退料人包含两个汉字 2025-10-10 17:47:01 +08:00
hayu ba56246a75 授权修改、退料单审核人 2025-10-10 17:36:18 +08:00
bb_pan ffb3b03952 材料站-退料单签名 2025-10-10 17:34:49 +08:00
syruan 0ae0d79c1b xieyishuchakan 2025-10-10 17:33:31 +08:00
hongchao 945367058b Merge branch 'material-ui' of http://36.33.26.201:3000/bonus/bonus-ui into material-ui 2025-10-10 12:19:16 +08:00
hongchao 1544db731f 在用配件,在修工程 2025-10-10 12:19:10 +08:00
syruan 9b71da35f5 结算修改 2025-10-10 12:11:00 +08:00
hayu 8ba43c268d 修改 2025-10-10 12:08:15 +08:00
bb_pan c0f1d0b0a1 优化 2025-10-10 12:03:32 +08:00
bb_pan ffa6dae4a3 清除本地储存 2025-10-01 09:57:11 +08:00
hongchao 1f9fb47860 Merge branch 'material-ui' of http://14.103.246.124:16000/bonus/bonus-ui into material-ui 2025-09-30 18:08:46 +08:00
hongchao 52690f9fc0 费用推送模块页面接口对接 2025-09-30 18:08:43 +08:00
hayu 089664bd8d 修改 2025-09-30 17:29:06 +08:00
hayu 0e53d6db1d 修改 2025-09-30 17:22:04 +08:00
hongchao 3c65e40340 费用推送租赁 2025-09-30 15:23:37 +08:00
hongchao c0768ded92 Merge branch 'material-ui' of http://14.103.246.124:16000/bonus/bonus-ui into material-ui 2025-09-30 11:59:16 +08:00
hongchao a160f15625 费用推送代码修正 2025-09-30 11:59:11 +08:00
bb_pan 14c3c6d61c 直转样式调整 2025-09-29 15:56:38 +08:00
bb_pan 94bb983bb4 材料站工程切换优化 2025-09-29 13:44:23 +08:00
bb_pan 39689bfa0f 材料站工程切换优化 2025-09-29 11:32:15 +08:00
bb_pan c6dcba9b2e 供需平衡表 2025-09-28 23:51:16 +08:00
bb_pan 024e8a676d 供需平衡表 2025-09-28 23:24:03 +08:00
bb_pan 9e09a4ba84 优化 2025-09-28 22:13:51 +08:00
hongchao 447382eefe 直转加loading 2025-09-28 21:33:09 +08:00
bb_pan eb29f39b54 供需平衡表 2025-09-28 19:15:38 +08:00
bb_pan affa833aaa 项目部出库 2025-09-28 14:44:03 +08:00
bb_pan a101c16b51 材料站供需平衡表 2025-09-28 13:56:19 +08:00
bb_pan d14a5b4335 退出登录/token过期-清除本地储存 2025-09-28 10:33:25 +08:00
bb_pan c8f93c6d8b 站内直转 2025-09-27 23:11:10 +08:00
bb_pan a76ea482c6 站内直转 2025-09-27 19:01:42 +08:00
hongchao a42281921d 材料站退料记录 2025-09-27 18:20:51 +08:00
hongchao 455c0ff092 直转审核下拉过滤 2025-09-27 16:05:11 +08:00
bb_pan ad900d3256 项目部出库 2025-09-27 15:05:59 +08:00
bb_pan f1881049e5 站内直转 2025-09-27 14:20:35 +08:00
bb_pan 77ede824c0 站内直转 2025-09-27 13:29:48 +08:00
hongchao ce6ee320d8 Merge branch 'material-ui' of http://14.103.246.124:16000/bonus/bonus-ui into material-ui 2025-09-26 18:07:10 +08:00
hongchao e2ec86b8ab 材料站领料编辑问题修复 2025-09-26 18:07:07 +08:00
hayu d2ac7b3511 材料站领料单号一键出库 2025-09-26 18:03:10 +08:00
bb_pan 6000fb5c86 直转小数问题 2025-09-26 17:09:22 +08:00
hongchao 50eec81888 费用推送 2025-09-26 16:31:19 +08:00
bb_pan 15d7e404b2 直转审核详情 2025-09-26 10:05:25 +08:00
syruan 3592bba376 已结算数据修改从结算记录查询 2025-09-25 17:52:20 +08:00
hongchao 5e198ae259 Merge branch 'material-ui' of http://14.103.246.124:16000/bonus/bonus-ui into material-ui 2025-09-25 12:01:37 +08:00
hongchao 347527221c 直转字段修正 2025-09-25 12:01:34 +08:00
bb_pan a019f6249a 签名 2025-09-25 10:51:36 +08:00
bb_pan fad4f0dc06 材料站-退料保存后刷新 2025-09-24 21:14:33 +08:00
bb_pan fe302379bb 直转-提交按钮权限 2025-09-24 20:17:07 +08:00
syruan 3a079497ed 已结算下拉框过滤 2025-09-24 19:13:22 +08:00
bb_pan 8893c41e36 名称变更 2025-09-24 18:47:11 +08:00
bb_pan 3e7b174cf2 直转查看问题 2025-09-24 16:42:24 +08:00
bb_pan 9d0e1d5842 工地直转输入小数 2025-09-24 15:58:46 +08:00
syruan b48471f9d7 结算表格滚动修改 2025-09-23 20:13:13 +08:00
bb_pan c0ab280ba1 退料签名 2025-09-23 19:58:15 +08:00
bb_pan 1de8398a4d 站内库存查询 2025-09-23 19:21:56 +08:00
bb_pan be6a1a9775 站内库存查询 2025-09-23 19:13:28 +08:00
bb_pan a88ff52693 站内库存查询 2025-09-23 19:03:31 +08:00
bb_pan 526646f27c 维修单查看 2025-09-23 18:16:29 +08:00
bb_pan 1084497d4d 工程合并 2025-09-23 17:06:40 +08:00
hongchao 7439c1bf82 材料站问题修复 2025-09-23 15:59:28 +08:00
bb_pan 6c36d1646b 工程合并 2025-09-23 12:09:06 +08:00
hongchao 67ec45b7ea 材料站领料退料 2025-09-22 20:08:38 +08:00
hongchao cabf9f8c28 材料站下拉框 2025-09-19 14:57:33 +08:00
hayu 7cb1c8d975 台账增加设备类型筛选
预警记录增加关键字筛选和检验报告查看
2025-09-18 18:49:21 +08:00
hongchao 7c06447efa 材料站领料记录添加备注 2025-09-18 10:50:25 +08:00
hayu 782589e2c8 修改 2025-09-17 21:54:24 +08:00
hongchao 5fd50410f3 问题修复 2025-09-17 20:40:15 +08:00
hayu 7d3193f836 修改 2025-09-17 20:04:30 +08:00
hayu ae65a5d711 修改 2025-09-17 18:23:35 +08:00
hayu 2978e8ab90 修改 2025-09-16 21:10:50 +08:00
hongchao 721482102c 导出领料出库明细 2025-09-16 20:43:47 +08:00
hongchao 4f08d369d0 注释 2025-09-16 12:15:41 +08:00
hongchao fd3f909789 领料审核一级加限制,web工单按钮限制优化 2025-09-16 10:03:55 +08:00
hayu e91ebde2fd 修改 2025-09-15 19:35:27 +08:00
hayu b57a8e9df4 修改 2025-09-15 19:17:41 +08:00
hongchao 6869c3a1a8 网页版领料工单跳转,材料站退料单 2025-09-15 18:01:40 +08:00
bb_pan c3765dac48 领用-撤回功能 2025-09-14 23:34:15 +08:00
syruan e87def46f9 xieyishu youhua liangweixiaoshudian 2025-09-14 23:08:36 +08:00
bb_pan 2a3974b860 优化搜索 2025-09-14 21:06:27 +08:00
bb_pan 749c1afc3e 材料站退料预约 2025-09-14 20:18:21 +08:00
hongchao 423fd360e6 盘点入库修正 2025-09-14 16:34:25 +08:00
syruan d4a414ded2 Excel导出携带工程 2025-09-14 11:55:54 +08:00
bb_pan 8e18075be4 时间格式化 2025-09-14 11:27:24 +08:00