Skip to content

D
dd_school
Commit 8c2b5c48 by zhaopanyu
Options

zpy 修改部分问题

parent 9963963b
Showing with 204 additions and 309 deletions
ruoyi-ui/src/views/components/moduleComponets/TeacherSelect/index.vue
<template> <template>
<el-dialog <el-dialog width="960px" :visible.sync="open" :title="title" @close="handleClose">
width="960px"
:visible.sync="open"
:title="title"
@close="handleClose"
>
<el-form ref="queryForm" inline :model="queryForm"> <el-form ref="queryForm" inline :model="queryForm">
<!--<el-form-item label="工作编号" prop="teacherCode">--> <!--<el-form-item label="工作编号" prop="teacherCode">-->
<!-- <el-input--> <!-- <el-input-->
...@@ -16,20 +11,10 @@ ...@@ -16,20 +11,10 @@
<!--</el-form-item>--> <!--</el-form-item>-->
<el-form-item label="教师姓名" prop="teacherName"> <el-form-item label="教师姓名" prop="teacherName">
<el-input <el-input v-model="queryForm.teacherName" placeholder="请输入老师名称" clearable @keyup.enter.native="handleQuery" />
v-model="queryForm.teacherName"
placeholder="请输入老师名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="教师电话" prop="teacherTel"> <el-form-item label="教师电话" prop="teacherTel">
<el-input <el-input v-model="queryForm.teacherTel" placeholder="请输入老师电话" clearable @keyup.enter.native="handleQuery" />
v-model="queryForm.teacherTel"
placeholder="请输入老师电话"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
...@@ -37,16 +22,8 @@ ...@@ -37,16 +22,8 @@
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table <el-table ref="teacherTable" v-loading="loading" stripe height="380px" width="100%" :data="teacherList"
ref="teacherTable" @selection-change="handleSelectChange" @row-click="handleRowClick">
v-loading="loading"
stripe
height="380px"
width="100%"
:data="teacherList"
@selection-change="handleSelectChange"
@row-click="handleRowClick"
>
<el-table-column type="selection" align="center"></el-table-column> <el-table-column type="selection" align="center"></el-table-column>
<!--<el-table-column type="index" label="序号" width="55" align="center"></el-table-column>--> <!--<el-table-column type="index" label="序号" width="55" align="center"></el-table-column>-->
<!--<el-table-column label="工作编号" align="center" prop="teacherCode"/>--> <!--<el-table-column label="工作编号" align="center" prop="teacherCode"/>-->
...@@ -56,43 +33,33 @@ ...@@ -56,43 +33,33 @@
<ListImage :image-url="isEmptyTeacherUrl(scope.row.picUrl, scope.row.sex)"></ListImage> <ListImage :image-url="isEmptyTeacherUrl(scope.row.picUrl, scope.row.sex)"></ListImage>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="老师名称" align="center" prop="teacherName" width="120" show-overflow-tooltip/> <el-table-column label="老师名称" align="center" prop="teacherName" width="120" show-overflow-tooltip />
<el-table-column label="性别" align="center" prop="sex" width="80"> <el-table-column label="性别" align="center" prop="sex" width="80">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex"/> <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="老师电话" width="160" align="center" prop="teacherTel"/> <el-table-column label="老师电话" width="160" align="center" prop="teacherTel" />
<el-table-column label="家庭住址" align="center" prop="homeAddress" show-overflow-tooltip/> <el-table-column label="职工类型" width="160" align="center" prop="employeeType" />
<!--<el-table-column label="身份证号" width="180" align="center" prop="idCard"/>--> <el-table-column label="部门" width="160" align="center" prop="deptName" />
<!-- <el-table-column label="家庭住址" align="center" prop="homeAddress" show-overflow-tooltip/>
<el-table-column label="身份证号" width="180" align="center" prop="idCard"/> -->
</el-table> </el-table>
<ExPagination <ExPagination v-show="total > 0" :total="total" :page.sync="queryForm.pageNum" :limit.sync="queryForm.pageSize"
v-show="total > 0" @pagination="getList"></ExPagination>
:total="total"
:page.sync="queryForm.pageNum"
:limit.sync="queryForm.pageSize"
@pagination="getList"
></ExPagination>
<div slot="footer"> <div slot="footer">
<el-button <el-button type="primary" size="small" :disabled="!isSimple" @click="handleSelect">确 定
type="primary"
size="small"
:disabled="!isSimple"
@click="handleSelect">确 定
</el-button> </el-button>
<el-button <el-button plain size="small" @click="handleClose">取 消
plain
size="small"
@click="handleClose">取 消
</el-button> </el-button>
</div> </div>
</el-dialog> </el-dialog>
</template> </template>
<script> <script>
import {listInform} from "@/api/smartSchool/teacherManage/teacherInformation.js"; import { listInform } from "@/api/smartSchool/teacherManage/teacherInformation.js";
import ListImage from "@/components/ListImage"; import ListImage from "@/components/ListImage";
import {Gender} from "../../../../enums/common"; import { Gender } from "../../../../enums/common";
export default { export default {
name: "TeacherSelect", name: "TeacherSelect",
......
ruoyi-ui/src/views/smartSchool/indexMould/myTask/depBudgetapproval/index.vue
...@@ -119,6 +119,7 @@ export default { ...@@ -119,6 +119,7 @@ export default {
this.isTaskListe = true this.isTaskListe = true
departiDetail().then((response) => { departiDetail().then((response) => {
this.tableData = response.rows this.tableData = response.rows
console.log('this.tableData', this.tableData);
this.total = response.total this.total = response.total
this.loading = false this.loading = false
}); });
......
ruoyi-ui/src/views/smartSchool/officialWork/budgetFilling/index.vue
...@@ -15,13 +15,12 @@ ...@@ -15,13 +15,12 @@
<!-- 表格数据 --> <!-- 表格数据 -->
<el-table border v-loading="loading" :row-style="{ height: '35px' }" :cell-style="{ padding: '0' }" <el-table border v-loading="loading" :row-style="{ height: '35px' }" :cell-style="{ padding: '0' }"
:data="budgetList" style="font-size: 14px" stripe> :data="budgetList" style="font-size: 14px" stripe>
<el-table-column label="年度" prop="year" align="center" width="100px" /> <el-table-column label="年度" prop="year" align="center" />
<el-table-column label="科室" prop="deptName" align="center" /> <el-table-column label="科室" prop="deptName" align="center" />
<el-table-column label="填报人" prop="informant" align="center" width="150px" /> <el-table-column label="填报人" prop="informant" align="center" />
<el-table-column label="分管领导" prop="leadershipName" align="center" width="150px" /> <el-table-column label="分管领导" prop="leadershipName" align="center" />
<el-table-column label="备注" prop="remark" align="center" /> <el-table-column label="填报时间" prop="tbTime" align="center" />
<el-table-column label="填报时间" prop="tbTime" align="center" width="200px" /> <el-table-column label="当前任务" prop="state" align="center">
<el-table-column label="当前任务" prop="state" align="center" width="250px">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
{{ row.state === '0' ? "未提交" : {{ row.state === '0' ? "未提交" :
row.state === '1' ? "分管领导审核" : row.state === '1' ? "分管领导审核" :
...@@ -139,17 +138,15 @@ ...@@ -139,17 +138,15 @@
{{ postForm.informant }} {{ postForm.informant }}
</span> </span>
</el-col> </el-col>
<el-col :span="10"> <el-col :span="10">
<!-- <el-form-item label="分管领导" prop="handUserName2"> --> <el-form-item label="分管领导:"
<!-- <el-input :value="postForm.handUserName2" placeholder="请选择分管领导" style="display: flex; align-items: center; font-size: 16px; font-weight: bold;">
@focus="openSelect('选择分管领导', 'leaderList', 2)"></el-input> --> <el-input v-model="postForm.handUserName2" placeholder="请选择分管领导"
<span class="uploadname" style="font-size: 16px;font-weight: bold;">分管领导: @focus="openSelect('选择分管领导', 'leaderList', 2)" style="margin-left: 10px;"></el-input>
<span style="display: inline-block; width: 100px;height: 20px;" </el-form-item>
@click="openSelect('选择分管领导', 'leaderList', 2)">{{ postForm.handUserName2 }}
</span>
</span>
<!-- </el-form-item> -->
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
</el-dialog> </el-dialog>
...@@ -545,23 +542,36 @@ export default { ...@@ -545,23 +542,36 @@ export default {
type: 'warning' type: 'warning'
}) })
.then(() => { .then(() => {
submitApply(row.id).then(res => { const loadingInstance = this.$loading({
lock: true,
text: '正在提交数据，请稍等...',
background: 'rgba(0, 0, 0, 0.7)'
}); // 显示遮罩层
submitApply(row.id)
.then(res => {
if (res.code == 200) { if (res.code == 200) {
this.$message({ this.$message({
type: 'success', type: 'success',
message: '提交成功!' message: '提交成功!'
}) });
this.getList() loadingInstance.close(); // 请求完成后关闭遮罩层
this.getList();
} }
}) })
.catch(() => {
this.$message.error('提交失败，请重试!');
loadingInstance.close(); // 请求失败时也关闭遮罩层
});
}) })
.catch(() => { .catch(() => {
this.$message({ this.$message({
type: 'info', type: 'info',
message: '已取消提交' message: '已取消提交'
}) });
}) });
}, },
// 查看按钮 // 查看按钮
handleLook(row) { handleLook(row) {
queryDepart(row.id).then(response => { queryDepart(row.id).then(response => {
...@@ -599,7 +609,7 @@ export default { ...@@ -599,7 +609,7 @@ export default {
this.open = true; this.open = true;
this.postForm.informant = this.$store.state.user.name; this.postForm.informant = this.$store.state.user.name;
this.title = '新增预算批复信息' this.title = '新增预算申请信息'
}, },
// 删除按钮操作 // 删除按钮操作
......
ruoyi-ui/src/views/smartSchool/officialWork/purchaseApply/index.vue
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
</el-row> </el-row>
<el-table v-loading="loading" :data="purchaseList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="purchaseList" @selection-change="handleSelectionChange">
<el-table-column type="index" align="center" label="序号" min-width="30px"></el-table-column> <el-table-column type="index" align="center" label="序号" min-width="30px"></el-table-column>
<el-table-column label="标题" align="center" min-width="150px" prop="purchaseName"/> <el-table-column label="标题" align="center" min-width="150px" prop="purchaseName" />
<el-table-column label="预算项目" prop="budgetName" align="center"></el-table-column> <el-table-column label="预算项目" prop="budgetName" align="center"></el-table-column>
<el-table-column label="采购费用" sortable align="center" prop="purchaseMoney"> <el-table-column label="采购费用" sortable align="center" prop="purchaseMoney">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -70,15 +70,13 @@ ...@@ -70,15 +70,13 @@
<el-row :gutter="10"> <el-row :gutter="10">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="标题" prop="purchaseName"> <el-form-item label="标题" prop="purchaseName">
<el-input v-model="formPur.purchaseName" placeholder="请输入采购申请标题" clearable <el-input v-model="formPur.purchaseName" placeholder="请输入采购申请标题" clearable style="width:576px"></el-input>
style="width:576px"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-form-item label="申请部门" prop="deptId"> <el-form-item label="申请部门" prop="deptId">
<Treeselect :disabled="formPurDisable" v-model="formPur.deptId" @select="deptIdAndName" :options="deptOptions" <Treeselect :disabled="formPurDisable" v-model="formPur.deptId" @select="deptIdAndName" :options="deptOptions"
:show-count="true" :show-count="true" placeholder="请选择归属部门" :defaultExpandLevel=1 style="width:224px" />
placeholder="请选择归属部门" :defaultExpandLevel=1 style="width:224px"/>
</el-form-item> </el-form-item>
<el-form-item label="期望日期" prop="expectedDate"> <el-form-item label="期望日期" prop="expectedDate">
<el-date-picker v-model="formPur.expectedDate" placeholder="请选择期望日期" clearable <el-date-picker v-model="formPur.expectedDate" placeholder="请选择期望日期" clearable
...@@ -86,8 +84,7 @@ ...@@ -86,8 +84,7 @@
</el-form-item> </el-form-item>
<el-form-item label="批复项目" prop="budgetId"> <el-form-item label="批复项目" prop="budgetId">
<!-- <el-input v-model="formPur.budgetName" clearable></el-input> --> <!-- <el-input v-model="formPur.budgetName" clearable></el-input> -->
<el-select v-model="formPur.budgetId" @change="getBudgetName" style="width: 100%" <el-select v-model="formPur.budgetId" @change="getBudgetName" style="width: 100%" placeholder="请选择批复项目">
placeholder="请选择批复项目">
<el-option v-for="item in budgetList" :key="item.id" :label="item.budgetName" :value="item.id"> <el-option v-for="item in budgetList" :key="item.id" :label="item.budgetName" :value="item.id">
</el-option> </el-option>
</el-select> </el-select>
...@@ -132,7 +129,7 @@ ...@@ -132,7 +129,7 @@
<el-table :data="projectDetail" v-loading="loading" style="width: 100%" <el-table :data="projectDetail" v-loading="loading" style="width: 100%"
@selection-change="handleSelectionChangeDetail"> @selection-change="handleSelectionChangeDetail">
<el-table-column type="selection" width="50" align="center"/> <el-table-column type="selection" width="50" align="center" />
<el-table-column type="index" label="序号" width="50"></el-table-column> <el-table-column type="index" label="序号" width="50"></el-table-column>
<el-table-column prop="assetsTypeName" label="资产分类" align="center"> <el-table-column prop="assetsTypeName" label="资产分类" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -159,16 +156,16 @@ ...@@ -159,16 +156,16 @@
<el-input v-show="isEdit" v-model="row.assetsUnit"></el-input> <el-input v-show="isEdit" v-model="row.assetsUnit"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="assetsPrice" label="单价-元" align="center"> <el-table-column prop="assetsPrice" label="单价-元" align="center" width="150px">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<span v-show="!isEdit">{{ row.assetsPrice }}</span> <span v-show="!isEdit">{{ row.assetsPrice }}</span>
<el-input v-show="isEdit" v-model="row.assetsPrice"></el-input> <el-input v-show="isEdit" v-model="row.assetsPrice" type="number"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="assetsNumbers" label="数量" align="center"> <el-table-column prop="assetsNumbers" label="数量" align="center">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<span v-show="!isEdit">{{ row.assetsNumbers }}</span> <span v-show="!isEdit">{{ row.assetsNumbers }}</span>
<el-input v-show="isEdit" v-model="row.assetsNumbers"></el-input> <el-input v-show="isEdit" v-model="row.assetsNumbers" ></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="totalPrice" label="小计" align="center"> <el-table-column prop="totalPrice" label="小计" align="center">
...@@ -192,10 +189,8 @@ ...@@ -192,10 +189,8 @@
</el-dialog> </el-dialog>
<!-- 选择资产分类 --> <!-- 选择资产分类 -->
<el-drawer ref="refDrawer" :title="title" :visible.sync="drawer"> <el-drawer ref="refDrawer" :title="title" :visible.sync="drawer">
<Treeselect v-model="formPur.assetsType" @select="assetsIdAndName" :options="assetsOptions" <Treeselect v-model="formPur.assetsType" @select="assetsIdAndName" :options="assetsOptions" :defaultExpandLevel=3
:defaultExpandLevel=3 :show-count="true" placeholder="请选择资产分类" />
:show-count="true"
placeholder="请选择资产分类"/>
</el-drawer> </el-drawer>
<BossSelect v-if="teacherOptions.open" :openSelect.sync="teacherOptions.open" :title="teacherOptions.title" <BossSelect v-if="teacherOptions.open" :openSelect.sync="teacherOptions.open" :title="teacherOptions.title"
...@@ -218,18 +213,18 @@ import { ...@@ -218,18 +213,18 @@ import {
getBudgetList1, getBudgetList1,
teacherListInform teacherListInform
} from "@/api/smartSchool/officialWork/purchaseApply.js" } from "@/api/smartSchool/officialWork/purchaseApply.js"
import {SubmitState} from "@/enums/apply"; import { SubmitState } from "@/enums/apply";
import BossSelect from '@/views/components/moduleComponets/BossSelect/index.vue' import BossSelect from '@/views/components/moduleComponets/BossSelect/index.vue'
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 {deptTreeSelect} from "@/api/system/user"; import { deptTreeSelect } from "@/api/system/user";
export default { export default {
name: 'index', name: 'index',
add: false, add: false,
submit: '1', submit: '1',
dialogDisable: "", dialogDisable: "",
components: {Treeselect, BossSelect}, components: { Treeselect, BossSelect },
props: {}, props: {},
data() { data() {
return { return {
...@@ -266,14 +261,14 @@ export default { ...@@ -266,14 +261,14 @@ export default {
total: 0, total: 0,
// 表单校验 // 表单校验
rules: { rules: {
purchaseName: [{required: true, message: '标题不能为空', trigger: 'blur'}], purchaseName: [{ required: true, message: '标题不能为空', trigger: 'blur' }],
deptId: [{required: true, message: '申请部门不能为空', trigger: 'change'}], deptId: [{ required: true, message: '申请部门不能为空', trigger: 'change' }],
budgetName: [{required: true, message: '批复项目不能为空', trigger: 'blur'}], budgetName: [{ required: true, message: '批复项目不能为空', trigger: 'blur' }],
expectedDate: [{required: true, message: '期望日期不能为空', trigger: 'blur'}], expectedDate: [{ required: true, message: '期望日期不能为空', trigger: 'blur' }],
title: [{required: true, message: '分管处室领导不能为空', trigger: 'blur'}], title: [{ required: true, message: '分管处室领导不能为空', trigger: 'blur' }],
handUserName1: [{required: true, message: '分管处室领导不能为空', trigger: 'change'}], handUserName1: [{ required: true, message: '分管处室领导不能为空', trigger: 'change' }],
handUserName2: [{required: true, message: '财务领导不能为空', trigger: 'change'}], handUserName2: [{ required: true, message: '财务领导不能为空', trigger: 'change' }],
budgetId: [{required: true, message: '批复项目不能为空', trigger: 'change'}], budgetId: [{ required: true, message: '批复项目不能为空', trigger: 'change' }],
}, },
// 项目预算详细 // 项目预算详细
projectDetail: [], projectDetail: [],
...@@ -363,7 +358,7 @@ export default { ...@@ -363,7 +358,7 @@ export default {
}) })
}, },
/** 切换tab标签 */ /** 切换tab标签 */
handleClick({name}) { handleClick({ name }) {
this.$set(this.queryParams, 'submitState', name); this.$set(this.queryParams, 'submitState', name);
// console.log(name, 123); // console.log(name, 123);
if (name == 0) { if (name == 0) {
...@@ -390,7 +385,7 @@ export default { ...@@ -390,7 +385,7 @@ export default {
}, },
// 提交申请 // 提交申请
submitApply(row) { submitApply(row) {
var obj = {applyUser: row.applyUser} var obj = { applyUser: row.applyUser }
submitPurchaseList(row.id, obj).then(() => { submitPurchaseList(row.id, obj).then(() => {
this.$modal.msgSuccess("提交成功"); this.$modal.msgSuccess("提交成功");
this.getList(); this.getList();
...@@ -399,7 +394,7 @@ export default { ...@@ -399,7 +394,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
...@@ -530,13 +525,13 @@ export default { ...@@ -530,13 +525,13 @@ export default {
}, },
// 分管领导 // 分管领导
leaderfgc(data) { leaderfgc(data) {
const {handUserName1, handUserId1} = data; const { handUserName1, handUserId1 } = data;
this.formPur.handUserName1 = handUserName1; this.formPur.handUserName1 = handUserName1;
this.formPur.handUserId1 = handUserId1; this.formPur.handUserId1 = handUserId1;
}, },
// 财务领导 // 财务领导
leadercw(data) { leadercw(data) {
const {handUserName2, handUserId2} = data; const { handUserName2, handUserId2 } = data;
this.formPur.handUserName2 = handUserName2; this.formPur.handUserName2 = handUserName2;
this.formPur.handUserId2 = handUserId2; this.formPur.handUserId2 = handUserId2;
}, },
...@@ -590,7 +585,7 @@ export default { ...@@ -590,7 +585,7 @@ export default {
arr.assetsType = node.id; arr.assetsType = node.id;
arr.assetsTypeName = node.label; arr.assetsTypeName = node.label;
console.log(arr, 594) console.log(arr, 594)
this.$set(this.projectDetail, index, {...arr}) this.$set(this.projectDetail, index, { ...arr })
}, },
// 获取部门 // 获取部门
...@@ -634,7 +629,7 @@ export default { ...@@ -634,7 +629,7 @@ export default {
}, },
//获批复项目下拉框 //获批复项目下拉框
getBudgetNamexl() { getBudgetNamexl() {
getBudgetList1({deptId: this.formPur.deptId}).then(((res) => { getBudgetList1({ deptId: this.formPur.deptId }).then(((res) => {
if (res.code == 200) { if (res.code == 200) {
this.budgetList = res.rows this.budgetList = res.rows
} }
...@@ -674,7 +669,7 @@ export default { ...@@ -674,7 +669,7 @@ export default {
}, },
getTeacherList(queryForm, callback) { getTeacherList(queryForm, callback) {
teacherListInform({...queryForm, employeeType: 0}).then(response => { teacherListInform({ ...queryForm, employeeType: 0 }).then(response => {
callback(response.rows, response.total); callback(response.rows, response.total);
}).catch(error => { }).catch(error => {
callback([], 0); callback([], 0);
...@@ -706,6 +701,4 @@ export default { ...@@ -706,6 +701,4 @@ export default {
}, },
}; };
</script> </script>
<style scoped lang="less"> <style scoped lang="less"></style>
</style>
ruoyi-ui/src/views/smartSchool/personWork/auditoriumReservation/index.vue
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="预计时长" prop="duration"> <el-form-item label="预计时长" prop="duration">
<el-input type="number" v-model="postForm.duration" placeholder="请输入"></el-input> <el-input v-model="postForm.duration" placeholder="请输入"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
......
ruoyi-ui/src/views/smartSchool/personWork/recordingroomAppointment/IdleSituation/index.vue
...@@ -11,15 +11,14 @@ ...@@ -11,15 +11,14 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item prop="studioName" :rules="[{ required: true, message: '请选择录播室', trigger: 'change,blur' }]"> <el-form-item prop="studioName" :rules="[{ required: true, message: '请选择录播室', trigger: 'change,blur' }]">
<el-select 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>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-button size="mini" type="primary" icon="el-icon-search" @click="fetchData">搜索</el-button> <!-- <el-button size="mini" type="primary" icon="el-icon-search" @click="fetchData">搜索</el-button> -->
<el-button size="mini" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
<!-- :disabled="isReservationDisabled" --> <!-- :disabled="isReservationDisabled" -->
<el-button size="mini" @click="reserve">预约</el-button> <el-button size="mini" type="primary" @click="reserve">预约</el-button>
</el-form> </el-form>
<p style="margin: 0 0 0 30px;font-size: 14px"> <p style="margin: 0 0 0 30px;font-size: 14px">
说明：（1）录播室每天开放上午四节、下午四节、晚上三节。共计每天11节。（2）请提前一天进行预约。（3）预约不可跨天，跨天请进行多次预约</p> 说明：（1）录播室每天开放上午四节、下午四节、晚上三节。共计每天11节。（2）请提前一天进行预约。（3）预约不可跨天，跨天请进行多次预约</p>
...@@ -131,7 +130,7 @@ export default { ...@@ -131,7 +130,7 @@ export default {
this.initTimeSlots(); this.initTimeSlots();
// 获取录播室下拉框列表 // 获取录播室下拉框列表
this.getRoomList(); this.getRoomList();
this.fetchStudioUseData(); // this.fetchStudioUseData();
// this.fetchData(); // this.fetchData();
}, },
methods: { methods: {
...@@ -145,18 +144,31 @@ export default { ...@@ -145,18 +144,31 @@ export default {
}; };
this.fetchStudioUseData(); // 重新发一次请求 this.fetchStudioUseData(); // 重新发一次请求
}, },
changeStudio(value) {
console.log('value', value);
console.log('this.queryParams.startTime', this.queryParams.startTime);
this.queryParams.studioId = value;
this.fetchStudioUseData();
},
changeDate() { changeDate() {
this.endTime = moment(this.queryParams.startTime).add(9, 'days') this.endTime = moment(this.queryParams.startTime).add(9, 'days')
// this.fetchData();
this.initDays();
this.fetchStudioUseData();
}, },
// 查询列表 // 查询列表
fetchStudioUseData() { fetchStudioUseData() {
this.studioUseData = []
// 调用接口获取录播室占用情况数据 // 调用接口获取录播室占用情况数据
console.log(123654, this.queryParams); console.log(123654, this.queryParams);
getstudioUse(this.queryParams.startTime, this.queryParams.studioId).then((res) => { getstudioUse(this.queryParams.startTime, this.queryParams.studioId).then((res) => {
this.studioUseData = res.rows; this.studioUseData = res.rows;
console.log(123, this.studioUseData); console.log(123, this.studioUseData);
}); });
// getstudioUse(time, id).then((res) => {
// this.studioUseData = res.rows;
// console.log(123, this.studioUseData);
// });
}, },
//表格占用显示 //表格占用显示
isOccupied(day, index) { isOccupied(day, index) {
...@@ -173,7 +185,7 @@ export default { ...@@ -173,7 +185,7 @@ export default {
if (this.isOccupied(day, index)) { if (this.isOccupied(day, index)) {
return false return false
} else { } else {
console.log('this.selectedTimeSlots', this.selectedTimeSlots) // console.log('this.selectedTimeSlots', this.selectedTimeSlots)
// 检查时间段是否已选中 // 检查时间段是否已选中
return this.selectedTimeSlots.some((selectedSlot) => { return this.selectedTimeSlots.some((selectedSlot) => {
// console.log('selectedSlot',selectedSlot) // console.log('selectedSlot',selectedSlot)
...@@ -224,6 +236,13 @@ export default { ...@@ -224,6 +236,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();
}
}); });
}, },
...@@ -249,6 +268,7 @@ export default { ...@@ -249,6 +268,7 @@ export default {
// const startDate = new Date(); // const startDate = new Date();
// startDate.setDate(startDate.getDate() + 1); // startDate.setDate(startDate.getDate() + 1);
// console.log('startDate',startDate) // console.log('startDate',startDate)
this.days = []
for (let i = 0; i < 10; i++) { for (let i = 0; i < 10; i++) {
const formattedDate = moment(this.queryParams.startTime).add(i, 'days').format("YYYY-MM-DD"); const formattedDate = moment(this.queryParams.startTime).add(i, 'days').format("YYYY-MM-DD");
console.log('formattedDate', formattedDate) console.log('formattedDate', formattedDate)
......
ruoyi-ui/src/views/smartSchool/teachAffairAdministration/affairGradeManage/gradeMemberList/index.vue
...@@ -92,7 +92,9 @@ ...@@ -92,7 +92,9 @@
<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="teacherPost"/>
<el-table-column label="电话号码" align="center" prop="teacherTel"/> <el-table-column label="电话号码" align="center" prop="teacherTel"/>
<el-table-column label="家庭住址" align="center" prop="homeAddress"/> <el-table-column label="职务" align="center" prop="teacherPost"/>
<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
......
ruoyi-ui/src/views/smartSchool/teachAffairAdministration/affairGradeManage/index.vue
...@@ -2,25 +2,11 @@ ...@@ -2,25 +2,11 @@
<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="schoolYear"> <el-form-item label="学年" prop="schoolYear">
<el-input <el-input v-model="queryParams.schoolYear" placeholder="请输入学年" clearable @keyup.enter.native="handleQuery" />
v-model="queryParams.schoolYear"
placeholder="请输入学年"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="年级" prop="gradeValue"> <el-form-item label="年级" prop="gradeValue">
<el-select <el-select v-model="queryParams.gradeValue" clearable placeholder="请选择年级" style="width: 100%;">
v-model="queryParams.gradeValue" <el-option v-for="dict in dict.type.Grade" :key="dict.value" :label="dict.label" :value="dict.value">
clearable
placeholder="请选择年级"
style="width: 100%;"
>
<el-option
v-for="dict in dict.type.Grade"
:key="dict.value"
:label="dict.label"
:value="dict.value">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -31,38 +17,18 @@ ...@@ -31,38 +17,18 @@
</el-form> </el-form>
<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:grade:add']"> 新 增
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['system:grade: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:grade:edit']"> 修 改
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:grade: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:grade:remove']"> 删 除
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:grade:remove']"
> 删 除
</el-button> </el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
...@@ -84,114 +50,65 @@ ...@@ -84,114 +50,65 @@
</el-row> </el-row>
<el-table :data="gradeList" v-loading="loading" @selection-change="handleSelectionChange"> <el-table :data="gradeList" v-loading="loading" @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" min-width="100" prop="gradeYear"> <el-table-column label="届/级" align="center" min-width="100" prop="gradeYear">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.gradeYear }}</span> <span>{{ scope.row.gradeYear }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="级部名称" align="center" min-width="150" prop="gradeName"/> <el-table-column label="级部名称" align="center" min-width="150" prop="gradeName" />
<el-table-column label="学年" align="center" min-width="100" prop="schoolYear"/> <el-table-column label="学年" align="center" min-width="100" prop="schoolYear" />
<el-table-column label="年级" align="center" min-width="110" prop="gradeValue"> <el-table-column label="年级" align="center" min-width="110" prop="gradeValue">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.Grade" :value="scope.row.gradeValue"/> <dict-tag :options="dict.type.Grade" :value="scope.row.gradeValue" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备注" align="center" min-width="300" prop="remark"/> <el-table-column label="备注" align="center" min-width="300" prop="remark" />
<el-table-column label="操作" min-width="250" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" min-width="250" 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="gradeMemberList(scope.row)"
size="mini" v-hasPermi="['system:grade:edit']">级部成员
type="text"
icon="el-icon-edit"
@click="gradeMemberList(scope.row)"
v-hasPermi="['system:grade:edit']"
>级部成员
</el-button> </el-button>
<el-button <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
size="mini" v-hasPermi="['system:grade:edit']">修改
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:grade: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:grade:remove']">删除
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:grade: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"
/>
<!-- 添加或修改学校年级级部对话框 --> <!-- 添加或修改学校年级级部对话框 -->
<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="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="届/级：" prop="gradeYear"> <el-form-item label="届/级：" prop="gradeYear">
<el-date-picker <el-date-picker style="width: 100%;" value-format="yyyy" v-model="form.gradeYear" type="year"
style="width: 100%;"
value-format="yyyy"
v-model="form.gradeYear"
type="year"
placeholder="请选择届/级"> placeholder="请选择届/级">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="级部名称：" prop="gradeName"> <el-form-item label="级部名称：" prop="gradeName">
<el-input <el-input disabled v-model="form.gradeName" placeholder="请选择上方的届/级" clearable />
disabled
v-model="form.gradeName"
placeholder="请选择上方的届/级"
clearable
/>
</el-form-item> </el-form-item>
<el-form-item label="学年：" prop="schoolYear"> <el-form-item label="学年：" prop="schoolYear">
<el-date-picker <el-date-picker style="width: 100%;" v-model="form.schoolYear" value-format="yyyy" type="year"
style="width: 100%;" :picker-options="pickerOptions" placeholder="选择学年">
v-model="form.schoolYear"
value-format="yyyy"
type="year"
:picker-options="pickerOptions"
placeholder="选择学年">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="年级：" prop="gradeValue"> <el-form-item label="年级：" prop="gradeValue">
<el-select <el-select v-model="form.gradeValue" disabled clearable style="width: 100%;" placeholder="请选择上方的学年">
v-model="form.gradeValue" <el-option v-for="dict in dict.type.Grade" :key="dict.value" :label="dict.label" :value="Number(dict.value)">
disabled
clearable
style="width: 100%;"
placeholder="请选择上方的学年"
>
<el-option
v-for="dict in dict.type.Grade"
:key="dict.value"
:label="dict.label"
:value="Number(dict.value)">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input <el-input v-model="form.remark" placeholder="请输入备注" clearable type="textarea"
v-model="form.remark" @keyup.enter.native="handleQuery" />
placeholder="请输入备注"
clearable
type="textarea"
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
...@@ -261,10 +178,10 @@ export default { ...@@ -261,10 +178,10 @@ export default {
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {
gradeYear: [{required: true, message: '届/级不能为空', trigger: 'change'}], gradeYear: [{ required: true, message: '届/级不能为空', trigger: 'change' }],
gradeName: [{required: true, message: '级部名称不能为空', trigger: 'blur'}], gradeName: [{ required: true, message: '级部名称不能为空', trigger: 'blur' }],
schoolYear: [{required: true, message: '学年不能为空', trigger: 'change'}], schoolYear: [{ required: true, message: '学年不能为空', trigger: 'change' }],
gradeValue: [{required: true, message: '年级不能为空', trigger: 'change'}], gradeValue: [{ required: true, message: '年级不能为空', trigger: 'change' }],
// remark: [{required: true, message: '备注不能为空', trigger: 'blur'}], // remark: [{required: true, message: '备注不能为空', trigger: 'blur'}],
}, },
pickerOptions: { pickerOptions: {
...@@ -323,6 +240,8 @@ export default { ...@@ -323,6 +240,8 @@ export default {
type: 'success', type: 'success',
message: '升级操作成功!' message: '升级操作成功!'
}); });
this.getList();
} else { } else {
this.$modal.msgError("升级操作失败"); this.$modal.msgError("升级操作失败");
} }
......
ruoyi-ui/src/views/smartSchool/teachAffairAdministration/statistics/age/index.vue
<template> <template>
<div class="app-container"> <div class="app-container">
<!-- <div id="gradeEcharts" :style="{ width: '100%', height: '600px' }"></div>--> <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" clearable type="year" value-format="yyyy" style="width: 100%"
placeholder="选择年度"></el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="gradeAgeList">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button> <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
<el-table </el-form-item>
:data="tableData" </el-form>
border <el-table :data="tableData" border stripe style="width: 100%">
stripe <el-table-column prop="gradeName" label="年级" align="center" width="180">
style="width: 100%">
<el-table-column
prop="gradeName"
label="年级"
align="center"
width="180">
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="num13" label="13岁" align="center" width="180">
prop="num13"
label="13岁"
align="center"
width="180">
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="num14" label="14岁" align="center" width="180">
prop="num14"
label="14岁"
align="center"
width="180">
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="num15" align="center" label="15岁">
prop="num15"
align="center"
label="15岁">
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="num16" align="center" label="16岁">
prop="num16"
align="center"
label="16岁">
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="num17" align="center" label="17岁">
prop="num17"
align="center"
label="17岁">
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="num18" align="center" label="18岁">
prop="num18"
align="center"
label="18岁">
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="num19" align="center" label="19岁">
prop="num19"
align="center"
label="19岁">
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="num20" align="center" label="20岁">
prop="num20"
align="center"
label="20岁">
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="num21" align="center" label="21岁">
prop="num21"
align="center"
label="21岁">
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="num22" align="center" label="22岁">
prop="num22"
align="center"
label="22岁">
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
...@@ -71,25 +40,29 @@ ...@@ -71,25 +40,29 @@
<script> <script>
import * as echarts from 'echarts'; import * as echarts from 'echarts';
import {listGradeAge} from "@/api/smartSchool/teachAffairAdministration/ageStatistics"; import { listGradeAge } from "@/api/smartSchool/teachAffairAdministration/ageStatistics";
export default { export default {
name: "index", name: "index",
created() { created() {
this.gradeAgeList() this.gradeAgeList();
this.getNowYear();
}, },
mounted() { mounted() {
// console.log(echarts, 'create') // console.log(echarts, 'create')
// // 基于准备好的dom，初始化echarts实例 // // 基于准备好的dom，初始化echarts实例
// let myChart = echarts.init(document.getElementById('gradeEcharts')); // let myChart = echarts.init(document.getElementById('gradeEcharts'));
// // 绘制图表 // // 绘制图表
// myChart.setOption(this.gradeData); // myChart.setOption(this.gradeData);
// window.addEventListener("resize", function () { // window.addEventListener("resize", function () {
// myChart.resize() // myChart.resize()
// }) // })
}, },
data() { data() {
return { return {
queryForm: {
classYear: '',
},
tableData: [], tableData: [],
gradeData: { gradeData: {
title: { title: {
...@@ -172,12 +145,23 @@ export default { ...@@ -172,12 +145,23 @@ export default {
} }
}, },
methods: { methods: {
gradeAgeList() { gradeAgeList() {
listGradeAge().then((res) => { listGradeAge(this.classYear).then((res) => {
this.tableData = res.rows this.tableData = res.rows
console.log('this.tableData', this.tableData);
}) })
}, },
//获得当前年份
getNowYear() {
this.classYear = new Date().getFullYear() + '';
},
// 重置按钮
resetQuery() {
this.getNowYear();
this.getList();
},
/** 【导出】按钮 */ /** 【导出】按钮 */
handleExport() { handleExport() {
this.throttle(() => { this.throttle(() => {
...@@ -188,6 +172,4 @@ export default { ...@@ -188,6 +172,4 @@ export default {
} }
</script> </script>
<style scoped> <style scoped></style>
</style>
ruoyi-ui/src/views/smartSchool/teacherManage/teacherInforManage/index.vue
...@@ -209,14 +209,14 @@ ...@@ -209,14 +209,14 @@
prop="teacherTel" prop="teacherTel"
/> />
<el-table-column <el-table-column
label="学历" label="职工类型"
align="center" align="center"
prop="education" prop="employeeType"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag <dict-tag
:options="dict.type.education" :options="dict.type.employee_type"
:value="scope.row.education" :value="scope.row.employeeType"
/> />
</template> </template>
</el-table-column> </el-table-column>
...@@ -358,15 +358,15 @@ ...@@ -358,15 +358,15 @@
@export="exportFile" @export="exportFile"
></ExportTable> ></ExportTable>
<!-- 添加或修改学校老师对话框 --> <!-- 添加或修改学校老师对话框 -->
<el-dialog :title="title" :visible.sync="open" width="900px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="60%" append-to-body>
<el-form <el-form
size="small" size="small"
ref="form" ref="form"
:model="form" :model="form"
:rules="rules" :rules="rules"
:disabled="isDisabled" :disabled="isDisabled"
label-width="80px" label-width="120px"
style="width: 100%;"
> >
<el-row :gutter="40"> <el-row :gutter="40">
<el-col :span="12" style="text-align: center;"> <el-col :span="12" style="text-align: center;">
...@@ -904,6 +904,7 @@ export default { ...@@ -904,6 +904,7 @@ export default {
this.loading = true; this.loading = true;
listInform(this.queryParams).then((response) => { listInform(this.queryParams).then((response) => {
this.informList = response.rows; this.informList = response.rows;
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
}); });
......
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