Skip to content

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

页面修改

parent 846f145c
Show whitespace changes
Inline Side-by-side
Showing with 174 additions and 87 deletions
src/components/school/manager/employee-info.vue
View file @ d138a3a5
......@@ -19,66 +19,76 @@
.empInfo_Dialog .normalName {
color: #999999;
font-size:12px;
font-size: 12px;
}
.empInfo_Dialog .normalInner {
color: #111111;
font-weight: bold;
font-size:13px;
margin-top:5px;
font-size: 13px;
margin-top: 5px;
}
.Employee_Top{
.Employee_Top {
display: flex;
margin:20px;
margin: 20px;
justify-content: space-between;
align-items: center;
}
.Employee_Top .q-avatar__content{
font-size:30px!important;
.Employee_Top .q-avatar__content {
font-size: 30px !important;
}
.empInfo_Dialog .Employee_Name{
margin:5px 0 0 10px;
color:#111111;
.empInfo_Dialog .Employee_Name {
margin: 5px 0 0 10px;
color: #111111;
}
.empInfo_Dialog .Employee_Name div:first-child{
font-size:12px;
.empInfo_Dialog .Employee_Name div:first-child {
font-size: 12px;
}
.empInfo_Dialog .Employee_Name div:last-child{
.empInfo_Dialog .Employee_Name div:last-child {
font-weight: bold;
margin-top:5px;
font-size:15px;
margin-top: 5px;
font-size: 15px;
}
.Emloyee_CompanyInfo{
.Emloyee_CompanyInfo {
display: flex;
justify-content: space-between;
margin:0 18px 25px;
border-bottom:1px solid #d1d1d1;
padding-bottom:20px;
margin: 0 18px 25px;
border-bottom: 1px solid #d1d1d1;
padding-bottom: 20px;
}
.empInfo_Dialog .employee_MenuList {
width: 96%;
margin:25px auto;
margin: 25px auto;
height: 40px;
border-radius: 3px!important;
border-radius: 3px !important;
border: 1px solid #2961FE;
color: #2961FE;
align-items: center;
font-size: 12px;
white-space: nowrap;
}
.empInfo_Dialog .checkedRole {
background-color: #2961FE;
color: #fff;
}
.empInfo_Dialog .employee_MenuList span {
padding:0 20px;
padding: 0 20px;
display: inline-block;
text-align: center;
height: 100%;
line-height: 38px;
cursor: pointer;
}
}
</style>
<template>
<q-dialog v-model="persistent" maximized full-height seamless position="right" @hide="closeShenheForm">
......@@ -98,23 +108,36 @@
</div>
</div>
<div>
<q-btn label="调岗" color="accent q-px-md" size="10px" @click="isShowJobPop=true" style="font-weight:400 !important;margin-right:10px;">
<q-btn label="调岗" color="accent q-px-md" size="10px" @click="isShowJobPop=true"
style="font-weight:400 !important;margin-right:10px;">
<q-popup-proxy>
<q-banner v-if="isShowJobPop">
<div style="width:300px;padding-bottom:20px;">
<div style="margin:10px 0 15px 0;">调岗</div>
<q-select filled stack-label option-value="PostId" option-label="PostName" v-model="Post_Id" ref="Post_Id"
:options="PostList" label="岗位" :dense="false" class="col-6 q-pb-lg" emit-value map-options />
<q-select filled stack-label option-value="PostId" option-label="PostName" v-model="Post_Id"
ref="Post_Id" :options="PostList" label="岗位" :dense="false" class="col-6 q-pb-lg" emit-value
map-options />
<q-btn color="primary" label="确定" style="width:100%;" @click="savePost()" />
</div>
</q-banner>
</q-popup-proxy>
</q-btn>
<q-btn label="调部门" color="accent q-px-md" size="10px" @click="isShowDepPop=true" style="font-weight:400 !important;">
<q-btn label="调部门" color="accent q-px-md" size="10px" @click="isShowDepPop=true"
style="font-weight:400 !important;">
<q-popup-proxy>
<q-banner v-if="isShowDepPop">
<div style="width:300px;padding-bottom:20px;">
<div style="margin:10px 0 15px 0;">调部门</div>
<q-radio v-model="deptObj.schoolType" :val="0" label="本校区" />
<q-radio v-model="deptObj.schoolType" :val="1" label="其他校区" />
<br />
<template v-if="deptObj.schoolType==1">
<q-select filled stack-label @input="getDepartList()" option-value="SId" option-label="SName"
v-model="deptObj.School_Id" ref="School_Id" :options="schoolList" label="所属校区" :dense="false"
emit-value map-options />
<br />
</template>
<selectTree :treeData='DeptList' :defaultArray="returnString" nodeKey="DeptId" :multiple="false"
labelKey="DeptName" childrenKey="ChildList" tipText="选择部门" @getChild="getChild"
classStr="col-6 q-pb-lg"></selectTree>
......@@ -144,8 +167,8 @@
</div>
</div>
<div class="employee_MenuList">
<span @click="getItem(item,index)" :class="{'checkedRole':index==checkedIndex}"
v-for="(item,index) in menuList" :key="index">{{item.name}}
<span @click="getItem(item,index)" :class="{'checkedRole':index==checkedIndex}" v-for="(item,index) in menuList"
:key="index">{{item.name}}
</span>
</div>
<div v-if="tabCheck==0" style="margin:0 15px;">
......@@ -183,6 +206,9 @@
import {
queryDeptPostList
} from '../../../api/system/post'
import {
getSchoolDropdown,
} from '../../../api/school/index'
import employeeDetails from '../manager/employee_details';
import employeeRemark from '../manager/employee-remark';
import employeeLog from '../manager/employee_log';
......@@ -209,51 +235,67 @@
persistent: true,
tabCheck: 0, //默认选第一个
loading: false,
checkedIndex:0,
checkedIndex: 0,
setObj: {
type: 0,
selected: []
},
menuList:[{
name:'行政备注',
id:0
},{
name:'详细资料',
id:1
},{
name:'日志记录',
id:2
},{
name:'附件',
id:3
},{
name:'财务单据',
id:4
menuList: [{
name: '行政备注',
id: 0
}, {
name: '详细资料',
id: 1
}, {
name: '日志记录',
id: 2
}, {
name: '附件',
id: 3
}, {
name: '财务单据',
id: 4
}],
isShowJobPop:false,
PostList:[], //岗位下拉数据
isShowJobPop: false,
PostList: [], //岗位下拉数据
Post_Id: 0, //岗位
isShowDepPop:false,
DeptList:[], //部门数据
isShowDepPop: false,
DeptList: [], //部门数据
returnString: [], //部门默认
departId: -2, // 部门
schoolList: [], //校区列表
deptObj: {
schoolType: 0, //校区类型
School_Id: 0,
}
}
},
created() {},
created() {
this.getSchool();
},
mounted() {
this.queryPostList();
this.getDepartList();
},
methods: {
getSchool() {
getSchoolDropdown({}).then(res => {
this.schoolList = res.Data;
var obj = {
SName: '全部',
SId: 0
}
this.schoolList.unshift(obj);
})
},
closeShenheForm() {
this.persistent = false;
this.$emit('close');
},
//点击切换
getItem(item,index){
this.checkedIndex=index;
this.tabCheck=item.id;
getItem(item, index) {
this.checkedIndex = index;
this.tabCheck = item.id;
},
//获取岗位下拉
queryPostList() {
......@@ -264,15 +306,15 @@
if (res.Code == 1) {
this.PostList = res.Data;
let obj = {
PostName:'不限',
PostId:0
PostName: '不限',
PostId: 0
}
this.PostList.unshift(obj);
}
})
},
//保存修改岗位
savePost(){
savePost() {
if (this.Post_Id == 0) {
this.$q.notify({
type: 'negative',
......@@ -290,8 +332,8 @@
}
UpdateEmployeePost(obj).then(res => {
if (res.Code == 1) {
this.isShowJobPop=false;
this.closeShenheForm=false;
this.isShowJobPop = false;
this.closeShenheForm = false;
this.$emit('close');
this.$emit('success');
}
......@@ -305,8 +347,14 @@
},
//获取部门下拉数据
getDepartList() {
this.DeptList = [];
let msg = {
School_Id: this.saveObj.School_Id
School_Id: 0
}
if (this.deptObj.schoolType == 0) {
msg.School_Id = this.saveObj.School_Id;
} else {
msg.School_Id = this.deptObj.School_Id;
}
getDeptTree(msg).then(res => {
if (res.Code == 1) {
......@@ -315,7 +363,7 @@
})
},
//保存部门
saveDepart(){
saveDepart() {
if (this.departId == -2) {
this.$q.notify({
type: 'negative',
......@@ -330,11 +378,12 @@
obj.AccountId = this.saveObj.AccountId;
obj.AccountType = this.saveObj.AccountType;
obj.Dept_Id = this.departId;
obj.School_Id = this.deptObj.School_Id;
}
UpdateEmployeeDept(obj).then(res => {
if (res.Code == 1) {
this.isShowDepPop=false;
this.closeShenheForm=false;
this.isShowDepPop = false;
this.closeShenheForm = false;
this.$emit('success');
this.$emit('close')
}
......
src/components/school/manager/employee-set.vue
View file @ d138a3a5
......@@ -110,6 +110,19 @@
<div class="Emp_Line"></div>
<div>修改部门</div>
</div>
<div class="row" style="margin-top:20px;">
<div class="col-6">
<q-radio v-model="deptObj.schoolType" :val="0" label="本校区" />
<q-radio v-model="deptObj.schoolType" :val="1" label="其他校区" />
</div>
</div>
<div class="row" style="margin-top:20px;" v-if="deptObj.schoolType==1">
<div class="col-6">
<q-select filled stack-label @input="getDepartList()" option-value="SId" option-label="SName"
class="col-6 q-pr-lg q-pb-lg" v-model="deptObj.School_Id" ref="School_Id" :options="schoolList"
label="所属校区" :dense="false" emit-value map-options />
</div>
</div>
<div class="row" style="margin-top:20px;">
<div class="col-6">
<selectTree :treeData='DeptList' :defaultArray="returnString" nodeKey="DeptId" :multiple="false"
......@@ -155,6 +168,9 @@
import {
queryDeptPostList
} from '../../../api/system/post'
import {
getSchoolDropdown,
} from '../../../api/school/index'
import selectTree from '../../../components/common/select-tree'
export default {
props: {
......@@ -178,11 +194,17 @@
DeptList: [], // 部门下拉
PostList: [], //岗位下拉
departId: -2, // 部门
Post_Id: 0 //岗位
Post_Id: 0, //岗位
schoolList: [], //校区列表
deptObj: {
schoolType: 0, //校区类型
School_Id: 0,
}
}
},
mounted() {
if (this.setingObj.type == 4) {
this.getSchool();
this.getDepartList();
}
if (this.setingObj.type == 3) {
......@@ -190,13 +212,28 @@
}
},
methods: {
getSchool() {
getSchoolDropdown({}).then(res => {
this.schoolList = res.Data;
var obj = {
SName: '全部',
SId: 0
}
this.schoolList.unshift(obj);
})
},
closeShenheForm() {
this.$emit('close')
},
//获取部门下拉数据
getDepartList() {
let msg = {
School_Id: this.setingObj.selected[0].School_Id
School_Id: 0
}
if (this.deptObj.schoolType == 0) {
msg.School_Id = this.setingObj.selected[0].School_Id;
} else {
msg.School_Id = this.deptObj.School_Id;
}
getDeptTree(msg).then(res => {
if (res.Code == 1) {
......@@ -212,8 +249,8 @@
queryDeptPostList(postMsg).then(res => {
if (res.Code == 1) {
let obj = {
PostName:'不限',
PostId:0
PostName: '不限',
PostId: 0
}
this.PostList = res.Data;
this.PostList.unshift(obj);
......@@ -273,6 +310,7 @@
obj.AccountId = this.setingObj.selected[0].AccountId;
obj.AccountType = this.setingObj.selected[0].AccountType;
obj.Dept_Id = this.departId;
obj.School_Id = this.deptObj.School_Id;
}
UpdateEmployeeDept(obj).then(res => {
if (res.Code == 1) {
......
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