fix

ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysReportServiceImpl.java

@@ -147,7 +147,7 @@ public class SysReportServiceImpl implements ISysReportService
                     try{
                         SysReport report = sysReportMapper.selectSysReportById(sysReport.getId());
                         List c= JSON.parseArray(report.getExt1(),Object.class);
-                        c.add(0,JSON.parse("{\"content\":\""+d.getRemark()+"\",\"timestamp\":\""+DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,DateUtils.addSeconds(new Date(),1))+"\",\"deptname\":\""+SecurityUtils.getLoginUser().getUser().getDept().getDeptName()+"\"}"));
+                        c.add(JSON.parse("{\"content\":\""+d.getRemark()+"\",\"timestamp\":\""+DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,DateUtils.addSeconds(new Date(),1))+"\",\"deptname\":\""+SecurityUtils.getLoginUser().getUser().getDept().getDeptName()+"\"}"));
                         sysReport.setExt1( JSON.toJSONString(c));
                     }catch (Exception e){}
                 }
@@ -206,7 +206,7 @@ public class SysReportServiceImpl implements ISysReportService
                     }
 
 
-                }else if(last.get("content").contains("审批结果：不同意")){
+                }else if(last.get("content").contains("审批结果：不同意")&&(!sysReport.getStatus().equals("1"))){
                     //当审批不同意是 自动关闭
                     sysReport.setStatus("4");
                 }

ruoyi-ui/src/views/report/add.vue

@@ -291,21 +291,28 @@
           </el-col>
 
         </el-row>
+        <div >
+          <el-form-item label="审批流程" >
+            <div style="padding-top: 10px">
+              <el-timeline :reverse="true">
+                <el-timeline-item
+                  v-for="(activity, index) in activities"
+                  :key="index"
+                  :timestamp="activity.timestamp">
+                  {{activity.deptname + "  "+activity.content}}
+                </el-timeline-item>
+              </el-timeline>
+
+            </div>
+
+          </el-form-item>
+
+        </div>
 
       </el-form>
 
 
-      <div style="padding-left: 300rem;">
-        <el-timeline :reverse="true">
-          <el-timeline-item
-            v-for="(activity, index) in activities"
-            :key="index"
-            :timestamp="activity.timestamp">
-            {{activity.deptname + "  "+activity.content}}
-          </el-timeline-item>
-        </el-timeline>
 
-      </div>