fix

src/render/components/ImportButton/index.vue

@@ -106,7 +106,8 @@ const customRequest: UploadProps["customRequest"] | undefined = !props.action
         });
     };
 
-const fileChange = ({ file }: any) => {
+const fileChange = ({ file, fileList }: any) => {
+  console.log("fileList", fileList);
   //   const formData = new FormData();
   //   const paramData: any = isRef(props.uploadParams)
   //     ? { ...(props.uploadParams?.value || {}) }
@@ -115,7 +116,8 @@ const fileChange = ({ file }: any) => {
   //     formData.append(key, paramData[key]);
   //   });
   //   formData.append(props.fileParamsName, file as File);
-  emit("fileChange", file as File);
+  let f: any = fileList.length ? file : null;
+  emit("fileChange", f);
 };
 </script>
 <style lang="less" scoped></style>

src/render/views/BaseDataConfig/ScanParams.vue

@@ -338,6 +338,7 @@ const save = () => {
     delete p.paperTypeBarcodeContentItem;
     saveBaseDataConfig(p).then((res: any) => {
       window.$message.success("保存成功");
+      oldParams = { ...cloneDeep(params), paperTypeBarcodeContentItem: "" };
     });
   });
 };

src/render/views/BaseDataConfig/StuImportFileDialog.vue

@@ -28,12 +28,16 @@
     <my-modal
       v-model:open="showProgressDialog"
       title="考生导入进度"
-      @cancel="progressClose"
-      @ok="closeSubModal"
+      okText="关闭"
     >
       <p>{{ curFileName }}</p>
       <a-progress :percent="progress" :status="progressStatus" />
       <p class="color-warning">{{ errMsg }}</p>
+      <template #footer>
+        <qm-button type="primary" @click="showProgressDialog = false"
+          >关闭</qm-button
+        >
+      </template>
     </my-modal>
   </my-modal>
 </template>
@@ -68,6 +72,7 @@ const rules = {
   file: [{ required: true, message: "请上传文件" }],
 };
 const getFile = (file: any) => {
+  console.log("file", file);
   params.file = file;
   curFileName.value = file?.name || "";
 };
@@ -111,18 +116,18 @@ const watchProgress = (obj: { taskId: string }) => {
     }
   });
 };
-const progressClose = () => {
-  if (progressStatus.value === "success") {
-    visible.value = false;
-  }
-};
+// const progressClose = () => {
+//   if (progressStatus.value === "success") {
+//     visible.value = false;
+//   }
+// };
 const downloadTpl = () => {
   exportStu({ examId: userStore.curExam?.id });
 };
 const closeSubModal = () => {
-  if (progressStatus.value === "success") {
-    visible.value = false;
-  }
+  // if (progressStatus.value === "success") {
+  visible.value = false;
+  // }
 };
 </script>
 <style lang="less" scoped></style>