Skip to content

C
confucius
Commit 1178b7c4 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 1fb1734c
Hide whitespace changes
Inline Side-by-side
Showing with 238 additions and 12 deletions
src/components/school/assistant/assistant-form.vue
View file @ 1178b7c4
......@@ -14,6 +14,12 @@
map-options :rules="[val => !!val || '请选择所属校区']" />
<q-input type="tel" filled stack-label maxlength="100" :dense="false" v-model="objOption.AssistTel"
ref="AssistTel" class="col-6 q-pr-lg q-pb-lg" label="联系电话" :rules="[val => !!val || '请填写助教联系电话']" />
<selectTree v-if="DeptList&&DeptList.length>0" :treeData='DeptList' :defaultArray="returnString"
nodeKey="DeptId" :multiple="false" labelKey="DeptName" childrenKey="ChildList" tipText="选择部门"
@getChild="getChild" classStr="col-6 q-pr-lg q-pb-lg"></selectTree>
<q-select filled stack-label option-value="PostId" option-label="PostName" v-model="objOption.Post_Id"
ref="Post_Id" :options="PostList" label="岗位" :dense="false" class="col-6 q-pb-lg q-pb-lg" emit-value
map-options />
<div class="col-6 q-pb-lg">
<q-uploader style="display: inline-block;max-height: 320px;max-width: 100%; background-repeat:no-repeat"
:style="{'background-image':'url(' + objOption.AssistIcon + ')'}" max-files="1" hide-upload-btn
......@@ -43,10 +49,20 @@
import {
UploadSelfFile
} from '../../../api/common/common'
//部门
import {
getDeptTree
} from '../../../api/system/dept'
//岗位
import {
getPostList
} from '../../../api/system/post'
import extEditor from '../../common/ext-editor'
import selectTree from '../../common/select-tree'
export default {
components: {
extEditor,
selectTree,
},
props: {
saveObj: {
......@@ -63,20 +79,58 @@
AssistName: "",
AssistTel: '',
AssistIcon: '',
AssistIntro: ''
AssistIntro: '',
Dept_Id: 0, //部门编号
Post_Id: 0, //岗位编号
},
optionTitle: "",
schoolList: [],
saveLoading: false,
DeptList: [], //部门列表
PostList: [], //岗位列表
returnString: [], //默认岗位
}
},
created() {
this.queryDeptTree();
this.queryPostList();
this.getSchool();
},
mounted() {
this.initObj()
},
methods: {
getChild(deptArray) {
var tempStr = "";
if (deptArray && deptArray != '') {
tempStr = deptArray;
}
this.objOption.Dept_Id = tempStr;
},
//获取部门结构树
queryDeptTree() {
getDeptTree({}).then(res => {
if (res.Code == 1) {
this.DeptList = res.Data;
}
})
},
//获取岗位列表
queryPostList() {
this.PostList = [];
var postMsg = {
RB_Dept_Id: 0,
};
if (this.objOption.Dept_Id) {
postMsg.RB_Dept_Id = this.objOption.Dept_Id;
}
getPostList(postMsg).then(res => {
if (res.Code == 1) {
this.PostList = res.Data;
}
})
},
//获取编辑器值
getEditValue(obj) {
this.objOption.AssistIntro = obj;
......@@ -90,6 +144,11 @@
this.objOption.AssistTel = this.saveObj.AssistTel;
this.objOption.AssistIcon = this.saveObj.AssistIcon;
this.objOption.AssistIntro = this.saveObj.AssistIntro;
this.objOption.Dept_Id = this.saveObj.Dept_Id;
this.objOption.Post_Id = this.saveObj.Post_Id;
if (this.saveObj.Dept_Id) {
this.returnString.push(this.saveObj.Dept_Id.toString());
}
} else {
this.optionTitle = "新增助教"
}
......@@ -161,13 +220,16 @@
}
},
},
watch: {
"objOption.Dept_Id": function (val) {
this.queryPostList();
}
},
}
</script>
<style>
.upload-assiatant-box .q-uploader__list {
display: none;
}
......
src/components/school/manager/manager-form.vue
View file @ 1178b7c4
......@@ -11,6 +11,12 @@
class="col-6 q-pr-lg q-pb-lg" label="管理者名称" :rules="[val => !!val || '请填写管理者姓名']" />
<q-input type="tel" filled stack-label maxlength="100" :dense="false" v-model="objOption.MTel" ref="MTel"
class="col-6 q-pr-lg q-pb-lg" label="联系电话" :rules="[val => !!val || '请填写管理者联系电话']" />
<selectTree v-if="DeptList&&DeptList.length>0" :treeData='DeptList' :defaultArray="returnString"
nodeKey="DeptId" :multiple="false" labelKey="DeptName" childrenKey="ChildList" tipText="选择部门"
@getChild="getChild" classStr="col-6 q-pr-lg q-pb-lg"></selectTree>
<q-select filled stack-label option-value="PostId" option-label="PostName" v-model="objOption.Post_Id"
ref="Post_Id" :options="PostList" label="岗位" :dense="false" class="col-6 q-pb-lg q-pb-lg" emit-value
map-options />
<div class="col-6 q-pb-lg">
<q-uploader style="display: inline-block;max-height: 320px;max-width: 100%; background-repeat:no-repeat"
:style="{'background-image':'url(' + objOption.MHead + ')'}" max-files="1" hide-upload-btn
......@@ -43,9 +49,18 @@
queryRoleDropdown
}
from '../../../api/system/index'
//部门
import {
getDeptTree
} from '../../../api/system/dept'
//岗位
import {
getPostList
} from '../../../api/system/post'
import {
UploadSelfFile,
} from '../../../api/common/common'
import selectTree from '../../common/select-tree'
export default {
components: {},
props: {
......@@ -54,6 +69,9 @@
default: null
}
},
components: {
selectTree
},
data() {
return {
persistent: true,
......@@ -64,22 +82,59 @@
MTel: '', //管理者电话
MHead: '', //头像
RoleAuth: "", //角色
Dept_Id: 0, //部门编号
Post_Id: 0, //岗位编号
},
optionTitle: "",
schoolList: [],
roleList: [], //角色列表
saveLoading: false,
tempRole: [],
DeptList: [], //部门列表
PostList: [], //岗位列表
returnString: [], //默认岗位
}
},
created() {
this.queryDeptTree();
this.queryPostList();
this.getrolelist();
this.getSchool();
},
mounted() {
this.initObj()
this.initObj();
},
methods: {
getChild(deptArray) {
var tempStr = "";
if (deptArray && deptArray != '') {
tempStr = deptArray;
}
this.objOption.Dept_Id = tempStr;
},
//获取部门结构树
queryDeptTree() {
getDeptTree({}).then(res => {
if (res.Code == 1) {
this.DeptList = res.Data;
}
})
},
//获取岗位列表
queryPostList() {
this.PostList = [];
var postMsg = {
RB_Dept_Id: 0,
};
if (this.objOption.Dept_Id) {
postMsg.RB_Dept_Id = this.objOption.Dept_Id;
}
getPostList(postMsg).then(res => {
if (res.Code == 1) {
this.PostList = res.Data;
}
})
},
getrolelist() {
queryRoleDropdown({}).then(res => {
if (res.Code == 1) {
......@@ -105,6 +160,9 @@
this.objOption.MName = res.Data.MName;
this.objOption.MTel = res.Data.MTel;
this.objOption.MHead = res.Data.MHead;
this.objOption.Post_Id = res.Data.Post_Id;
this.objOption.Dept_Id = res.Data.Dept_Id;
this.returnString.push(res.Data.Dept_Id.toString());
this.tempRole = res.Data.RoleList;
this.$forceUpdate();
})
......@@ -164,6 +222,11 @@
})
},
},
watch: {
"objOption.Dept_Id": function (val) {
this.queryPostList();
}
}
}
</script>
......
src/components/school/teacher/teacher-form.vue
View file @ 1178b7c4
......@@ -16,6 +16,12 @@
ref="TeacherTel" class="col-6 q-pr-lg q-pb-lg" label="联系电话" :rules="[val => !!val || '请填写教师联系电话']" />
<q-input filled stack-label maxlength="100" :dense="false" v-model="objOption.TeacherSay" ref="TeacherSay"
class="col-6 q-pb-lg" label="教师营销语" />
<selectTree v-if="DeptList&&DeptList.length>0" :treeData='DeptList' :defaultArray="returnString"
nodeKey="DeptId" :multiple="false" labelKey="DeptName" childrenKey="ChildList" tipText="选择部门"
@getChild="getChild" classStr="col-6 q-pr-lg q-pb-lg"></selectTree>
<q-select filled stack-label option-value="PostId" option-label="PostName" v-model="objOption.Post_Id"
ref="Post_Id" :options="PostList" label="岗位" :dense="false" class="col-6 q-pb-lg q-pb-lg" emit-value
map-options />
<div class="col-6 q-pr-lg q-pb-lg">
<q-uploader style="display: inline-block;height: 320px;max-width: 100%; background-repeat:no-repeat"
:style="{'background-image':'url(' + objOption.TeacherHead + ')'}" max-files="1" hide-upload-btn
......@@ -77,10 +83,20 @@
import {
UploadSelfFile
} from '../../../api/common/common'
//部门
import {
getDeptTree
} from '../../../api/system/dept'
//岗位
import {
getPostList
} from '../../../api/system/post'
import extEditor from '../../common/ext-editor'
import selectTree from '../../common/select-tree'
export default {
components: {
extEditor,
selectTree
},
props: {
saveObj: {
......@@ -103,7 +119,9 @@
IsShow: 1,
IsRecommend: 0,
SortNum: 1,
TeachTag: ""
TeachTag: "",
Dept_Id: 0, //部门编号
Post_Id: 0, //岗位编号
},
optionTitle: "",
schoolList: [],
......@@ -111,15 +129,50 @@
saveLoading: false,
tagText: "",
tags: [],
DeptList: [], //部门列表
PostList: [], //岗位列表
returnString: [], //默认岗位
}
},
created() {
this.queryDeptTree();
this.queryPostList();
this.getSchool()
},
mounted() {
this.initObj()
},
methods: {
getChild(deptArray) {
var tempStr = "";
if (deptArray && deptArray != '') {
tempStr = deptArray;
}
this.objOption.Dept_Id = tempStr;
},
//获取部门结构树
queryDeptTree() {
getDeptTree({}).then(res => {
if (res.Code == 1) {
this.DeptList = res.Data;
}
})
},
//获取岗位列表
queryPostList() {
this.PostList = [];
var postMsg = {
RB_Dept_Id: 0,
};
if (this.objOption.Dept_Id) {
postMsg.RB_Dept_Id = this.objOption.Dept_Id;
}
getPostList(postMsg).then(res => {
if (res.Code == 1) {
this.PostList = res.Data;
}
})
},
getType(type) {
this.uploadType = type;
},
......@@ -142,6 +195,12 @@
this.objOption.IsRecommend = this.saveObj.IsRecommend;
this.objOption.SortNum = this.saveObj.SortNum;
this.objOption.TeachTag = this.saveObj.TeachTag;
this.objOption.Dept_Id = this.saveObj.Dept_Id;
this.objOption.Post_Id = this.saveObj.Post_Id;
if(this.saveObj.Dept_Id)
{
this.returnString.push(this.saveObj.Dept_Id.toString());
}
if (this.objOption.TeachTag && this.objOption.TeachTag.length > 0) {
this.tags = JSON.parse(this.objOption.TeachTag)
}
......@@ -232,6 +291,11 @@
}
},
},
watch: {
"objOption.Dept_Id": function (val) {
this.queryPostList();
}
},
}
</script>
......
src/pages/school/assistant.vue
View file @ 1178b7c4
......@@ -153,6 +153,18 @@
field: 'SName',
align: 'left',
},
{
name: 'DeptName',
label: '所属部门',
field: 'DeptName',
align: 'left',
},
{
name: 'PostName',
label: '岗位名称',
field: 'PostName',
align: 'left',
},
{
name: 'AuditStatus',
label: '审核状态',
......
src/pages/school/manager.vue
View file @ 1178b7c4
......@@ -246,7 +246,8 @@
getSchool() {
getSchoolPage(this.msg).then(res => {
this.loading = false
this.data = res.Data.PageData
this.data = res.Data.PageData;
this.pageCount = res.Data.PageCount
}).catch(() => {
this.loading = false
......
src/pages/school/sysuser.vue
View file @ 1178b7c4
......@@ -120,7 +120,18 @@
field: 'SName',
align: 'left',
},
{
name: 'DeptName',
label: '部门',
field: 'DeptName',
align: 'left',
},
{
name: 'PostName',
label: '岗位',
field: 'PostName',
align: 'left',
},
{
name: 'Status',
label: '状态',
......@@ -305,8 +316,9 @@
this.loading = true;
queryManagerPage(this.msg).then(res => {
this.loading = false;
this.data = res.Data.PageData
this.pageCount = res.Data.PageCount
this.data = res.Data.PageData;
console.log("data", this.data);
this.pageCount = res.Data.PageCount;
}).catch(() => {
this.loading = false
})
......
src/pages/school/teacher.vue
View file @ 1178b7c4
......@@ -102,8 +102,8 @@
style="font-weight:400" class="q-mr-xs" label="审核" @click="showExamine(props.row)" />
<q-btn v-if="props.row.AuditStatus==2" flat size="xs" icon="iconfont icon-ziyuan" color="warning"
style="font-weight:400" class="q-mr-xs" label="重置密码" @click="resetPw(props.row.TId)" />
<q-btn flat size="xs" icon="iconfont icon-shanchu" color="negative"
style="font-weight:400" class="q-mr-xs" label="删除" @click="deleteUser(props.row.TId)" />
<q-btn flat size="xs" icon="iconfont icon-shanchu" color="negative" style="font-weight:400"
class="q-mr-xs" label="删除" @click="deleteUser(props.row.TId)" />
<q-btn v-if="props.row.AuditStatus==3" flat size="xs" icon="iconfont icon-ziyuan" color="negative"
style="font-weight:400" class="q-mr-xs" label="重新申请" @click="reApplyTeacher(props.row.TId)" />
<q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑"
......@@ -173,6 +173,18 @@
field: 'SName',
align: 'left',
},
{
name: 'DeptName',
label: '所属部门',
field: 'DeptName',
align: 'left',
},
{
name: 'PostName',
label: '岗位名称',
field: 'PostName',
align: 'left',
},
{
name: 'AuditStatus',
label: '审核状态',
......@@ -215,7 +227,7 @@
align: 'left',
field: 'CreateTimeStr'
},
{
{
name: 'TeacherAccount',
label: '账号',
align: 'left',
......
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