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

src/views/components/resiForm.vue

@@ -373,13 +373,14 @@
                     </el-date-picker>
                   </template>
                   <template v-else-if="itemk.itemType == 'cascader1'">
-                    <el-cascader :props="{ emitPath: false }"
+                    <el-cascader v-model="form.parymemberInfoDto.partyOrgId"
-                                 :options="itemk.opction"
+                                   :props="casProps"
-                                 class="u-item-width-normal"
+                                   :options="itemk.opction"
-                                 clearable
+                                   class="u-item-width-normal"
-                                 size="small"
+                                   clearable
-                                 :label="itemk.opction.label"
+                                   size="small"
-                                 :value="itemk.opction.value"></el-cascader>
+                                   @change="handlePartyOrgCascadarChange"
+                                  ></el-cascader>
                   </template>
                   <template v-else-if="itemk.itemType == 'number'">
                     <el-input-number class="u-item-width-normal"
@@ -403,7 +404,7 @@
 import { isCard, isPassport, isMobile, isPhone } from '@/utils/validate'
 import { computedCard } from '@/utils/index'
 import { idTypeList } from "@/js/columns/constants";
-
+import {requestGet}  from "@/js/dai/request";
 export default {
   name: 'resiForm',
   props: {
@@ -424,6 +425,16 @@ export default {
       optionsH: [],
       optionsD: [],
       optionsG: [],
+      casProps:{
+        value: 'id', 
+        label: 'partyOrgName', 
+        lazy:true,
+        lazyLoad: (node, resolve) => {
+          this.handleNextOrgTreeClick(node, resolve)
+        },
+        checkStrictly: true,
+        multiple: false
+      },
       activeName: 'groupeduInfoDto',
       validateFlag: null,
       disabilityCategoryCode: [],
@@ -1658,6 +1669,9 @@ export default {
       await this.getHouseList()
       await this.residentEduInfo(this.form.resiId)
     },
+    handlePartyOrgCascadarChange(selectedNode) {
+      this.form.parymemberInfoDto.partyOrgId = selectedNode[selectedNode.length - 1];
+    },
     async getAllDict () {
       try {
         await Promise.all([
@@ -1682,7 +1696,8 @@ export default {
           this.gethobbyDict(),
           this.getWelfareDict(),
           this.getUnemployment(),
-          this.getCareer()
+          this.getCareer(),
+          this.getListPartyOrgTreeRoot4Select()
         ]);
       } catch (error) {
         console.error("Error fetching dictionaries: ", error);
@@ -1703,11 +1718,25 @@ export default {
         return this.$message.error('网络错误')
       })
     },
-    // handelminzu (val) {
+    async handleNextOrgTreeClick (node,resolve) {
-    //   this.newForm.nation = val
+      console.log(node,resolve);
-    // },
+       await this.getTreeChildenList(node,resolve)      
-
+    },
   
+    async getTreeChildenList (node, resolve) {
+      console.log(node,resolve);
+      const url = "/actual/base/party/org/listNextLevelPartyOrgTreeNodesByPid"
+      console.log('级联', node.value)
+      let params = {
+        partyOrgPid: node.data.id
+      }
+      const { data, code, msg } = await requestGet(url, params)
+      if (code === 0) {
+        resolve(data)
+      } else {
+        this.$message.error(msg)
+      }
+  },
     //获取国籍字典
     async getGuojiDictList () {
       await this.getDictDataBasic('nationality', 'nationality')
@@ -2100,7 +2129,37 @@ export default {
 
       }
     },
+      // 获取全部党组织树
+    async getOrgTree(){
+      try {
+        const { data } = await requestGet('/actual/base/party/org/listPartyOrgTreeRoot4Select',{ depth: 8 })
+        this.footerInputList.forEach(c => {
+          for (let i of c.children) {
+            if (i.formName == 'partyOrgId') {
+              i.opction = [data];
+            }
+          }
+        })
+      } catch (error) {
+        console.log(error);
+      }
+    },
+    async getListPartyOrgTreeRoot4Select(){
+      try {
+        const { data } = await this.$http.get('actual/base/party/org/listPartyOrgTreeRoot4Select')
+        console.log(data,'data懒加载');
+        this.footerInputList.forEach(c => {
+          for (let i of c.children) {
+            if (i.formName == 'partyOrgId') {
+              i.opction = [data.data];
+              console.log(i.opction,'option懒加载');
+            }
+          }
+        })
+      } catch (error) {
 
+      }
+    },
     // 获取人物关系字典
     async getRelationship () {
       try {
@@ -2446,9 +2505,12 @@ export default {
       })
     },
     // 党员信息详情
-    residentPartyMemberInfo (id) {
+   async residentPartyMemberInfo (id) {
       if (this.newForm.parymemberInfoDto) return
-      this.$http.get(`/actual/base/residentPartyMemberInfo/detail/${id}`).then(({ data: res }) => {
+      if(this.formId == 'resiForm'){
+         await this.getOrgTree()
+      }
+      await this.$http.get(`/actual/base/residentPartyMemberInfo/detail/${id}`).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg);
         } else {