Commit Graph

574 Commits

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