Commit Graph

868 Commits

Author SHA1 Message Date
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
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
hongchao 5af69ea3bc Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui 2024-12-27 13:36:57 +08:00
hongchao faf58c9786 领料申请与领料出库bug修复 2024-12-27 13:36:46 +08:00
zzyuan 40a290936d Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui 2024-12-27 10:16:55 +08:00
zzyuan 992c849f42 测试问题修改 2024-12-27 10:15:11 +08:00
hongchao 0a821b88b1 领料出库打印 2024-12-27 09:08:43 +08:00
mashuai 5ce7cef3c3 修饰入库 2024-12-26 18:48:11 +08:00
syruan 4e9aeb7ab4 新增字段、修改计算逻辑 2024-12-26 18:36:27 +08:00
zzyuan c66a8b3b06 Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui 2024-12-26 17:10:05 +08:00
zzyuan f5d2f7a356 修饰后入库查看 2024-12-26 17:09:51 +08:00
mashuai b2e784cfc5 Merge remote-tracking branch 'origin/material-ui' into material-ui 2024-12-26 13:16:48 +08:00
mashuai 88c986d3ee 修饰数量 2024-12-26 13:16:42 +08:00
zzyuan 7418f743ed 综合查询 2024-12-26 13:16:04 +08:00
zzyuan 433f26c4d0 综合查询导出参数 2024-12-26 12:22:46 +08:00
zzyuan 85c88df8a9 领料出库 2024-12-26 11:25:27 +08:00
zzyuan 6566cf2cf1 综合查询修复 2024-12-26 09:50:41 +08:00
zzyuan bad7e7d034 物资类型修改编辑库管维修员 2024-12-26 09:36:31 +08:00
zzyuan 9310e218d0 测试bug修改 2024-12-25 18:22:44 +08:00
zzyuan 7096fa1ea2 Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui 2024-12-25 18:03:08 +08:00
zzyuan d58d6ff3ca 综合查询接口对接 2024-12-25 18:02:54 +08:00
hongchao b488e2727d 画布重叠问题bug修复 2024-12-25 17:31:00 +08:00
hongchao 0242282372 Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui 2024-12-25 16:43:35 +08:00
hongchao 7e6c2f093a 出库单检验 2024-12-25 16:43:28 +08:00
zzyuan 0525ecd3a6 新购绑定入库修改 2024-12-25 15:56:55 +08:00
hongchao b1bacdf86c 公章bug 2024-12-25 14:07:52 +08:00
hongchao d9dc57e7b0 公章显示 2024-12-25 13:50:18 +08:00
hongchao 15e7c52540 Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui 2024-12-25 11:06:46 +08:00
hongchao ce1ce4f033 出库检验单 2024-12-25 11:06:39 +08:00
zzyuan 8bbe2ed185 新购绑定驳回逻辑 2024-12-24 19:31:05 +08:00
zzyuan d60535be2f 新购二级查询修改 2024-12-24 17:26:45 +08:00
zzyuan 19cc629eb8 修试入库通过驳回 2024-12-24 17:07:10 +08:00
zzyuan ca722cad9e 驳回提交2 2024-12-24 16:38:12 +08:00
zzyuan a646db1a5c 新购验收驳回2 2024-12-24 15:01:37 +08:00
zzyuan f99df38248 新购驳回编辑操作修改 2024-12-24 14:30:15 +08:00
zzyuan 4cb92fe78b 退料单字段修改 2024-12-24 14:00:03 +08:00
zzyuan 77fddf5be7 新购模块逻辑优化 2024-12-24 13:03:48 +08:00
zzyuan 680cda1153 新购验收勾选框优化 2024-12-24 10:36:31 +08:00
zzyuan 29164a506e 新购编码绑定逻辑对接 2024-12-24 10:26:16 +08:00
zzyuan c498e59cda 新购模块问题修改 2024-12-24 10:22:01 +08:00
zzyuan 88119b83dd 新购新增数量价格逻辑优化 2024-12-24 09:56:53 +08:00
zzyuan eca37e0151 用户新增弹窗角色部门下拉检索 2024-12-23 19:06:01 +08:00
zzyuan f87cbdad27 新购流程数量展示 2024-12-23 18:59:50 +08:00
zzyuan d5cbc32812 Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui 2024-12-23 18:48:11 +08:00
zzyuan 2e1b56b5ce 新购模块对接 2024-12-23 18:48:07 +08:00
hongchao 19609d0931 领料申请,领料出库bug修复 2024-12-23 18:33:34 +08:00
zzyuan b74bef31ae 新购模块对接 2024-12-23 18:15:42 +08:00
syruan c398a0de6b 新购增加阶段stage 2024-12-23 16:23:55 +08:00
mashuai 916932f5fa 修饰编号 2024-12-20 21:08:45 +08:00
mashuai 653b41d208 修饰编号 2024-12-20 20:04:09 +08:00
zzyuan d1ae556c0e Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui 2024-12-20 18:34:49 +08:00
zzyuan 59e3711a8b 综合查询一级列表查询 2024-12-20 18:33:52 +08:00
mashuai 23b9e2cbe9 修饰编号 2024-12-20 17:34:30 +08:00
zzyuan 2d38ccd56d Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui 2024-12-19 18:26:26 +08:00
zzyuan e62c1ea8fc 标准箱列表 2024-12-19 18:26:16 +08:00
syruan 56ffe0f634 维修管理操作功能权限修改 2024-12-18 18:19:32 +08:00
zzyuan 1fa605c876 综合查询前端页面绘制 2024-12-16 17:59:18 +08:00
zzyuan b128c9e416 修试入库驳回原因查询 2024-12-16 10:20:47 +08:00
zzyuan 082f72f965 修试入库驳回原因 2024-12-13 17:09:28 +08:00
zzyuan 2367f8676b 报废管理列表 2024-12-13 15:52:22 +08:00
zzyuan bc16532a69 报废管理 2024-12-13 15:29:30 +08:00
zzyuan 602eec34a6 修试入库和报废管理接口对接 2024-12-13 15:15:56 +08:00
zzyuan 51a095555d 报废管理一级列表 2024-12-13 13:30:22 +08:00
zzyuan 7fcc9e3100 修试入库外层接口对接 2024-12-13 13:12:37 +08:00
zzyuan 3dd85bd679 修试入库接口对接 2024-12-13 10:51:39 +08:00
zzyuan e34ac6f1b0 维修模块流程接口对接 2024-12-12 18:21:08 +08:00
zzyuan 5dc0ce1e7e Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui 2024-12-12 11:09:55 +08:00
zzyuan cab519687c 标准箱列表库存日期 2024-12-12 11:09:43 +08:00
mashuai 45f0cccf0e 新购库存日志调试 2024-12-11 17:26:15 +08:00
zzyuan d8d2a594ea 修饰审核问题修改 2024-12-11 17:02:53 +08:00
zzyuan b34869cbc6 二维码标准箱页面绘制 2024-12-11 16:32:36 +08:00
zzyuan 8d4ffa0368 报废管理页面草稿 2024-12-11 13:57:24 +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 61394340fe 修试后入库以及维修数量管理有效性 2024-11-29 16:56:30 +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
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 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
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
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
jjLv 31d17904de 站点配置 2024-11-08 14:29:22 +08:00
jiang 328e28d7ee Merge remote-tracking branch 'origin/main' 2024-11-08 10:51:35 +08:00
jiang b6fd43084e 用户登录问题修改 2024-11-08 10:51:14 +08:00
zzyuan e7459cb829 新购内部导出 2024-11-08 10:28:49 +08:00
weiweiw cf48732c87 Merge remote-tracking branch 'origin/main' 2024-11-08 10:28:22 +08:00
BianLzhaoMin ffefbb5611 Merge branch 'material-ui' into dev-sy-11-8 2024-11-08 09:31:36 +08:00
zzyuan b93c30cca7 新购验收、入库二级页面 2024-11-08 09:30:26 +08:00
BianLzhaoMin cfa7b138b9 Merge branch 'material-ui' into dev-sy-11-8 2024-11-08 09:16:18 +08:00
BianLzhaoMin 8dd9cd22cb 解决启动时控制台warning警告 2024-11-08 09:15:25 +08:00
zzyuan 1814dbaba1 新购验收1 2024-11-08 09:10:01 +08:00
jjLv 7965252432 物资配置 2024-11-08 08:59:05 +08:00
jjLv e0c276dfa8 Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui 2024-11-08 08:47:15 +08:00
jjLv cbd0762bff 站点配置 2024-11-08 08:47:05 +08:00
zzyuan 72505a72f0 Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui 2024-11-07 17:22:41 +08:00
zzyuan 20ffd00bcf 新购新增5 2024-11-07 17:22:30 +08:00
jiang 1d31b2fe3c 用户登录问题修改 2024-11-07 16:50:42 +08:00
jjLv b5dfa73ab8 物资配置 2024-11-07 16:37:23 +08:00
jjLv f897b22203 Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui 2024-11-07 16:12:48 +08:00
jjLv 8acae94a24 左侧树角色id动态获取 2024-11-07 16:12:36 +08:00
zzyuan 24f30cce3f 新购新增联调4 2024-11-07 15:56:37 +08:00
jiang 828794effa 用户登录问题修改 2024-11-07 15:02:38 +08:00
weiweiw 1d84c5db55 增加日志备份功能和完善日志 操作 2024-11-07 15:01:48 +08:00
zzyuan c16548d169 新购-新增 2024-11-07 14:33:17 +08:00
zzyuan 83a3627af9 编辑查看文件管理上传 2024-11-07 11:21:22 +08:00
zzyuan 6613e9fe16 新购-新增-文件管理 2024-11-07 10:50:20 +08:00
jiang 5ac47fa006 用户登录问题修改 2024-11-06 20:53:49 +08:00
zzyuan 534a14bc0f 新购文件管理 2024-11-06 19:06:30 +08:00
zzyuan b971631106 新购新增3 2024-11-06 18:27:24 +08:00
zzyuan fe4daa62ac Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui 2024-11-06 17:26:29 +08:00
zzyuan c28fcbab24 新购到货新增2 2024-11-06 17:13:40 +08:00
jjLv 6555f21d5d 物资类型右侧表格,配件类型左侧树 2024-11-06 17:03:18 +08:00
zzyuan 39a97186b0 新购到货-新增1 2024-11-06 16:46:12 +08:00
zzyuan 1a16d8d016 新购到货-通知人员 2024-11-06 15:13:34 +08:00
jjLv ad4572febd 物资厂家 2024-11-06 14:05:46 +08:00
jjLv add756b320 维修员页面 2024-11-06 13:20:47 +08:00
jjLv 30b727a6b5 新增显示关系属性 2024-11-05 14:48:11 +08:00
jiang 33cab82ec6 用户登录问题修改 2024-11-05 14:43:17 +08:00
jjLv 42646b4f32 多选解绑和绑定 2024-11-05 14:42:12 +08:00
jjLv 3f57f7b93f 新购管理 2024-11-05 13:57:31 +08:00
jjLv 4ddcabaef0 Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui 2024-11-04 13:00:48 +08:00
jjLv 43bf81c75f 库管员页面 2024-11-04 13:00:40 +08:00
sxu 4a232bf511 Merge branch 'main' into material-ui 2024-11-01 10:42:36 +08:00
jiang 580626e5fd 用户登录问题修改 2024-11-01 10:19:37 +08:00
jjLv cf304ce8ee 解绑 2024-10-31 19:31:59 +08:00
jjLv 127320e8db 解绑 2024-10-31 19:24:03 +08:00
jjLv d16a200a72 解绑 2024-10-31 19:15:56 +08:00
jjLv aafbf5d30d 解绑 2024-10-31 19:08:20 +08:00
jjLv 18e0272b6b bug 2024-10-31 18:50:05 +08:00
jjLv 9d7c389ca1 库管员配置 2024-10-31 18:48:31 +08:00
jjLv 6ad52f4107 库管员配置 2024-10-31 15:43:43 +08:00
jjLv dcbad6826e 库管员,维修员配置 2024-10-31 12:53:24 +08:00
jjLv acc96ac903 文件加密,维修员页面增加 2024-10-31 10:27:56 +08:00
jjLv dbac0b4493 物资文件上传,删除服务器文件 2024-10-30 17:58:47 +08:00
jjLv ecedc86725 文件上传 2024-10-30 16:49:20 +08:00
jjLv a1eb8e0f0d 物资厂家 2024-10-30 15:06:31 +08:00
jjLv 4f078ed5a7 物资厂家管理 2024-10-30 14:31:10 +08:00
jjLv 0596f2a887 物资文件上传 2024-10-30 11:27:42 +08:00
jjLv de858331a0 物资厂家文件上传 2024-10-30 11:00:50 +08:00
jjLv 7a080291fc 文件上传下载 2024-10-30 10:30:06 +08:00
jjLv c2e5ba2dec 物资厂家文件上传回显 2024-10-30 09:50:16 +08:00
jjLv d9bd4cfe29 新购绑定相关配置添加 2024-10-29 18:03:15 +08:00
sxu 644652324f Merge branch 'main' into material-ui 2024-10-29 17:46:50 +08:00
jiang df9a8e0253 用户登录问题修改 2024-10-29 15:48:18 +08:00
jiang 7e6ecd0dba 用户登录问题修改 2024-10-29 15:20:59 +08:00
jjLv 38b9e2c32e 物资厂家文件出现重复新增bug 2024-10-29 14:53:33 +08:00
jjLv 56a6ad55fc 物资厂家Bug修复 2024-10-29 14:31:13 +08:00
jjLv f9e373cf1f 配件类型管理 2024-10-29 14:22:58 +08:00
jiang 7ffda168f5 用户登录问题修改 2024-10-29 14:19:41 +08:00
jjLv 150ca02fdb 物资厂家管理新增营业执照 2024-10-29 14:08:31 +08:00
jjLv f0d04656a3 基础管理bug修改 2024-10-29 10:46:04 +08:00
jjLv 9d83fb64b8 基础管理分页处理 2024-10-29 09:11:04 +08:00
jjLv c99da5778a 导出 2024-10-28 17:54:52 +08:00
jjLv 9e90d6d352 物资类型导出修改 2024-10-28 17:53:00 +08:00
jjLv da7888a9d8 往来单位导出 2024-10-28 17:07:37 +08:00
jjLv 09ed54aba5 物资类型管理 2024-10-28 16:25:31 +08:00
jjLv 79e72d2b0b 物资类型管理修改功能bug修复 2024-10-28 13:29:42 +08:00
jjLv 3dd8720bb6 物资管理 2024-10-25 18:13:13 +08:00
jjLv 7f53d4a40d 物资管理整体框架 2024-10-25 12:54:20 +08:00
jjLv ff383c5754 基础管理 2024-10-25 12:42:45 +08:00
jjLv 77b4ec475b 基础管理 2024-10-24 18:11:40 +08:00
jjLv 753b02ed90 基础管理 2024-10-24 17:59:57 +08:00
weiweiw 444a3bf9b9 给菜单增加系统类型,并根据后台系统调用menu/getRouters/0接口 2024-10-16 08:10:36 +08:00
jiang 4a84ccb7db 用户登录问题修改 2024-09-18 15:51:58 +08:00
jiang 305a665da2 用户登录问题修改 2024-09-14 17:34:19 +08:00
weiweiw 86c164db35 增加支持顶级部门功能 2024-09-12 18:02:17 +08:00
jiang be94bc276f 用户登录问题修改 2024-09-10 18:01:39 +08:00
jiang 8bb10191ea 用户登录问题修改 2024-09-10 10:04:32 +08:00
jiang eb9e9db8b1 用户登录问题修改 2024-09-08 20:13:32 +08:00
jiang 20797914db 数据加密和完整性校验 2024-08-16 15:50:37 +08:00
jiang dd0e2f4721 数据加密和完整性校验 2024-08-09 13:25:47 +08:00
jiang b130e05078 数据加密和完整性校验 2024-08-08 15:31:39 +08:00
jiang 700a9c6ac7 数据加密和完整性校验 2024-08-07 11:27:37 +08:00
jiang 877ae77cb3 数据加密和完整性校验 2024-08-06 15:47:19 +08:00
jiang 5cfdb4870c bug修改 2024-07-31 16:19:37 +08:00