刘洋 hai 7 meses
pai
achega
d85b6bbf67

+ 1 - 0
src/render/ap/types/absentCheck.ts

@@ -9,6 +9,7 @@ export interface AbsentCheckListFilter {
   subjectCode: string;
   examStatus: string;
   status: string;
+  packageCode?: string;
 }
 
 export type AbsentCheckListParams = PageParams<AbsentCheckListFilter>;

+ 59 - 33
src/render/views/AbsentCheck/CheckAction.vue

@@ -12,7 +12,6 @@
             <select-course
               v-model:value="searchModel.subjectCode"
               :exam-id="userStore.curExam.id"
-              style="width: 150px"
               allow-clear
             ></select-course>
           </a-form-item>
@@ -24,42 +23,53 @@
               allow-clear
             ></a-select>
           </a-form-item>
-          <a-form-item label="考号">
-            <div class="exam-number">
-              <a-textarea
-                v-model:value="searchModel.examNumber"
-                placeholder="请输入"
-                :auto-size="{ minRows: 1, maxRows: 1 }"
-              ></a-textarea>
-              <div class="number-suffix">{{ examNumberCountCont }}</div>
-            </div>
-            <a-button
-              class="ant-simple m-l-8px"
-              type="link"
-              @click="onEditExamNumber"
-              >查看全部</a-button
-            >
-          </a-form-item>
-
-          <a-row>
-            <a-col :span="15">
-              <a-form-item label="姓名">
+          <template v-if="searchModel.examStatus === 'CUSTOM'">
+            <a-form-item label="卷袋号">
+              <div class="exam-number">
+                <a-input
+                  v-model:value="searchModel.packageCode"
+                  placeholder="请输入"
+                ></a-input>
+              </div>
+            </a-form-item>
+            <a-form-item label="考号">
+              <div class="exam-number">
+                <a-textarea
+                  v-model:value="searchModel.examNumber"
+                  placeholder="请输入"
+                  :auto-size="{ minRows: 1, maxRows: 1 }"
+                ></a-textarea>
+                <div class="number-suffix">{{ examNumberCountCont }}</div>
+              </div>
+              <a-button
+                class="ant-simple m-l-8px"
+                type="link"
+                @click="onEditExamNumber"
+                >查看全部</a-button
+              >
+            </a-form-item>
+
+            <!-- <a-row> -->
+            <!-- <a-col :span="15"> -->
+            <a-form-item label="姓名">
+              <div class="exam-number">
                 <a-input
                   v-model:value="searchModel.name"
                   placeholder="请输入"
-                  style="width: 140px"
                 ></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :span="9">
-              <a-form-item style="text-align: right">
-                <a-button class="m-r-8px" type="primary" @click="onSearch"
-                  >查询</a-button
-                >
-                <a-button @click="onExport">导出</a-button>
-              </a-form-item>
-            </a-col>
-          </a-row>
+              </div>
+            </a-form-item>
+          </template>
+          <!-- </a-col> -->
+          <!-- <a-col :span="9"> -->
+          <a-form-item style="text-align: right">
+            <a-button class="m-r-8px" type="primary" @click="onSearch"
+              >查询</a-button
+            >
+            <a-button @click="onExport">导出</a-button>
+          </a-form-item>
+          <!-- </a-col> -->
+          <!-- </a-row> -->
         </a-form>
       </a-collapse-panel>
       <a-collapse-panel key="2">
@@ -189,6 +199,10 @@ async function getAbsentCheckOptions() {
       label: `交叉对比缺考不一致(待确认)`,
       value: "UNCHECK3",
     },
+    {
+      label: "自定义",
+      value: "CUSTOM",
+    },
   ];
 }
 getAbsentCheckOptions();
@@ -202,6 +216,7 @@ const initSearchModel = {
   subjectCode: "",
   examStatus: "",
   status: "SCANNED",
+  packageCode: "",
 };
 const searchModel = reactive<AbsentCheckListFilter>({ ...initSearchModel });
 const imageType = ref(dataCheckStore.imageType);
@@ -353,4 +368,15 @@ watch(
     }
   }
 );
+
+watch(
+  () => searchModel.examStatus,
+  (val: string) => {
+    if (val !== "CUSTOM") {
+      searchModel.packageCode = "";
+      searchModel.examNumber = "";
+      searchModel.name = "";
+    }
+  }
+);
 </script>

+ 3 - 0
src/render/views/AbsentCheck/index.vue

@@ -76,6 +76,9 @@ async function getList() {
     pageNumber: pageNumber.value,
     pageSize: pageSize.value,
   };
+  if (datas.examStatus === "CUSTOM") {
+    datas.examStatus = "";
+  }
   const res = await absentCheckList(datas).catch(() => null);
   loading.value = false;
   if (!res) return;

+ 20 - 11
src/render/views/DataCheck/CheckAction.vue

@@ -43,6 +43,25 @@
         <template #header><FilterFilled />搜索条件 (自定义)</template>
 
         <a-form :label-col="{ style: { width: '83px' } }">
+          <a-form-item label="科目">
+            <a-select
+              v-model:value="customSearchModel.subjectCode"
+              placeholder="请选择"
+              :options="courses"
+              :field-names="fieldNames"
+              filter-option
+              allow-clear
+              style="width: 150px"
+            ></a-select>
+          </a-form-item>
+          <a-form-item label="卷袋号">
+            <a-input
+              v-model:value="customSearchModel.packageCode"
+              placeholder="请输入"
+              allow-clear
+              style="width: 150px"
+            ></a-input>
+          </a-form-item>
           <a-form-item label="考号">
             <div class="exam-number">
               <a-textarea
@@ -66,17 +85,7 @@
               style="width: 150px"
             ></a-input>
           </a-form-item>
-          <a-form-item label="科目">
-            <a-select
-              v-model:value="customSearchModel.subjectCode"
-              placeholder="请选择"
-              :options="courses"
-              :field-names="fieldNames"
-              filter-option
-              allow-clear
-              style="width: 150px"
-            ></a-select>
-          </a-form-item>
+
           <a-row>
             <a-col :span="12">
               <a-form-item label="客观题作答">