From aed17c8dc06d9e6fb03e3eae5ec951fe86e073bc Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Wed, 18 Sep 2024 11:23:13 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=20=E5=B7=A5=E7=A8=8B=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E4=BF=AE=E6=94=B9=E5=8D=95vo=E7=B1=BB?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=E4=BB=BB=E5=8A=A1=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=95=E5=90=8E=E7=AB=AF=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=8A=B6=E6=80=81=EF=BC=9B=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E4=BF=AE=E6=94=B9=E5=8D=95=E5=89=8D=E7=AB=AF?= =?UTF-8?q?=E5=88=97=E8=A1=A8=EF=BC=8C=E5=AE=A1=E6=A0=B8=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E5=92=8C=E5=BD=93=E5=89=8D=E4=BB=BB=E5=8A=A1=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=B8=BA=E5=BD=93=E5=89=8D=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=20=E6=8C=89=E7=85=A7=E4=B8=87=E6=9D=90?= =?UTF-8?q?=E8=A6=81=E6=B1=82=EF=BC=9A=E8=B0=83=E6=95=B4=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=95=E5=89=8D=E7=AB=AF=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=B8=83=E5=B1=80=EF=BC=9A=E4=BC=98=E5=85=88?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=9A=E5=BC=80=E5=8F=91=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=8D=95=E5=8F=B7=E3=80=81=E5=85=B3=E8=81=94=E7=9A=84=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E8=AE=A2=E5=8D=95=E5=8F=B7=E3=80=81=E6=96=99=E5=8F=B7?= =?UTF-8?q?=E3=80=81=E7=89=A9=E6=96=99=E5=90=8D=E7=A7=B0=E3=80=81=E6=8F=8F?= =?UTF-8?q?=E8=BF=B0=E3=80=81=E5=93=81=E7=89=8C=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/vo/ErpDevelopModifyorderVo.java | 4 + .../ErpDevelopModifyorderServiceImpl.java | 9 +++ .../developModifyOrder.html | 76 +++++++++++-------- 3 files changed, 59 insertions(+), 30 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/vo/ErpDevelopModifyorderVo.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/vo/ErpDevelopModifyorderVo.java index 2d6c7029..7a3a073b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/vo/ErpDevelopModifyorderVo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/vo/ErpDevelopModifyorderVo.java @@ -17,6 +17,10 @@ public class ErpDevelopModifyorderVo extends ErpDevelopModifyorder { private String taskId; /** 任务名称 */ private String taskName; + + //当前状态 + private String taskStatus; + /** 办理时间 */ private Date doneTime; /** 创建人 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpDevelopModifyorderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpDevelopModifyorderServiceImpl.java index 4fc60207..93c2f149 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpDevelopModifyorderServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpDevelopModifyorderServiceImpl.java @@ -146,6 +146,15 @@ public class ErpDevelopModifyorderServiceImpl implements IErpDevelopModifyorderS } else { tempErpDevelopModifyorderVo.setTaskName("未启动"); } + + tempErpDevelopModifyorderVo.setTaskStatus(tempErpDevelopModifyorderVo.getTaskName()); + if(tempErpDevelopModifyorderVo.getAuditStatus()!=null){ + if(tempErpDevelopModifyorderVo.getAuditStatus().equals("1")){ + tempErpDevelopModifyorderVo.setTaskStatus("审核通过"); + }else if(tempErpDevelopModifyorderVo.getAuditStatus().equals("2")){ + tempErpDevelopModifyorderVo.setTaskStatus("审核拒绝"); + } + } returnList.add(tempErpDevelopModifyorderVo); } returnList.setTotal(org.springframework.util.CollectionUtils.isEmpty(list) ? 0 : list.getTotal()); diff --git a/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/developModifyOrder.html b/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/developModifyOrder.html index cc998107..db2977d2 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/developModifyOrder.html +++ b/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/developModifyOrder.html @@ -61,7 +61,7 @@
-
+
@@ -132,17 +132,6 @@ title: '申请人ID', visible: false }, - { - field: 'applyUserName', - title: '申请人', - formatter: function(value, row, index) { - return '' + (value ? value : "-") + ''; - } - }, - { - field: 'applyTime', - title: '申请时间' - }, { field: 'taskId', title: '当前任务ID', @@ -157,6 +146,7 @@ field: 'taskName', title: '当前任务名称', align: 'center', + visible: false, formatter: function(value, row, index) { return '' + value + ''; } @@ -164,10 +154,54 @@ { title: '审核状态', field: 'auditStatus', + visible: false, formatter: function (value, row, index) { return $.table.selectDictLabel(auditStatusDatas, value); } }, + + {title: '当前状态',field: 'taskStatus',align: 'center', + formatter: function(value, row, index) { + if(row.auditStatus!="1"&&value != "未启动"){ + return '' + value + ''; + } + if(value === "未启动"){ + return '' + value + ''; + } + return '' + value + '';} + }, + {title: '开发修改单号',field: 'developOrderCode',}, + {title: '料号',field: 'materialNo',}, + {title: '图片',field: 'materialPhotoUrl',}, + {title: '物料名称',field: 'materialName',}, + {title: '物料类型',field: 'materialType', + formatter: function(value, row, index) { + return $.table.selectCategoryLabel(materialTypeDatas, value); + } + }, + {title: '单位',field: 'materialUnit',}, + {title: '品牌',field: 'materialBrand',}, + {title: '描述',field: 'materialDescribe',}, + {title: '加工方式', + field: 'materialProcessMethod', + formatter: function(value, row, index) { + return $.table.selectDictLabel(processMethodDatas, value); + } + }, + + + { + field: 'applyUserName', + title: '申请人', + formatter: function(value, row, index) { + return '' + (value ? value : "-") + ''; + } + }, + { + field: 'applyTime', + title: '申请时间' + }, + {title: '完成状态',field: 'finshStatus', formatter: function (value, row, index) { return $.table.selectDictLabel(finshStatusDatas, value); @@ -178,7 +212,6 @@ return $.table.selectDictLabel(completeStatusDatas, value); } }, - {title: '开发修改单号',field: 'developOrderCode',}, {title: '采购入库状态',field: 'purchaseStorageStatus', formatter: function (value, row, index) { return $.table.selectDictLabel(purchaseStorageStatusDatas, value); @@ -190,23 +223,6 @@ } }, {title: '工程员',field: 'userName',}, - {title: '料号',field: 'materialNo',}, - {title: '图片',field: 'materialPhotoUrl',}, - {title: '物料名称',field: 'materialName',}, - {title: '物料类型',field: 'materialType', - formatter: function(value, row, index) { - return $.table.selectCategoryLabel(materialTypeDatas, value); - } - }, - {title: '单位',field: 'materialUnit',}, - {title: '品牌',field: 'materialBrand',}, - {title: '描述',field: 'materialDescribe',}, - {title: '加工方式', - field: 'materialProcessMethod', - formatter: function(value, row, index) { - return $.table.selectDictLabel(processMethodDatas, value); - } - }, {title: '录入时间',field: 'createTime',}, {title: '更新人',field: 'updateBy',}, {title: '上次更新时间',field: 'updateTime',},