From ed2b6e3fd034bb56aa73e19e3a5f4266d5745c0d Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Tue, 3 Sep 2024 10:35:37 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20=E9=94=80=E5=94=AE=E7=AE=A1=E7=90=86=20?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=A9=E6=96=99=E7=9A=84=E5=BD=93=E5=89=8D?=
=?UTF-8?q?=E7=8A=B6=E6=80=81=E4=BF=A1=E6=81=AF=E5=88=B0=E5=88=97=E8=A1=A8?=
=?UTF-8?q?=E7=AC=AC=E4=B8=80=E5=88=97=20=E5=90=88=E5=B9=B6=E9=94=80?=
=?UTF-8?q?=E5=94=AE=E8=AE=A2=E5=8D=95=E7=9A=84=E5=AE=A1=E6=A0=B8=E7=8A=B6?=
=?UTF-8?q?=E6=80=81=E5=92=8C=E5=BD=93=E5=89=8D=E4=BB=BB=E5=8A=A1=E5=90=8D?=
=?UTF-8?q?=E7=A7=B0=EF=BC=8C=E6=98=BE=E7=A4=BA=E5=9C=A8=E5=88=97=E8=A1=A8?=
=?UTF-8?q?=E7=AC=AC=E4=B8=80=E5=88=97=20=E4=BF=AE=E6=94=B9=E9=94=80?=
=?UTF-8?q?=E5=94=AE=E8=AE=A2=E5=8D=95=E7=9A=84=E5=88=86=E9=A1=B5=E6=9F=A5?=
=?UTF-8?q?=E8=AF=A2=E6=96=B9=E6=B3=95=EF=BC=8C=E6=96=B0=E5=A2=9E=E4=B8=A4?=
=?UTF-8?q?=E4=B8=AA=E7=8A=B6=E6=80=81=E7=9A=84=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../impl/SysSalesOrderServiceImpl.java | 7 +++++
.../templates/erp/material/material.html | 20 ++++++-------
.../system/salesOrder/salesOrder.html | 30 +++++++++++++------
3 files changed, 38 insertions(+), 19 deletions(-)
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 24515ebc..30f8a451 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,6 +190,13 @@ public class SysSalesOrderServiceImpl implements ISysSalesOrderService
} else {
sysSalesOrderVo.setTaskName("未启动");
}
+ if(sysSalesOrderVo.getAuditStatus()!=null){
+ if(sysSalesOrderVo.getAuditStatus().equals("1")){
+ sysSalesOrderVo.setTaskName("审核通过");
+ }else if(sysSalesOrderVo.getAuditStatus().equals("2")){
+ sysSalesOrderVo.setTaskName("审核拒绝");
+ }
+ }
returnList.add(sysSalesOrderVo);
}
returnList.setTotal(CollectionUtils.isEmpty(list) ? 0 : list.getTotal());
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 e4e17e2d..bd93a954 100644
--- a/ruoyi-admin/src/main/resources/templates/erp/material/material.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/material/material.html
@@ -135,6 +135,16 @@
columns: [
{checkbox: true},
{title: '主键ID',field: 'id',visible: false},
+ {title: '当前状态',field: 'taskName',align: 'center',
+ formatter: function(value, row, index) {
+ if(row.auditStatus!="1"&&value != "未启动"){
+ return '' + value + '';
+ }
+ if(value === "未启动"){
+ return '' + value + '';
+ }
+ return '' + value + '';}
+ },
{title: '料号',field: 'materialNo',},
{title: '物料名称',field: 'materialName',},
{title: '描述',field: 'describe',},
@@ -155,16 +165,6 @@
},
{title: '申请时间',field: 'applyTime',sortable: true,},
{title: '上次更新时间',field: 'updateTime',},
- {title: '当前状态',field: 'taskName',align: 'center',
- formatter: function(value, row, index) {
- if(row.auditStatus!="1"&&value != "未启动"){
- return '' + value + '';
- }
- if(value === "未启动"){
- return '' + value + '';
- }
- return '' + value + '';}
- },
{title: '流程实例ID',field: 'instanceId',visible: false},
{title: '流程提交实例ID',field: 'submitInstanceId',visible: false},
{title: '流程作废实例ID',field: 'cancelInstanceId',visible: false},
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 31509c2f..84eb916c 100644
--- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html
+++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html
@@ -272,6 +272,18 @@
{title: '流程恢复实例ID',field: 'restoreInstanceId', visible: false},
{ title: '流程实例类型', field: 'instanceTypeName',visible: false},
{title: '申请人ID',field: 'applyUser', visible: false},
+
+ {title: '当前状态',field: 'taskName',align: 'center',
+ formatter: function(value, row, index) {
+ if(row.auditStatus!="1"&&value != "未启动"){
+ return '' + value + '';
+ }
+ if(value === "未启动"){
+ return '' + value + '';
+ }
+ return '' + value + '';}
+ },
+
{
field: 'applyUserName',
title: '申请人',
@@ -283,15 +295,15 @@
},
{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',
+ // align: 'center',
+ // formatter: function(value, row, index) {
+ // return '' + value + '';
+ // }
+ // },
+ // {title: '审核状态',field: 'auditStatus',formatter: function(value, row, index) {
+ // return $.table.selectDictLabel(auditStatusDatas, value);}
+ // },
{title: '使用状态',field: 'useStatus',formatter:function(value, row, index) {
return $.table.selectDictLabel(useStatusDatas, value);}
},