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',},