Browse Source

[fix]

委外加工 委外计划
修改委外计划列表页面状态字典类型;
修改查询委外计划详情controller接口,过滤保留0阶子表;
dev
王晓迪 2 months ago
parent
commit
22ffe59642
  1. 4
      ruoyi-admin/src/main/java/com/ruoyi/system/controller/OutsourcePlanController.java
  2. 4
      ruoyi-admin/src/main/resources/templates/system/outsource_plan/outsource_plan.html

4
ruoyi-admin/src/main/java/com/ruoyi/system/controller/OutsourcePlanController.java

@ -1,6 +1,7 @@
package com.ruoyi.system.controller; package com.ruoyi.system.controller;
import java.util.List; import java.util.List;
import java.util.stream.Collectors;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.domain.OutsourcePlan; import com.ruoyi.system.domain.OutsourcePlan;
@ -61,7 +62,8 @@ public class OutsourcePlanController extends BaseController
{ {
OutsourcePlan outsourcePlan = outsourcePlanService.selectOutsourcePlanByOutsourcePlanId(outsourcePlanId); OutsourcePlan outsourcePlan = outsourcePlanService.selectOutsourcePlanByOutsourcePlanId(outsourcePlanId);
List<OutsourcePlanDetail> list = outsourcePlan.getOutsourcePlanDetailList(); List<OutsourcePlanDetail> list = outsourcePlan.getOutsourcePlanDetailList();
return getDataTable(list); List<OutsourcePlanDetail> filtList = list.stream().filter(item ->item.getLevel()== 0).collect(Collectors.toList());
return getDataTable(filtList);
} }
/** /**
* 导出委外计划列表 * 导出委外计划列表

4
ruoyi-admin/src/main/resources/templates/system/outsource_plan/outsource_plan.html

@ -24,7 +24,7 @@
</li> </li>
<li> <li>
<label>状态:</label> <label>状态:</label>
<select name="status" th:with="type=${@dict.getType('purchase_plan_status')}"> <select name="status" th:with="type=${@dict.getType('outsource_plan_status')}">
<option value="">所有</option> <option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select> </select>
@ -64,7 +64,7 @@
var processMethodDatas = [[${@dict.getType('processMethod')}]]; var processMethodDatas = [[${@dict.getType('processMethod')}]];
var materialTypeDatas = [[${@category.getChildByCode('materialType')}]]; var materialTypeDatas = [[${@category.getChildByCode('materialType')}]];
var sourceTypeDatas = [[${@dict.getType('purchase_plan_source')}]]; var sourceTypeDatas = [[${@dict.getType('purchase_plan_source')}]];
var planStatusDatas = [[${@dict.getType('purchase_plan_status')}]]; var planStatusDatas = [[${@dict.getType('outsource_plan_status')}]];
var prefix = ctx + "system/outsource_plan"; var prefix = ctx + "system/outsource_plan";

Loading…
Cancel
Save