diff --git a/src/views/modules/base/residentManagement/louzhang/addForm.vue b/src/views/modules/base/residentManagement/louzhang/addForm.vue
index 49e4faff7..d93f4d96f 100644
--- a/src/views/modules/base/residentManagement/louzhang/addForm.vue
+++ b/src/views/modules/base/residentManagement/louzhang/addForm.vue
@@ -114,17 +114,17 @@
               <span class="info-title-2">管理范围: </span>
               <span>{{ formData.rangeName || "--" }}</span>
             </div>
+         
             <el-form-item label-width="100px"
                           label="管理范围"
                           prop="rangeList"
                           v-else>
-
               <el-cascader ref="cascaderUnit"
                            class="width-two"
                            v-model="formData.rangeList"
                            :options="optionsRange"
                            @change="handleChangeRange"
-                           :props="rangeProps"
+                           :props="{ multiple: true,checkStrictly: true, emitPath: true, children: 'subAgencyList', label: 'agencyName', value: 'agencyId'}"
                            :disabled="formType==='detail'"
                            clearable />
 
@@ -176,7 +176,7 @@ export default {
       rangeProps: {
         multiple: true,
         checkStrictly: true,
-        // emitPath: true, 
+        emitPath: true, 
         children: 'subAgencyList',
         label: 'agencyName',
         value: 'agencyId'
@@ -212,12 +212,10 @@ export default {
   methods: {
     async initForm (type, row) {
       this.formType = type;
-
       if (this.formType === 'add') {
 
       } else {
         this.startLoading();
-
         this.categorizedResiId = row.categorizedResiId
         await this.getDetail();
         if (this.formData.agencyId) {
@@ -225,11 +223,19 @@ export default {
         }
         this.endLoading();
       }
-
-
-
-
     },
+    filterByLevel(data, levels) {
+    let result = [];
+    for (let item of data) {
+      if (levels.includes(item.level)) {
+        result.push(item);
+      }
+      if (item.subAgencyList) {
+        result = result.concat(this.filterByLevel(item.subAgencyList, levels));
+      }
+    }
+    return result;
+  },
     async getDetail () {
       const url = `/actual/base/resiCategorized/buildingUnitChief/detail/${this.categorizedResiId}`;
 
@@ -272,7 +278,6 @@ export default {
 
     handleChangeRange (val) {
 
-
     },
     async getGridList () {
       const { user } = this.$store.state
@@ -318,13 +323,15 @@ export default {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           } else {
-
-            this.optionsRange = res.data
+            console.log(res.data);
+            this.optionsRange =  this.filterByLevel(res.data, ['quarter', 'building', 'unit']);
+            this.processOptions(this.optionsRange);
           }
         })
-        .catch(() => {
-          this.dataListLoading = false
-          return this.$message.error('网络错误')
+        .catch((error) => {
+          this.dataListLoading = false;
+          console.error("Error details:", error);  // 打印错误详细信息
+          return this.$message.error('网络错误');
         })
       this.dataListLoading = false
     },
@@ -389,6 +396,28 @@ export default {
     resetData () {
       this.formData = {};
     },
+    processOptions(options) {
+    options.forEach(item => {
+      if (item.level === "quarter") {
+        item.disabled = true; // 禁用第一层
+      } else if (item.level === "building") {
+        item.disabled = false; // 启用第二层
+      } else if (item.level === "unit") {
+        item.disabled = false; // 启用第三层
+
+        // 如果存在第四层，禁用它
+        if (item.subAgencyList) {
+          item.subAgencyList.forEach(fourthLevel => {
+            fourthLevel.disabled = true; // 禁用第四层
+          });
+        }
+      }
+
+      if (item.subAgencyList) {
+        this.processOptions(item.subAgencyList);
+      }
+    });
+  },
     // 开启加载动画
     startLoading () {
       loading = Loading.service({
diff --git a/src/views/modules/communityParty/partyOrg/orgTree.vue b/src/views/modules/communityParty/partyOrg/orgTree.vue
index 0b2b62e59..07420f7b2 100644
--- a/src/views/modules/communityParty/partyOrg/orgTree.vue
+++ b/src/views/modules/communityParty/partyOrg/orgTree.vue
@@ -41,8 +41,8 @@
         :load="handleTreeNodeExpand"
         :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
         ref="table"
-        >
-      
+        :row-class-name="rowClassName"
+       >
       <el-table-column
           prop="partyOrgName"
           label="党组织名称"
@@ -197,7 +197,15 @@ export default {
         }
       });
     },
-    
+    rowClassName(row, rowIndex) {
+      if (row.row.childrenQty == 0) { 
+        return 'no-expand';
+      }
+      return '';
+    },
+    hasChildren(row){
+      console.log(row);
+    },
     /**
      * 点击"新增"
      */
@@ -259,8 +267,14 @@ export default {
         if (!data) {
             return;
         }
+
         this.partyOrgTree=[]
         this.partyOrgTree.push(data);
+        data.children.forEach(item=>{
+          if(item.childrenQty != 0){
+            item.hasChildren = true
+          }
+        })
         this.tableKey = new Date().getTime();
         // 默认加载2级，并且展开，从第三级开始，需要展开上一级动态查询得到
         console.log(">>>>", this.partyOrgTree)
@@ -285,6 +299,11 @@ export default {
       })
 
       this.epmetResultResolver.success((data) => {
+        data.forEach(item=>{
+          if(item.childrenQty != 0){
+            item.hasChildren = true
+          }
+        })
         row.children = data; // 清空原有子节点
         resolve(row.children); // 重新添加子节点
         // this.partyOrgTree.push(data);
@@ -379,4 +398,7 @@ export default {
   margin-top: 20px;
   text-align: center;
 }
+::v-deep  .no-expand>:nth-child(1) .cell .el-table__expand-icon{
+    display: none;
+}
 </style>
diff --git a/src/views/modules/satisfaction/communitySelfInsp/followUpDetail.vue b/src/views/modules/satisfaction/communitySelfInsp/followUpDetail.vue
index ab54c6c00..da10eb4c4 100644
--- a/src/views/modules/satisfaction/communitySelfInsp/followUpDetail.vue
+++ b/src/views/modules/satisfaction/communitySelfInsp/followUpDetail.vue
@@ -1,8 +1,7 @@
 
 <template>
-
   <div class='g-main dialog-h-content'>
-    <h3>{{agencyName}}{{period.substr(5,2)}}月份满意度调查</h3>
+    <h3>{{ agencyName }}{{ period.substr(5, 2) }}月份满意度调查</h3>
     <p>尊敬的居民朋友</p>
     <p style="text-indent: 2em; ">为了更好地推进社区工作，为您提供更全面、优质的服务，请您根据真实情况填写此表，我们将认真对待您提出的问题，并承诺对您提供的信息保密，感谢您的配合！</p>
     <div class="card" v-for="(item, index) in formList" :key="index">
@@ -12,40 +11,41 @@
         <el-radio class="f-bot16" v-model.trim="form[item.pkey]" disabled label="good">基本满意</el-radio>
         <el-radio class="f-bot16" v-model.trim="form[item.pkey]" disabled label="bad">不满意</el-radio>
       </section>
-      <p v-if="form[item.pkey] == 'bad'">{{ index + 1 }}.1您具体对那些方面不满意</p>
+      <p v-if="form[item.pkey] == 'bad'">{{ index + 1 }}.1您具体对哪些方面不满意</p>
       <section class="f-hflex" v-for="(itemK, indexK) in item.children" v-if="form[item.pkey] == 'bad'">
-        <el-radio class="f-bot16" v-model.trim="form[item.value]" :label="itemK.value" disabled
-         >{{ itemK.label }}</el-radio>
-          <el-input v-if="indexK == item.children.length -1 && form[item.pkey] == 'bad'" disabled placeholder="请填写不满意原因" v-model.trim="form[item.reason]"></el-input>
+        <el-radio class="f-bot16" v-model.trim="form[item.value]" :label="itemK.value" disabled>{{ itemK.label
+        }}</el-radio>
+        <el-input v-if="indexK == item.children.length - 1 && form[item.pkey] == 'bad'" disabled placeholder="请填写不满意原因"
+          v-model.trim="form[item.reason]"></el-input>
       </section>
     </div>
-    <p>8、姓名：{{form.reporterName}}</p>
-    <p>9、电话：{{form.reporterMobile}}</p>
+    <p>8、姓名：{{ form.reporterName }}</p>
+    <p>9、电话：{{ form.reporterMobile }}</p>
     <p>10、您是否接受回访</p>
     <section class="f-hflex">
-        <el-radio class="f-bot16" v-model="form.followUpStatus" disabled :label="-2">未知</el-radio>
-        <el-radio class="f-bot16" v-model="form.followUpStatus" disabled :label="-1">不接受回访</el-radio>
-        <el-radio class="f-bot16" v-model="form.followUpStatus" disabled :label="0">接受回访/待回访</el-radio>
-        <el-radio class="f-bot16" v-model="form.followUpStatus" disabled :label="1">已回访</el-radio>
-      </section>
-      <p v-if="form.followUpStatus === 0">11、请选择合适您的回访方式</p>
-      <section class="f-hflex"  v-if="form.followUpStatus === 0">
-        <el-radio class="f-bot16" v-model="form.expectFollowUpWay" disabled label="0">未知</el-radio>
-        <el-radio class="f-bot16" v-model="form.expectFollowUpWay" disabled label="1">电话回访</el-radio>
-        <el-radio class="f-bot16" v-model="form.expectFollowUpWay" disabled label="2">上门回访</el-radio>
-      </section>
-      <p >请填写您的家庭住址</p>
-      <el-input  v-model="form.resideAddress" disabled></el-input>
-        <el-row type="flex" justify="end" class="f-top12">
-            <el-col :span="2">
-                <el-button @click="handleClose"> 取消</el-button>
-            </el-col>
-        </el-row>
+      <el-radio class="f-bot16" v-model="form.followUpStatus" disabled :label="-2">未知</el-radio>
+      <el-radio class="f-bot16" v-model="form.followUpStatus" disabled :label="-1">不接受回访</el-radio>
+      <el-radio class="f-bot16" v-model="form.followUpStatus" disabled :label="0">接受回访/待回访</el-radio>
+      <el-radio class="f-bot16" v-model="form.followUpStatus" disabled :label="1">已回访</el-radio>
+    </section>
+    <p v-if="form.followUpStatus === 0">11、请选择合适您的回访方式</p>
+    <section class="f-hflex" v-if="form.followUpStatus === 0">
+      <el-radio class="f-bot16" v-model="form.expectFollowUpWay" disabled label="0">未知</el-radio>
+      <el-radio class="f-bot16" v-model="form.expectFollowUpWay" disabled label="1">电话回访</el-radio>
+      <el-radio class="f-bot16" v-model="form.expectFollowUpWay" disabled label="2">上门回访</el-radio>
+    </section>
+    <p>请填写您的家庭住址</p>
+    <el-input v-model="form.resideAddress" disabled></el-input>
+    <el-row type="flex" justify="end" class="f-top12">
+      <el-col :span="2">
+        <el-button @click="handleClose"> 取消</el-button>
+      </el-col>
+    </el-row>
   </div>
 </template>
 
 <script>
-import {  requestGet } from "@/js/dai/request";
+import { requestGet } from "@/js/dai/request";
 export default {
   //数据
   data() {
@@ -61,14 +61,14 @@ export default {
       formList: [],
       form: {
         //  是否满意：veryGood,good,bad
-        evaCulturalFacility:'',
-        evaSportsFacility:'',
-        evaEcologicalEnv:'',
-        evaSocialSecurity:'',
-        evaSocialAssistance:'',
-        evaOldPeopleProvide:'',
-        evaBasicEducation:'',
-        evaMedical:'',
+        evaCulturalFacility: '',
+        evaSportsFacility: '',
+        evaEcologicalEnv: '',
+        evaSocialSecurity: '',
+        evaSocialAssistance: '',
+        evaOldPeopleProvide: '',
+        evaBasicEducation: '',
+        evaMedical: '',
 
         // 二级选中 对应值 cultureFacilityAsp 01 02 03 09
         cultureFacilityAsp: '',
@@ -89,46 +89,52 @@ export default {
         medicalReason: '',
 
         // 居民信息
-        reporterName:'',
-        reporterMobile:'',
+        reporterName: '',
+        reporterMobile: '',
         followUpStatus: null,
-        expectFollowUpWay:'',
-        resideAddress:'',
+        expectFollowUpWay: '',
+        resideAddress: '',
       },
-      agencyName:this.$store.state.user.agencyName,
+      agencyName: this.$store.state.user.agencyName,
     };
   },
   //创建前
   async created() {
     await this.getDicts()
-    await this.handleArr()
+    await this.transformInitialArray()
     await this.getInspResult()
   },
   //方法
   methods: {
-    handleArr() {
-      const transformArray = (initialArray) => {
-        const resultMap = new Map();
-        for (const item of initialArray) {
-          const baseValue = item.value.slice(0, -2);
-          const endValue = item.value.slice(-2);
-          const modifiedBaseValue = baseValue.charAt(0).toUpperCase() + baseValue.slice(1,-3);
-          const reasonValue = baseValue.charAt(0) + baseValue.slice(1,-3) + 'Reason';
-          if (!resultMap.has(baseValue)) {
-            resultMap.set(baseValue, { label: item.label, value: baseValue, children: [] ,pkey:`eva${modifiedBaseValue}`,reason:reasonValue});
-          }
-          if (["01", "02", "03", "09"].includes(endValue)) {
-            resultMap.get(baseValue).children.push(item);
-          }
-        }
+    transformInitialArray() {
+  const resultMap = new Map();
 
-        return [...resultMap.values()].filter(item => item.children.length > 0);
-      };
+  // 先找到所有的“父”项
+   this.dicts.satisfaction_ns_aspect.forEach(item => {
+    const endValue = item.value.slice(-2);
+    if (isNaN(endValue)) {
+      resultMap.set(item.value, {
+        label: item.label,
+        value: item.value,
+        children: [],
+        pkey: `eva${item.value.charAt(0).toUpperCase() + item.value.slice(1, -3)}`,
+        reason: `${item.value.replace('Asp', '')}Reason`  // 修改这里
+      });
+    }
+  });
+
+  // 然后为每一个父项找到子项
+   this.dicts.satisfaction_ns_aspect.forEach(item => {
+    const parentValue = item.value.slice(0, -2);
+    if (resultMap.has(parentValue)) {
+      resultMap.get(parentValue).children.push(item);
+    }
+  });
+
+  this.formList = [...resultMap.values()];
+  console.log(this.formList);
+},
 
-      this.formList = transformArray(this.dicts.satisfaction_ns_aspect);
-      console.log(this.formList);
-    },
- 
     async getDicts() {
       try {
         const requests = [
@@ -150,17 +156,17 @@ export default {
         console.log("获取字典失败: ", error);
       }
     },
-    async getInspResult(){
+    async getInspResult() {
       const url = `/governance/satisfaction/communitySelfInsp/inspResult/detail/${this.inspResultId}`
-      const {data,code,msg} = await requestGet(url)
-      if(code == 0){
-        this.form = {...data.reporter,...data.satisfaction}
+      const { data, code, msg } = await requestGet(url)
+      if (code == 0) {
+        this.form = { ...data.reporter, ...data.satisfaction }
         console.log(this.form);
-      }else{
+      } else {
         this.$message.error(msg)
       }
     },
-    handleClose(){
+    handleClose() {
       this.$emit('handleClose')
     }
   },
@@ -170,14 +176,14 @@ export default {
   computed: {},
   //监听
   watch: {},
-  props:{
-    inspResultId:{
-      type:String,
-      default:''
+  props: {
+    inspResultId: {
+      type: String,
+      default: ''
     },
-    period:{
-      type:String,
-      default:''
+    period: {
+      type: String,
+      default: ''
     }
   }
 }
@@ -205,4 +211,5 @@ h3 {
 .f-font-color {
   color: #000;
   font-weight: 400;
-}</style>
+}
+</style>
diff --git a/src/views/modules/satisfaction/communitySelfInsp/index.vue b/src/views/modules/satisfaction/communitySelfInsp/index.vue
index 6b7d92d8b..5cb7b1db5 100644
--- a/src/views/modules/satisfaction/communitySelfInsp/index.vue
+++ b/src/views/modules/satisfaction/communitySelfInsp/index.vue
@@ -57,7 +57,7 @@
             :close-on-press-escape="false" title="社区自查" :modal-append-to-body="false" width="820px" top="5vh"
             class="dialog-h" @closed="showFormList = false">
             <form-list ref="ref_add_form" @handleClose="handleClose" :satisfactionCategoryStr="satisfactionCategoryStr"
-                @handelDetail="handelDetail" @handelFollowUpList="handelFollowUpList" :period="formData.period" :seriesName="seriesName" :inspRecordId="formData.inspRecordId"></form-list>
+                @handelDetail="handelDetail" @handelFollowUpList="handelFollowUpList" :period="formData.period" :seriesName="seriesName" :inspRecordId="inspRecordId"></form-list>
             <el-dialog width="920px" class="dialog-h" title="社区自查报告详情" :close-on-click-modal="false"
                 v-if="showFollowUpDetail" :visible.sync="showFollowUpDetail" append-to-body>
                 <follow-Detail :period="formData.period" :inspResultId="inspResultId" @handleClose="showFollowUpDetail = false"></follow-Detail>
@@ -99,8 +99,8 @@ export default {
 
             formData: {
                 period: "",//月份
-                inspRecordId: "",
             },
+            inspRecordId: "",
 
             multiSelection: [], // 多选结果
 
@@ -329,7 +329,7 @@ export default {
                 this.option.xAxis.data = []
                 this.tableData = data.categoryDatas || [];
                 this.satisfactionCategory = []
-                this.formData.inspRecordId = data.inspRecordId;
+                this.inspRecordId = data.inspRecordId;
                 this.synthesisScore = data.synthesisScore;
                 this.personQty = data.personQty
                 const allowedCategories = this.dicts.satisfaction_category.map(item => item.value)