Merge branch 'dev' of http://120.46.222.128:10021/elink-star/epmet-work-pc into dev

src/views/dataBoard/overview/components/ResourceScheduling.vue

@@ -245,25 +245,11 @@ export default {
           this.getZzzList();
         } else if (this.peopleType === '5' ) {
           this.getLjdwList();
-        }  else if (this.peopleType === 'publicWelfareNum' || this.peopleType === 'volunteer') {
-          this.getServerOrgNewTask();
         } else {
           this.getList()
         }
       }
     },
-    getServerOrgNewTask() {
-      let {parentCategoryCode,categoryCode} = this.demandRecDetail;
-      this.loading = true;
-      this.$http.post('/actual/base/serviceitem/listServerOrgNewTask', {
-        serverOrgType: this.peopleType == 'publicWelfareNum'?'publicWelfare':'ic_user_volunteer',
-        serverParentOrgCategoryCode:parentCategoryCode,
-        serverOrgCategoryCode:categoryCode
-      }).then(res => {
-        this.loading = false;
-        this.list = res.data.data;
-      })
-    },
     
     handleHandle(data) {
       this.handleClose()

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

@@ -1672,15 +1672,14 @@ export default {
 
     // 添加人员
     async submitPeoDo () {
+      if(this.peoForm.manageScopes){
       const targetAgencyIds = this.peoForm.manageScopes.map(innerArray => innerArray[innerArray.length - 1]);
-      
       // 用于存储提取结果的 Set 对象
       const result = new Set();
-
       // 调用递归函数提取 level 与 agencyId 组合成的字符串
       this.extractLevelAndAgencyId(this.orgOptions[0], targetAgencyIds, result);
-    
+      var manageScopeArray = Array.from(result);
-      const manageScopeArray = Array.from(result);
+      }
       const url = "/gov/org/staff/addstaffv2";
       const {
         peoForm: { orgType },