Merge remote-tracking branch 'origin/master'

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

 <template>
 <template>
-    <div>
-        <h2>春季查看</h2>
+    <div class="app-container">
+        <el-form :model="queryForm" ref="queryForm" size="small" :inline="true" label-width="70px">
+            <el-form-item prop="studentsName">
+                <el-input clearable v-model="queryForm.studentsName" placeholder="学生姓名"
+                    @keyup.enter.native="handleQuery"></el-input>
+            </el-form-item>
+            <el-form-item prop="classId">
+                <el-select v-model="queryForm.classId" placeholder="班级" clearable>
+                    <el-option v-for="item in classList" :key="item.id" :label="item.className" :value="item.id">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item prop="majorId">
+                <el-select v-model="queryForm.majorId" placeholder="已选专业" clearable>
+                    <el-option v-for="item in majorList" :key="item.id" :label="item.majorName" :value="item.id">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item>
+                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+                <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+                <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
+            </el-form-item>
+        </el-form>
+        <!-- 表单信息 -->
+        <el-table border v-loading="loading" :row-style="{ height: '35px' }" :cell-style="{ padding: '0' }"
+            :data="studentsList" style="font-size: 14px" stripe>
+            <el-table-column label="班级" prop="bj" align="center" width="150px" />
+            <el-table-column label="学生姓名" prop="xsxm" align="center" width="150px" />
+            <el-table-column label="学号" prop="xh" align="center" />
+            <el-table-column label="身份证号" prop="sfzh" width="300px" align="center" />
+            <el-table-column label="课程类型" prop="kclx" align="center" />
+            <el-table-column label="选课时间" prop="xksj" align="center" />
+            <el-table-column label="已选专业" prop="yxzy" align="center" />
+
+
+        </el-table>
+        <pagination v-show="total > 0" :total="total" :page.sync="queryForm.pageNum" :limit.sync="queryForm.pageSize"
+            @pagination="getList" />
+
     </div>
     </div>
 </template>
 </template>
 
 
 <script>
 <script>
+import {
+    getksBudgetList,//查询科室预算填报项目明细列表
+    depBudget//查看详情
+} from '@/api/smartSchool/logisticsManage/departmentBudgetview'
+
 export default {
 export default {
+    name: "springView",
+    data() {
+        return {
+            majorList: [],
+            classList: [],
+            // 查询表单
+            queryForm: {
+                studentsName: '',
+                classId: '',
+                majorId: '',
+                pageNum: 1,
+                pageSize: 10
+            },
+            // 遮罩层
+            loading: false,
+            total: 0,
+            // 信息列表
+            studentsList: [
+                {
+                    id: 1,
+                    bj: '一班',
+                    xsxm: '张三',
+                    xh: '2018001',
+                    sfzh: '123456789012345678',
+                    kclx: '春季选课',
+                    xksj: '2020-09-01',
+                    yxzy: '会计 护理 幼师 机电 电子商务 导游'
+                },
+                {
+                    id: 2,
+                    bj: '一班',
+                    xsxm: '张三',
+                    xh: '2018001',
+                    sfzh: '123456789012345678',
+                    kclx: '春季选课',
+                    xksj: '2020-09-01',
+                    yxzy: '会计 护理 幼师 机电 电子商务 导游'
+                },
+                {
+                    id: 3,
+                    bj: '一班',
+                    xsxm: '张三',
+                    xh: '2018001',
+                    sfzh: '123456789012345678',
+                    kclx: '春季选课',
+                    xksj: '2020-09-01',
+                    yxzy: '会计 护理 幼师 机电 电子商务 导游'
+
+                }
+            ],
+            // 新增/编辑表单
+            postForm: {
+
+            },
+            // 查看表格
+            lookTable: [],
+            options: [],
+            // 是否显示弹出层
+            open: false,
+            // 查看弹窗
+            openLook: false,
+            // 校验规则
+            rules: {
+
+            },
+            // 弹出层标题
+            title: '',
+            // 是否禁用删除按钮--项目明细
+            multiple: false,
+            // 选中数据的值数组
+            selectItems: [],
+            // 科室列表
+            deptOptions: [],
+
+        }
+    },
+
+
+
+    created() {
+        this.getList();
+        // 获取科室信息
+
+    },
+    methods: {
+
+
+
+
+        // 获取列表
+        // getList() {
+        //     getksBudgetList(this.queryForm).then(response => {
+        //         this.loading = false;
+        //         this.studentsList = response.rows;
+        //         console.log(111, response.rows);
+        //         this.total = response.total;
+        //     }).catch(err => {
+        //         this.loading = false;
+        //     })
+        // },
+
+
+        // 搜索按钮
+        handleQuery() {
+            this.getList();
+        },
 
 
+        // 重置按钮
+        resetQuery() {
+            this.queryForm = {
+
+                pageNum: 1,
+                pageSize: 10
+            };
+            this.resetForm("queryForm");
+            this.handleQuery();
+        },
+
+        // 重置
+        reset() {
+            this.postForm = {
+
+            }
+            this.resetForm('postForm');
+        },
+
+        // 取消按钮
+        cancel() {
+            this.open = false;
+            this.openLook = false;
+            this.reset();
+            this.resetForm('postForm');
+        },
+        // 导出
+        handleExport() {
+            this.download('/departmentBudgetProjectmx/export', {
+                ...this.queryParams
+            }, `科室预算查看_${Date.now()}.xlsx`)
+        }
+
+
+
+
+
+
+
+
+    }
 }
 }
 </script>
 </script>
 
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
\ No newline at end of file
+::v-deep .inline-table .cell {
+    padding: 0;
+}
+
+.title {
+    font-size: 20px;
+    text-align: center;
+}
+
+
+</style>

ruoyi-ui/src/views/smartSchool/logisticsManage/repairReport/index copy.vue

@@ -320,7 +320,6 @@
 
 
 
 
         <!--反馈结果对话框 -->
         <!--反馈结果对话框 -->
-
         <el-dialog :title="title" :visible.sync="openfk" width="1100px" append-to-body @close="cancel">
         <el-dialog :title="title" :visible.sync="openfk" width="1100px" append-to-body @close="cancel">
             <el-form ref="formfk" :model="formfk" :rules="rules" label-width="100px">
             <el-form ref="formfk" :model="formfk" :rules="rules" label-width="100px">
                 <el-form-item label="报修单号" prop="id">
                 <el-form-item label="报修单号" prop="id">