From 7e4350338e89ff9b5129341333c89d8f6773ea66 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Thu, 24 Aug 2023 14:56:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=91=98=E7=AE=A1=E7=90=86=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=90=9C=E7=B4=A2=E6=A0=8F=E6=A0=B7=E5=BC=8F,?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5=E7=A4=BE=E5=8C=BA=E7=AE=80=E4=BB=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communityParty/members/memberList.vue     | 82 ++++++++++++-------
 src/views/modules/home/index.vue              | 16 ++--
 2 files changed, 62 insertions(+), 36 deletions(-)

diff --git a/src/views/modules/communityParty/members/memberList.vue b/src/views/modules/communityParty/members/memberList.vue
index 0b0a58bf7..c3a081a7a 100644
--- a/src/views/modules/communityParty/members/memberList.vue
+++ b/src/views/modules/communityParty/members/memberList.vue
@@ -1,31 +1,37 @@
 <template>
-  <div>
-    <el-card ref="searchConditions">
-      <el-form class="header_form_box" ref="searchForm" :model="searchForm" :inline="true" :label-width="'110px'">
-        <el-form-item label="所属党组织">
+  <div class="g-main">
+    <div class="m-search">
+      <el-form class="header_form_box" ref="searchForm" :model="searchForm" :inline="true" :label-width="'105px'">
+        <el-form-item label="所属党组织" >
           <el-cascader :options="partyOrgTree"
                        clearable
-                       style="width: 300px"
+                       size="small"
+                       class="u-item-width-normal"
                        placeholder="请选择"
                        v-model="searchForm.partyOrgId"
                        @change="handlePartyOrgCascadarChange"
                        :props="partyOrgTreeCascadarProps">
           </el-cascader>
         </el-form-item>
-        <el-form-item label="党员姓名">
-          <el-input v-model="searchForm.name" placeholder="请输入" clearable></el-input>
+        <el-form-item label="党员姓名" >
+          <el-input v-model="searchForm.name" placeholder="请输入"  size="small"
+                       class="u-item-width-normal" clearable></el-input>
         </el-form-item>
-        <el-form-item label="联系电话">
-          <el-input v-model="searchForm.mobile" placeholder="请输入" clearable></el-input>
+        <el-form-item label="联系电话" >
+          <el-input v-model="searchForm.mobile" placeholder="请输入"  size="small"
+                       class="u-item-width-normal" clearable></el-input>
         </el-form-item>
         <el-form-item label="身份证号">
-          <el-input v-model="searchForm.idCard" placeholder="请输入" clearable></el-input>
+          <el-input v-model="searchForm.idCard" placeholder="请输入"  size="small"
+                       class="u-item-width-normal" clearable></el-input>
         </el-form-item>
         <el-form-item label="居住地址">
-          <el-input v-model="searchForm.jzAddress" placeholder="请输入" clearable></el-input>
+          <el-input v-model="searchForm.jzAddress" placeholder="请输入"  size="small"
+                       class="u-item-width-normal" clearable></el-input>
         </el-form-item>
         <el-form-item label="职务">
-          <el-select v-model="searchForm.partyJob" placeholder="请选择">
+          <el-select v-model="searchForm.partyJob" placeholder="请选择"  size="small"
+                       class="u-item-width-normal">
             <el-option v-for="e in partyJobOptions"
                        :key="e.value"
                        :value="e.value"
@@ -35,6 +41,8 @@
         <el-form-item label="入党日期">
           <el-date-picker
               type="daterange"
+              size="small"
+              class="u-item-width-daterange2"
               clearable
               @change="handleJoinTimeChange"
               range-separator="至"
@@ -44,8 +52,9 @@
         </el-form-item>
 
         <!--党员中心户-->
-        <el-form-item prop="centerFlag" label="党员中心户">
-          <el-select v-model="searchForm.centerFlag" placeholder="请选择" clearable>
+        <el-form-item prop="centerFlag" label="党员中心户" >
+          <el-select v-model="searchForm.centerFlag" placeholder="请选择" clearable  size="small"
+                       class="u-item-width-normal">
             <el-option v-for="e in centerFlagOptions"
                        :key="e.value"
                        :value="e.value"
@@ -54,8 +63,9 @@
         </el-form-item>
 
         <!--流动党员-->
