zhangjie 6 kuukautta sitten
vanhempi
commit
a0a37fd1d8

+ 12 - 2
src/components/base/ProfessionalSelect.vue

@@ -18,7 +18,10 @@
 </template>
 
 <script>
-import { conditionProfessionalList } from "../../modules/base/api";
+import {
+  conditionProfessionalList,
+  allProfessionalList,
+} from "../../modules/base/api";
 
 export default {
   name: "professional-select",
@@ -28,6 +31,10 @@ export default {
     value: { type: [Number, String], default: "" },
     clearable: { type: Boolean, default: true },
     defaultSelect: { type: Boolean, default: false },
+    fetchAll: {
+      type: Boolean,
+      default: false,
+    },
   },
   data() {
     return {
@@ -49,7 +56,10 @@ export default {
   methods: {
     async search() {
       this.optionList = [];
-      const res = await conditionProfessionalList();
+      const func = this.fetchAll
+        ? allProfessionalList
+        : conditionProfessionalList;
+      const res = await func();
       this.optionList = res;
 
       if (this.defaultSelect && !this.value) this.selectDefault();

+ 3 - 0
src/modules/base/api.js

@@ -75,6 +75,9 @@ export const conditionListClazz = ({ semesterId, examId, courseId }) => {
 export const conditionProfessionalList = () => {
   return $postParam("/api/admin/basic/condition/list_professional", {});
 };
+export const allProfessionalList = () => {
+  return $postParam("/admin/basic/professional/list", {});
+};
 // training-plan
 export const conditionTrainingPlanList = (professionalId) => {
   return $postParam("/api/admin/basic/condition/list_culture_program", {

+ 5 - 0
src/modules/exam/components/createExamAndPrintTask/InfoPrintTask.vue

@@ -450,9 +450,14 @@ export default {
         if (!this.taskModel.examStartTime || !this.taskModel.examEndTime) {
           row.examDate = "";
           row.examTime = "";
+          row.examStartTime = "";
+          row.examEndTime = "";
           return;
         }
 
+        row.examStartTime = this.taskModel.examStartTime;
+        row.examEndTime = this.taskModel.examEndTime;
+
         Object.assign(
           row,
           getExamDateTime(

+ 5 - 0
src/modules/exam/components/taskApply/TaskPrint.vue

@@ -397,9 +397,14 @@ export default {
         if (!this.taskModel.examStartTime || !this.taskModel.examEndTime) {
           row.examDate = "";
           row.examTime = "";
+          row.examStartTime = "";
+          row.examEndTime = "";
           return;
         }
 
+        row.examStartTime = this.taskModel.examStartTime;
+        row.examEndTime = this.taskModel.examEndTime;
+
         Object.assign(
           row,
           getExamDateTime(

+ 1 - 0
src/modules/target/components/training-plan/ModifyTrainingPlan.vue

@@ -28,6 +28,7 @@
           v-model="modalForm.professionalId"
           placeholder="所属专业"
           class="width-full"
+          fetch-all
         ></professional-select>
       </el-form-item>
     </el-form>