Browse Source

Merge branch 'dev_org_staff' into dev

test
YUJT 4 years ago
parent
commit
bd5df026a4
  1. 140
      src/views/modules/base/organization/organization.vue

140
src/views/modules/base/organization/organization.vue

@ -388,7 +388,7 @@
title="人员详情"
:visible.sync="details"
width="30%"
:before-close="handleClose">
:before-close="handleClosePeoView">
<el-form>
<el-form-item label="姓名" >
<el-input v-model="peoForm.name" placeholder="姓名" :disabled="true"></el-input>
@ -686,12 +686,14 @@ export default {
// ID
userAgencyId: localStorage.getItem("agencyId"),
// staffId
userStaffId: '',
// ID
currentAgencyId: localStorage.getItem("agencyId"),
// ID
currentDepartmentId:'',
currentDepartmentId:'14f572e724eecf7668b655505d789cab',
// ID
currentGridOrgId:'',
currentGridOrgId:'63d5ff92ea981b1c58e4914ac894c610',
//
lat:'11',
@ -941,15 +943,27 @@ export default {
methods:{
// id
handleChange (e) {
console.log(e)
this.transferForm.orgId = e[1]
if(this.transferForm.orgId != null || ''){
if(this.transferForm.orgId === 0){
if(e[2] == null || ''){
this.transferForm.orgType = 'dept'
this.transferForm.orgId = "14f572e724eecf7668b655505d789cab"
}else{
this.transferForm.orgId = e[2]
this.transferForm.orgType = 'dept'
}
} else {
if(e[2] == null || ''){
this.transferForm.orgType = 'grid'
this.transferForm.orgId = "63d5ff92ea981b1c58e4914ac894c610"
} else {
this.transferForm.orgId = e[2]
this.transferForm.orgType = 'grid'
}
}
}else{
this.transferForm.orgId = e[0]
this.transferForm.orgType = 'agency'
@ -1169,25 +1183,28 @@ export default {
const url = "/gov/org/staff/editstaff"
let params = {
orgType:this.peoForm.orgType,
staffId:this.userStaffId,
name:this.peoForm.name,
mobile:this.peoForm.mobile,
gender:this.peoForm.gender,
gender:this.peoForm.gender === '男' ? 1 : 0,
workType:this.peoForm.post,
roles:this.peoForm.duty,
orgId:this.submitOrgid,
agencyId:this.userAgencyId,
}
const { data, code, msg } = await requestPost(url,params)
if(code === 0) {
this.$message.success("添加成功")
this.dialogVisiblePeo = false
this.peoForm = []
this.$message.success("修改成功")
this.modifyPeo = false
this.getAgencyList()
this.getDepartmentList()
this.getGridList()
this.getAgencyStaffListData()
this.getDepartmentStaffListData()
this.getGridStaffListData()
} else {
this.$message.error(msg)
}
@ -1233,6 +1250,11 @@ export default {
})
.catch(_ => {});
},
//
handleClosePeoView(done){
this.insertFormRest()
done();
},
//
insertFormRest(){
this.insertForm.name = '',
@ -1445,34 +1467,14 @@ export default {
this.peoForm.orgType = 'agency'
this.submitOrgid = this.currentAgencyId
},
//
xiuPeo(row){
this.modifyPeo = true
this.peoForm.orgType = 'agency'
this.submitOrgid = this.currentAgencyId
this.peoForm.name = row.name
this.peoForm.mobile = row.mobile
this.peoForm.gender = row.gender
this.peoForm.post = row.post
this.peoForm.duty = row.roles
},
//
addCommunityPeo(){
this.dialogVisiblePeo = true
this.peoForm.orgType = 'dept'
this.submitOrgid = this.currentDepartmentId
},
//
xiuCommunityPeo(row){
this.modifyPeo = true
this.peoForm.orgType = 'dept'
this.submitOrgid = this.currentDepartmentId
this.peoForm.name = row.name
this.peoForm.mobile = row.mobile
this.peoForm.gender = row.gender
this.peoForm.post = row.post
this.peoForm.duty = row.roles
},
//
addGridPeo(){
this.dialogVisiblePeo = true
@ -1484,6 +1486,7 @@ export default {
this.modifyPeo = true
this.peoForm.orgType = 'grid'
this.submitOrgid = this.currentGridOrgId
this.userStaffId = row.staffId
const url = "/gov/org/staff/editstaffinit"
let params = {
@ -1495,8 +1498,41 @@ export default {
this.peoForm.name = data.name
this.peoForm.mobile = data.mobile
this.peoForm.gender = data.gender
this.peoForm.gender = data.gender === 1 ? '男' : '女'
this.peoForm.post = data.workType
//
let existedRoleArr = []
data.roleList.forEach(function (sysRole) {
if (sysRole.selected === true) {
existedRoleArr.push(sysRole.roleId)
}
})
this.peoForm.duty = existedRoleArr
} else {
this.$message.error(msg)
}
},
//
async xiuPeo(row){
this.modifyPeo = true
this.peoForm.orgType = 'agency'
this.submitOrgid = this.currentAgencyId
this.userStaffId = row.staffId
const url = "/gov/org/staff/editstaffinit"
let params = {
staffId:row.staffId,
agencyId:this.currentAgencyId
}
const { data, code, msg } = await requestPost(url,params)
if(code === 0){
this.peoForm.name = data.name
this.peoForm.mobile = data.mobile
this.peoForm.post = data.workType
this.peoForm.gender = data.gender === 1 ? '男' : '女'
//
let existedRoleArr = []
data.roleList.forEach(function (sysRole) {
@ -1508,6 +1544,43 @@ export default {
} else {
this.$message.error(msg)
}
},
//
async xiuCommunityPeo(row){
this.modifyPeo = true
this.peoForm.orgType = 'dept'
this.submitOrgid = this.currentDepartmentId
this.userStaffId = row.staffId
const url = '/gov/org/staff/editstaffinit'
let params = {
staffId:row.staffId,
agencyId:this.currentAgencyId
}
const { data, code, msg } = await requestPost(url,params)
if(code === 0){
this.peoForm.name = data.name
this.peoForm.mobile = data.mobile
this.peoForm.gender = data.gender === 1 ? '男' : '女'
this.peoForm.post = data.workType
//
let existedRoleArr = []
data.roleList.forEach(function (sysRole) {
if (sysRole.selected === true) {
existedRoleArr.push(sysRole.roleId)
}
})
this.peoForm.duty = existedRoleArr
}else {
this.$message.error(msg)
}
},
//
cancelDisable(){
@ -1628,6 +1701,9 @@ export default {
this.getDepartmentList()
this.getGridList()
this.getAgencyStaffListData()
this.getDepartmentStaffListData()
this.getAgencyStaffListData()
this.getGridStaffListData()
} else {
this.$message.error(msg)

Loading…
Cancel
Save