Skip to content

D
dd_school
Commit c431cc52 by zhaopanyu
Options

zpy 10.31

parent b17d2ea4
Showing with 176 additions and 237 deletions
ruoyi-ui/src/api/smartSchool/laboratoryManagement/gradeExperimentapp.js
...@@ -9,12 +9,13 @@ export function getLabClassYear(query) { ...@@ -9,12 +9,13 @@ export function getLabClassYear(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",
}); });
} }
// 分配实验室 // 分配实验室
export function getAllocationLab(data) { export function getAllocationLab(data) {
return request({ return request({
......
ruoyi-ui/src/views/smartSchool/examinationManage/examManage/components/registeProcess.vue
...@@ -9,10 +9,10 @@ ...@@ -9,10 +9,10 @@
<InfoReview ref="InfoReview" :examId="id" @sendStatus="sendStatus"></InfoReview> <InfoReview ref="InfoReview" :examId="id" @sendStatus="sendStatus"></InfoReview>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="考场分配" :disabled="disable2" name="2"> <el-tab-pane label="考场分配" :disabled="disable2" name="2">
<examRoomAllocate ref="examRoomAllocate" :examId="id" @sendStatus="sendStatus"/> <examRoomAllocate ref="examRoomAllocate" :examId="id" @sendStatus="sendStatus" />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="成绩管理" :disabled="disable3" name="3"> <el-tab-pane label="成绩管理" :disabled="disable3" name="3">
<scoreManage ref="scoreManage" :examId="id" @sendStatus="sendStatus"/> <scoreManage ref="scoreManage" :examId="id" @sendStatus="sendStatus" />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="返回列表" name="4"> <el-tab-pane label="返回列表" name="4">
</el-tab-pane> </el-tab-pane>
...@@ -120,7 +120,8 @@ export default { ...@@ -120,7 +120,8 @@ export default {
// this.$router.go(-1) // this.$router.go(-1)
this.$store.dispatch("tagsView/delView", this.$route); this.$store.dispatch("tagsView/delView", this.$route);
this.$router.replace({ this.$router.replace({
path: '/exam/examManage', }) path: '/teachAffairAdministration/exam/examManage',
})
} }
}, },
......
ruoyi-ui/src/views/smartSchool/gradeWork/laboratoryManagement/experimentalPlan/index.vue
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
<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="请选择" :disabled="nowType === 2" clearable <el-select v-model="form.sub" placeholder="请选择" :disabled="nowType === 2" clearable
@change="onGradeChange" style="width: 100%;"> style="width: 100%;">
<el-option v-for="(item, index) in subList" :key="index" :label="item.dictLabel" <el-option v-for="(item, index) in subList" :key="index" :label="item.dictLabel"
:value="item.dictValue"></el-option> :value="item.dictValue"></el-option>
</el-select> </el-select>
...@@ -326,22 +326,20 @@ export default { ...@@ -326,22 +326,20 @@ export default {
//选择级部自动获取年级 //选择级部自动获取年级
onGradeChange() { onGradeChange() {
const selectedGrade = this.gradeList.find(grade => grade.id === this.form.gradeId); const selectedGrade = this.gradeList.find(grade => grade.id === this.form.gradeId);
if (selectedGrade) { this.classList = []; // 清空班级列表
const gradeValue = selectedGrade.gradeValue; getClass(selectedGrade.id).then(response => {
console.log('selectedGrade', selectedGrade); this.loading = false;
if (gradeValue === 1) { this.classList = response.data;
console.log('gradeValue', gradeValue); if (selectedGrade.gradeValue == 1) {
this.form.classId = this.classList.map(classItem => classItem.classId); // 默认选中所有班级的班级ID this.form.classId = this.classList.map(classItem => classItem.classId);
console.log('this.form.classId', this.form.classId); } else {
console.log('this.form.schoolExperimentPlanClassList', this.form.schoolExperimentPlanClassList); this.form.classId = []
} else if (gradeValue === 2 || gradeValue === 3) {
this.form.schoolExperimentPlanClassList = [];
console.log('gradeValue', gradeValue);
this.getClass(selectedGrade.id); // 获取班级列表
}
} }
});
}, },
//删除按钮操作 //删除按钮操作
handleDelete(id) { handleDelete(id) {
this.$confirm("此操作将永久删除该数据，是否继续？", '提示', { this.$confirm("此操作将永久删除该数据，是否继续？", '提示', {
......
ruoyi-ui/src/views/smartSchool/gradeWork/laboratoryManagement/laboratoryAppointment/index.vue
...@@ -118,16 +118,22 @@ ...@@ -118,16 +118,22 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="学科" prop="sub"> <el-form-item label="学科" prop="sub">
<el-input v-model="form.sub" placeholder="请输入" clearable <el-select v-model="form.sub" placeholder="请选择" :disabled="nowType === 2" clearable
:disabled="nowType === 1 || nowType === 2 || nowType === 0" /> style="width: 100%;">
<el-option v-for="dict in dict.type.lab_sub" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
</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="8"> <el-col :span="8">
<el-form-item label="实验分类" prop="experimentClassify"> <el-form-item label="实验分类" prop="experimentClassify">
<el-input v-model="form.experimentClassify" placeholder="请输入" clearable <el-select v-model="form.experimentClassify" placeholder="请选择" clearable style="width: 100%;"
:disabled="nowType === 1 || nowType === 2 || nowType === 0" /> :disabled="nowType === 2">
<el-option v-for="dict in dict.type.experiment_classify" :key="dict.value"
:label="dict.label" :value="dict.value" />
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
...@@ -261,7 +267,7 @@ export default { ...@@ -261,7 +267,7 @@ export default {
}, },
created() { created() {
this.getSchholyear(); this.getSchholyear();
this.getExperimentName();
}, },
methods: { methods: {
...@@ -276,13 +282,18 @@ export default { ...@@ -276,13 +282,18 @@ export default {
}, },
// 获取实验名称下拉框 // 获取实验名称下拉框
getExperimentName() { getExperimentName() {
getLabplanxlk().then(response => { // 在调用getLabplanxlk方法时，将当前学年和学期信息作为参数传递进去
const params = {
schoolYear: this.form.schoolYear,
semester: this.form.semester
};
getLabplanxlk(params).then(response => {
this.tableList = response.data; this.tableList = response.data;
console.log('this.tableList', this.tableList); console.log('this.tableList', this.tableList);
this.loading = false this.loading = false
}) })
}, },
//选择实验名称自动带出信息 //选择实验名称自动带出信息
getName() { getName() {
const selectedExperiment = this.tableList.find(experiment => experiment.experimentName === this.form.experimentName); const selectedExperiment = this.tableList.find(experiment => experiment.experimentName === this.form.experimentName);
...@@ -318,6 +329,7 @@ export default { ...@@ -318,6 +329,7 @@ export default {
// 在获取到学年和学期后，调用getList方法进行表单查询 // 在获取到学年和学期后，调用getList方法进行表单查询
this.getList(); this.getList();
this.getExperimentName();
}); });
}, },
...@@ -362,6 +374,7 @@ export default { ...@@ -362,6 +374,7 @@ export default {
} }
this.nowType = type; this.nowType = type;
this.getSchholyear(); this.getSchholyear();
this.getExperimentName();
if (type != 0) { if (type != 0) {
if (row && row.id) { if (row && row.id) {
const id = row.id; const id = row.id;
......
ruoyi-ui/src/views/smartSchool/laboratoryManagement/laboratoryManagements/experimentalPlan/index.vue
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="实验名称"> <el-form-item label="实验名称">
<el-input v-model="queryForm.grade" placeholder="请输入实验名称" clearable></el-input> <el-input v-model="queryForm.experimentName" placeholder="请输入实验名称" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item label="实验分类"> <el-form-item label="实验分类">
<el-select v-model="queryForm.experimentClassify" placeholder="请选择" clearable> <el-select v-model="queryForm.experimentClassify" placeholder="请选择" clearable>
......
ruoyi-ui/src/views/smartSchool/laboratoryManagement/laboratoryManagements/gradeExperimentapp/index.vue
...@@ -105,8 +105,6 @@ ...@@ -105,8 +105,6 @@
</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="级部">
...@@ -170,57 +168,52 @@ ...@@ -170,57 +168,52 @@
<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>
</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="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>
</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="isEdit"></el-input> :disabled="isEdits"></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="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>
...@@ -311,6 +304,7 @@ export default { ...@@ -311,6 +304,7 @@ export default {
], ],
isEdit: false, isEdit: false,
isEdits: false,
postForm: { postForm: {
applyName: '', applyName: '',
experimentClassify: '', experimentClassify: '',
...@@ -391,29 +385,39 @@ export default { ...@@ -391,29 +385,39 @@ 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).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.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 数组，将已选择的实验室信息存储在对应实验室对象中
this.labs = labs.map(lab => {
const selectedLab = selectedLabInfo.find(selectedLab => selectedLab.labId === lab.labId);
if (selectedLab) {
lab.selectedLabInfo = selectedLab;
}
return lab;
});
this.isEdits = true;
this.loading = false; this.loading = false;
}); });
}); });
this.dialogTableVisible = true; this.dialogTableVisible = true;
}, },
...@@ -429,7 +433,7 @@ export default { ...@@ -429,7 +433,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;
...@@ -478,7 +482,7 @@ export default { ...@@ -478,7 +482,7 @@ export default {
getAllocationLab(params).then(response => { getAllocationLab(params).then(response => {
this.$modal.msgSuccess('保存成功'); this.$modal.msgSuccess('保存成功');
this.open = false; this.dialogTableVisible = false;
this.getList(); this.getList();
}); });
} }
...@@ -498,7 +502,7 @@ export default { ...@@ -498,7 +502,7 @@ export default {
plannedEndTime: this.postForm.plannedEndTime, plannedEndTime: this.postForm.plannedEndTime,
experimentUseGoods: this.postForm.experimentUseGoods, experimentUseGoods: this.postForm.experimentUseGoods,
declareState: '3', declareState: '3',
schoolLabClassYearRelationList: [], schoolLabClassYearRelationList: labs,
}; };
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;
...@@ -510,7 +514,7 @@ export default { ...@@ -510,7 +514,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.open = false; this.dialogTableVisible = false;
this.getList(); this.getList();
}); });
} }
......
ruoyi-ui/src/views/smartSchool/laboratoryManagement/laboratoryManagements/laboratoryManagementlist/index.vue
...@@ -169,9 +169,9 @@ import { ...@@ -169,9 +169,9 @@ import {
getSchoolLabxq, getSchoolLabxq,
getClassDetails getClassDetails
} from '@/api/smartSchool/laboratoryManagement/laboratoryManagementlist' } from '@/api/smartSchool/laboratoryManagement/laboratoryManagementlist'
import { // import {
getGrade, // getGrade,
} from '@/api/smartSchool/gradeWork/laboratoryManagement/experimentalPlan' // } from '@/api/smartSchool/gradeWork/laboratoryManagement/experimentalPlan'
export default { export default {
name: 'index', name: 'index',
dicts: ['lab_state', 'lab_sub', 'experiment_classify',], dicts: ['lab_state', 'lab_sub', 'experiment_classify',],
...@@ -248,7 +248,7 @@ export default { ...@@ -248,7 +248,7 @@ export default {
}, },
created() { created() {
this.getList(); this.getList();
this.getGrade(); // this.getGrade();
this.getListtc(); this.getListtc();
}, },
methods: { methods: {
...@@ -274,14 +274,14 @@ export default { ...@@ -274,14 +274,14 @@ export default {
}); });
}, },
//查询级部 //查询级部
getGrade() { // getGrade() {
getGrade().then(response => { // getGrade().then(response => {
this.loading = false; // this.loading = false;
this.gradeList = response.data; // this.gradeList = response.data;
console.log("this.gradeList", this.gradeList); // console.log("this.gradeList", this.gradeList);
}); // });
}, // },
//弹窗搜索 //弹窗搜索
......
ruoyi-ui/src/views/smartSchool/officialWork/purchaseApply/index.vue
...@@ -64,13 +64,13 @@ ...@@ -64,13 +64,13 @@
<ExPagination v-show="total > 0" :total="total" :limit.sync="queryParams.pageSize" :page.sync="queryParams.pageNum" <ExPagination v-show="total > 0" :total="total" :limit.sync="queryParams.pageSize" :page.sync="queryParams.pageNum"
@pagination="getList"></ExPagination> @pagination="getList"></ExPagination>
<!-- 新增或修改采购对话框 --> <!-- 新增或修改采购对话框 -->
<el-dialog :title="title" :visible.sync="openForPur" width="55%" @close="refreshValidate"> <el-dialog :title="title" :visible.sync="openForPur" width="1000px" @close="refreshValidate">
<!-- <div> --> <!-- <div> -->
<el-form ref="formPur" :model="formPur" :disabled="formPurDisable" :rules="rules" label-width="120px" inline> <el-form ref="formPur" :model="formPur" :disabled="formPurDisable" :rules="rules" label-width="110px" inline>
<el-row> <el-row>
<el-col :span="22"> <el-col :span="22">
<el-form-item label="标题" prop="purchaseName"> <el-form-item label="标题" prop="purchaseName">
<el-input v-model="formPur.purchaseName" placeholder="请输入采购申请标题" clearable style="width: 615px"></el-input> <el-input v-model="formPur.purchaseName" placeholder="请输入采购申请标题" clearable style="width: 608px"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -79,20 +79,20 @@ ...@@ -79,20 +79,20 @@
<el-form-item label="申请部门" prop="deptId"> <el-form-item label="申请部门" prop="deptId">
<Treeselect :disabled="formPurDisable" v-model="formPur.deptId" @select="deptIdAndName" <Treeselect :disabled="formPurDisable" v-model="formPur.deptId" @select="deptIdAndName"
:options="deptOptions" :show-count="true" placeholder="请选择归属部门" :defaultExpandLevel=1 :options="deptOptions" :show-count="true" placeholder="请选择归属部门" :defaultExpandLevel=1
style="width: 193px" /> style="width: 208px" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="10"> <el-col :span="10">
<el-form-item label="期望日期" prop="expectedDate"> <el-form-item label="期望日期" prop="expectedDate">
<el-date-picker v-model="formPur.expectedDate" placeholder="请选择期望日期" clearable value-format="yyyy-MM-dd" <el-date-picker v-model="formPur.expectedDate" placeholder="请选择期望日期" clearable value-format="yyyy-MM-dd"
style="width: 193px"></el-date-picker> style="width: 208px"></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="10"> <el-col :span="10">
<el-form-item label="批复项目" prop="budgetId"> <el-form-item label="批复项目" prop="budgetId">
<el-select v-model="formPur.budgetId" @change="getBudgetName" placeholder="请选择批复项目" style="width: 100%"> <el-select v-model="formPur.budgetId" @change="getBudgetName" placeholder="请选择批复项目" style="width: 208px">
<el-option v-for="item in budgetList" :key="item.id" :label="item.budgetName" <el-option v-for="item in budgetList" :key="item.id" :label="item.budgetName"
:value="item.id"></el-option> :value="item.id"></el-option>
</el-select> </el-select>
...@@ -100,21 +100,21 @@ ...@@ -100,21 +100,21 @@
</el-col> </el-col>
<el-col :span="10"> <el-col :span="10">
<el-form-item label="采购金额(元)" prop="purchaseMoney"> <el-form-item label="采购金额(元)" prop="purchaseMoney">
<el-input :value="purchaseMoney" readonly clearable></el-input> <el-input :value="purchaseMoney" readonly clearable style="width: 208px"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="10"> <el-col :span="10">
<el-form-item label="分管处室领导" prop="handUserName1"> <el-form-item label="分管处室领导" prop="handUserName1">
<el-input placeholder="请选择分管领导" v-model="formPur.handUserName1" clearable <el-input placeholder="请选择分管领导" v-model="formPur.handUserName1" clearable @click.native="selectBoss1(1)"
@click.native="selectBoss1(1)"></el-input> style="width: 208px"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="10"> <el-col :span="10">
<el-form-item label="财务领导" prop="handUserName2"> <el-form-item label="财务领导" prop="handUserName2">
<el-input placeholder="请选择财务领导" v-model="formPur.handUserName2" clearable <el-input placeholder="请选择财务领导" v-model="formPur.handUserName2" clearable @click.native="selectBoss1(2)"
@click.native="selectBoss1(2)"></el-input> style="width: 208px"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
<el-col :span="22"> <el-col :span="22">
<el-form-item label="采购说明"> <el-form-item label="采购说明">
<el-input type="textarea" v-model="formPur.remark" placeholder="请输入采购说明" clearable <el-input type="textarea" v-model="formPur.remark" placeholder="请输入采购说明" clearable
style="width: 615px"></el-input> style="width: 208px"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
......
ruoyi-ui/src/views/smartSchool/othersManage/conferenceManage/conferenceInformation/components/selectArea.vue
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
size="small" size="small"
row-key="id" row-key="id"
highlight-current-row highlight-current-row
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"> :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
@row-click="handleCurrentChange" @row-click="handleCurrentChange"
@selection-change="select" @selection-change="select"
@select-all="selectAll" @select-all="selectAll"
......
ruoyi-ui/src/views/smartSchool/othersManage/schoolResources/schoolResourcesBase/index.vue
...@@ -3,12 +3,7 @@ ...@@ -3,12 +3,7 @@
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px" <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"
@submit.native.prevent> @submit.native.prevent>
<el-form-item label="资源名称" prop="name"> <el-form-item label="资源名称" prop="name">
<el-input <el-input v-model="queryParams.name" placeholder="请输入资源名称" clearable @keyup.enter.native="handleQuery" />
v-model="queryParams.name"
placeholder="请输入资源名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
...@@ -18,96 +13,55 @@ ...@@ -18,96 +13,55 @@
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
type="primary" v-hasPermi="['system:resources:add']">新增
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['system:resources:add']"
>新增
</el-button> </el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
type="success" v-hasPermi="['system:resources:edit']">修改
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:resources:edit']"
>修改
</el-button> </el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
type="danger" v-hasPermi="['system:resources:remove']">删除
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:resources:remove']"
>删除
</el-button> </el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
type="warning" v-hasPermi="['system:resources:export']">导出
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['system:resources:export']"
>导出
</el-button> </el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="resourcesList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="resourcesList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center"/> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="资源名称" align="center" prop="name"> <el-table-column label="资源名称" align="center" prop="name">
<template slot-scope="scope"> <!-- <template slot-scope="scope">
<el-link type="primary" :underline="false" @click="handleClick(scope.row)">{{ scope.row.name }}</el-link> <el-link type="primary" :underline="false" @click="handleClick(scope.row)">{{ scope.row.name }}</el-link>
</template> </template> -->
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
size="mini" v-hasPermi="['system:resources:edit']">修改
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:resources:edit']"
>修改
</el-button> </el-button>
<el-button <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
size="mini" v-hasPermi="['system:resources:remove']">删除
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:resources:remove']"
>删除
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<ExPagination <ExPagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
v-show="total>0" @pagination="getList" />
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改学校资源库对话框 --> <!-- 添加或修改学校资源库对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px" @submit.native.prevent> <el-form ref="form" :model="form" :rules="rules" label-width="80px" @submit.native.prevent>
<el-form-item label="资源名称" prop="name"> <el-form-item label="资源名称" prop="name">
<el-input v-model="form.name" placeholder="请输入资源名称"/> <el-input v-model="form.name" placeholder="请输入资源名称" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
...@@ -127,7 +81,7 @@ import { ...@@ -127,7 +81,7 @@ import {
editResource editResource
} from "@/api/smartSchool/schoolResources/resource"; } from "@/api/smartSchool/schoolResources/resource";
import {getInfo as getDetailInfo} from '@/api/smartSchool/schoolResources/resourceInfo'; import { getInfo as getDetailInfo } from '@/api/smartSchool/schoolResources/resourceInfo';
export default { export default {
name: "Resourcesbase", name: "Resourcesbase",
...@@ -162,7 +116,7 @@ export default { ...@@ -162,7 +116,7 @@ export default {
// 表单校验 // 表单校验
rules: { rules: {
name: [ name: [
{required: true, message: "资源名称不能为空", trigger: "blur"} { required: true, message: "资源名称不能为空", trigger: "blur" }
], ],
} }
}; };
...@@ -284,7 +238,7 @@ export default { ...@@ -284,7 +238,7 @@ export default {
}, },
/** 点击资源名称 */ /** 点击资源名称 */
handleClick({id}) { handleClick({ id }) {
this.$router.push({ this.$router.push({
path: '/resource/resource-details/' + id, path: '/resource/resource-details/' + id,
query: { query: {
......
ruoyi-ui/src/views/smartSchool/teachAffairAdministration/affairGradeManage/gradeMemberList/index.vue
...@@ -2,28 +2,13 @@ ...@@ -2,28 +2,13 @@
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="教师姓名" prop="teacherName"> <el-form-item label="教师姓名" prop="teacherName">
<el-input <el-input v-model="queryParams.teacherName" @keyup.enter.native="handleQuery" placeholder="请输入教师姓名" clearable />
v-model="queryParams.teacherName"
@keyup.enter.native="handleQuery"
placeholder="请输入教师姓名"
clearable
/>
</el-form-item> </el-form-item>
<el-form-item label="工号" prop="teacherCode"> <el-form-item label="工号" prop="teacherCode">
<el-input <el-input v-model="queryParams.teacherCode" placeholder="请输入工号" clearable @keyup.enter.native="handleQuery" />
v-model="queryParams.teacherCode"
placeholder="请输入工号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="职务" prop="teacherPost"> <el-form-item label="职务" prop="teacherPost">
<el-input <el-input v-model="queryParams.teacherPost" placeholder="请输入职务" clearable @keyup.enter.native="handleQuery" />
v-model="queryParams.teacherPost"
placeholder="请输入职务"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
...@@ -33,38 +18,18 @@ ...@@ -33,38 +18,18 @@
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
type="primary" v-hasPermi="['system:mentor:add']"> 新 增
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['system:mentor:add']"
> 新 增
</el-button> </el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
type="success" v-hasPermi="['system:mentor:edit']"> 修 改
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:mentor:edit']"
> 修 改
</el-button> </el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
type="danger" v-hasPermi="['system:mentor:remove']"> 删 除
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:mentor:remove']"
> 删 除
</el-button> </el-button>
</el-col> </el-col>
<!-- <el-col :span="1.5">--> <!-- <el-col :span="1.5">-->
...@@ -82,64 +47,59 @@ ...@@ -82,64 +47,59 @@
</el-row> </el-row>
<el-table v-loading="loading" :data="mentorList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="mentorList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center"/> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="照片" align="center"> <el-table-column label="照片" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<ListImage :image-url="baseUrl + scope.row.picUrl"></ListImage> <ListImage :image-url="baseUrl + scope.row.picUrl"></ListImage>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="姓名" align="center" prop="teacherName"/> <el-table-column label="姓名" align="center" prop="teacherName" />
<el-table-column label="工号" align="center" prop="teacherCode"/> <el-table-column label="工号" align="center" prop="teacherCode" />
<el-table-column label="职务" align="center" prop="teacherPost"/> <el-table-column label="类型" align="center" prop="type">
<el-table-column label="电话号码" align="center" prop="teacherTel"/> <template slot-scope="scope">
<dict-tag :options="dict.type.grade_mentor_type" :value="scope.row.type" />
</template>
</el-table-column>
<el-table-column label="职务" align="center" prop="teacherPost" />
<el-table-column label="学科组" align="center" prop="subGroup">
<template slot-scope="scope">
<dict-tag :options="dict.type.sub_group" :value="scope.row.subGroup" />
</template>
</el-table-column>
<el-table-column label="电话号码" align="center" prop="teacherTel" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
size="mini" v-hasPermi="['system:mentor:edit']">修改
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:mentor:edit']"
>修改
</el-button> </el-button>
<el-button <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
size="mini" v-hasPermi="['system:mentor:remove']">删除
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:mentor:remove']"
>删除
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
v-show="total>0" @pagination="getList" />
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!--选择老师--> <!--选择老师-->
<TeacherSelect <TeacherSelect v-if="teacherSelectDialog" :openSelect.sync="teacherSelectDialog" :title="teacherSelect"
v-if="teacherSelectDialog" @getTeacherList="getTeacherList" @setTeacherInfo="setTeacherInfo"></TeacherSelect>
:openSelect.sync="teacherSelectDialog"
:title="teacherSelect"
@getTeacherList="getTeacherList"
@setTeacherInfo="setTeacherInfo"
></TeacherSelect>
<!-- 添加或修改老师与班级关系对话框 --> <!-- 添加或修改老师与班级关系对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="教师姓名" prop="teacherName"> <el-form-item label="教师姓名" prop="teacherName">
<el-input :disabled="disableTeacherName" v-model="form.teacherName" @click.native="openTeacherSelect" <el-input :disabled="disableTeacherName" v-model="form.teacherName" @click.native="openTeacherSelect"
placeholder="请输入教师姓名"/> placeholder="请输入教师姓名" />
</el-form-item> </el-form-item>
<el-form-item label="职务" prop="teacherPost"> <el-form-item label="职务" prop="teacherPost">
<el-input v-model="form.teacherPost" placeholder="请输入职务"/> <el-input v-model="form.teacherPost" placeholder="请输入职务" />
</el-form-item>
<el-form-item label="学科组" prop="subGroup">
<el-select v-model="form.subGroup" placeholder="请输入学科组" clearable style="width: 100%;">
<el-option v-for="(item, index) in dict.type.sub_group" :key="index" :label="item.label"
:value="item.value"></el-option>
</el-select>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
...@@ -159,11 +119,12 @@ import { ...@@ -159,11 +119,12 @@ import {
updateMentor updateMentor
} from '@/api/smartSchool/teachAffairAdministration/affairClassManage/gradeMememberList'; } from '@/api/smartSchool/teachAffairAdministration/affairClassManage/gradeMememberList';
import TeacherSelect from '@/views/components/moduleComponets/TeacherSelect/index.vue' import TeacherSelect from '@/views/components/moduleComponets/TeacherSelect/index.vue'
import {listInform} from "@/api/smartSchool/teacherManage/teacherInformation"; import { listInform } from "@/api/smartSchool/teacherManage/teacherInformation";
export default { export default {
name: "gradeMemberList", name: "gradeMemberList",
components: {TeacherSelect}, dicts: ['grade_mentor_type', 'sub_group'],
components: { TeacherSelect },
data() { data() {
return { return {
// 头像显示前缀 // 头像显示前缀
...@@ -205,7 +166,7 @@ export default { ...@@ -205,7 +166,7 @@ export default {
// 表单校验 // 表单校验
rules: { rules: {
delFlag: [ delFlag: [
{required: true, message: "$comment不能为空", trigger: "blur"} { required: true, message: "$comment不能为空", trigger: "blur" }
], ],
} }
}; };
......
ruoyi-ui/src/views/smartSchool/venueReservation/useRecordingroom/index.vue
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<el-date-picker size="small" type="date" v-model="endTime" disabled> <el-date-picker size="small" type="date" v-model="endTime" disabled>
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item prop="studioId" :rules="[{ required: true, message: '请选择录播室', trigger: 'change,blur' }]"> <el-form-item prop="studioName" :rules="[{ required: true, message: '请选择录播室', trigger: 'change,blur' }]">
<el-select @change="changeStudio" v-model="queryParams.studioId" placeholder="录播室"> <el-select @change="changeStudio" v-model="queryParams.studioId" placeholder="录播室">
<el-option v-for="item in options" :key="item.id" :label="item.studioName" :value="item.id"> <el-option v-for="item in options" :key="item.id" :label="item.studioName" :value="item.id">
</el-option> </el-option>
...@@ -214,6 +214,13 @@ export default { ...@@ -214,6 +214,13 @@ export default {
getAppointmentList({}).then((res) => { getAppointmentList({}).then((res) => {
this.options = res.rows; this.options = res.rows;
console.log('res', res) console.log('res', res)
if (this.options.length > 0) {
// 默认选中第一个录播室
this.queryParams.studioId = this.options[0].id;
// 立即执行搜索表单
this.fetchStudioUseData();
}
}); });
}, },
......
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