Merge branch 'dev_org_staff' into dev

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

@@ -851,7 +851,7 @@ export default {
             dutyList:[],
             // 修改操作是否展示
             modifyPeo:false,
-            submitOrgid:'',
+            
             // 级联数据
             options:[
                 {
@@ -1166,7 +1166,7 @@ export default {
                 gender:this.peoForm.gender,
                 workType:this.peoForm.post,
                 roles:this.peoForm.duty,
-                orgId:this.submitOrgid
+                orgId:this.currentAgencyId
             }
 
             const { data, code, msg } = await requestPost(url,params)
@@ -1196,7 +1196,7 @@ export default {
                 gender:this.peoForm.gender === '男' ? 1 : 0,
                 workType:this.peoForm.post,
                 roles:this.peoForm.duty,
-                agencyId:this.userAgencyId,
+                agencyId:this.currentAgencyId,
             }
 
             const { data, code, msg } = await requestPost(url,params)
@@ -1473,27 +1473,27 @@ export default {
         addPeo(row){
             this.dialogVisiblePeo = true
             this.peoForm.orgType = 'agency'
-            this.submitOrgid = this.currentAgencyId
+            
         },
         
         // 新增社区人员
         addCommunityPeo(){
             this.dialogVisiblePeo = true
             this.peoForm.orgType = 'dept'
-            this.submitOrgid = this.currentDepartmentId
+            
         },
 
         // 新增网格人员
         addGridPeo(){
             this.dialogVisiblePeo = true
             this.peoForm.orgType = 'grid'
-            this.submitOrgid = this.currentGridOrgId
+            
         },
         // 修改网格人员
         async xiuGridPeo(row){
             this.modifyPeo = true
             this.peoForm.orgType = 'grid'
-            this.submitOrgid = this.currentGridOrgId
+            
             this.userStaffId = row.staffId
 
             const url = "/gov/org/staff/editstaffinit"
@@ -1524,7 +1524,7 @@ export default {
         async xiuPeo(row){
             this.modifyPeo = true
             this.peoForm.orgType = 'agency'
-            this.submitOrgid = this.currentAgencyId
+            
             this.userStaffId = row.staffId
 
             const url = "/gov/org/staff/editstaffinit"
@@ -1559,7 +1559,7 @@ export default {
         async xiuCommunityPeo(row){
             this.modifyPeo = true
             this.peoForm.orgType = 'dept'
-            this.submitOrgid = this.currentDepartmentId
+            
             this.userStaffId = row.staffId
 
             const url = '/gov/org/staff/editstaffinit'