Skip to content

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

页面修改

parent 7c039547
Hide whitespace changes
Inline Side-by-side
Showing with 102 additions and 197 deletions
src/components/school/teacher/teacher-form.vue
View file @ ee2c7cab
......@@ -11,32 +11,33 @@
class="col-6 q-pr-lg q-pb-lg" label="教师名称" :rules="[val => !!val || '请填写教师姓名']" />
<q-select filled stack-label option-value="SId" option-label="SName" v-model="objOption.School_Id"
ref="School_Id" :options="schoolList" label="所属校区" :dense="false" class="col-6 q-pb-lg" emit-value
map-options @input="schoolChagne" />
map-options @input="schoolChagne" />
<q-input type="tel" filled stack-label maxlength="20" :dense="false" v-model="objOption.TeacherTel"
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 :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>
<selectTree :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" emit-value map-options />
<q-input filled stack-label maxlength="5" :dense="false" v-model="objOption.BaseStuNum" ref="BaseStuNum"
class="col-6 q-pr-lg q-pb-lg" label="带班基础人数" @keyup.native="checkInteger(objOption,'BaseStuNum')" />
<q-input filled stack-label maxlength="5" :dense="false" v-model="objOption.BaseHourFee" ref="BaseHourFee"
class="col-6 q-pb-lg" label="基础课时费" @keyup.native="checkPrice(objOption,'BaseHourFee')" />
<q-select filled stack-label option-value="Id" option-label="Name" v-model="chooseSpecialty" ref="SpecialtyList"
:options="SpecialtyList" label="老师特长" :dense="false" class="col-6 q-pr-lg q-pb-lg" emit-value map-options
@input="schoolChagne" multiple clearable />
<q-select filled stack-label option-value="Id" option-label="Name" v-model="chooseSpecialty"
ref="SpecialtyList" :options="SpecialtyList" label="老师特长" :dense="false" class="col-6 q-pr-lg q-pb-lg"
emit-value map-options @input="schoolChagne" multiple clearable />
<q-select filled stack-label option-value="Id" option-label="Name" v-model="objOption.BaseHoursEnabled"
ref="BaseHoursEnabled" :options="BaseHoursList" label="是否启用基础课时" :dense="false" class="col-6 q-pb-lg" emit-value map-options />
<q-input v-if='objOption.BaseHoursEnabled==1' filled v-model="objOption.EnableTime" mask="####-##" label="启用时间" ref="EnableTime"
:rules="[val => !!val || '请选择启用时间']">
ref="BaseHoursEnabled" :options="BaseHoursList" label="是否启用基础课时" :dense="false" class="col-6 q-pb-lg"
emit-value map-options />
<q-input v-if='objOption.BaseHoursEnabled==1' filled v-model="objOption.EnableTime" mask="####-##"
label="启用时间" ref="EnableTime" :rules="[val => !!val || '请选择启用时间']">
<template v-slot:append>
<q-icon name="event" class="cursor-pointer">
<q-popup-proxy ref="qDateProxy" transition-show="scale" transition-hide="scale">
<div class="q-gutter-md row items-start">
<q-date v-model="objOption.EnableTime" mask="YYYY-MM"></q-date>
<div class="q-gutter-md row items-start">
<q-date v-model="objOption.EnableTime" mask="YYYY-MM"></q-date>
</div>
<q-btn v-close-popup label="关闭" color="primary" flat style="float:right" />
</q-popup-proxy>
......@@ -44,12 +45,11 @@
</template>
</q-input>
</div>
<div class="row wrap" style="margin-top:20px;">
<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
@rejected="onRejected" label="教师头像" :max-file-size="5*1024*1024" accept=".jpg, image/*" auto-upload
@rejected="onRejected" label="教师头像" :max-file-size="5*1024*1024" accept=".jpg, image/*" auto-upload
:factory="uploadFile" no-thumbnails @added="getType(1)">
</q-uploader>
</div>
......@@ -160,10 +160,16 @@
BaseStuNum: 0, //带班基础人数
BaseHourFee: 0, //基础课时费
Specialty: "", //老师擅长
BaseHoursEnabled:1,//是否启用基础课时 1是
EnableTime :'',//启用时间 (存到月)
BaseHoursEnabled: 1, //是否启用基础课时 1是
EnableTime: '', //启用时间 (存到月)
},
BaseHoursList:[{Id:0,Name:'关闭'},{Id:1,Name:'开启'}],
BaseHoursList: [{
Id: 0,
Name: '关闭'
}, {
Id: 1,
Name: '开启'
}],
chooseSpecialty: [],
optionTitle: "",
schoolList: [],
......@@ -233,14 +239,17 @@
//获取部门结构树
queryDeptTree() {
var msg = {
School_Id: 0
School_Id: -1
};
if (this.objOption.School_Id && this.objOption.School_Id != '') {
if (this.objOption.School_Id != '' && this.objOption.School_Id >= 0) {
msg.School_Id = this.objOption.School_Id;
}
getDeptTree(msg).then(res => {
if (res.Code == 1) {
this.DeptList = res.Data;
if (this.objOption.Dept_Id) {
this.$set(this.returnString, 0, this.objOption.Dept_Id);
}
}
})
},
......@@ -286,18 +295,17 @@
this.objOption.BaseStuNum = this.saveObj.BaseStuNum;
this.objOption.BaseHourFee = this.saveObj.BaseHourFee;
this.objOption.Specialty = this.saveObj.Specialty;
this.objOption.EnableTime = this.saveObj.EnableTime;
this.objOption.BaseHoursEnabled = this.saveObj.BaseHoursEnabled;
if (this.saveObj.ChooseSpecialty && this.saveObj.ChooseSpecialty.length > 0) {
this.chooseSpecialty = this.saveObj.ChooseSpecialty;
}
if (this.objOption.School_Id) {
if (this.objOption && this.objOption.School_Id >= 0) {
this.queryDeptTree();
}
if (this.objOption.Dept_Id) {
this.queryPostList();
this.returnString.push(this.objOption.Dept_Id.toString());
}
if (this.objOption.TeachTag && this.objOption.TeachTag.length > 0) {
this.tags = JSON.parse(this.objOption.TeachTag)
......@@ -365,7 +373,7 @@
// } else if (this.objOption.TeacherHead == '') {
// err_msg = "请上传用户头像"
// }
if(this.objOption.BaseHoursEnabled==1 && this.objOption.EnableTime==''){
if (this.objOption.BaseHoursEnabled == 1 && this.objOption.EnableTime == '') {
err_msg = "请选择日期"
}
if (err_msg == "") {
......
src/pages/school/sysuser.vue
View file @ ee2c7cab
......@@ -71,8 +71,8 @@
</div>
<div class="page-content">
<q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat selection="multiple"
:selected.sync="selected" class="sticky-right-column-table sticky-column-table" separator="none"
:data="data" :columns="columns" row-key="Id">
:selected.sync="selected" class="sticky-right-column-table sticky-column-table" separator="none" :data="data"
:columns="columns" row-key="Id">
<template v-slot:top="props">
<div class="col-2 q-table__title">员工管理</div>
<q-space />
......@@ -102,17 +102,16 @@
<q-avatar rounded size="sm" color="teal-10" text-color="white" v-if="!props.row.UserIcon">
{{GetFirst(props.value[0])}}</q-avatar>
<span class="q-ml-md text-blue cursor-pointer" style="color:#2961FE;margin-left:10px;cursor:pointer;"
@click="getEmpInfoInfo(props.row)" title="点击查看详情">{{props.value}}</span>
@click="EditManager(props.row,1)" title="点击查看详情">{{props.value}}</span>
</q-td>
</template>
<template v-slot:body-cell-PropertyNumber="props">
<q-td :props="props">
<span class="q-ml-md text-blue cursor-pointer" style="color:#2961FE;margin-left:10px;cursor:pointer;"
@click="goeduyhsl(props.row)" title="点击查看详情">{{props.value}}</span>
</q-td>
</template>
<template v-slot:body-cell-StuSex="props">
<q-td :props="props">
<q-badge :color="props.value==1?'negative':'primary'" :label="props.value==1?'女':'男'" />
......@@ -146,10 +145,9 @@
<template v-slot:body-cell-optioned="props">
<q-td :props="props">
<div class="syster_qDropdown">
<q-btn v-if="props.row.ManagerAccount==''" flat size="xs" icon="iconfont icon-ziyuan" color="warning"
style="font-weight:400" class="q-mr-xs" label="创建账号" @click="createAccount(props.row.MId)" />
<q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑"
@click="EditManager(props.row)" />
@click="EditManager(props.row,2)" />
<q-btn-dropdown flat size="xs" color="dark" label="更多" style="margin-left:10px;">
<q-list>
<q-item clickable v-close-popup @click="transFerJob(props.row,3)">
......@@ -162,7 +160,8 @@
<q-item-label>调部门</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-close-popup @click="goEAccountId(props.row.EmAccountId)" v-if="props.row.EmAccountId>0">
<q-item clickable v-close-popup @click="goEAccountId(props.row.EmAccountId)"
v-if="props.row.EmAccountId>0">
<q-item-section>
<q-item-label>账户</q-item-label>
</q-item-section>
......@@ -185,9 +184,9 @@
</q-table>
<manager-form v-if="isShowManagerForm" :save-obj="managerOption" @close="closeStuForm" @success="refreshPage">
</manager-form>
<employee-set v-if="isShowEmployeeSet" :seting-obj="setObj" @close="closeSetForm" @success="refreshSetPage">
<employee-set v-if="isShowEmployeeSet" :seting-obj="setObj" @close="closeStuForm" @success="refreshPage">
</employee-set>
<employee-info v-if="isShowEmpInfo" :save-obj="managerOption" @close="closeEmpInfoForm" @success="refreshPage">
<employee-info v-if="isShowEmpInfo" :save-obj="managerOption" @close="closeStuForm" @success="refreshPage">
</employee-info>
</div>
</div>
......@@ -296,19 +295,19 @@
align: 'left',
},
{
name:'DirectSupervisorName',
label:'直属上级',
name: 'DirectSupervisorName',
label: '直属上级',
field: 'DirectSupervisorName',
align: 'left',
},
{
name: 'AccountRemark',
label: '行政备注',
field: 'AccountRemark',
align: 'left',
},
{
{
name: 'PropertyNumber',
required: true,
label: '使用资产',
......@@ -327,7 +326,7 @@
pageIndex: 1,
pageSize: 10,
rowsPerPage: 10,
School_Id: 0, //校区
School_Id: -1, //校区
Dept_Id: 0, //部门
Post_Id: 0, //岗位编号
LeaveStatus: 0, //在职状态
......@@ -339,7 +338,6 @@
EndBirthDate: "", //结束生日
EmployeeName: "", //员工姓名电话
},
schoolTemp: "",
pageCount: 0,
managerOption: null,
schoolList: [], //校区数组
......@@ -374,28 +372,6 @@
this.msg.pageIndex = 1;
this.getManager()
},
//创建账号
createAccount(id) {
let that = this
createManagerAccount({
MId: id,
}).then(res => {
that.$q.dialog({
title: "创建账号",
message: res.Message,
persistent: true,
ok: {
label: "确认",
flat: true,
focus: true
}
}).onOk(() => {
that.getManager();
}).onCancel(() => {
that.getManager();
})
})
},
//重置密码
resetPassWord() {
if (this.selected.length == 0) {
......@@ -449,7 +425,7 @@
})
},
//单个重置密码
resetSinglePwd(item){
resetSinglePwd(item) {
let that = this
this.$q.dialog({
title: "重置密码",
......@@ -533,7 +509,7 @@
this.schoolList = res.Data;
var obj = {
SName: '全部',
SId: 0
SId: -1
}
this.schoolList.unshift(obj);
})
......@@ -562,13 +538,12 @@
this.msg.EndLeaveTime = '';
}
queryManagerPage(this.msg).then(res => {
this.data = res.Data.PageData;
this.pageCount = res.Data.PageCount;
let UserIds = [];
this.data.forEach(x=>{
this.data.forEach(x => {
UserIds.push(x.EmAccountId);
x.PropertyNumber=0
x.PropertyNumber = 0
})
UserIds = UserIds.join(',')
this.loading = false;
......@@ -577,22 +552,24 @@
this.loading = false;
})
},
geteduyhzclist(UserIds){
getEduEmployeeNumList({UserIds:UserIds}).then(res => {
this.loading = false;
let data = res.data.data
var mydata=JSON.parse(JSON.stringify(this.data));
data.forEach(x=>{
mydata.forEach(j=>{
if(x.EmployeeId == j.EmAccountId){
j.PropertyNumber = x.PropertyNumber;
}
})
});
this.data=mydata;
}).catch(() => {
this.loading = false;
})
geteduyhzclist(UserIds) {
getEduEmployeeNumList({
UserIds: UserIds
}).then(res => {
this.loading = false;
let data = res.data.data
var mydata = JSON.parse(JSON.stringify(this.data));
data.forEach(x => {
mydata.forEach(j => {
if (x.EmployeeId == j.EmAccountId) {
j.PropertyNumber = x.PropertyNumber;
}
})
});
this.data = mydata;
}).catch(() => {
this.loading = false;
})
},
refreshPage() {
if (!this.managerOption) {
......@@ -602,27 +579,26 @@
this.msg.Status = "-1";
this.msg.School_Id = 0;
}
this.selected = [];
this.getManager()
},
EditManager(obj) {
EditManager(obj, type) {
if (obj) {
this.managerOption = obj;
} else {
this.managerOption = null;
}
this.isShowManagerForm = true;
if (type == 1) {
this.isShowEmpInfo = true;
} else if (type == 2) {
this.isShowManagerForm = true;
}
},
//关闭表单
closeStuForm() {
this.isShowManagerForm = false;
},
//关闭右侧抽屉
closeSetForm() {
this.isShowEmployeeSet = false;
},
//关抽屉刷新数据
refreshSetPage() {
this.getManager();
this.selected = [];
this.isShowEmpInfo = false;
},
getChild(deptArray) {
var tempStr = "";
......@@ -694,15 +670,14 @@
this.setObj.selected.push(obj);
this.isShowEmployeeSet = true;
},
goEAccountId(Id){
// this.$router.push({ path: '/financial/empBankAccount ',query:{"id":Id,"type":9}})
var tempStr = '/financial/empBankAccount?type=9'+'&id='+Id;
goEAccountId(Id) {
var tempStr = '/financial/empBankAccount?type=9' + '&id=' + Id;
this.$router.push({
path: tempStr
});
},
goWOrkTransfer(Id){
var tempStr = '/financial/financalDocument/GetWOrkTransferPageLis?type=9'+'&id='+Id;
goWOrkTransfer(Id) {
var tempStr = '/financial/financalDocument/GetWOrkTransferPageLis?type=9' + '&id=' + Id;
this.$router.push({
path: tempStr
});
......@@ -712,25 +687,13 @@
return val.substr(0, 1);
}
},
//显示员工信息弹窗
getEmpInfoInfo(obj) {
if (obj) {
this.managerOption = obj;
} else {
this.managerOption = null;
}
this.isShowEmpInfo = true;
},
//关闭员工信息弹窗
closeEmpInfoForm() {
this.isShowEmpInfo = false;
},
//点击使用资产跳转到资产列表查看
goeduyhsl(row){
var tempStr = '/school/receiveNumList?id='+row.EmAccountId;
this.$router.push({
path: tempStr
});
goeduyhsl(row) {
var tempStr = '/school/receiveNumList?id=' + row.EmAccountId;
this.$router.push({
path: tempStr
});
}
},
}
......
src/pages/school/teacher.vue
View file @ ee2c7cab
......@@ -8,16 +8,13 @@
</div>
<div class="col-3">
<q-select @input="resetSearch" clearable filled stack-label option-value="SId" option-label="SName"
v-model="schoolTemp" ref="School_Id" :options="schoolList" label="所属校区" :dense="false" />
v-model="msg.School_Id" ref="School_Id" :options="schoolList" emit-value map-options label="所属校区"
:dense="false" />
</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>
<div class="page-content">
......@@ -114,9 +111,9 @@
</q-td>
</template>
</q-table>
<teacher-form v-if="persistent" :save-obj="objOption" @close="closeSaveForm" @success="addAfterQuery">
<teacher-form v-if="persistent" :save-obj="objOption" @close="closeSaveForm" @success="RefreshPage">
</teacher-form>
<teacher-shenhe v-if="persistentExamine" :show-obj="objOption" @close="closeSaveForm" @success="addAfterQuery">
<teacher-shenhe v-if="persistentExamine" :show-obj="objOption" @close="closeSaveForm" @success="RefreshPage">
</teacher-shenhe>
</div>
</div>
......@@ -157,12 +154,6 @@
field: 'TeacherTel',
align: 'left'
},
// {
// name: 'TeachTag',
// label: '标签',
// field: 'TeachTag',
// align: 'left'
// },
{
name: 'SName',
label: '所属校区',
......@@ -187,12 +178,6 @@
field: 'BaseStuNum',
align: 'left',
},
// {
// name: 'AuditStatus',
// label: '审核状态',
// align: 'left',
// field: 'AuditStatus'
// },
{
name: 'IsShow',
label: '是否显示',
......@@ -211,18 +196,6 @@
align: 'left',
field: 'CourseCount'
},
// {
// name: 'OnlineClassCount',
// label: '网课产品',
// align: 'left',
// field: 'OnlineClassCount'
// },
// {
// name: 'OnlineOrderCount',
// label: '网课订单',
// align: 'left',
// field: 'OnlineOrderCount'
// },
{
name: 'CreateTimeStr',
label: '入职时间',
......@@ -235,7 +208,7 @@
align: 'left',
field: 'TeacherAccount'
},
{
{
name: 'LeaveStatusName',
label: '状态',
align: 'left',
......@@ -262,23 +235,6 @@
value: '1'
}
],
AuditOpts: [{
label: '全部',
value: '-1'
},
{
label: '审核中',
value: '1'
},
{
label: '审核通过',
value: '2'
},
{
label: '审核不通过',
value: '3'
}
],
msg: {
pageIndex: 1,
pageSize: 12,
......@@ -286,8 +242,8 @@
TeacherName: "",
TeacherTel: "",
AuditStatus: "-1",
School_Id: "",
IsShow: "-1",
School_Id: 0
},
pageCount: 0,
persistent: false,
......@@ -298,21 +254,18 @@
resetLoading: false
}
},
mounted() {
created() {
this.currentUrl = this.$route.path
this.getSchool()
},
mounted() {
this.getTeacher()
},
methods: {
resetSearch() {
this.msg.pageIndex = 1
this.loading = true
if (this.schoolTemp) {
this.msg.School_Id = this.schoolTemp.SId
} else {
this.msg.School_Id = 0
}
this.getTeacher()
this.loading = true;
this.msg.pageIndex = 1;
this.getTeacher();
},
resetPw(id) {
let that = this
......@@ -398,21 +351,13 @@
})
},
changePage(val) {
this.msg.Status = this.StatusTemp ? this.StatusTemp.value : '-1'
this.msg.pageIndex = val;
this.loading = true;
this.getTeacher();
},
getSchool() {
getSchoolDropdown({}).then(res => {
this.schoolList = res.Data
if (this.msg.School_Id != 0) {
this.schoolTemp = this.schoolList.filter(x => {
if (this.objOption.School_Id == x.SId) {
return x
}
})[0]
}
this.schoolList = res.Data;
})
},
getTeacher() {
......@@ -424,23 +369,12 @@
this.loading = false
})
},
addAfterQuery() {
if (!this.objOption) {
this.msg = {
pageIndex: 1,
pageSize: 12,
rowsPerPage: 12,
TeacherName: "",
TeacherTel: "",
AuditStatus: "-1",
IsShow: "-1"
}
}
RefreshPage() {
this.getTeacher()
},
addObj(obj) {
if (obj) {
this.objOption = obj
this.objOption = obj;
} else {
this.objOption = null
}
......
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