dd

src/views/modules/partymember/icpartymemberpayrecorddetail.vue

@@ -4,13 +4,28 @@
       <el-card ref="searchCard" class="search-card">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item  prop="mySelectOrg" label="所属党组织">
-          <el-cascader
+          <!-- <el-cascader
                   v-model="mySelectOrg"
                   :options="orgList"
                   placeholder="请选择党组织"
                   :props="{ label: 'partyOrgName', value: 'id' }"
                   @change="handleChangeOrg"
-                  clearable />
+                  clearable /> -->
+          <el-cascader
+            class="list_item_width_1"
+            size="small"
+            v-model="mySelectOrg"
+            :options="orgList"
+            placeholder="请选择党组织"
+            :props="{
+              checkStrictly: true,
+              label: 'partyOrgName',
+              value: 'id',
+              children: 'children'
+            }"
+            @change="handleChangeOrg"
+            clearable
+          />
         </el-form-item>
         <el-form-item label="姓名"
                       prop="name">
@@ -44,13 +59,14 @@
           <el-date-picker
                   v-model="dataForm.year"
                   type="year"
+                  size="small"
                   placeholder="选择年"
                   value-format="yyyy"
                   @change="yearChangeHandler">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="" prop="month">
-          <el-select v-model="dataForm.month" placeholder="选择月份" clearable :disabled="dataForm.year === '' || dataForm.year === null">
+          <el-select v-model="dataForm.month" placeholder="选择月份" size="small" clearable :disabled="dataForm.year === '' || dataForm.year === null">
             <el-option v-for="item in monthArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
             </el-option>
           </el-select>
@@ -237,7 +253,7 @@
       },
       // 获取党组织列表
       getOrgList() {
-          return this.$http.get('/resi/partymember/icPartyOrg/getTreelist', {params: {agencyId: localStorage.getItem('agencyId')}}).then(({data: res}) => {
+          return this.$http.get('/resi/partymember/icPartyOrg/getSearchTreelist', {params: {agencyId: localStorage.getItem('agencyId')}}).then(({data: res}) => {
               if (res.code !== 0) {
                   return this.$message.error(res.msg)
               }

src/views/modules/partymember/icpartymemberpoint.vue

@@ -10,8 +10,9 @@
       >
         <el-form-item prop="mySelectOrg" label="所属党组织">
           <el-cascader
-            style="width: 300px"
+            class="list_item_width_1"
             v-model="mySelectOrg"
+            size="small"
             :options="orgList"
             placeholder="请选择党组织"
             :props="{
@@ -57,8 +58,10 @@
         <br />
         <el-form-item label="评分年度" prop="year">
           <el-date-picker
+            class="list_item_width_1"
             v-model="dataForm.year"
             type="year"
+            size="small"
             placeholder="选择年"
             value-format="yyyy"
           >
@@ -241,17 +244,27 @@ export default {
       this.currentPage = val
       this.getDataList()
     },
+    deepArrTOnull(arr) {
+      let a = []
+      a = arr.map(item => {
+        return {
+          ...item,
+          children: (item.children.length > 0 && this.deepArrTOnull(item.children) )|| null
+        }
+      })
+      return a
+    },
     // 获取党组织列表
     getOrgList() {
       return this.$http
-        .get('/resi/partymember/icPartyOrg/getTreelist', {
+        .get('/resi/partymember/icPartyOrg/getSearchTreelist', {
           params: { agencyId: localStorage.getItem('agencyId') }
         })
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           }
-          this.orgList = res.data
+          this.orgList = this.deepArrTOnull(res.data)
         })
         .catch(() => {})
     },

src/views/modules/visual/communityParty/party.vue

@@ -753,7 +753,8 @@ export default {
     async getPartyOggList(node, resolve) {
       // const url = "/gov/org/customeragency/staffinagencylist";
       // const url = '/gov/org/customeragency/agencygridtree'
-      const url = '/resi/partymember/icPartyOrg/getTreelist'
+      // const url = '/resi/partymember/icPartyOrg/getTreelist'
+      const url ='/resi/partymember/icPartyOrg/getSearchTreelist'
       let params = {
         agencyId: this.$store.state.user.agencyId,
       };