Forráskód Böngészése

提交记录添加

zhangjie 3 éve
szülő
commit
355da57a26

+ 4 - 2
src/modules/exam/api.js

@@ -64,8 +64,10 @@ export const batchAddExamTask = datas => {
 export const taskApplyAuditHistory = flowId => {
   return $postParam("/api/admin/exam/task/review_list", { flowId });
 };
-export const taskApplySubmitHistory = flowId => {
-  return $postParam("/api/admin/exam/task/submit_list", { flowId });
+export const taskApplySubmitHistory = examTaskId => {
+  return $postParam("/api/admin/flow/task/approver/submit/list", {
+    examTaskId
+  });
 };
 export const taskApplyExamObject = paperNumber => {
   return $postParam("/api/admin/exam/task/find_exam_object", { paperNumber });

+ 17 - 9
src/modules/exam/components/ApplySubmitHistory.vue

@@ -7,8 +7,8 @@
             >{{ scope.row.operateTime | timestampFilter }}
           </span>
         </el-table-column>
-        <el-table-column prop="operateName" label="提交人"></el-table-column>
-        <el-table-column prop="reviewStatus" label="下级审核人">
+        <el-table-column prop="submitUserName" label="提交人"></el-table-column>
+        <el-table-column prop="approveUsers" label="下级审核人">
         </el-table-column>
       </el-table>
     </div>
@@ -24,25 +24,33 @@ import { taskApplySubmitHistory } from "../api";
 export default {
   name: "apply-submit-history",
   props: {
-    flowId: {
+    examTaskId: {
       type: String,
       default: ""
     }
   },
   data() {
     return {
-      submitHistory: [],
-      latestHistory: null
+      submitHistory: []
     };
   },
   mounted() {
-    // this.getData();
+    this.getData();
   },
   methods: {
     async getData() {
-      if (!this.flowId) return;
-      this.submitHistory = await taskApplySubmitHistory(this.flowId);
-      this.latestHistory = this.submitHistory[0];
+      if (!this.examTaskId) return;
+      const data = await taskApplySubmitHistory(this.examTaskId);
+      const result = data || [];
+      this.submitHistory = result.map(item => {
+        return {
+          operateTime: item.submitUser.createTime,
+          submitUserName: `${item.submitUser.realName}(${item.submitUser.orgName})`,
+          approveUsers: item.approveUserList
+            .map(user => `${user.realName}(${user.orgName})`)
+            .join(",")
+        };
+      });
     }
   }
 };

+ 1 - 1
src/modules/exam/components/ModifyTaskApply.vue

@@ -137,7 +137,7 @@
         v-if="needReview"
         v-show="curMenu.id === '3'"
         ref="ApplySubmitHistory"
-        :flow-id="modalForm.flowId"
+        :exam-task-id="modalForm.id"
       ></apply-submit-history>
     </div>