zpy 1.12

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

@@ -72,3 +72,19 @@ export function reviewStudentAward(data) {
     data: data,
   });
 }
+//班主任管理--学生嘉奖查看
+export function listStudent(query) {
+  return request({
+    url: "/school/studentAward/getStudentAwardList",
+    method: "get",
+    params: query,
+  });
+}
+//班主任管理--学生违纪查看
+export function listStudentwj(query) {
+  return request({
+    url: "/school/discipline/getDisciplineList",
+    method: "get",
+    params: query,
+  });
+}

ruoyi-ui/src/views/smartSchool/awardsDisciplinary/studentViolation/ViolationDiscipline/index.vue

@@ -365,6 +365,7 @@ export default {
             query: false,
             isEdit: false,
             gradeLists: [],
+            fileList: [],
             //表格数据
             tableData: [
 

ruoyi-ui/src/views/smartSchool/classAdviser/studentManage/discipline/index.vue

@@ -91,6 +91,9 @@
             <el-col :span="1.5">
                 <el-button type="primary" plain icon="el-icon-search" size="mini" @click="handleQuerycx">查询</el-button>
             </el-col>
+            <!-- <el-col :span="1.5">
+                <el-button plain type="warning" icon="el-icon-upload2" size="mini" @click="handleExport">导出</el-button>
+            </el-col> -->
         </el-row>
 
         <el-table :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }" :data="tableData"
@@ -123,7 +126,7 @@
             <el-table-column align="center" prop="idCard" sortable label="身份证号" width="180" show-overflow-tooltip />
             <el-table-column align="center" prop="classTeacher" sortable label="班主任" width="100" show-overflow-tooltip />
             <el-table-column align="center" prop="gradeDirector" sortable label="级部主任" width="100" show-overflow-tooltip />
-            <el-table-column align="center" prop="violateType" sortable label="违纪类别" width="100" show-overflow-tooltip>
+            <el-table-column align="center" prop="violateType" sortable label="违纪类别" width="120" show-overflow-tooltip>
                 <template slot-scope="{ row }">
                     <div>{{ selectDictLabel(dict.type.violate_type, row.violateType) }}</div>
                 </template>
@@ -145,8 +148,7 @@
                     <div>{{ selectDictLabel(dict.type.audit_state, row.auditState) }}</div>
                 </template>
             </el-table-column>
-
-            <el-table-column align="center" fixed="right" label="操作" width="180">
+            <el-table-column align="center" fixed="right" label="操作" width="110">
                 <template slot-scope="scope">
                     <el-button @click="handleLook(scope.row)" type="text" size="small">查看</el-button>
                 </template>
@@ -156,7 +158,7 @@
             @pagination="getList" />
 
         <!-- 查看-->
-        <el-dialog title="详细信息" :visible.sync="dialogTableVisible" width="1100px">
+        <el-dialog title="详细信息" :visible.sync="dialogTableVisible" width="1200px">
             <el-form :model="form" ref="form" size="small" label-width="120px" :disabled="isEdit" :rules="rules">
                 <el-row>
                     <el-col :span="8">
@@ -226,7 +228,8 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
-                        <el-form-item label="身份证号" prop="idCard">
+                        <el-form-item label="
+                        号" prop="idCard">
                             <el-input v-model="form.idCard" @blur="handleIdCardBlur" maxlength="18" placeholder="请输入"
                                 clearable></el-input>
                         </el-form-item>
@@ -331,9 +334,9 @@ import {
     subApply,//提交
     getGrade,// 获取最新三个年级
     getClassList,// 根据年级获取班级,
-    listDisciplinetg,//查看已通过
     getTeacher,//获取教师
 } from '@/api/smartSchool/awardsDisciplinary/studentViolation/disciplinaryManagemen'
+import { listStudentwj } from "@/api/smartSchool/classAdviser/studentCommendation";
 import { checkIdcard } from '@/utils/utilLibrary/validate'
 export default {
     name: 'index',
@@ -393,6 +396,7 @@ export default {
             //弹窗
             dialogTableVisible: false,
             total: 0,
+            fileList: [],
             gradeList: [],
             classList: [],
             deptOptions: [],
@@ -584,7 +588,7 @@ export default {
 
 
         getList() {
-            listDisciplinetg(this.queryForm)
+            listStudentwj(this.queryForm)
                 .then(response => {
                     this.tableData = response.rows;
                     console.log('response', response);
@@ -685,7 +689,11 @@ export default {
             this.getList();
             this.query = false;
         },
-
+        handleExport() {
+            this.download('/school/discipline/exportYtg', {
+                ...this.queryParams
+            }, `学生违纪_${new Date().getTime()}.xlsx`)
+        }
     },
 }
 </script>

ruoyi-ui/src/views/smartSchool/classAdviser/studentManage/index.vue

@@ -149,7 +149,7 @@
         </template>
       </el-table-column>
       <el-table-column key="support" width="150" align="center" prop="support" label="接收资助情况"></el-table-column>
-      <el-table-column label="操作" align="center" min-width="220px" fixed="right">
+      <el-table-column label="操作" align="center" min-width="250px" fixed="right">
         <template slot-scope="scope">
           <el-button size="mini" type="text" @click="handleUpdate(scope.row)">编辑
           </el-button>

ruoyi-ui/src/views/smartSchool/studentAchievements/scoreEntry/index.vue

@@ -504,6 +504,7 @@ export default {
                 this.form = response.data;
                 this.isEdit = true;
                 this.open = true;
+                this.title = "查看学生成绩";
             }).catch(error => {
                 this.$modal.closeLoading();
             })

ruoyi-ui/src/views/smartSchool/studentAchievements/scoreViewing/index.vue

@@ -485,6 +485,7 @@ export default {
                 this.form = response.data;
                 this.isEdit = true;
                 this.open = true;
+                this.title = "查看学生成绩";
             }).catch(error => {
                 this.$modal.closeLoading();
             })