采集修改

src/components/base/ArchivesOrgSelect.vue

@@ -0,0 +1,75 @@
+<template>
+  <el-select
+    v-model="selected"
+    class="archives-select"
+    :placeholder="placeholder"
+    filterable
+    :clearable="clearable"
+    :disabled="disabled"
+    @change="select"
+  >
+    <el-option
+      v-for="item in optionList"
+      :key="item.id"
+      :value="item.id"
+      :label="item.name"
+    >
+    </el-option>
+  </el-select>
+</template>
+
+<script>
+import { commonArchivesOrgQuery } from "../../modules/base/api";
+
+export default {
+  name: "archives-select",
+  props: {
+    disabled: { type: Boolean, default: false },
+    placeholder: { type: String, default: "请选择学期" },
+    value: { type: [Number, String], default: "" },
+    clearable: { type: Boolean, default: true },
+    semesterId: { type: String, default: "" }
+  },
+  data() {
+    return {
+      optionList: [],
+      selected: ""
+    };
+  },
+  watch: {
+    value: {
+      immediate: true,
+      handler(val) {
+        this.selected = val;
+      }
+    },
+    semesterId(val, oldval) {
+      if (val !== oldval) {
+        this.search("");
+        this.$emit("input", "");
+        this.$emit("change", {});
+      }
+    }
+  },
+  created() {
+    this.search();
+  },
+  methods: {
+    async search() {
+      this.optionList = [];
+
+      let data = {};
+      if (this.semesterId) data.semesterId = this.semesterId;
+      const res = await commonArchivesOrgQuery(data);
+      this.optionList = res;
+    },
+    select() {
+      this.$emit("input", this.selected);
+      this.$emit(
+        "change",
+        this.optionList.find(item => item.id === this.selected)
+      );
+    }
+  }
+};
+</script>

src/components/base/ArchivesSelect.vue

@@ -0,0 +1,76 @@
+<template>
+  <el-select
+    v-model="selected"
+    class="archives-select"
+    :placeholder="placeholder"
+    filterable
+    :clearable="clearable"
+    :disabled="disabled"
+    @change="select"
+  >
+    <el-option
+      v-for="item in optionList"
+      :key="item.id"
+      :value="item.id"
+      :label="item.name"
+    >
+    </el-option>
+  </el-select>
+</template>
+
+<script>
+import { commonArchivesQuery } from "../../modules/base/api";
+
+export default {
+  name: "archives-select",
+  props: {
+    disabled: { type: Boolean, default: false },
+    placeholder: { type: String, default: "请选择学期" },
+    value: { type: [Number, String], default: "" },
+    clearable: { type: Boolean, default: true },
+    semesterId: { type: String, default: "" }
+  },
+  data() {
+    return {
+      optionList: [],
+      selected: ""
+    };
+  },
+  watch: {
+    value: {
+      immediate: true,
+      handler(val) {
+        this.selected = val;
+      }
+    },
+    semesterId(val, oldval) {
+      if (val !== oldval) {
+        this.search("");
+        this.$emit("input", "");
+        this.$emit("change", {});
+      }
+    }
+  },
+  created() {
+    this.search();
+  },
+  methods: {
+    async search() {
+      this.optionList = [];
+
+      let data = {};
+      if (this.semesterId) data.semesterId = this.semesterId;
+
+      const res = await commonArchivesQuery(data);
+      this.optionList = res;
+    },
+    select() {
+      this.$emit("input", this.selected);
+      this.$emit(
+        "change",
+        this.optionList.find(item => item.id === this.selected)
+      );
+    }
+  }
+};
+</script>

src/components/base/ArchivesTypeSelect.vue

@@ -0,0 +1,65 @@
+<template>
+  <el-select
+    v-model="selected"
+    class="archives-select"
+    :placeholder="placeholder"
+    filterable
+    :clearable="clearable"
+    :disabled="disabled"
+    @change="select"
+  >
+    <el-option
+      v-for="item in optionList"
+      :key="item.id"
+      :value="item.id"
+      :label="item.name"
+    >
+    </el-option>
+  </el-select>
+</template>
+
+<script>
+import { commonArchivesTypeQuery } from "../../modules/base/api";
+
+export default {
+  name: "archives-select",
+  props: {
+    disabled: { type: Boolean, default: false },
+    placeholder: { type: String, default: "请选择学期" },
+    value: { type: [Number, String], default: "" },
+    clearable: { type: Boolean, default: true }
+  },
+  data() {
+    return {
+      optionList: [],
+      selected: ""
+    };
+  },
+  watch: {
+    value: {
+      immediate: true,
+      handler(val) {
+        this.selected = val;
+      }
+    }
+  },
+  created() {
+    this.search();
+  },
+  methods: {
+    async search() {
+      this.optionList = [];
+
+      const res = await commonArchivesTypeQuery();
+      this.optionList = res;
+    },
+    select() {
+      this.$emit("input", this.selected);
+      this.$emit(
+        "change",
+        this.optionList.find(item => item.id === this.selected)
+      );
+    }
+  }
+};
+</script>

