diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpMaterialVo.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpMaterialVo.java index f0b16d32..fc6a74fe 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpMaterialVo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpMaterialVo.java @@ -14,6 +14,8 @@ public class ErpMaterialVo extends ErpMaterial { private String taskId; /** 任务名称 */ private String taskName; + + private String taskStatus; /** 办理时间 */ private Date doneTime; /** 创建人 */ @@ -115,6 +117,14 @@ public class ErpMaterialVo extends ErpMaterial { this.ids = ids; } + public String getTaskStatus() { + return taskStatus; + } + + public void setTaskStatus(String taskStatus) { + this.taskStatus = taskStatus; + } + @Override public String toString() { return "ErpMaterialVo{" + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpMaterialServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpMaterialServiceImpl.java index bf31441e..be5386c2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpMaterialServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpMaterialServiceImpl.java @@ -147,11 +147,12 @@ public class ErpMaterialServiceImpl implements IErpMaterialService } else { materialVo.setTaskName("未启动"); } + materialVo.setTaskStatus(materialVo.getTaskName()); if(materialVo.getAuditStatus()!=null){ if(materialVo.getAuditStatus().equals("1")){ - materialVo.setTaskName("审核通过"); + materialVo.setTaskStatus("审核通过"); }else if(materialVo.getAuditStatus().equals("2")){ - materialVo.setTaskName("审核拒绝"); + materialVo.setTaskStatus("审核拒绝"); } } returnList.add(materialVo); diff --git a/ruoyi-admin/src/main/resources/templates/erp/material/material.html b/ruoyi-admin/src/main/resources/templates/erp/material/material.html index bd93a954..630239ae 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/material/material.html +++ b/ruoyi-admin/src/main/resources/templates/erp/material/material.html @@ -135,7 +135,7 @@ columns: [ {checkbox: true}, {title: '主键ID',field: 'id',visible: false}, - {title: '当前状态',field: 'taskName',align: 'center', + {title: '当前状态',field: 'taskStatus',align: 'center', formatter: function(value, row, index) { if(row.auditStatus!="1"&&value != "未启动"){ return '' + value + ''; @@ -165,6 +165,7 @@ }, {title: '申请时间',field: 'applyTime',sortable: true,}, {title: '上次更新时间',field: 'updateTime',}, + {title: '当前任务名称',field: 'taskName',visible: false}, {title: '流程实例ID',field: 'instanceId',visible: false}, {title: '流程提交实例ID',field: 'submitInstanceId',visible: false}, {title: '流程作废实例ID',field: 'cancelInstanceId',visible: false},