Merge branch 'feature_bug' into dev

src/views/components/addResi.vue

@@ -1264,8 +1264,9 @@ export default {
                 const { sex, birth, age } = computedCard(this.form.baseInfoDto.idNum);
                 this.form.baseInfoDto.birthday = birth;
                 this.form.baseInfoDto.gender = sex == 1 ? '1' : '2';
-                // this.form.baseInfoDto.categoryInfo.oldPeopleFlag = age >= 60 ? 1 : 0;
+                this.form.baseInfoDto.categoryInfo.oldPeopleFlag = age >= 60 ? 1 : 0;
                 let obj = {oldPeopleFlag:age >= 60 ? 1 : 0,fertileWomanFlag:this.form.baseInfoDto.gender == 2 && (age >= 18 && age < 49)? 1 : 0}
+                this.form.baseInfoDto.categoryInfo.fertileWomanFlag = this.form.baseInfoDto.gender == 2 && (age >= 18 && age < 49)? 1 : 0;
                 this.$refs['stafftag'].updatedForm(obj);
                 this.form.oldPeopleDto.oldPeopleCategories = ['oldPeopleFlag'];
                 // this.form.IS_BDHJ = huji == _id ? '1' : ''

src/views/components/resiExpand/editExpand.vue

@@ -374,7 +374,10 @@ export default {
                     if (c.formId == "parymemberInfoDto") {
                         for (let i of c.form[0].children) {
                             if (i.formName == 'partyOrgId') {
-                                i.opction = [data];
+                            // 深度克隆数据，避免直接修改原数据
+                                const clonedData = JSON.parse(JSON.stringify(data));
+                            // 调用递归函数处理把党小组这一层去掉
+                            i.opction = [this.processTree(clonedData)];
                             }
                         }
                     }
@@ -384,6 +387,14 @@ export default {
                 console.log(error);
             }
         },
+        processTree(node) {
+            if (node.partyOrgLevel === 7) {
+                node.children = [];
+            } else if (node.children && node.children.length > 0) {
+                node.children = node.children.map(child => this.processTree(child));
+            }
+            return node;
+        }
     },
     components: {},
     computed: {},

src/views/components/resiExpand/index.vue

@@ -177,7 +177,9 @@ export default {
                 label: 'partyOrgName',
                 lazy: true,
                 lazyLoad: (node, resolve) => {
+                    if(node.partyOrgLevel != 7){
                     this.handleNextOrgTreeClick(node, resolve)
+                    }
                 },
                 isLeaf: (data, node) => {
                     console.log(data);
@@ -339,19 +341,29 @@ export default {
         },
         async getOrgTree() {
             try {
-                const { data } = await requestGet('/actual/base/party/org/listPartyOrgTreeRoot4Select', { depth: 8 })
+                const { data } = await requestGet('/actual/base/party/org/listPartyOrgTreeRoot4Select', { depth: 8 });
                 this.formList.forEach(c => {
-                    for (let i of c.children) {
-                        if (i.formName == 'partyOrgId') {
-                            i.opction = [data];
+                    c.children.forEach(i => {
+                        if (i.formName === 'partyOrgId') {
+                            // 深度克隆数据，避免直接修改原数据
+                            const clonedData = JSON.parse(JSON.stringify(data));
+                            // 调用递归函数处理把党小组这一层去掉
+                            i.opction = [this.processTree(clonedData)];
                         }
-                    }
-                })
+                    });
+                });
             } catch (error) {
                 console.log(error);
             }
         },
-
+        processTree(node) {
+            if (node.partyOrgLevel === 7) {
+                node.children = [];
+            } else if (node.children && node.children.length > 0) {
+                node.children = node.children.map(child => this.processTree(child));
+            }
+            return node;
+        }
     },
     components: {},
     computed: {},

src/views/components/resiSearch.vue

@@ -797,7 +797,7 @@ export default {
     // },
     handleAgeChange() {
       if (this.form.ageStart&&this.form.ageEnd) {
-        if (this.form.ageStart > this.form.ageEnd) {
+        if (Number(this.form.ageStart) > Number(this.form.ageEnd)) {
           this.$message.warning('结束年龄不能小于开始年龄')
         }
       }