zhangjie 1 rok pred
rodič
commit
26096b97b2

+ 6 - 4
src/modules/mark/components/markDetail/MarkDetailMarker.vue

@@ -48,7 +48,7 @@
         <el-button
           type="primary"
           :disabled="!multipleSelection.length"
-          @click="toSetTaskCount(multipleSelection)"
+          @click="toSetTaskCount(multipleSelection, {})"
         >
           设置评卷数
         </el-button>
@@ -69,7 +69,7 @@
         <el-table-column prop="courseName" label="评卷员" min-width="100">
           <template slot-scope="scope">
             <el-tag size="medium" type="info">
-              {{ scope.row.name }}({{ scope.row.orgName }})
+              {{ scope.row.loginName }}({{ scope.row.orgName }})
             </el-tag>
           </template>
         </el-table-column>
@@ -126,7 +126,7 @@
             <el-button
               class="btn-primary"
               type="text"
-              @click="toSetTaskCount([scope.row.markUserGroupId])"
+              @click="toSetTaskCount([scope.row.markUserGroupId], scope.row)"
               >设置评卷数</el-button
             >
           </template>
@@ -154,6 +154,7 @@
     <modify-marker-task-count
       ref="ModifyMarkerTaskCount"
       :ids="curIds"
+      :top-count="curRow.topCount"
       @modified="getList"
     ></modify-marker-task-count>
     <!-- ModifyMarkerBind -->
@@ -322,10 +323,11 @@ export default {
       this.getList();
     },
     // set task count
-    toSetTaskCount(ids) {
+    toSetTaskCount(ids, row) {
       if (!ids.length) return;
 
       this.curIds = ids;
+      this.curRow = row;
       this.$refs.ModifyMarkerTaskCount.open();
     },
   },

+ 4 - 5
src/modules/mark/components/markDetail/ModifyMarkerTaskCount.vue

@@ -34,10 +34,6 @@
 <script>
 import { markMarkerSetTaskCount } from "../../api";
 
-const initModalForm = {
-  topCount: null,
-};
-
 export default {
   name: "modify-marker-task-count",
   props: {
@@ -47,6 +43,9 @@ export default {
         return [];
       },
     },
+    topCount: {
+      type: Number,
+    },
   },
   data() {
     return {
@@ -66,7 +65,7 @@ export default {
   },
   methods: {
     visibleChange() {
-      this.modalForm = { ...initModalForm };
+      this.modalForm.topCount = this.topCount || undefined;
       this.$nextTick(() => {
         this.$refs.modalFormComp.clearValidate();
       });

+ 1 - 1
src/modules/mark/components/markParam/MarkParamObjectiveAnswer.vue

@@ -141,7 +141,7 @@ export default {
           errMsg: "",
         };
         if (item.questionType === 2 && !item.objectivePolicy) {
-          item.objectivePolicy = "NONE";
+          nitem.objectivePolicy = "NONE";
         }
         if (nitem.mainNumber !== curMainNumber) {
           curMainNumber = nitem.mainNumber;