bugfix - 问卷审批流程审批处理页面添加备注框

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

@@ -95,6 +95,10 @@ public class TQuestionnaireController extends BaseController
                 progress.setApplyStatus("3");
                 comment = "驳回";
             }
+            String devComment = devTask.getComment();
+            if (StringUtils.isNotNull(devComment)) {
+                comment += "，" + devComment;
+            }
         }
         // 使用任务id,获取任务对象，获取流程实例id
         Task task = taskService.createTaskQuery().taskId(taskId).singleResult();

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

@@ -79,7 +79,20 @@ export default {
       // rejectList: [],
       historyLoading: true,
       dialogType: 0,
-      openitem: null,
+      openitem: {
+        type: null,
+        questionnaireId: null,
+        description: null,
+        level: null,
+        openTime: null,
+        closeTime: null,
+        status: null,
+        personInChargeName: null,
+        reviewerName: null,
+        result: null,
+        deadline: null,
+        remarks: null,
+      },
       type: null,
       // 用户列表
       userOptions: [],

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

@@ -41,7 +41,7 @@
       <el-descriptions-item :span="2" label="备注">{{progress.remarks}}</el-descriptions-item>
     </el-descriptions>
 
-    <el-table :data="historyList" border v-loading="historyLoading" style="width: 100%;">
+    <el-table :data="historyList" border v-loading="historyLoading" style="width: 100%; margin-top: 10px;">
       <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>
       <el-table-column prop="comment" header-align="center" align="center" label="备注 / 审批意见"></el-table-column>
@@ -49,6 +49,12 @@
       <el-table-column width="100" prop="taskEndTime" header-align="center" align="center" label="结束时间"></el-table-column>
     </el-table>
 
+    <el-form ref="taskForm" :model="taskForm" label-width="68px" style="margin-top: 10px;" v-if="type == 2">
+      <el-form-item label="备注">
+        <el-input clearable v-model="taskForm.comment" placeholder="请填写备注"></el-input>
+      </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>
@@ -80,12 +86,27 @@ export default {
       // rejectList: [],
       historyLoading: true,
       dialogType: 0,
-      progress: null,
+      progress: {
+        chapName: null,
+        subChapName: null,
+        secSubChapName: null,
+        content: null,
+        personInCharge: null,
+        supporter: null,
+        startDate: null,
+        targetDate: null,
+        finishDate: null,
+        preparation: null,
+        progress: null,
+        remarks: null,
+      },
       type: 0,
       // 用户列表
       userOptions: [],
     }
   },
+  created() {
+  },
   methods: {
     init(progress, taskId, processId, taskName, type) {
       this.getUserList();
@@ -116,10 +137,6 @@ export default {
         }
       });
     },
-    reset() {
-      this.taskForm =  {
-      };
-    },
     dataFormSubmit(condition) {
       this.taskForm.condition = condition;
       handleQuestionnaire(this.taskForm).then(response => {