src/components/base/ClassSelect.vue

@@ -10,8 +10,8 @@
   >
     <el-option
       v-for="item in optionList"
-      :key="item.id"
-      :value="item.id"
+      :key="item.name"
+      :value="item.name"
       :label="item.name"
     >
     </el-option>

src/components/base/CourseSelect.vue

@@ -10,11 +10,10 @@
   >
     <el-option
       v-for="item in optionList"
-      :key="item.code"
-      :value="item.code"
-      :label="`${item.name}（${item.code}）`"
+      :key="item.id"
+      :value="item.id"
+      :label="item.name"
     >
-      <span>{{ `${item.name}（${item.code}）` }}</span>
     </el-option>
   </el-select>
 </template>

src/components/base/MajorSelect.vue

@@ -10,8 +10,8 @@
   >
     <el-option
       v-for="item in optionList"
-      :key="item.id"
-      :value="item.id"
+      :key="item.name"
+      :value="item.name"
       :label="item.name"
     >
     </el-option>

src/components/base/TeachClazzSelect.vue

@@ -33,7 +33,7 @@ export default {
       default() {
         return {
           paperArchivesId: "",
-          semesterId: ""
+          courseName: ""
         };
       }
     }

src/modules/base/api.js

@@ -21,20 +21,16 @@ export const commonTeachClazzQuery = ({
   });
 };
 // 档案
