Merge remote-tracking branch 'origin/feature/dev_party_mange' into dev

src/views/modules/partymember/icpartymemberpayrecorddetail.vue

@@ -8,7 +8,7 @@
                   v-model="mySelectOrg"
                   :options="orgList"
                   placeholder="请选择党组织"
-                  :props="{ checkStrictly: true, label: 'partyOrgName', value: 'id', children: 'children' }"
+                  :props="{ label: 'partyOrgName', value: 'id' }"
                   @change="handleChangeOrg"
                   clearable />
         </el-form-item>
@@ -186,7 +186,7 @@
               if (res.code !== 0) {
                   return this.$message.error(res.msg)
               }
-              this.orgList = res.data
+              this.orgList = this.deepArrTOnull(res.data)
           }).catch(() => {})
       },
       // 党组织选中事件
@@ -196,6 +196,16 @@
           } else {
               this.dataForm.orgId = ''
           }
+      },
+      deepArrTOnull(arr) {
+          let a = []
+          a = arr.map(item => {
+              return {
+                  ...item,
+                  children: (item.children.length > 0 && this.deepArrTOnull(item.children) )|| null
+              }
+          })
+          return a
       }
   }
 }