归档考试

src/modules/examwork/view/examInfo.vue

@@ -9,14 +9,14 @@
           label-position="right"
           label-width="70px"
         >
-          <el-form-item label="考试名称" class="pull-left">
+          <el-form-item label="考试名称">
             <el-input
               v-model="formSearch.name"
               auto-complete="off"
               class="input"
             ></el-input>
           </el-form-item>
-          <el-form-item label="类型" class="pull-left">
+          <el-form-item label="类型">
             <el-select
               v-model="formSearch.examType"
               placeholder="请选择"
@@ -32,14 +32,30 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="状态" class="pull-left">
-            <el-select v-model="formSearch.enable" class="input">
-              <el-option label="全部" value=""></el-option>
+          <el-form-item label="状态">
+            <el-select
+              v-model="formSearch.enable"
+              clearable
+              placeholder="请选择"
+              class="input"
+              style="width: 100px"
+            >
               <el-option label="已启用" value="true"></el-option>
               <el-option label="已禁用" value="false"></el-option>
             </el-select>
           </el-form-item>
-
+          <el-form-item label="归档状态">
+            <el-select
+              v-model="formSearch.archived"
+              clearable
+              filterable
+              class="input"
+              placeholder="请选择"
+            >
+              <el-option label="已归档" value="true"></el-option>
+              <el-option label="未归档" value="false"></el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item class="d-block">
             <el-button
               v-if="rolePrivileges.search_exam"
@@ -104,8 +120,16 @@
             label="ID"
             sortable
           ></el-table-column>
-          <el-table-column prop="code" label="考试编码"></el-table-column>
-          <el-table-column prop="name" label="考试名称"></el-table-column>
+          <el-table-column
+            prop="code"
+            width="130"
+            label="考试编码"
+          ></el-table-column>
+          <el-table-column
+            prop="name"
+            width="130"
+            label="考试名称"
+          ></el-table-column>
           <el-table-column width="130" label="考试类型" sortable>
             <template slot-scope="scope">
               <div>
@@ -155,8 +179,15 @@
               </span>
             </span>
           </el-table-column>
-          <el-table-column label="操作" width="190">
+          <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="操作" width="190" fixed="right">
+            <template v-if="!scope.row.archived" slot-scope="scope">
               <div>
                 <el-button
                   v-if="rolePrivileges.update_exam"
@@ -376,6 +407,7 @@ export default {
         name: "",
         examType: "",
         enable: "true",
+        archived: "",
       },
       loading: false,
       examTypeList: EXAM_TYPE,
@@ -443,6 +475,13 @@ export default {
   },
 
   methods: {
+    getArchivedText(archived) {
+      if (archived) {
+        return "已归档";
+      } else {
+        return "未归档";
+      }
+    },
     toCopyExam() {
       if (this.selectedExamIds.length == 0) {
         this.$notify({
@@ -555,7 +594,8 @@ export default {
         "/" +
         this.pageSize +
         "?" +
-        param;
+        param +
+        "&ignoreArchived=true";
       this.loading = true;
       this.$httpWithMsg.get(url).then((response) => {
         console.log(response);

src/modules/marking/views/MarkWork.vue

@@ -297,7 +297,7 @@ export default {
     return {
       formSearch: {
         name: "",
-        archived: null,
+        archived: "",
       },
       formMarkWork: {
         examType: "",