diff --git a/maintain-business/src/main/resources/mapper/ErpRepairFormMapper.xml b/maintain-business/src/main/resources/mapper/ErpRepairFormMapper.xml index 741e6822743ef14fadcc09d0ddfedd6bbfa1d725..574f83278e9d5dec8ecd8428c381b3e6ac91ebd5 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 38b47d019e02c9e3330e7b4763f038b182b2410b..e951a18209a7561d1bd3c4102c746d48e282a9ac 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;