Commit Graph

511 Commits

Author SHA1 Message Date
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