新需求

src/modules/record/components/LibraryDialog.vue

@@ -14,9 +14,6 @@
       <div class="data-check-body">
         <div class="data-check-action part-box">
           <div class="data-check-action-form">
-            <el-button size="mini" type="primary" @click="toSelectTaskStd"
-              >所有任务考生信息</el-button
-            >
             <el-button
               v-if="openCodeOcr"
               size="mini"
@@ -34,16 +31,6 @@
             </div>
 
             <el-divider></el-divider>
-            <div v-if="openGlobalMatch" class="box-justify mb-2">
-              <h4>绑定学生</h4>
-              <div>
-                <span class="inline-middle mr-1">全局匹配</span>
-                <el-switch
-                  v-model="globalMatch"
-                  @change="getStudentList"
-                ></el-switch>
-              </div>
-            </div>
             <el-input
               v-model="studentNameOrNo"
               class="width-full"
@@ -55,7 +42,6 @@
           <div class="data-check-action-student">
             <el-table ref="TableList" :data="studentList">
               <el-table-column
-                v-if="globalMatch"
                 prop="paperScanTaskName"
                 label="扫描任务"
               ></el-table-column>
@@ -128,12 +114,6 @@
       </div>
     </el-dialog>
 
-    <!-- RelateStudentDialog -->
-    <relate-student-dialog
-      ref="RelateStudentDialog"
-      :page-data="curPage"
-      @confirm="toBind"
-    ></relate-student-dialog>
     <!-- ocr-result -->
     <el-dialog
       class="page-dialog"
@@ -177,12 +157,12 @@ import {
 } from "../api";
 import { systemSettingQuery } from "../../base/api";
 import ImageContain from "../../../components/ImageContain.vue";
-import RelateStudentDialog from "./RelateStudentDialog.vue";
 import OcrAreaSet from "./OcrAreaSet.vue";
 
 const initModalForm = {
   paperLibraryId: "",
-  paperScanTaskDetailId: ""
+  studentId: "",
+  paperScanTaskId: ""
 };
 
 export default {
@@ -209,7 +189,7 @@ export default {
       }
     }
   },
-  components: { ImageContain, RelateStudentDialog, OcrAreaSet },
+  components: { ImageContain, OcrAreaSet },
   mixins: [timeMixin],
   data() {
     return {
@@ -232,8 +212,6 @@ export default {
       isSetOcrSet: false,
       openOcr: false,
       openBarCode: false,
-      openGlobalMatch: false,
-      globalMatch: false,
       areaType: "",
       ocrArea: { x: null, y: null, width: null, height: null, rotate: 0 },
       ocrResult: [],
@@ -297,9 +275,6 @@ export default {
           if (field.code === "openBarCode") {
             this.openBarCode = field.value === "true";
           }
-          if (field.code === "openGlobalMatch") {
-            this.openGlobalMatch = field.value === "true";
-          }
         });
       });
 
@@ -321,16 +296,12 @@ export default {
       const datas = {
         paperScanTaskId: this.curPage.paperScanTaskId,
         param: this.studentNameOrNo,
-        globalMatch: this.globalMatch,
         pageNumber: 1,
         pageSize: 30
       };
       const data = await scanTaskStudentListPage(datas);
       this.studentList = data.records;
     },
