查询调整

src/components/base/SemesterSelect.vue

@@ -28,7 +28,7 @@ export default {
     placeholder: { type: String, default: "请选择学期" },
     value: { type: [Number, String], default: "" },
     clearable: { type: Boolean, default: true },
-    defaultSelectInUsed: { type: Boolean, default: false }
+    defaultSelect: { type: Boolean, default: false }
   },
   data() {
     return {
@@ -54,7 +54,7 @@ export default {
       const res = await unitQueryByType({}, "SEMESTER");
       this.optionList = res;
 
-      if (this.defaultSelectInUsed && !this.value) this.selectDefault();
+      if (this.defaultSelect && !this.value) this.selectDefault();
     },
     select() {
       this.$emit("input", this.selected);
@@ -64,10 +64,11 @@ export default {
       );
     },
     selectDefault() {
-      const defaultCollege = this.optionList.find(item => item.inUsed);
+      const defaultCollege = this.optionList[0];
       if (defaultCollege) {
         this.selected = defaultCollege.id;
-        this.select();
+        this.$emit("input", this.selected);
+        this.$emit("default-selected", defaultCollege);
       }
     }
   }

src/modules/base/views/PrintPlanPushManage.vue

@@ -3,20 +3,12 @@
     <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.trim="filter.semesterId"
-              placeholder="请选择使用学期"
-              clearable
-              filterable
-            >
-              <el-option
-                v-for="item in semesters"
-                :key="item.id"
-                :value="item.id"
-                :label="item.name"
-              ></el-option>
-            </el-select>
+          <el-form-item label="学期：">
+            <semester-select
+              v-model="filter.semesterId"
+              default-select
+              @default-selected="getList"
+            ></semester-select>
           </el-form-item>
           <el-form-item label="考试：">
             <exam-select
@@ -221,7 +213,6 @@
 <script>
 import { PUSH_TYPE } from "@/constants/enumerate";
 import { printPlanPushListQuery } from "../api";
-import { examSemesterList } from "../../base/api";
 import PrintPlanBatchPushDialog from "../components/PrintPlanBatchPushDialog.vue";
 import DataSyncDialog from "../../stmms/components/DataSyncDialog.vue";
 
@@ -252,14 +243,8 @@ export default {
       createTime: []
     };
   },
-  mounted() {
-    this.initData();
-  },
+  mounted() {},
   methods: {
-    async initData() {
-      await this.getSemesters();
-      await this.getList();
-    },
     async getList() {
       if (!this.checkPrivilege("list", "list")) return;
 
@@ -288,15 +273,6 @@ export default {
       this.size = size;
       this.toPage(1);
     },
-    async getSemesters() {
-      const res = await examSemesterList({});
-      this.semesters = res || [];
-      if (!this.semesters.length) return;
-
-      let curSemester = this.semesters.find(item => item.inUsed);
-      curSemester = curSemester || this.semesters[0];
-      this.filter.semesterId = curSemester.id;
-    },
     handleSelectionChange(val) {
       this.multipleSelection = val;
     },

src/modules/exam/views/ExamTaskManage.vue

@@ -4,7 +4,11 @@
       <el-form ref="FilterForm" label-position="left" label-width="85px" inline>
         <template v-if="checkPrivilege('condition', 'condition')">
           <el-form-item label="学期：">
-            <semester-select v-model="filter.semesterId"></semester-select>
+            <semester-select
+              v-model="filter.semesterId"
+              default-select
+              @default-selected="getList"
+            ></semester-select>
           </el-form-item>
           <el-form-item label="考试：">
             <exam-select
@@ -293,9 +297,7 @@ export default {
       pickerOptions
     };
   },
-  mounted() {
-    this.getList();
-  },
+  mounted() {},
   methods: {
     ...mapActions("exam", ["updateWaitTaskCount"]),
     async getList() {

src/modules/exam/views/TaskApplyManage.vue

@@ -4,7 +4,11 @@
       <el-form ref="FilterForm" label-position="left" label-width="85px" inline>
         <template v-if="checkPrivilege('condition', 'condition')">
           <el-form-item label="学期：">
-            <semester-select v-model="filter.semesterId"></semester-select>
+            <semester-select
+              v-model="filter.semesterId"
+              default-select
+              @default-selected="getList"
+            ></semester-select>
           </el-form-item>
           <el-form-item label="考试：">
             <exam-select
@@ -293,7 +297,7 @@ export default {
       pickerOptions
     };
   },
-  mounted() {
+  created() {
     this.initData();
   },
   methods: {
@@ -315,7 +319,7 @@ export default {
           this.toEdit(curRow);
         });
       } else {
-        this.toPage(1);
+        // this.toPage(1);
       }
       this.$ls.remove("cachePageInfo");
     },

src/modules/exam/views/TaskPaperManage.vue

@@ -4,7 +4,11 @@
       <el-form ref="FilterForm" label-position="left" label-width="85px" inline>
         <template v-if="checkPrivilege('condition', 'condition')">
           <el-form-item label="学期：">
-            <semester-select v-model="filter.semesterId"></semester-select>
+            <semester-select
+              v-model="filter.semesterId"
+              default-select
+              @default-selected="getList"
+            ></semester-select>
           </el-form-item>
           <el-form-item label="考试：">
             <exam-select
@@ -286,7 +290,7 @@ export default {
           this.toEdit(curRow);
         });
       } else {
-        this.toPage(1);
+        // this.toPage(1);
       }
       this.$ls.remove("cachePageInfo");
     },

