bug fix

src/modules/base/api.js

@@ -41,8 +41,8 @@ export const commonSemesterQuery = () => {
   return $postParam("/api/admin/common/semester/query", {});
 };
 // 学期
-export const commonScanTaskQuery = () => {
-  return $postParam("/api/admin/common/scan_task/query", {});
+export const commonScanTaskQuery = data => {
+  return $postParam("/api/admin/common/scan_task/query", data);
 };
 
 // user --------------------------------->

src/modules/base/views/SystemSetting.vue

@@ -122,7 +122,12 @@ export default {
       this.$message.success("设置成功！");
     },
     async freshCache() {
-      await flushCache("SYS_SETTING");
+      const schoolId = this.$ls.get("schoolId");
+      if (!schoolId) {
+        await flushCache("SYS_SETTING_GLOBAL");
+      } else {
+        await flushCache("SYS_SETTING");
+      }
     }
   }
 };

src/modules/record/components/LibraryDialog.vue

@@ -368,7 +368,7 @@ export default {
       this.switchCurPage(this.curPagePaperIndex);
 
       if (
-        !this.openOcr &&
+        !this.openCodeOcr &&
         this.lastPaperScanTaskId !== this.curPage.paperScanTaskId
       ) {
         this.getStudentList();
@@ -413,7 +413,7 @@ export default {
     async getOrcResult() {
       if (this.ocrArea.x === null) {
         this.$message.error("请设置信息识别区");
-        this.getStudentList();
+        if (!this.studentList.length) this.getStudentList();
         return;
       }
 

src/modules/record/views/LibraryManage.vue

@@ -9,9 +9,17 @@
         @submit.native.prevent
       >
         <template v-if="checkPrivilege('condition', 'condition')">
+          <el-form-item label="档案：">
+            <archives-select
+              v-model="filter.paperArchivesId"
+              placeholder="档案"
+            >
+            </archives-select>
+          </el-form-item>
           <el-form-item label="任务：">
             <scan-task-select
               v-model="filter.paperScanTaskId"
+              :paper-archives-id="filter.paperArchivesId"
               placeholder="任务"
             >
             </scan-task-select>
@@ -27,15 +35,7 @@
           >
         </el-form-item>
       </el-form>
-      <div class="part-box-action">
-        <el-button
-          v-if="checkPrivilege('button', 'Deal')"
-          type="primary"
-          icon="el-icon-circle-plus-outline"
-          @click="todoTask"
-          >开始处理</el-button
-        >
-      </div>
+      <div class="part-box-action"></div>
     </div>
 
     <div class="mb-4 tab-btns">
@@ -63,14 +63,46 @@
           width="70"
           :index="indexMethod"
         ></el-table-column>
-        <el-table-column prop="path" label="文件名称">
-          <span slot-scope="scope">{{ scope.row.path | fileNameFilter }}</span>
+        <el-table-column prop="scanTaskName" label="任务名称"></el-table-column>
+        <el-table-column
+          prop="paperScanTaskId"
+          label="任务ID"
+          width="180"
+        ></el-table-column>
+        <el-table-column prop="archivesName" label="档案名称"></el-table-column>
+        <el-table-column
+          prop="archivesCode"
+          label="档案编号"
+          width="180"
+        ></el-table-column>
+        <el-table-column prop="courseName" label="课程" min-width="180">
+          <span slot-scope="scope"
+            >{{ scope.row.courseName }}（{{ scope.row.courseCode }}）</span
+          >
         </el-table-column>
-        <el-table-column prop="createTime" label="创建时间" width="170">
+        <el-table-column prop="scanCount" label="扫描量（份）" width="110">
+        </el-table-column>
+        <el-table-column label="未绑定量（份）" width="120">
           <span slot-scope="scope">{{
-            scope.row.createTime | timestampFilter
+            scope.row.scanCount - scope.row.bindCount
           }}</span>
         </el-table-column>
+        <el-table-column
+          class-name="action-column"
+          label="操作"
+          width="120"
+          fixed="right"
+        >
+          <template slot-scope="scope">
+            <el-button
+              v-if="checkPrivilege('link', 'Deal')"
+              class="btn-primary"
+              type="text"
+              @click="todoTask(scope.row)"
+              >开始处理</el-button
+            >
+          </template>
+        </el-table-column>
       </el-table>
       <div class="part-page">
         <el-pagination
@@ -201,7 +233,7 @@
     <!-- LibraryDialog -->
     <library-dialog
       ref="LibraryDialog"
-      :filter-data="filter"
+      :filter-data="filterData"
       :mode="curMode"
       :student="curStudent"
       @closed="search"
@@ -237,6 +269,7 @@ export default {
   data() {
     return {
       filter: {
+        paperArchivesId: "",
         paperScanTaskId: ""
       },
       doneTypes: [
@@ -273,6 +306,7 @@ export default {
       curImageList: [],
       curMode: "",
       curStudent: {},
+      filterData: {},
       loading: false
     };
   },
@@ -353,8 +387,11 @@ export default {
       this.abnormalPage.current = page;
       this.getAbnormalList();
     },
-    todoTask() {
+    todoTask(row) {
       this.curMode = "undo";
+      this.filterData = {
+        paperScanTaskId: row.paperScanTaskId
+      };
       this.$refs.LibraryDialog.open();
     },
     async toDoAbnormal(row) {

src/modules/record/views/ScanTaskManage.vue

@@ -101,15 +101,17 @@
           label="档案编号"
           width="180"
         ></el-table-column>
-        <el-table-column prop="courseName" label="课程"> </el-table-column>
-        <el-table-column prop="teacherName" label="任课老师" width="120">
-        </el-table-column>
-        <el-table-column prop="teachClazzName" label="教学班">
+        <el-table-column prop="courseName" label="课程" min-width="180">
+          <span slot-scope="scope"
+            >{{ scope.row.courseName }}（{{ scope.row.courseCode }}）</span
+          >
         </el-table-column>
         <el-table-column prop="scanCount" label="扫描量（份）" width="110">
         </el-table-column>
         <el-table-column prop="scanUserName" label="扫描员" width="120">
         </el-table-column>
+        <el-table-column prop="checkUserName" label="校验员" width="120">
+        </el-table-column>
         <el-table-column
           class-name="action-column"
           label="绑定进度"