Skip to content

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

页面修改

parent 6c4e2919
Show whitespace changes
Inline Side-by-side
Showing with 203 additions and 116 deletions
src/api/users/user.js
View file @ da489f74
......@@ -16,8 +16,7 @@ export function resetPassword(data) {
* 获取员工列表
* @param {查询参数} data
*/
export function queryEmployee(data)
{
export function queryEmployee(data) {
return request({
url: '/user/GetEmployeeList',
method: 'post',
......@@ -29,8 +28,7 @@ export function queryEmployee(data)
* 修改离职信息
* @param {查询参数} data
*/
export function UpdateEmployeeLeave(data)
{
export function UpdateEmployeeLeave(data) {
return request({
url: '/User/UpdateEmployeeLeaveTime',
method: 'post',
......@@ -42,8 +40,7 @@ export function UpdateEmployeeLeave(data)
* 修改部门
* @param {查询参数} data
*/
export function UpdateEmployeeDept(data)
{
export function UpdateEmployeeDept(data) {
return request({
url: '/User/UpdateEmployeeDept',
method: 'post',
......@@ -55,8 +52,7 @@ export function UpdateEmployeeDept(data)
* 修改岗位
* @param {查询参数} data
*/
export function UpdateEmployeePost(data)
{
export function UpdateEmployeePost(data) {
return request({
url: '/User/UpdateEmployeePost',
method: 'post',
......@@ -68,8 +64,7 @@ export function UpdateEmployeePost(data)
* 重置密码
* @param {查询参数} data
*/
export function BatchResetUserPassword(data)
{
export function BatchResetUserPassword(data) {
return request({
url: '/User/BatchResetUserPassword',
method: 'post',
......@@ -79,8 +74,7 @@ export function BatchResetUserPassword(data)
/**
* 获取部门Id
*/
export function getEmployeeAddrBook(data)
{
export function getEmployeeAddrBook(data) {
return request({
url: '/User/GetEmployeeAddrBook',
method: 'post',
......@@ -91,82 +85,87 @@ export function getEmployeeAddrBook(data)
/**
* 个人资料修改
*/
export function setEmployeeBaseInfo(data)
{
export function setEmployeeBaseInfo(data) {
return request({
url: '/UserInfo/SetEmployeeBaseInfo',
method: 'post',
data
})
}
}
/**
/**
* 个人资料-修改密码
*/
export function updateUserPassword(data)
{
export function updateUserPassword(data) {
return request({
url: '/UserInfo/UpdateUserPassword',
method: 'post',
data
})
}
}
/**
/**
* 获取个人中心信息
*/
export function getUserCenterInfo(data)
{
export function getUserCenterInfo(data) {
return request({
url: '/UserInfo/GetUserCenterInfo',
method: 'post',
data
})
}
}
/**
/**
* 获取我的提成折线图
*/
export function getUserSellCommission(data)
{
export function getUserSellCommission(data) {
return request({
url: '/UserInfo/GetUserSellCommission',
method: 'post',
data
})
}
/**
}
/**
* 获取我的奖金折线图
*/
export function getTeacherSellCommission(data)
{
export function getTeacherSellCommission(data) {
return request({
url: '/UserInfo/GetTeacherSellCommission',
method: 'post',
data
})
}
/**
}
/**
* 个人中心 我的奖金确认
*/
export function updateSureTeachingBonusDetail(data)
{
export function updateSureTeachingBonusDetail(data) {
return request({
url: '/UserInfo/UpdateSureTeachingBonusDetail',
method: 'post',
data
})
}
}
/**
/**
* 个人中心 我的提成确认
*/
export function updatSureSellCommission(data)
{
export function updatSureSellCommission(data) {
return request({
url: '/UserInfo/UpdatSureSellCommission',
method: 'post',
data
})
}
\ No newline at end of file
}
/**
* 修改员工职能
* @param {查询参数} data
*/
export function UpdateEmployeeType(data) {
return request({
url: '/User/SetEmployeeType',
method: 'post',
data
})
}
src/components/school/manager/employee-set.vue
View file @ da489f74
......@@ -64,6 +64,7 @@
<span class="drawer_Span" v-if="setingObj.type==2">重置密码</span>
<span class="drawer_Span" v-if="setingObj.type==3">调岗</span>
<span class="drawer_Span" v-if="setingObj.type==4">调部门</span>
<span class="drawer_Span" v-if="setingObj.type==5">调整职能</span>
</div>
</div>
<div style="margin:20px;">
......@@ -144,6 +145,41 @@
</div>
</div>
</div>
<!-- 调整职能 -->
<div style="margin:20px;" v-if="setingObj.type==5">
<div class="EmpLine_title">
<div class="Emp_Line"></div>
<div>修改职能</div>
</div>
<div class="row" style="margin-top:20px;">
<div class="col-6">
当前职能：<template v-if="setingObj&&setingObj.selected&&setingObj.selected.length>0">
<template v-if="changeTypeMsg.AccountType==1">
员工
</template>
<template v-if="changeTypeMsg.AccountType==2">
教师
</template>
<template v-if="changeTypeMsg.AccountType==3">
助教
</template>
</template>
</div>
</div>
<div class="row" style="margin-top:20px;">
<div class="col-6">
<q-select filled stack-label option-value="Id" option-label="Name" v-model="changeTypeMsg.TargetAccountType"
ref="AccountType" :options="accountTypeList" label="目标职能" :dense="false" class="col-6 q-pr-lg q-pb-lg"
emit-value map-options />
</div>
</div>
<div class="row" style="margin-top:20px;">
<div class="col-6">
<q-input v-model="changeTypeMsg.Remark" label="调整原因" filled type="textarea" class="col-6 q-pr-lg q-pb-lg"
maxlength="100" />
</div>
</div>
</div>
<div style="text-align:left;margin-left:20px;">
<q-btn color="primary" label="确定" @click="saveReuslt()" style="width:300px;" />
</div>
......@@ -159,7 +195,8 @@
import {
UpdateEmployeeLeave,
UpdateEmployeeDept,
UpdateEmployeePost
UpdateEmployeePost,
UpdateEmployeeType
} from '../../../api/users/user'
import {
getDeptTree
......@@ -199,6 +236,14 @@
deptObj: {
schoolType: 0, //校区类型
School_Id: 0,
},
accountTypeList: [],
//职能调整
changeTypeMsg: {
AccountId: 0,
AccountType: 0,
TargetAccountType: "",
Remark: ""
}
}
},
......@@ -210,6 +255,40 @@
if (this.setingObj.type == 3) {
this.queryPostList();
}
if (this.setingObj.type == 5) {
if (this.setingObj && this.setingObj.selected && this.setingObj.selected.length > 0) {
this.changeTypeMsg.AccountType = this.setingObj.selected[0].AccountType;
this.changeTypeMsg.AccountId = this.setingObj.selected[0].AccountId;
}
if (this.changeTypeMsg.AccountType == 1) {
this.accountTypeList.push({
Id: 2,
Name: "教师"
});
this.accountTypeList.push({
Id: 3,
Name: "助教"
});
} else if (this.changeTypeMsg.AccountType == 2) {
this.accountTypeList.push({
Id: 1,
Name: "员工"
});
this.accountTypeList.push({
Id: 3,
Name: "助教"
});
} else if (this.changeTypeMsg.AccountType == 3) {
this.accountTypeList.push({
Id: 1,
Name: "员工"
});
this.accountTypeList.push({
Id: 2,
Name: "教师"
});
}
}
},
methods: {
getSchool() {
......@@ -342,6 +421,15 @@
}
})
}
//修改员工职能
if (this.setingObj.type == 5) {
UpdateEmployeeType(this.changeTypeMsg).then(res => {
if (res.Code == 1) {
this.$emit('success');
this.$emit('close')
}
})
}
},
GetFirst(val) {
if (val) {
......
src/pages/school/sysuser.vue
View file @ da489f74
......@@ -22,7 +22,7 @@
label="员工姓名/账号" maxlength="20" />
</div>
<div class="col-3">
<q-select filled stack-label @input="getDepartList(msg.School_Id),resetSearch()" option-value="SId"
<q-select filled stack-label clearable @input="getDepartList(msg.School_Id),resetSearch()" option-value="SId"
option-label="SName" v-model="msg.School_Id" ref="School_Id" :options="schoolList" label="所属校区"
:dense="false" emit-value map-options />
</div>
......@@ -31,11 +31,11 @@
labelKey="DeptName" childrenKey="ChildList" tipText="选择部门" @getChild="getChild"></selectTree>
</div>
<div class="col-3">
<q-select filled stack-label @input="resetSearch" option-value="PostId" option-label="PostName"
<q-select filled stack-label @input="resetSearch" clearable option-value="PostId" option-label="PostName"
v-model="msg.Post_Id" ref="Post_Id" :options="PostList" label="岗位" :dense="false" emit-value map-options />
</div>
<div class="col-3">
<q-select filled @input="resetSearch" stack-label option-value="Id" option-label="Name"
<q-select filled @input="resetSearch" clearable stack-label option-value="Id" option-label="Name"
v-model="msg.LeaveStatus" ref="LeaveStatus" :options="LeaveStatusList" label="在职状态" :dense="false"
emit-value map-options />
</div>
......@@ -159,6 +159,11 @@
<q-item-label>调部门</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-close-popup @click="transFerJob(props.row,5)">
<q-item-section>
<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-section>
......@@ -325,7 +330,7 @@
pageIndex: 1,
pageSize: 10,
rowsPerPage: 10,
School_Id: -1, //校区
School_Id: "", //校区
Dept_Id: 0, //部门
Post_Id: 0, //岗位编号
LeaveStatus: 0, //在职状态
......@@ -506,11 +511,6 @@
getSchool() {
getSchoolDropdown({}).then(res => {
this.schoolList = res.Data;
var obj = {
SName: '全部',
SId: -1
}
this.schoolList.unshift(obj);
})
},
getManager() {
......
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