src/modules/exam/views/TaskReviewManage.vue

@@ -19,7 +19,11 @@
           "
         >
           <el-form-item label="学期：">
-            <semester-select v-model="filter.semesterId"></semester-select>
+            <semester-select
+              v-model="filter.semesterId"
+              default-select
+              @default-selected="getList"
+            ></semester-select>
           </el-form-item>
           <el-form-item label="考试：">
             <exam-select
@@ -335,7 +339,7 @@ export default {
     }
   },
   mounted() {
-    this.toPage(1);
+    // this.toPage(1);
   },
   methods: {
     ...mapActions("exam", ["updateWaitTaskCount"]),

src/modules/print/views/BusinessDataDetail.vue

@@ -3,6 +3,19 @@
     <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="学期：">
+            <semester-select
+              v-model="filter.semesterId"
+              default-select
+              @default-selected="getList"
+            ></semester-select>
+          </el-form-item>
+          <el-form-item label="考试：">
+            <exam-select
+              v-model="filter.examId"
+              :semester-id="filter.semesterId"
+            ></exam-select>
+          </el-form-item>
           <el-form-item label="印刷计划：">
             <print-plan-select
               v-model.trim="filter.printPlanIdList"
@@ -188,7 +201,7 @@ export default {
     };
   },
   mounted() {
-    this.search();
+    // this.search();
   },
   methods: {
     async getList() {

src/modules/print/views/BusinessDataExport.vue

@@ -7,7 +7,8 @@
             <semester-select
               v-model.trim="filter.semesterId"
               placeholder="学期"
-              clearable
+              default-select
+              @default-selected="search"
             ></semester-select>
           </el-form-item>
           <el-form-item label="考试：">
@@ -356,7 +357,7 @@ export default {
     };
   },
   mounted() {
-    this.search();
+    // this.search();
     this.getPlans();
   },
   methods: {

src/modules/print/views/PrintPlanManage.vue

@@ -3,6 +3,19 @@
     <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="学期：">
+            <semester-select
+              v-model="filter.semesterId"
+              default-select
+              @default-selected="getList"
+            ></semester-select>
+          </el-form-item>
+          <el-form-item label="考试：">
+            <exam-select
+              v-model="filter.examId"
+              :semester-id="filter.semesterId"
+            ></exam-select>
+          </el-form-item>
           <el-form-item label="印刷计划：">
             <print-plan-select
               v-model.trim="filter.printPlanIdList"
@@ -216,7 +229,7 @@ export default {
     };
   },
   mounted() {
-    this.search();
+    // this.search();
   },
   methods: {
     async getList() {

src/modules/print/views/PrintTaskManage.vue

@@ -7,7 +7,8 @@
             <semester-select
               v-model.trim="filter.semesterId"
               placeholder="学期"
-              clearable
+              default-select
+              @default-selected="search"
             ></semester-select>
           </el-form-item>
           <el-form-item label="考试：">
@@ -466,7 +467,7 @@ export default {
     };
   },
   mounted() {
-    this.search();
+    // this.search();
   },
   methods: {
     async getList() {