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);} },