diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrderVo.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrderVo.java
index 0c5dc539..e339601c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrderVo.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrderVo.java
@@ -10,6 +10,10 @@ public class SysSalesOrderVo extends SysSalesOrder{
private String taskId;
/** 任务名称 */
private String taskName;
+
+ /** 任务状态 */
+ private String taskStatus;
+
/** 办理时间 */
private Date doneTime;
/** 创建人 */
@@ -117,4 +121,12 @@ public class SysSalesOrderVo extends SysSalesOrder{
public void setApplyTitle(String applyTitle) {
this.applyTitle = applyTitle;
}
+
+ public String getTaskStatus() {
+ return taskStatus;
+ }
+
+ public void setTaskStatus(String taskStatus) {
+ this.taskStatus = taskStatus;
+ }
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderServiceImpl.java
index 30f8a451..09bbb62e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderServiceImpl.java
@@ -190,11 +190,12 @@ public class SysSalesOrderServiceImpl implements ISysSalesOrderService
} else {
sysSalesOrderVo.setTaskName("未启动");
}
+ sysSalesOrderVo.setTaskStatus(sysSalesOrderVo.getTaskName());
if(sysSalesOrderVo.getAuditStatus()!=null){
if(sysSalesOrderVo.getAuditStatus().equals("1")){
- sysSalesOrderVo.setTaskName("审核通过");
+ sysSalesOrderVo.setTaskStatus("审核通过");
}else if(sysSalesOrderVo.getAuditStatus().equals("2")){
- sysSalesOrderVo.setTaskName("审核拒绝");
+ sysSalesOrderVo.setTaskStatus("审核拒绝");
}
}
returnList.add(sysSalesOrderVo);
diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html
index 84eb916c..318a9046 100644
--- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html
+++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html
@@ -273,7 +273,7 @@
{ title: '流程实例类型', field: 'instanceTypeName',visible: false},
{title: '申请人ID',field: 'applyUser', visible: false},
- {title: '当前状态',field: 'taskName',align: 'center',
+ {title: '当前状态',field: 'taskStatus',align: 'center',
formatter: function(value, row, index) {
if(row.auditStatus!="1"&&value != "未启动"){
return '' + value + '';
@@ -295,15 +295,17 @@
},
{title: '当前任务ID',field: 'taskId',visible: false},
{ title: '待办用户ID',field: 'todoUserId', visible: false},
- // { title: '当前任务名称',field: 'taskName',
- // align: 'center',
- // formatter: function(value, row, index) {
- // return '' + value + '';
- // }
- // },
- // {title: '审核状态',field: 'auditStatus',formatter: function(value, row, index) {
- // return $.table.selectDictLabel(auditStatusDatas, value);}
- // },
+ { title: '当前任务名称',field: 'taskName',visible: false,
+ align: 'center',
+ formatter: function(value, row, index) {
+ return '' + value + '';
+ }
+
+ },
+ {title: '审核状态',field: 'auditStatus',visible: false,
+ formatter: function(value, row, index) {
+ return $.table.selectDictLabel(auditStatusDatas, value);}
+ },
{title: '使用状态',field: 'useStatus',formatter:function(value, row, index) {
return $.table.selectDictLabel(useStatusDatas, value);}
},