Skip to content

D
dd_school
Commit b094023e by zhaopanyu
Options

zpy 8.24 修改

parent 6408f8b3
Showing with 399 additions and 596 deletions
ruoyi-ui/src/api/smartSchool/gradeWork/stuLeaveView/index.js
import request from '@/utils/request'
import request from "@/utils/request";
// 查询学生请假信息列表
export function getlistStuLeave(query) {
console.log(query)
console.log(query);
return request({
url: '/school/studentLeave/gradeList',
method: 'get',
params: query
})
url: "/school/studentLeave/gradeList",
method: "get",
params: query,
});
}
//查看审批流程;
export function getProcess(query) {
return request({
url: `/activiti/process/listHistory/`,
method: "get",
params: query,
});
}
// 查询学生请假信息详情
export function getStuLeaveOne(id) {
return request({
url: '/school/studentLeave/queryOne/' + id,
method: 'get'
})
url: "/school/studentLeave/queryOne/" + id,
method: "get",
});
}
ruoyi-ui/src/api/smartSchool/informationPush/personnelGrouping.js
......@@ -3,11 +3,19 @@ import request from "@/utils/request";
//人员分组
//获取分组集合
export function getUserList(data) {
export function getUserList(query) {
return request({
url: "/notification/list",
url: `/notification/list`,
method: "get",
params: query,
});
}
//修改详情
export function getXg(id) {
return request({
url: `/notification/selectOne/${id}`, // 在这里使用正确的拼接方式
method: "get",
data,
});
}
......@@ -16,7 +24,6 @@ export function getUser(notificationId) {
return request({
url: `/notification/getUserList/${notificationId}`,
method: "get",
// params: id
});
}
......@@ -39,7 +46,7 @@ export function addUser(data) {
}
//删除人员
export function deleteUser() {
export function deleteUser(data) {
return request({
url: "/notification/delectNotificationUser",
method: "put",
......@@ -51,7 +58,7 @@ export function deleteUser() {
export function updateNotification(data) {
return request({
url: "/notification/update",
method: "post",
method: "put",
data,
});
}
......
ruoyi-ui/src/components/FilepersonUploadNew/index.vue
......@@ -17,15 +17,16 @@
<transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear" tag="ul">
<li :key="file.url" class="el-upload-list__item ele-upload-list__item-content" v-for="(file, index) in fileList">
<el-link :href="`${baseUrl}${file.url}`" :underline="false" target="_blank">
<span class="el-icon-document"> {{ file.name }} </span>
<span class="el-icon-document">{{ file.name }}</span>
</el-link>
<div class="ele-upload-list__item-content-action" style="float: right">
<el-link style="margin-left: 10px;color: #1890ff" :href="`${baseUrl}${file.url}`" :underline="false"
<el-link style="margin-left: 10px; color: #1890ff" :href="`${baseUrl}${file.url}`" :underline="false"
target="_blank">下载</el-link>
<el-link style="margin-left: 15px" :underline="false" @click="handleDelete(index)" type="danger">删除</el-link>
</div>
</li>
</transition-group>
</div>
</template>
......
ruoyi-ui/src/layout/components/Navbar.vue
<template>
<div class="navbar">
<hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container"
@toggleClick="toggleSideBar"/>
@toggleClick="toggleSideBar" />
<breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav"/>
<top-nav id="topmenu-container" class="topmenu-container" v-if="topNav"/>
<breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav" />
<top-nav id="topmenu-container" class="topmenu-container" v-if="topNav" />
<div class="right-menu">
<template v-if="device!=='mobile'">
<search id="header-search" class="right-menu-item"/>
<screenfull id="screenfull" class="right-menu-item hover-effect"/>
<template v-if="device !== 'mobile'">
<search id="header-search" class="right-menu-item" />
<screenfull id="screenfull" class="right-menu-item hover-effect" />
<el-tooltip content="布局大小" effect="dark" placement="bottom">
<size-select id="size-select" class="right-menu-item hover-effect"/>
<size-select id="size-select" class="right-menu-item hover-effect" />
</el-tooltip>
</template>
......@@ -19,11 +19,11 @@
<el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
<div class="avatar-wrapper">
<img :src="avatar" @error="handleError" class="user-avatar">
<i class="el-icon-caret-bottom"/>
<i class="el-icon-caret-bottom" />
</div>
<el-dropdown-menu slot="dropdown">
<!-- <router-link to="/user/profile">-->
<router-link to="/personWork/basicInfo">
<router-link to="/personWork/grxx/basicInfo">
<el-dropdown-item>个人中心</el-dropdown-item>
</router-link>
<el-dropdown-item @click.native="setting = true">
......@@ -39,7 +39,7 @@
</template>
<script>
import {mapGetters} from 'vuex'
import { mapGetters } from 'vuex'
import Breadcrumb from '@/components/Breadcrumb'
import TopNav from '@/components/TopNav'
import Hamburger from '@/components/Hamburger'
......
ruoyi-ui/src/router/index.js
......@@ -131,20 +131,29 @@ export const dynamicRoutes = [
},
],
},
{
path: "/system/dict-data",
path: "/schoolManage/schoolNotice",
component: Layout,
hidden: true,
permissions: ["system:dict:list"],
permissions: ["system:role:edit"],
children: [
{
path: "index/:dictId(\\d+)",
component: () => import("@/views/system/dict/data"),
name: "Data",
meta: { title: "字典数据", activeMenu: "/system/dict" },
path: "/personnelGrouping/authUser",
component: () =>
import(
"@/views/smartSchool/schoolManage/schoolNotice/personnelGrouping/authUser.vue"
),
name: "AuthUser",
meta: {
title: "分配成员",
activeMenu:
"/smartSchool/schoolManage/schoolNotice/personnelGrouping",
},
},
],
},
{
path: "/monitor/job-log",
component: Layout,
......
ruoyi-ui/src/views/components/moduleComponets/TeacherSelect/index.vue
......@@ -40,7 +40,13 @@
</template>
</el-table-column>
<el-table-column label="老师电话" width="160" align="center" prop="teacherTel" />
<el-table-column label="职工类型" width="160" align="center" prop="employeeType" />
<el-table-column label="职工类型" width="160" align="center" prop="employeeType">
<template slot-scope="{ row }">
<div>{{ selectDictLabel(dict.type.employee_type, row.employeeType) }}</div>
</template>
</el-table-column>
<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"/> -->
......@@ -63,7 +69,7 @@ import { Gender } from "../../../../enums/common";
export default {
name: "TeacherSelect",
dicts: ['sys_user_sex'],
dicts: ['sys_user_sex', 'employee_type'],
components: {
ListImage
},
......
ruoyi-ui/src/views/smartSchool/gradeWork/clockManage/clockRecord.vue
......@@ -2,23 +2,12 @@
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="80px">
<el-form-item label="姓名" prop="userName">
<el-input
v-model="queryParams.userName"
placeholder="请输入姓名"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.userName" placeholder="请输入姓名" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="日期">
<el-date-picker
style="width: 300px"
v-model="dateRange"
value-format="yyyy-MM-dd"
type="datetimerange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
<el-date-picker style="width: 300px" v-model="dateRange" value-format="yyyy-MM-dd" type="datetimerange"
range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
</el-date-picker>
</el-form-item>
<!-- <el-form-item label="部门" prop="department">
......@@ -36,14 +25,14 @@
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="clockRecordList" stripe>
<el-table-column label="序号" type="index" width="55" align="center"/>
<el-table-column label="设备工号" align="center" prop="deviceNum"/>
<el-table-column label="员工工号" align="center" prop="teacherCode"/>
<el-table-column label="姓名" align="center" prop="userName"/>
<el-table-column label="部门" align="center" prop="orgname"/>
<el-table-column label="考勤日期" align="center" prop="clockDate"/>
<el-table-column label="打卡时间" align="center" prop="times"/>
<el-table-column label="备注" align="center" prop="remark"/>
<el-table-column label="序号" type="index" width="55" align="center" />
<el-table-column label="设备工号" align="center" prop="deviceNum" />
<el-table-column label="员工工号" align="center" prop="teacherCode" />
<el-table-column label="姓名" align="center" prop="userName" />
<el-table-column label="部门" align="center" prop="orgname" />
<el-table-column label="考勤日期" align="center" prop="clockDate" />
<el-table-column label="打卡时间" align="center" prop="times" />
<el-table-column label="备注" align="center" prop="remark" />
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
......@@ -57,11 +46,13 @@
</template>
</el-table-column> -->
</el-table>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
</div>
</template>
<script>
import {personalList, checkRow} from "@/api/smartSchool/gradeWork/monthRecord.js"
import { personalList, checkRow } from "@/api/smartSchool/gradeWork/monthRecord.js"
export default {
name: 'GradeWorkClockRecord',
......@@ -121,5 +112,4 @@ export default {
}
};
</script>
<style scoped>
</style>
<style scoped></style>
ruoyi-ui/src/views/smartSchool/gradeWork/courseSelection/summerViewing/index.vue
......@@ -179,7 +179,6 @@ export default {
//获取每种课程选择人数
getCourseSelection() {
getsDivision({ curriculaId: this.queryForm.curriculaId }).then(res => {
if (res.code == 200) {
this.selectedCourse = res.data.map(item => {
return {
......@@ -232,7 +231,8 @@ export default {
// 分班按钮
submitForm() {
// 检查是否已经分班
const alreadyDivided = this.selectedCourse.some(course => course.divisionClassesRule !== null);
const alreadyDivided = this.selectedCourse.every(course => course.divisionClassesRule !== "");
console.log('this.selectedCourse', this.selectedCourse);
if (alreadyDivided) {
this.$message.warning("已经分班，无法重复操作");
return;
......@@ -242,25 +242,27 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
let that = this;
for (let i = 0; i < this.selectedCourse.length; i++) {
that.selectedCourse[i].divisionClassesRule = that.form.divisionClassesRule;
const course = this.selectedCourse[i];
console.log('course.divisionClassesRule:', course.divisionClassesRule);
console.log('course.classesNumber:', course.classesNumber);
console.log('course.peopleNumber:', course.peopleNumber);
if (course.divisionClassesRule === '' || course.classesNumber === '' || course.peopleNumber === '') {
this.$message.error("分班规则、班级数量和每班人数不能为空");
return;
}
let totalPeopleNumber = course.classesNumber * course.peopleNumber;
if (totalPeopleNumber > this.selectedCourse.length) {
this.$message.error("班级数量和每班人数相乘不能超过总人数");
return;
}
}
console.log('this.selectedCourse', this.selectedCourse);
// let that = this;
// for (let i = 0; i < this.selectedCourse.length; i++) {
// that.selectedCourse[i].divisionClassesRule = that.form.divisionClassesRule;
// const course = this.selectedCourse[i];
// console.log('course.divisionClassesRule:', course.divisionClassesRule);
// console.log('course.classesNumber:', course.classesNumber);
// console.log('course.peopleNumber:', course.peopleNumber);
// if (course.divisionClassesRule === '' || course.classesNumber === '' || course.peopleNumber === '') {
// this.$message.error("分班规则、班级数量和每班人数不能为空");
// return;
// }
// let totalPeopleNumber = course.classesNumber * course.peopleNumber;
// console.log('totalPeopleNumber', totalPeopleNumber);
// if (totalPeopleNumber > this.coursePeopleNumber) {
// console.log('this.coursePeopleNumber', this.coursePeopleNumber);
// this.$message.error("班级数量和每班人数相乘不能超过总人数");
// return;
// }
// }
// console.log('this.selectedCourse', this.selectedCourse);
addDivision(this.selectedCourse).then((response) => {
console.log('this.selectedCourse', this.selectedCourse);
this.$modal.msgSuccess("分班成功");
......
ruoyi-ui/src/views/smartSchool/gradeWork/courseSelection/taskPublishing/index.vue
......@@ -53,7 +53,7 @@
<el-button class="purpleBtn" size="small" round
@click="summerViewing(task.id, task.grade)">夏季选课情况</el-button>
<el-button class="rowBtn" size="small" round
@click="secondaryDivision(task.id, task.grade)">夏季二次选课</el-button>
@click="secondaryDivision(task.id, task.grade)">夏季二次分班</el-button>
</div>
</div>
</div>
......
ruoyi-ui/src/views/smartSchool/gradeWork/parentsInfoPush/receiveList/index.vue
......@@ -4,71 +4,56 @@
<el-form ref="form" :model="form" label-width="80px">
<el-row>
<el-col :span="8" :offset="2">
<el-form-item label="标题" prop="title">
<el-input v-model="form.title" disabled />
</el-form-item>
<el-form-item label="标题" prop="title">
<el-input v-model="form.title" disabled />
</el-form-item>
</el-col>
<el-col :span="8" :offset="2">
<el-form-item label="类型" prop="type">
<el-select v-model="form.type" disabled style="width: 100%">
<el-option
v-for="dict in dict.type.sys_notice_type"
:key="dict.value"
:label="dict.label"
:value="dict.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="类型" prop="type">
<el-select v-model="form.type" disabled style="width: 100%">
<el-option v-for="dict in dict.type.sys_notice_type" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
<h4 class="form-header h4">详情列表</h4>
<el-row class="mb8" :gutter="10">
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="primary"-->
<!-- plain-->
<!-- size="mini"-->
<!-- icon="el-icon-plus"-->
<!-- @click="handleAdd"-->
<!-- >新增-->
<!-- </el-button>-->
<!-- </el-col>-->
<!-- <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 :span="1.5">-->
<!-- <el-button-->
<!-- type="primary"-->
<!-- plain-->
<!-- size="mini"-->
<!-- icon="el-icon-plus"-->
<!-- @click="handleAdd"-->
<!-- >新增-->
<!-- </el-button>-->
<!-- </el-col>-->
<!-- <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 :span="1.5">
<el-button
type="info"
plain
size="mini"
icon="el-icon-close"
@click="handleClose"
>关闭
<el-button type="info" plain size="mini" icon="el-icon-close" @click="handleClose">关闭
</el-button>
</el-col>
</el-row>
<el-table
ref="receiveList"
stripe
style="width: 100%;"
:data="receiveList"
@selection-change="handleSelectChange"
>
<el-table ref="receiveList" stripe style="width: 100%;" :data="receiveList" @selection-change="handleSelectChange">
<el-table-column type="selection" align="center" width="55"></el-table-column>
<!-- <el-table-column label="工作编号" prop="teacherCode" align="center"></el-table-column>-->
<el-table-column label="姓名" prop="parentName" align="center"></el-table-column>
<el-table-column label="关系" prop="relationship" align="center">
<template slot-scope="scope">
<dict-tag :options="dict.type.relationship" :value="scope.row.relationship"/>
<dict-tag :options="dict.type.relationship" :value="scope.row.relationship" />
</template>
</el-table-column>
<!-- <el-table-column label="性别" prop="sex" align="center"></el-table-column>-->
......@@ -76,24 +61,15 @@
<!-- <el-table-column label="身份号" prop="idCard" align="center"></el-table-column>-->
<el-table-column label="是否阅读" prop="status" align="center">
<template slot-scope="scope">
<el-tag type="success" v-if="scope.row.status==1">已阅读</el-tag>
<el-tag type="success" v-if="scope.row.status == 1">已阅读</el-tag>
<el-tag type="warning" v-else>未阅读</el-tag>
</template>
</el-table-column>
</el-table>
<ExPagination
v-show="total > 0"
:total="total"
:page.sync="queryForm.pageNum"
:limit.sync="queryForm.pageSize"
@pagination="getList"
></ExPagination>
<ExPagination v-show="total > 0" :total="total" :page.sync="queryForm.pageNum" :limit.sync="queryForm.pageSize"
@pagination="getList"></ExPagination>
<el-dialog
:visible.sync="open"
title="选择推送人"
width="960px"
>
<el-dialog :visible.sync="open" title="选择推送人" width="960px">
<el-form :model="pushForm" inline size="small">
<el-form-item label="姓名" porp="userName">
<el-input v-model="pushForm.userName"></el-input>
......@@ -102,44 +78,22 @@
<el-input v-model="pushForm.phonenumber"></el-input>
</el-form-item>
<el-form-item>
<el-button
type="primary"
size="small"
icon="el-icon-search"
@click="handlePushQuery"
>搜索
<el-button type="primary" size="small" icon="el-icon-search" @click="handlePushQuery">搜索
</el-button>
<el-button
plain
size="small"
icon="el-icon-refresh"
@click="resetPushQuery"
>重置
<el-button plain size="small" icon="el-icon-refresh" @click="resetPushQuery">重置
</el-button>
</el-form-item>
</el-form>
<el-table
ref="pushList"
stripe
width="100%"
v-loading="loading"
:data="pushList"
@selection-change="handleSelectPush"
@row-click="handleRowClick"
>
<el-table ref="pushList" stripe width="100%" v-loading="loading" :data="pushList"
@selection-change="handleSelectPush" @row-click="handleRowClick">
<el-table-column type="selection" align="center"></el-table-column>
<el-table-column type="index" label="序号" align="center"></el-table-column>
<el-table-column label="用户姓名" prop="userName" align="center"></el-table-column>
<el-table-column label="手机号" prop="phonenumber" align="center"></el-table-column>
</el-table>
<ExPagination
v-show="total > 0"
:total="total"
:page.sync="queryForm.pageNum"
:limit.sync="queryForm.pageSize"
@paginaiton="getList"
></ExPagination>
<ExPagination v-show="total > 0" :total="total" :page.sync="queryForm.pageNum" :limit.sync="queryForm.pageSize"
@paginaiton="getList"></ExPagination>
<div slot="footer">
<el-button :disabled="!isSimple" type="primary" size="small" @click="handleSelect">确 认</el-button>
......@@ -151,7 +105,7 @@
</template>
<script>
import {addReceive, deleteReceive, getList} from "@/api/smartSchool/informationPush/parentsDetails";
import { addReceive, deleteReceive, getList } from "@/api/smartSchool/informationPush/parentsDetails";
export default {
name: "ParentInfo",
......@@ -190,9 +144,9 @@ export default {
methods: {
/** 初始化参数数据、列表数据查询 */
init() {
const {title, type} = this.$route.query;
const { title, type } = this.$route.query;
this.pushId = this.$route.query && this.$route.query.id;
this.form = {title, type};
this.form = { title, type };
this.getList();
},
/** 获取列表数据 */
......@@ -235,7 +189,7 @@ export default {
/** 关闭 */
handleClose() {
this.$tab.closeOpenPage({
path: '/gradeWork/parentsInfoPush'
path: '/gradeWork/jxgy/parentsInfoPush'
});
},
......@@ -297,6 +251,4 @@ export default {
}
</script>
<style scoped>
</style>
<style scoped></style>
ruoyi-ui/src/views/smartSchool/gradeWork/studentLeaveView/index.vue
......@@ -14,8 +14,7 @@
</el-form-item>
<el-form-item label="审批状态：" prop="state" label-width="105px">
<el-select v-model="queryParams.state" placeholder="请选择审批状态">
<el-option v-for="dict in dict.type.approval_status" :key="dict.value" :label="dict.label"
:value="dict.value">
<el-option v-for="dict in dict.type.approval_status" :key="dict.value" :label="dict.label" :value="dict.value">
{{ dict.label }}
</el-option>
</el-select>
......@@ -26,35 +25,34 @@
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="teacherLeaveList">
<el-table-column type="index" width="55" label="序号" fixed="left" align="center"/>
<el-table-column label="姓名" min-width="100" align="center" fixed="left" prop="studentName"/>
<el-table-column label="班级" align="center" min-width="100" prop="className"/>
<el-table-column label="请假开始时间" sortable prop="startTime" align="center" min-width="180"/>
<el-table-column label="请假结束时间" sortable align="center" prop="endTime" min-width="180"/>
<el-table-column type="index" width="55" label="序号" fixed="left" align="center" />
<el-table-column label="姓名" min-width="100" align="center" fixed="left" prop="studentName" />
<el-table-column label="班级" align="center" min-width="100" prop="className" />
<el-table-column label="请假开始时间" sortable prop="startTime" align="center" min-width="180" />
<el-table-column label="请假结束时间" sortable align="center" prop="endTime" min-width="180" />
<el-table-column label="请假类型" align="center" prop="type" min-width="100">
<template slot-scope="scope">
<dict-tag :options="dict.type.biz_leave_type" :value="scope.row.type"></dict-tag>
</template>
</el-table-column>
<el-table-column label="请假原因" min-width="220" align="center" prop="leaveReason"
show-overflow-tooltip/>
<el-table-column label="请假原因" min-width="220" align="center" prop="leaveReason" show-overflow-tooltip />
<el-table-column label="申请时间" align="center" prop="applyTime" min-width="150">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.applyTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="申请人" align="center" prop="applyUser" min-width="100"/>
<el-table-column label="申请人" align="center" prop="applyUser" min-width="100" />
<el-table-column label="审批状态" align="center" prop="state" min-width="100">
<template slot-scope="scope">
<dict-tag :options="dict.type.approval_status" :value="scope.row.state"/>
<dict-tag :options="dict.type.approval_status" :value="scope.row.state" />
</template>
</el-table-column>
<el-table-column label="返校时间" align="center" prop="revokeTime" min-width="150px"/>
<el-table-column label="返校时间" align="center" prop="revokeTime" min-width="150px" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="100" key="operate">
<template slot-scope="scope">
<!-- <el-button v-if="scope.row.taskName === '等待销假'" type="text" size="mini" icon="el-icon-edit" @click="handleResolve(scope.row, false)">销假 </el-button> -->
<el-button size="mini" type="text" icon="el-icon-search" @click="handleDetail(scope.row)"
v-hasPermi="['system:teacherOvertime:edit']">查看
v-hasPermi="['system:teacherOvertime:edit']">查看
</el-button>
</template>
</el-table-column>
......@@ -63,11 +61,11 @@
<!-- @pagination="getList"></ExPagination>-->
<!-- <HandleResolve v-if="process.open" :process-open.sync="process.open" :instanceId="process.instanceId" :id="process.id" :taskId="process.taskId" :readOnly="process.readOnly" :revoke="process.revoke" @refreshData="refreshData"></HandleResolve> -->
<el-dialog :title="title" :visible.sync="dialogTeacherLeave" width="1000px" append-to-body>
<el-form ref="form" :model="form" label-width="120px" style="width: 100%; margin: auto">
<el-form ref="form" :model="form" label-width="120px" style="width: 100%; margin: auto" :disabled="!isEditable">
<el-row>
<el-col :span="11">
<el-form-item label="姓名" prop="studentName">
<el-input :value="form.studentName"/>
<el-input :value="form.studentName" />
</el-form-item>
</el-col>
<el-col :offset="2" :span="11">
......@@ -79,15 +77,15 @@
<el-row>
<el-col :span="11">
<el-form-item label="请假开始时间" prop="startTime">
<el-date-picker style="width: 100%" :value="form.startTime" type="datetime"
value-format="yyyy-MM-dd HH:mm" placeholder="选择开始时间"></el-date-picker>
<el-date-picker style="width: 100%" :value="form.startTime" type="datetime" value-format="yyyy-MM-dd HH:mm"
placeholder="选择开始时间"></el-date-picker>
</el-form-item>
</el-col>
<el-col :offset="2" :span="11">
<el-form-item label="请假结束时间" prop="endTime">
<el-date-picker style="width: 100%" :value="form.endTime" type="datetime" value-format="yyyy-MM-dd HH:mm"
placeholder="选择结束时间"></el-date-picker>
placeholder="选择结束时间"></el-date-picker>
</el-form-item>
</el-col>
</el-row>
......@@ -96,13 +94,18 @@
<el-form-item label="请假类型" prop="type">
<el-select :value="form.type" style="width: 100%" placeholder="请选择请假类型">
<el-option v-for="dict in dict.type.biz_leave_type" :key="dict.value" :label="dict.label"
:value="dict.value"></el-option>
:value="dict.value"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :offset="2" :span="11">
<el-form-item label="当前任务" prop="taskName">
<el-input :value="form.taskName" style="width: 100%" placeholder="请输入" />
</el-form-item>
</el-col>
</el-row>
<el-form-item label="请假原因" prop="leaveReason">
<el-input type="textarea" resize="none" :autosize="{ minRows: 5 }" :value="form.leaveReason"/>
<el-input type="textarea" resize="none" :autosize="{ minRows: 5 }" :value="form.leaveReason" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
......@@ -112,8 +115,9 @@
</div>
</template>
<script>
import {getlistStuLeave, getStuLeaveOne} from '@/api/smartSchool/gradeWork/stuLeaveView'
import { getlistStuLeave, getStuLeaveOne, getProcess } from '@/api/smartSchool/gradeWork/stuLeaveView'
import HandleResolve from '@/views/smartSchool/gradeWork/studentLeaveView/components/HandleResolve'
import { courseSelectionSpringList } from '../../../../api/smartSchool/gradeWork/courseSelection/courseSelection'
export default {
name: 'StudentLeaveView',
......@@ -123,6 +127,7 @@ export default {
},
created() {
this.getList()
},
data() {
return {
......@@ -138,6 +143,7 @@ export default {
multiple: true,
// 遮罩层
loading: true,
isEditable: true,
// 弹出层标题
title: '',
dialogTeacherLeaveView: false,
......@@ -215,8 +221,11 @@ export default {
handleDetail(row) {
let stuId = row.id
getStuLeaveOne(stuId).then(response => {
this.form = response.data
this.dialogTeacherLeave = true
this.form = response.data;
this.form.instanceId = response.data.instanceId;
console.log('this.form.instanceId', this.form.instanceId);
this.dialogTeacherLeave = true;
this.isEditable = false;
this.title = '学生请假信息详情'
})
},
......
ruoyi-ui/src/views/smartSchool/indexMould/myTask/purchaseApproval/components/TaskResolve.vue
......@@ -48,7 +48,7 @@ export default {
return {
postForm: {
comment: '',
pass: "true",
pass: "",
},
// 意见模板
templateComment: '',
......
ruoyi-ui/src/views/smartSchool/indexMould/myTask/studentLeaveApproval/HandleResolve/TaskResolve.vue
......@@ -48,7 +48,7 @@ export default {
return {
postForm: {
comment: '',
pass: 'true'
pass: ''
},
// 意见模板
templateComment: '',
......
ruoyi-ui/src/views/smartSchool/indexMould/myTask/teachLeaveApprove/HandleResolve/TaskResolve.vue
......@@ -52,7 +52,7 @@ export default {
return {
postForm: {
comment: '',
pass: 'true',
pass: '',
},
// 意见模板
templateComment: '',
......
ruoyi-ui/src/views/smartSchool/officialWork/clockManage/clockRecord.vue
......@@ -45,6 +45,8 @@
</template>
</el-table-column> -->
</el-table>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
</div>
</template>
......
ruoyi-ui/src/views/smartSchool/personWork/auditoriumReservation/index.vue
......@@ -6,11 +6,12 @@
</el-form-item>
<el-form-item>
<el-date-picker v-model="dateRange" type="daterange" range-separator="至" start-placeholder="开始日期"
end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" @change="changeData(dateRange)">
</el-date-picker>
end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" @change="changeData(dateRange)"
:clearable="true" @clear="clearDateRange"></el-date-picker>
<!-- 时间短（天） -->
<span v-if="diffDate !== ''" style="font-size: 14px">({{ diffDate }})天</span>
<span v-if="diffDate !== '' && dateRange" style="font-size: 14px">({{ diffDate }})天</span>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-circle-plus" size="mini" @click="handleAdd">新增</el-button>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
......@@ -549,6 +550,11 @@ export default {
},
methods: {
// 清空时间段
clearDateRange() {
this.dateRange = []; // 或者设置为null，取决于数据类型
this.diffDate = ''; // 清空 diffDate 变量
},
downloadFile(url) {
// 在这里编写下载文件的逻辑，可以使用浏览器的下载功能或者自定义的下载方法
window.open(url, "_blank");
......
ruoyi-ui/src/views/smartSchool/personWork/awArds/materialPreparation/index.vue
<template>
<div class="" style="padding:15px 10px 0 10px">
<el-form :model="queryParams" ref="queryForm" :inline="true" style="padding:0 0 0 0" size="small">
<el-form-item prop="name">
<el-input v-model="queryParams.name" placeholder="名称" />
<el-form-item prop="name" label="获奖名称">
<el-input v-model="queryParams.name" placeholder="请输入" />
</el-form-item>
<el-form-item prop="publishTime">
<el-date-picker v-model="queryParams.publishTime" type="date" value-format="yyyy-MM-dd" placeholder="发表时间">
<el-form-item prop="publishTime" label="发表时间">
<el-date-picker v-model="queryParams.publishTime" type="date" value-format="yyyy-MM-dd" placeholder="请选择">
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" size="mini" plain icon="el-icon-plus" @click="handleAdd"> 新增 </el-button>
<el-button icon="el-icon-search" type="primary" size="mini" @click="getList">搜索</el-button>
......@@ -42,21 +41,21 @@
<el-form ref="form" :model="form" label-width="114px" :rules="rules">
<el-row>
<el-col :span="8">
<el-form-item label="名称">
<el-form-item label="名称" prop="name">
<el-input v-model="form.name" :style="{ width: '100%' }"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="发表时间：" prop="publishTime">
<el-date-picker v-model="form.publishTime" type="date" placeholder="选择发表时间"
:style="{ width: '100%' }">
:style="{ width: '100%' }" value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="16">
<el-form-item label="附件 :" prop="url">
<el-form-item label="附件 :" :rules="[{ required: true, message: '请上传附件' }]">
<FilepersonUploadNew @input="getFileList" :value="fileList"></FilepersonUploadNew>
</el-form-item>
</el-col>
......@@ -90,7 +89,7 @@
<el-form-item label="附件 :">
<li class="el-upload-list__item ele-upload-list__item-content" v-for="file in fileList"
:key="file.id">
<el-link :href="`${file.accessoryUrl}`" :underline="false" target="_blank">
<el-link :href="`${baseUrl}${file.accessoryUrl}`" :underline="false" target="_blank">
<span class="el-icon-document"> {{ file.accessoryName }} </span>
</el-link>
</li>
......@@ -128,6 +127,7 @@ export default {
},
data() {
return {
baseUrl: process.env.VUE_APP_BASE_API,
fileList: [],
queryParams: {
name: "",
......@@ -137,7 +137,12 @@ export default {
},
title: "",
rules: {
name: [
{ required: true, message: "获奖名称不能为空", trigger: "blur" }
],
publishTime: [
{ required: true, message: "发表时间不能为空", trigger: "blur" }
],
},
// 附件
schoolAccessoryList: [],
......@@ -145,8 +150,7 @@ export default {
lookTable: [],
tableData: [],
options: [
// { value: '1', label: '启用' },
// { value: '2', label: '禁用' },
],
form: {
name: "",
......@@ -213,47 +217,48 @@ export default {
},
/** 提交按钮 */
submitForm: function () {
this.$refs["form"].validate(valid => {
submitForm: function () {
this.$refs["form"].validate((valid) => {
if (valid) {
if (this.form.id !== undefined) {
const newObj = {};
newObj.id = this.form.id;
newObj.name = this.form.name;
newObj.publishTime = this.form.publishTime;
//附件列表
newObj.schoolAccessoryList = this.schoolAccessoryList.map(item => {
return {
"accessoryUrl": item.accessoryUrl,
"accessoryName": item.accessoryName
}
});
updateMaterial(newObj).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
if (this.schoolAccessoryList.length > 0) {
if (this.form.id !== undefined) {
const newObj = {
id: this.form.id,
name: this.form.name,
publishTime: this.form.publishTime,
schoolAccessoryList: this.schoolAccessoryList.map(item => ({
accessoryUrl: item.accessoryUrl,
accessoryName: item.accessoryName
}))
};
updateMaterial(newObj).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
const newObj = {
name: this.form.name,
publishTime: this.form.publishTime,
schoolAccessoryList: this.schoolAccessoryList.map(item => ({
accessoryUrl: item.accessoryUrl,
accessoryName: item.accessoryName
}))
};
addMaterial(newObj).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
} else {
const newObj = {};
newObj.name = this.form.name;
newObj.publishTime = this.form.publishTime;
//附件列表
newObj.schoolAccessoryList = this.schoolAccessoryList.map(item => {
return {
"accessoryUrl": item.accessoryUrl,
"accessoryName": item.accessoryName
}
});
addMaterial(newObj).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
this.$message.error("请上传附件");
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
......
ruoyi-ui/src/views/smartSchool/personWork/awArds/traiNing/index.vue
<template>
<div class="" style="padding:15px 10px 0 10px">
<el-form :model="queryParams" ref="queryForm" :inline="true" style="padding:0 0 0 0" size="small">
<el-form-item prop="trainingTime">
<el-form-item prop="trainingTime" label="培训时间">
<el-date-picker v-model="queryParams.trainingTime" type="date" placeholder="选择日期" value-format="yyyy-MM-dd"
format="yyyy-MM-dd" clearable>
</el-date-picker>
</el-form-item>
<el-form-item prop="trainingName">
<el-form-item prop="trainingName" label="培训名称">
<el-input v-model="queryParams.trainingName" placeholder="培训名称" clearable />
</el-form-item>
<el-form-item prop="isQualified">
<el-form-item prop="isQualified" label="是否合格">
<el-select v-model="queryParams.isQualified" placeholder="是否合格">
<el-option v-for="dict in dict.type.
is_qualified" :key="dict.value" :label="dict.label" :value="dict.value" clearable />
......@@ -57,17 +57,17 @@
<el-col :span="8">
<el-form-item label="培训时间：" prop="trainingTime">
<el-date-picker v-model="form.trainingTime" type="date" placeholder="选择发表时间"
:style="{ width: '100%' }">
:style="{ width: '100%' }" value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="培训名称">
<el-form-item label="培训名称" prop="trainingName">
<el-input v-model="form.trainingName" :style="{ width: '100%' }"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="是否合格">
<el-form-item label="是否合格" prop="isQualified">
<el-select v-model="form.isQualified" placeholder="是否合格" :style="{ width: '100%' }">
<el-option label="是" value="1"></el-option>
<el-option label="否" value="0"></el-option>
......@@ -78,7 +78,7 @@
<el-row>
<el-col :span="16">
<el-form-item label="附件 :" prop="url">
<el-form-item label="附件 :" :rules="[{ required: true, message: '请上传附件' }]">
<FilepersonUploadNew @input="getFileList" :value="fileList"></FilepersonUploadNew>
</el-form-item>
</el-col>
......@@ -122,7 +122,7 @@
<el-form-item label="附件 :">
<li class="el-upload-list__item ele-upload-list__item-content" v-for="file in fileList"
:key="file.id">
<el-link :href="`${file.accessoryUrl}`" :underline="false" target="_blank">
<el-link :href="`${baseUrl}${file.accessoryUrl}`" :underline="false" target="_blank">
<span class="el-icon-document"> {{ file.accessoryName }} </span>
</el-link>
</li>
......@@ -160,6 +160,7 @@ export default {
},
data() {
return {
baseUrl: process.env.VUE_APP_BASE_API,
fileList: [],
queryParams: {
trainingTime: "",
......@@ -173,7 +174,16 @@ export default {
schoolAccessoryList: [],
title: "",
rules: {
trainingTime: [
{ required: true, message: "培训时间不能为空", trigger: "blur" }
],
trainingName: [
{ required: true, message: "培训名称不能为空", trigger: "blur" }
],
isQualified: [
{ required: true, message: "是否合格不能为空", trigger: "blur" }
],
},
// 查看表格
lookTable: [],
......@@ -247,43 +257,43 @@ export default {
},
/** 提交按钮 */
submitForm: function () {
this.$refs["form"].validate(valid => {
this.$refs["form"].validate((valid) => {
if (valid) {
if (this.form.id !== undefined) {
const newObj = {};
newObj.id = this.form.id;
newObj.trainingTime = this.form.trainingTime;
newObj.trainingName = this.form.trainingName;
newObj.isQualified = this.form.isQualified;
//附件列表
newObj.schoolAccessoryList = this.schoolAccessoryList.map(item => {
return {
"accessoryUrl": item.accessoryUrl,
"accessoryName": item.accessoryName
}
});
updateTraining(newObj).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
if (this.schoolAccessoryList.length > 0) {
if (this.form.id !== undefined) {
const newObj = {
id: this.form.id,
trainingTime: this.form.trainingTime,
trainingName: this.form.trainingName,
isQualified: this.form.isQualified,
schoolAccessoryList: this.schoolAccessoryList.map(item => ({
accessoryUrl: item.accessoryUrl,
accessoryName: item.accessoryName
}))
};
updateTraining(newObj).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
const newObj = {
trainingTime: this.form.trainingTime,
trainingName: this.form.trainingName,
isQualified: this.form.isQualified,
schoolAccessoryList: this.schoolAccessoryList.map(item => ({
accessoryUrl: item.accessoryUrl,
accessoryName: item.accessoryName
}))
};
addTraining(newObj).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
} else {
const newObj = {};
newObj.trainingTime = this.form.trainingTime;
newObj.trainingName = this.form.trainingName;
newObj.isQualified = this.form.isQualified;
//附件列表
newObj.schoolAccessoryList = this.schoolAccessoryList.map(item => {
return {
"accessoryUrl": item.accessoryUrl,
"accessoryName": item.accessoryName
}
});
addTraining(newObj).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
this.$message.error("请上传附件");
}
}
});
......
ruoyi-ui/src/views/smartSchool/personWork/clockRecord/index.vue
......@@ -2,88 +2,68 @@
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="86px">
<el-form-item label="日期" prop="dateRange">
<el-date-picker
v-model="dateRange"
value-format="yyyy-MM-dd"
type="datetimerange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
<el-date-picker v-model="dateRange" value-format="yyyy-MM-dd" type="datetimerange" range-separator="至"
start-placeholder="开始日期" end-placeholder="结束日期">
</el-date-picker>
</el-form-item>
<el-form-item class="ml20">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
<!-- <el-button type="warning" icon="el-icon-upload" size="mini" @click="importRecord">导入</el-button> -->
<el-button style="margin-left: 20px" type="success" icon="el-icon-download" size="mini"
@click="handleExport">导出
<el-button style="margin-left: 20px" type="success" icon="el-icon-download" size="mini" @click="handleExport">导出
</el-button>
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="clockRecordList" stripe>
<el-table-column label="序号" type="index" width="55" align="center"/>
<el-table-column label="设备工号" align="center" prop="deviceNum"/>
<el-table-column label="员工工号" align="center" prop="teacherCode"/>
<el-table-column label="姓名" align="center" prop="userName"/>
<el-table-column label="部门" align="center" prop="orgname"/>
<el-table-column label="考勤日期" align="center" prop="clockDate"/>
<el-table-column label="打卡时间" align="center" min-width="200px" prop="times"/>
<el-table-column label="备注" align="center" min-width="200px" prop="remark"/>
<el-table-column label="序号" type="index" width="55" align="center" />
<el-table-column label="设备工号" align="center" prop="deviceNum" />
<el-table-column label="员工工号" align="center" prop="teacherCode" />
<el-table-column label="姓名" align="center" prop="userName" />
<el-table-column label="部门" align="center" prop="orgname" />
<el-table-column label="考勤日期" align="center" prop="clockDate" />
<el-table-column label="打卡时间" align="center" min-width="200px" prop="times" />
<el-table-column label="备注" align="center" min-width="200px" prop="remark" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleEdit(scope.row)"
>编辑备注
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleEdit(scope.row)">编辑备注
</el-button>
</template>
</el-table-column>
</el-table>
<!-- <pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/> -->
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
<el-dialog title="编写备注" :visible.sync="dialogEditNote" width="1000px" append-to-body>
<el-form ref="form" :model="form" label-width="110px" style="width: 100%; margin: auto">
<el-row>
<el-col :span="12">
<el-form-item label="设备工号" prop="deviceNum">
<el-input :value="form.deviceNum" placeholder="请输入设备工号"/>
<el-input :value="form.deviceNum" placeholder="请输入设备工号" />
</el-form-item>
<el-form-item label="姓名" prop="userName">
<el-input :value="form.userName" placeholder="请输入姓名"/>
<el-input :value="form.userName" placeholder="请输入姓名" />
</el-form-item>
<el-form-item label="考勤日期" prop="clockDate">
<el-date-picker
v-model="form.clockDate"
type="date"
style="width: 100%"
placeholder="请选择考勤日期">
<el-date-picker v-model="form.clockDate" type="date" style="width: 100%" placeholder="请选择考勤日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="员工工号" prop="teacherCode">
<el-input :value="form.teacherCode" placeholder="请输入员工工号"/>
<el-input :value="form.teacherCode" placeholder="请输入员工工号" />
</el-form-item>
<el-form-item label="部门" prop="orgname">
<el-input :value="form.orgname" placeholder="请输入部门"/>
<el-input :value="form.orgname" placeholder="请输入部门" />
</el-form-item>
<el-form-item label="打卡时间" prop="times">
<el-input :value="form.times" placeholder="请输入打卡时间"/>
<el-input :value="form.times" placeholder="请输入打卡时间" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" show-overflow-tooltip placeholder="请输入备注"/>
<el-input v-model="form.remark" type="textarea" show-overflow-tooltip placeholder="请输入备注" />
</el-form-item>
</el-row>
</el-form>
......@@ -98,7 +78,7 @@
</template>
<script>
import {personalList, submitRemark} from "@/api/smartSchool/personWork/clockRecord.js"
import { personalList, submitRemark } from "@/api/smartSchool/personWork/clockRecord.js"
export default {
name: ' PersonWorkClockRecord',
......@@ -109,7 +89,10 @@ export default {
// 日期范围
dateRange: [],
// 模糊搜索
queryParams: {},
queryParams: {
pageNum: 1,
pageSize: 10,
},
// 加载遮罩
loading: true,
// 记录条数
......@@ -171,5 +154,4 @@ export default {
},
};
</script>
<style scoped>
</style>
<style scoped></style>
ruoyi-ui/src/views/smartSchool/schoolManage/schoolNotice/infoPush/components/receiveList.vue
......@@ -5,16 +5,13 @@
<el-row>
<el-col :span="8" :offset="2">
<el-form-item label="标题" prop="title">
<el-input v-model="form.title" disabled/>
<el-input v-model="form.title" disabled />
</el-form-item>
</el-col>
<el-col :span="8" :offset="2">
<el-form-item label="类型" prop="type">
<el-select v-model="form.type" disabled style="width: 100%">
<el-option
v-for="dict in dict.type.sys_notice_type"
:key="dict.value"
:label="dict.label"
<el-option v-for="dict in dict.type.sys_notice_type" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
</el-select>
......@@ -35,57 +32,29 @@
<!-- </el-button>-->
<!--</el-col>-->
<el-col :span="1.5">
<el-button
type="danger"
plain
size="mini"
icon="el-icon-delete"
:disabled="!isMultiple"
@click="handleDelete"
>删除
<el-button type="danger" plain size="mini" icon="el-icon-delete" :disabled="!isMultiple" @click="handleDelete">删除
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="info"
plain
size="mini"
icon="el-icon-close"
@click="handleClose"
>关闭
<el-button type="info" plain size="mini" icon="el-icon-close" @click="handleClose">关闭
</el-button>
</el-col>
</el-row>
<el-table
ref="receiveList"
stripe
style="width: 100%;"
:data="receiveList"
@selection-change="handleSelectChange"
>
<el-table ref="receiveList" stripe style="width: 100%;" :data="receiveList" @selection-change="handleSelectChange">
<el-table-column type="selection" align="center" width="55"></el-table-column>
<el-table-column label="姓名" prop="userName" align="center"></el-table-column>
<el-table-column label="电话" prop="phonenumber" align="center"></el-table-column>
<el-table-column label="是否阅读" prop="status" align="center">
<template slot-scope="scope">
<el-tag type="success" v-if="scope.row.status==1">已阅读</el-tag>
<el-tag type="success" v-if="scope.row.status == 1">已阅读</el-tag>
<el-tag type="warning" v-else>未阅读</el-tag>
</template>
</el-table-column>
</el-table>
<ExPagination
v-show="total > 0"
:total="total"
:page.sync="queryForm.pageNum"
:limit.sync="queryForm.pageSize"
@pagination="getList"
></ExPagination>
<ExPagination v-show="total > 0" :total="total" :page.sync="queryForm.pageNum" :limit.sync="queryForm.pageSize"
@pagination="getList"></ExPagination>
<el-dialog
:visible.sync="open"
title="选择推送人"
width="960px"
>
<el-dialog :visible.sync="open" title="选择推送人" width="960px">
<el-form :model="pushForm" inline size="small">
<el-form-item label="姓名" porp="userName">
<el-input v-model="pushForm.userName"></el-input>
......@@ -94,44 +63,22 @@
<el-input v-model="pushForm.phonenumber"></el-input>
</el-form-item>
<el-form-item>
<el-button
type="primary"
size="small"
icon="el-icon-search"
@click="handlePushQuery"
>搜索
<el-button type="primary" size="small" icon="el-icon-search" @click="handlePushQuery">搜索
</el-button>
<el-button
plain
size="small"
icon="el-icon-refresh"
@click="resetPushQuery"
>重置
<el-button plain size="small" icon="el-icon-refresh" @click="resetPushQuery">重置
</el-button>
</el-form-item>
</el-form>
<el-table
ref="assignorList"
stripe
width="100%"
v-loading="loading"
:data="pushList"
@selection-change="handleSelectChange"
@row-click="handleRowClick"
>
<el-table ref="assignorList" stripe width="100%" v-loading="loading" :data="pushList"
@selection-change="handleSelectChange" @row-click="handleRowClick">
<el-table-column type="selection" align="center"></el-table-column>
<el-table-column type="index" label="序号" align="center"></el-table-column>
<el-table-column label="用户姓名" prop="userName" align="center"></el-table-column>
<el-table-column label="手机号" prop="phonenumber" align="center"></el-table-column>
</el-table>
<ExPagination
v-show="total > 0"
:total="total"
:page.sync="queryForm.pageNum"
:limit.sync="queryForm.pageSize"
@paginaiton="getList"
></ExPagination>
<ExPagination v-show="total > 0" :total="total" :page.sync="queryForm.pageNum" :limit.sync="queryForm.pageSize"
@paginaiton="getList"></ExPagination>
<div slot="footer">
<el-button :disabled="!isSimple" type="primary" size="small" @click="handleSelect">确 认</el-button>
......@@ -143,8 +90,10 @@
</template>
<script>
import {deleteReceive, getList} from "@/api/smartSchool/informationPush/schoolDetail";
import { deleteReceive, getList } from "@/api/smartSchool/informationPush/schoolDetail";
import {
getUser,// 根据分类id获取人员信息
} from "@/api/smartSchool/informationPush/personnelGrouping";
export default {
name: "SchoolDetail",
dicts: ['sys_user_sex', 'sys_notice_type'],
......@@ -183,11 +132,22 @@ export default {
methods: {
/** 初始化参数数据、列表数据查询 */
init() {
const {title, type} = this.$route.query;
const { title, type } = this.$route.query;
this.pushId = this.$route.query && this.$route.query.id;
this.form = {title, type};
this.form = { title, type };
this.getList();
},
//根据组id查询组成员
getList() {
this.loading = true;
this.notificationId = this.$route.query.id;
console.log('this..notificationId', this.notificationId);
getUser(this.notificationId).then(response => {
this.userList = response.rows;
console.log('this.userList', this.userList);
this.loading = false;
});
},
/** 获取列表数据 */
getList() {
this.loading = true;
......@@ -272,6 +232,4 @@ export default {
}
</script>
<style scoped>
</style>
<style scoped></style>
ruoyi-ui/src/views/smartSchool/schoolManage/schoolNotice/personnelGrouping/selectUser.vue deleted 100644 → 0
<template>
<!-- 授权用户 -->
<el-dialog title="选择用户" :visible.sync="visible" width="800px" top="5vh" append-to-body>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
<el-form-item label="用户名称" prop="userName">
<el-input
v-model="queryParams.userName"
placeholder="请输入用户名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="手机号码" prop="phonenumber">
<el-input
v-model="queryParams.phonenumber"
placeholder="请输入手机号码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row>
<el-table @row-click="clickRow" ref="table" :data="userList" @selection-change="handleSelectionChange" height="260px">
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column label="用户名称" prop="userName" :show-overflow-tooltip="true" />
<el-table-column label="用户昵称" prop="nickName" :show-overflow-tooltip="true" />
<el-table-column label="邮箱" prop="email" :show-overflow-tooltip="true" />
<el-table-column label="手机" prop="phonenumber" :show-overflow-tooltip="true" />
<el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
</el-row>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="handleSelectUser">确 定</el-button>
<el-button @click="visible = false">取 消</el-button>
</div>
</el-dialog>
</template>
<script>
import { unallocatedUserList, authUserSelectAll } from "@/api/system/role";
export default {
dicts: ['sys_normal_disable'],
props: {
// 角色编号
roleId: {
type: [Number, String]
}
},
data() {
return {
// 遮罩层
visible: false,
// 选中数组值
userIds: [],
// 总条数
total: 0,
// 未授权用户数据
userList: [],
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
roleId: undefined,
userName: undefined,
phonenumber: undefined
}
};
},
methods: {
// 显示弹框
show() {
this.queryParams.roleId = this.roleId;
this.getList();
this.visible = true;
},
clickRow(row) {
this.$refs.table.toggleRowSelection(row);
},
// 多选框选中数据
handleSelectionChange(selection) {
this.userIds = selection.map(item => item.userId);
},
// 查询表数据
getList() {
unallocatedUserList(this.queryParams).then(res => {
this.userList = res.rows;
this.total = res.total;
});
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
/** 选择授权用户操作 */
handleSelectUser() {
const roleId = this.queryParams.roleId;
const userIds = this.userIds.join(",");
if (userIds == "") {
this.$modal.msgError("请选择要分配的用户");
return;
}
authUserSelectAll({ roleId: roleId, userIds: userIds }).then(res => {
this.$modal.msgSuccess(res.msg);
if (res.code === 200) {
this.visible = false;
this.$emit("ok");
}
});
}
}
};
</script>
ruoyi-ui/src/views/smartSchool/schoolProperty/classiFication/index.vue
......@@ -60,7 +60,8 @@
<el-col :span="16">
<el-form-item label="分类编码" prop="classificationCode">
<el-input v-model="postForm.classificationCode"></el-input>
<el-input v-model="postForm.classificationCode"
:rules="[{ required: true, message: '会议名称不能为空' },]"></el-input>
</el-form-item>
</el-col>
<el-col :span="16">
......@@ -158,10 +159,10 @@ export default {
refreshTable: true,
// 校验规则
rules: {
classificationCode: [{ required: true, message: '分类编码不能为空', trigger: 'blur' }],
equipmentType: [{ required: true, message: '设备分类不能为空', trigger: 'blur' }],
orderNum: [{ required: true, message: '显示排序不能为空', trigger: 'blur' }],
adminId: [{ required: true, message: '管理员不能为空', trigger: 'blur' }],
classificationCode: [{ required: true, message: "分类编码不能为空", trigger: 'blur' }],
equipmentType: [{ required: true, message: "设备分类不能为空", trigger: 'blur' }],
orderNum: [{ required: true, message: "显示排序不能为空", trigger: 'blur' }],
adminId: [{ required: true, message: "管理员不能为空", trigger: 'blur' }],
},
//管理员
adminUser: [],
......@@ -248,7 +249,7 @@ export default {
this.getAdminUserList();
console.log('this.postForm修改', this.postForm);
this.open = true;
this.title = "修改资产信息";
this.title = "修改资产分类";
});
},
......@@ -268,9 +269,18 @@ export default {
});
},
// 确定
submitForm() {
const adminId = this.postForm.adminId
this.postForm.admin = adminId == '' ? '' : this.adminUser.find(item => item.adminId == adminId).admin
submitForm: function () {
const adminId = this.postForm.adminId;
if (adminId === '') {
this.postForm.admin = '';
} else {
const adminUser = this.adminUser.find(item => item.adminId == adminId);
if (adminUser) {
this.postForm.admin = adminUser.admin;
} else {
// 处理找不到匹配的管理员情况，你可以根据实际需要进行处理，例如设置默认值或显示错误提示等
}
}
this.$refs["postForm"].validate(valid => {
if (valid) {
if (this.postForm.id != null) {
......@@ -283,15 +293,15 @@ export default {
});
} else {
addProduct(this.postForm).then(response => {
if (this.postForm.parentId == undefined) {
this.enuqLeader();
}
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
addProduct(this.postForm).then(response => {
if (this.postForm.parentId == undefined) {
this.enuqLeader();
}
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
});
}
}
});
......
ruoyi-ui/src/views/smartSchool/teachAffairAdministration/affairGradeManage/gradeMemberList/index.vue
......@@ -92,8 +92,6 @@
<el-table-column label="工号" align="center" prop="teacherCode"/>
<el-table-column label="职务" align="center" prop="teacherPost"/>
<el-table-column label="电话号码" align="center" prop="teacherTel"/>
<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">
<template slot-scope="scope">
......
ruoyi-ui/src/views/smartSchool/teachAffairAdministration/affairStudentManage/index.vue
......@@ -124,7 +124,7 @@
<el-table-column key="nativePlace" min-width="100" header-align="center" align="center" prop="nativePlace"
label="籍贯" show-overflow-tooltip></el-table-column>
<el-table-column key="idCard" width="180" align="center" prop="idCard" label="身份证号" />
<el-table-column key="schoolNo" width="100" align="center" prop="schoolNo" label="注册序号" />
<el-table-column key="schoolNo" width="160" align="center" prop="schoolNo" label="注册序号" />
<el-table-column key="stuTelephone" width="130" align="center" prop="stuTelephone" label="联系电话" />
<el-table-column key="birthAddress" width="150" align="center" prop="birthAddress" label="出生地" />
<el-table-column key="postalCode" width="150" align="center" prop="postalCode" label="邮政编码" />
......
ruoyi-ui/src/views/system/role/selectUser.vue
......@@ -3,20 +3,10 @@
<el-dialog title="选择用户" :visible.sync="visible" width="800px" top="5vh" append-to-body>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
<el-form-item label="用户名称" prop="userName">
<el-input
v-model="queryParams.userName"
placeholder="请输入用户名称"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="手机号码" prop="phonenumber">
<el-input
v-model="queryParams.phonenumber"
placeholder="请输入手机号码"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
......@@ -24,7 +14,8 @@
</el-form-item>
</el-form>
<el-row>
<el-table @row-click="clickRow" ref="table" :data="userList" @selection-change="handleSelectionChange" height="260px">
<el-table @row-click="clickRow" ref="table" :data="userList" @selection-change="handleSelectionChange"
height="260px">
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column label="用户名称" prop="userName" :show-overflow-tooltip="true" />
<el-table-column label="用户昵称" prop="nickName" :show-overflow-tooltip="true" />
......@@ -32,7 +23,7 @@
<el-table-column label="手机" prop="phonenumber" :show-overflow-tooltip="true" />
<el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
......@@ -41,13 +32,8 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
</el-row>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="handleSelectUser">确 定</el-button>
......
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