zhangjie 2 жил өмнө
parent
commit
8482b3f190

+ 4 - 1
src/modules/base/api.js

@@ -292,6 +292,9 @@ export const semesterListQuery = datas => {
 export const examSemesterList = datas => {
   return $postParam("/api/admin/basic/semester/list", datas);
 };
+export const ableSemester = ({ id, enable }) => {
+  return $post("/api/admin/basic/semester/enable", { id, enable });
+};
 export const deleteSemester = id => {
   return $postParam("/api/admin/basic/semester/delete", { id });
 };
@@ -485,5 +488,5 @@ export const updateTeacherSimple = datas => {
   return $post("/api/admin/teach/course/manual_create_teacher", datas);
 };
 export const batchAddTeacherSimple = datas => {
-  return $post("/api/admin/teach/course/select_create_teacher", datas);
+  return $postParam("/api/admin/teach/course/select_create_teacher", datas);
 };

+ 1 - 1
src/modules/base/components/course-simple/ClazzSimpleManage.vue

@@ -141,7 +141,7 @@ export default {
   },
   methods: {
     async initData() {
-      this.filter.basicCourseId = this.course.id;
+      this.filter.basicCourseId = this.course.basicCourseId;
       await this.getList();
     },
     async getList() {

+ 3 - 0
src/modules/base/components/course-simple/CourseSimpleDetail.vue

@@ -75,6 +75,9 @@ export default {
     },
     open() {
       this.modalIsShow = true;
+    },
+    selectMenu(tab) {
+      this.curTab = tab;
     }
   }
 };

+ 1 - 1
src/modules/base/components/course-simple/ModifyCourseSimple.vue

@@ -179,7 +179,7 @@ export default {
       if (!data) return;
 
       this.isSubmit = false;
-      this.$message.success(this.title + "成功!");
+      this.$message.success("添加成功!");
       this.$emit("modified");
       this.cancel();
     },

+ 5 - 4
src/modules/base/components/course-simple/ModifyTeacherSimple.vue

@@ -158,8 +158,9 @@ export default {
   methods: {
     visibleChange() {
       this.modalForm = { ...initModalForm };
+      this.modalForm.basicCourseId = this.course.basicCourseId;
       this.uploadData = {
-        basicCourseId: this.course.id
+        basicCourseId: this.course.basicCourseId
       };
     },
     cancel() {
@@ -192,7 +193,7 @@ export default {
       if (!data) return;
 
       this.isSubmit = false;
-      this.$message.success(this.title + "成功!");
+      this.$message.success("添加成功!");
       this.$emit("modified");
       this.cancel();
     },
@@ -205,8 +206,8 @@ export default {
       if (this.isSubmit) return;
       this.isSubmit = true;
       const data = await batchAddTeacherSimple({
-        basicCourseId: this.course.id,
-        userIdList: this.selectedTeacherIds
+        basicCourseId: this.course.basicCourseId,
+        userIdList: this.selectedTeacherIds.join()
       }).catch(() => {});
       this.isSubmit = false;
 

+ 1 - 1
src/modules/base/components/course-simple/SelectSimpleTeacher.vue

@@ -77,7 +77,7 @@ export default {
         orgId: "",
         enable: true,
         pageNumber: 1,
-        pageSize: 1000
+        pageSize: 500
       },
       dataList: [],
       multipleSelection: []

+ 6 - 15
src/modules/base/components/course-simple/TeacherSimpleManage.vue

@@ -40,20 +40,11 @@
           width="70"
           :index="indexMethod"
         ></el-table-column>
-        <el-table-column prop="teachClazzName" label="姓名"></el-table-column>
-        <el-table-column
-          prop="teachStudentCount"
-          label="工号"
-        ></el-table-column>
-        <el-table-column
-          prop="teachStudentCount"
-          label="角色"
-        ></el-table-column>
-        <el-table-column
-          prop="teachStudentCount"
-          label="所在机构"
-        ></el-table-column>
-        <el-table-column class-name="action-column" label="操作" width="170px">
+        <el-table-column prop="userName" label="姓名"></el-table-column>
+        <el-table-column prop="userCode" label="工号"></el-table-column>
+        <el-table-column prop="roleName" label="角色"></el-table-column>
+        <el-table-column prop="orgName" label="所在机构"></el-table-column>
+        <el-table-column class-name="action-column" label="操作" width="100px">
           <template slot-scope="scope">
             <el-button
               class="btn-danger"
@@ -122,7 +113,7 @@ export default {
   },
   methods: {
     async initData() {
-      this.filter.basicCourseId = this.course.id;
+      this.filter.basicCourseId = this.course.basicCourseId;
       await this.getList();
     },
     async getList() {

+ 22 - 20
src/modules/base/views/SemesterManage.vue

@@ -28,22 +28,13 @@
           :index="indexMethod"
         ></el-table-column>
         <el-table-column prop="semesterName" label="学期"></el-table-column>
-        <el-table-column prop="inUsed" label="当前学期">
-          <span
-            :class="{ 'color-success': scope.row.inUsed }"
-            slot-scope="scope"
-            >{{ scope.row.inUsed ? "是" : "否" }}</span
-          >
+        <el-table-column prop="enable" label="状态" width="80">
+          <template slot-scope="scope">
+            {{ scope.row.enable | enableFilter }}
+          </template>
         </el-table-column>
         <el-table-column class-name="action-column" label="操作" width="200px">
           <template slot-scope="scope">
-            <el-button
-              v-if="checkPrivilege('link', 'edit') && !scope.row.inUsed"
-              class="btn-primary"
-              type="text"
-              @click="setUsed(scope.row)"
-              >设置为当前学期</el-button
-            >
             <el-button
               v-if="checkPrivilege('link', 'edit')"
               class="btn-primary"
@@ -51,6 +42,13 @@
               @click="toEdit(scope.row)"
               >编辑</el-button
             >
+            <el-button
+              v-if="checkPrivilege('link', 'enable')"
+              :class="scope.row.enable ? 'btn-danger' : 'btn-primary'"
+              type="text"
+              @click="toEnable(scope.row)"
+              >{{ scope.row.enable ? "禁用" : "启用" }}</el-button
+            >
             <el-button
               v-if="checkPrivilege('link', 'delete')"
               class="btn-danger"
@@ -85,7 +83,7 @@
 </template>
 
 <script>
-import { semesterListQuery, deleteSemester, semesterSetInUsed } from "../api";
+import { semesterListQuery, deleteSemester, ableSemester } from "../api";
 import ModifySemester from "../components/ModifySemester";
 
 export default {
@@ -143,9 +141,10 @@ export default {
       this.$message.success("删除成功!");
       this.deletePageLastItem();
     },
-    async setUsed(row) {
+    async toEnable(row) {
+      const action = row.enable ? "禁用" : "启用";
       const result = await this.$confirm(
-        `确定要将学期【${row.semesterName}】设置成当前学期吗?`,
+        `确定要${action}学期【${row.semesterName}】吗?`,
         "提示",
         {
           type: "warning"
@@ -153,10 +152,13 @@ export default {
       ).catch(() => {});
       if (result !== "confirm") return;
 
-      await semesterSetInUsed(row.id);
-
-      this.getList();
-      this.$message.success("设置成功!");
+      const enable = !row.enable;
+      await ableSemester({
+        id: row.id,
+        enable
+      });
+      row.enable = enable;
+      this.$message.success("操作成功!");
     }
   }
 };