开项管理 - 审批流程添加描述/备注、页面样式优化

rc-admin/src/main/java/com/ruoyi/web/controller/rc/TOpenItemController.java

@@ -84,18 +84,18 @@ public class TOpenItemController extends BaseController
             // 进度审批状态修改为2-待审核
             openItem.setStatus("2");
             questionnaire.setOpenItemStatus("2");
-            comment = "重新提交";
+            comment = devTask.getComment() == null ? "重新提交" : "重新提交，" + devTask.getComment();
         } else if (taskName.equals("审核")) {
             if ("1".equals(condition)) {
                 // 进度审批状态修改为4-已通过
                 openItem.setStatus("4");
                 questionnaire.setOpenItemStatus("4");
-                comment = "通过";
+                comment = devTask.getComment() == null ? "通过" : "通过，" + devTask.getComment();
             } else {
                 // 进度审批状态修改为3-未通过
                 openItem.setStatus("3");
                 questionnaire.setOpenItemStatus("3");
-                comment = "驳回";
+                comment = devTask.getComment() == null ? "驳回" : "驳回，" + devTask.getComment();
             }
         }
         // 使用任务id,获取任务对象，获取流程实例id

ruoyi-ui/src/views/rc/approve/detail/openitem-detail.vue

@@ -1,7 +1,9 @@
 <template>
   <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="visible" :append-to-body="true" width="600px">
 
-    <el-descriptions title="详细信息" :column="2" border>
+    <h4 style="font-weight: bold; margin-top: 0px; padding-top: 0px;">详细信息</h4>
+
+    <el-descriptions :column="2" border style="margin-bottom: 10px;">
       <el-descriptions-item :span="1" label="问题类型">
         <span
           v-for="dict in dict.type.t_open_item_type"
@@ -21,11 +23,26 @@
       <el-descriptions-item :span="1" label="开项时间">{{openitem.openTime}}</el-descriptions-item>
       <el-descriptions-item :span="1" label="闭项时间">{{openitem.closeTime}}</el-descriptions-item>
       <el-descriptions-item :span="1" label="问题处理状态">
-        <span
-          v-for="dict in dict.type.t_open_item_status"
-          v-if="openitem.status==dict.value"
-          v-text="dict.label"
-        ></span>
+        <span v-if="openitem.status == 1">
+          <el-tag type="info">
+            <dict-tag :options="dict.type.t_open_item_status" :value="openitem.status" style="display: inline;"/>
+          </el-tag>
+        </span>
+        <span v-if="openitem.status == 2">
+          <el-tag type="warning">
+            <dict-tag :options="dict.type.t_open_item_status" :value="openitem.status" style="display: inline;"/>
+          </el-tag>
+        </span>
+        <span v-if="openitem.status == 3">
+          <el-tag type="danger">
+            <dict-tag :options="dict.type.t_open_item_status" :value="openitem.status" style="display: inline;"/>
+          </el-tag>
+        </span>
+        <span v-if="openitem.status == 4">
+          <el-tag type="success">
+            <dict-tag :options="dict.type.t_open_item_status" :value="openitem.status" style="display: inline;"/>
+          </el-tag>
+        </span>
       </el-descriptions-item>
       <el-descriptions-item :span="1" label="负责人">{{openitem.personInChargeName}}</el-descriptions-item>
       <el-descriptions-item :span="1" label="审核人">{{openitem.reviewerName}}</el-descriptions-item>
@@ -40,6 +57,8 @@
       <el-descriptions-item :span="2" label="备注">{{openitem.remarks}}</el-descriptions-item>
     </el-descriptions>
 
+    <h4 style="font-weight: bold;">流转详情</h4>
+
     <el-table :data="historyList" border v-loading="historyLoading" style="width: 100%;">
       <el-table-column width="100" prop="taskName" header-align="center" align="center" label="流程进度"></el-table-column>
       <el-table-column width="80" prop="userName" header-align="center" align="center" label="处理人"></el-table-column>
@@ -48,6 +67,13 @@
       <el-table-column width="100" prop="taskEndTime" header-align="center" align="center" label="结束时间"></el-table-column>
     </el-table>
 
+    <el-form v-if="type == 2">
+      <h4 style="font-weight: bold;">描述 / 备注</h4>
+      <el-form-item>
+        <el-input v-model="taskForm.comment"/>
+      </el-form-item>
+    </el-form>
+
     <div slot="footer" class="dialog-footer">
       <el-button v-if="type == 2" type="success" @click="dataFormSubmit(1)">通 过</el-button>
       <el-button v-if="type == 2" type="info" @click="dataFormSubmit(0)">驳 回</el-button>
@@ -100,6 +126,7 @@ export default {
   },
   methods: {
     init(openitem, taskId, processId, taskName, type) {
+      this.title = type == 1 ? '查看开项审批流程': '处理开项审批流程';
       this.getUserList();
       this.openitem = openitem;
       this.type = type;