Skip to content

D
dd_school
Commit a1795a76 by xuwenhao
Options

Merge remote-tracking branch 'origin/master'

parents 504893a6 036a244f
Showing with 50 additions and 6 deletions
ruoyi-ui/src/api/smartSchool/classTeacherWork/laboratoryManagement/personalLaboratoryapp.js
...@@ -70,3 +70,10 @@ export function getResult(data) { ...@@ -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 @@ ...@@ -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-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" <el-option v-for="(item, index) in subList" :key="index" :label="item.subName"
:value="dict.value" /> :value="item.sub"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -173,6 +173,7 @@ ...@@ -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 { ...@@ -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 { ...@@ -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 { ...@@ -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 { ...@@ -518,6 +522,15 @@ export default {
}, },
//获取科目
getSubiect() {
getSub().then(response => {
this.subList = response.data;
console.log(this.subList, 'this.subList');
})
},
//上传按钮 //上传按钮
getFileList(data) { getFileList(data) {
......
ruoyi-ui/src/views/smartSchool/gradeWork/electronicRecord/index.vue
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
<template slot-scope="{ row }"> <template slot-scope="{ row }">
{{ {{
row.state == 1 row.state == 1
? "编辑" ? "未填写"
: row.state == 4 : row.state == 4
? "已提交" ? "已提交"
: row.state == 5 : row.state == 5
...@@ -120,7 +120,25 @@ ...@@ -120,7 +120,25 @@
align="center" align="center"
min-width="150" min-width="150"
prop="education" prop="education"
/> >
<template slot-scope="{ row }">
{{
row.education == 0
? "高中"
: row.education == 1
? "专科"
: row.education == 2
? "本科"
: row.education == 3
? "研究生"
: row.education == 4
? "硕士"
: row.education == 5
? "博士"
: ""
}}
</template>
</el-table-column>
<el-table-column <el-table-column
label="政治面貌" label="政治面貌"
align="center" align="center"
......
ruoyi-ui/src/views/smartSchool/personWork/electronicRecord/index.vue
...@@ -319,6 +319,8 @@ ...@@ -319,6 +319,8 @@
style="padding-right: 10px" style="padding-right: 10px"
> >
<el-input <el-input
type="number"
placeholder="请输入数字"
v-model="form.classHour" v-model="form.classHour"
:disabled="form.state == '4' ? true : false" :disabled="form.state == '4' ? true : false"
></el-input> ></el-input>
......
ruoyi-ui/src/views/smartSchool/teachAffairAdministration/electronicRecord/dataMaintenance.vue
...@@ -308,6 +308,7 @@ ...@@ -308,6 +308,7 @@
style="padding-right: 10px" style="padding-right: 10px"
> >
<el-input <el-input
type="number"
v-model="form.classHour" v-model="form.classHour"
:disabled="status == '7' ? true : false" :disabled="status == '7' ? true : false"
></el-input> ></el-input>
......
ruoyi-ui/src/views/smartSchool/teachAffairAdministration/electronicRecord/index.vue
...@@ -562,6 +562,9 @@ export default { ...@@ -562,6 +562,9 @@ export default {
elink.setAttribute("href", objectUrl); elink.setAttribute("href", objectUrl);
elink.setAttribute("download", "教师电子档案" + ".xls"); elink.setAttribute("download", "教师电子档案" + ".xls");
elink.click(); elink.click();
})
.then(() => {
this.$modal.closeLoading();
}); });
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment