Commit Graph

721 Commits

Author SHA1 Message Date
BianLzhaoMin 2584475e8b Merge branch 'material-ui' of http://192.168.0.75:3000/bonus/bonus-ui into material-ui 2025-03-05 18:35:48 +08:00
BianLzhaoMin 327dc1c266 新需求开发 功能优化 2025-03-05 18:35:45 +08:00
hongchao fba88cab52 Merge branch 'material-ui' of http://192.168.0.75:3000/bonus/bonus-ui into material-ui 2025-03-05 17:46:23 +08:00
hongchao 5056526dc9 业务办理-领料申请发布,标签查询 2025-03-05 17:46:20 +08:00
BianLzhaoMin c94d536c4f 领用申请审核功能优化完善 2025-03-04 18:13:36 +08:00
bb_pan a48d92859a 业务联系单 2025-03-03 19:17:59 +08:00
bb_pan 129accd83a 领用申请 2025-02-28 18:23:58 +08:00
mashuai fdafabe322 维修审核 2025-02-28 14:58:33 +08:00
mashuai c585e3aa0c 维修审核 2025-02-28 14:33:00 +08:00
mashuai b03be7a391 维修审核按钮隐藏 2025-02-28 13:34:15 +08:00
hongchao 4c0c68d05c 出场日期bug 2025-02-27 10:00:09 +08:00
hongchao cdb3a2f253 结算管理,结算申请页面修改 2025-02-24 09:32:57 +08:00
BianLzhaoMin 4eeb872968 代码优化 2025-02-21 03:29:04 +08:00
BianLzhaoMin 7f231a8aac 代码优化 2025-02-21 03:21:05 +08:00
BianLzhaoMin 1e26a55d29 Merge branch 'material-ui' of http://192.168.0.75:3000/bonus/bonus-ui into material-ui 2025-02-21 03:10:24 +08:00
BianLzhaoMin 35d3a53628 减免审批流完善 2025-02-21 03:10:22 +08:00
hongchao 8c9ca1f7a4 Merge branch 'material-ui' of http://192.168.0.75:3000/bonus/bonus-ui into material-ui 2025-02-21 02:02:50 +08:00
hongchao 90b9fbab66 批量通过和驳回 2025-02-21 02:02:46 +08:00
bb_pan 475fc935dc 直转申请-审核 2025-02-21 01:45:20 +08:00
bb_pan 4deda8cefb 直转申请-审核 2025-02-21 01:27:24 +08:00
BianLzhaoMin bae3f46304 Merge branch 'material-ui' of http://192.168.0.75:3000/bonus/bonus-ui into material-ui 2025-02-21 01:24:14 +08:00
BianLzhaoMin 3dfe48ecce 领用申请接口调试完成 2025-02-21 01:24:12 +08:00
hongchao b91e4a816e 结算管理导出 2025-02-20 23:43:04 +08:00
hayu 46b3b986ee 1 2025-02-20 23:39:18 +08:00
hongchao 3446482c49 Merge branch 'material-ui' of http://192.168.0.75:3000/bonus/bonus-ui into material-ui 2025-02-20 23:36:50 +08:00
hongchao 50126b4d71 bug修复 2025-02-20 23:36:48 +08:00
BianLzhaoMin c536630a1b 减免审核页面初步完善 2025-02-20 23:10:05 +08:00
bb_pan 65f1f6e17d 优化 2025-02-20 22:14:12 +08:00
bb_pan b2204e9283 优化 2025-02-20 21:51:46 +08:00
BianLzhaoMin 351c109c96 Merge branch 'material-ui' of http://192.168.0.75:3000/bonus/bonus-ui into material-ui 2025-02-20 21:50:31 +08:00
BianLzhaoMin 79eaa32b11 领用申请代码提交 2025-02-20 21:50:29 +08:00
hongchao 6d270f4750 bug 2025-02-20 20:41:56 +08:00
hongchao c0be272be2 bug 2025-02-20 20:34:24 +08:00
hongchao 7abedf8faf Merge branch 'material-ui' of http://192.168.0.75:3000/bonus/bonus-ui into material-ui 2025-02-20 20:08:20 +08:00
hongchao dfc0c39218 报废台账 2025-02-20 20:08:17 +08:00
BianLzhaoMin c0757397d4 Merge branch 'material-ui' of http://192.168.0.75:3000/bonus/bonus-ui into material-ui 2025-02-20 19:36:07 +08:00
BianLzhaoMin 6b8e493084 领用申请详情静态页面完善 2025-02-20 19:36:05 +08:00
hongchao 1b885a337a Merge branch 'material-ui' of http://192.168.0.75:3000/bonus/bonus-ui into material-ui 2025-02-20 19:12:07 +08:00
hongchao 7cc568adae 减免记录查询管理,盘点报废 2025-02-20 19:12:04 +08:00
BianLzhaoMin 7cc2763b38 会签流程配置功能完善 2025-02-20 16:47:45 +08:00
hongchao 95ba75749e 减免记录查询管理,盘点报废页面搭建 2025-02-20 15:28:19 +08:00
hongchao 0ad9db8776 配件新增bug修复 2025-02-20 09:26:31 +08:00
hongchao d6a7de4a9e bug修复 2025-02-19 19:00:16 +08:00
hongchao e4cec52a18 配件管理修改 2025-02-19 18:56:45 +08:00
hongchao fb8c580fb8 Merge branch 'material-ui' of http://192.168.0.75:3000/bonus/bonus-ui into material-ui 2025-02-19 13:40:42 +08:00
hongchao e861dd69d8 费用结算 2025-02-19 13:40:38 +08:00
bb_pan 0f587e9a4f 直转申请 2025-02-18 19:25:17 +08:00
syruan 2db82be6a0 物资类型排序 2025-02-18 17:32:20 +08:00
bb_pan 5f43342bbc 直转申请 2025-02-18 11:23:38 +08:00
bb_pan 088d784cbb 直转申请 2025-02-18 10:45:22 +08:00
bb_pan 91378c7e62 业务办理-领用申请 2025-02-17 18:04:44 +08:00
hongchao be9ee7a8c9 减免费用 2025-02-17 17:55:52 +08:00
bb_pan 460a96e34d 业务办理 2025-02-17 13:02:56 +08:00
hongchao 2e0b9374e2 减免费用 2025-02-17 12:40:47 +08:00
hongchao 61247f3f9e Merge branch 'material-ui' of http://192.168.0.75:3000/bonus/bonus-ui into material-ui 2025-02-15 17:00:46 +08:00
hongchao 482d0052a3 减免费用 2025-02-15 17:00:43 +08:00
bb_pan 3b3d7f7c49 机械化设备标准配置管理 2025-02-15 16:52:13 +08:00
mashuai f30d2128ed 综合查询修改 2025-02-15 14:14:48 +08:00
hongchao 3c608c3763 审核传参 2025-02-14 17:42:29 +08:00
hongchao 83825b59a1 报废审核台账 2025-02-14 15:17:53 +08:00
hongchao 0d70716f45 减免费用 2025-02-14 13:16:52 +08:00
hongchao 0a3b2c7ab1 结算管理中减免费用 2025-02-12 16:08:11 +08:00
bb_pan 7dfc37fa54 编码退料-完好,损坏数量 2025-02-11 15:03:58 +08:00
hongchao 81707a15f7 退料明细字段切换 2025-02-11 11:05:12 +08:00
bb_pan 8290c16742 退料接收-增加完好数量,损坏数量 2025-02-10 17:29:32 +08:00
hongchao e80328a159 Merge branch 'material-ui' of http://192.168.0.75:3000/bonus/bonus-ui into material-ui 2025-02-10 16:46:34 +08:00
hongchao c949f649c6 领料申请,领料出库bug修复 2025-02-10 16:46:31 +08:00
mashuai d0a3972f73 Merge remote-tracking branch 'origin/material-ui' into material-ui 2025-02-10 16:20:18 +08:00
mashuai 12decf35ee 优化 2025-02-10 16:20:14 +08:00
bb_pan 1c89c3f1dc 分包商单位增加委托书上传 2025-02-10 11:21:07 +08:00
hongchao 54c4bad8cb bug修复 2025-02-10 09:19:20 +08:00
hongchao 615915a72c 费用推送 2025-02-06 16:15:03 +08:00
hongchao 517ddbf1b4 费用推送审核管理 2025-01-24 17:50:01 +08:00
hongchao 1340792d48 Merge branch 'material-ui' of http://192.168.0.75:3000/bonus/bonus-ui into material-ui 2025-01-24 16:39:49 +08:00
hongchao f576b86c25 费用推送管理 2025-01-24 16:39:38 +08:00
zzyuan 3a292acd79 测试问题修改2 2025-01-24 16:26:10 +08:00
zzyuan 133d1ef461 测试问题修改 2025-01-24 14:49:15 +08:00
zzyuan 9702299f71 测试问题修改 2025-01-23 18:01:21 +08:00
zzyuan 4892bb2bb9 维修修改 2025-01-23 17:24:48 +08:00
zzyuan 0013ca35a7 Merge branch 'material-ui' of http://192.168.0.75:3000/bonus/bonus-ui into material-ui 2025-01-23 16:42:33 +08:00
zzyuan ab4e64d9a0 报表修饰后入库接口对接 2025-01-23 16:42:23 +08:00
hongchao 0aecab77e8 Merge branch 'material-ui' of http://192.168.0.75:3000/bonus/bonus-ui into material-ui 2025-01-23 16:20:10 +08:00
hongchao 3994f5c566 费用推送,bug修复 2025-01-23 16:20:02 +08:00
zzyuan d9b83b8412 退料编辑编码反显问题修改 2025-01-23 16:12:07 +08:00
zzyuan 3c7a0cc56e 文件查看类型判断添加大写 2025-01-23 15:23:38 +08:00
zzyuan 0d4cb9f3e4 报表-维修报表接口对接 2025-01-23 15:23:19 +08:00
zzyuan 9a2d298449 电子档案文件查看 2025-01-23 15:22:45 +08:00
zzyuan 54b865fdfb Merge branch 'material-ui' of http://192.168.0.75:3000/bonus/bonus-ui into material-ui 2025-01-23 15:01:00 +08:00
zzyuan 748b38af1e 营业执照改为附件 2025-01-23 15:00:48 +08:00
hongchao 4bc44ee986 Merge branch 'material-ui' of http://192.168.0.75:3000/bonus/bonus-ui into material-ui 2025-01-23 14:56:17 +08:00
hongchao 8f931df1b8 维修单,退料单,配件入库单,领料单,新购验收单打印样式修改 2025-01-23 14:56:11 +08:00
zzyuan 059f3c43a3 维修编辑代码优化 2025-01-23 14:21:21 +08:00
hongchao c3fb3c7d87 领料单,出库检验单打印样式调整 2025-01-23 13:54:30 +08:00
zzyuan b55a43f075 Merge branch 'material-ui' of http://192.168.0.75:3000/bonus/bonus-ui into material-ui 2025-01-22 18:12:34 +08:00
zzyuan ef712b8db5 测试问题修改 2025-01-22 18:12:10 +08:00
hongchao 33b10f28a7 结算申请中解决维修序号不连续问题 2025-01-22 17:57:12 +08:00
zzyuan 9343c33b54 Merge branch 'material-ui' of http://192.168.0.75:3000/bonus/bonus-ui into material-ui 2025-01-22 17:38:51 +08:00
zzyuan 3cd1005b5e 前端问题修改,报表模块代码 2025-01-22 17:38:39 +08:00
hongchao d1aa54a9c8 解决因领料申请或新购到货的css样式导致其他页面树形高度缩短的全局问题 2025-01-22 16:53:47 +08:00
hongchao 1c5eda8555 费用推送管理 2025-01-22 16:13:23 +08:00
zzyuan 91aeaa0e3b Merge branch 'material-ui' of http://192.168.0.75:3000/bonus/bonus-ui into material-ui 2025-01-22 09:59:54 +08:00
zzyuan a962b345fb 配件领料修改 2025-01-22 09:59:42 +08:00
hongchao 1f76e51498 配件管理功能优化 2025-01-21 16:18:59 +08:00
hongchao 05790958e6 会签调试,用户编号隐藏 2025-01-21 14:29:40 +08:00
hongchao 5bf14644a8 新购三方签名 2025-01-21 13:37:59 +08:00
zzyuan 5633a14764 Merge branch 'material-ui' of http://192.168.0.75:3000/bonus/bonus-ui into material-ui 2025-01-20 18:16:56 +08:00
zzyuan cd46ab166c 配件领用接口对接 2025-01-20 18:16:48 +08:00
hongchao 7affe42708 配件入库单页面 2025-01-20 18:00:29 +08:00
hongchao 7a31d25cd2 权限修改 2025-01-20 17:23:56 +08:00
hongchao 9dffb46b18 结算审批 2025-01-20 17:10:15 +08:00
zzyuan aa30d2304c Merge branch 'material-ui' of http://192.168.0.75:3000/bonus/bonus-ui into material-ui 2025-01-17 18:52:57 +08:00
zzyuan b9474a15d1 电子档案文件导出修改 2025-01-17 18:52:37 +08:00
hongchao f9337e020a bug修复 2025-01-17 18:01:18 +08:00
hongchao 764ccfb256 Merge branch 'material-ui' of http://192.168.0.75:3000/bonus/bonus-ui into material-ui 2025-01-17 18:00:21 +08:00
hongchao 48b4754fb4 新购验收配供应,库管,技术签名 2025-01-17 18:00:11 +08:00
zzyuan 48b9317066 库管员维修员导出按钮注释 2025-01-17 16:28:42 +08:00
zzyuan 10fa5afc6b 电子档案文件上传优化 2025-01-17 16:13:19 +08:00
zzyuan a2a5585a75 Merge branch 'material-ui' of http://192.168.0.75:3000/bonus/bonus-ui into material-ui 2025-01-17 15:40:38 +08:00
zzyuan fe25a7f101 前端代码梳理 2025-01-17 15:40:27 +08:00
hongchao 253d7094cf 会签流程配置管理 2025-01-17 15:20:51 +08:00
zzyuan 8f968c1492 档案管理优化 2025-01-17 13:28:23 +08:00
hongchao 747ebd0569 Merge branch 'material-ui' of http://192.168.0.75:3000/bonus/bonus-ui into material-ui 2025-01-17 11:25:28 +08:00
hongchao 1afa702f6a 报废原因管理bug修复 2025-01-17 11:25:21 +08:00
zzyuan e9b83fe835 Merge branch 'material-ui' of http://192.168.0.75:3000/bonus/bonus-ui into material-ui 2025-01-17 11:13:06 +08:00
zzyuan e49680f9ab 新购绑定详情优化 2025-01-17 11:12:52 +08:00
hongchao 9f98a65dea Merge branch 'material-ui' of http://192.168.0.75:3000/bonus/bonus-ui into material-ui 2025-01-17 11:04:28 +08:00
hongchao 2c59cdbdff 退料管理退料审核人签名 2025-01-17 11:04:20 +08:00
zzyuan c948f7e7db 报废管理接口对接 2025-01-17 09:29:40 +08:00
zzyuan e9324c42ce 退料维修模块审核流程梳理 2025-01-16 18:34:21 +08:00
hongchao cebb1ca432 领料单审核人签名 2025-01-16 18:05:10 +08:00
hongchao 53f9a3ef90 会签配置管理 2025-01-16 15:34:56 +08:00
hongchao ebcf19bd0f 结算申请(单个结算),以及提交 2025-01-16 09:23:35 +08:00
hongchao 06a8f49852 物资中配件类型管理按钮权限修改 2025-01-13 18:31:19 +08:00
hongchao a908af3824 Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui 2025-01-10 17:44:47 +08:00
hongchao 160894a9aa 数据脱敏 2025-01-10 17:44:30 +08:00
syruan ab1c733dc7 新购绑定物资可分批次进行入库 2025-01-10 17:44:27 +08:00
hongchao 02485efff3 相关配套文件 2025-01-10 15:40:24 +08:00
hongchao 6a3da83a4c 配件管理 2025-01-10 08:55:27 +08:00
zzyuan fcd4d29585 电子档案下载 2025-01-09 17:50:38 +08:00
zzyuan e41d9d9085 维修驳回逻辑 2025-01-09 17:15:08 +08:00
zzyuan 4acd91d466 维修驳回 2025-01-09 16:42:45 +08:00
zzyuan bed4846b48 维修列表页面修改 2025-01-09 15:41:22 +08:00
zzyuan 4b22734632 领料逻辑优化2 2025-01-09 15:09:09 +08:00
zzyuan e29f79e1b3 前端流程逻辑优化 2025-01-09 15:07:22 +08:00
zzyuan 1ac9bd125f 文件档案下载 2025-01-08 18:13:09 +08:00
zzyuan 82bdb7becd 新购修改 2025-01-08 17:47:45 +08:00
zzyuan 22a890a385 配件领用接口未对接 2025-01-08 16:37:02 +08:00
zzyuan 9107897db6 协议管理字段修改 2025-01-08 16:16:14 +08:00
zzyuan bc566cd058 Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui 2025-01-08 15:53:44 +08:00
zzyuan a331ba90fb 领料退料物资类型选择逻辑优化 2025-01-08 15:53:32 +08:00
syruan 4f3eff18c7 Merge remote-tracking branch 'origin/material-ui' into material-ui 2025-01-08 15:53:20 +08:00
syruan 0d26b83ce9 物资类型BUG修复 增加字段 2025-01-08 15:53:02 +08:00
zzyuan 238c668ee0 新购类型选择逻辑优化 2025-01-08 15:25:25 +08:00
zzyuan bec91890d9 协议新增部分修改 2025-01-08 15:11:55 +08:00
zzyuan 84d8f03937 Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui 2025-01-08 14:40:52 +08:00
zzyuan 6d92114f41 领料模块领料单优化 2025-01-08 14:40:33 +08:00
mashuai 63a9c33e2b 租赁期限去除 2025-01-08 14:35:21 +08:00
mashuai 522c598f87 Merge remote-tracking branch 'origin/material-ui' into material-ui
# Conflicts:
#	src/views/material/lease/protocol/index.vue
2025-01-08 14:32:44 +08:00
mashuai 7fbd7b9adc 租赁期限去除 2025-01-08 14:32:20 +08:00
zzyuan 6a2a644b1c Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui 2025-01-08 11:26:44 +08:00
zzyuan b2988f6a53 页面优化,领料编辑详情内部按钮判断 2025-01-08 11:23:30 +08:00
hongchao ac3f9dd50f Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui 2025-01-08 11:10:06 +08:00
hongchao af7dff73a2 配件管理框架 2025-01-08 11:09:57 +08:00
mashuai 6a07f5e5ac 1 2025-01-08 11:08:27 +08:00
binbin_pan fa474c8a07 新购到货管理/领料申请-类型规格-优化 2025-01-08 10:30:19 +08:00
zzyuan a0519e57fa 合同主体 2025-01-08 10:23:14 +08:00
binbin_pan e997020dcf 新建退料-物品类型搜索优化 2025-01-08 10:17:06 +08:00
zzyuan dfa4f49ead 合同主体字段修改 2025-01-08 10:07:44 +08:00
zzyuan ee1454ef55 领料和综合查询都添加实施单位,合同主体单位字段 2025-01-08 10:00:56 +08:00
zzyuan 02be6c3969 领料单时间截取 2025-01-08 09:13:02 +08:00
hongchao f0042946c0 去除备注字段 2025-01-07 18:44:20 +08:00
hongchao fb259fad26 代码注释以及去掉不必要的参数属性 2025-01-07 18:40:51 +08:00
hongchao 12eee67965 报废原因管理 2025-01-07 18:39:31 +08:00
zzyuan add1cf0fd9 领料单修改 2025-01-07 18:27:04 +08:00
zzyuan a4e8c717b8 协议管理修改 2025-01-07 17:48:10 +08:00
zzyuan d8a4dbfdbb 新购新增租赁价格修改 2025-01-07 16:39:31 +08:00
zzyuan 58437e4919 新购报告还未上传加颜色标识 2025-01-07 16:31:19 +08:00
zzyuan 2cf85bbe1f 新购:通知验收内容带入机具类型,租赁价格带入修改,含税价格修改 2025-01-07 16:21:59 +08:00
zzyuan 002171f60d 操作人修改为制单(领料单、退料单、维修单、入库单等) 2025-01-07 13:37:42 +08:00
zzyuan 6bc8609d01 二维码扫码添加网址 2025-01-03 11:30:35 +08:00
zzyuan 19b7d58f45 Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui 2024-12-31 17:51:58 +08:00
zzyuan daa331dcb8 电子档案上传 2024-12-31 17:48:52 +08:00
mashuai b0324fad0b 1 2024-12-31 15:46:09 +08:00
mashuai 7eeb6c972f Merge remote-tracking branch 'origin/material-ui' into material-ui 2024-12-31 15:44:28 +08:00
mashuai 7666897677 1 2024-12-31 15:44:20 +08:00
zzyuan 8c32e58b43 二维码管理对接 2024-12-31 15:39:18 +08:00
zzyuan f289beb34b 二维码管理 2024-12-31 14:54:41 +08:00
zzyuan 4ad226e6cf 标准箱菜单位置改动 2024-12-31 11:13:58 +08:00
zzyuan d2a5fc4ce0 配件领用页面代码 2024-12-31 10:57:45 +08:00
zzyuan 56d4919ab9 综合查询单位工程树状修改 2024-12-30 11:32:23 +08:00
zzyuan 3f0cb56e31 结算管理单位工程树状修改 2024-12-30 11:17:25 +08:00
zzyuan 107b065311 领料单位工程树状 2024-12-30 11:02:17 +08:00
zzyuan 7db3348184 退料单位工程树 2024-12-30 10:40:52 +08:00
zzyuan 2354c0290e Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui 2024-12-30 10:33:58 +08:00
zzyuan 19d93086de 退料单位工程树状修改 2024-12-30 10:33:42 +08:00
syruan 0642540405 BUG修复 2024-12-27 18:25:34 +08:00
zzyuan 0aa9855656 Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui 2024-12-27 17:55:14 +08:00
zzyuan c6ec188406 电子档案管理 2024-12-27 17:55:03 +08:00
hongchao 50eb7c20ab 领料申请领料单,出库单修改 2024-12-27 16:58:09 +08:00
hongchao 25061d4532 维修管理按钮隐藏设定 2024-12-27 14:45:15 +08:00