Merge remote-tracking branch 'origin/dev' into dev

src/request/training_process_management.js

@@ -21,6 +21,7 @@ export const getAssociatedCoursewareNameList = (params) =>
 export const getClassManagementList = (params) => post("/class/list", params); // 班级管理列表
 export const setClassManagementDelete = (params) =>
   post("/class/delete", params); // 班级管理删除
+export const setClassFinish = (params) => post("/class/finish", params); // 班级管理完成
 export const setClassManagementDelay = (params) =>
   post("/class/postpone", params); // 班级管理延期
 export const getPersonnelList = (params) =>

src/views/training_process_management/class_management/components/curriculum.vue

@@ -100,7 +100,7 @@
       >
         上一步
       </el-button>
-      <el-button type="primary"> 完成 </el-button>
+      <el-button type="primary" @click="fnComplete"> 完成 </el-button>
     </div>
     <involved-in-training
       :id="data.involvedInTrainingDialog.CLASSCURRICULUM_ID"
@@ -122,6 +122,7 @@ import useListData from "@/assets/js/useListData.js";
 import {
   getClassManagementCurriculumList,
   getClassManagementInvolvedInTrainingList,
+  setClassFinish,
   setClassManagementCurriculumDelete,
 } from "@/request/training_process_management.js";
 import { debounce } from "throttle-debounce";
@@ -170,6 +171,22 @@ const fnDelete = debounce(
   },
   { atBegin: true }
 );
+const fnComplete = debounce(
+  1000,
+  async () => {
+    await ElMessageBox.confirm(
+      "完成之后将开班，只能新增学员，不能再进行其它更改，确认继续吗？",
+      {
+        type: "warning",
+      }
+    );
+    await setClassFinish({ CLASS_ID, EXAMINATION });
+    ElMessage.success("班级添加完成");
+    fnResetPagination();
+    router.back();
+  },
+  { atBegin: true }
+);
 </script>
 
 <style scoped lang="scss"></style>

src/views/training_process_management/class_management/components/student.vue

@@ -277,17 +277,13 @@ const fnGetLearningRecords = async () => {
       "/student/exportStudentInfo?CLASS_ID=" +
       CLASS_ID +
       "&START_TIME=" +
-    searchForm.value.TIME?.[0] +
+      searchForm.value.TIME?.[0] ||
-    "&END_TIME=" +
+    "" + "&END_TIME=" + searchForm.value.TIME?.[1] ||
-    searchForm.value.TIME?.[1] +
+    "" + "&DEPARTMENT_ID=" + searchForm.value.DEPARTMENT_ID ||
-    "&DEPARTMENT_ID=" +
+    "" + "&POST_ID=" + searchForm.value.POST_ID ||
-    searchForm.value.DEPARTMENT_ID +
+    "" + "&STUDYSTATE=" + searchForm.value.STUDYSTATE ||
-    "&POST_ID=" +
+    "" + "&STAGEEXAMSTATE=" + searchForm.value.STAGEEXAMSTATE ||
-    searchForm.value.POST_ID +
+    "";
-    "&STUDYSTATE=" +
-    searchForm.value.STUDYSTATE +
-    "&STAGEEXAMSTATE=" +
-    searchForm.value.STAGEEXAMSTATE;
   ElMessage.success("导出成功");
 };
 const fnDelete = debounce(

src/views/training_process_management/class_management/components/test_paper_type.vue

@@ -96,7 +96,7 @@ const data = reactive({
       OPTIONALDANYUANTICOUNT: 0,
       OPTIONALDUOXUANTICOUNT: 0,
       OPTIONALPANDUITICOUNT: 0,
-      COURSEWAREIDS: "",
+      COURSEWAREIDS: [],
       EXAMNAME: "",
       EXAMSCORE: 0,
       PASSSCORE: 0,

src/views/training_process_management/class_management/index.vue

@@ -141,12 +141,7 @@
           prop="TRAININGTYPE_NAME"
           width="150"
         />
-        <el-table-column label="行业类型" prop="POSTTYPE_NAME" width="150" />
+        <el-table-column label="岗位类型" prop="POSTTYPE_NAME" width="150" />
-        <el-table-column
-          label="岗位类型"
-          prop="INDUSTRY_ALL_NAME"
-          width="200"
-        />
         <el-table-column label="培训等级" prop="TRAINLEVEL_NAME" width="150" />
         <el-table-column label="负责人" prop="PRINCIPAL" width="150" />
         <el-table-column label="培训开始时间" prop="START_TIME" width="150" />