commit:左树右表页面支持

This commit is contained in:
Jerry
2020-10-10 23:40:46 +08:00
parent 42eb7503d7
commit 3020abc9e5
5 changed files with 284 additions and 334 deletions

View File

@@ -1,98 +1,100 @@
<template> <template>
<div style="position: relative;"> <el-container style="position: relative;">
<el-form label-width="100px" size="mini" label-position="right" @submit.native.prevent> <el-aside width="300px">
<filter-box :item-width="350"> <el-card class="base-card" shadow="never" :body-style="{ padding: '0px' }">
<el-form-item label="所属省份"> <div slot="header" class="base-card-header">
<el-select class="filter-item" v-model="formStudent.formFilter.provinceId" :clearable="true" filterable <span>所属校区</span>
placeholder="所属省份" :loading="formStudent.provinceId.impl.loading" </div>
@visible-change="formStudent.provinceId.impl.onVisibleChange" <el-scrollbar :style="{height: (getMainContextHeight - 94) + 'px'}" class="custom-scroll">
@change="onProvinceIdValueChange"> <el-tree ref="schoolId" :props="{label: 'name'}"
<el-option v-for="item in formStudent.provinceId.impl.dropdownList" :key="item.id" :value="item.id" :label="item.name" /> :data="formStudent.schoolId.impl.dropdownList"
</el-select> node-key="id" @node-click="onSchoolIdValueChange"
</el-form-item> :highlight-current="true" :default-expand-all="true" />
<el-form-item label="所属城市"> </el-scrollbar>
<el-select class="filter-item" v-model="formStudent.formFilter.cityId" :clearable="true" filterable </el-card>
placeholder="所属城市" :loading="formStudent.cityId.impl.loading" </el-aside>
@visible-change="formStudent.cityId.impl.onVisibleChange" <el-main style="padding-left: 15px;">
@change="onCityIdValueChange"> <el-scrollbar :style="{height: (getMainContextHeight - 42) + 'px'}" class="custom-scroll">
<el-option v-for="item in formStudent.cityId.impl.dropdownList" :key="item.id" :value="item.id" :label="item.name" /> <el-form label-width="100px" size="mini" label-position="right" @submit.native.prevent>
</el-select> <filter-box :item-width="350">
</el-form-item> <el-form-item label="所属年级">
<el-form-item label="所属校区"> <el-select class="filter-item" v-model="formStudent.formFilter.gradeId" :clearable="true" filterable
<el-select class="filter-item" v-model="formStudent.formFilter.schoolId" :clearable="true" filterable placeholder="所属年级" :loading="formStudent.gradeId.impl.loading"
placeholder="所属校区" :loading="formStudent.schoolId.impl.loading" @visible-change="formStudent.gradeId.impl.onVisibleChange"
@visible-change="formStudent.schoolId.impl.onVisibleChange" @change="onGradeIdValueChange">
@change="onSchoolIdValueChange"> <el-option v-for="item in formStudent.gradeId.impl.dropdownList" :key="item.id" :value="item.id" :label="item.name" />
<el-option v-for="item in formStudent.schoolId.impl.dropdownList" :key="item.id" :value="item.id" :label="item.name" /> </el-select>
</el-select> </el-form-item>
</el-form-item> <el-form-item label="注册日期">
<el-form-item label="注册日期"> <date-range class="filter-item" v-model="formStudent.formFilter.registerDate" :clearable="true" :allowTypes="['day']" align="left"
<date-range class="filter-item" v-model="formStudent.formFilter.registerDate" :clearable="true" :allowTypes="['day']" align="left" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd hh:mm:ss" />
format="yyyy-MM-dd" value-format="yyyy-MM-dd hh:mm:ss" /> </el-form-item>
</el-form-item> <el-form-item label="学生姓名">
<el-form-item label="学生姓名"> <el-input class="filter-item" v-model="formStudent.formFilter.searchString"
<el-input class="filter-item" v-model="formStudent.formFilter.searchString" :clearable="true" placeholder="输入学生姓名 / 手机号码 模糊查询" />
:clearable="true" placeholder="输入学生姓名 / 手机号码 模糊查询" /> </el-form-item>
</el-form-item> <el-button slot="operator" type="primary" :plain="true" size="mini" @click="refreshFormStudent(true)">查询</el-button>
<el-button slot="operator" type="primary" :plain="true" size="mini" @click="refreshFormStudent(true)">查询</el-button> <el-button slot="operator" type="primary" size="mini" :disabled="!checkPermCodeExist('formStudent:formStudent:formCreateStudent')"
<el-button slot="operator" type="primary" size="mini" :disabled="!checkPermCodeExist('formStudent:formStudent:formCreateStudent')" @click="onFormCreateStudentClick()">
@click="onFormCreateStudentClick()"> 新建
新建 </el-button>
</el-button> </filter-box>
</filter-box> </el-form>
</el-form> <el-row>
<el-row> <el-col :span="24">
<el-col :span="24"> <el-table :data="formStudent.Student.impl.dataList" size="mini" @sort-change="formStudent.Student.impl.onSortChange"
<el-table :data="formStudent.Student.impl.dataList" size="mini" @sort-change="formStudent.Student.impl.onSortChange" header-cell-class-name="table-header-gray">
header-cell-class-name="table-header-gray"> <el-table-column label="序号" header-align="center" align="center" type="index" width="55px" :index="formStudent.Student.impl.getTableIndex" />
<el-table-column label="序号" header-align="center" align="center" type="index" width="55px" :index="formStudent.Student.impl.getTableIndex" /> <el-table-column label="姓名" prop="studentName">
<el-table-column label="姓名" prop="studentName"> </el-table-column>
</el-table-column> <el-table-column label="手机号码" prop="loginMobile">
<el-table-column label="手机号码" prop="loginMobile"> </el-table-column>
</el-table-column> <el-table-column label="所属校区" prop="schoolIdDictMap.name">
<el-table-column label="所属校区" prop="schoolIdDictMap.name"> </el-table-column>
</el-table-column> <el-table-column label="经验等级" prop="experienceLevelDictMap.name" sortable="custom">
<el-table-column label="经验等级" prop="experienceLevelDictMap.name" sortable="custom"> </el-table-column>
</el-table-column> <table-progress-column label="学币状态" :min="0" max-column="totalCoin" value-column="leftCoin" />
<table-progress-column label="学币状态" :min="0" max-column="totalCoin" value-column="leftCoin" /> <el-table-column label="状态 " prop="statusDictMap.name">
<el-table-column label="状态 " prop="statusDictMap.name"> </el-table-column>
</el-table-column> <el-table-column label="注册时间" prop="registerTime">
<el-table-column label="注册时间" prop="registerTime"> <template slot-scope="scope">
<template slot-scope="scope"> <span>{{formatDateByStatsType(scope.row.registerTime, 'day')}}</span>
<span>{{formatDateByStatsType(scope.row.registerTime, 'day')}}</span> </template>
</template> </el-table-column>
</el-table-column> <el-table-column label="操作" fixed="right">
<el-table-column label="操作" fixed="right"> <template slot-scope="scope">
<template slot-scope="scope"> <el-button @click="onFormEditStudentClick(scope.row)" type="text" size="mini"
<el-button @click="onFormEditStudentClick(scope.row)" type="text" size="mini" :disabled="!checkPermCodeExist('formStudent:formStudent:formEditStudent')">
:disabled="!checkPermCodeExist('formStudent:formStudent:formEditStudent')"> 编辑
编辑 </el-button>
</el-button> <el-button @click="onDeleteClick(scope.row)" type="text" size="mini"
<el-button @click="onDeleteClick(scope.row)" type="text" size="mini" :disabled="!checkPermCodeExist('formStudent:formStudent:delete')">
:disabled="!checkPermCodeExist('formStudent:formStudent:delete')"> 删除
删除 </el-button>
</el-button> </template>
</template> </el-table-column>
</el-table-column> </el-table>
</el-table> <el-row type="flex" justify="end" style="margin-top: 10px;">
<el-row type="flex" justify="end" style="margin-top: 10px;"> <el-pagination
<el-pagination :total="formStudent.Student.impl.totalCount"
:total="formStudent.Student.impl.totalCount" :current-page="formStudent.Student.impl.currentPage"
:current-page="formStudent.Student.impl.currentPage" :page-size="formStudent.Student.impl.pageSize"
:page-size="formStudent.Student.impl.pageSize" :page-sizes="[10, 20, 50, 100]"
:page-sizes="[10, 20, 50, 100]" layout="total, prev, pager, next, sizes"
layout="total, prev, pager, next, sizes" @current-change="formStudent.Student.impl.onCurrentPageChange"
@current-change="formStudent.Student.impl.onCurrentPageChange" @size-change="formStudent.Student.impl.onPageSizeChange">
@size-change="formStudent.Student.impl.onPageSizeChange"> </el-pagination>
</el-pagination> </el-row>
</el-col>
</el-row> </el-row>
</el-col> </el-scrollbar>
</el-row> </el-main>
</div> </el-container>
</template> </template>
<script> <script>
import { mapGetters } from 'vuex';
/* eslint-disable-next-line */ /* eslint-disable-next-line */
import rules from '@/utils/validate.js'; import rules from '@/utils/validate.js';
/* eslint-disable-next-line */ /* eslint-disable-next-line */
@@ -113,27 +115,22 @@ export default {
return { return {
formStudent: { formStudent: {
formFilter: { formFilter: {
provinceId: undefined,
cityId: undefined,
schoolId: undefined, schoolId: undefined,
gradeId: undefined,
registerDate: [], registerDate: [],
searchString: undefined searchString: undefined
}, },
formFilterCopy: { formFilterCopy: {
provinceId: undefined,
cityId: undefined,
schoolId: undefined, schoolId: undefined,
gradeId: undefined,
registerDate: [], registerDate: [],
searchString: undefined searchString: undefined
}, },
provinceId: {
impl: new DropdownWidget(this.loadProvinceIdDropdownList)
},
cityId: {
impl: new DropdownWidget(this.loadCityIdDropdownList)
},
schoolId: { schoolId: {
impl: new DropdownWidget(this.loadSchoolIdDropdownList) impl: new DropdownWidget(this.loadSchoolIdDropdownList, true, 'id', 'parentId')
},
gradeId: {
impl: new DropdownWidget(this.loadGradeIdDropdownList)
}, },
Student: { Student: {
impl: new TableWidget(this.loadStudentData, this.loadStudentVerify, true, 'registerTime', 1) impl: new TableWidget(this.loadStudentData, this.loadStudentVerify, true, 'registerTime', 1)
@@ -151,8 +148,7 @@ export default {
params = { params = {
...params, ...params,
studentFilter: { studentFilter: {
provinceId: this.formStudent.formFilterCopy.provinceId, gradeId: this.formStudent.formFilterCopy.gradeId,
cityId: this.formStudent.formFilterCopy.cityId,
schoolId: this.formStudent.formFilterCopy.schoolId, schoolId: this.formStudent.formFilterCopy.schoolId,
registerTimeStart: Array.isArray(this.formStudent.formFilterCopy.registerDate) ? this.formStudent.formFilterCopy.registerDate[0] : undefined, registerTimeStart: Array.isArray(this.formStudent.formFilterCopy.registerDate) ? this.formStudent.formFilterCopy.registerDate[0] : undefined,
registerTimeEnd: Array.isArray(this.formStudent.formFilterCopy.registerDate) ? this.formStudent.formFilterCopy.registerDate[1] : undefined, registerTimeEnd: Array.isArray(this.formStudent.formFilterCopy.registerDate) ? this.formStudent.formFilterCopy.registerDate[1] : undefined,
@@ -174,76 +170,18 @@ export default {
* 学生数据数据获取检测函数返回true正常获取数据返回false停止获取数据 * 学生数据数据获取检测函数返回true正常获取数据返回false停止获取数据
*/ */
loadStudentVerify () { loadStudentVerify () {
this.formStudent.formFilterCopy.provinceId = this.formStudent.formFilter.provinceId; this.formStudent.formFilterCopy.gradeId = this.formStudent.formFilter.gradeId;
this.formStudent.formFilterCopy.cityId = this.formStudent.formFilter.cityId;
this.formStudent.formFilterCopy.schoolId = this.formStudent.formFilter.schoolId; this.formStudent.formFilterCopy.schoolId = this.formStudent.formFilter.schoolId;
this.formStudent.formFilterCopy.registerDate = this.formStudent.formFilter.registerDate; this.formStudent.formFilterCopy.registerDate = this.formStudent.formFilter.registerDate;
this.formStudent.formFilterCopy.searchString = this.formStudent.formFilter.searchString; this.formStudent.formFilterCopy.searchString = this.formStudent.formFilter.searchString;
return true; return true;
}, },
/**
* 所属省份下拉数据获取函数
*/
loadProvinceIdDropdownList () {
return new Promise((resolve, reject) => {
let params = {};
DictionaryController.dictAreaCodeByParentId(this, params).then(res => {
resolve(res.getList());
}).catch(e => {
reject(e);
});
});
},
/**
* 所属省份选中值改变
*/
onProvinceIdValueChange (value) {
// 清除被过滤组件选中值并且将被过滤组件的状态设置为dirty
this.formStudent.formFilter.cityId = undefined;
this.formStudent.cityId.impl.dirty = true;
this.onCityIdValueChange(this.formStudent.formFilter.cityId);
// 清除被过滤组件选中值并且将被过滤组件的状态设置为dirty
this.formStudent.formFilter.schoolId = undefined;
this.formStudent.schoolId.impl.dirty = true;
this.onSchoolIdValueChange(this.formStudent.formFilter.schoolId);
},
/**
* 所属城市下拉数据获取函数
*/
loadCityIdDropdownList () {
return new Promise((resolve, reject) => {
let params = {
parentId: this.formStudent.formFilter.provinceId
};
if (params.parentId == null || params.parentId === '') {
resolve([]);
return;
}
DictionaryController.dictAreaCodeByParentId(this, params).then(res => {
resolve(res.getList());
}).catch(e => {
reject(e);
});
});
},
/**
* 所属城市选中值改变
*/
onCityIdValueChange (value) {
// 清除被过滤组件选中值并且将被过滤组件的状态设置为dirty
this.formStudent.formFilter.schoolId = undefined;
this.formStudent.schoolId.impl.dirty = true;
this.onSchoolIdValueChange(this.formStudent.formFilter.schoolId);
},
/** /**
* 所属校区下拉数据获取函数 * 所属校区下拉数据获取函数
*/ */
loadSchoolIdDropdownList () { loadSchoolIdDropdownList () {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
let params = { let params = {};
provinceId: this.formStudent.formFilter.provinceId,
cityId: this.formStudent.formFilter.cityId
};
DictionaryController.dictSchoolInfo(this, params).then(res => { DictionaryController.dictSchoolInfo(this, params).then(res => {
resolve(res.getList()); resolve(res.getList());
}).catch(e => { }).catch(e => {
@@ -255,6 +193,33 @@ export default {
* 所属校区选中值改变 * 所属校区选中值改变
*/ */
onSchoolIdValueChange (value) { onSchoolIdValueChange (value) {
if (value.id !== this.formStudent.formFilter.schoolId) {
this.formStudent.formFilter.schoolId = value.id;
} else {
this.formStudent.formFilter.schoolId = undefined;
this.$nextTick(() => {
this.$refs.schoolId.setCurrentKey(null);
});
}
this.refreshFormStudent(true);
},
/**
* 所属年级下拉数据获取函数
*/
loadGradeIdDropdownList () {
return new Promise((resolve, reject) => {
let params = {};
DictionaryController.dictGrade(this, params).then(res => {
resolve(res.getList());
}).catch(e => {
reject(e);
});
});
},
/**
* 所属年级选中值改变
*/
onGradeIdValueChange (value) {
}, },
/** /**
* 更新学生管理 * 更新学生管理
@@ -267,6 +232,7 @@ export default {
} }
if (!this.formStudent.isInit) { if (!this.formStudent.isInit) {
// 初始化下拉数据 // 初始化下拉数据
this.formStudent.schoolId.impl.onVisibleChange(true);
} }
this.formStudent.isInit = true; this.formStudent.isInit = true;
}, },
@@ -320,8 +286,17 @@ export default {
this.refreshFormStudent(); this.refreshFormStudent();
} }
}, },
computed: {
...mapGetters(['getMainContextHeight'])
},
created () { created () {
this.formInit(); this.formInit();
} }
} }
</script> </script>
<style scoped>
>>> .el-tree-node__content {
height: 35px;
}
</style>

View File

@@ -10,7 +10,7 @@
icon="el-icon-circle-plus-outline" @click="onCreatePermModuleClick()" /> icon="el-icon-circle-plus-outline" @click="onCreatePermModuleClick()" />
</div> </div>
</div> </div>
<el-scrollbar :style="{height: (getClientHeight - 184) + 'px'}" class="custom-scroll"> <el-scrollbar :style="{height: (getMainContextHeight - 94) + 'px'}" class="custom-scroll">
<el-tree ref="moduleTree" :data="getModuleTreeData" :props="{label: 'moduleName'}" <el-tree ref="moduleTree" :data="getModuleTreeData" :props="{label: 'moduleName'}"
node-key="moduleId" @node-click="onModuleNodeClick" :default-expanded-keys="formPerm.expandedModule" node-key="moduleId" @node-click="onModuleNodeClick" :default-expanded-keys="formPerm.expandedModule"
:highlight-current="true" @node-expand="onModuleNodeExpand" @node-collapse="onModuleNodeCollapse"> :highlight-current="true" @node-expand="onModuleNodeExpand" @node-collapse="onModuleNodeCollapse">
@@ -49,7 +49,7 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-table :data="formPerm.SysPerm.impl.dataList" size="mini" @sort-change="formPerm.SysPerm.impl.onSortChange" <el-table :data="formPerm.SysPerm.impl.dataList" size="mini" @sort-change="formPerm.SysPerm.impl.onSortChange"
header-cell-class-name="table-header-gray" :height="(getClientHeight - 222) + 'px'"> header-cell-class-name="table-header-gray" :height="(getMainContextHeight - 132) + 'px'">
<el-table-column label="序号" header-align="center" align="center" type="index" width="50px" :index="formPerm.SysPerm.impl.getTableIndex" /> <el-table-column label="序号" header-align="center" align="center" type="index" width="50px" :index="formPerm.SysPerm.impl.getTableIndex" />
<el-table-column label="权限名称" prop="permName" width="150px"> <el-table-column label="权限名称" prop="permName" width="150px">
</el-table-column> </el-table-column>
@@ -344,7 +344,7 @@ export default {
}]; }];
return tempList.concat(this.formPerm.permModuleId.impl.dropdownList); return tempList.concat(this.formPerm.permModuleId.impl.dropdownList);
}, },
...mapGetters(['getClientHeight']) ...mapGetters(['getMainContextHeight'])
}, },
created () { created () {
this.formInit(); this.formInit();

View File

@@ -5,11 +5,11 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0"> <meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="<%= BASE_URL %>favicon.ico"> <link rel="icon" href="<%= BASE_URL %>favicon.ico">
<title><%= htmlWebpackPlugin.options.title %></title> <title><EFBFBD>ȵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD></title>
</head> </head>
<body class="demo-project"> <body class="demo-project">
<noscript> <noscript>
<strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong> <strong>We're sorry but <EFBFBD>ȵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
</noscript> </noscript>
<div id="app"></div> <div id="app"></div>
<!-- built files will be auto injected --> <!-- built files will be auto injected -->

View File

@@ -1,98 +1,100 @@
<template> <template>
<div style="position: relative;"> <el-container style="position: relative;">
<el-form label-width="100px" size="mini" label-position="right" @submit.native.prevent> <el-aside width="300px">
<filter-box :item-width="350"> <el-card class="base-card" shadow="never" :body-style="{ padding: '0px' }">
<el-form-item label="所在省份"> <div slot="header" class="base-card-header">
<el-select class="filter-item" v-model="formStudent.formFilter.provinceId" :clearable="true" filterable <span>所属校区</span>
placeholder="所在省份" :loading="formStudent.provinceId.impl.loading" </div>
@visible-change="formStudent.provinceId.impl.onVisibleChange" <el-scrollbar :style="{height: (getMainContextHeight - 94) + 'px'}" class="custom-scroll">
@change="onProvinceIdValueChange"> <el-tree ref="schoolId" :props="{label: 'name'}"
<el-option v-for="item in formStudent.provinceId.impl.dropdownList" :key="item.id" :value="item.id" :label="item.name" /> :data="formStudent.schoolId.impl.dropdownList"
</el-select> node-key="id" @node-click="onSchoolIdValueChange"
</el-form-item> :highlight-current="true" :default-expand-all="true" />
<el-form-item label="所在城市"> </el-scrollbar>
<el-select class="filter-item" v-model="formStudent.formFilter.cityId" :clearable="true" filterable </el-card>
placeholder="所在城市" :loading="formStudent.cityId.impl.loading" </el-aside>
@visible-change="formStudent.cityId.impl.onVisibleChange" <el-main style="padding-left: 15px;">
@change="onCityIdValueChange"> <el-scrollbar :style="{height: (getMainContextHeight - 42) + 'px'}" class="custom-scroll">
<el-option v-for="item in formStudent.cityId.impl.dropdownList" :key="item.id" :value="item.id" :label="item.name" /> <el-form label-width="100px" size="mini" label-position="right" @submit.native.prevent>
</el-select> <filter-box :item-width="350">
</el-form-item> <el-form-item label="所属年级">
<el-form-item label="所属校区"> <el-select class="filter-item" v-model="formStudent.formFilter.gradeId" :clearable="true" filterable
<el-select class="filter-item" v-model="formStudent.formFilter.schoolId" :clearable="true" filterable placeholder="所属年级" :loading="formStudent.gradeId.impl.loading"
placeholder="所属校区" :loading="formStudent.schoolId.impl.loading" @visible-change="formStudent.gradeId.impl.onVisibleChange"
@visible-change="formStudent.schoolId.impl.onVisibleChange" @change="onGradeIdValueChange">
@change="onSchoolIdValueChange"> <el-option v-for="item in formStudent.gradeId.impl.dropdownList" :key="item.id" :value="item.id" :label="item.name" />
<el-option v-for="item in formStudent.schoolId.impl.dropdownList" :key="item.id" :value="item.id" :label="item.name" /> </el-select>
</el-select> </el-form-item>
</el-form-item> <el-form-item label="注册日期">
<el-form-item label="注册日期"> <date-range class="filter-item" v-model="formStudent.formFilter.registerDate" :clearable="true" :allowTypes="['day']" align="left"
<date-range class="filter-item" v-model="formStudent.formFilter.registerDate" :clearable="true" :allowTypes="['day']" align="left" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd hh:mm:ss" />
format="yyyy-MM-dd" value-format="yyyy-MM-dd hh:mm:ss" /> </el-form-item>
</el-form-item> <el-form-item label="学生姓名">
<el-form-item label="学生姓名"> <el-input class="filter-item" v-model="formStudent.formFilter.searchString"
<el-input class="filter-item" v-model="formStudent.formFilter.searchString" :clearable="true" placeholder="输入学生姓名 / 手机号码 模糊查询" />
:clearable="true" placeholder="输入学生姓名 / 手机号码 模糊查询" /> </el-form-item>
</el-form-item> <el-button slot="operator" type="primary" :plain="true" size="mini" @click="refreshFormStudent(true)">查询</el-button>
<el-button slot="operator" type="primary" :plain="true" size="mini" @click="refreshFormStudent(true)">查询</el-button> <el-button slot="operator" type="primary" size="mini" :disabled="!checkPermCodeExist('formStudent:formStudent:formCreateStudent')"
<el-button slot="operator" type="primary" size="mini" :disabled="!checkPermCodeExist('formStudent:formStudent:formCreateStudent')" @click="onFormCreateStudentClick()">
@click="onFormCreateStudentClick()"> 新建
新建 </el-button>
</el-button> </filter-box>
</filter-box> </el-form>
</el-form> <el-row>
<el-row> <el-col :span="24">
<el-col :span="24"> <el-table :data="formStudent.Student.impl.dataList" size="mini" @sort-change="formStudent.Student.impl.onSortChange"
<el-table :data="formStudent.Student.impl.dataList" size="mini" @sort-change="formStudent.Student.impl.onSortChange" header-cell-class-name="table-header-gray">
header-cell-class-name="table-header-gray"> <el-table-column label="序号" header-align="center" align="center" type="index" width="55px" :index="formStudent.Student.impl.getTableIndex" />
<el-table-column label="序号" header-align="center" align="center" type="index" width="55px" :index="formStudent.Student.impl.getTableIndex" /> <el-table-column label="学生姓名" prop="studentName">
<el-table-column label="学生姓名" prop="studentName"> </el-table-column>
</el-table-column> <el-table-column label="手机号码" prop="loginMobile">
<el-table-column label="手机号码" prop="loginMobile"> </el-table-column>
</el-table-column> <el-table-column label="所属校区" prop="schoolIdDictMap.name">
<el-table-column label="所属校区" prop="schoolIdDictMap.name"> </el-table-column>
</el-table-column> <el-table-column label="经验等级" prop="experienceLevelDictMap.name">
<el-table-column label="经验等级" prop="experienceLevelDictMap.name"> </el-table-column>
</el-table-column> <table-progress-column label="剩余学币" :min="0" max-column="totalCoin" value-column="leftCoin" />
<table-progress-column label="剩余学币" :min="0" max-column="totalCoin" value-column="leftCoin" /> <el-table-column label="学生状态" prop="statusDictMap.name">
<el-table-column label="学生状态" prop="statusDictMap.name"> </el-table-column>
</el-table-column> <el-table-column label="注册时间" prop="registerTime">
<el-table-column label="注册时间" prop="registerTime"> <template slot-scope="scope">
<template slot-scope="scope"> <span>{{formatDateByStatsType(scope.row.registerTime, 'day')}}</span>
<span>{{formatDateByStatsType(scope.row.registerTime, 'day')}}</span> </template>
</template> </el-table-column>
</el-table-column> <el-table-column label="操作" fixed="right">
<el-table-column label="操作" fixed="right"> <template slot-scope="scope">
<template slot-scope="scope"> <el-button @click="onFormEditStudentClick(scope.row)" type="text" size="mini"
<el-button @click="onFormEditStudentClick(scope.row)" type="text" size="mini" :disabled="!checkPermCodeExist('formStudent:formStudent:formEditStudent')">
:disabled="!checkPermCodeExist('formStudent:formStudent:formEditStudent')"> 编辑
编辑 </el-button>
</el-button> <el-button @click="onDeleteClick(scope.row)" type="text" size="mini"
<el-button @click="onDeleteClick(scope.row)" type="text" size="mini" :disabled="!checkPermCodeExist('formStudent:formStudent:delete')">
:disabled="!checkPermCodeExist('formStudent:formStudent:delete')"> 删除
删除 </el-button>
</el-button> </template>
</template> </el-table-column>
</el-table-column> </el-table>
</el-table> <el-row type="flex" justify="end" style="margin-top: 10px;">
<el-row type="flex" justify="end" style="margin-top: 10px;"> <el-pagination
<el-pagination :total="formStudent.Student.impl.totalCount"
:total="formStudent.Student.impl.totalCount" :current-page="formStudent.Student.impl.currentPage"
:current-page="formStudent.Student.impl.currentPage" :page-size="formStudent.Student.impl.pageSize"
:page-size="formStudent.Student.impl.pageSize" :page-sizes="[10, 20, 50, 100]"
:page-sizes="[10, 20, 50, 100]" layout="total, prev, pager, next, sizes"
layout="total, prev, pager, next, sizes" @current-change="formStudent.Student.impl.onCurrentPageChange"
@current-change="formStudent.Student.impl.onCurrentPageChange" @size-change="formStudent.Student.impl.onPageSizeChange">
@size-change="formStudent.Student.impl.onPageSizeChange"> </el-pagination>
</el-pagination> </el-row>
</el-col>
</el-row> </el-row>
</el-col> </el-scrollbar>
</el-row> </el-main>
</div> </el-container>
</template> </template>
<script> <script>
import { mapGetters } from 'vuex';
/* eslint-disable-next-line */ /* eslint-disable-next-line */
import rules from '@/utils/validate.js'; import rules from '@/utils/validate.js';
/* eslint-disable-next-line */ /* eslint-disable-next-line */
@@ -113,27 +115,22 @@ export default {
return { return {
formStudent: { formStudent: {
formFilter: { formFilter: {
provinceId: undefined,
cityId: undefined,
schoolId: undefined, schoolId: undefined,
gradeId: undefined,
registerDate: [], registerDate: [],
searchString: undefined searchString: undefined
}, },
formFilterCopy: { formFilterCopy: {
provinceId: undefined,
cityId: undefined,
schoolId: undefined, schoolId: undefined,
gradeId: undefined,
registerDate: [], registerDate: [],
searchString: undefined searchString: undefined
}, },
provinceId: {
impl: new DropdownWidget(this.loadProvinceIdDropdownList)
},
cityId: {
impl: new DropdownWidget(this.loadCityIdDropdownList)
},
schoolId: { schoolId: {
impl: new DropdownWidget(this.loadSchoolIdDropdownList) impl: new DropdownWidget(this.loadSchoolIdDropdownList, true, 'id', 'parentId')
},
gradeId: {
impl: new DropdownWidget(this.loadGradeIdDropdownList)
}, },
Student: { Student: {
impl: new TableWidget(this.loadStudentData, this.loadStudentVerify, true, 'registerTime', 1) impl: new TableWidget(this.loadStudentData, this.loadStudentVerify, true, 'registerTime', 1)
@@ -151,8 +148,7 @@ export default {
params = { params = {
...params, ...params,
studentFilter: { studentFilter: {
provinceId: this.formStudent.formFilterCopy.provinceId, gradeId: this.formStudent.formFilterCopy.gradeId,
cityId: this.formStudent.formFilterCopy.cityId,
schoolId: this.formStudent.formFilterCopy.schoolId, schoolId: this.formStudent.formFilterCopy.schoolId,
registerTimeStart: Array.isArray(this.formStudent.formFilterCopy.registerDate) ? this.formStudent.formFilterCopy.registerDate[0] : undefined, registerTimeStart: Array.isArray(this.formStudent.formFilterCopy.registerDate) ? this.formStudent.formFilterCopy.registerDate[0] : undefined,
registerTimeEnd: Array.isArray(this.formStudent.formFilterCopy.registerDate) ? this.formStudent.formFilterCopy.registerDate[1] : undefined, registerTimeEnd: Array.isArray(this.formStudent.formFilterCopy.registerDate) ? this.formStudent.formFilterCopy.registerDate[1] : undefined,
@@ -174,76 +170,18 @@ export default {
* 学生数据数据获取检测函数返回true正常获取数据返回false停止获取数据 * 学生数据数据获取检测函数返回true正常获取数据返回false停止获取数据
*/ */
loadStudentVerify () { loadStudentVerify () {
this.formStudent.formFilterCopy.provinceId = this.formStudent.formFilter.provinceId; this.formStudent.formFilterCopy.gradeId = this.formStudent.formFilter.gradeId;
this.formStudent.formFilterCopy.cityId = this.formStudent.formFilter.cityId;
this.formStudent.formFilterCopy.schoolId = this.formStudent.formFilter.schoolId; this.formStudent.formFilterCopy.schoolId = this.formStudent.formFilter.schoolId;
this.formStudent.formFilterCopy.registerDate = this.formStudent.formFilter.registerDate; this.formStudent.formFilterCopy.registerDate = this.formStudent.formFilter.registerDate;
this.formStudent.formFilterCopy.searchString = this.formStudent.formFilter.searchString; this.formStudent.formFilterCopy.searchString = this.formStudent.formFilter.searchString;
return true; return true;
}, },
/**
* 所在省份下拉数据获取函数
*/
loadProvinceIdDropdownList () {
return new Promise((resolve, reject) => {
let params = {};
DictionaryController.dictAreaCodeByParentId(this, params).then(res => {
resolve(res.getList());
}).catch(e => {
reject(e);
});
});
},
/**
* 所在省份选中值改变
*/
onProvinceIdValueChange (value) {
// 清除被过滤组件选中值并且将被过滤组件的状态设置为dirty
this.formStudent.formFilter.cityId = undefined;
this.formStudent.cityId.impl.dirty = true;
this.onCityIdValueChange(this.formStudent.formFilter.cityId);
// 清除被过滤组件选中值并且将被过滤组件的状态设置为dirty
this.formStudent.formFilter.schoolId = undefined;
this.formStudent.schoolId.impl.dirty = true;
this.onSchoolIdValueChange(this.formStudent.formFilter.schoolId);
},
/**
* 所在城市下拉数据获取函数
*/
loadCityIdDropdownList () {
return new Promise((resolve, reject) => {
let params = {
parentId: this.formStudent.formFilter.provinceId
};
if (params.parentId == null || params.parentId === '') {
resolve([]);
return;
}
DictionaryController.dictAreaCodeByParentId(this, params).then(res => {
resolve(res.getList());
}).catch(e => {
reject(e);
});
});
},
/**
* 所在城市选中值改变
*/
onCityIdValueChange (value) {
// 清除被过滤组件选中值并且将被过滤组件的状态设置为dirty
this.formStudent.formFilter.schoolId = undefined;
this.formStudent.schoolId.impl.dirty = true;
this.onSchoolIdValueChange(this.formStudent.formFilter.schoolId);
},
/** /**
* 所属校区下拉数据获取函数 * 所属校区下拉数据获取函数
*/ */
loadSchoolIdDropdownList () { loadSchoolIdDropdownList () {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
let params = { let params = {};
provinceId: this.formStudent.formFilter.provinceId,
cityId: this.formStudent.formFilter.cityId
};
DictionaryController.dictSchoolInfo(this, params).then(res => { DictionaryController.dictSchoolInfo(this, params).then(res => {
resolve(res.getList()); resolve(res.getList());
}).catch(e => { }).catch(e => {
@@ -255,6 +193,33 @@ export default {
* 所属校区选中值改变 * 所属校区选中值改变
*/ */
onSchoolIdValueChange (value) { onSchoolIdValueChange (value) {
if (value.id !== this.formStudent.formFilter.schoolId) {
this.formStudent.formFilter.schoolId = value.id;
} else {
this.formStudent.formFilter.schoolId = undefined;
this.$nextTick(() => {
this.$refs.schoolId.setCurrentKey(null);
});
}
this.refreshFormStudent(true);
},
/**
* 所属年级下拉数据获取函数
*/
loadGradeIdDropdownList () {
return new Promise((resolve, reject) => {
let params = {};
DictionaryController.dictGrade(this, params).then(res => {
resolve(res.getList());
}).catch(e => {
reject(e);
});
});
},
/**
* 所属年级选中值改变
*/
onGradeIdValueChange (value) {
}, },
/** /**
* 更新学生管理 * 更新学生管理
@@ -267,6 +232,7 @@ export default {
} }
if (!this.formStudent.isInit) { if (!this.formStudent.isInit) {
// 初始化下拉数据 // 初始化下拉数据
this.formStudent.schoolId.impl.onVisibleChange(true);
} }
this.formStudent.isInit = true; this.formStudent.isInit = true;
}, },
@@ -320,8 +286,17 @@ export default {
this.refreshFormStudent(); this.refreshFormStudent();
} }
}, },
computed: {
...mapGetters(['getMainContextHeight'])
},
created () { created () {
this.formInit(); this.formInit();
} }
} }
</script> </script>
<style scoped>
>>> .el-tree-node__content {
height: 35px;
}
</style>

View File

@@ -10,7 +10,7 @@
icon="el-icon-circle-plus-outline" @click="onCreatePermModuleClick()" /> icon="el-icon-circle-plus-outline" @click="onCreatePermModuleClick()" />
</div> </div>
</div> </div>
<el-scrollbar :style="{height: (getClientHeight - 184) + 'px'}" class="custom-scroll"> <el-scrollbar :style="{height: (getMainContextHeight - 94) + 'px'}" class="custom-scroll">
<el-tree ref="moduleTree" :data="getModuleTreeData" :props="{label: 'moduleName'}" <el-tree ref="moduleTree" :data="getModuleTreeData" :props="{label: 'moduleName'}"
node-key="moduleId" @node-click="onModuleNodeClick" :default-expanded-keys="formPerm.expandedModule" node-key="moduleId" @node-click="onModuleNodeClick" :default-expanded-keys="formPerm.expandedModule"
:highlight-current="true" @node-expand="onModuleNodeExpand" @node-collapse="onModuleNodeCollapse"> :highlight-current="true" @node-expand="onModuleNodeExpand" @node-collapse="onModuleNodeCollapse">
@@ -49,7 +49,7 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-table :data="formPerm.SysPerm.impl.dataList" size="mini" @sort-change="formPerm.SysPerm.impl.onSortChange" <el-table :data="formPerm.SysPerm.impl.dataList" size="mini" @sort-change="formPerm.SysPerm.impl.onSortChange"
header-cell-class-name="table-header-gray" :height="(getClientHeight - 222) + 'px'"> header-cell-class-name="table-header-gray" :height="(getMainContextHeight - 132) + 'px'">
<el-table-column label="序号" header-align="center" align="center" type="index" width="50px" :index="formPerm.SysPerm.impl.getTableIndex" /> <el-table-column label="序号" header-align="center" align="center" type="index" width="50px" :index="formPerm.SysPerm.impl.getTableIndex" />
<el-table-column label="权限名称" prop="permName" width="150px"> <el-table-column label="权限名称" prop="permName" width="150px">
</el-table-column> </el-table-column>
@@ -344,7 +344,7 @@ export default {
}]; }];
return tempList.concat(this.formPerm.permModuleId.impl.dropdownList); return tempList.concat(this.formPerm.permModuleId.impl.dropdownList);
}, },
...mapGetters(['getClientHeight']) ...mapGetters(['getMainContextHeight'])
}, },
created () { created () {
this.formInit(); this.formInit();