Skip to content

D
dd_school
Commit 057ad9d4 by zhaopanyu
Options

zpy 11.2

parent 9ab57d6d
Showing with 318 additions and 515 deletions
ruoyi-ui/src/api/smartSchool/schoolProperty/equipmenTledger.js
......@@ -57,8 +57,15 @@ export function deleteEquipmentLedger(id) {
**/
export function getUserList(params) {
return request({
url: '/equipmentLedger/getUser',
url: "/equipmentLedger/getUser",
method: "GET",
params
params,
});
}
//获取打印设备条码信息
export function equipmentPrint(ids) {
return request({
url: `/equipmentLedger/getEquipmentledger/${ids}`,
method: "get",
});
}
ruoyi-ui/src/views/smartSchool/classAdviser/classView/index.vue
......@@ -2,22 +2,21 @@
<div class="app-container fixed-scroll-error">
<el-row :gutter="20">
<el-col :span="4" :xs="24">
<el-card shadow="never" :style="{ height: clientHeight }">
<el-card class="scrollable-card" shadow="never" :style="{ height: clientHeight }">
<template slot="header">
<div style="display:flex; justify-content: space-between">
<div style="display:flex; align-items: center">
<span>班级列表</span>
</div>
<el-select v-model="queryParams.schoolYear" style="width: 100px;" size="small" @change="handleYearChange">
<el-option v-for="item in yearList" :key="item.value" :value="item.value"
:label="item.label"></el-option>
<el-option v-for="item in yearList" :key="item.value" :value="item.value" :label="item.label"></el-option>
</el-select>
</div>
</template>
<div class="head-container">
<el-tree :data="leftOptions.treeOptions" :props="leftOptions.defaultProps" :expand-on-click-node="false"
:filter-node-method="filterNode" ref="tree" node-key="id" default-expand-all highlight-current
@node-click="handleNodeClick"/>
@node-click="handleNodeClick" />
</div>
</el-card>
</el-col>
......@@ -139,40 +138,38 @@
</el-radio-group>
<el-table v-if="activeName === Types.STUDENT" stripe v-loading="studentLoading" width="100%"
:cell-style="customCellStyle" :data="rightData.studentList" :key="Types.STUDENT">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column type="selection" width="55" align="center" />
<el-table-column fixed="left" key="avatar" align="center" prop="avatar" label="头像">
<template slot-scope="scope">
<ListImage :image-url="isEmptyAvatar(scope.row.avatar, scope.row.sex)"></ListImage>
</template>
</el-table-column>
<el-table-column fixed="left" key="studentName" min-width="80" align="center" prop="studentName"
label="姓名"/>
<el-table-column key="score" min-width="80" align="center" prop="score" label="积分"/>
<el-table-column key="grade" min-width="100px" align="center" prop="classAlias" label="班级"/>
<el-table-column fixed="left" key="studentName" min-width="80" align="center" prop="studentName" label="姓名" />
<el-table-column key="score" min-width="80" align="center" prop="score" label="积分" />
<el-table-column key="grade" min-width="100px" align="center" prop="classAlias" label="班级" />
<el-table-column key="sex" min-width="50px" align="center" prop="sex" label="性别">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex"></dict-tag>
</template>
</el-table-column>
<el-table-column key="nation" width="100" align="center" prop="nation" label="民族"/>
<el-table-column key="nation" width="100" align="center" prop="nation" label="民族" />
<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="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="邮政编码"/>
<el-table-column key="enrollmentYear" width="100" align="center" prop="enrollmentYear" label="级/届"/>
<el-table-column key="idCard" width="180" align="center" prop="idCard" 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="邮政编码" />
<el-table-column key="enrollmentYear" width="100" align="center" prop="enrollmentYear" label="级/届" />
<el-table-column key="enrollmentTime" min-width="100" header-align="center" align="center"
prop="enrollmentTime" label="入学时间" show-overflow-tooltip></el-table-column>
<el-table-column key="platform" width="180" align="center" prop="platform" label="平台"/>
<el-table-column key="platform" width="180" align="center" prop="platform" label="平台" />
<el-table-column key="studentType" width="130" align="center" prop="studentType" label="学生类型">
<template slot-scope="scope">
<dict-tag :options="dict.type.student_type" :value="scope.row.studentType"></dict-tag>
</template>
</el-table-column>
<el-table-column key="provincialNumber" width="150" align="center" prop="provincialNumber"
label="省学籍辅号"/>
<el-table-column key="nationalNumber" width="150" align="center" prop="nationalNumber" label="全国学籍号"/>
<el-table-column key="provincialNumber" width="150" align="center" prop="provincialNumber" label="省学籍辅号" />
<el-table-column key="nationalNumber" width="150" align="center" prop="nationalNumber" label="全国学籍号" />
<el-table-column key="studentStatus" width="80" align="center" prop="studentStatus" label="学生状态">
<template slot-scope="scope">
<dict-tag :options="dict.type.child_state" :value="scope.row.studentStatus"></dict-tag>
......@@ -183,18 +180,17 @@
<dict-tag :options="dict.type.student_type" :value="scope.row.studentType"></dict-tag>
</template>
</el-table-column>
<el-table-column key="schoolNo" width="100" align="center" prop="schoolNo" label="注册序号"/>
<el-table-column key="schoolNo" width="100" align="center" prop="schoolNo" label="注册序号" />
<el-table-column key="registeredAddress" min-width="100" header-align="center" align="center"
prop="registeredAddress" label="户口所在地" show-overflow-tooltip></el-table-column>
<el-table-column key="registeredType" width="180" align="center" prop="registeredType" label="户口性质">
<template slot-scope="scope">
<dict-tag :options="dict.type.regist_type" :value="scope.row.registeredType"/>
<dict-tag :options="dict.type.regist_type" :value="scope.row.registeredType" />
</template>
</el-table-column>
<el-table-column key="juniorSchool" width="130" align="center" prop="juniorSchool" label="初中学校"/>
<el-table-column key="region" width="150" align="center" prop="region" label="国家地区"/>
<el-table-column key="foreignLanguages" width="150" align="center" prop="foreignLanguages"
label="外语语种"/>
<el-table-column key="juniorSchool" width="130" align="center" prop="juniorSchool" label="初中学校" />
<el-table-column key="region" width="150" align="center" prop="region" label="国家地区" />
<el-table-column key="foreignLanguages" width="150" align="center" prop="foreignLanguages" label="外语语种" />
<el-table-column key="appearance" width="150" align="center" prop="appearance" label="政治面貌">
<template slot-scope="scope">
<dict-tag :options="dict.type.politics_tatus" :value="scope.row.appearance"></dict-tag>
......@@ -210,16 +206,15 @@
</span>
</template>
</el-table-column>
<el-table-column key="bloodType" width="100" align="center" prop="bloodType" label="血型"/>
<el-table-column key="health" min-width="100" header-align="center" align="center" prop="health"
label="健康状况"
<el-table-column key="bloodType" width="100" align="center" prop="bloodType" label="血型" />
<el-table-column key="health" min-width="100" header-align="center" align="center" prop="health" label="健康状况"
show-overflow-tooltip></el-table-column>
<el-table-column key="otherRegions" width="180" align="center" prop="otherRegions" label="港澳台侨"/>
<el-table-column key="otherRegions" width="180" align="center" prop="otherRegions" label="港澳台侨" />
<el-table-column key="floatingPopulation" width="130" align="center" prop="floatingPopulation"
label="流动人口状况"/>
label="流动人口状况" />
<el-table-column key="onlyChild" width="150" align="center" prop="onlyChild" label="独生子女">
<template slot-scope="scope">
<dict-tag :options="dict.type.only_child" :value="scope.row.onlyChild"/>
<dict-tag :options="dict.type.only_child" :value="scope.row.onlyChild" />
</template>
</el-table-column>
<el-table-column key="nature" width="150" align="center" prop="nature" label="性质">
......@@ -227,8 +222,7 @@
<dict-tag :options="dict.type.student_nature" :value="scope.row.nature"></dict-tag>
</template>
</el-table-column>
<el-table-column key="support" width="150" align="center" prop="support"
label="接收资助情况"></el-table-column>
<el-table-column key="support" width="150" align="center" prop="support" label="接收资助情况"></el-table-column>
<el-table-column label="操作" align="center" min-width="200px" fixed="right">
<template slot-scope="scope">
<!-- <el-button-->
......@@ -252,18 +246,18 @@
<ListImage :image-url="isEmptyAvatar(scope.row.picUrl, scope.row.sex)"></ListImage>
</template>
</el-table-column>
<el-table-column label="老师名称" align="center" prop="teacherName"/>
<el-table-column label="老师名称" align="center" prop="teacherName" />
<el-table-column label="性别" align="center" width="55" prop="sex">
<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>
</el-table-column>
<el-table-column label="工作编号" width="180px" align="center" prop="teacherCode"/>
<el-table-column label="老师电话" width="180px" align="center" prop="teacherTel"/>
<el-table-column label="工作编号" width="180px" align="center" prop="teacherCode" />
<el-table-column label="老师电话" width="180px" align="center" prop="teacherTel" />
<el-table-column label="任教课程" align="center" prop="courseName"></el-table-column>
<el-table-column label="学历" align="center" prop="education">
<template slot-scope="scope">
<dict-tag :options="dict.type.education" :value="scope.row.education"/>
<dict-tag :options="dict.type.education" :value="scope.row.education" />
</template>
</el-table-column>
<el-table-column label="操作" align="center">
......@@ -275,8 +269,7 @@
</el-table-column>
</el-table>
<ExPagination :total="activeName === Types.STUDENT ? studentTotal : teacherTotal"
:limit.sync="queryParams.pageSize" :page.sync="queryParams.pageNum"
@pagination="getClassDetails">
:limit.sync="queryParams.pageSize" :page.sync="queryParams.pageNum" @pagination="getClassDetails">
</ExPagination>
</el-row>
</el-col>
......@@ -322,8 +315,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="出生日期：" prop="birthday">
<el-date-picker v-model="studentForm.birthday" type="date" value-format="yyyy-MM-dd"
placeholder="请选择出生日期"
<el-date-picker v-model="studentForm.birthday" type="date" value-format="yyyy-MM-dd" placeholder="请选择出生日期"
style="width: 100%;"></el-date-picker>
</el-form-item>
</el-col>
......@@ -375,8 +367,7 @@
<el-col :span="8">
<el-form-item label="民族：" prop="nation">
<el-select v-model="studentForm.nation" placeholder="请选择民族" style="width: 100%">
<el-option v-for="item in Nations" :key="item.label" :label="item.label"
:value="item.label"></el-option>
<el-option v-for="item in Nations" :key="item.label" :label="item.label" :value="item.label"></el-option>
</el-select>
</el-form-item>
</el-col>
......@@ -402,15 +393,13 @@
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="级/届：" prop="enrollmentYear">
<el-date-picker style="width:100%" v-model="studentForm.enrollmentYear" type="year"
placeholder="选择入学年">
<el-date-picker style="width:100%" v-model="studentForm.enrollmentYear" type="year" placeholder="选择入学年">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="入学时间：" prop="enrollmentTime">
<el-date-picker v-model="studentForm.enrollmentTime" style="width: 100%" type="date"
placeholder="选择入学时间">
<el-date-picker v-model="studentForm.enrollmentTime" style="width: 100%" type="date" placeholder="选择入学时间">
</el-date-picker>
</el-form-item>
</el-col>
......@@ -453,10 +442,7 @@
<el-col :span="8">
<el-form-item label="户口性质：" prop="registeredType">
<el-select v-model="studentForm.registeredType" style="width: 100%" placeholder="请输入户口性质">
<el-option
v-for="dict in dict.type.regist_type"
:key="dict.value"
:label="dict.label"
<el-option v-for="dict in dict.type.regist_type" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
</el-select>
......@@ -511,11 +497,7 @@
<el-col :span="8">
<el-form-item label="独生子女：" prop="onlyChild">
<el-select v-model="studentForm.onlyChild" style="width: 100%" placeholder="请选择是否为独生子女">
<el-option
v-for="dict in dict.type.only_child"
:key="dict.value"
:label="dict.label"
:value="dict.value">
<el-option v-for="dict in dict.type.only_child" :key="dict.value" :label="dict.label" :value="dict.value">
</el-option>
</el-select>
</el-form-item>
......@@ -548,7 +530,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="教师名称" prop="teacherName">
<el-input v-model="teacherForm.teacherName" placeholder=""/>
<el-input v-model="teacherForm.teacherName" placeholder="" />
</el-form-item>
<el-form-item label="性别" prop="sex">
<el-select v-model="teacherForm.sex" style="width: 100%" placeholder="">
......@@ -557,10 +539,10 @@
</el-select>
</el-form-item>
<el-form-item label="身份证号" prop="idCard">
<el-input v-model.trim="teacherForm.idCard" placeholder=""/>
<el-input v-model.trim="teacherForm.idCard" placeholder="" />
</el-form-item>
<el-form-item label="手机号码" prop="teacherTel">
<el-input v-model="teacherForm.teacherTel" placeholder=""/>
<el-input v-model="teacherForm.teacherTel" placeholder="" />
</el-form-item>
</el-col>
<el-col :span="12">
......@@ -592,7 +574,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="工作编号" prop="teacherCode">
<el-input v-model="teacherForm.teacherCode" placeholder=""/>
<el-input v-model="teacherForm.teacherCode" placeholder="" />
</el-form-item>
</el-col>
<el-col :span="12">
......@@ -611,16 +593,14 @@
<el-col :span="12">
<el-form-item label="岗位" prop="postId">
<el-select multiple v-model="teacherForm.postId" placeholder="" style="width: 100%;">
<el-option v-for="item in []" :key="item.postId" :label="item.postName"
:value="item.postId"></el-option>
<el-option v-for="item in []" :key="item.postId" :label="item.postName" :value="item.postId"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="角色" prop="roleId">
<el-select v-model="teacherForm.roleId" multiple placeholder="" style="width: 100%;">
<el-option v-for="item in []" :key="item.roleId" :label="item.roleName"
:value="item.roleId"></el-option>
<el-option v-for="item in []" :key="item.roleId" :label="item.roleName" :value="item.roleId"></el-option>
</el-select>
</el-form-item>
</el-col>
......@@ -636,8 +616,7 @@
<el-col :span="12">
<el-form-item label="民族" prop="nation">
<el-select v-model="teacherForm.nation" style="width: 100%" placeholder="">
<el-option v-for="item in Nations" :key="item.label" :label="item.label"
:value="item.label"></el-option>
<el-option v-for="item in Nations" :key="item.label" :label="item.label" :value="item.label"></el-option>
</el-select>
</el-form-item>
</el-col>
......@@ -653,7 +632,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="家庭住址" prop="homeAddress">
<el-input v-model="teacherForm.homeAddress" placeholder=""/>
<el-input v-model="teacherForm.homeAddress" placeholder="" />
</el-form-item>
</el-col>
</el-row>
......@@ -674,13 +653,13 @@ import {
getStudentList,
getTeacherList
} from "@/api/smartSchool/classAdviser/classView";
import {getFirstLeafNode, handleTreeData} from "@/utils/utilLibrary/getTreeClass";
import {getYearList} from "@/utils/utilLibrary/getYearList";
import {CustomCellStyle} from "@/enums/customStyle";
import {getStudent} from "@/api/smartSchool/studentManage";
import {getInform} from "@/api/smartSchool/teacherManage/teacherInformation";
import {Gender, Nations} from "@/enums/common";
import {getNewYear} from "@/api/smartSchool/gradeWork/classView";
import { getFirstLeafNode, handleTreeData } from "@/utils/utilLibrary/getTreeClass";
import { getYearList } from "@/utils/utilLibrary/getYearList";
import { CustomCellStyle } from "@/enums/customStyle";
import { getStudent } from "@/api/smartSchool/studentManage";
import { getInform } from "@/api/smartSchool/teacherManage/teacherInformation";
import { Gender, Nations } from "@/enums/common";
import { getNewYear } from "@/api/smartSchool/gradeWork/classView";
export default {
name: "ClassAdviserClassView",
......@@ -788,7 +767,7 @@ export default {
const id = row.id
this.$router.push({
path: '/classAdviser/classView/parentInfo',
query: {studentId: row.id}
query: { studentId: row.id }
})
},
//学生信息
......@@ -869,9 +848,9 @@ export default {
/** 查询班级信息 */
getClassDetails() {
if (this.yearClass == 1) {
this.queryParams.pageNum = 1;
if (this.yearClass != 1) {
return; // 年级不是1，直接返回，不执行请求数据的操作
}
if (this.activeName === this.Types.STUDENT) {
this.studentLoading = true;
getStudentList(this.queryParams).then(response => {
......@@ -891,9 +870,8 @@ export default {
this.teacherLoading = false;
})
}
}
},
/** 选择班级(打开对话框) */
selectClass() {
this.classOptions.open = true
......@@ -1019,4 +997,8 @@ export default {
.form-header {
margin: 8px 0px 25px 0px;
}
.scrollable-card {
overflow: auto;
}
</style>
ruoyi-ui/src/views/smartSchool/gradeWork/infoPublish/index.vue
......@@ -2,17 +2,11 @@
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="名称" prop="xxfbName">
<el-input
v-model="queryParams.xxfbName"
placeholder="请输入名称"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.xxfbName" placeholder="请输入名称" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="状态" prop="xxfbZt">
<el-select v-model="queryParams.xxfbZt" placeholder="请选择状态" @keyup.enter.native="handleQuery">
<el-option v-for="dict in dict.type.info_push_state" :key="dict.value" :label="dict.label"
:value="dict.value">
<el-option v-for="dict in dict.type.info_push_state" :key="dict.value" :label="dict.label" :value="dict.value">
</el-option>
</el-select>
</el-form-item>
......@@ -31,46 +25,26 @@
</el-row>
<el-table v-loading="loading" :data="xxfbList" @selection-change="handleSelectionChange">
<el-table-column label="序号" align="center" type="index"/>
<el-table-column label="名称" min-width="250" align="center" prop="xxfbName"/>
<el-table-column label="序号" align="center" type="index" />
<el-table-column label="名称" min-width="250" align="center" prop="xxfbName" />
<el-table-column label="状态" align="center" prop="xxfbZt">
<template slot-scope="scope">
<dict-tag :options="dict.type.info_push_state" :value="scope.row.xxfbZt"/>
<dict-tag :options="dict.type.info_push_state" :value="scope.row.xxfbZt" />
</template>
</el-table-column>
<el-table-column label="查询次数" align="center" prop="num"/>
<el-table-column label="创建时间" align="center" min-width="150" prop="createTime"/>
<el-table-column label="查询次数" align="center" prop="num" />
<el-table-column label="创建时间" align="center" min-width="150" prop="createTime" />
<el-table-column label="操作" align="center" min-width="250" class-name="small-padding fixed-width">
<template slot-scope="scope">
<template v-if="scope.row.xxfbZt == '1'">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
>修改
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改
</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
>删除
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除
</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-search"
@click="handleViewDetail(scope.row)"
>数据
<el-button size="mini" type="text" icon="el-icon-search" @click="handleViewDetail(scope.row)">数据
</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-s-promotion"
@click="handlePublish(scope.row)"
>发布
<el-button size="mini" type="text" icon="el-icon-s-promotion" @click="handlePublish(scope.row)">发布
</el-button>
......@@ -93,29 +67,14 @@
<!-- </el-dropdown>-->
</template>
<template v-if="scope.row.xxfbZt == '2'">
<el-button
size="mini"
type="text"
icon="el-icon-back"
@click="handleRecall(scope.row)"
v-hasPermi="['system:xxfb:export']"
>撤回
<el-button size="mini" type="text" icon="el-icon-back" @click="handleRecall(scope.row)"
v-hasPermi="['system:xxfb:export']">撤回
</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-view"
@click="handleViewData(scope.row)"
v-hasPermi="['system:xxfb:view']"
>数据查看
<el-button size="mini" type="text" icon="el-icon-view" @click="handleViewData(scope.row)"
v-hasPermi="['system:xxfb:view']">数据查看
</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-download"
@click="handleExport(scope.row)"
v-hasPermi="['system:xxfb:export']"
>导出
<el-button size="mini" type="text" icon="el-icon-download" @click="handleExport(scope.row)"
v-hasPermi="['system:xxfb:export']">导出
</el-button>
</template>
......@@ -152,18 +111,11 @@
<el-divider></el-divider>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="查询名称" prop="xxfbName">
<el-input v-model="form.xxfbName" placeholder="请输入名称"/>
<el-input v-model="form.xxfbName" placeholder="请输入名称" />
</el-form-item>
<el-form-item label="级部" prop="gradeId">
<treeselect
v-model="form.gradeId"
:options="gradeTree"
:show-count="true"
@select="deptIdAndName"
:disable-branch-nodes="true"
:defaultExpandLevel="2"
placeholder="请选择级部"
/>
<treeselect v-model="form.gradeId" :options="gradeTree" :show-count="true" @select="deptIdAndName"
:disable-branch-nodes="true" :defaultExpandLevel="2" placeholder="请选择级部" />
</el-form-item>
</el-form>
<!-- <span style="color: red">*</span>-->
......@@ -173,13 +125,13 @@
<div v-show="isShow">
<div
style="font-size: 10px; color: #ed5565; font-weight: 400; background: #d8ecf6; border: 1px solid #03b3f5; padding: 10px">
注：上传excel文件,第一行为数据表头，不允许合并单元格，列名不要重复，第一列为身份证号，第二列为姓名。后续不限制
注：上传excel文件,第一行为数据表头，不允许合并单元格，列名不要重复，第一列为学号，第二列为姓名。后续不限制
</div>
<br/>
<br />
<el-table :data="tableData" :border="true" style="width: 100%">
<!-- <el-table-column type="index" label="序号" width="50">-->
<!-- </el-table-column>-->
<el-table-column prop="idCard" min-width="120px" label="身份证号">
<el-table-column prop="schoolNo" min-width="120px" label="学号">
</el-table-column>
<el-table-column prop="name" label="姓名">
</el-table-column>
......@@ -198,20 +150,11 @@
<el-table-column label="I">
</el-table-column>
</el-table>
<br/> <br/>
<br /> <br />
</div>
<el-upload
style="width: 950px;display: block; margin: 0 auto;"
ref="upload"
:limit='1'
class="upload-demo"
action="uploadUrl"
accept=".xlsx, .xls"
:headers="upload.headers"
show-file-list
:before-upload="handleBeforeUpload"
:http-request="uploadImage"
>
<el-upload style="width: 950px;display: block; margin: 0 auto;" ref="upload" :limit='1' class="upload-demo"
action="uploadUrl" accept=".xlsx, .xls" :headers="upload.headers" show-file-list
:before-upload="handleBeforeUpload" :http-request="uploadImage">
<el-button style="width: 950px; display: block; margin: 0 auto; background: #54bbbc; color: white">
点击上传文件
</el-button>
......@@ -227,7 +170,7 @@
<el-dialog :title="title" :visible.sync="edtion" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="60px">
<el-form-item label="名称" prop="xxfbName">
<el-input v-model="form.xxfbName" placeholder="请输入名称"/>
<el-input v-model="form.xxfbName" placeholder="请输入名称" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
......@@ -256,7 +199,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default {
name: "Xxfb",
components: {Treeselect},
components: { Treeselect },
dicts: ['info_push_state'],
data() {
return {
......@@ -276,10 +219,10 @@ export default {
},
tableData: [{
idCard: 'xxxxxxxxxxxxx',
schoolNo: 'xxxxxxxxxxxxx',
name: 'xxx',
}, {
idCard: 'xxxxxxxxxxxxx',
schoolNo: 'xxxxxxxxxxxxx',
name: 'xxx',
}],
uploadUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传excel
......@@ -312,10 +255,10 @@ export default {
// 表单校验
rules: {
xxfbName: [
{required: true, message: "查询名称不能为空", trigger: "blur"}
{ required: true, message: "查询名称不能为空", trigger: "blur" }
],
gradeId: [
{required: true, message: "级部不能为空", trigger: "blur"}
{ required: true, message: "级部不能为空", trigger: "blur" }
],
},
// 级部树
......
ruoyi-ui/src/views/smartSchool/gradeWork/studentManage/parentInfo/index.vue
......@@ -183,7 +183,7 @@ export default {
telephone: [{required: true, message: "联系方式不能为空", trigger: "blur"}],
relationship: [{required: true, message: "与学生关系不能为空", trigger: "blur"}],
contactAddress: [{required: true, message: "联系地址不能为空", trigger: "blur"}],
idCard: [{required: true, message: "身份证号不能为空", trigger: "blur"}],
// idCard: [{required: true, message: "身份证号不能为空", trigger: "blur"}],
}
};
},
......
ruoyi-ui/src/views/smartSchool/laboratoryManagement/laboratoryManagements/laboratoryCompetition/index.vue
......@@ -118,11 +118,10 @@
<el-row>
<el-col :span="10">
<el-form-item prop="schoolAccessoryList" label="证书照片">
<el-upload v-loading="uploadLoading" class="avatar-uploader" action="#" accept="image/*"
:show-file-list="false" :on-success="handleAvatarSuccess" :before-upload="beforeAvatarUpload"
:http-request="uploadImage">
<el-upload v-loading="uploadLoading" class="avatar-uploader" :action="uploadFileUrl" accept="image/*"
:show-file-list="false" :on-success="handleAvatarSuccess" :before-upload="beforeAvatarUpload">
<img v-for="item in form.schoolAccessoryList" :key="item.accessoryUrl" :src="item.accessoryUrl"
class="avatar" />
class="avatar" />{{ item }}
<i v-if="form.schoolAccessoryList.length === 0" class="el-icon-plus avatar-uploader-icon"></i>
</el-upload>
......@@ -181,6 +180,7 @@ export default {
components: { picAvatar },
data() {
return {
uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
//缩略图
srcList: [],
// 图片路径
......@@ -222,7 +222,7 @@ export default {
schoolYear: [
{ required: true, message: "学年不能为空", trigger: "change" }
],
teacherName: [
teacherId: [
{ required: true, message: "教师名称不能为空", trigger: "change" }
],
entrySubject: [
......@@ -271,15 +271,15 @@ export default {
console.log('response', response);
this.total = response.total;
this.loading = false;
this.competitionData.forEach(item => {
if (item.schoolAccessoryList) {
item.previewUrls = [item.schoolAccessoryList.map(accessory => accessory.accessoryUrl)];
item.pictureUrl = item.schoolAccessoryList.map(accessory => accessory.accessoryUrl);
} else {
item.previewUrls = [];
item.pictureUrl = [];
}
});
// this.competitionData.forEach(item => {
// if (item.schoolAccessoryList) {
// item.previewUrls = [item.schoolAccessoryList.map(accessory => accessory.accessoryUrl)];
// item.pictureUrl = item.schoolAccessoryList.map(accessory => accessory.accessoryUrl);
// } else {
// item.previewUrls = [];
// item.pictureUrl = [];
// }
// });
});
......@@ -291,18 +291,20 @@ export default {
},
// 移除图片
handleRemove() {
this.imageUrl = undefined
this.schoolAccessoryList = undefined
},
// 上传成功回调
handleAvatarSuccess(response, file) {
console.log('response', response);
console.log('file', file);
// 处理上传成功的逻辑
const accessoryUrl = response.data.url; // 假设响应中包含了图片的访问URL
const accessoryName = file.name; // 获取上传文件的名称
const accessoryUrl = this.pev + response.fileName; // 假设响应中包含了图片的访问URL
const accessoryName = response.originalFilename; // 获取上传文件的名称
this.form.schoolAccessoryList.push({
accessoryUrl: accessoryUrl,
accessoryName: accessoryName
});
console.log('this.form.schoolAccessoryList', this.form.schoolAccessoryList);
},
// 上传前格式和图片大小限制
......@@ -318,27 +320,7 @@ export default {
return type && isLt2M
},
// 上传图片
uploadImage(file) {
const fileData = file.file
const formData = new FormData()
formData.append('file', fileData)
this.uploadLoading = true
commonUpload(formData)
.then(response => {
this.uploadLoading = false
this.$modal.msgSuccess('上传成功')
this.imageUrl = process.env.VUE_APP_BASE_API + response.url
// 添加以下代码将文件信息添加到 uploadedFiles 数组中
this.uploadedFiles.push({
accessoryUrl: process.env.VUE_APP_BASE_API + response.url,
accessoryName: fileData.name
})
})
.catch(error => {
this.uploadLoading = false
})
},
//重置
resetQuery() {
......@@ -430,16 +412,6 @@ export default {
this.$refs['form'].validate(valid => {
if (valid) {
if (this.form.id != "") {
// 清空原有图片
this.form.schoolAccessoryList.splice(0);
for (let i = 0; i < this.uploadedFiles.length; i++) {
const file = this.uploadedFiles[i];
this.form.schoolAccessoryList.push({
accessoryUrl: file.accessoryUrl,
accessoryName: file.accessoryName
});
}
updateCompetition(this.form).then(({ code }) => {
if (code == 200) {
this.$modal.msgSuccess('修改成功')
......@@ -450,17 +422,6 @@ export default {
this.$modal.msgError("修改失败");
});
} else {
// 清空原有图片
this.form.schoolAccessoryList = [];
for (let i = 0; i < this.uploadedFiles.length; i++) {
const file = this.uploadedFiles[i];
this.form.schoolAccessoryList.push({
accessoryUrl: file.accessoryUrl,
accessoryName: file.accessoryName
});
}
addCompetition(this.form).then(response => {
console.log(this.form, 'this.form');
this.$modal.msgSuccess('新增成功')
......
ruoyi-ui/src/views/smartSchool/massOrganization/communityStyle/index.vue
......@@ -409,7 +409,7 @@ export default {
id: this.form.id,
theme: this.form.theme,
// file: this.form.file,
file:this.uploadList.toString()
};
console.log(params, "params");
editCommunityInfo(params)
......@@ -468,7 +468,6 @@ export default {
const data = {
id: row.id,
};
this.$modal
.confirm()
.then(() => {
......
ruoyi-ui/src/views/smartSchool/personWork/lendingRecords/index.vue
......@@ -21,6 +21,11 @@
<el-table-column label="型号" align="center" prop="model" />
<el-table-column label="借用日期" align="center" prop="borrowTime" />
<el-table-column label="借用人" align="center" prop="borrowBy" />
<el-table-column label="归还状态" align="center" prop="returnState">
<template slot-scope="scope">
<dict-tag :options="dict.type.return_state" :value="scope.row.returnState"></dict-tag>
</template>
</el-table-column>
<el-table-column label="用途" align="center" prop="purpose" />
<el-table-column label="借用期限" align="center" prop="deadline" />
<el-table-column label="操作" align="center">
......@@ -80,6 +85,14 @@
<el-input v-model="postForm.deadline" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="归还状态" prop="returnState">
<el-select v-model="postForm.returnState" clearable style="width: 100%;">
<el-option v-for="dict in dict.type.return_state" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
......@@ -100,7 +113,7 @@ import {
listTeacherjyxq
} from "@/api/smartSchool/personWork/propertyManagement";
export default {
dicts: ['return_state'],
data() {
return {
queryParams: {
......
ruoyi-ui/src/views/smartSchool/personWork/repairRecord/index.vue
......@@ -86,8 +86,8 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="报修时间:" prop="reportrepairtime">
<el-date-picker v-model="postForm.reportrepairtime" type="date" style="width: 100%;"
<el-form-item label="报修时间:" prop="reportRepairTime">
<el-date-picker v-model="postForm.reportRepairTime" type="date" style="width: 100%;"
value-format="yyyy-MM-dd" clearable></el-date-picker>
</el-form-item>
</el-col>
......
ruoyi-ui/src/views/smartSchool/schoolProperty/equipmenTledger/index.vue
......@@ -656,7 +656,7 @@ export default {
console.log(encodes, 'encodes');
const printListParam = encodeURIComponent(JSON.stringify(this.printList));
dd.biz.util.openLink({
url: `${baseUrl}?ids=${ids}&encodes=${encodes}&printList=${printListParam}`,
url: `${baseUrl}?ids=${ids}`,
onSuccess: () => {
console.log('跳转成功，准备打印');
// 打印条码
......
ruoyi-ui/src/views/smartSchool/schoolProperty/equipmenTledger/printBarcodes.vue
......@@ -50,7 +50,9 @@ import { getToken } from "@/utils/auth";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import QRCode from "qrcodejs2"; // 生成二维码插件
import printJS from "print-js"; // 打印插件
import {
equipmentPrint
} from "../../../../api/smartSchool/schoolProperty/equipmenTledger";
export default {
name: "index",
......@@ -81,22 +83,28 @@ export default {
};
},
created() {
const ids = this.$route.query.ids;
const encodes = this.$route.query.encodes;
const printList = JSON.parse(decodeURIComponent(this.$route.query.printList));
this.printBarcodes(ids, encodes, printList);
this.getList();
},
methods: {
getList() {
this.loading = true
const ids = this.$route.query.ids;
console.log(ids, 'ids');
equipmentPrint(ids).then(res => {
this.printList = res;
console.log(this.printList, 'this.printList');
this.chooseList = res;
console.log(this.chooseList, 'this.chooseList');
this.loading = false
this.printBarcodes();
})
},
//生成批量打印条码
printBarcodes(ids, encodes, printList) {
printBarcodes() {
this.printDialog = true;
console.log(ids, encodes);
this.printList = [...printList];
this.chooseList = [...this.printList];
console.log(this.chooseList, '122');
this.$nextTick(() => {
this.printList.map((item, index) => {
const domPrint = document.getElementById(`print${index}`).lastElementChild;
......
ruoyi-ui/src/views/smartSchool/schoolProperty/lendingReturn/index.vue
......@@ -27,14 +27,14 @@
<el-table-column label="借用人" align="center" prop="borrowBy" />
<el-table-column label="用途" align="center" prop="purpose" />
<el-table-column label="借用期限（天）" align="center" prop="deadline" width="140" />
<el-table-column label="归还日期" align="center" prop="returnTime" width="160" />
<el-table-column label="预计使用期限" align="center" prop="yjuseTime" width="160" />
<el-table-column label="归还时设备情况" align="center" prop="returnEquipmentCondition" width="160">
<template slot-scope="{ row }">
<dict-tag :options="dict.type.equipment_state" :value="row.returnEquipmentCondition" />
</template>
</el-table-column>
<el-table-column label="接收人" align="center" prop="receivedBy" />
<el-table-column label="预计使用时间" align="center" prop="yjuseTime" width="160" />
<el-table-column label="归还日期" align="center" prop="returnTime" width="160" />
<el-table-column label="实际使用时间" align="center" prop="sjuseTime" width="160" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" prop="orgname" width="150" fixed="right">
......@@ -137,17 +137,19 @@
</el-row>
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="预计使用时间" prop="yjuseTime">
<el-form-item label="预计使用期限" prop="yjuseTime">
<el-date-picker v-model="lendReturnForm.yjuseTime" type="datetime" clearable class="selectWidth"
placeholder="请选择预计使用时间" value-format="yyyy-MM-dd HH:mm:ss" :disabled="nowType == 2 ? true : false">
placeholder="请选择" value-format="yyyy-MM-dd HH:mm:ss" :disabled="nowType == 2 ? true : false">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="实际使用时间" prop="sjuseTime">
<el-date-picker v-model="lendReturnForm.sjuseTime" type="datetime" clearable class="selectWidth"
<!-- <el-date-picker v-model="lendReturnForm.sjuseTime" type="datetime" clearable class="selectWidth"
placeholder="请选择实际使用时间" value-format="yyyy-MM-dd HH:mm:ss" :disabled="nowType == 2 ? true : false">
</el-date-picker>
</el-date-picker> -->
<el-input v-model="lendReturnForm.sjuseTime" placeholder="请输入" :disabled="nowType == 2 ? true : false"
type="number"></el-input>
</el-form-item>
</el-col>
</el-row>
......
ruoyi-ui/src/views/smartSchool/teachAffairAdministration/affairClassView/index.vue
......@@ -2,21 +2,20 @@
<div class="app-container fixed-scroll-error">
<el-row :gutter="20">
<el-col :span="4" :xs="24">
<el-card shadow="never" :style="{ height: clientHeight }">
<el-card shadow="never" class="scrollable-card" :style="{ height: clientHeight }">
<template slot="header">
<div style="display:flex; justify-content: space-between">
<div style="display:flex; align-items: center">
<span>班级列表</span>
</div>
<el-select v-model="queryParams.schoolYear" style="width: 100px;" size="small" @change="handleYearChange">
<el-option v-for="item in yearList" :key="item.value" :value="item.value"
:label="item.label"></el-option>
<el-option v-for="item in yearList" :key="item.value" :value="item.value" :label="item.label"></el-option>
</el-select>
</div>
</template>
<div class="head-container">
<el-tree :data="leftOptions.treeOptions" @node-click="handleNodeClick" :props="leftOptions.defaultProps"
:expand-on-click-node="false" ref="tree" node-key="id" default-expand-all highlight-current/>
:expand-on-click-node="false" ref="tree" node-key="id" default-expand-all highlight-current />
<!-- :filter-node-method="filterNode"-->
</div>
</el-card>
......@@ -138,40 +137,38 @@
<el-table v-if="activeName === Types.STUDENT" stripe v-loading="studentLoading" width="100%"
:cell-style="customCellStyle" :data="rightData.studentList" :key="Types.STUDENT">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column type="selection" width="55" align="center" />
<el-table-column fixed="left" key="avatar" width="60" align="center" prop="avatar" label="头像">
<template slot-scope="scope">
<ListImage :image-url="isEmptyAvatar(scope.row.avatar, scope.row.sex)"></ListImage>
</template>
</el-table-column>
<el-table-column fixed="left" key="studentName" min-width="80" align="center" prop="studentName"
label="姓名"/>
<el-table-column fixed="left" key="studentName" min-width="80" align="center" prop="studentName" label="姓名" />
<!-- <el-table-column key="score" min-width="80" align="center" prop="score" label="积分"/>-->
<el-table-column key="grade" min-width="100px" align="center" prop="classAlias" label="班级"/>
<el-table-column key="grade" min-width="100px" align="center" prop="classAlias" label="班级" />
<el-table-column key="sex" min-width="50px" align="center" prop="sex" label="性别">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex"></dict-tag>
</template>
</el-table-column>
<el-table-column key="nation" width="100" align="center" prop="nation" label="民族"/>
<el-table-column key="nation" width="100" align="center" prop="nation" label="民族" />
<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="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="邮政编码"/>
<el-table-column key="enrollmentYear" width="100" align="center" prop="enrollmentYear" label="级/届"/>
<el-table-column key="idCard" width="180" align="center" prop="idCard" 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="邮政编码" />
<el-table-column key="enrollmentYear" width="100" align="center" prop="enrollmentYear" label="级/届" />
<el-table-column key="enrollmentTime" min-width="100" header-align="center" align="center"
prop="enrollmentTime" label="入学时间" show-overflow-tooltip></el-table-column>
<el-table-column key="platform" width="180" align="center" prop="platform" label="平台"/>
<el-table-column key="platform" width="180" align="center" prop="platform" label="平台" />
<el-table-column key="studentType" width="130" align="center" prop="studentType" label="学生类型">
<template slot-scope="scope">
<dict-tag :options="dict.type.student_type" :value="scope.row.studentType"></dict-tag>
</template>
</el-table-column>
<el-table-column key="provincialNumber" width="150" align="center" prop="provincialNumber"
label="省学籍辅号"/>
<el-table-column key="nationalNumber" width="150" align="center" prop="nationalNumber" label="全国学籍号"/>
<el-table-column key="provincialNumber" width="150" align="center" prop="provincialNumber" label="省学籍辅号" />
<el-table-column key="nationalNumber" width="150" align="center" prop="nationalNumber" label="全国学籍号" />
<el-table-column key="studentStatus" width="80" align="center" prop="studentStatus" label="学生状态">
<template slot-scope="scope">
<dict-tag :options="dict.type.child_state" :value="scope.row.studentStatus"></dict-tag>
......@@ -182,18 +179,17 @@
<dict-tag :options="dict.type.student_type" :value="scope.row.studentType"></dict-tag>
</template>
</el-table-column>
<el-table-column key="schoolNo" width="100" align="center" prop="schoolNo" label="注册序号"/>
<el-table-column key="schoolNo" width="100" align="center" prop="schoolNo" label="注册序号" />
<el-table-column key="registeredAddress" min-width="100" header-align="center" align="center"
prop="registeredAddress" label="户口所在地" show-overflow-tooltip></el-table-column>
<el-table-column key="registeredType" width="180" align="center" prop="registeredType" label="户口性质">
<template slot-scope="scope">
<dict-tag :options="dict.type.regist_type" :value="scope.row.registeredType"/>
<dict-tag :options="dict.type.regist_type" :value="scope.row.registeredType" />
</template>
</el-table-column>
<el-table-column key="juniorSchool" width="130" align="center" prop="juniorSchool" label="初中学校"/>
<el-table-column key="region" width="150" align="center" prop="region" label="国家地区"/>
<el-table-column key="foreignLanguages" width="150" align="center" prop="foreignLanguages"
label="外语语种"/>
<el-table-column key="juniorSchool" width="130" align="center" prop="juniorSchool" label="初中学校" />
<el-table-column key="region" width="150" align="center" prop="region" label="国家地区" />
<el-table-column key="foreignLanguages" width="150" align="center" prop="foreignLanguages" label="外语语种" />
<el-table-column key="appearance" width="150" align="center" prop="appearance" label="政治面貌">
<template slot-scope="scope">
<dict-tag :options="dict.type.politics_tatus" :value="scope.row.appearance"></dict-tag>
......@@ -209,16 +205,15 @@
</span>
</template>
</el-table-column>
<el-table-column key="bloodType" width="100" align="center" prop="bloodType" label="血型"/>
<el-table-column key="health" min-width="100" header-align="center" align="center" prop="health"
label="健康状况"
<el-table-column key="bloodType" width="100" align="center" prop="bloodType" label="血型" />
<el-table-column key="health" min-width="100" header-align="center" align="center" prop="health" label="健康状况"
show-overflow-tooltip></el-table-column>
<el-table-column key="otherRegions" width="180" align="center" prop="otherRegions" label="港澳台侨"/>
<el-table-column key="otherRegions" width="180" align="center" prop="otherRegions" label="港澳台侨" />
<el-table-column key="floatingPopulation" width="130" align="center" prop="floatingPopulation"
label="流动人口状况"/>
label="流动人口状况" />
<el-table-column key="onlyChild" width="150" align="center" prop="onlyChild" label="独生子女">
<template slot-scope="scope">
<dict-tag :options="dict.type.only_child" :value="scope.row.onlyChild"/>
<dict-tag :options="dict.type.only_child" :value="scope.row.onlyChild" />
</template>
</el-table-column>
<el-table-column key="nature" width="150" align="center" prop="nature" label="性质">
......@@ -226,8 +221,7 @@
<dict-tag :options="dict.type.student_nature" :value="scope.row.nature"></dict-tag>
</template>
</el-table-column>
<el-table-column key="support" width="150" align="center" prop="support"
label="接收资助情况"></el-table-column>
<el-table-column key="support" width="150" align="center" prop="support" label="接收资助情况"></el-table-column>
<el-table-column label="操作" align="center" min-width="100px" fixed="right">
<template slot-scope="scope">
<!-- <el-button-->
......@@ -249,18 +243,18 @@
<ListImage :image-url="isEmptyTeacherUrl(scope.row.picUrl, scope.row.sex)"></ListImage>
</template>
</el-table-column>
<el-table-column label="老师名称" align="center" prop="teacherName"/>
<el-table-column label="老师名称" align="center" prop="teacherName" />
<el-table-column label="性别" align="center" width="55" prop="sex">
<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>
</el-table-column>
<el-table-column label="工作编号" width="180px" align="center" prop="teacherCode"/>
<el-table-column label="老师电话" width="180px" align="center" prop="teacherTel"/>
<el-table-column label="工作编号" width="180px" align="center" prop="teacherCode" />
<el-table-column label="老师电话" width="180px" align="center" prop="teacherTel" />
<el-table-column label="任教课程" align="center" prop="courseName"></el-table-column>
<el-table-column label="学历" align="center" prop="education">
<template slot-scope="scope">
<dict-tag :options="dict.type.education" :value="scope.row.education"/>
<dict-tag :options="dict.type.education" :value="scope.row.education" />
</template>
</el-table-column>
<el-table-column label="操作" align="center">
......@@ -272,8 +266,7 @@
</el-table-column>
</el-table>
<ExPagination :total="activeName === Types.STUDENT ? studentTotal : teacherTotal"
:limit.sync="queryParams.pageSize" :page.sync="queryParams.pageNum"
@pagination="getClassDetails">
:limit.sync="queryParams.pageSize" :page.sync="queryParams.pageNum" @pagination="getClassDetails">
</ExPagination>
</el-row>
</el-col>
......@@ -292,14 +285,12 @@
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="姓名：" prop="studentName">
<el-input placeholder="请输入姓名" :disabled="isEditMode" v-model="studentForm.studentName"
clearable></el-input>
<el-input placeholder="请输入姓名" :disabled="isEditMode" v-model="studentForm.studentName" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="身份证号：" prop="idCard">
<el-input placeholder="请输入身份证号" :disabled="isEditMode" v-model="studentForm.idCard"
clearable></el-input>
<el-input placeholder="请输入身份证号" :disabled="isEditMode" v-model="studentForm.idCard" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -320,8 +311,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="出生日期：" prop="birthday">
<el-date-picker v-model="studentForm.birthday" type="date" value-format="yyyy-MM-dd"
placeholder="请选择出生日期"
<el-date-picker v-model="studentForm.birthday" type="date" value-format="yyyy-MM-dd" placeholder="请选择出生日期"
style="width: 100%;"></el-date-picker>
</el-form-item>
</el-col>
......@@ -371,10 +361,8 @@
</el-col>
<el-col :span="8">
<el-form-item label="民族：" prop="nation">
<el-select :disabled="isEditMode" v-model="studentForm.nation" placeholder="请选择民族"
style="width: 100%">
<el-option v-for="item in Nations" :key="item.label" :label="item.label"
:value="item.label"></el-option>
<el-select :disabled="isEditMode" v-model="studentForm.nation" placeholder="请选择民族" style="width: 100%">
<el-option v-for="item in Nations" :key="item.label" :label="item.label" :value="item.label"></el-option>
</el-select>
</el-form-item>
</el-col>
......@@ -407,8 +395,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="级/届：" prop="enrollmentYear">
<el-date-picker style="width:100%" v-model="studentForm.enrollmentYear" type="year"
placeholder="选择入学年">
<el-date-picker style="width:100%" v-model="studentForm.enrollmentYear" type="year" placeholder="选择入学年">
</el-date-picker>
</el-form-item>
......@@ -457,10 +444,7 @@
<el-col :span="8">
<el-form-item label="户口性质：" prop="registeredType">
<el-select v-model="studentForm.registeredType" style="width: 100%" placeholder="请输入户口性质">
<el-option
v-for="dict in dict.type.regist_type"
:key="dict.value"
:label="dict.label"
<el-option v-for="dict in dict.type.regist_type" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
</el-select>
......@@ -515,11 +499,7 @@
<el-col :span="8">
<el-form-item label="独生子女：" prop="onlyChild">
<el-select v-model="studentForm.onlyChild" style="width: 100%" placeholder="请选择是否为独生子女">
<el-option
v-for="dict in dict.type.only_child"
:key="dict.value"
:label="dict.label"
:value="dict.value">
<el-option v-for="dict in dict.type.only_child" :key="dict.value" :label="dict.label" :value="dict.value">
</el-option>
</el-select>
</el-form-item>
......@@ -547,7 +527,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="教师名称" prop="teacherName">
<el-input v-model="teacherForm.teacherName" placeholder=""/>
<el-input v-model="teacherForm.teacherName" placeholder="" />
</el-form-item>
<el-form-item label="性别" prop="sex">
<el-select v-model="teacherForm.sex" style="width: 100%" placeholder="">
......@@ -556,10 +536,10 @@
</el-select>
</el-form-item>
<el-form-item label="身份证号" prop="idCard">
<el-input v-model.trim="teacherForm.idCard" placeholder=""/>
<el-input v-model.trim="teacherForm.idCard" placeholder="" />
</el-form-item>
<el-form-item label="手机号码" prop="teacherTel">
<el-input v-model="teacherForm.teacherTel" placeholder=""/>
<el-input v-model="teacherForm.teacherTel" placeholder="" />
</el-form-item>
</el-col>
<el-col :span="12">
......@@ -591,7 +571,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="工作编号" prop="teacherCode">
<el-input v-model="teacherForm.teacherCode" placeholder=""/>
<el-input v-model="teacherForm.teacherCode" placeholder="" />
</el-form-item>
</el-col>
<el-col :span="12">
......@@ -610,16 +590,14 @@
<el-col :span="12">
<el-form-item label="岗位" prop="postId">
<el-select multiple v-model="teacherForm.postId" placeholder="" style="width: 100%;">
<el-option v-for="item in []" :key="item.postId" :label="item.postName"
:value="item.postId"></el-option>
<el-option v-for="item in []" :key="item.postId" :label="item.postName" :value="item.postId"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="角色" prop="roleId">
<el-select v-model="teacherForm.roleId" multiple placeholder="" style="width: 100%;">
<el-option v-for="item in []" :key="item.roleId" :label="item.roleName"
:value="item.roleId"></el-option>
<el-option v-for="item in []" :key="item.roleId" :label="item.roleName" :value="item.roleId"></el-option>
</el-select>
</el-form-item>
</el-col>
......@@ -635,8 +613,7 @@
<el-col :span="12">
<el-form-item label="民族" prop="nation">
<el-select v-model="teacherForm.nation" style="width: 100%" placeholder="">
<el-option v-for="item in Nations" :key="item.label" :label="item.label"
:value="item.label"></el-option>
<el-option v-for="item in Nations" :key="item.label" :label="item.label" :value="item.label"></el-option>
</el-select>
</el-form-item>
</el-col>
......@@ -652,7 +629,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="家庭住址" prop="homeAddress">
<el-input v-model="teacherForm.homeAddress" placeholder=""/>
<el-input v-model="teacherForm.homeAddress" placeholder="" />
</el-form-item>
</el-col>
</el-row>
......@@ -673,12 +650,12 @@ import {
getStudentList,
getTeacherList
} from "@/api/smartSchool/teachAffairAdministration/affairClassView";
import {getFirstLeafNode, handleTreeData} from "@/utils/utilLibrary/getTreeClass";
import {getYearList} from "@/utils/utilLibrary/getYearList";
import {CustomCellStyle} from "@/enums/customStyle";
import {getStudent} from "@/api/smartSchool/studentManage";
import {getInform} from "@/api/smartSchool/teacherManage/teacherInformation";
import {Gender, Nations} from "@/enums/common";
import { getFirstLeafNode, handleTreeData } from "@/utils/utilLibrary/getTreeClass";
import { getYearList } from "@/utils/utilLibrary/getYearList";
import { CustomCellStyle } from "@/enums/customStyle";
import { getStudent } from "@/api/smartSchool/studentManage";
import { getInform } from "@/api/smartSchool/teacherManage/teacherInformation";
import { Gender, Nations } from "@/enums/common";
export default {
name: "index",
......@@ -843,7 +820,6 @@ export default {
/** 查询班级信息 */
getClassDetails() {
if (this.yearClass == 1) {
this.queryParams.pageNum = 1;
if (this.activeName === this.Types.STUDENT) {
this.studentLoading = true;
getStudentList(this.queryParams).then(response => {
......@@ -987,4 +963,8 @@ export default {
.form-header {
margin: 8px 0px 25px 0px;
}
.scrollable-card {
overflow: auto;
}
</style>
ruoyi-ui/src/views/smartSchool/teachAffairAdministration/lessonManage/index.vue
......@@ -2,7 +2,7 @@
<div class="app-container">
<el-row>
<el-col :span="4">
<el-card style="height: 950px">
<el-card style="height: 950px" class="scrollable-card">
<el-form :model="queryParams" style="border-bottom: 1px solid #dfe6ec; padding: 10px 0 0 5px">
<el-form-item label="班级信息" prop="schoolYear">
<el-select v-model="queryParams.schoolYear" @change="getTreeData" style="width: 100%" size="mini">
......@@ -678,6 +678,10 @@ export default {
padding-right: 0px;
}
.scrollable-card {
overflow: auto;
}
/*.dragBox[data-v-86c11aba] {*/
/* font-size: 20px;*/
/* width: 100%;*/
......
ruoyi-ui/src/views/smartSchool/teachAffairAdministration/questionnaireManagement/components/ActivityResult/index.vue
......@@ -2,33 +2,20 @@
<div class="activity-result app-container">
<el-tabs tab-position="left" style="height: 100%;">
<el-tab-pane label="明细数据">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
label-width="80px">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
<el-form-item label="姓名" prop="studentName">
<el-input v-model="queryParams.studentName" placeholder="请输入姓名" clearable
@keyup.enter.native="handleQuery">
<el-input v-model="queryParams.studentName" placeholder="请输入姓名" clearable @keyup.enter.native="handleQuery">
</el-input>
</el-form-item>
<el-form-item label="填写状态" prop="ryZdzt">
<el-select v-model="queryParams.ryZdzt" style="width: 100%" placeholder="请选择问卷填写状态">
<el-option
v-for="dict in dict.type.quiz_txzt"
:key="dict.value"
:label="dict.label"
:value="dict.value">
<el-option v-for="dict in dict.type.quiz_txzt" :key="dict.value" :label="dict.label" :value="dict.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="填写时间">
<el-date-picker
v-model="dateRange"
style="width: 240px"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
<el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
......@@ -48,31 +35,26 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="activityList" @selection-change="handleSelectionChange">
<el-table-column type="index" label="序号" width="55" align="center"/>
<el-table-column v-if="pubType==0" label="班级" align="center" prop="classAlias"/>
<el-table-column label="姓名" align="center" prop="studentName"/>
<el-table-column type="index" label="序号" width="55" align="center" />
<el-table-column v-if="pubType == 0" label="班级" align="center" prop="classAlias" />
<el-table-column label="姓名" align="center" prop="studentName" />
<el-table-column label="填写状态" align="center" prop="ryZdzt">
<template slot-scope="scope">
<span>{{ scope.row.ryZdzt == 0 ? '未填写' : '已填写' }} </span>
</template>
</el-table-column>
<el-table-column label="填写时间" align="center" min-width="120px" prop="ryCtime"/>
<el-table-column v-for="(item,index) in dynamicTitle" :label="item" min-width="150px" align="center">
<el-table-column label="填写时间" align="center" min-width="120px" prop="ryCtime" />
<el-table-column v-for="(item, index) in dynamicTitle" :label="item" min-width="150px" align="center">
<template slot-scope="scope">
<ListImage v-if="scope.row[dynamicProp[index]] && scope.row[dynamicProp[index]].type==3"
:image-url=" scope.row[dynamicProp[index]] && baseUrl+scope.row[dynamicProp[index]].datas"
<ListImage v-if="scope.row[dynamicProp[index]] && scope.row[dynamicProp[index]].type == 3"
:image-url="scope.row[dynamicProp[index]] && baseUrl + scope.row[dynamicProp[index]].datas"
style="height: 50px"></ListImage>
<span v-else> {{ scope.row[dynamicProp[index]] && scope.row[dynamicProp[index]].datas }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" min-width="80" key="operate">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-view"
@click="handleDetail(scope.row)"
>查看
<el-button size="mini" type="text" icon="el-icon-view" @click="handleDetail(scope.row)">查看
</el-button>
</template>
</el-table-column>
......@@ -80,15 +62,14 @@
</el-tab-pane>
<el-tab-pane label="统计">
<el-card style="width: 900px; height: 900px; margin:auto">
<div v-if="countList.length!=0" v-for="(item,index) in countList" :key="item.title"
<div v-if="countList.length != 0" v-for="(item, index) in countList" :key="item.title"
style="height:270px ;width:800px;margin: 20px 0 0 0 ;">
<b>{{ item.title }}</b>
<br/> <br/>
<el-table v-loading="loading" :data="item.detailsLit"
:summary-method="(res)=>getSummaries(res,index )" show-summary
>
<el-table-column label="选项" align="center" prop="selects"/>
<el-table-column label="小计" align="center" prop="selectNum"/>
<br /> <br />
<el-table v-loading="loading" :data="item.detailsLit" :summary-method="(res) => getSummaries(res, index)"
show-summary>
<el-table-column label="选项" align="center" prop="selects" />
<el-table-column label="小计" align="center" prop="selectNum" />
<el-table-column label="比例" align="center" sortable prop="proportion">
<template slot-scope="scope">
<el-progress :percentage="scope.row.proportion"></el-progress>
......@@ -101,9 +82,9 @@
</el-tab-pane>
</el-tabs>
<el-dialog title="调查问卷" :visible.sync="dialogQuestionire" width="860" append-to-body>
<el-form ref="form" disabled label-width="90px"
style="width: 100%; margin: auto">
<el-form ref="form" disabled label-width="90px" style="width: 100%; margin: auto">
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="班级">
......@@ -111,26 +92,18 @@
</el-form-item>
<el-form-item label="填写状态" prop="ryZdzt">
<el-select v-model="formFix.ryZdzt" style="width: 100%" placeholder="请选择问卷填写状态">
<el-option
v-for="dict in dict.type.quiz_txzt"
:key="dict.value"
:label="dict.label"
:value="dict.value">
<el-option v-for="dict in dict.type.quiz_txzt" :key="dict.value" :label="dict.label" :value="dict.value">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="姓名" prop="studentName">
<el-input :value="formFix.studentName"/>
<el-input :value="formFix.studentName" />
</el-form-item>
<el-form-item label="填写时间">
<el-date-picker
v-model="formFix.ryCtime"
style="width: 100%"
value-format="yyyy-MM-dd HH:mm"
type="date"
></el-date-picker>
<el-date-picker v-model="formFix.ryCtime" style="width: 100%" value-format="yyyy-MM-dd HH:mm"
type="date"></el-date-picker>
</el-form-item>
</el-col>
</el-row>
......@@ -142,25 +115,26 @@
:value="item.type"></dict-tag>
)
<b>{{ item.title }}</b>
<br/><br/>
<el-image v-if="item.type==3" :src="baseUrl+item.datas"></el-image>
<br /><br />
<el-image v-if="item.type == 3" :src="baseUrl + item.datas"></el-image>
<b v-else>{{ item.datas }}</b>
<el-divider></el-divider>
</el-row>
</el-form>
</el-dialog>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
</div>
</template>
<script>
import {activityTypesEnum, departmentEnum} from "@/enums/questionnaire/content";
import { activityTypesEnum, departmentEnum } from "@/enums/questionnaire/content";
import {
getList,
getCount,
getQuestionResultQueryOne
} from "@/api/smartSchool/teachAffairAdministration/questionnaireManagement/ActivityResult/request.js";
import {closeCurrentTab} from "@/utils/utilLibrary/routerBatch/routerBatch.js";
import { closeCurrentTab } from "@/utils/utilLibrary/routerBatch/routerBatch.js";
export default {
name: "QuestionnaireResult",
......@@ -191,7 +165,7 @@ export default {
// 显示搜索条件
showSearch: true,
// 总条数
// total: 0,
total: 0,
// 办公申购表格数据
activityList: [],
// 弹出层标题
......@@ -241,6 +215,8 @@ export default {
this.loading = true;
getList(this.addDateRange(this.queryParams, this.dateRange), this.dcwjId).then(response => {
this.activityList = response.data
this.total = response.total;
console.log(response, 'response');
//获取标题
let title = Object.values(response.titles)
this.dynamicTitle = title.filter((item) => {
......@@ -360,7 +336,7 @@ export default {
//查看按钮
handleDetail(row) {
this.dialogQuestionire = true
let {classAlias, ryZdzt, studentName, ryCtime} = row
let { classAlias, ryZdzt, studentName, ryCtime } = row
this.formFix.classAlias = classAlias
this.formFix.ryZdzt = ryZdzt
this.formFix.studentName = studentName
......@@ -391,7 +367,7 @@ export default {
},
getSummaries(param, index) {
// console.log(index,778)
const {columns, data} = param;
const { columns, data } = param;
const sums = [];
columns.forEach((column, columnIndex) => {
if (columnIndex === 0) {
......@@ -410,6 +386,5 @@ export default {
</script>
<style scoped lang="scss">
div.activity-result {
}
div.activity-result {}
</style>
ruoyi-ui/src/views/smartSchool/teachAffairAdministration/questionnaireManagement/index.vue
<template>
<div class="questionnaire-activity 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="dcwjName">
<el-input v-model="queryParams.dcwjName"
placeholder="请输入问卷名称"
clearable
@keyup.enter.native="handleQuery"
>
<el-input v-model="queryParams.dcwjName" placeholder="请输入问卷名称" clearable @keyup.enter.native="handleQuery">
</el-input>
</el-form-item>
<el-form-item label="问卷状态" prop="dcwjZt">
......@@ -29,13 +18,7 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
>新 增
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新 增
</el-button>
<!-- v-show="queryParams.dcwjZt==='0'"-->
</el-col>
......@@ -78,89 +61,55 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="activityList" @selection-change="handleSelectionChange">
<el-table-column type="selection" min-width="55" align="center"/>
<el-table-column type="index" label="序号" min-width="55" align="center"/>
<el-table-column type="selection" min-width="55" align="center" />
<el-table-column type="index" label="序号" min-width="55" align="center" />
<el-table-column label="范围" align="center" prop="scope" min-width="200px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.scope }}
</template>
</el-table-column>
<el-table-column label="问卷名称" align="center" prop="dcwjName" min-width="150px" show-overflow-tooltip/>
<el-table-column label="问卷名称" align="center" prop="dcwjName" min-width="150px" show-overflow-tooltip />
<el-table-column label="状态" align="center" prop="dcwjZt">
<template slot-scope="scope">
<dict-tag :options="dict.type.quest_state" :value="scope.row.dcwjZt"/>
<dict-tag :options="dict.type.quest_state" :value="scope.row.dcwjZt" />
</template>
</el-table-column>
<el-table-column label="开始时间" sortable align="center" min-width="150px" prop="dcwjKssj"/>
<el-table-column label="结束时间" sortable align="center" min-width="150px" prop="dcwjJssj"/>
<el-table-column label="描述" align="center" min-width="200px" show-overflow-tooltip prop="dcwjMs"/>
<el-table-column label="开始时间" sortable align="center" min-width="150px" prop="dcwjKssj" />
<el-table-column label="结束时间" sortable align="center" min-width="150px" prop="dcwjJssj" />
<el-table-column label="描述" align="center" min-width="200px" show-overflow-tooltip prop="dcwjMs" />
<el-table-column label="操作" align="center" min-width="270px">
<template v-slot="scope">
<el-button
v-show="scope.row.dcwjZt==='1'"
size="mini"
type="text"
@click="handleUpdate(scope.row)"
>修改
<el-button v-show="scope.row.dcwjZt === '1'" size="mini" type="text" @click="handleUpdate(scope.row)">修改
</el-button>
<el-button
size="mini"
type="text"
@click="jumpTo(QuestionnaireContent(scope.row.id, scope.row.dcwjZt,scope.row.dcwjName))"
>问卷内容
<el-button size="mini" type="text"
@click="jumpTo(QuestionnaireContent(scope.row.id, scope.row.dcwjZt, scope.row.dcwjName))">问卷内容
</el-button>
<el-button v-show="scope.row.dcwjZt==='1'"
size="mini"
type="text"
@click="publishExamExecute(scope.row)"
>发布
<el-button v-show="scope.row.dcwjZt === '1'" size="mini" type="text" @click="publishExamExecute(scope.row)">发布
</el-button>
<el-button v-show="scope.row.dcwjZt==='2'"
size="mini"
type="text"
@click="toQuestionResult(scope.row.id,scope.row.pubType)"
>问卷结果
<el-button v-show="scope.row.dcwjZt === '2'" size="mini" type="text"
@click="toQuestionResult(scope.row.id, scope.row.pubType)">问卷结果
</el-button>
<!-- @click="jumpTo(ActivityResult(scope.row.id,scope.row.pubType))"-->
<el-button v-show="scope.row.dcwjZt==='1'"
size="mini"
type="text"
@click="handleDelete(scope.row)"
>删除
<el-button v-show="scope.row.dcwjZt === '1'" size="mini" type="text" @click="handleDelete(scope.row)">删除
</el-button>
<el-button
v-show="scope.row.dcwjZt==='2'"
size="mini"
type="text"
@click="recallExamExecute(scope.row)"
>撤回
<el-button v-show="scope.row.dcwjZt === '2'" size="mini" type="text" @click="recallExamExecute(scope.row)">撤回
</el-button>
<el-button
size="mini"
type="text"
@click="handleCheck(scope.row)"
>查看
<el-button size="mini" type="text" @click="handleCheck(scope.row)">查看
</el-button>
</template>
</el-table-column>
</el-table>
<ExPagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<ExPagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
<!-- 添加或修改问卷调查活动对话框 -->
<el-dialog :title="title" :visible.sync="open" width="650px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="auto" class="add-edit-dialog"
:disabled="!isEditable">
<el-form ref="form" :model="form" :rules="rules" label-width="auto" class="add-edit-dialog" :disabled="!isEditable">
<el-row>
<el-col :span="24">
<el-form-item label="问卷名称" prop="dcwjName">
<el-input v-model="form.dcwjName" placeholder="请输入活动名称"/>
<el-input v-model="form.dcwjName" placeholder="请输入活动名称" />
</el-form-item>
</el-col>
<el-col :span="12">
......@@ -169,25 +118,15 @@
<el-row>
<el-col :span="12">
<el-form-item label="开始时间" prop="dcwjKssj">
<el-date-picker clearable
v-model="form.dcwjKssj"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择开始时间"
:picker-options="StartPickerOptions"
>
<el-date-picker clearable v-model="form.dcwjKssj" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择开始时间" :picker-options="StartPickerOptions">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="" prop="dcwjJssj" label-width="0px">
<el-date-picker clearable
v-model="form.dcwjJssj"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择结束时间"
:picker-options="EndPickerOptions"
>
<el-date-picker clearable v-model="form.dcwjJssj" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择结束时间" :picker-options="EndPickerOptions">
</el-date-picker>
</el-form-item>
</el-col>
......@@ -195,42 +134,31 @@
<el-row>
<el-col :span="12">
<el-form-item label="学年" prop="schoolYear">
<el-input v-model="form.schoolYear" placeholder="请输入学年" disabled/>
<el-input v-model="form.schoolYear" placeholder="请输入学年" disabled />
</el-form-item>
</el-col>
</el-row>
<el-form-item label="问卷描述" prop="dcwjMs">
<el-input type="textarea" v-model="form.dcwjMs" placeholder="请输入问卷描述"/>
<el-input type="textarea" v-model="form.dcwjMs" placeholder="请输入问卷描述" />
</el-form-item>
<el-col :span="12">
<el-form-item label="接收人类型" prop="pubType">
<el-select v-model="form.pubType" @change="receiveChange" placeholder="请选择接收人类型">
<el-option
v-for="item in [{
<el-option v-for="item in [{
value: '1',
label: '教师'},{
label: '教师'
}, {
value: '0',
label: '家长'
}]"
:key="item.value"
:label="item.label"
:value="item.value">
}]" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="级部" prop="gradeIds">
<treeselect
v-model="form.gradeIds"
:disabled="gradeDisabled || !isEditable"
multiple
:options="gradeTree"
:show-count="true"
:defaultExpandLevel="2"
:disable-branch-nodes="true"
placeholder="请选择级部"
/>
<treeselect v-model="form.gradeIds" :disabled="gradeDisabled || !isEditable" multiple :options="gradeTree"
:show-count="true" :defaultExpandLevel="2" :disable-branch-nodes="true" placeholder="请选择级部" />
</el-form-item>
</el-col>
</el-form>
......@@ -258,8 +186,8 @@ import {
getQueryOne
} from "@/api/smartSchool/teachAffairAdministration/questionnaireManagement/QuestionnaireActivity/request.js";
import {jumpTo, Path_Destination} from "@/utils/utilLibrary/routerBatch/routerBatch";
import {QUESTION_STATE} from "@/enums/questionnaire/content";
import { jumpTo, Path_Destination } from "@/utils/utilLibrary/routerBatch/routerBatch";
import { QUESTION_STATE } from "@/enums/questionnaire/content";
import Treeselect from "@riophae/vue-treeselect";
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
......@@ -315,11 +243,11 @@ export default {
},
// 表单校验
rules: {
dcwjName: [{required: true, message: '问卷名称不能为空', trigger: 'blur'}],
dcwjKssj: [{required: true, message: '开始时间不能为空', trigger: 'blur'}],
dcwjJssj: [{required: true, message: '结束不能为空', trigger: 'blur'}],
gradeId: [{required: true, message: '范围不能为空', trigger: 'blur'}],
pubType: [{required: true, message: '接收人类型不能为空', trigger: 'blur'}],
dcwjName: [{ required: true, message: '问卷名称不能为空', trigger: 'blur' }],
dcwjKssj: [{ required: true, message: '开始时间不能为空', trigger: 'blur' }],
dcwjJssj: [{ required: true, message: '结束不能为空', trigger: 'blur' }],
gradeId: [{ required: true, message: '范围不能为空', trigger: 'blur' }],
pubType: [{ required: true, message: '接收人类型不能为空', trigger: 'blur' }],
},
StartPickerOptions: {
disabledDate: (time) => {
......@@ -338,7 +266,7 @@ export default {
title
}),
//问卷结果
ActivityResult: (examId, pubType) => new Path_Destination(`/teachAffairQuestion/result/${examId}`, {pubType: pubType}),
ActivityResult: (examId, pubType) => new Path_Destination(`/teachAffairQuestion/result/${examId}`, { pubType: pubType }),
};
},
created() {
......@@ -560,8 +488,9 @@ div.questionnaire-activity {
}
}
form.add-edit-dialog ::v-deep .el-input__inner, form.add-edit-dialog ::v-deep .el-date-editor, form.add-edit-dialog ::v-deep .el-select--medium {
form.add-edit-dialog ::v-deep .el-input__inner,
form.add-edit-dialog ::v-deep .el-date-editor,
form.add-edit-dialog ::v-deep .el-select--medium {
width: 98.5%;
}
</style>
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