Commit 86b9122f authored by 刘帅's avatar 刘帅

1.报修单创建,维修项目允许重复

2.维修单材料价格与汇总不一致问题
parent c60793a8
...@@ -170,7 +170,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -170,7 +170,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
GROUP BY repair_form_id GROUP BY repair_form_id
) erfpd ON erf.id = erfpd.repair_form_id ) erfpd ON erf.id = erfpd.repair_form_id
LEFT JOIN ( 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 FROM erp_material_picking_info
GROUP BY repair_form_id GROUP BY repair_form_id
) empi ON erf.id = empi.repair_form_id ) empi ON erf.id = empi.repair_form_id
......
...@@ -404,7 +404,7 @@ export default { ...@@ -404,7 +404,7 @@ export default {
/** 查询维修项目列表 */ /** 查询维修项目列表 */
getMaintainList() { getMaintainList() {
this.loading = true; 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.maintainProjectList = response.rows;
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment