归档处理

src/modules/marking/views/MarkWork.vue

@@ -45,7 +45,7 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column label="考试名称-类型" width="300">
+            <el-table-column label="考试名称-类型" width="250">
               <template slot-scope="scope">
                 <div>
                   <span
@@ -78,15 +78,23 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column label="评卷是否结束" width="130">
+            <el-table-column label="评卷是否结束" width="100">
               <template slot-scope="scope">
                 <div>
                   <span>{{ getIsEndText(scope.row.isEnd) }}</span>
                 </div>
               </template>
             </el-table-column>
-            <el-table-column label="操作">
+            <el-table-column label="是否归档" width="90">
               <template slot-scope="scope">
+                <div>
+                  <span>{{ getArchivedText(scope.row.archived) }}</span>
+                </div>
+              </template>
+            </el-table-column>
+
+            <el-table-column label="操作">
+              <template v-if="!scope.row.archived" slot-scope="scope">
                 <div class="pull-left">
                   <el-button
                     type="primary"
@@ -366,6 +374,14 @@ export default {
       }
     },
 
+    getArchivedText(archived) {
+      if (archived) {
+        return "已归档";
+      } else {
+        return "未归档";
+      }
+    },
+
     appendPaper(row) {
       this.loading = true;
       this.$http
@@ -436,7 +452,8 @@ export default {
             orgId +
             `&pageNumber=${this.currentPage - 1}&pageSize=${
               this.pageSize
-            }&name=${this.formSearch.name}`
+            }&name=${this.formSearch.name}` +
+            "&ignoreArchived=true"
         )
         .then((response) => {
           console.log(response);