Merge branch 'feature-7-31' into dev

# Conflicts:
#	src/views/modules/base/organization/organization.vue

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

@@ -1346,14 +1346,13 @@ export default {
       orgOptionProps :{
       multiple: true,
       emitPath: true, 
-      value: 'id',
+      value: 'agencyId',
-      label: 'label',
+      label: 'agencyName',
-      children: 'children',
+      children: 'subAgencyList',
-      checkStrictly: true,
+      checkStrictly: true
-      lazy: true,
+      // lazyLoad: (node, resolve) => {
-      lazyLoad: (node, resolve) => {
+      //               this.loadOptions(node, resolve)
-                    this.loadOptions(node, resolve)
+      //           },
-                },
     
     },
     dialogVisiblePeoAgency:false,//通过组织添加
@@ -1421,40 +1420,42 @@ export default {
   methods: {
     getOrgTreeList () {
       this.$http
-        .get('/actual/base/communityBuilding/tree/initTree', {})
+        .post('/gov/org/customeragency/agencygridtree', {})
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           } else {
+            console.log('获取组织树成功', res.data)
             this.orgOptions = []
             this.orgOptions.push(res.data)
+            console.log(this.orgOptions,"sdkfhkjdfs");
           }
         })
         .catch(() => {
           return this.$message.error('网络错误')
         })
     },
-    async loadOptions(node, resolve) {
+    // async loadOptions(node, resolve) {
-      let data1 =node.data;
+    //   let data1 =node.data;
-      if (data1.level == 'district') {
+    //   if (data1.level == 'district') {
-          resolve(this.orgOptions);
+    //       resolve(this.orgOptions);
 
-      } else {
+    //   } else {
-            if(data1.level !== "building"){            
+    //         if(data1.level !== "building"){            
-              const url = "/actual/base/communityBuilding/tree/nextTreeNode";
+    //           const url = "/actual/base/communityBuilding/tree/nextTreeNode";
-			        let params = {
+		// 	        let params = {
-              level:data1.level,
+    //           level:data1.level,
-              id:data1.id
+    //           id:data1.id
-             };
+    //          };
-			        const { data, code, msg } =await requestGet(url, params);
+		// 	        const { data, code, msg } =await requestGet(url, params);
-              data1.children=data
+    //           data1.children=data
-              resolve(data);
+    //           resolve(data);
-          }else{
+    //       }else{
-            return resolve()
+    //         return resolve()
-          }
+    //       }
 
-      }
+    //   }
-    },
+    // },
     // 点击后获取id
     handleChangeTransferCascader (e) {
       function findItem (valueArr, coll) {
@@ -1635,7 +1636,6 @@ export default {
     },
     // 添加网格
     async submitGrid () {
-        debugger
         this.$refs.addGridForm.validate(async (result) => {
             if (result === true) {
                 const url = "/gov/org/grid/addgrid";
@@ -1658,7 +1658,7 @@ export default {
                 if (code === 0) {
                     this.$message.success("添加成功");
                     this.dialogVisibleGrid = false;
-                    this.GridForm = [];
+                    this.GridFormRest();
                     this.getAgencyList();
                     this.getDepartmentList();
                     this.getGridList();
@@ -1752,6 +1752,7 @@ export default {
       // 调用递归函数提取 level 与 agencyId 组合成的字符串
       this.extractLevelAndAgencyId(this.orgOptions[0], targetAgencyIds, result);
       // 将 Set 对象转换为数组
+
       const manageScopeArray = Array.from(result);
       const url = "/gov/org/staff/editstaff";
       let params = {
@@ -1786,13 +1787,12 @@ export default {
 
     // 递归函数，遍历 JSON 对象提取所有的 level 与 agencyId 组合成的字符串
     extractLevelAndAgencyId(obj, agencyIds, result) {
-
         if (obj && typeof obj === 'object') {
-            if (obj.level && obj.id && agencyIds.includes(obj.id)) {
+            if (obj.level && obj.agencyId && agencyIds.includes(obj.agencyId)) {
-                result.add(`${obj.level}:${obj.id}`);
+                result.add(`${obj.level}:${obj.agencyId}`);
             }
-            if (Array.isArray(obj.children)) {
+            if (Array.isArray(obj.subAgencyList)) {
-                obj.children.forEach(subObj => {
+                obj.subAgencyList.forEach(subObj => {
                   this.extractLevelAndAgencyId(subObj, agencyIds, result);
                 });
             }
@@ -2127,11 +2127,10 @@ export default {
     },
     // 修改人员
     async xiuPeo (row) {
+      console.log(row);
       this.modifyPeo = true;
       this.peoForm.orgType = "agency";
-
       this.userStaffId = row.staffId;
-
       const url = "/gov/org/staff/editstaffinit";
       let params = {
         staffId: row.staffId,
@@ -2139,12 +2138,14 @@ export default {
       };
       const { data, code, msg } = await requestPost(url, params);
       if (code === 0) {
+        console.log("修改人员", data);
+
         this.peoForm.name = data.name;
         this.peoForm.mobile = data.mobile;
         this.peoForm.post = data.workType;
-        // this.peoForm.gender = data.gender === 1 ? '男' : '女'
         this.peoForm.gender = data.gender;
         this.peoForm.idCard = data.idCard;
+        this.peoForm.agencyName=data.agencyName;
         // 已有的权限（角色）
         let existedRoleArr = [];
         data.newRoleList.forEach(function (sysRole) {
@@ -2160,15 +2161,14 @@ export default {
       }
     },
     findParentPath(data,agencyIds) {
+      console.log(data,agencyIds,"dskck");
       let paths = [];
-
+      function findPathRecursive(agencyId, node, path) {;
-      function findPathRecursive(agencyId, node, path) {
           if (node.agencyId === agencyId) {
               path.push(agencyId);
               paths.push(path.slice()); // Make a copy of the path array before pushing
               return true;
           }
-
           if (node.subAgencyList) {
               for (let i = 0; i < node.subAgencyList.length; i++) {
                   if (findPathRecursive(agencyId, node.subAgencyList[i], path.concat(node.agencyId))) {
@@ -2179,11 +2179,10 @@ export default {
 
           return false;
       }
-
       agencyIds.forEach(agencyId => {
           findPathRecursive(agencyId, data, []);
       });
-
+      console.log(paths,"paths");
       return paths;
     },
     // 修改社区人员