diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue
index 5a9aa1396..55e53e191 100644
--- a/src/views/components/resiSearch.vue
+++ b/src/views/components/resiSearch.vue
@@ -152,7 +152,7 @@
           <el-cascader class="u-item-width-normal"
                        size="small"
                        ref="myCascader"
-                       v-model="form.agencyId"
+                       v-model="cascaderAgencyId"
                        :options="orgOptions"
                        :props="orgOptionProps"
                        :show-all-levels="false"
@@ -335,6 +335,7 @@ export default {
 
     return {
       categoryAll:[],
+      cascaderAgencyId:[],
       categoryAllList:[
         {
           label:'群众',
@@ -934,6 +935,7 @@ export default {
     this.$EventBus.$on('handleClickResiTree', async (val) => {
            if(val.type === 'agency'){
               this.form.agencyId = val.id;
+              this.cascaderAgencyId = val.id;
               this.optionsV = [];
               this.form.villageId = '';
               this.form.buildId = '';
@@ -1066,7 +1068,7 @@ export default {
         }
       }
     },
-    handleChangeAgency(val) {
+   async handleChangeAgency(val) {
       this.sarr = []
       this.getLastItem(
         this.orgOptions,
@@ -1074,7 +1076,10 @@ export default {
         "agencyId"
       );
       this.form.level = this.sarr[this.sarr.length - 1].level;
-      this.getValiheList()
+      this.form.agencyId = this.sarr[this.sarr.length - 1].agencyId;
+      this.optionsV = [];
+      this.optionsVPageNo = 1;
+      await this.getValiheList()
     },
     getLastItem(list, vals, key) {
       let LIST = list || [];
diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue
index bb1f03bab..99333f554 100644
--- a/src/views/modules/base/community/communityTable.vue
+++ b/src/views/modules/base/community/communityTable.vue
@@ -39,12 +39,12 @@
                                 <el-button size="small" type="text" class="diy-button--other">导入房屋数据</el-button>
                             </el-upload>
                         </div>
-                       
+
                         <el-button size="small" style="float: right" class="diy-button--white" slot="reference">导入<i
                                 class="el-icon-arrow-down el-icon--right"></i></el-button>
                     </el-popover>
                 </div>
-                
+
                 <el-button style="margin-left: 10px" class="diy-button--white" size="small"
                     @click="handleExportOpen">导出</el-button>
 
@@ -75,7 +75,11 @@
                     </div> -->
                     <div  class="table-more-btn">
                         <el-button :headers="$getElUploadHeaders()" class="diy-button--other" size="small" type="text"
-                            @click="handleExportIDCard()">下载电子门牌</el-button>
+                            @click="handleExportHouseDoorplate()">下载房屋电子门牌</el-button>
+                    </div>
+                    <div  class="table-more-btn">
+                        <el-button :headers="$getElUploadHeaders()" class="diy-button--other" size="small" type="text"
+                                   @click="handleExportUnitDoorplate()">下载单元电子门牌</el-button>
                     </div>
                     <!-- <div
 						v-if="
@@ -386,7 +390,7 @@ export default {
             }
         });
         this.getQueryConditions();
-    
+
     },
 
     methods: {
@@ -429,7 +433,7 @@ export default {
                 updateStartDate: this.updateStartDate,
                 updateEndDate: this.updateEndDate,
             };
-            
+
             this.$refs.baobiao.init({
                 elseParams: {
                     categoryKeys: ["house_info"],
@@ -865,19 +869,19 @@ export default {
                 }
             );
         },
-        
+
         //导入电子门牌信息
-        
-        handleExportIDCard() {
+
+        handleExportHouseDoorplate() {
             let title = this.agencyObj.label;
-            title = title + "电子门牌信息";
+            title = title + "房屋电子门牌信息";
             let url = "/actual/base/communityHouse/downloadZip";
             console.log(this.agencyObj)
             this.startLoading('正在生成，需要几分钟时间，请耐心等待...')
             let params = {
                 pageSize:this.pageSize,
                 pageNo:this.pageNo,
-                level:this.agencyObj.level ,              
+                level:this.agencyObj.level ,
                 id:this.agencyObj.id,
                 ownerName: this.ownerName,
                 ownerPhone: this.ownerPhone,
@@ -912,6 +916,37 @@ export default {
                 }
             );
         },
+
+      handleExportUnitDoorplate() {
+        let title = this.agencyObj.label;
+        title = title + "单元电子门牌信息";
+        let url = "/actual/base/communityBuildingUnit/downloadUnitDoorplateZip";
+        this.startLoading('正在生成，需要几分钟时间，请耐心等待...')
+        let params = {
+          level:this.agencyObj.level ,
+          id:this.agencyObj.id,
+        };
+        // if (this.agencyObj.level === "grid") {
+        //     params.gridId = this.agencyObj.id;
+        //     params.agencyId = "";
+        // } else {
+        //     params.gridId = "";
+        //     params.agencyId = this.agencyObj.id;
+        // }
+
+        app.ajax.exportFilePost(
+            url,
+            params,
+            (data, rspMsg) => {
+              console.log(data)
+              this.download(data, title + ".zip");
+            },
+            (rspMsg, data) => {
+              this.$message.error(rspMsg);
+            }
+        );
+      },
+
         //导出一户一档
         handleExportYihuyidang() {
             this.yihuyidangDisabled = true;
diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
index 4ece03b8c..758ff886f 100644
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@@ -1347,14 +1347,13 @@ export default {
       orgOptionProps :{
       multiple: true,
       emitPath: true, 
-      value: 'id',
-      label: 'label',
-      children: 'children',
-      checkStrictly: true,
-      lazy: true,
-      lazyLoad: (node, resolve) => {
-                    this.loadOptions(node, resolve)
-                },
+      value: 'agencyId',
+      label: 'agencyName',
+      children: 'subAgencyList',
+      checkStrictly: true
+      // lazyLoad: (node, resolve) => {
+      //               this.loadOptions(node, resolve)
+      //           },
     
     },
     dialogVisiblePeoAgency:false,//通过组织添加
@@ -1422,40 +1421,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) {
-      let data1 =node.data;
-      if (data1.level == 'district') {
-          resolve(this.orgOptions);
-
-      } else {
-            if(data1.level !== "building"){            
-              const url = "/actual/base/communityBuilding/tree/nextTreeNode";
-			        let params = {
-              level:data1.level,
-              id:data1.id
-             };
-			        const { data, code, msg } =await requestGet(url, params);
-              data1.children=data
-              resolve(data);
-          }else{
-            return resolve()
-          }
-
-      }
-    },
+    // async loadOptions(node, resolve) {
+    //   let data1 =node.data;
+    //   if (data1.level == 'district') {
+    //       resolve(this.orgOptions);
+
+    //   } else {
+    //         if(data1.level !== "building"){            
+    //           const url = "/actual/base/communityBuilding/tree/nextTreeNode";
+		// 	        let params = {
+    //           level:data1.level,
+    //           id:data1.id
+    //          };
+		// 	        const { data, code, msg } =await requestGet(url, params);
+    //           data1.children=data
+    //           resolve(data);
+    //       }else{
+    //         return resolve()
+    //       }
+
+    //   }
+    // },
     // 点击后获取id
     handleChangeTransferCascader (e) {
       function findItem (valueArr, coll) {
@@ -1756,6 +1757,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 = {
@@ -1790,14 +1792,12 @@ export default {
 
     // 递归函数，遍历 JSON 对象提取所有的 level 与 agencyId 组合成的字符串
     extractLevelAndAgencyId(obj, agencyIds, result) {
-
         if (obj && typeof obj === 'object') {
-          console.log(obj,"1111");
-            if (obj.level && obj.id && agencyIds.includes(obj.id)) {
-                result.add(`${obj.level}:${obj.id}`);
+            if (obj.level && obj.agencyId && agencyIds.includes(obj.agencyId)) {
+                result.add(`${obj.level}:${obj.agencyId}`);
             }
-            if (Array.isArray(obj.children)) {
-                obj.children.forEach(subObj => {
+            if (Array.isArray(obj.subAgencyList)) {
+                obj.subAgencyList.forEach(subObj => {
                   this.extractLevelAndAgencyId(subObj, agencyIds, result);
                 });
             }
@@ -2138,11 +2138,10 @@ export default {
     // 修改人员
     async xiuPeo (row) {
       console.log("修改人员");
+      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,
@@ -2150,12 +2149,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) {
@@ -2171,15 +2172,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))) {
@@ -2190,11 +2190,10 @@ export default {
 
           return false;
       }
-
       agencyIds.forEach(agencyId => {
           findPathRecursive(agencyId, data, []);
       });
-
+      console.log(paths,"paths");
       return paths;
     },
     // 修改社区人员
diff --git a/src/views/modules/communityParty/activity/index.vue b/src/views/modules/communityParty/activity/index.vue
index 515dce5c7..4404a3d9e 100644
--- a/src/views/modules/communityParty/activity/index.vue
+++ b/src/views/modules/communityParty/activity/index.vue
@@ -283,7 +283,6 @@
       },
       async communityActivityList() {
         const url = "/actual/base/communityActivity/page";
-
         let params = {
          pageSize: this.pageSize,
           pageNo: this.pageNo,
@@ -398,7 +397,7 @@
           pageSize: 10,
           pageNo: 1,
           typeName: "",
-          enabled: 1
+          enabled: 0
         }
         const { data, code, msg } = await requestPost(url, params)
         if (code === 0) {
diff --git a/src/views/modules/shequzhili/Delivery/index.vue b/src/views/modules/shequzhili/Delivery/index.vue
index 7f5413688..ce7c65c50 100644
--- a/src/views/modules/shequzhili/Delivery/index.vue
+++ b/src/views/modules/shequzhili/Delivery/index.vue
@@ -77,21 +77,30 @@
                 <div class="div_btn">
 
                     <el-button @click="handleExport" class="diy-button--white" size="small">导出</el-button>
+                    <el-button class="diy-button--white" size="small">
+                        <el-upload :headers="$getElUploadHeaders()" ref="upload" class="upload-btn"
+                                action="uploadUlr" :limit="1" :accept="'.xls,.xlsx'" :with-credentials="true"
+                                :show-file-list="false" :auto-upload="true" :on-progress="handleProgress"
+                                :on-success="handleExcelSuccess" :before-upload="beforeExcelUpload"
+                                :http-request="uploadHttpRequest">
+                               上传导入
+                            </el-upload>
+                    </el-button>
 
-                    <el-dropdown size="small" split-button type="primary" style="margin: 0 10px; height: 30px"
+                    <!-- <el-dropdown size="small" split-button type="primary" style="margin: 0 10px; height: 30px"
                         @command="(command) => importTypeChange(command)">
                         导入
-                        <el-dropdown-menu slot="dropdown">
-                            <el-dropdown-item command="0" @click.native="handleExportModule">下载模板</el-dropdown-item>
-                            <el-upload :headers="$getElUploadHeaders()" ref="upload" class="upload-btn"
+                        <el-dropdown-menu slot="dropdown"> -->
+                            <!-- <el-dropdown-item command="0" @click.native="handleExportModule">下载模板</el-dropdown-item> -->
+                            <!-- <el-upload :headers="$getElUploadHeaders()" ref="upload" class="upload-btn"
                                 action="uploadUlr" :limit="1" :accept="'.xls,.xlsx'" :with-credentials="true"
                                 :show-file-list="false" :auto-upload="true" :on-progress="handleProgress"
                                 :on-success="handleExcelSuccess" :before-upload="beforeExcelUpload"
                                 :http-request="uploadHttpRequest">
                                 <el-dropdown-item command="1">上传导入</el-dropdown-item>
                             </el-upload>
-                        </el-dropdown-menu>
-                    </el-dropdown>
+                        </el-dropdown-menu> -->
+                    <!-- </el-dropdown> -->
                 </div>
                 <el-table :data="tableData" border class="m-table-item" style="width: 100%"
                     @selection-change="handleSelectionChange" :height="maxTableHeight">
diff --git a/src/views/modules/shequzhili/event/cpts/event-info.vue b/src/views/modules/shequzhili/event/cpts/event-info.vue
index afbd87d68..06b0b9702 100644
--- a/src/views/modules/shequzhili/event/cpts/event-info.vue
+++ b/src/views/modules/shequzhili/event/cpts/event-info.vue
@@ -24,7 +24,7 @@
                         <div class="div-btn">
                             <el-button size="small" @click="handleClose">关闭</el-button>
                             <el-button style="margin-left: 20px" type="primary" size="small"
-                                @click="handleComfirm">保存</el-button>
+                                @click="handleComfirm">{{this.pageType=="assign"?"确认指派":"保存"}}</el-button>
                         </div>
                     </el-card>
                 </div>
diff --git a/src/views/modules/shequzhili/eventHandling/index.vue b/src/views/modules/shequzhili/eventHandling/index.vue
index 9cef2ce64..66825013d 100644
--- a/src/views/modules/shequzhili/eventHandling/index.vue
+++ b/src/views/modules/shequzhili/eventHandling/index.vue
@@ -69,20 +69,27 @@
                 <div class="div_btn">
 
                     <el-button @click="handleExport" class="diy-button--white" size="small">导出</el-button>
-
-                    <el-dropdown size="small" split-button type="primary" style="margin: 0 10px; height: 30px"
+                    <el-button class="diy-button--white" size="small">
+                        <el-upload :headers="$getElUploadHeaders()" ref="upload" class="upload-btn" action="uploadUlr"
+                                     :limit="1" :accept="'.xls,.xlsx'" :with-credentials="true" :show-file-list="false"
+                                     :auto-upload="true" :on-progress="handleProgress" :on-success="handleExcelSuccess"
+                                     :before-upload="beforeExcelUpload" :http-request="uploadHttpRequest">
+                         上传导入
+                        </el-upload>
+                    </el-button>
+                    <!-- <el-dropdown size="small" split-button type="primary" style="margin: 0 10px; height: 30px"
                         @command="(command) => handleMarkDiffcult(command)">
                         导入
-                        <el-dropdown-menu slot="dropdown">
-                            <el-dropdown-item command="0" @click.native="handleExportModule">下载模板</el-dropdown-item>
-                            <el-upload :headers="$getElUploadHeaders()" ref="upload" class="upload-btn" action="uploadUlr"
+                        <el-dropdown-menu slot="dropdown"> -->
+                            <!-- <el-dropdown-item command="0" @click.native="handleExportModule">下载模板</el-dropdown-item> -->
+                            <!-- <el-upload :headers="$getElUploadHeaders()" ref="upload" class="upload-btn" action="uploadUlr"
                                      :limit="1" :accept="'.xls,.xlsx'" :with-credentials="true" :show-file-list="false"
                                      :auto-upload="true" :on-progress="handleProgress" :on-success="handleExcelSuccess"
                                      :before-upload="beforeExcelUpload" :http-request="uploadHttpRequest">
                           <el-dropdown-item command="1">上传导入</el-dropdown-item>
                         </el-upload>
                         </el-dropdown-menu>
-                    </el-dropdown>
+                    </el-dropdown> -->
                 </div>
 
                 <el-table :data="tableData" border class="m-table-item" style="width: 100%"
diff --git a/src/views/modules/shequzhili/eventOld/cpts/event-info.vue b/src/views/modules/shequzhili/eventOld/cpts/event-info.vue
index ca929bc52..334a07add 100644
--- a/src/views/modules/shequzhili/eventOld/cpts/event-info.vue
+++ b/src/views/modules/shequzhili/eventOld/cpts/event-info.vue
@@ -113,34 +113,34 @@
                                         </div>
                                         <template v-if="item.internalFile && item.internalFile.length > 0"
                                             v-for="i in item.internalFile">
-                                            <template v-if="i.type === 'image'">
+                                            <template v-if="i.attachmentType === 'image'">
                                                 <div class="detail">
                                                     <div class="detail-field">图片：</div>
                                                     <div
                                                         :class="['m-info-prop', { 'm-info-prop-vis': source === 'visiual' },]">
-                                                        <img :src="i.url" :key="i.url"
+                                                        <img :src="i.attachmentUrl" :key="i.attachmentUrl"
                                                             style="width: 50px; height: 50px; padding-right: 10px"
-                                                            @click="watchImg(i.url)" />
+                                                            @click="watchImg(i.attachmentUrl)" />
                                                     </div>
                                                 </div>
                                             </template>
-                                            <template v-if="i.type === 'voice'">
+                                            <template v-if="i.attachmentType === 'voice'">
                                                 <div class="detail">
                                                     <div class="detail-field">语音：</div>
                                                     <div
                                                         :class="['m-info-prop', { 'm-info-prop-vis': source === 'visiual' },]">
                                                         <audio controls>
-                                                            <source :src="i.url" type="" :key="i.url" />
+                                                            <source :src="i.attachmentUrl" type="" :key="i.attachmentUrl" />
                                                         </audio>
                                                     </div>
                                                 </div>
                                             </template>
-                                            <template v-if="i.type === 'doc'">
+                                            <template v-if="i.attachmentType === 'doc'">
                                                 <div class="detail">
                                                     <div class="detail-field">附件：</div>
                                                     <div
                                                         :class="['m-info-prop', { 'm-info-prop-vis': source === 'visiual' },]">
-                                                        <a :href="i.url">{{ i.name }}</a>
+                                                        <a :href="i.attachmentUrl">{{ i.attachmentName }}</a>
                                                     </div>
                                                 </div>
                                             </template>
diff --git a/src/views/modules/shequzhili/eventOld/cpts/process-form-designate.vue b/src/views/modules/shequzhili/eventOld/cpts/process-form-designate.vue
index c5def143e..dbce30b34 100644
--- a/src/views/modules/shequzhili/eventOld/cpts/process-form-designate.vue
+++ b/src/views/modules/shequzhili/eventOld/cpts/process-form-designate.vue
@@ -212,11 +212,11 @@ export default {
         handleChangeAgency(val) {
             let obj = this.$refs["agencyIdArray"].getCheckedNodes()[0].data
             if (obj) {
-                this.formData.orgType = obj.level === 'grid' ? 'grid' : 'agency'
+                this.formData.level = obj.level === 'grid' ? 'grid' : 'agency'
                 this.formData.deptId = obj.agencyId
                 this.formData.deptName = obj.agencyName
             } else {
-                this.form.orgType = ''
+                this.form.level = ''
                 this.form.orgId = ''
             }
         },
diff --git a/src/views/modules/shequzhili/eventOld/eventList.vue b/src/views/modules/shequzhili/eventOld/eventList.vue
index 0b874f404..2583fe5f1 100644
--- a/src/views/modules/shequzhili/eventOld/eventList.vue
+++ b/src/views/modules/shequzhili/eventOld/eventList.vue
@@ -206,7 +206,7 @@
                     <el-table-column prop="happenTime" align="center" width="140" :show-overflow-tooltip="true"
                         label="上报时间">
                     </el-table-column>
-                    <el-table-column prop="userShowName" align="center" width="100" :show-overflow-tooltip="true"
+                    <el-table-column prop="deptName" align="center" width="100" :show-overflow-tooltip="true"
                         label="当前结点">
                     </el-table-column>
                     <el-table-column prop="status" align="center" label="状态" width="80" :show-overflow-tooltip="true">
diff --git a/src/views/modules/workSys/role/role.vue b/src/views/modules/workSys/role/role.vue
index f00869619..b875a5d57 100644
--- a/src/views/modules/workSys/role/role.vue
+++ b/src/views/modules/workSys/role/role.vue
@@ -38,7 +38,7 @@
                    class="diy-button--white"
                    @click="resetSearch">重置</el-button>
 
-        
+
       </el-form>
     </div>
     <div class="m-table">
@@ -55,7 +55,7 @@
                 border
                 :height="tableHeight"
                 v-loading="tableLoading"
-                
+
                 style="width: 100%">
         <el-table-column label="序号"
                          header-align="center"
@@ -78,6 +78,12 @@
                     {{ scope.row.defaultRole == '0' ? 'X' : '√' }}
                 </template>
         </el-table-column>
+        <el-table-column prop="levelName"
+                         header-align="center"
+                         align="center"
+                         label="级别"
+                         in-width="30">
+        </el-table-column>
         <el-table-column prop="remark"
                          header-align="center"
                          align="center"
@@ -328,7 +334,7 @@ export default {
     resetSearch () {
       this.formData = {
 
-        name: '',//姓名	
+        name: '',//姓名
 
       }
 
diff --git a/src/views/modules/workSys/role/roleForm.vue b/src/views/modules/workSys/role/roleForm.vue
index 49054d99d..f736aeb58 100644
--- a/src/views/modules/workSys/role/roleForm.vue
+++ b/src/views/modules/workSys/role/roleForm.vue
@@ -22,6 +22,18 @@
 
         </el-form-item>
 
+        <el-form-item label="所属组织级别"
+                      prop="level"
+                      label-width="150px"
+                      style="display: block">
+          <el-select v-model.trim="formData.level" placeholder="请选择" size="small"
+                     class="list_item_width_1">
+            <el-option v-for="(item, index) in orgLevels" :key="item.code"
+                       :label="item.name" :value="item.code"></el-option>
+          </el-select>
+
+        </el-form-item>
+
         <el-form-item label="备注"
                       prop="remark"
                       label-width="150px"
@@ -107,13 +119,16 @@ export default {
       },
 
       defaultRole: '',
-
+      orgLevels: []
     }
   },
   components: {},
-  async mounted () {
-
+  mounted () {
+    this.listOrgLevels4Roles()
+  },
 
+  activated() {
+    this.listOrgLevels4Roles()
   },
 
   methods: {
@@ -314,6 +329,14 @@ export default {
       if (loading) {
         loading.close()
       }
+    },
+
+    // 加载行政组织级别
+    listOrgLevels4Roles() {
+      requestGet('/gov/access/govrole/orgLevels/list').then(({code, data, msg}) => {
+        this.orgLevels = data
+        console.log("行政组织级别:", data)
+      })
     }
   },
   computed: {
@@ -322,8 +345,6 @@ export default {
         name: [
           { required: true, message: '角色名称不能为空', trigger: 'change' }
         ],
-
-
       }
     },