修改班级园历部分功能

ruoyi-ui/src/api/benyi/schoolcalendarclass.js

@@ -2,52 +2,61 @@ import request from '@/utils/request'
 
 // 查询园历管理(班级)列表
 export function listSchoolcalendarclass(query) {
-  return request({
-    url: '/benyi/schoolcalendarclass/list',
-    method: 'get',
-    params: query
-  })
+    return request({
+        url: '/benyi/schoolcalendarclass/list',
+        method: 'get',
+        params: query
+    })
+}
+
+// 不分页查询班级列表
+export function listSchoolcalendarclassAll(query) {
+    return request({
+        url: '/benyi/schoolcalendarclass/listAll',
+        method: 'get',
+        params: query
+    })
 }
 
 // 查询园历管理(班级)详细
 export function getSchoolcalendarclass(id) {
-  return request({
-    url: '/benyi/schoolcalendarclass/' + id,
-    method: 'get'
-  })
+    return request({
+        url: '/benyi/schoolcalendarclass/' + id,
+        method: 'get'
+    })
 }
 
 // 新增园历管理(班级)
 export function addSchoolcalendarclass(data) {
-  return request({
-    url: '/benyi/schoolcalendarclass',
-    method: 'post',
-    data: data
-  })
+    return request({
+        url: '/benyi/schoolcalendarclass',
+        method: 'post',
+        data: data
+    })
 }
 
 // 修改园历管理(班级)
 export function updateSchoolcalendarclass(data) {
-  return request({
-    url: '/benyi/schoolcalendarclass',
-    method: 'put',
-    data: data
-  })
+    return request({
+        url: '/benyi/schoolcalendarclass',
+        method: 'put',
+        data: data
+    })
 }
 
 // 删除园历管理(班级)
 export function delSchoolcalendarclass(id) {
-  return request({
-    url: '/benyi/schoolcalendarclass/' + id,
-    method: 'delete'
-  })
+    return request({
+        url: '/benyi/schoolcalendarclass/' + id,
+        method: 'delete'
+    })
 }
 
 // 导出园历管理(班级)
 export function exportSchoolcalendarclass(query) {
-  return request({
-    url: '/benyi/schoolcalendarclass/export',
-    method: 'get',
-    params: query
-  })
+    return request({
+        url: '/benyi/schoolcalendarclass/export',
+        method: 'get',
+        params: query
+    })
 }

ruoyi-ui/src/api/system/teacher.js

@@ -2,70 +2,70 @@ import request from '@/utils/request'
 
 // 查询教师基本信息列表
 export function listTeacher(query) {
-  return request({
-    url: '/system/teacher/list',
-    method: 'get',
-    params: query
-  })
+    return request({
+        url: '/system/teacher/list',
+        method: 'get',
+        params: query
+    })
 }
 
 //不分页
 export function listTeacher2(query) {
-  return request({
-    url: '/system/teacher/list2',
-    method: 'get',
-    params: query
-  })
+    return request({
+        url: '/system/teacher/list2',
+        method: 'get',
+        params: query
+    })
 }
 
 // 查询教师基本信息列表
 export function listTeacherGroupXw() {
-  return request({
-    url: '/system/teacher/listgroupxw',
-    method: 'get',
-    params: ''
-  })
+    return request({
+        url: '/system/teacher/listgroupxw',
+        method: 'get',
+        params: ''
+    })
 }
 
 // 查询教师基本信息详细
 export function getTeacher(id) {
-  return request({
-    url: '/system/teacher/' + id,
-    method: 'get'
-  })
+    return request({
+        url: '/system/teacher/' + id,
+        method: 'get'
+    })
 }
 
 // 新增教师基本信息
 export function addTeacher(data) {
-  return request({
-    url: '/system/teacher',
-    method: 'post',
-    data: data
-  })
+    return request({
+        url: '/system/teacher',
+        method: 'post',
+        data: data
+    })
 }
 
 // 修改教师基本信息
 export function updateTeacher(data) {
-  return request({
-    url: '/system/teacher',
-    method: 'put',
-    data: data
-  })
+    return request({
+        url: '/system/teacher',
+        method: 'put',
+        data: data
+    })
 }
 
 // 删除教师基本信息
 export function delTeacher(id) {
-  return request({
-    url: '/system/teacher/' + id,
-    method: 'delete'
-  })
+    return request({
+        url: '/system/teacher/' + id,
+        method: 'delete'
+    })
 }
 
 // 导出教师基本信息
 export function exportTeacher(query) {
-  return request({
-    url: '/system/teacher/export',
-    method: 'get',
-    params: query
-  })
+    return request({
+        url: '/system/teacher/export',
+        method: 'get',
+        params: query
+    })
 }

ruoyi-ui/src/views/benyi/schoolcalendarclass/index.vue

@@ -12,13 +12,14 @@
         </el-select>
       </el-form-item>
       <el-form-item label="所属班级" prop="classid">
-        <el-input
-          v-model="queryParams.classid"
-          placeholder="请输入所属班级"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
+        <el-select v-model="queryParams.classid"  placeholder="请选择班级" >
+          <el-option
+            v-for="item in classListAll"
+            :key="item.classid"
+            :label="item.byClass.bjmc"
+            :value="item.classid"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="学年学期" prop="xnxq">
         <el-select v-model="queryParams.xnxq" placeholder="请选择学年学期" clearable size="small">
@@ -90,7 +91,7 @@
       <el-table-column label="编号" align="center" prop="id" />
       <el-table-column label="名称" align="center" prop="name" />
       <el-table-column label="活动类型" align="center" prop="type" :formatter="typeFormat" />
-      <el-table-column label="所属班级" align="center" prop="classid" />
+      <el-table-column label="所属班级" align="center" prop="byClass.bjmc" />
       <el-table-column label="学年学期" align="center" prop="xnxq" :formatter="xnxqFormat" />
       <el-table-column label="活动时间" align="center" prop="activitytime" width="180"/>
       <el-table-column label="创建时间" align="center" prop="createtime" width="180">
@@ -160,7 +161,14 @@
 </template>
 
 <script>
-import { listSchoolcalendarclass, getSchoolcalendarclass, delSchoolcalendarclass, addSchoolcalendarclass, updateSchoolcalendarclass, exportSchoolcalendarclass } from "@/api/benyi/schoolcalendarclass";
+import { 
+  listSchoolcalendarclass, 
+  listSchoolcalendarclassAll,
+  getSchoolcalendarclass, 
+  delSchoolcalendarclass, 
+  addSchoolcalendarclass, 
+  updateSchoolcalendarclass, 
+  exportSchoolcalendarclass } from "@/api/benyi/schoolcalendarclass";
 
 export default {
   name: "Schoolcalendarclass",
@@ -178,6 +186,8 @@ export default {
       total: 0,
       // 园历管理(班级)表格数据
       schoolcalendarclassList: [],
+      // 园历班级名称列表
+      classListAll: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -208,6 +218,7 @@ export default {
   },
   created() {
     this.getList();
+    this.getListAll();
     this.getDicts("sys_schoolcalendartype").then(response => {
       this.typeOptions = response.data;
     });
@@ -225,6 +236,12 @@ export default {
         this.loading = false;
       });
     },
+    /** 查询所有班级名称列表 */
+    getListAll(){
+      listSchoolcalendarclassAll(this.queryParams).then(response => {
+        this.classListAll = response.rows;
+      });
+    },
     // 活动类型字典翻译
     typeFormat(row, column) {
       return this.selectDictLabel(this.typeOptions, row.type);