[fix] 工程管理

开发修改单vo类新增 任务状态字段，修改开发修改单后端分页查询接口，新增任务状态；修改开发修改单前端列表，审核状态和当前任务名称合并为当前状态字段
按照万材要求：调整开发修改单前端列表页面布局：优先字段：开发修改单号、关联的生产订单号、料号、物料名称、描述、品牌等

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;
     /** 创建人 */

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());

ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/developModifyOrder.html

@@ -61,7 +61,7 @@
                 </a>
             </div>
             <div class="col-sm-12 select-table table-striped">
-                <table id="bootstrap-table"></table>
+                <table id="bootstrap-table" style="white-space:nowrap"></table>
             </div>
         </div>
     </div>
@@ -132,17 +132,6 @@
                         title: '申请人ID',
                         visible: false
                     },
-                    {
-                        field: 'applyUserName',
-                        title: '<span style="color: red;">申请人</span>',
-                        formatter: function(value, row, index) {
-                            return '<span style="color: red;">' + (value ? value : "-") + '</span>';
-                        }
-                    },
-                    {
-                        field: 'applyTime',
-                        title: '申请时间'
-                    },
                     {
                         field: 'taskId',
                         title: '当前任务ID',
@@ -157,6 +146,7 @@
                         field: 'taskName',
                         title: '当前任务名称',
                         align: 'center',
+                        visible: false,
                         formatter: function(value, row, index) {
                             return '<span class="badge badge-primary">' + value + '</span>';
                         }
@@ -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 '<span class="badge badge-danger">' + value + '</span>';
+                            }
+                            if(value === "未启动"){
+                                return '<span class="badge badge-primary">' + value + '</span>';
+                            }
+                            return '<span class="badge badge-primary">' + value + '</span>';}
+                    },
+                    {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: '<span style="color: red;">申请人</span>',
+                        formatter: function(value, row, index) {
+                            return '<span style="color: red;">' + (value ? value : "-") + '</span>';
+                        }
+                    },
+                    {
+                        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',},