-export const commonRecordQuery = (semesterId = "") => {
-  return $postParam("/api/admin/common/archives/query", {
-    semesterId
-  });
+export const commonArchivesQuery = data => {
+  return $postParam("/api/admin/common/archives/query", data);
 };
 // 档案类型
-export const commonRecordTypeQuery = () => {
+export const commonArchivesTypeQuery = () => {
   return $postParam("/api/admin/common/archives_type/query", {});
 };
 // 档案部门
-export const commonRecordOrgQuery = (semesterId = "") => {
-  return $postParam("/api/admin/common/manager_org/query", {
-    semesterId
-  });
+export const commonArchivesOrgQuery = data => {
+  return $postParam("/api/admin/common/manager_org/query", data);
 };
 // 学期
 export const commonSemesterQuery = () => {
@@ -218,7 +214,7 @@ export const updateClazzSimple = datas => {
 
 // semester-manage
 export const semesterListQuery = datas => {
-  return $postParam("/api/admin/basic/semester/query", datas);
+  return $postParam("/api/admin/basic/semester/page", datas);
 };
 export const deleteSemester = id => {
   return $postParam("/api/admin/basic/semester/delete", { id });
@@ -228,13 +224,13 @@ export const updateSemester = datas => {
 };
 // record-type-manage
 export const recordTypeListQuery = datas => {
-  return $postParam("/api/admin/basic/recordType/query", datas);
+  return $postParam("/api/admin/paper/archives_type/page", datas);
 };
 export const deleteRecordType = id => {
-  return $postParam("/api/admin/basic/recordType/delete", { id });
+  return $postParam("/api/admin/paper/archives_type/delete", { id });
 };
 export const updateRecordType = datas => {
-  return $post("/api/admin/basic/recordType/save", datas);
+  return $post("/api/admin/paper/archives_type/save", datas);
 };
 // major-manage
 export const majorListQuery = datas => {

src/modules/base/components/ModifyStudent.vue

@@ -53,7 +53,6 @@
           cascader
           placeholder="请选择专业"
           style="width: 100%;"
-          @change="updateClazz"
         ></major-select>
       </el-form-item>
       <el-form-item prop="clazzName" label="班级：">

src/modules/base/router.js

@@ -6,7 +6,7 @@ import UserManage from "./views/UserManage.vue";
 // dict
 import StudentManage from "./views/StudentManage.vue";
 import SemesterManage from "./views/SemesterManage.vue";
-import RecordTypeManage from "./views/RecordTypeManage.vue";
+import ArchivesTypeManage from "./views/ArchivesTypeManage.vue";
 
 export default [
   {
@@ -35,8 +35,8 @@ export default [
     component: SemesterManage
   },
   {
-    path: "/base/record-type-manage",
-    name: "RecordTypeManage",
-    component: RecordTypeManage
+    path: "/base/archives-type-manage",
+    name: "ArchivesTypeManage",
+    component: ArchivesTypeManage
   }
 ];

src/modules/base/views/RecordTypeManage.vue → src/modules/base/views/ArchivesTypeManage.vue

@@ -115,7 +115,7 @@ export default {
     },
     async toDelete(row) {
       const result = await this.$confirm(
-        `确定要删除类型【${row.semesterName}】吗?`,
+        `确定要删除类型【${row.name}】吗?`,
         "提示",
         {
           type: "warning"

src/modules/record/api.js

@@ -31,19 +31,22 @@ export const dataCheckStateDetail = paperScanTaskId => {
     paperScanTaskId
   });
 };
-export const releaseUserDataCheckTask = datas => {
+export const releaseUserLibraryTask = datas => {
   return $postParam("/api/admin/paper/scan_task/release_binding_task", datas);
 };
 
-// record-manage
-export const recordListPage = datas => {
-  return $postParam("/api/admin/sys/role/list", datas);
+// archives-manage
+export const archivesListPage = datas => {
+  return $postParam("/api/admin/paper/archives/page", datas);
 };
-export const updateRecord = datas => {
-  return $post("/api/admin/sys/user/save", datas);
+export const archivesDetailListPage = datas => {
+  return $postParam("/api/admin/paper/archives/page_detail", datas);
+};
+export const updateArchives = datas => {
+  return $post("/api/admin/paper/archives/save", datas);
 };
-export const deleteRecord = ids => {
-  return $postParam("/api/admin/sys/role/remove", { ids });
+export const deleteArchives = id => {
+  return $postParam("/api/admin/paper/archives/delete", { id });
 };
 // data-check-manage
 export const dataCheckUndoListPage = datas => {

src/modules/record/components/RecordDetailStudentDialog.vue → src/modules/record/components/ArchivesDetailStudentDialog.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-dialog
-      class="record-detail-student-dialog page-dialog"
+      class="archives-detail-student-dialog page-dialog"
       :visible.sync="modalIsShow"
       title="查看档案详情"
       :close-on-click-modal="false"
@@ -10,8 +10,8 @@
       fullscreen
       @open="visibleChange"
     >
-      <div class="record-student-body">
-        <div class="record-student-content part-box">
+      <div class="archives-student-body">
+        <div class="archives-student-content part-box">
           <el-carousel height="100%" :autoplay="false" arrow="always">
             <el-carousel-item v-for="item in 4" :key="item">
               <h3 class="small">{{ item }}</h3>
@@ -19,8 +19,8 @@
             </el-carousel-item>
           </el-carousel>
         </div>
-        <div class="record-student-action part-box">
-          <div class="record-student-info">
+        <div class="archives-student-action part-box">
+          <div class="archives-student-info">
             <p>
               <span>姓名：</span><span>{{ student.studentName }}</span>
             </p>
@@ -56,22 +56,22 @@
       </div>
     </el-dialog>
 
-    <!-- DataCheckDialog -->
-    <data-check-dialog
+    <!-- LibraryDialog -->
+    <library-dialog
       v-if="modalIsShow"
-      ref="DataCheckDialog"
+      ref="LibraryDialog"
       model="fix"
       :student="student"
-    ></data-check-dialog>
+    ></library-dialog>
   </div>
 </template>
 
 <script>
-import DataCheckDialog from "./DataCheckDialog.vue";
+import LibraryDialog from "./LibraryDialog.vue";
 
 export default {
-  name: "record-detail-student-dialog",
-  components: { DataCheckDialog },
+  name: "archives-detail-student-dialog",
+  components: { LibraryDialog },
   props: {
     student: {
       type: Object,
@@ -94,7 +94,7 @@ export default {
       this.modalIsShow = true;
     },
     toFix() {
-      this.$refs.DataCheckDialog.open();
+      this.$refs.LibraryDialog.open();
     }
   }
 };

src/modules/record/components/DataCheckStateDialog.vue → src/modules/record/components/LibraryStateDialog.vue

@@ -33,7 +33,7 @@
 </template>
 
 <script>
-import { dataCheckStateDetail, releaseUserDataCheckTask } from "../api";
+import { dataCheckStateDetail, releaseUserLibraryTask } from "../api";
 
 export default {
   name: "data-check-state-dialog",
@@ -76,7 +76,7 @@ export default {
       ).catch(() => {});
       if (res !== "confirm") return;
 
-      await releaseUserDataCheckTask({
+      await releaseUserLibraryTask({
         paperScanTaskId: this.task.id,
         bindUserId: row.bindUserId
       });

src/modules/record/components/ModifyRecord.vue → src/modules/record/components/ModifyArchives.vue

@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    class="modify-record"
+    class="modify-archives"
     :visible.sync="modalIsShow"
     :title="title"
     top="10vh"
@@ -23,15 +23,15 @@
           clearable
         ></el-input>
       </el-form-item>
-      <el-form-item prop="recordType" label="档案类型：">
+      <el-form-item prop="archivesType" label="档案类型：">
         <el-select
           class="width-full"
-          v-model="modalForm.recordType"
+          v-model="modalForm.archivesType"
           placeholder="请选择档案类型"
           filterable
         >
           <el-option
-            v-for="item in recordTypes"
+            v-for="item in archivesTypes"
             :key="item.id"
             :value="item.id"
             :label="item.name"
@@ -85,12 +85,12 @@
 </template>
 
 <script>
-import { updateRecord } from "../api";
+import { updateArchives } from "../api";
 
 const initModalForm = {
   id: "",
   name: "",
-  recordType: "",
+  archivesType: "",
   semesterId: "",
   adminUserId: "",
   orgId: "",
@@ -98,7 +98,7 @@ const initModalForm = {
 };
 
 export default {
-  name: "modify-record",
+  name: "modify-archives",
   props: {
     instance: {
       type: Object,
@@ -133,7 +133,7 @@ export default {
             trigger: "change"
           }
         ],
-        recordType: [
+        archivesType: [
           {
             required: true,
             message: "请选择档案类型",
@@ -163,7 +163,7 @@ export default {
         ]
       },
       orgs: [],
-      recordTypes: [],
+      archivesTypes: [],
       adminUsers: []
     };
   },
@@ -195,7 +195,7 @@ export default {
       this.isSubmit = true;
 
       const datas = { ...this.modalForm };
-      const data = await updateRecord(datas).catch(() => {});
+      const data = await updateArchives(datas).catch(() => {});
       this.isSubmit = false;
       if (!data) return;
 

src/modules/record/components/ModifyScanTask.vue

@@ -23,15 +23,15 @@
           :disabled="isEdit"
         ></el-input>
       </el-form-item>
-      <el-form-item prop="recordId" label="档案名称：">
+      <el-form-item prop="archivesId" label="档案名称：">
         <el-select
           style="width:100%;"
-          v-model="modalForm.recordId"
+          v-model="modalForm.archivesId"
           placeholder="请选择档案名称"
           filterable
         >
           <el-option
-            v-for="item in records"
+            v-for="item in archivess"
             :key="item.id"
             :value="item.id"
             :label="item.name"
@@ -76,7 +76,7 @@ import { updateScanTask } from "../api";
 const initModalForm = {
   id: "",
   name: "",
-  recordId: "",
+  archivesId: "",
   courseName: "",
   teacherName: "",
   teachingClass: ""
@@ -118,7 +118,7 @@ export default {
             trigger: "change"
           }
         ],
-        recordId: [
+        archivesId: [
           {
             required: true,
             message: "请选择档案",
@@ -162,7 +162,7 @@ export default {
           }
         ]
       },
-      records: []
+      archivess: []
     };
   },
   methods: {

src/modules/record/router.js

@@ -1,30 +1,30 @@
 import ScanTaskManage from "./views/ScanTaskManage";
-import RecordManage from "./views/RecordManage";
-import RecordDetail from "./views/RecordDetail";
-import DataCheckManage from "./views/DataCheckManage";
+import ArchivesManage from "./views/ArchivesManage";
+import ArchivesDetail from "./views/ArchivesDetail";
+import LibraryManage from "./views/LibraryManage";
 
 export default [
   {
-    path: "/record/scan-manage",
+    path: "/record/scan-task-manage",
     name: "ScanTaskManage",
     component: ScanTaskManage
   },
   {
-    path: "/record/record-manage",
-    name: "RecordManage",
-    component: RecordManage
+    path: "/record/archives-manage",
+    name: "ArchivesManage",
+    component: ArchivesManage
   },
   {
-    path: "/record/record-detail/:recordId",
-    name: "RecordDetail",
-    component: RecordDetail,
+    path: "/record/archives-detail/:archivesId",
+    name: "ArchivesDetail",
+    component: ArchivesDetail,
     meta: {
-      relate: "RecordManage"
+      relate: "ArchivesManage"
     }
   },
   {
-    path: "/record/data-check-manage",
-    name: "DataCheckManage",
-    component: DataCheckManage
+    path: "/record/library-manage",
+    name: "LibraryManage",
+    component: LibraryManage
   }
 ];

src/modules/record/views/RecordDetail.vue → src/modules/record/views/ArchivesDetail.vue

@@ -1,10 +1,14 @@
 <template>
-  <div class="record-detail">
+  <div class="archives-detail">
     <div class="part-box part-box-filter part-box-flex">
       <el-form ref="FilterForm" label-position="left" label-width="85px" inline>
         <template v-if="checkPrivilege('condition', 'condition')">
           <el-form-item label="学院：">
-            <el-select v-model="filter.collegeId" placeholder="学院" filterable>
+            <el-select
+              v-model="filter.belongOrgId"
+              placeholder="学院"
+              filterable
+            >
               <el-option
                 v-for="item in collegeList"
                 :key="item.id"
@@ -15,7 +19,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="专业：">
-            <el-select v-model="filter.majorId" placeholder="专业" filterable>
+            <el-select v-model="filter.majorName" placeholder="专业" filterable>
               <el-option
                 v-for="item in majorList"
                 :key="item.id"
@@ -26,7 +30,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="班级：">
-            <el-select v-model="filter.clazzId" placeholder="班级" filterable>
+            <el-select v-model="filter.clazzName" placeholder="班级" filterable>
               <el-option
                 v-for="item in clazzList"
                 :key="item.id"
@@ -38,7 +42,7 @@
           </el-form-item>
           <el-form-item label="课程：">
             <el-select
-              v-model="filter.courseCode"
+              v-model="filter.courseName"
               placeholder="课程"
               filterable
             >
@@ -60,7 +64,7 @@
           </el-form-item>
           <el-form-item label="教学班：">
             <el-select
-              v-model="filter.teachingClazzId"
+              v-model="filter.teachClazzName"
               placeholder="教学班"
               filterable
             >
@@ -74,7 +78,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="绑定状态：">
-            <el-select v-model="filter.status" placeholder="绑定状态" clearable>
+            <el-select v-model="filter.isBind" placeholder="绑定状态" clearable>
               <el-option
                 v-for="(val, key) in BOUND_TYPE"
                 :key="key"
@@ -86,7 +90,7 @@
           </el-form-item>
           <el-form-item label="模糊查询：">
             <el-input
-              v-model.trim="filter.info"
+              v-model.trim="filter.param"
               placeholder="姓名/学号"
               clearable
             ></el-input>
@@ -124,22 +128,30 @@
           width="55"
           align="center"
         ></el-table-column>
-        <el-table-column prop="name" label="姓名"></el-table-column>
-        <el-table-column prop="code" label="学号"></el-table-column>
-        <el-table-column prop="code" label="专业" width="120"></el-table-column>
-        <el-table-column prop="id" label="班级" width="180"></el-table-column>
+        <el-table-column prop="studentNmae" label="姓名"></el-table-column>
+        <el-table-column prop="studentCode" label="学号"></el-table-column>
+        <el-table-column
+          prop="majorName"
+          label="专业"
+          width="120"
+        ></el-table-column>
+        <el-table-column
+          prop="clazzName"
+          label="班级"
+          width="180"
+        ></el-table-column>
         <el-table-column
-          prop="recordType"
+          prop="courseName"
           label="课程"
           width="120"
         ></el-table-column>
         <el-table-column
-          prop="recordNumber"
+          prop="teacherName"
           label="任课老师"
           width="120"
         ></el-table-column>
         <el-table-column
-          prop="recordNumber"
+          prop="teachClazzName"
           label="教学班"
           width="120"
         ></el-table-column>
@@ -161,7 +173,7 @@
               type="text"
               @click="toDetail(scope.row)"
             >
-              <span class="cont-link">{{ scope.row.imageCount }}</span>
+              <span class="cont-link">{{ scope.row.bindCount }}</span>
             </el-button>
           </template>
         </el-table-column>
@@ -178,41 +190,34 @@
         </el-pagination>
       </div>
     </div>
-    <!-- ModifyRecord -->
-    <modify-record
-      ref="ModifyRecord"
-      :instance="curRow"
-      @modified="getList"
-    ></modify-record>
-    <!-- RecordDetailStudentDialog -->
-    <record-detail-student-dialog
-      ref="RecordDetailStudentDialog"
+    <!-- ArchivesDetailStudentDialog -->
+    <archives-detail-student-dialog
+      ref="ArchivesDetailStudentDialog"
       :student="curRow"
-    ></record-detail-student-dialog>
+    ></archives-detail-student-dialog>
   </div>
 </template>
 
 <script>
-import { recordListPage } from "../api";
+import { archivesDetailListPage } from "../api";
 import { BOUND_TYPE } from "../../../constants/enumerate";
-import ModifyRecord from "../components/ModifyRecord.vue";
-import RecordDetailStudentDialog from "../components/RecordDetailStudentDialog.vue";
+import ArchivesDetailStudentDialog from "../components/ArchivesDetailStudentDialog.vue";
 
 export default {
-  name: "record-detail",
-  components: { ModifyRecord, RecordDetailStudentDialog },
+  name: "archives-detail",
+  components: { ArchivesDetailStudentDialog },
   data() {
     return {
       filter: {
-        recordId: "",
-        collegeId: "",
-        majorId: "",
-        clazzId: "",
-        courseCode: "",
+        paperArchivesId: "",
+        belongOrgId: "",
+        majorName: "",
+        clazzName: "",
+        courseName: "",
         teacherName: "",
-        teachingClazzId: "",
-        status: "",
-        info: ""
+        teachClazzName: "",
+        isBind: "",
+        param: ""
       },
       BOUND_TYPE,
       current: 1,
@@ -223,7 +228,7 @@ export default {
         {
           id: "1",
           name: "12312",
-          imageCount: 5
+          bindCount: 5
         }
       ],
       curRow: {},
@@ -235,8 +240,8 @@ export default {
     };
   },
   created() {
-    this.filter.recordId = this.$route.params.recordId;
-    if (!this.filter.recordId) {
+    this.filter.paperArchivesId = this.$route.params.archivesId;
+    if (!this.filter.paperArchivesId) {
       this.$message.error("缺少档案信息，请退出当前页面！");
       return;
     }
@@ -250,7 +255,7 @@ export default {
         pageNumber: this.current,
         pageSize: this.size
       };
-      const data = await recordListPage(datas);
+      const data = await archivesDetailListPage(datas);
       this.dataList = data.records;
       this.total = data.total;
     },
@@ -263,7 +268,7 @@ export default {
     },
     toDetail(row) {
       this.curRow = row;
-      this.$refs.ModifyRecord.open();
+      this.$refs.ArchivesDetailStudentDialog.open();
     },
     toBatchDownload() {
       if (!this.multipleSelection.length) {

src/modules/record/views/RecordManage.vue → src/modules/record/views/ArchivesManage.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="record-manage">
+  <div class="archives-manage">
     <div class="part-box part-box-filter part-box-flex">
       <el-form ref="FilterForm" label-position="left" label-width="85px" inline>
         <template v-if="checkPrivilege('condition', 'condition')">
@@ -11,7 +11,7 @@
           </el-form-item>
           <el-form-item label="档案管理部门：">
             <el-select
-              v-model="filter.orgId"
+              v-model="filter.managerOrgId"
               placeholder="档案管理部门"
               filterable
             >
@@ -26,12 +26,12 @@
           </el-form-item>
           <el-form-item label="档案类型：">
             <el-select
-              v-model="filter.recordType"
+              v-model="filter.archivesTypeId"
               placeholder="档案类型"
               filterable
             >
               <el-option
-                v-for="item in recordTypes"
+                v-for="item in archivesTypes"
                 :key="item.id"
                 :value="item.id"
                 :label="item.name"
@@ -42,7 +42,7 @@
           <el-form-item label="档案名称：">
             <el-input
               style="width: 180px;"
-              v-model.trim="filter.name"
+              v-model.trim="filter.archivesName"
               placeholder="档案名称"
               clearable
             ></el-input>
@@ -77,25 +77,25 @@
           width="70"
           :index="indexMethod"
         ></el-table-column>
-        <el-table-column prop="name" label="档案名称"></el-table-column>
-        <el-table-column prop="code" label="档案编号"></el-table-column>
+        <el-table-column prop="archivesName" label="档案名称"></el-table-column>
+        <el-table-column prop="archivesCode" label="档案编号"></el-table-column>
         <el-table-column
-          prop="code"
+          prop="archivesTypeName"
           label="档案类型"
           width="120"
         ></el-table-column>
         <el-table-column
-          prop="id"
+          prop="semesterName"
           label="所属学期"
           width="180"
         ></el-table-column>
         <el-table-column
-          prop="recordType"
+          prop="managerOrgName"
           label="档案管理部门"
           width="120"
         ></el-table-column>
         <el-table-column
-          prop="recordNumber"
+          prop="managerName"
           label="档案管理员"
           width="120"
         ></el-table-column>
@@ -157,29 +157,29 @@
         </el-pagination>
       </div>
     </div>
-    <!-- ModifyRecord -->
-    <modify-record
-      ref="ModifyRecord"
+    <!-- ModifyArchives -->
+    <modify-archives
+      ref="ModifyArchives"
       :instance="curRow"
       @modified="getList"
-    ></modify-record>
+    ></modify-archives>
   </div>
 </template>
 
 <script>
-import { deleteRecord, recordListPage } from "../api";
-import ModifyRecord from "../components/ModifyRecord.vue";
+import { deleteArchives, archivesListPage } from "../api";
+import ModifyArchives from "../components/ModifyArchives.vue";
 
 export default {
-  name: "record-manage",
-  components: { ModifyRecord },
+  name: "archives-manage",
+  components: { ModifyArchives },
   data() {
     return {
       filter: {
         semesterId: "",
-        orgId: "",
-        recordType: "",
-        name: ""
+        managerOrgId: "",
+        archivesTypeId: "",
+        archivesName: ""
       },
       current: 1,
       size: this.GLOBAL.pageSize,
@@ -192,7 +192,7 @@ export default {
       ],
       curRow: {},
       orgs: [],
-      recordTypes: []
+      archivesTypes: []
     };
   },
   methods: {
@@ -204,8 +204,8 @@ export default {
         pageNumber: this.current,
         pageSize: this.size
       };
-      const data = await recordListPage(datas);
-      this.dataList = data.records;
+      const data = await archivesListPage(datas);
+      this.dataList = data.archivess;
       this.total = data.total;
     },
     toPage(page) {
@@ -214,23 +214,23 @@ export default {
     },
     toAdd() {
       this.curRow = {};
-      this.$refs.ModifyRecord.open();
+      this.$refs.ModifyArchives.open();
     },
     toEdit(row) {
       this.curRow = row;
-      this.$refs.ModifyRecord.open();
+      this.$refs.ModifyArchives.open();
     },
     toDetail(row) {
       this.$router.push({
-        name: "RecordDetail",
+        name: "ArchivesDetail",
         params: {
-          recordId: row.id
+          archivesId: row.id
         }
       });
     },
     async toDelete(row) {
       const res = await this.$confirm(
-        `确定要删除档案【${row.name}】吗??`,
+        `确定要删除档案【${row.archivesName}】吗??`,
         "提示",
         {
           type: "warning"
@@ -238,7 +238,7 @@ export default {
       ).catch(() => {});
       if (res !== "confirm") return;
 
-      await deleteRecord([row.id]);
+      await deleteArchives([row.id]);
       this.$message.success("操作成功！");
       this.deletePageLastItem();
     }

src/modules/record/views/DataCheckManage.vue → src/modules/record/views/LibraryManage.vue

@@ -148,8 +148,8 @@
       ref="ImageListPreviewDialog"
       :image-list="curImageList"
     ></image-list-preview-dialog>
-    <!-- DataCheckDialog -->
-    <data-check-dialog ref="DataCheckDialog"></data-check-dialog>
+    <!-- LibraryDialog -->
+    <library-dialog ref="LibraryDialog"></library-dialog>
   </div>
 </template>
 
@@ -160,11 +160,11 @@ import {
   studentPictureList
 } from "../api";
 import ImageListPreviewDialog from "../../../components/ImageListPreviewDialog.vue";
-import DataCheckDialog from "../components/DataCheckDialog.vue";
+import LibraryDialog from "../components/LibraryDialog.vue";
 
 export default {
   name: "data-check-manage",
-  components: { ImageListPreviewDialog, DataCheckDialog },
+  components: { ImageListPreviewDialog, LibraryDialog },
   data() {
     return {
       filter: {
@@ -243,7 +243,9 @@ export default {
       this.donePage.current = page;
       this.getDoneList();
     },
-    todoTask() {}
+    todoTask() {
+      this.$refs.LibraryDialog.open();
+    }
   }
 };
 </script>

src/modules/record/views/ScanTaskManage.vue

@@ -201,21 +201,13 @@
           }}</a>
         </el-form-item>
 
-        <el-form-item prop="recordId" label="所属档案：">
-          <el-select
+        <el-form-item prop="paperArchivesId" label="所属档案：">
+          <archives-select
             style="width:100%;"
-            v-model="modalForm.recordId"
+            v-model="modalForm.paperArchivesId"
             placeholder="请选择所属档案"
-            filterable
           >
-            <el-option
-              v-for="item in records"
-              :key="item.id"
-              :value="item.id"
-              :label="item.name"
-            >
-            </el-option>
-          </el-select>
+          </archives-select>
         </el-form-item>
       </el-form>
     </import-file>
@@ -225,9 +217,9 @@
       :instance="curRow"
       :modified="getList"
     ></modify-scan-task>
-    <!-- DataCheckStateDialog -->
-    <data-check-state-dialog ref="DataCheckStateDialog" :task="curRow">
-    </data-check-state-dialog>
+    <!-- LibraryStateDialog -->
+    <library-state-dialog ref="LibraryStateDialog" :task="curRow">
+    </library-state-dialog>
     <!-- ScanTaskDetailDialog -->
     <scan-task-detail-dialog
       ref="ScanTaskDetailDialog"
@@ -245,7 +237,7 @@ import {
 } from "../api";
 import ImportFile from "../../../components/ImportFile.vue";
 import ModifyScanTask from "../components/ModifyScanTask.vue";
-import DataCheckStateDialog from "../components/DataCheckStateDialog.vue";
+import LibraryStateDialog from "../components/LibraryStateDialog.vue";
 import ScanTaskDetailDialog from "../components/ScanTaskDetailDialog.vue";
 
 export default {
@@ -253,7 +245,7 @@ export default {
   components: {
     ImportFile,
     ModifyScanTask,
-    DataCheckStateDialog,
+    LibraryStateDialog,
     ScanTaskDetailDialog
   },
   data() {
@@ -272,11 +264,10 @@ export default {
       curRow: {},
       loading: false,
       userId: this.$ls.get("user", { id: "" }).id,
-      records: [],
       // import-task
-      modalForm: { recordId: "" },
+      modalForm: { paperArchivesId: "" },
       rules: {
-        recordId: [
+        paperArchivesId: [
           {
             required: true,
             message: "请选择所属档案",
@@ -322,7 +313,7 @@ export default {
     },
     toShowProgress(row) {
       this.curRow = row;
-      this.$refs.DataCheckStateDialog.open();
+      this.$refs.LibraryStateDialog.open();
     },
     toImportTask() {
       this.$refs.ImportTask.open();

src/plugins/globalVuePlugins.js

@@ -13,6 +13,9 @@ import MajorSelect from "../components/base/MajorSelect.vue";
 import ClassSelect from "../components/base/ClassSelect.vue";
 import OrgSelect from "../components/base/OrgSelect.vue";
 import TeachClazzSelect from "../components/base/TeachClazzSelect.vue";
+import ArchivesSelect from "../components/base/ArchivesSelect.vue";
+import ArchivesOrgSelect from "../components/base/ArchivesOrgSelect.vue";
+import ArchivesTypeSelect from "../components/base/ArchivesTypeSelect.vue";
 
 const components = {
   ViewFooter,
@@ -24,7 +27,10 @@ const components = {
   MajorSelect,
   ClassSelect,
   OrgSelect,
-  TeachClazzSelect
+  TeachClazzSelect,
+  ArchivesSelect,
+  ArchivesOrgSelect,
+  ArchivesTypeSelect
 };
 
 export default {