From 1820095db88dc13083032030535620e9c74c2e94 Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Tue, 3 Sep 2024 13:15:17 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20=E9=94=80=E5=94=AE=E7=AE=A1=E7=90=86=20?=
=?UTF-8?q?=E9=94=80=E5=94=AEvo=E7=B1=BB=E6=96=B0=E5=A2=9E=E4=BB=BB?=
=?UTF-8?q?=E5=8A=A1=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5=20=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E7=9A=84=E5=88=86?=
=?UTF-8?q?=E9=A1=B5=E6=9F=A5=E8=AF=A2=E6=96=B9=E6=B3=95=EF=BC=8C=E6=96=B0?=
=?UTF-8?q?=E5=A2=9E=E7=BB=99=E4=BB=BB=E5=8A=A1=E5=90=8D=E7=A7=B0=E8=B5=8B?=
=?UTF-8?q?=E5=80=BC=E7=9A=84=E5=90=8C=E6=97=B6=E7=BB=99=E4=BB=BB=E5=8A=A1?=
=?UTF-8?q?=E7=8A=B6=E6=80=81=E8=B5=8B=E5=80=BC=20=E6=96=B0=E5=A2=9E?=
=?UTF-8?q?=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2=E5=BD=93=E5=89=8D=E7=8A=B6?=
=?UTF-8?q?=E6=80=81=E5=AD=97=E6=AE=B5=E4=B8=BA=E4=BB=BB=E5=8A=A1=E7=8A=B6?=
=?UTF-8?q?=E6=80=81=EF=BC=8C=E9=9A=90=E8=97=8F=E5=BD=93=E5=89=8D=E4=BB=BB?=
=?UTF-8?q?=E5=8A=A1=E5=90=8D=E7=A7=B0=E5=92=8C=E5=AE=A1=E6=A0=B8=E7=8A=B6?=
=?UTF-8?q?=E6=80=81=20=E4=BF=AE=E5=A4=8D=E9=94=80=E5=94=AE=E8=AE=A2?=
=?UTF-8?q?=E5=8D=95=E6=B2=A1=E6=9C=89=E8=B0=83=E6=95=B4=E7=94=B3=E8=AF=B7?=
=?UTF-8?q?=E6=8C=89=E9=92=AE=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ruoyi/system/domain/SysSalesOrderVo.java | 12 ++++++++++
.../impl/SysSalesOrderServiceImpl.java | 5 +++--
.../system/salesOrder/salesOrder.html | 22 ++++++++++---------
3 files changed, 27 insertions(+), 12 deletions(-)
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);}
},