Skip to content

D
dd_school
Commit ab3bdd77 by zhaopanyu
Options

zpy 10.31

parent 0fc5be64
Showing with 72 additions and 50 deletions
ruoyi-ui/src/api/smartSchool/laboratoryManagement/experimentApproval.js
...@@ -9,9 +9,9 @@ export function getTeacherList(query) { ...@@ -9,9 +9,9 @@ export function getTeacherList(query) {
}); });
} }
// 获取实验室 // 获取实验室
export function getLabList(plannedStartTime, plannedEndTime) { export function getLabList(plannedStartTime, plannedEndTime, sub) {
return request({ return request({
url: `/schoolLabClassYear/getLabList?plannedStartTime=${plannedStartTime}&plannedEndTime=${plannedEndTime}`, url: `/schoolLabClassYear/getLabList?plannedStartTime=${plannedStartTime}&plannedEndTime=${plannedEndTime}&sub=${sub}`,
method: "get", method: "get",
}); });
} }
......
ruoyi-ui/src/api/smartSchool/teacherFiles/teacherElectronicFile.js
...@@ -85,11 +85,13 @@ export function getNoticeInfo(query) { ...@@ -85,11 +85,13 @@ export function getNoticeInfo(query) {
} }
//老师查看列表 //老师查看列表
export function getTeacherTnfo(query) { export function getTeacherTnfo(userId) {
return request({ return request({
url: "/teacherFiles/files/getTeachList", url: `/teacherFiles/files/getTeachList/${userId}`,
method: "get", method: "get",
params: query, params: {
noticeName: noticeName,
},
}); });
} }
......
ruoyi-ui/src/views/smartSchool/laboratoryManagement/laboratoryManagements/experimentApproval/index.vue
...@@ -64,11 +64,12 @@ ...@@ -64,11 +64,12 @@
</el-table> </el-table>
<!-- 分配实验室弹窗 --> <!-- 分配实验室弹窗 -->
<el-dialog title="申请信息" :visible.sync="dialogTableVisible" width="75%"> <el-dialog title="申请信息" :visible.sync="dialogTableVisible" width="75%">
<el-form :model="form" ref="form" size="small" label-width="110px" > <el-form :model="form" ref="form" size="small" label-width="110px">
<el-row :gutter="30"> <el-row :gutter="30">
<el-col :span="8"> <el-col :span="8">
<el-form-item label="学科" prop="sub"> <el-form-item label="学科" prop="sub">
<el-select v-model="form.sub" placeholder="请选择" clearable style="width: 100%;" :disabled="isEdit"> <el-select v-model="form.sub" placeholder="请选择" clearable style="width: 100%;"
:disabled="isEdits">
<el-option v-for="dict in dict.type.lab_sub" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.lab_sub" :key="dict.value" :label="dict.label"
:value="dict.value" /> :value="dict.value" />
</el-select> </el-select>
...@@ -76,12 +77,13 @@ ...@@ -76,12 +77,13 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="实验名称"> <el-form-item label="实验名称">
<el-input v-model="form.experimentName" placeholder="请输入" clearable :disabled="isEdit"/> <el-input v-model="form.experimentName" placeholder="请输入" clearable :disabled="isEdits" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="实验分类" prop="experimentClassify"> <el-form-item label="实验分类" prop="experimentClassify">
<el-select v-model="form.experimentClassify" placeholder="请选择" clearable style="width: 100%;" :disabled="isEdit"> <el-select v-model="form.experimentClassify" placeholder="请选择" clearable style="width: 100%;"
:disabled="isEdits">
<el-option v-for="dict in dict.type.experiment_classify" :key="dict.value" <el-option v-for="dict in dict.type.experiment_classify" :key="dict.value"
:label="dict.label" :value="dict.value" /> :label="dict.label" :value="dict.value" />
</el-select> </el-select>
...@@ -91,12 +93,12 @@ ...@@ -91,12 +93,12 @@
<el-row :gutter="30"> <el-row :gutter="30">
<el-col :span="8"> <el-col :span="8">
<el-form-item label="学年"> <el-form-item label="学年">
<el-input v-model="form.schoolYear" placeholder="请输入" clearable :disabled="isEdit"/> <el-input v-model="form.schoolYear" placeholder="请输入" clearable :disabled="isEdits" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="学期"> <el-form-item label="学期">
<el-select v-model="form.semester" placeholder="请选择学期" style="width: 100%;" :disabled="isEdit"> <el-select v-model="form.semester" placeholder="请选择学期" style="width: 100%;" :disabled="isEdits">
<el-option label="上学期" value="1"></el-option> <el-option label="上学期" value="1"></el-option>
<el-option label="下学期" value="2"></el-option> <el-option label="下学期" value="2"></el-option>
</el-select> </el-select>
...@@ -104,7 +106,7 @@ ...@@ -104,7 +106,7 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="级部"> <el-form-item label="级部">
<el-input v-model="form.grade" placeholder="请输入" clearable :disabled="isEdit"/> <el-input v-model="form.grade" placeholder="请输入" clearable :disabled="isEdits" />
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -112,7 +114,7 @@ ...@@ -112,7 +114,7 @@
<el-row :gutter="30"> <el-row :gutter="30">
<el-col :span="8"> <el-col :span="8">
<el-form-item label="申请老师"> <el-form-item label="申请老师">
<el-input v-model="form.applyName" placeholder="请输入" clearable :disabled="isEdit" /> <el-input v-model="form.applyName" placeholder="请输入" clearable :disabled="isEdits" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
...@@ -134,7 +136,8 @@ ...@@ -134,7 +136,8 @@
<el-col :span="24"> <el-col :span="24">
<el-form-item label="实验室选择"> <el-form-item label="实验室选择">
<el-checkbox-group v-model="form.schoolTeacherExperimentApplyLabsList"> <el-checkbox-group v-model="form.schoolTeacherExperimentApplyLabsList">
<el-checkbox v-for="classItem in labs" :key="classItem.labId" :label="classItem.labId"> <el-checkbox v-for="classItem in labs" :key="classItem.labId" :label="classItem.labId"
>
{{ classItem.labName }}- {{ classItem.useState }} {{ classItem.labName }}- {{ classItem.useState }}
</el-checkbox> </el-checkbox>
</el-checkbox-group> </el-checkbox-group>
...@@ -282,6 +285,7 @@ export default { ...@@ -282,6 +285,7 @@ export default {
applyName: "", applyName: "",
grade: "", grade: "",
}, },
selectedLabs: [], // 已选择的实验室
//表格数据 //表格数据
tableData: [ tableData: [
...@@ -290,6 +294,7 @@ export default { ...@@ -290,6 +294,7 @@ export default {
}, },
isEdit: false, isEdit: false,
isEdits: false,
labs: [], labs: [],
schoolTeacherExperimentApplyLabsList: [], schoolTeacherExperimentApplyLabsList: [],
total: 0, total: 0,
...@@ -324,6 +329,7 @@ export default { ...@@ -324,6 +329,7 @@ export default {
handleAllocation(row) { handleAllocation(row) {
this.loading = true; this.loading = true;
const id = row.id || this.ids; const id = row.id || this.ids;
getTeacherapplyxq(id).then(response => { getTeacherapplyxq(id).then(response => {
this.form = response.data; this.form = response.data;
// 清空已经选择的实验室 // 清空已经选择的实验室
...@@ -332,27 +338,42 @@ export default { ...@@ -332,27 +338,42 @@ export default {
const labId = this.form.schoolTeacherExperimentApplyLabsList[i].labId; const labId = this.form.schoolTeacherExperimentApplyLabsList[i].labId;
this.selectedLabs.push(labId); this.selectedLabs.push(labId);
} }
// console.log('this.form', this.form);
this.form.applyName = response.data.applyName; this.form.schoolTeacherExperimentApplyLabsList = this.selectedLabs; // 仅将已经选择的实验室作为关联数据提交
this.form.experimentClassify = response.data.experimentClassify;
this.form.experimentName = response.data.experimentName;
this.form.sub = response.data.sub;
this.form.chapterContent = response.data.chapterContent;
this.form.grade = response.data.grade;
this.form.schoolYear = response.data.schoolYear;
this.form.experimentUseGoods = response.data.experimentUseGoods;
this.form.plannedStartTime = response.data.plannedStartTime;
this.form.plannedEndTime = response.data.plannedEndTime;
this.form.schoolLabClassYearRelationList = this.selectedLabs; // 仅将已经选择的实验室作为关联数据提交
this.loading = false; this.loading = false;
const plannedStartTime = this.form.plannedStartTime const plannedStartTime = this.form.plannedStartTime
const plannedEndTime = this.form.plannedEndTime const plannedEndTime = this.form.plannedEndTime
const sub = this.form.sub
getLabList(plannedStartTime, plannedEndTime).then(response => { getLabList(plannedStartTime, plannedEndTime, sub).then(response => {
const labs = response.data; const labs = response.data;
this.labs = labs.filter(lab => lab.useState === "空闲"); // 根据状态筛选出空闲的实验室 console.log(labs, 'qb');
// console.log(this.labs, 'this.labs'); const selectedLabs = this.form.schoolTeacherExperimentApplyLabsList; // 获取已选择的实验室列表
// 这里不再需要循环添加实验室关联数据 console.log(selectedLabs, 'xz');
// 将已选择的实验室信息存储在新的数组中
const selectedLabInfo = labs.filter(lab => {
const isSelected = selectedLabs.some(selectedLab => selectedLab.labId === lab.labId);
if (isSelected) {
lab.isSelected = true;
return true;
}
return false;
});
// 更新 labs 数组，将已选择的实验室信息存储在对应实验室对象中
this.labs = labs.map(lab => {
const selectedLab = selectedLabInfo.find(selectedLab => selectedLab.labId === lab.labId);
if (selectedLab) {
lab.selectedLabInfo = selectedLab;
}
return lab;
}).map(lab => {
if (lab.useState === '使用中') {
lab.isDisabled = true;
}
return lab;
})
this.isEdits = true;
this.loading = false; this.loading = false;
}); });
}); });
......
ruoyi-ui/src/views/smartSchool/laboratoryManagement/laboratoryManagements/gradeExperimentapp/index.vue
...@@ -170,13 +170,13 @@ ...@@ -170,13 +170,13 @@
<el-row :gutter="30"> <el-row :gutter="30">
<el-col :span="10"> <el-col :span="10">
<el-form-item label="申请老师"> <el-form-item label="申请老师">
<el-input v-model="postForm.applyName" placeholder="请输入" clearable :disabled="isEdit" /> <el-input v-model="postForm.applyName" placeholder="请输入" clearable :disabled="isEdits" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="10"> <el-col :span="10">
<el-form-item label="实验分类"> <el-form-item label="实验分类">
<el-select v-model="postForm.experimentClassify" placeholder="请选择" clearable <el-select v-model="postForm.experimentClassify" placeholder="请选择" clearable
style="width: 100%;" :disabled="isEdit"> style="width: 100%;" :disabled="isEdits">
<el-option v-for="dict in dict.type.experiment_classify" :key="dict.value" <el-option v-for="dict in dict.type.experiment_classify" :key="dict.value"
:label="dict.label" :value="dict.value" /> :label="dict.label" :value="dict.value" />
</el-select> </el-select>
...@@ -187,13 +187,13 @@ ...@@ -187,13 +187,13 @@
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="10"> <el-col :span="10">
<el-form-item label="实验名称"> <el-form-item label="实验名称">
<el-input v-model="postForm.experimentName" placeholder="请输入" clearable :disabled="isEdit" /> <el-input v-model="postForm.experimentName" placeholder="请输入" clearable :disabled="isEdits" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="10"> <el-col :span="10">
<el-form-item label="学科"> <el-form-item label="学科">
<el-select v-model="postForm.sub" placeholder="请选择" clearable style="width: 100%;" <el-select v-model="postForm.sub" placeholder="请选择" clearable style="width: 100%;"
:disabled="isEdit"> :disabled="isEdits">
<el-option v-for="dict in dict.type.lab_sub" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.lab_sub" :key="dict.value" :label="dict.label"
:value="dict.value" /> :value="dict.value" />
</el-select> </el-select>
...@@ -206,7 +206,7 @@ ...@@ -206,7 +206,7 @@
<el-col :span="20"> <el-col :span="20">
<el-form-item label="章节内容"> <el-form-item label="章节内容">
<el-input v-model="postForm.chapterContent" placeholder="请输入" clearable <el-input v-model="postForm.chapterContent" placeholder="请输入" clearable
:disabled="isEdit"></el-input> :disabled="isEdits"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -215,12 +215,12 @@ ...@@ -215,12 +215,12 @@
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="10"> <el-col :span="10">
<el-form-item label="级部"> <el-form-item label="级部">
<el-input v-model="postForm.grade" placeholder="请输入" clearable :disabled="isEdit" /> <el-input v-model="postForm.grade" placeholder="请输入" clearable :disabled="isEdits" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="10"> <el-col :span="10">
<el-form-item label="学年"> <el-form-item label="学年">
<el-input v-model="postForm.schoolYear" placeholder="请输入" clearable :disabled="isEdit" /> <el-input v-model="postForm.schoolYear" placeholder="请输入" clearable :disabled="isEdits" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -253,7 +253,7 @@ ...@@ -253,7 +253,7 @@
<el-form-item label="实验室选择"> <el-form-item label="实验室选择">
<el-checkbox-group v-model="postForm.schoolLabClassYearRelationList"> <el-checkbox-group v-model="postForm.schoolLabClassYearRelationList">
<el-checkbox v-for="classItem in labs" :key="classItem.labId" :label="classItem.labId" <el-checkbox v-for="classItem in labs" :key="classItem.labId" :label="classItem.labId"
:disabled="classItem.isDisabled"> >
{{ classItem.labName }}- {{ classItem.useState }} {{ classItem.labName }}- {{ classItem.useState }}
</el-checkbox> </el-checkbox>
</el-checkbox-group> </el-checkbox-group>
...@@ -312,6 +312,7 @@ export default { ...@@ -312,6 +312,7 @@ export default {
], ],
isEdit: false, isEdit: false,
isEdits: false,
postForm: { postForm: {
applyName: '', applyName: '',
experimentClassify: '', experimentClassify: '',
...@@ -382,7 +383,7 @@ export default { ...@@ -382,7 +383,7 @@ export default {
//分配实验室 //分配实验室
handleAllocation(row) { handleAllocation(row) {
this.loading = true; this.loading = true;
const id = row.id || this.ids; const id = row.id || this.ids;
getLabClassYearxq(id).then(response => { getLabClassYearxq(id).then(response => {
this.postForm = response.data; this.postForm = response.data;
......
ruoyi-ui/src/views/smartSchool/personWork/electronicRecord/index.vue
...@@ -324,18 +324,16 @@ export default { ...@@ -324,18 +324,16 @@ export default {
/** 查询信息列表 */ /** 查询信息列表 */
getList() { getList() {
this.loading = true; this.loading = true;
const params = { const userId = this.$store.state.user.userId;
userId: this.$store.state.user.userId, const noticeName = this.queryForm.noticeName;
noticeName: this.queryForm.noticeName, console.log(userId, 'userId');
}; console.log(noticeName, 'noticeName');
getTeacherTnfo(userId, noticeName).then((res) => {
getTeacherTnfo(params).then((res) => {
this.tableData = res.rows; this.tableData = res.rows;
// console.log(params, "params");
console.log(res, "res"); console.log(res, "res");
// this.total = res.total;
}); });
}, },
// 提取 ` // 提取 `
handleExtract() { handleExtract() {
const fid = this.form.fid; const fid = this.form.fid;
......
ruoyi-ui/src/views/smartSchool/schoolProperty/collectionLedger/index.vue
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="30"> <!-- <el-row :gutter="30">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="预计使用时间" prop="yjuseTime"> <el-form-item label="预计使用时间" prop="yjuseTime">
<el-date-picker v-model="collectionForm.yjuseTime" type="datetime" clearable class="selectWidth" <el-date-picker v-model="collectionForm.yjuseTime" type="datetime" clearable class="selectWidth"
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row> -->
<el-row :gutter="30"> <el-row :gutter="30">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
......
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