Commit a2130725 authored by 罗超's avatar 罗超

页面提交

parent b327cbbe
......@@ -12,7 +12,7 @@ export default {
<style>
@import url('~assets/css/font.css');
@import url('//at.alicdn.com/t/font_2077629_ns3e8uvuyb.css');
@import url('//at.alicdn.com/t/font_2077629_wkoyran264.css');
html,
body,
......
......@@ -22,4 +22,15 @@ export function saveSchool(data) {
method: 'post',
data
})
}
/**
* 获取教师分页数据
*/
export function getTeacherPage(data) {
return request({
url: '/user/GetTeacherPageList',
method: 'post',
data
})
}
\ No newline at end of file
......@@ -26,5 +26,36 @@
z-index: 1
box-shadow: rgba(0, 0, 0, 0.05) 2px 0px 0px
td.none-shadow
box-shadow: none
.sticky-tow-column-table
max-width: 100%
thead
background: rgb(245, 246, 247)
thead tr:first-child
height: 40px
line-height: 14px
thead tr:first-child th
font-size: 12px
font-weight: 400
color: rgb(168, 168, 179)
thead tr:first-child th:nth-child(-n+2)
background-color: rgb(245, 246, 247)
td:nth-child(-n+2)
background-color: #fff
th:nth-child(-n+2),
td:nth-child(-n+2)
position: sticky
left: 0
z-index: 1
box-shadow: rgba(0, 0, 0, 0.05) 2px 0px 0px
td.none-shadow
box-shadow: none
\ No newline at end of file
<template>
<q-dialog v-model="persistent" content-class="bg-grey-1" persistent transition-show="scale" transition-hide="scale">
<q-card style="width: 800px;max-width:900px;">
<q-card-section>
<div class="text-h6">{{objOption.SId==0?'新增校区':'修改校区'}}</div>
</q-card-section>
<div class="text-caption q-mb-lg q-px-md text-grey-6">基本资料</div>
<q-card-section class="q-pt-none">
<div class="row wrap">
<q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.SName" ref="SName" class="col-6 q-pr-lg q-pb-lg" label="校区名称" :rules="[val => !!val || '请填写校区名称']" />
<q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.SAddress" ref="SAddress" class="col-6 q-pb-lg" label="校区地址" :rules="[val => !!val || '请填写校区地址']" />
<q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.SLinkMan" ref="SLinkMan" class="col-6 q-pr-lg q-pb-lg " label="校区联系人" :rules="[val => !!val || '请填写校区联系人']" />
<q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.SLinkTel" ref="SLinkTel" class="col-6 q-pb-lg" label="校区联系电话" :rules="[val => !!val || '请填写校区联系电话']" />
<q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.Remark" class="col-6 q-pb-lg q-pr-lg" label="校区备注" />
<div class="col-6">
<q-toggle size="md" label="校区状态" color="primary" :false-value="1" :true-value="0" v-model="objOption.Status" />
<div class="text-grey-6 text-caption">注意:关闭校区后,所有下属教师、学生将无法继续使用系统</div>
</div>
</div>
</q-card-section>
<q-separator />
<q-card-actions align="right" class="bg-white">
<q-btn label="取消" color="dark" style="font-weight:400 !important" @click="closeSaveForm" />
<q-btn label="立即提交" color="accent q-px-md" style="font-weight:400 !important" :loading="saveLoading" @click="saveSchool" />
</q-card-actions>
</q-card>
</q-dialog>
</template>
<script>
export default {
props: {
saveObj: {
type: Object,
default: null
}
},
data() {
return {
objOption: {},
optionTitle: ""
}
},
mounted() {
if ()
},
methods: {
initObj() {
if (this.saveObj) {
this.optionTitle = "修改教师信息"
this.objOption = this.saveObj
} else {
this.optionTitle = "新增教师"
this.objOption = {
TId: 0,
School_Id: '',
TeacherName: "",
TeacherTel: '',
TeacherHead: '',
TeacherIcon: '',
TeacherSay: '',
TeacherIntro: '',
IsShow: '1',
IsRecommend: '0',
SortNum: 1
}
}
}
},
}
</script>
<style>
</style>
......@@ -9,7 +9,7 @@
{{name}}
</q-toolbar-title>
<q-tabs v-model="tab" @input="changeNavs" inline-label style="margin:0 auto; font-family:perfectFont;height:60px" class="text-white" shrink stretch v-if="userInfo">
<q-route-tab v-for="(x, i) in userInfo.MenuList" :key="i" :to="x.MenuUrl" :name="`navs_${i}`" :label="x.MenuName" :icon="x.MenuIcon" />
<q-tab v-for="(x, i) in userInfo.MenuList" :key="i" @click="setNavs(i)" :name="`navs_${i}`" :label="x.MenuName" :icon="x.MenuIcon" />
</q-tabs>
<div class="q-pl-lg">
<q-btn-dropdown flat color="primary" size="xs">
......@@ -182,6 +182,7 @@ import EssentialLink from 'components/EssentialLink.vue'
import {
mapGetters
} from 'vuex'
import lockr from 'lockr'
export default {
name: 'MainLayout',
components: {
......@@ -216,6 +217,16 @@ export default {
this.currentPath = route.path
},
immediate: true
},
userInfo: {
handler: function (newVal) {
let i = this.tab.split('_')[1]
if (newVal && newVal.MenuList) {
this.secondNavs = newVal.MenuList.length > 0 ? newVal.MenuList[i].SubList : []
}
console.log(this.secondNavs)
},
immediate: true
}
},
computed: {
......@@ -226,7 +237,14 @@ export default {
]),
},
mounted() {
this.secondNavs = this.userInfo ? this.userInfo.MenuList[0].SubList : []
let i = 0
if (lockr.get("current_navs")) {
i = lockr.get("current_navs")
}
this.tab = `navs_${i}`
if (this.userInfo && this.userInfo.MenuList) {
this.secondNavs = this.userInfo.MenuList.length > 0 ? this.userInfo.MenuList[i].SubList : []
}
},
methods: {
logout() {
......@@ -240,6 +258,15 @@ export default {
changeNavs(val) {
let i = val.split('_')[1]
this.secondNavs = this.userInfo.MenuList[i].SubList
},
setNavs(val) {
//防止页面数据丢失
lockr.set("current_navs", val)
this.tab = `navs_${val}`
this.secondNavs = this.userInfo.MenuList[val].SubList
this.$router.push({
path: this.userInfo.MenuList[val].MenuUrl
})
}
},
}
......
......@@ -3,30 +3,32 @@
<div class="page-search row items-center">
<div class="col row wrap q-mr-lg q-col-gutter-md">
<div class="col-3">
<q-input @change="resetSearch" clearable standout="bg-primary text-white" v-model="msg.SName" label="校区名称" />
<q-input @change="resetSearch" clearable standout="bg-primary text-white" v-model="msg.TeacherName" label="教师名称" />
</div>
<div class="col-3">
<q-select @input="resetSearch" standout="bg-primary text-white" v-model="StatusTemp" :options="StatusOpts" option-value="value" option-label="label" label="校区状态" />
<q-input @change="resetSearch" clearable standout="bg-primary text-white" v-model="msg.TeacherTel" label="教师电话" />
</div>
<div class="col-3">
<q-select @input="resetSearch" standout="bg-primary text-white" v-model="msg.IsShow" :options="ShowOpts" emit-value map-options label="显示状态" />
</div>
<div class="col-3">
<q-select @input="resetSearch" standout="bg-primary text-white" v-model="msg.AuditStatus" :options="AuditOpts" emit-value map-options label="审核状态" />
</div>
</div>
<div class="page-option">
<!-- 原则上不能操作过三个按钮,建议不要使用查询按钮,增加用户操作次数 -->
<!-- <q-btn color="primary" outline label="立即查询" /> -->
<q-btn color="accent" class="q-mr-md" icon="add" label="新增校区" @click="initObj(null)" />
<q-btn color="accent" class="q-mr-md" icon="add" label="新增教师" @click="initObj(null)" />
<q-btn-dropdown outline color="dark" label="更多">
<q-list>
<q-item clickable v-close-popup @click="onItemClick">
<!-- <q-item-section side>
<q-icon name="style" />
</q-item-section> -->
<q-item-section>
<q-item-label>导出</q-item-label>
<q-item-label>批量导入</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-close-popup @click="onItemClick">
<q-item-section>
<q-item-label>导入</q-item-label>
<q-item-label>批量导出</q-item-label>
</q-item-section>
</q-item>
</q-list>
......@@ -34,60 +36,53 @@
</div>
</div>
<div class="page-content">
<q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-column-table" separator="none" title="校区信息" :data="data" :columns="columns" row-key="name">
<template v-slot:body-cell-Status="props">
<q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-tow-column-table" separator="none" title="教师信息" :data="data" :columns="columns" row-key="name">
<template v-slot:body-cell-IsShow="props">
<q-td :props="props">
<q-badge :color="props.value==1?'negative':'primary'" :label="props.value==1?'关闭':'正常'" />
<q-badge :color="props.value==0?'negative':'primary'" :label="props.value==0?'隐藏':'显示'" />
</q-td>
</template>
<template v-slot:body-cell-Remark="props">
<template v-slot:body-cell-TeacherIcon="props">
<q-td :props="props">
<q-badge color="grey-3 text-grey-10" :label="props.value" />
<q-avatar size="md">
<img :src="props.value" />
</q-avatar>
</q-td>
</template>
<template v-slot:body-cell-optioned="props">
<template v-slot:body-cell-TeacherName="props">
<q-td :props="props">
<q-btn flat size="xs" icon="edit" color="accent" style="font-family:perfectFont" label="编辑" @click="initObj(props.value)" />
<div class="text-blue cursor-pointer">{{props.value}}</div>
</q-td>
</template>
<template v-slot:body-cell-IsRecommend="props">
<q-td :props="props">
<q-icon v-if="props==1" name="iconfont icon-good" color="negative" size="16px" />
</q-td>
</template>
<template v-slot:body-cell-AuditStatus="props">
<q-td :props="props">
<q-badge v-if="props.value==1" color="dark" label="审核中" />
<q-badge v-if="props.value==2" color="warning" label="审核不通过" />
<q-badge v-if="props.value==3" color="primary" label="审核通过" />
</q-td>
</template>
<template v-slot:bottom>
<q-pagination class="full-width justify-end" v-model="msg.pageIndex" color="primary" :max="pageCount" :input="true" @input="changePage" />
</template>
<template v-slot:body-cell-optioned="props">
<q-td :props="props">
<q-btn flat size="xs" icon="edit" color="accent" style="font-family:perfectFont" label="编辑" @click="initObj(props.value)" />
</q-td>
</template>
</q-table>
<q-dialog v-model="persistent" content-class="bg-grey-1" persistent transition-show="scale" transition-hide="scale">
<q-card style="width: 800px;max-width:900px;">
<q-card-section>
<div class="text-h6">{{objOption.SId==0?'新增校区':'修改校区'}}</div>
</q-card-section>
<div class="text-caption q-mb-lg q-px-md text-grey-6">基本资料</div>
<q-card-section class="q-pt-none">
<div class="row wrap">
<q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.SName" ref="SName" class="col-6 q-pr-lg q-pb-lg" label="校区名称" :rules="[val => !!val || '请填写校区名称']" />
<q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.SAddress" ref="SAddress" class="col-6 q-pb-lg" label="校区地址" :rules="[val => !!val || '请填写校区地址']" />
<q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.SLinkMan" ref="SLinkMan" class="col-6 q-pr-lg q-pb-lg " label="校区联系人" :rules="[val => !!val || '请填写校区联系人']" />
<q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.SLinkTel" ref="SLinkTel" class="col-6 q-pb-lg" label="校区联系电话" :rules="[val => !!val || '请填写校区联系电话']" />
<q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.Remark" class="col-6 q-pb-lg q-pr-lg" label="校区备注" />
<div class="col-6">
<q-toggle size="md" label="校区状态" color="primary" :false-value="1" :true-value="0" v-model="objOption.Status" />
<div class="text-grey-6 text-caption">注意:关闭校区后,所有下属教师、学生将无法继续使用系统</div>
</div>
</div>
</q-card-section>
<q-separator />
<q-card-actions align="right" class="bg-white">
<q-btn label="取消" color="dark" style="font-weight:400 !important" @click="closeSaveForm" />
<q-btn label="立即提交" color="accent q-px-md" style="font-weight:400 !important" :loading="saveLoading" @click="saveSchool" />
</q-card-actions>
</q-card>
</q-dialog>
</div>
</div>
</template>
<script>
import {
getSchoolPage,
saveSchool
getTeacherPage
} from '../../api/school/index'
export default {
meta: {
......@@ -97,99 +92,128 @@ export default {
return {
currentUrl: "",
columns: [{
name: 'SName',
name: 'TeacherIcon',
label: '',
field: 'TeacherIcon',
align: 'left',
},
{
name: 'TeacherName',
required: true,
label: '公司名称',
label: '教师名称',
align: 'left',
field: row => row.TeacherName
},
{
name: 'TeacherTel',
label: '教师电话',
field: 'TeacherTel',
align: 'left'
},
{
name: 'SName',
label: '所属校区',
field: 'SName',
align: 'left',
field: row => row.SName,
format: val => `${val}`,
sortable: true
},
{
name: 'GroupName',
label: '所属机构',
field: 'GroupName',
name: 'AuditStatus',
label: '审核状态',
align: 'left',
sortable: true
field: 'AuditStatus'
},
{
name: 'SLinkMan',
label: '负责人',
field: 'SLinkMan',
name: 'IsShow',
label: '是否显示',
align: 'left',
sortable: true
field: 'IsShow'
},
{
name: 'SLinkTel',
label: '负责人电话',
name: 'IsRecommend',
label: '是否推荐',
align: 'left',
field: 'SLinkTel'
field: 'IsRecommend'
},
{
name: 'Status',
label: '状态',
name: 'CourseCount',
label: '课程数量',
align: 'left',
field: 'Status'
field: 'CourseCount'
},
{
name: 'CreateByName',
label: '创建人',
name: 'OnlineClassCount',
label: '网课产品',
align: 'left',
field: 'CreateByName'
field: 'OnlineClassCount'
},
{
name: 'CreateTimeStr',
label: '建立时间',
name: 'OnlineOrderCount',
label: '网课订单',
align: 'left',
field: 'CreateTimeStr'
field: 'OnlineOrderCount'
},
{
name: 'Remark',
label: '备注',
name: 'CreateTimeStr',
label: '入职时间',
align: 'left',
field: 'Remark'
field: 'CreateTimeStr'
},
{
name: 'optioned',
label: '操作',
field: 'SId'
},
field: 'TId'
}
],
data: [],
loading: true,
StatusOpts: [{
ShowOpts: [{
label: '全部',
value: '-1'
},
{
label: '开启',
label: '隐藏',
value: '0'
},
{
label: '关闭',
label: '显示',
value: '1'
}
],
AuditOpts: [{
label: '全部',
value: '-1'
},
{
label: '审核中',
value: '1'
},
{
label: '审核通过',
value: '2'
},
{
label: '审核不通过',
value: '3'
}
],
msg: {
pageIndex: 1,
pageSize: 13,
rowsPerPage: 13,
SName: "",
Status: '-1'
pageSize: 12,
rowsPerPage: 12,
TeacherName: "",
TeacherTel: "",
AuditStatus: "-1",
IsShow: "-1"
},
StatusTemp: {},
pageCount: 0,
persistent: false,
objOption: {},
saveLoading: false
}
},
created() {
this.StatusTemp = this.StatusOpts[0]
},
mounted() {
this.currentUrl = this.$route.path
this.getSchool()
this.getTeacher()
},
methods: {
onItemClick() {
......@@ -226,19 +250,20 @@ export default {
//this.pageCount = 0
this.loading = true
this.msg.Status = this.StatusTemp ? this.StatusTemp.value : '-1'
this.getSchool()
this.getTeacher()
},
changePage(val) {
this.msg.Status = this.StatusTemp ? this.StatusTemp.value : '-1'
this.msg.pageIndex = 1
this.loading = true
this.getSchool()
this.getTeacher()
},
getSchool() {
getSchoolPage(this.msg).then(res => {
getTeacher() {
getTeacherPage(this.msg).then(res => {
this.loading = false
this.data = res.Data.PageData
this.pageCount = res.Data.PageCount
console.log(this.data)
}).catch(() => {
this.loading = false
})
......@@ -246,37 +271,37 @@ export default {
closeSaveForm() {
this.persistent = false
},
saveSchool() {
this.saveLoading = true
this.$refs.SName.validate()
this.$refs.SAddress.validate()
this.$refs.SLinkMan.validate()
this.$refs.SLinkTel.validate()
if (
!this.$refs.SName.hasError &&
!this.$refs.SAddress.hasError &&
!this.$refs.SLinkMan.hasError &&
!this.$refs.SLinkTel.hasError
) {
saveSchool(this.objOption).then(res => {
this.saveLoading = false
this.$q.notify({
icon: 'iconfont icon-chenggong',
color: 'accent',
timeout: 2000,
message: '数据保存成功!',
position: 'top'
})
if (this.objOption.SId == 0) {
this.msg.pageIndex = 1
}
this.getSchool()
this.closeSaveForm()
})
} else {
this.saveLoading = false
}
}
// saveSchool() {
// this.saveLoading = true
// this.$refs.SName.validate()
// this.$refs.SAddress.validate()
// this.$refs.SLinkMan.validate()
// this.$refs.SLinkTel.validate()
// if (
// !this.$refs.SName.hasError &&
// !this.$refs.SAddress.hasError &&
// !this.$refs.SLinkMan.hasError &&
// !this.$refs.SLinkTel.hasError
// ) {
// saveSchool(this.objOption).then(res => {
// this.saveLoading = false
// this.$q.notify({
// icon: 'iconfont icon-chenggong',
// color: 'accent',
// timeout: 2000,
// message: '数据保存成功!',
// position: 'top'
// })
// if (this.objOption.SId == 0) {
// this.msg.pageIndex = 1
// }
// this.getSchool()
// this.closeSaveForm()
// })
// } else {
// this.saveLoading = false
// }
// }
},
}
</script>
......
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