Skip to content

D
dd_school
Commit a021ae4e by zhaopanyu
Options

zpy 10.25

parent 882da7ea
Showing with 52 additions and 26 deletions
ruoyi-ui/src/views/smartSchool/personWork/recordingroomAppointment/IdleSituation/index.vue
......@@ -144,12 +144,18 @@ export default {
};
this.fetchStudioUseData(); // 重新发一次请求
},
// changeStudio(value) {
// console.log('value', value);
// console.log('this.queryParams.startTime', this.queryParams.startTime);
// this.queryParams.studioId = value;
// this.fetchStudioUseData();
// },
changeStudio(value) {
console.log('value', value);
console.log('this.queryParams.startTime', this.queryParams.startTime);
this.selectedTimeSlots = []; // 在切换录播室时清空已选时间段
this.queryParams.studioId = value;
this.fetchStudioUseData();
},
changeDate() {
this.endTime = moment(this.queryParams.startTime).add(9, 'days')
// this.fetchData();
......@@ -224,7 +230,7 @@ export default {
if (selectObj != undefined) {
this.remark = true
this.selectedTimeSlots = this.selectedTimeSlots.filter(item => item.index != index)
this.selectedTimeSlots.length == 0 ? this.remark = false : this.selectedTimeSlots
this.selectedTimeSlots.length === 0 ? this.remark = false : this.selectedTimeSlots
} else {
this.selectedTimeSlots.push({ day, index })
}
......
ruoyi-ui/src/views/smartSchool/schoolManage/schoolNotice/infoPush/components/receiveList.vue
......@@ -31,10 +31,10 @@
<!-- >新增-->
<!-- </el-button>-->
<!--</el-col>-->
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button type="danger" plain size="mini" icon="el-icon-delete" :disabled="!isMultiple" @click="handleDelete">删除
</el-button>
</el-col>
</el-col> -->
<el-col :span="1.5">
<el-button type="info" plain size="mini" icon="el-icon-close" @click="handleClose">关闭
</el-button>
......
ruoyi-ui/src/views/smartSchool/schoolManage/schoolNotice/infoPush/school/index.vue
......@@ -363,7 +363,7 @@ export default {
/** 提交按钮 */
submitForm() {
const groupId = this.form.groupId
this.form.group = groupId == '' ? '' : this.roleList.find(item => item.id == groupId).name
this.form.groupName = groupId == '' ? '' : this.roleList.find(item => item.id == groupId).name
console.log(this.form.borrowBy);
this.throttle(() => {
this.$refs["form"].validate(valid => {
......
ruoyi-ui/src/views/smartSchool/schoolManage/schoolNotice/personnelGrouping/authUser.vue
......@@ -78,8 +78,6 @@
</el-table>
<pagination v-show="totalcy > 0" :total="total" :page.sync="queryParam.pageNum" :limit.sync="queryParam.pageSize"
@pagination="getListcy" />
</el-row>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="handleSelectUser">确 定</el-button>
......@@ -167,7 +165,7 @@ export default {
this.notificationId = this.$route.query.id;
console.log('this..notificationId', this.notificationId);
getUser(this.notificationId).then(response => {
this.userList = response.rows;
this.userList = response.data;
console.log('this.userList', this.userList);
this.loading = false;
});
......
ruoyi-ui/src/views/smartSchool/teachAffairAdministration/affairClassManage/index.vue
......@@ -473,7 +473,7 @@ export default {
classValue: [{required: true, message: '班级不能为空', trigger: 'change'}],
teacherName: [{required: true, message: '班主任姓名不能为空', trigger: 'change'}],
teacherTel: [{required: true, message: '班主任手机号不能为空', trigger: 'change'}],
houseName: [{required: true, message: '所在教学楼不能为空', trigger: 'change'}],
// houseName: [{required: true, message: '所在教学楼不能为空', trigger: 'change'}],
classNum1: [{required: true, message: '高一班级数量不能为空', trigger: 'blur'}],
classNum2: [{required: true, message: '高二班级数量不能为空', trigger: 'blur'}],
classNum3: [{required: true, message: '高三班级数量不能为空', trigger: 'blur'}],
......
ruoyi-ui/src/views/smartSchool/teachAffairAdministration/statistics/age/index.vue
......@@ -3,7 +3,7 @@
<el-form :model="queryForm" ref="queryForm" size="small" :inline="true" label-width="70px">
<el-form-item label="学年" prop="classYear">
<el-date-picker v-model="queryForm.classYear" type="year" @change="getList" format="yyyy" value-format="yyyy"
placeholder="选择年度"></el-date-picker>
placeholder="选择年度" :clearable="false"></el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
......@@ -155,7 +155,7 @@ export default {
newYear() {
getNewYear().then((res) => {
//数值类型转换成字符串
this.queryForm.classYear = res.schoolYear + '' ;
this.queryForm.classYear = res.schoolYear + '';
console.log('this.queryForm.classYear', typeof this.queryForm.classYear);
this.getList();
});
......
ruoyi-ui/src/views/smartSchool/teacherManage/teacherInforManage/components/Resume.vue
......@@ -47,10 +47,8 @@
<el-table-column type="selection" align="center" width="55" />
<el-table-column label="序号" type="index" align="center" width="55" />
<el-table-column label="学校/工作单位" width="width" align="center" prop="learnSchool" />
<el-table-column label="履历开始时间" :formatter="dateFormat" width="width" align="center"
prop="learnStart"></el-table-column>
<el-table-column label="履历结束时间" :formatter="dateFormat" width="width" align="center"
prop="learnEnd"></el-table-column>
<el-table-column label="履历开始时间" width="width" align="center" prop="learnStart"></el-table-column>
<el-table-column label="履历结束时间" width="width" align="center" prop="learnEnd"></el-table-column>
<el-table-column label="备注" width="width" align="center" prop="remark" />
</el-table>
<ExPagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
......@@ -64,12 +62,12 @@
<el-input v-model="resumeForm.learnSchool" clearable style="width: 100%" />
</el-form-item>
<el-form-item label="履历开始时间" prop="learnStart">
<el-date-picker v-model="resumeForm.learnStart" type="date" style="width: 100%"
placeholder="履历开始时间"></el-date-picker>
<el-date-picker v-model="resumeForm.learnStart" type="date" style="width: 100%" placeholder="履历开始时间"
value-format="yyyy-MM-dd"></el-date-picker>
</el-form-item>
<el-form-item label="履历结束时间" clearable prop="learnEnd">
<el-date-picker v-model="resumeForm.learnEnd" type="date" style="width: 100%"
placeholder="履历结束时间"></el-date-picker>
<el-date-picker v-model="resumeForm.learnEnd" type="date" style="width: 100%" placeholder="履历结束时间"
value-format="yyyy-MM-dd"></el-date-picker>
</el-form-item>
<el-form-item label="备注" clearable prop="remark">
<el-input type="textarea" :rows="3" style="width: 100%" v-model="resumeForm.remark" clearable />
......
ruoyi-ui/src/views/smartSchool/teacherManage/teacherInforManage/index.vue
......@@ -195,8 +195,6 @@
<img v-if="imageUrl" :src="imageUrl" class="avatar" />
<i v-else class="el-icon-plus avatar-uploader-icon"></i>
</el-upload>
</template>
</el-form-item>
<div style="width:50px; height: 20px; margin:auto;"><b>照片</b></div>
......@@ -232,12 +230,19 @@
<el-date-picker clearable v-model="form.birthday" type="date" style="width: 100%" value-format="yyyy-MM-dd"
placeholder="请选择生日"></el-date-picker>
</el-form-item>
<el-form-item label="岗位" prop="postId">
<el-select v-model="form.postIds" multiple placeholder="请选择岗位" style="width: 100%">
<el-option v-for="item in postOptions" :key="item.postId" :label="item.postName"
:value="item.postId"></el-option>
</el-select>
</el-form-item>
<el-form-item label="任职部门" prop="deptIds">
<treeselect :disabled="isDisabled" v-model="form.deptIds" :options="deptOptions" :show-count="true"
:defaultExpandLevel="2" placeholder="请选择主部门" @change="handleSelectionChange" multiple :max="8" />
<!-- 添加 multiple 和 max 属性 -->
</el-form-item>
</el-col>
......@@ -254,9 +259,9 @@
</el-form-item>
<div style="width:50px; height: 20px;margin:auto;"><b>签名</b></div>
<br />
<el-form-item label="归属部门" prop="deptId">
<el-form-item label="主部门" prop="deptId">
<treeselect :disabled="isDisabled" v-model="form.deptId" :options="deptOptions" :show-count="true"
:defaultExpandLevel="2" placeholder="请选择归属部门" />
:defaultExpandLevel="2" placeholder="请选择主部门" />
</el-form-item>
<!-- :placeholder="isDisabled ? '' : '请选择归属部门'"-->
<el-form-item label="密码" v-if="!form.id" prop="password">
......@@ -384,10 +389,15 @@ export default {
},
data() {
return {
peV: process.env.VUE_APP_BASE_API,
// 民族
Nations,
honorQueryAdd: {},
isDisabled: false, // 根据需要设置是否禁用
deptOptions: [
// 选项数据
],
honorTitle: undefined,
honorQuery: {},
resumeTitle: undefined,
......@@ -459,7 +469,9 @@ export default {
employeeType: null,
},
// 表单参数
form: {},
form: {
deptIds: [],
},
// 列信息
columns: [
{ key: 0, label: `头像`, visible: true },
......@@ -545,6 +557,12 @@ export default {
deptName(val) {
this.$refs.tree.filter(val);
},
'form.deptIds'(newVal) {
if (newVal.length > 8) {
// If the selection exceeds the limit, remove the last item
this.form.deptIds.pop();
}
},
},
created() {
this.getList();
......@@ -554,6 +572,12 @@ export default {
// })
},
methods: {
handleSelectionChange(selectedItems) {
if (selectedItems.length > 8) {
// 用户选择的项数超过了最大限制，您可以在此处进行处理，例如取消选择最后一个项
this.form.deptIds.pop();
}
},
// 筛选节点
filterNode(value, data) {
if (!value) return true;
......@@ -1053,7 +1077,7 @@ export default {
}
},
};
};
</script>
<style scoped>
.avatar-uploader {
......
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