From 86b9122f15a5830bdbfdfe08bcb3ba30cb517827 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=B8=85?= Date: Fri, 24 Oct 2025 14:36:54 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=8A=A5=E4=BF=AE=E5=8D=95=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=EF=BC=8C=E7=BB=B4=E4=BF=AE=E9=A1=B9=E7=9B=AE=E5=85=81=E8=AE=B8?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=202.=E7=BB=B4=E4=BF=AE=E5=8D=95=E6=9D=90?= =?UTF-8?q?=E6=96=99=E4=BB=B7=E6=A0=BC=E4=B8=8E=E6=B1=87=E6=80=BB=E4=B8=8D?= =?UTF-8?q?=E4=B8=80=E8=87=B4=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/ErpRepairFormMapper.xml | 2 +- maintain-ui/src/views/business/repairFormProject/index.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/maintain-business/src/main/resources/mapper/ErpRepairFormMapper.xml b/maintain-business/src/main/resources/mapper/ErpRepairFormMapper.xml index 741e682..574f832 100644 --- a/maintain-business/src/main/resources/mapper/ErpRepairFormMapper.xml +++ b/maintain-business/src/main/resources/mapper/ErpRepairFormMapper.xml @@ -170,7 +170,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" GROUP BY repair_form_id ) erfpd ON erf.id = erfpd.repair_form_id LEFT JOIN ( - SELECT repair_form_id, SUM(selling_price * collect_number) AS totalMaterialMoney + SELECT repair_form_id, SUM(money) AS totalMaterialMoney FROM erp_material_picking_info GROUP BY repair_form_id ) empi ON erf.id = empi.repair_form_id diff --git a/maintain-ui/src/views/business/repairFormProject/index.vue b/maintain-ui/src/views/business/repairFormProject/index.vue index 38b47d0..e951a18 100644 --- a/maintain-ui/src/views/business/repairFormProject/index.vue +++ b/maintain-ui/src/views/business/repairFormProject/index.vue @@ -404,7 +404,7 @@ export default { /** 查询维修项目列表 */ getMaintainList() { this.loading = true; - listMaintainProject({ ...this.queryMaintainParams, notInIdList: this.repairFormProjectList.map(item => item.maintainId) }).then(response => { + listMaintainProject({ ...this.queryMaintainParams }).then(response => { this.maintainProjectList = response.rows; this.total = response.total; this.loading = false; -- 2.22.0