f

src/render/views/AbsentCheck/ImportTypeDialog.vue

@@ -7,6 +7,19 @@
     title="导入缺考名单"
   >
     <a-row :gutter="16">
+      <a-col :span="24">
+        <div class="mb-10px">
+          <span style="color: red; margin-right: 3px">*</span>
+          <span class="label">科目：</span>
+          <SelectSubject
+            style="width: 100px"
+            v-model="subjectCode"
+            :exam-id="userStore.curExam?.id as number"
+            placeholder="请选择"
+          ></SelectSubject>
+          <span style="color: red" v-if="!subjectCode">（科目必选）</span>
+        </div>
+      </a-col>
       <a-col :span="12">
         <import-btn
           :upload-url="uploadUrl"
@@ -14,8 +27,13 @@
           :format="['txt']"
           @upload-success="uploadSuccessHandle"
           @valid-error="onValidError"
+          :disabled="!subjectCode"
         >
-          <a-button class="type-box" @click="seleted('COMPARE')">
+          <a-button
+            class="type-box"
+            :disabled="!subjectCode"
+            @click="seleted('COMPARE')"
+          >
             <img src="@/assets/imgs/bg-compare.png" alt="交叉对比" />
             <p>交叉对比</p>
             <p>CROSS-CONTRAST</p>
@@ -29,8 +47,13 @@
           :format="['txt']"
           @upload-success="uploadSuccessHandle"
           @valid-error="onValidError"
+          :disabled="!subjectCode"
         >
-          <a-button class="type-box" @click="seleted('OVERRIDE')">
+          <a-button
+            class="type-box"
+            @click="seleted('OVERRIDE')"
+            :disabled="!subjectCode"
+          >
             <img src="@/assets/imgs/bg-overwrite.png" alt="覆盖数据" />
             <p>覆盖数据</p>
             <p>OVERWRITE THE DATA</p>
@@ -64,7 +87,7 @@ import { absentTemplateDownload } from "@/ap/absentCheck";
 import useLoading from "@/hooks/useLoading";
 import { message } from "@qmth/ui";
 import { useUserStore } from "@/store";
-
+import SelectSubject from "@/components/SelectSubject/index.vue";
 import ImportBtn from "@/components/ImportBtn/index.vue";
 import TaskProgressDialog from "../ResultExport/TaskProgressDialog.vue";
 
@@ -81,10 +104,12 @@ const userStore = useUserStore();
 const uploadUrl = "/api/admin/check/exam-status/import";
 const uploadMode = ref("" as ImportType);
 
+const subjectCode = ref("");
 const updateData = computed(() => {
   return {
     examId: userStore.curExam.id,
     mode: uploadMode.value,
+    subjectCode: subjectCode.value,
   };
 });
 

src/render/views/ScanManage/ScanCheckMiss.vue

@@ -20,6 +20,9 @@
         <template v-if="column.dataIndex === 'scanned'">
           {{ record[column.dataIndex] }}
         </template>
+        <template v-if="column.dataIndex === 'subjectName'">
+          {{ record.subjectCode + "-" + record.subjectName }}
+        </template>
       </template>
     </a-table>
   </div>