Skip to content

D
dd_school
Commit 8bf08967 by zhaopanyu
Options

zpy 10.31

parent a4b9d8f6
Showing with 35 additions and 40 deletions
ruoyi-ui/src/views/smartSchool/laboratoryManagement/laboratoryManagements/gradeExperimentapp/index.vue
...@@ -105,6 +105,8 @@ ...@@ -105,6 +105,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="10"> <el-col :span="10">
<el-form-item label="级部"> <el-form-item label="级部">
...@@ -168,52 +170,57 @@ ...@@ -168,52 +170,57 @@
<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="isEdits" /> <el-input v-model="postForm.applyName" placeholder="请输入" clearable :disabled="isEdit" />
</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="isEdits"> style="width: 100%;" :disabled="isEdit">
<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>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<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="isEdits" /> <el-input v-model="postForm.experimentName" placeholder="请输入" clearable :disabled="isEdit" />
</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="isEdits"> :disabled="isEdit">
<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>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<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="isEdits"></el-input> :disabled="isEdit"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<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="isEdits" /> <el-input v-model="postForm.grade" placeholder="请输入" clearable :disabled="isEdit" />
</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="isEdits" /> <el-input v-model="postForm.schoolYear" placeholder="请输入" clearable :disabled="isEdit" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -304,7 +311,6 @@ export default { ...@@ -304,7 +311,6 @@ export default {
], ],
isEdit: false, isEdit: false,
isEdits: false,
postForm: { postForm: {
applyName: '', applyName: '',
experimentClassify: '', experimentClassify: '',
...@@ -385,39 +391,29 @@ export default { ...@@ -385,39 +391,29 @@ export default {
const labId = this.postForm.schoolLabClassYearRelationList[i].labId; const labId = this.postForm.schoolLabClassYearRelationList[i].labId;
this.selectedLabs.push(labId); this.selectedLabs.push(labId);
} }
// console.log('this.form', this.form);
this.postForm.applyName = response.data.applyName;
this.postForm.experimentClassify = response.data.experimentClassify;
this.postForm.experimentName = response.data.experimentName;
this.postForm.sub = response.data.sub;
this.postForm.chapterContent = response.data.chapterContent;
this.postForm.grade = response.data.grade;
this.postForm.schoolYear = response.data.schoolYear;
this.postForm.experimentUseGoods = response.data.experimentUseGoods;
this.postForm.plannedStartTime = response.data.plannedStartTime;
this.postForm.plannedEndTime = response.data.plannedEndTime;
this.postForm.schoolLabClassYearRelationList = this.selectedLabs; // 仅将已经选择的实验室作为关联数据提交 this.postForm.schoolLabClassYearRelationList = this.selectedLabs; // 仅将已经选择的实验室作为关联数据提交
this.loading = false; this.loading = false;
const plannedStartTime = this.postForm.plannedStartTime const plannedStartTime = this.postForm.plannedStartTime
const plannedEndTime = this.postForm.plannedEndTime const plannedEndTime = this.postForm.plannedEndTime
const sub = this.postForm.sub
getLabList(plannedStartTime, plannedEndTime, sub).then(response => {
const labs = response.data;
console.log(labs, 'qb');
const selectedLabs = this.postForm.schoolLabClassYearRelationList; // 获取已选择的实验室列表
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 数组，将已选择的实验室信息存储在对应实验室对象中 getLabList(plannedStartTime, plannedEndTime).then(response => {
this.labs = labs.map(lab => { const labs = response.data;
const selectedLab = selectedLabInfo.find(selectedLab => selectedLab.labId === lab.labId); this.labs = labs.filter(lab => lab.useState === "空闲"); // 根据状态筛选出空闲的实验室
if (selectedLab) { // console.log(this.labs, 'this.labs');
lab.selectedLabInfo = selectedLab; // 这里不再需要循环添加实验室关联数据
}
return lab;
});
this.isEdits = true;
this.loading = false; this.loading = false;
}); });
}); });
this.dialogTableVisible = true; this.dialogTableVisible = true;
}, },
...@@ -433,7 +429,7 @@ export default { ...@@ -433,7 +429,7 @@ export default {
console.log('this.form.schoolLabClassYearRelationList', this.form.schoolLabClassYearRelationList); console.log('this.form.schoolLabClassYearRelationList', this.form.schoolLabClassYearRelationList);
} }
// this.form.schoolLabClassYearRelationList = []; this.form.schoolLabClassYearRelationList = [];
for (let i = 0; i < this.schoolLabClassYearRelationList.length; i++) { for (let i = 0; i < this.schoolLabClassYearRelationList.length; i++) {
const labId = this.schoolLabClassYearRelationList[i].labId; const labId = this.schoolLabClassYearRelationList[i].labId;
const labName = this.schoolLabClassYearRelationList[i].labName; const labName = this.schoolLabClassYearRelationList[i].labName;
...@@ -482,7 +478,7 @@ export default { ...@@ -482,7 +478,7 @@ export default {
getAllocationLab(params).then(response => { getAllocationLab(params).then(response => {
this.$modal.msgSuccess('保存成功'); this.$modal.msgSuccess('保存成功');
this.dialogTableVisible = false; this.open = false;
this.getList(); this.getList();
}); });
} }
...@@ -502,7 +498,7 @@ export default { ...@@ -502,7 +498,7 @@ export default {
plannedEndTime: this.postForm.plannedEndTime, plannedEndTime: this.postForm.plannedEndTime,
experimentUseGoods: this.postForm.experimentUseGoods, experimentUseGoods: this.postForm.experimentUseGoods,
declareState: '3', declareState: '3',
schoolLabClassYearRelationList: labs, schoolLabClassYearRelationList: [],
}; };
for (let i = 0; i < this.labs.length; i++) { for (let i = 0; i < this.labs.length; i++) {
const labId = this.labs[i].labId; const labId = this.labs[i].labId;
...@@ -514,7 +510,7 @@ export default { ...@@ -514,7 +510,7 @@ export default {
getAllocationLab(params).then(response => { getAllocationLab(params).then(response => {
console.log(params, params); console.log(params, params);
this.$modal.msgSuccess('提交成功'); this.$modal.msgSuccess('提交成功');
this.dialogTableVisible = false; this.open = false;
this.getList(); this.getList();
}); });
} }
...@@ -532,4 +528,4 @@ export default { ...@@ -532,4 +528,4 @@ export default {
} }
</script> </script>
<style lang="scss" scoped></style> <style lang="scss" scoped></style>
\ No newline at end of file
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