bugfix - 问卷审批流程无法提交申请问题及相关页面优化

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

@@ -148,7 +148,7 @@ public class TQuestionnaireController extends BaseController
         param.put("condition", "1");
         ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
         TaskService taskService = processEngine.getTaskService();
-        List<Task> list = taskService.createTaskQuery().taskCandidateOrAssigned(userId).list();
+        List<Task> list = taskService.createTaskQuery().taskCandidateOrAssigned(tProgress.getPersonInCharge().toString()).list();
         String taskId = null;
         String processInstanceId = null;
         for (Task task : list) {
@@ -157,7 +157,7 @@ public class TQuestionnaireController extends BaseController
                 taskId = task.getId();
             }
         }
-        processEngine.getTaskService().claim(taskId, getUserId().toString());
+//        processEngine.getTaskService().claim(taskId, getUserId().toString());
         taskService.addComment(taskId, processInstanceId, "无");
         taskService.complete(taskId, param);
 

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

@@ -104,6 +104,7 @@ export default {
     },
     /** 查询用户列表 */
     getUserList() {
+      this.userOptions = [];
       listAllUser().then(response => {
         let data = response.data;
         for (let i = 0; i < data.length; i++) {

ruoyi-ui/src/views/rc/progress/index.vue

@@ -118,9 +118,9 @@
 
     <el-table border v-loading="loading" :data="progressList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="章节" align="center" prop="chapName" width="200" />
-      <el-table-column label="细分章节" align="center" prop="subChapName" width="200" />
-      <el-table-column label="二级细分章节" align="center" prop="secSubChapName" width="200" />
+      <el-table-column label="章节" align="center" prop="chapName" width="150" />
+      <el-table-column label="细分章节" align="center" prop="subChapName" width="150" />
+      <el-table-column label="二级细分章节" align="center" prop="secSubChapName" width="150" />
       <el-table-column label="序号" align="center" prop="code" width="80" />
       <el-table-column label="名称" align="center" prop="name" width="350" />
       <el-table-column label="内容" align="center" prop="content" width="200" />
@@ -151,12 +151,26 @@
           <dict-tag :options="dict.type.t_progress_description" :value="scope.row.progress"/>
         </template>
       </el-table-column>
-      <el-table-column label="审批状态" align="center" prop="applyStatus" width="100">
+      <el-table-column label="备注" align="center" prop="remarks" width="200" />
+      <el-table-column label="审批状态" align="center" prop="applyStatus" width="120" fixed="right">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.t_progress_apply_status" :value="scope.row.applyStatus"/>
+          <span v-if="scope.row.applyStatus == 1">
+            <svg-icon icon-class="roundGrey" style="font-size: 10px; margin: 0px 4px;"></svg-icon>
+          </span>
+          <span v-if="scope.row.applyStatus == 2">
+            <svg-icon icon-class="roundYellow" style="font-size: 10px; margin: 0px 4px;"></svg-icon>
+          </span>
+          <span v-if="scope.row.applyStatus == 3">
+            <svg-icon icon-class="roundRed" style="font-size: 10px; margin: 0px 4px;"></svg-icon>
+          </span>
+          <span v-if="scope.row.applyStatus == 4">
+            <svg-icon icon-class="roundGreen" style="font-size: 10px; margin: 0px 4px;"></svg-icon>
+          </span>
+          <span>
+            <dict-tag :options="dict.type.t_progress_apply_status" :value="scope.row.applyStatus" style="display: inline;"/>
+          </span>
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="remarks" width="200" />
       <el-table-column label="审计文档" align="center" width="100" fixed="right">
         <template slot-scope="scope">
           <el-button icon="el-icon-folder" style="color:#6e96fa;" circle @click="handleDoc(scope.row , 'audit')"></el-button>