zpy 8.9

ruoyi-ui/src/api/smartSchool/classAdviser/courseView.js

+import request from "@/utils/request";
+
+
+
+// 查看选课情况列表（班主任）
+export function getStudentsList(query) {
+  return request({
+    url: "/curricula/student/listBzr",
+    method: "get",
+    params: query,
+  });
+}
+
+// 获取选课任务下拉框
+export function getDetailInfo() {
+  return request({
+    url: "/curricula/variable/getGrade",
+    method: "get",
+  });
+}
+
+//获取班级下拉框
+export function classList(data) {
+  return request({
+    url: `/curricula/variable/selectClass?grade=${data}`,
+    method: "get",
+  });
+}

ruoyi-ui/src/api/smartSchool/gradeWork/courseSelection/courseSelection.js

@@ -27,6 +27,23 @@ export function courseSelectionSummerList(query) {
     params: query,
   });
 }
+// 夏季分班规则 获取每种课程选择人数
+export function getsDivision(query) {
+  return request({
+    url: "/schoolDivision/getNumber",
+    method: "get",
+    params: query,
+  });
+}
+//分班规则
+export function addDivision(data) {
+  return request({
+    url: "/schoolDivision/add",
+    method: "post",
+    data,
+  });
+}
+
 /** 艺体选课情况API **/
 // 获取艺体选课列表
 export function courseSelectionArtList(query) {
@@ -36,3 +53,21 @@ export function courseSelectionArtList(query) {
     params: query,
   });
 }
+/** 夏季二次选课情况API **/
+// 获取夏季二次选课列表
+export function courseSelectionSummerListec(query) {
+  return request({
+    url: "/curricula/student/listXjEc",
+    method: "get",
+    params: query,
+  });
+}
+
+//二次分班规则
+export function addDivisionec(data) {
+  return request({
+    url: "/schoolDivision/addEc",
+    method: "post",
+    data,
+  });
+}

ruoyi-ui/src/views/smartSchool/gradeWork/courseSelection/taskPublishing/index.vue

@@ -52,7 +52,8 @@
                         @click="artisticView(task.id, task.grade)">艺体选课情况</el-button>
                     <el-button class="purpleBtn" size="small" round
                         @click="summerViewing(task.id, task.grade)">夏季选课情况</el-button>
-                    <el-button class="rowBtn" size="small" round @click="secondaryDivision()">夏季二次选课</el-button>
+                    <el-button class="rowBtn" size="small" round
+                        @click="secondaryDivision(task.id, task.grade)">夏季二次选课</el-button>
                 </div>
             </div>
         </div>
@@ -213,11 +214,12 @@ export default {
             });
         },
         //夏季二次选课按钮
-        secondaryDivision() {
+        secondaryDivision(id, grade) {
             this.$router.push({
                 path: "/gradeWork/courseSelection/secondaryDivision",
                 query: {
-                    // id: this.task.id
+                    id,
+                    grade
                 }
             });
         },

ruoyi-ui/src/views/smartSchool/personWork/repairRecord/index.vue

@@ -72,5 +72,4 @@ export default {
 </script>
 
 <style lang="scss" scoped></style>
-<style lang="scss" scoped></style>
->
\ No newline at end of file
+

ruoyi-ui/src/views/smartSchool/schoolProperty/warehousingLedger/index.vue

@@ -78,32 +78,32 @@
                 <el-row :gutter="20">
                     <el-col :span="12">
                         <el-form-item label="入库类型:" prop="teacherName">
-                            <el-input v-model="form.teacherName" placeholder="请输入自编码" clearable
+                            <el-input v-model="form.teacherName" placeholder="请输入入库类型" clearable
                                 @click.native="selectTeacher"></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="地点:" prop="equipmentName">
-                            <el-input v-model="form.equipmentName" placeholder="请输入设备名称" clearable></el-input>
+                            <el-input v-model="form.equipmentName" placeholder="请输入地点" clearable></el-input>
                         </el-form-item>
                     </el-col>
                 </el-row>
                 <el-row :gutter="20">
                     <el-col :span="12">
                         <el-form-item label="入库时间:" prop="teacherName">
-                            <el-input v-model="form.teacherName" placeholder="请输入自编码" clearable></el-input>
+                            <el-input v-model="form.teacherName" placeholder="请输入库时间" clearable></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="归属类型:" prop="equipmentName">
-                            <el-input v-model="form.equipmentName" placeholder="请输入设备名称" clearable></el-input>
+                            <el-input v-model="form.equipmentName" placeholder="请输入归属类型" clearable></el-input>
                         </el-form-item>
                     </el-col>
                 </el-row>
                 <el-row :gutter="20">
                     <el-col :span="12">
                         <el-form-item label="设备名称:" prop="equipmentModel">
-                            <el-input v-model="form.equipmentModel" placeholder="请输入型号" clearable></el-input>
+                            <el-input v-model="form.equipmentModel" placeholder="请输入设备名称" clearable></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
@@ -120,7 +120,7 @@
                 <el-row :gutter="20">
                     <el-col :span="12">
                         <el-form-item label="型号:" prop="equipmentType">
-                            <el-input v-model="form.equipmentType" placeholder="请输入分类编码" clearable></el-input>
+                            <el-input v-model="form.equipmentType" placeholder="请输入型号" clearable></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
@@ -135,12 +135,12 @@
                 <el-row :gutter="20">
                     <el-col :span="12">
                         <el-form-item label="规格:" prop="equipmentBelongType">
-                            <el-input v-model="form.equipmentBelongType" placeholder="请输入归属类型" clearable></el-input>
+                            <el-input v-model="form.equipmentBelongType" placeholder="请输入规格" clearable></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="价格（元）:" prop="equipmentPrice">
-                            <el-input v-model="form.equipmentPrice" placeholder="请输入价格" clearable></el-input>
+                            <el-input v-model="form.equipmentPrice" placeholder="请输入价格（元）" clearable></el-input>
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -149,24 +149,24 @@
                 <el-row :gutter="20">
                     <el-col :span="12">
                         <el-form-item label="分类编码:" prop="equipmentBelongType">
-                            <el-input v-model="form.equipmentBelongType" placeholder="请输入归属类型" clearable></el-input>
+                            <el-input v-model="form.equipmentBelongType" placeholder="请输入分类编码" clearable></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="效用年限（年）:" prop="equipmentPrice">
-                            <el-input v-model="form.equipmentPrice" placeholder="请输入价格" clearable></el-input>
+                            <el-input v-model="form.equipmentPrice" placeholder="请输入效用年限（年)" clearable></el-input>
                         </el-form-item>
                     </el-col>
                 </el-row>
                 <el-row :gutter="20">
                     <el-col :span="12">
                         <el-form-item label="单位:" prop="equipmentBelongType">
-                            <el-input v-model="form.equipmentBelongType" placeholder="请输入归属类型" clearable></el-input>
+                            <el-input v-model="form.equipmentBelongType" placeholder="请输入单位" clearable></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="使用人:" prop="equipmentPrice">
-                            <el-input v-model="form.equipmentPrice" placeholder="请输入价格" clearable></el-input>
+                            <el-input v-model="form.equipmentPrice" placeholder="请输入使用人" clearable></el-input>
                         </el-form-item>
                     </el-col>
                 </el-row>