-    toSelectTaskStd() {
-      this.$refs.RelateStudentDialog.open();
-    },
     async switchCurPage(curPagePaperIndex) {
       if (this.isSwitchFb) return;
       this.curPagePaperIndex = curPagePaperIndex;
@@ -389,7 +360,8 @@ export default {
     },
     toBind(row) {
       this.lastPaperScanTaskId = this.curPage.paperScanTaskId;
-      this.modalForm.paperScanTaskDetailId = row.paperScanTaskDetailId;
+      this.modalForm.studentId = row.studentId;
+      this.modalForm.paperScanTaskId = this.curPage.paperScanTaskId;
       this.confirm();
     },
     async confirm() {

src/modules/record/views/ArchivesManage.vue

@@ -105,6 +105,13 @@
           fixed="right"
         >
           <template slot-scope="scope">
+            <el-button
+              v-if="checkPrivilege('link', 'import')"
+              class="btn-primary"
+              type="text"
+              @click="toImport(scope.row)"
+              >导入课程信息</el-button
+            >
             <el-button
               v-if="checkPrivilege('link', 'edit')"
               class="btn-primary"
@@ -147,16 +154,29 @@
       :instance="curRow"
       @modified="getList"
     ></modify-archives>
+    <!-- import-student -->
+    <import-file
+      v-if="checkPrivilege('link', 'import')"
+      ref="ImportCourseInfo"
+      title="导入课程信息"
+      :upload-url="uploadUrl"
+      :upload-data="uploadData"
+      :downloadUrl="downloadUrl"
+      :downloadFilename="dfilename"
+      :format="['xls', 'xlsx']"
+      @upload-success="uploadSuccess"
+    ></import-file>
   </div>
 </template>
 
 <script>
 import { deleteArchives, archivesListPage } from "../api";
 import ModifyArchives from "../components/ModifyArchives.vue";
+import ImportFile from "../../../components/ImportFile.vue";
 
 export default {
   name: "archives-manage",
-  components: { ModifyArchives },
+  components: { ModifyArchives, ImportFile },
   data() {
     return {
       filter: {
@@ -169,7 +189,12 @@ export default {
       size: this.GLOBAL.pageSize,
       total: 0,
       dataList: [],
-      curRow: {}
+      curRow: {},
+      // import course info
+      uploadData: {},
+      uploadUrl: "/api/admin/paper/archives/import",
+      downloadUrl: "/temps/archivesInfoTemplate.xlsx",
+      dfilename: "档案课程信息导入模板.xlsx"
     };
   },
   mounted() {
@@ -221,6 +246,13 @@ export default {
       await deleteArchives([row.id]);
       this.$message.success("操作成功！");
       this.deletePageLastItem();
+    },
+    toImport(row) {
+      this.uploadData = { id: row.id };
+      this.$refs.ImportCourseInfo.open();
+    },
+    uploadSuccess() {
+      this.$message.success("导入成功！");
     }
   }
 };

src/modules/record/views/ScanTaskManage.vue

@@ -189,13 +189,6 @@
               @click="toDetail(scope.row)"
               >查看详情</el-button
             >
-            <el-button
-              v-if="checkPrivilege('link', 'import')"
-              class="btn-primary"
-              type="text"
-              @click="toImportStudent(scope.row)"
-              >导入考生</el-button
-            >
             <el-button
               v-if="checkPrivilege('link', 'delete')"
               class="btn-danger"
@@ -289,18 +282,6 @@
       ref="DataTaskDialog"
       task-type="PAPER_SCAN_TASK_IMPORT"
     ></data-task-dialog>
-    <!-- import-student -->
-    <import-file
-      v-if="checkPrivilege('link', 'import')"
-      ref="ImportStudent"
-      title="导入考生"
-      :upload-url="uploadStdUrl"
-      :upload-data="uploadStdData"
-      :downloadUrl="downloadStdUrl"
-      :downloadFilename="stdDfilename"
-      :format="['xls', 'xlsx']"
-      @upload-success="uploadSuccess"
-    ></import-file>
     <!-- ModifyScanTask -->
     <modify-scan-task
       v-if="checkPrivilege('button', 'add')"
@@ -374,12 +355,7 @@ export default {
       uploadData: {},
       uploadUrl: "/api/admin/paper/scan_task/scan_task_import",
       downloadUrl: "/temps/scanTaskTemplate.xlsx",
-      dfilename: "扫描任务导入模板.xlsx",
-      // import student
-      uploadStdData: {},
-      uploadStdUrl: "/api/admin/paper/scan_task/import_student",
-      downloadStdUrl: "/temps/taskStudentTemplate.xlsx",
-      stdDfilename: "考生导入模板.xlsx"
+      dfilename: "扫描任务导入模板.xlsx"
     };
   },
   mounted() {
@@ -418,10 +394,6 @@ export default {
       this.curRow = row;
       this.$refs.ScanTaskDetailDialog.open();
     },
-    toImportStudent(row) {
-      this.uploadStdData = { paperScanTaskId: row.paperScanTaskId };
-      this.$refs.ImportStudent.open();
-    },
     toShowProgress(row) {
       this.curRow = row;
       this.$refs.LibraryStateDialog.open();