Merge branch 'dev_org_staff'

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

@@ -17,7 +17,7 @@
         height="250"
         :data="agencyTableListData"
         style="width: 100%">
-            <el-table-column prop="agencyName" label="下级组织"></el-table-column>
+            <el-table-column prop="agencyName" label="下级组织" ></el-table-column>
             <el-table-column prop="contacts" label="联系人"></el-table-column>
             <el-table-column prop="mobile" label="联系人电话"></el-table-column>
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -196,7 +196,7 @@
         width="30%"
         :before-close="handleClose">
             <el-form :rules="rules">
-                <el-form-item label="部门名称" prop="departmentName">
+                <el-form-item label="部门名称" prop="addDepartmentName">
                     <el-input v-model="insertForm.departmentName" placeholder="请输入部门名称"></el-input>
                 </el-form-item>
                 <el-form-item label="组织编码" prop="code">
@@ -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>
@@ -405,6 +405,9 @@
                 <el-form-item label="职位" >
                     <el-input  v-model="peoForm.duty" placeholder="职位" :disabled="true"></el-input>
                 </el-form-item>
+                <el-form-item label="是否禁用">
+                    <el-input v-model="peoForm.disableFlag" placeholder="是否禁用" :disabled="true"></el-input>
+                </el-form-item>
             </el-form>
             <div slot="footer" >
                 <el-button type="primary" style="margin-right:170px" @click="cancelDetails">关 闭</el-button>
@@ -773,6 +776,7 @@ export default {
                 orgType:'',
                 activeTime:'',
                 zuzhi:'',
+                disableFlag:''
             },
             // 人员调动
             transferForm:{
@@ -880,6 +884,9 @@ export default {
                 ],
                 gridName:[
                     { required: true, message: '网格名称必填', trigger: 'blur' }
+                ],
+                addDepartmentName:[
+                    { required: true, message: '部门名称必填', trigger: 'blur' }
                 ]
             }
         }
@@ -946,11 +953,22 @@ export default {
             this.transferForm.orgId = e[1]
             if(this.transferForm.orgId != null || ''){
                 if(this.transferForm.orgId === 0){
-                    this.transferForm.orgId = e[2]
+                    if(e[2] == null || ''){
-                    this.transferForm.orgType = 'dept'
+                        this.transferForm.orgType = 'dept'
+                        this.transferForm.orgId = "14f572e724eecf7668b655505d789cab"
+                    }else{
+                        this.transferForm.orgId = e[2]
+                        this.transferForm.orgType = 'dept'
+                    }
                 } else {
-                    this.transferForm.orgId = e[2]
+                    if(e[2] == null || ''){
-                    this.transferForm.orgType = 'grid'
+                        this.transferForm.orgType = 'grid'
+                        this.transferForm.orgId = "63d5ff92ea981b1c58e4914ac894c610"
+                    } else {
+                        this.transferForm.orgId = e[2]
+                        this.transferForm.orgType = 'grid'
+                    }
+                    
                 }
             }else{
                 this.transferForm.orgId = e[0]
@@ -1238,12 +1256,18 @@ export default {
           })
           .catch(_ => {});
         },
+        // 人员查看叉号关闭
+        handleClosePeoView(done){
+            this.insertFormRest()
+            done();
+        },
         // 社区新增弹框重置函数
         insertFormRest(){
             this.insertForm.name = '',
             this.insertForm.contacts = '',
             this.insertForm.code = '',
-            this.insertForm.phone = ''
+            this.insertForm.mobile = '',
+            this.insertForm.departmentName = ''
         },
         // 网格新增弹框重置函数
         GridFormRest(){
@@ -1277,7 +1301,7 @@ export default {
             this.transferForm.orgId = '',
             this.transferForm.orgType = ''
             this.selectValue = ''
-            
+            this.options[0] = []
         },
         // 新增组织
         addNewAgencyRest(){
@@ -1609,10 +1633,15 @@ export default {
 
             if(code === 0){
                 this.peoForm.name = data.name
-                this.peoForm.mobile = data.mobile
+                this.peoForm.mobile = data.mobile.substr(0,3) + "****" + data.mobile.substr(7)
                 this.peoForm.activeTime = data.activeTime
                 this.peoForm.duty = data.roles
                 this.peoForm.zuzhi = data.orgName
+                if (data.enableFlag === 'enable') {
+                    this.peoForm.disableFlag = '已启用'
+                } else {
+                    this.peoForm.disableFlag = '已禁用'
+                }
             }
             this.details = true
         },
@@ -1684,6 +1713,9 @@ export default {
                 this.getDepartmentList()
                 this.getGridList()
                 this.getAgencyStaffListData()
+                this.getDepartmentStaffListData()
+                this.getAgencyStaffListData()
+                this.getGridStaffListData()
 
             } else {
                 this.$message.error(msg)
@@ -1906,7 +1938,6 @@ export default {
             
         },
         handelStreeOrCommunityZoing(val){
-            console.log(val)
             this.OrgDetailsForm.level = val.level
             this.OrgDetailsForm.areaName = val.areaName
             this.OrgDetailsForm.areaCode = val.areaCode