Skip to content

D
dd_school
Commit 7da5dff1 by peijy
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	ruoyi-ui/src/views/smartSchool/personWork/auditoriumReservation/index.vue
parents 916c950c a0077cde
Showing with 62 additions and 64 deletions
ruoyi-ui/src/api/smartSchool/personWork/venueReservation/recordingroomManagement/index.js
...@@ -10,10 +10,11 @@ export function addStudio(data) { ...@@ -10,10 +10,11 @@ export function addStudio(data) {
} }
// 查看录播室列表 // 查看录播室列表
export function getStudio() { export function getStudio(query) {
return request({ return request({
url: "/studio/list", url: "/studio/list",
method: "get", method: "get",
params: query,
}); });
} }
......
ruoyi-ui/src/views/smartSchool/personWork/leaveApply/components/SelectUser.vue
...@@ -154,6 +154,7 @@ export default { ...@@ -154,6 +154,7 @@ export default {
}, },
/** 选项选中发生变化 */ /** 选项选中发生变化 */
selectionChange(selections) { selectionChange(selections) {
console.log('seselections', selections);
this.selectUser = selections[0]; this.selectUser = selections[0];
}, },
/** 点击选中、取消 */ /** 点击选中、取消 */
......
ruoyi-ui/src/views/smartSchool/personWork/leaveApply/index.vue
...@@ -34,13 +34,13 @@ ...@@ -34,13 +34,13 @@
<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="teacherLeaveList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="teacherLeaveList" @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="流程实例ID" prop="instanceId" min-width="100" key="instanceId" <el-table-column label="流程实例ID" prop="instanceId" min-width="100" key="instanceId"
v-if="activeName === SubmitState.HAS_SUBMIT" align="center"></el-table-column> v-if="activeName === SubmitState.HAS_SUBMIT" align="center"></el-table-column>
<el-table-column label="教师名称" key="teacherName" v-if="columns[0].visible" align="center" prop="teacherName" <el-table-column label="教师名称" key="teacherName" v-if="columns[0].visible" align="center" prop="teacherName"
show-overflow-tooltip/> show-overflow-tooltip />
<el-table-column label="标题" key="title" v-if="columns[1].visible" align="center" min-width="250" prop="title" <el-table-column label="标题" key="title" v-if="columns[1].visible" align="center" min-width="250" prop="title"
show-overflow-tooltip/> show-overflow-tooltip />
<el-table-column label="请假类型" key="type" min-width="100" v-if="columns[7].visible" align="center" prop="type"> <el-table-column label="请假类型" key="type" min-width="100" v-if="columns[7].visible" align="center" prop="type">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.biz_leave_type" :value="scope.row.type"></dict-tag> <dict-tag :options="dict.type.biz_leave_type" :value="scope.row.type"></dict-tag>
...@@ -100,21 +100,20 @@ ...@@ -100,21 +100,20 @@
<el-form ref="form" :model="form" :disabled="isEdit" :rules="rules" label-width="110px" <el-form ref="form" :model="form" :disabled="isEdit" :rules="rules" label-width="110px"
style="width: 100%; margin: auto"> style="width: 100%; margin: auto">
<el-form-item label="标题" prop="title"> <el-form-item label="标题" prop="title">
<el-input :value="title" placeholder="请输入标题"/> <el-input :value="title" placeholder="请输入标题" />
</el-form-item> </el-form-item>
<el-row> <el-row>
<el-col :span="11"> <el-col :span="11">
<el-form-item label="姓名" prop="teacherName"> <el-form-item label="姓名" prop="teacherName">
<el-input :value="form.teacherName" placeholder="请输入教师名称"/> <el-input :value="form.teacherName" placeholder="请输入教师名称" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :offset="2" :span="11"> <el-col :offset="2" :span="11">
<el-form-item label="级部/处室" prop="applyOrgid"> <el-form-item label="级部/处室" prop="applyOrgid">
<template v-if="!isEdit"> <template v-if="!isEdit">
<Treeselect v-model="form.applyOrgid" :options="gradeOfficeList" :disable-branch-nodes="true" <Treeselect v-model="form.applyOrgid" :options="gradeOfficeList" :disable-branch-nodes="true"
:searchable="true" :show-count="true" :searchable="true" :show-count="true" :clearable="false" @select="deptIdAndName" placeholder="请选择归属部门"
:clearable="false" @select="deptIdAndName" placeholder="请选择归属部门" style="width:224px" />
style="width:224px"/>
</template> </template>
<template v-else> <template v-else>
<el-input :value="form.applyOrgname"></el-input> <el-input :value="form.applyOrgname"></el-input>
...@@ -126,8 +125,7 @@ ...@@ -126,8 +125,7 @@
<el-col :span="11"> <el-col :span="11">
<el-form-item label="请假开始时间" prop="startTime"> <el-form-item label="请假开始时间" prop="startTime">
<el-date-picker @change="leaveTime" style="width: 100%" v-model="form.startTime" type="datetime" <el-date-picker @change="leaveTime" style="width: 100%" v-model="form.startTime" type="datetime"
value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" :picker-options="pickerOptionsStart"
:picker-options="pickerOptionsStart"
placeholder="选择开始时间"> placeholder="选择开始时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
...@@ -136,8 +134,7 @@ ...@@ -136,8 +134,7 @@
<el-col :offset="2" :span="11"> <el-col :offset="2" :span="11">
<el-form-item label="请假结束时间" prop="endTime"> <el-form-item label="请假结束时间" prop="endTime">
<el-date-picker @change="leaveTime" style="width: 100%" v-model="form.endTime" type="datetime" <el-date-picker @change="leaveTime" style="width: 100%" v-model="form.endTime" type="datetime"
value-format="yyyy-MM-dd HH:mm:ss" :picker-options="pickerOptionsEnd" value-format="yyyy-MM-dd HH:mm:ss" :picker-options="pickerOptionsEnd" placeholder="选择结束时间">
placeholder="选择结束时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -185,7 +182,7 @@ ...@@ -185,7 +182,7 @@
<el-row v-else> <el-row v-else>
<el-col :span="11"> <el-col :span="11">
<el-form-item label="请假时间" prop="dayCourse"> <el-form-item label="请假时间" prop="dayCourse">
<el-input :value="form.dayCourse" placeholder="请假时间"/> <el-input :value="form.dayCourse" placeholder="请假时间" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -223,7 +220,7 @@ ...@@ -223,7 +220,7 @@
<el-form-item label="请假事由" prop="reasonForLeave"> <el-form-item label="请假事由" prop="reasonForLeave">
<el-input type="textarea" placeholder="请输入请假事由" resize="none" :autosize="{ minRows: 5 }" <el-input type="textarea" placeholder="请输入请假事由" resize="none" :autosize="{ minRows: 5 }"
v-model="form.reasonForLeave"/> v-model="form.reasonForLeave" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
...@@ -241,14 +238,14 @@ ...@@ -241,14 +238,14 @@
<el-descriptions-item label="请假结束时间">{{ form.endTime }}</el-descriptions-item> <el-descriptions-item label="请假结束时间">{{ form.endTime }}</el-descriptions-item>
<!-- <el-descriptions-item label="请假类型">{{ form.type }}</el-descriptions-item>--> <!-- <el-descriptions-item label="请假类型">{{ form.type }}</el-descriptions-item>-->
<el-descriptions-item label="请假类型"> <el-descriptions-item label="请假类型">
<dict-tag :options="dict.type.biz_leave_type" :value="form.type"/> <dict-tag :options="dict.type.biz_leave_type" :value="form.type" />
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
</el-card> </el-card>
<br/> <br />
<el-card> <el-card>
<el-descriptions title="请假原因"/> <el-descriptions title="请假原因" />
<span v-html="form.reasonForLeave"/> <span v-html="form.reasonForLeave" />
</el-card> </el-card>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="progress.open = false">确 定</el-button> <el-button type="primary" @click="progress.open = false">确 定</el-button>
...@@ -273,10 +270,10 @@ import { ...@@ -273,10 +270,10 @@ import {
listHistory, listHistory,
submitApply, submitApply,
} from "@/api/smartSchool/personWork/leaveApply"; } from "@/api/smartSchool/personWork/leaveApply";
import {SubmitState} from "@/enums/apply"; import { SubmitState } from "@/enums/apply";
import {listInform} from "@/api/smartSchool/teacherManage/teacherInformation"; import { listInform } from "@/api/smartSchool/teacherManage/teacherInformation";
import {getListByRole} from "@/api/smartSchool/common"; import { getListByRole } from "@/api/smartSchool/common";
import {ExportType} from "@/enums/common"; import { ExportType } from "@/enums/common";
import TeacherSelect from '@/views/components/moduleComponets/TeacherSelect/index.vue' import TeacherSelect from '@/views/components/moduleComponets/TeacherSelect/index.vue'
import HandleResolve from "@/views/smartSchool/teacherManage/teacherLeave/components/HandleResolve"; import HandleResolve from "@/views/smartSchool/teacherManage/teacherLeave/components/HandleResolve";
import HandleEntrust from "@/views/components/moduleComponets/HandleEntrust"; import HandleEntrust from "@/views/components/moduleComponets/HandleEntrust";
...@@ -286,8 +283,8 @@ import { ...@@ -286,8 +283,8 @@ import {
getGradeOfficeDirectorList, getGradeOfficeDirectorList,
getLeaderList getLeaderList
} from "@/api/smartSchool/personWork/leaveApply"; } from "@/api/smartSchool/personWork/leaveApply";
import {formatDate} from "../../../../utils"; import { formatDate } from "../../../../utils";
import {getDepId} from "../../../../api/smartSchool/personWork/leaveApply"; import { getDepId } from "../../../../api/smartSchool/personWork/leaveApply";
import Treeselect from "@riophae/vue-treeselect"; import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css"; import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import SelectUser from "./components/SelectUser"; import SelectUser from "./components/SelectUser";
...@@ -393,28 +390,28 @@ export default { ...@@ -393,28 +390,28 @@ export default {
// 列信息 // 列信息
columns: [ columns: [
{key: 0, label: `教师名称`, visible: true}, { key: 0, label: `教师名称`, visible: true },
{key: 1, label: `标题`, visible: true}, { key: 1, label: `标题`, visible: true },
{key: 2, label: `请假原因`, visible: true}, { key: 2, label: `请假原因`, visible: true },
{key: 3, label: `请假开始时间`, visible: true}, { key: 3, label: `请假开始时间`, visible: true },
{key: 4, label: `请假结束时间`, visible: true}, { key: 4, label: `请假结束时间`, visible: true },
{key: 5, label: `请假时长`, visible: true}, { key: 5, label: `请假时长`, visible: true },
{key: 6, label: `流程实例ID`, visible: true}, { key: 6, label: `流程实例ID`, visible: true },
{key: 7, label: `申请人`, visible: true}, { key: 7, label: `申请人`, visible: true },
{key: 8, label: `申请时间`, visible: true}, { key: 8, label: `申请时间`, visible: true },
{key: 9, label: `操作`, visible: true}, { key: 9, label: `操作`, visible: true },
], ],
// 表单校验 // 表单校验
rules: { rules: {
teacherName: [{required: true, message: '教师名称不能为空', trigger: 'change'}], teacherName: [{ required: true, message: '教师名称不能为空', trigger: 'change' }],
applyOrgname: [{required: true, message: '级部/处室不能为空', trigger: 'change'}], applyOrgname: [{ required: true, message: '级部/处室不能为空', trigger: 'change' }],
handUserName1: [{required: true, message: '级部/处室主任不能为空', trigger: 'change'}], handUserName1: [{ required: true, message: '级部/处室主任不能为空', trigger: 'change' }],
handUserName2: [{required: true, message: '分管领导', trigger: 'change'}], handUserName2: [{ required: true, message: '分管领导', trigger: 'change' }],
handUserName3: [{required: true, message: '主要领导', trigger: 'change'}], handUserName3: [{ required: true, message: '主要领导', trigger: 'change' }],
startTime: [{required: true, message: '请假开始时间不能为空', trigger: 'blur'}], startTime: [{ required: true, message: '请假开始时间不能为空', trigger: 'blur' }],
endTime: [{required: true, message: '请假结束时间不能为空', trigger: 'blur'}], endTime: [{ required: true, message: '请假结束时间不能为空', trigger: 'blur' }],
type: [{required: true, message: '请假类型不能为空', trigger: 'blur'}], type: [{ required: true, message: '请假类型不能为空', trigger: 'blur' }],
reasonForLeave: [{required: true, message: '请假原因不能为空', trigger: 'blur'}] reasonForLeave: [{ required: true, message: '请假原因不能为空', trigger: 'blur' }]
}, },
// 导出选项 // 导出选项
exportOptions: { exportOptions: {
...@@ -476,7 +473,7 @@ export default { ...@@ -476,7 +473,7 @@ export default {
this.multiple = !selection.length this.multiple = !selection.length
}, },
/** 切换tab标签 */ /** 切换tab标签 */
handleClick({name}) { handleClick({ name }) {
this.$set(this.queryParams, 'submitState', Number(name)); this.$set(this.queryParams, 'submitState', Number(name));
this.resetQuery(); this.resetQuery();
}, },
...@@ -547,13 +544,13 @@ export default { ...@@ -547,13 +544,13 @@ export default {
const ids = this.ids; const ids = this.ids;
// TODO: 这里因为是两种状态： 提交和未提交，所以需要判断状态 // TODO: 这里因为是两种状态： 提交和未提交，所以需要判断状态
const options = [ const options = [
{type: ExportType.TOTAL, path: '/school/teacherLeave/export', params: {}}, { type: ExportType.TOTAL, path: '/school/teacherLeave/export', params: {} },
{ {
type: ExportType.SELECT, type: ExportType.SELECT,
path: '/school/teacherLeave/export/' + ids, path: '/school/teacherLeave/export/' + ids,
params: {} params: {}
}, },
{type: ExportType.QUERY, path: '/school/teacherLeave/export', params: this.queryParams}, { type: ExportType.QUERY, path: '/school/teacherLeave/export', params: this.queryParams },
] ]
callback(options, `老师请假信息${new Date().getTime()}.xlsx`); callback(options, `老师请假信息${new Date().getTime()}.xlsx`);
}, },
...@@ -613,13 +610,13 @@ export default { ...@@ -613,13 +610,13 @@ export default {
} }
if (this.form.id != null) { if (this.form.id != null) {
updateTeacherLeave({...this.form, title: temp3}).then(response => { updateTeacherLeave({ ...this.form, title: temp3 }).then(response => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
this.dialogTeacherLeave = false; this.dialogTeacherLeave = false;
this.getList(); this.getList();
}); });
} else { } else {
addTeacherLeave({...this.form, title: temp3}).then(response => { addTeacherLeave({ ...this.form, title: temp3 }).then(response => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess("新增成功");
this.dialogTeacherLeave = false; this.dialogTeacherLeave = false;
this.getList(); this.getList();
...@@ -652,7 +649,7 @@ export default { ...@@ -652,7 +649,7 @@ export default {
this.getApproveHistoryList(row) this.getApproveHistoryList(row)
}, },
getApproveHistoryList(row) { getApproveHistoryList(row) {
listHistory({instanceId: row.instanceId}).then(res => { listHistory({ instanceId: row.instanceId }).then(res => {
}) })
}, },
openTeacherSelect() { openTeacherSelect() {
...@@ -758,7 +755,7 @@ export default { ...@@ -758,7 +755,7 @@ export default {
if (this.form.handUserName1) { if (this.form.handUserName1) {
this.form.handUserName1 = "" this.form.handUserName1 = ""
} }
const {id, label} = data; const { id, label } = data;
console.log(id, label, 758) console.log(id, label, 758)
this.form.applyOrgname = label; this.form.applyOrgname = label;
this.form.applyOrgid = id; this.form.applyOrgid = id;
...@@ -769,19 +766,19 @@ export default { ...@@ -769,19 +766,19 @@ export default {
})) }))
}, },
handleDirector(data) { handleDirector(data) {
const {handUserName1, handUserId1} = data; const { handUserName1, handUserId1 } = data;
this.form.handUserName1 = handUserName1; this.form.handUserName1 = handUserName1;
this.form.handUserId1 = handUserId1; this.form.handUserId1 = handUserId1;
}, },
handleDeputyLeader(data) { handleDeputyLeader(data) {
const {handUserName2, handUserId2} = data; const { handUserName2, handUserId2 } = data;
this.form.handUserName2 = handUserName2; this.form.handUserName2 = handUserName2;
this.form.handUserId2 = handUserId2; this.form.handUserId2 = handUserId2;
}, },
handleLeader(data) { handleLeader(data) {
const {handUserName3, handUserId3} = data; const { handUserName3, handUserId3 } = data;
this.form.handUserName3 = handUserName3; this.form.handUserName3 = handUserName3;
this.form.handUserId3 = handUserId3; this.form.handUserId3 = handUserId3;
}, },
...@@ -862,7 +859,7 @@ export default { ...@@ -862,7 +859,7 @@ export default {
}, },
readNodes(nodes = [], arr = []) { readNodes(nodes = [], arr = []) {
for (let item of nodes) { for (let item of nodes) {
arr.push({id: item.id, label: item.label}) arr.push({ id: item.id, label: item.label })
if (item.children && item.children.length) this.readNodes(item.children, arr) if (item.children && item.children.length) this.readNodes(item.children, arr)
} }
return arr return arr
...@@ -876,12 +873,16 @@ export default { ...@@ -876,12 +873,16 @@ export default {
this.selectHandles.type = type; this.selectHandles.type = type;
// 将级部、处室 id赋值 // 将级部、处室 id赋值
this.selectHandles.id = this.form.applyOrgid; this.selectHandles.id = this.form.applyOrgid;
console.log('this.selectHandles', this.selectHandles);
}, },
// 选择处理人 // 选择处理人
selectUser(select) { selectUser(select) {
console.log('this.form1', this.form);
// 这种写法存在一定危险，后续最好是可以有更好的字段名对应 // 这种写法存在一定危险，后续最好是可以有更好的字段名对应
this.$set(this.form, `handUserName${this.selectHandles.type}`, select.name); this.$set(this.form, `handUserName${this.selectHandles.type}`, select.name);
this.$set(this.form, `handUserId${this.selectHandles.type}`, select.id); this.$set(this.form, `handUserId${this.selectHandles.type}`, select.id);
console.log('this.form', this.form);
} }
} }
}; };
......
ruoyi-ui/src/views/smartSchool/venueReservation/recordingroomManagement/index.vue
...@@ -34,8 +34,8 @@ ...@@ -34,8 +34,8 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" <!-- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" /> @pagination="getList" /> -->
<!-- 新增/修改弹窗 --> <!-- 新增/修改弹窗 -->
<el-dialog :title="title" :visible.sync="open" width="1200px"> <el-dialog :title="title" :visible.sync="open" width="1200px">
<el-form ref="form" :model="form" label-width="114px" :rules="rules"> <el-form ref="form" :model="form" label-width="114px" :rules="rules">
...@@ -90,12 +90,7 @@ export default { ...@@ -90,12 +90,7 @@ export default {
return { return {
studioStatu: "", studioStatu: "",
queryParams: { queryParams: {
id: "", studioArea: "",
studioName: "",
studioStatu: "",
studioArea: '',
pageNum: 1,
pageSize: 10,
}, },
title: "", title: "",
rules: { rules: {
...@@ -125,7 +120,7 @@ export default { ...@@ -125,7 +120,7 @@ export default {
methods: { methods: {
/** 查询 */ /** 查询 */
getList() { getList() {
getStudio(this.queryParams.studioArea).then((response) => { getStudio(this.queryParams).then((response) => {
this.tableData = response.rows; this.tableData = response.rows;
this.loading = false; this.loading = false;
console.log(111, response.rows); console.log(111, response.rows);
......
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