命题任务驳回之后可以继续选择审核人

src/modules/exam/components/ApplyContent.vue

@@ -320,7 +320,8 @@
               <div
                 v-if="
                   flow.isApproveSetFlowNextNode &&
-                  auditModal.approvePass === 'PASS'
+                  ((IS_AUDIT && auditModal.approvePass === 'PASS') ||
+                    curTaskApply.flowStatus === 'REJECT')
                 "
                 class="flow-item-action"
               >
@@ -713,6 +714,9 @@ export default {
         : this.curTaskApply.setup > 1;
       return IS_COMMON_AUDIT;
     },
+    FLOW_IS_OVER() {
+      return ["END", "FINISH"].includes(this.curTaskApply.flowStatus);
+    },
     maxFetchCount() {
       return this.paperAttachments.length < 1
         ? 1
@@ -787,9 +791,10 @@ export default {
         await this.getFlowList();
       } else {
         await this.getFlowHistory();
+        this.getCurFlowNodeInfo();
       }
 
-      if (this.IS_AUDIT) this.getCurFlowNodeInfo();
+      // if (this.IS_AUDIT) this.getCurFlowNodeInfo();
     },
     async getCardList() {
       if (!this.curTaskApply.courseCode || !this.curTaskApply.examId) return;
@@ -879,12 +884,10 @@ export default {
         this.TASK_AUDIT_RESULT = { PASS: "通过" };
         this.auditModal.approvePass = "PASS";
       }
-      // 判断发起人自选，是否需要选择下个审核人员
-      const { modelType, approveUserNames, taskKey } = this.nextFlowTaskResult;
+      // 判断发起人自选，不管approveUserNames有没有值，都可以选择下个审核人员
+      const { modelType, taskKey } = this.nextFlowTaskResult;
       this.IS_NEED_SELECT_APPROVE_USER =
-        modelType === "APPROVE_SET" &&
-        taskKey.toLowerCase() !== "end" &&
-        !approveUserNames;
+        modelType === "APPROVE_SET" && taskKey.toLowerCase() !== "end";
       this.flowHistoryList[
         this.flowHistoryList.length - 1
       ].isApproveSetFlowNextNode = this.IS_NEED_SELECT_APPROVE_USER;

src/modules/stmms/components/markParam/MarkPaperGroup.vue

@@ -69,18 +69,13 @@
             >编辑</el-button
           >
           <el-button
-            v-if="!onlyMarker"
             class="btn-primary"
             type="text"
             :disabled="!paperList.length"
             @click="toSetArea(scope.row)"
             >评卷区</el-button
           >
-          <el-button
-            v-if="!onlyMarker"
-            class="btn-danger"
-            type="text"
-            @click="toDelete(scope.row)"
+          <el-button class="btn-danger" type="text" @click="toDelete(scope.row)"
             >删除</el-button
           >
         </template>
@@ -98,7 +93,6 @@
     ></modify-marker-question>
     <!-- ModifyMarkArea -->
     <modify-mark-area
-      v-if="!onlyMarker"
       ref="ModifyMarkArea"
       :base-info="datas.basicPaperInfo"
       :group="curGroupInfo"

src/modules/stmms/components/markParam/MarkParamMarker.vue

@@ -36,14 +36,6 @@
           </el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="评卷方式">
-        <template slot-scope="scope">
-          <span>{{ MARK_TYPE[scope.row.doubleRate] }}</span>
-          <span v-if="scope.row.doubleRate === 1">
-            仲裁阀值：{{ scope.row.arbitrateThreshold }}
-          </span>
-        </template>
-      </el-table-column>
       <el-table-column label="评阅题目">
         <template slot-scope="scope">
           {{ scope.row.questions | questionsFilter }}
@@ -58,8 +50,8 @@
       </el-table-column>
     </el-table>
 
-    <div class="text-center">
-      <!-- <el-button type="success" :disabled="loading" @click="submit"
+    <div class="text-center mt-2">
+      <!-- <el-button type="primary" :disabled="loading" @click="submit"
         >提交</el-button
       > -->
       <el-button @click="cancel">取消</el-button>
@@ -68,7 +60,7 @@
     <!-- ModifyMarkerQuestion -->
     <modify-marker-question
       ref="ModifyMarkerQuestion"
-      :course-code="datas.basicPaperInfo.courseCode"
+      :course-code="markParamInfos.basicPaperInfo.courseCode"
       :instance="curGroupInfo"
       :disabled-question-ids="disabledQuestionIds"
       :paper-structure="subjectiveQuestionList"
@@ -172,7 +164,7 @@ export default {
     async updateGroupMarker(group) {
       console.log(group);
       await examBindMarker({
-        paperStructureId: this.datas.basicPaperInfo.id,
+        paperStructureId: this.markParamInfos.basicPaperInfo.id,
         groupInfo: group,
       });
     },

src/modules/stmms/components/markParam/MarkParamMarkerLeader.vue

@@ -1,17 +1,36 @@
 <template>
   <div class="mark-param-marker-leader">
-    <el-tag
-      v-for="user in users"
-      :key="user.id"
-      closable
-      :disable-transitions="false"
-      @close="toDeleteUser(user)"
-    >
-      {{ user.label }}
-    </el-tag>
+    <table class="table">
+      <colgroup>
+        <col />
+        <col width="100" />
+      </colgroup>
+      <tr>
+        <th>科组长</th>
+        <th>操作</th>
+      </tr>
+      <tr>
+        <td>
+          <el-tag
+            v-for="user in users"
+            :key="user.id"
+            closable
+            :disable-transitions="false"
+            @close="toDeleteUser(user)"
+          >
+            {{ user.label }}
+          </el-tag>
+        </td>
+        <td>
+          <el-button class="btn-primary" type="text" @click="toEdit"
+            >编辑</el-button
+          >
+        </td>
+      </tr>
+    </table>
 
-    <div class="text-center">
-      <el-button type="success" :disabled="loading" @click="submit"
+    <div class="text-center mt-2">
+      <el-button type="primary" :disabled="loading" @click="submit"
         >提交</el-button
       >
       <el-button @click="cancel">取消</el-button>
@@ -53,6 +72,9 @@ export default {
     userSelected(users) {
       this.users = users;
     },
+    toEdit() {
+      this.$refs.SelectTypeUser.open();
+    },
     async submit() {
       if (!this.users.length) {
         this.$message.error("请选择科组长");

src/modules/stmms/components/markParam/MarkParamObjectiveAnswer.vue

@@ -80,8 +80,8 @@
       </el-table-column>
     </el-table>
 
-    <div class="text-center">
-      <el-button type="success" :disabled="loading" @click="submit"
+    <div class="text-center mt-2">
+      <el-button type="primary" :disabled="loading" @click="submit"
         >提交</el-button
       >
       <el-button @click="cancel">取消</el-button>

src/modules/stmms/components/markParam/MarkParamStructure.vue

@@ -36,7 +36,7 @@
       >
       <el-button
         v-if="isLastStep"
-        type="success"
+        type="primary"
         :disabled="loading"
         @click="nextStep"
         >提交</el-button
@@ -56,7 +56,6 @@ import { mapState, mapMutations } from "vuex";
 
 import MarkPaperGroup from "./MarkPaperGroup.vue";
 import MarkPaperStructure from "./MarkPaperStructure.vue";
-// import paramData from "./paramData";
 import { examStructureSubmit } from "../../api";
 import { calcSum, deepCopy } from "@/plugins/utils";
 
@@ -74,7 +73,7 @@ const STEPS_LIST = [
 ];
 
 export default {
-  name: "mark-paper-structure",
+  name: "mark-param-structure",
   components: { MarkPaperGroup, MarkPaperStructure },
   props: {
     instance: {

src/modules/stmms/components/markParam/MarkParamUploadAnswer.vue

@@ -12,7 +12,7 @@
         </el-form-item>
       </div>
     </el-form>
-    <div class="text-center">
+    <div class="text-center mt-2">
       <el-button type="primary" :disabled="loading" @click="submit"
         >确认</el-button
       >

src/modules/stmms/components/markParam/ModifyMarkParams.vue

@@ -22,7 +22,7 @@
       </el-button>
     </div>
 
-    <div v-if="dataReady" class="mark-body">
+    <div v-if="dataReady">
       <component
         :is="currentComponent"
         def="MarkParamRef"
@@ -94,7 +94,7 @@ export default {
   },
   computed: {
     currentComponent() {
-      return `mark-param-${this.tabs[this.current].name}`;
+      return `mark-param-${this.curTab}`;
     },
     isFirstStep() {
       return this.current === 0;
@@ -155,8 +155,10 @@ export default {
     getBaseInfo(baseInfo) {
       return this.$objAssign(
         {
+          id: null,
           examPaperStructureId: baseInfo.id,
           examId: null,
+          cardId: null,
           thirdRelateId: null,
           thirdRelateName: "",
           courseName: "",

src/modules/stmms/components/markParam/ModifyMarkerQuestion.vue

@@ -90,7 +90,10 @@
                 {{ user.name }}（{{ user.orgName }}）
               </el-tag>
             </el-form-item>
-            <el-form-item prop="questions" label="选择评卷题目：">
+            <el-form-item
+              prop="questions"
+              :label="canSelectQuestion ? '选择评卷题目：' : '评卷题目：'"
+            >
               <div class="marker-paper-struct">
                 <div
                   v-for="mainItem in paperStructs"

src/modules/stmms/views/UploadStructure.vue

@@ -71,7 +71,7 @@
         <el-table-column
           class-name="action-column"
           label="操作"
-          width="220px"
+          width="160px"
           fixed="right"
         >
           <template slot-scope="scope">