Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_wxcp_app into dev

src/apps/AppFourNeighbor/Add.vue

@@ -5,7 +5,7 @@
         <span class="tips">*</span>党员信息
       </div>
       <div class="value">
-        <AiPagePicker type="party" @select="handlePartySelect" single>
+        <AiPagePicker type="party" @select="handlePartySelect" single :isFourParty="true">
           <AiMore v-model="form.partyName" placeholder="请选择"/>
         </AiPagePicker>
       </div>

src/apps/AppFourNeighbor/AppFourNeighbor.vue

@@ -161,6 +161,11 @@ export default {
           color: #333;
           line-height: 44px;
           margin-bottom: 32px;
+          display: -webkit-box;
+          -webkit-box-orient: vertical;
+          -webkit-line-clamp: 2;
+          overflow: hidden;
+          text-overflow: hidden;
         }
         .info{
           font-size: 26px;

src/components/pages/selectParty.vue

@@ -57,22 +57,32 @@ export default {
   },
   methods: {
     getList() {
-      this.$http.post(`/app/appparty/list`, null, {
+      var url = this.$route.query.isFourParty ? '/app/appparty/listByFourParty?size=999' : '/app/appparty/list'
+      this.$http.post(url, null, {
         params: {
           current: this.current,
           size: 20,
           areaId: this.user.areaId,
-          con: this.name
+          con: this.name,
+          name: this.name
         }
       }).then(res => {
         if (res?.data) {
-          res.data.records.forEach(e => {
-            e.isCheck = this.selected.includes(e.idNumber)
-          })
           if (this.current > 1 && this.current > res.data.pages) {
             return
           }
-          this.list = this.current > 1 ? [...this.list, ...res.data.records] : res.data.records
+          if(this.$route.query.isFourParty) {
+            res.data.forEach(e => {
+              e.isCheck = this.selected.includes(e.idNumber)
+            })
+            this.list = this.current > 1 ? [...this.list, ...res.data] : res.data
+          }else {
+            res.data.records.forEach(e => {
+              e.isCheck = this.selected.includes(e.idNumber)
+            })
+            this.list = this.current > 1 ? [...this.list, ...res.data.records] : res.data.records
+          }
+          
         }
       })
     },