-        <el-form-item prop="flowFlag" label="流动党员">
-          <el-select v-model="searchForm.flowFlag" placeholder="请选择" clearable>
+        <el-form-item prop="flowFlag" label="流动党员"  >
+          <el-select v-model="searchForm.flowFlag" placeholder="请选择" clearable size="small"
+                       class="u-item-width-normal">
             <el-option v-for="e in flowFlagOptions"
                        :key="e.value"
                        :value="e.value"
@@ -64,13 +74,15 @@
         </el-form-item>
 
         <!--流动党员证号-->
-        <el-form-item prop="flowActNum" label="流动党员证号">
-          <el-input v-model="searchForm.flowActNum" clearable></el-input>
+        <el-form-item prop="flowActNum" label="流动党员证号"  >
+          <el-input v-model="searchForm.flowActNum" clearable size="small"
+                       class="u-item-width-normal"></el-input>
         </el-form-item>
 
         <!--免学习-->
         <el-form-item prop="studyNotNeed" label="免学习">
-          <el-select v-model="searchForm.studyNotNeed" placeholder="请选择" style="width: 300px" clearable>
+          <el-select v-model="searchForm.studyNotNeed" placeholder="请选择" clearable  size="small"
+                       class="u-item-width-normal">
             <el-option v-for="e in studyNotNeedOptions"
                        :key="e.value"
                        :value="e.value"
@@ -78,13 +90,23 @@
           </el-select>
         </el-form-item>
       </el-form>
-      <div>
-        <el-button type="primary" @click="handleReset">重置</el-button>
-        <el-button type="primary" @click="handleSearch">查询</el-button>
-      </div>
-    </el-card>
-    <el-card ref="memberList">
-      <div>
+      <el-row type="flex" >
+          <el-col :span="24" align="right">
+            <el-button style="margin-left:30px"
+                       size="small"
+                       type="primary "
+                       @click="handleSearch">查询</el-button>
+            <el-button style="margin-left:10px"
+                       is-plain
+                       class="diy-button--white el-button--default"
+                       size="small"
+                       @click="handleReset">重置</el-button>
+          </el-col>
+        </el-row>
+    </div>
+      
+       
+      <div class="g-table">
         <el-button type="primary"
                    @click="handleCreateBtnClick">新增
         </el-button>
@@ -124,7 +146,9 @@
             v-loading="loading"
             @select-all="handleMultiSelect"
             @selection-change="handleMultiSelect"
-            style="width: 100%">
+            style="width: 100%"
+            table
+            >
           <el-table-column
               type="selection"
               width="55">
@@ -233,7 +257,6 @@
             :total="total">
         </el-pagination>
       </div>
-    </el-card>
     <Create ref="create" @finishUpdate="search"></Create>
     <Detail ref="detail" @finishUpdate="search"></Detail>
     <Update ref="update" @finishUpdate="search"></Update>
@@ -685,6 +708,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+@import "@/assets/scss/buttonstyle.scss";
+@import "@/assets/scss/modules/management/list-main.scss";
+@import "@/assets/scss/modules/shequzhili/event-info.scss";
 .resi-container .resi-card-table {
   ::v-deep .el-table {
     th {
diff --git a/src/views/modules/home/index.vue b/src/views/modules/home/index.vue
index 78830768a..3a314a19a 100644
--- a/src/views/modules/home/index.vue
+++ b/src/views/modules/home/index.vue
@@ -52,14 +52,14 @@
 								<p>
 									{{ pandectData.deptName }}，<span v-if="pandectData.gridCount">划分为{{
 										pandectData.underCount }}个{{
-		pandectData.underName
-	}}，</span>现有居民{{ pandectData.homeCount }}户、{{
-	pandectData.resiCount
-}}人，其中常住人口{{
-	pandectData.permanentResiCount
-}}人，流动人口{{
-	pandectData.floatingResiCount
-}}人，各类群体分布如下：
+											pandectData.underName
+										}}，</span>  现有房屋{{ pandectData.homeCount }}间，自住房屋{{
+										pandectData.selfStay
+									}}间、出租房屋{{
+										pandectData.rentOut
+									}}间、闲置房屋{{
+										pandectData.vacantHouse
+									}}间，现有居民{{pandectData.resiCount}}户、{{pandectData.totalResidents}}人，其中常住人口{{pandectData.permanentResiCount}}人，流动人口{{pandectData.floatingResiCount}}人，各类群体分布如下：
 								</p>
 
 								<div class="subtitle">