zpy 11.10

ruoyi-ui/src/api/smartSchool/classTeacherWork/laboratoryManagement/personalLaboratoryapp.js

@@ -70,3 +70,10 @@ export function getResult(data) {
     data,
     data,
   });
   });
 }
 }
+//获取科目
+export function getSub() {
+  return request({
+    url: "schoolTeacherExperimentApply/getSubject",
+    method: "get",
+  });
+}

ruoyi-ui/src/views/smartSchool/classTeacherWork/laboratoryManagement/personalLaboratoryapp/index.vue

@@ -89,9 +89,9 @@
                 <el-row :gutter="30">
                 <el-row :gutter="30">
                     <el-col :span="10">
                     <el-col :span="10">
                         <el-form-item label="学科" prop="sub">
                         <el-form-item label="学科" prop="sub">
-                            <el-select v-model="form.sub" placeholder="请选择" clearable style="width: 100%;">
-                                <el-option v-for="dict in dict.type.lab_sub" :key="dict.value" :label="dict.label"
-                                    :value="dict.value" />
+                            <el-select v-model="form.sub" placeholder="请选择" clearable :style="{ width: '100%' }">
+                                <el-option v-for="(item, index) in subList" :key="index" :label="item.subName"
+                                    :value="item.sub"></el-option>
                             </el-select>
                             </el-select>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
@@ -173,6 +173,7 @@
 
 
             </div>
             </div>
         </el-dialog>
         </el-dialog>
+
         <!--查看弹窗 -->
         <!--查看弹窗 -->
         <el-dialog title="申请信息" :visible.sync="open" width="60%">
         <el-dialog title="申请信息" :visible.sync="open" width="60%">
             <el-form :model="form" ref="form" size="small" label-width="110px" :disabled="isEdit">
             <el-form :model="form" ref="form" size="small" label-width="110px" :disabled="isEdit">
@@ -294,6 +295,7 @@ import {
     getApplylist,// 查询个人实验申请列表
     getApplylist,// 查询个人实验申请列表
     getListxq,//查看详情
     getListxq,//查看详情
     getResult,//附件
     getResult,//附件
+    getSub,//获取科目
 } from '@/api/smartSchool/classTeacherWork/laboratoryManagement/personalLaboratoryapp';
 } from '@/api/smartSchool/classTeacherWork/laboratoryManagement/personalLaboratoryapp';
 import FileUploadlab from '@/components/FileUploadlab';
 import FileUploadlab from '@/components/FileUploadlab';
 import { getToken } from '@/utils/auth';
 import { getToken } from '@/utils/auth';
@@ -355,6 +357,8 @@ export default {
             //级部
             //级部
             gradeList: [],
             gradeList: [],
             gradeLists: [],
             gradeLists: [],
+            //科目
+            subList: [],
             total: 0,
             total: 0,
             postForm: {
             postForm: {
                 id: '',
                 id: '',
@@ -400,11 +404,11 @@ export default {
         this.getList();
         this.getList();
         this.getGradelist();
         this.getGradelist();
         this.getGrade();
         this.getGrade();
+        this.getSubiect();
 
 
 
 
     },
     },
     methods: {
     methods: {
-
         getList() {
         getList() {
             getApplylist(this.queryForm).then(response => {
             getApplylist(this.queryForm).then(response => {
                 this.tableData = response.rows;
                 this.tableData = response.rows;
@@ -518,6 +522,15 @@ export default {
 
 
 
 
         },
         },
+        //获取科目
+        getSubiect() {
+            getSub().then(response => {
+                this.subList = response.data;
+                console.log(this.subList, 'this.subList');
+            })
+
+
+        },
 
 
         //上传按钮
         //上传按钮
         getFileList(data) {
         getFileList(data) {