From d4660f5917cfb93e0e67a2e5cd9625605e754bf7 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Mon, 21 Nov 2022 16:20:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/img/icon-add.png                   |  Bin 751 -> 1400 bytes
 src/assets/img/icon-del.png                   |  Bin 753 -> 1147 bytes
 .../scss/modules/management/list-main.scss    |   99 +-
 .../scss/modules/visual/communityManage.scss  |   24 +-
 src/views/components/resiSearch copy.vue      |  813 +++++++++
 src/views/components/resiSearch.vue           |  650 ++++---
 src/views/components/smartSearchRule.vue      |  951 ++++++++++
 .../modules/base/community/community.vue      |   17 +-
 src/views/modules/base/resi copy.vue          | 1543 +++++++++++++++++
 src/views/modules/base/resi.vue               |  162 +-
 10 files changed, 3779 insertions(+), 480 deletions(-)
 create mode 100644 src/views/components/resiSearch copy.vue
 create mode 100644 src/views/components/smartSearchRule.vue
 create mode 100644 src/views/modules/base/resi copy.vue

diff --git a/src/assets/img/icon-add.png b/src/assets/img/icon-add.png
index 07d1bb4dd4e96cc4b9389438b541f168c105a41b..deedbb2948d903f67d6d6a91db347bdaf838e98d 100644
GIT binary patch
literal 1400
zcmV-;1&8{HP)<h;3K|Lk000e1NJLTq001Tc001Tk1^@s6s6FYf00001b5ch_0Itp)
z=>Px)GD$>1R9HvNm~Bv0RT#(r&$+v>yKJBiz6PQwGR+v6qUelS_CW<jEM5dN70aAS
zZKgg{eral^588+N+VlmqL}Wol<RzW5Y${(?3ty&DkP)H8G!=CB;@&;yG<S1X0(RNG
ztWM{{-kCk;`9HsN&pppM&qFZKimK(aQXosyL=2alBw&$JNL`AE5dnP)Dbj3a9%67h
zis^i$ZYW%XqH1XeN1^KRj&b#QE}gh^{haFY@=*5H7?UzTePTwOB_`b(W4a9mHI8Ds
zACAvq!CpKjO^G+KMpd<hmW~@uUAJ8BaD)erNlJ{fWlkNRV~sWU+!~L{?-!Fdluk&n
zf;}?LD@4)d?wf~x@3?#02+%;AXHrIunK5DPN)uy_+E=MHm}XG0!YaAMrS>H?o#|+f
z2GBr_WmzdXc8jI6ri6|Rr9UKCVU^6k-K(<i&RskCIH3HRFJ(;59usdBH6>Ix(9a;S
zqDr~!mP@rAYq@sfaYFgE7iT1ACE9JOV+|ec@9#fgMb$F>p1W^hv$Lb=NkI91ES;UQ
zG~RCc*-=cF{Qm{O^xc=xCElw$*;?@=q5Qt`v(q;8B(YEZyEOn-SS8n8?7VR{TDvdO
z$xTm67@awJLRRe>+T{z>`i~ww-KtjBaJs!VQo(4BUp_arz-Bd<>p}Qmu)T7_4;MRs
z{Ohh;HSCCqI1tN$luih`YD7m5!VA)q7CK6)!Uwium-g=A(^smDhy`p+D1(%r0B8oM
z*Ntke%$`<q=r!|aR9Y!B{^)fl9ly}|n^7^J9g|x@*bY!5I5rv8S~N3x*3<E}E-I{&
zWesQBj;d}hjEX%3+XTW#038I!7Nc5Lo5FIRo4$lr?cr}8{H67<QK5hxlTiWF_42dR
z@@U0w&z8fd+7JAnz*fvleVLY*d$u*4i9(oAWFCMo0PF^*?IW3}9yTbqqVMfS=hd39
zgv@+21S^At1q9!X)z?UJ2sRrepNGVGKso?o{rXJ+sbHcGnsR42U%6RR3L^t!Vl9Yv
z4ksM6pYSET^l_lyOax6nn&86@A6P_7Y2xD`*c%|S0J8rs764@faux_3fE;{Xl1xIP
z0s`lT1M@9q)INSiZU*onAioA@?;C!rdcfB|{`{}_=DL%u^&=7T*_z}Bkk|%bKRD@6
z!_5~i3iis4jlZ@X8F7GBq`nik0yqFp`qNMg1lXt@Nl^j|97+1L@^*XPsXx`e&(IY8
zMt(4ob?~ycjB4f0OI=;RF6MLJ?Lt2<k6-9KKB8-nB6b3_7NBpzvCatCxKTFiqM6By
zYD%a)a8Y!*we^k85gbj5SOw5d5bb~$<wn4k&q*z?#r3-=>LLY|a(&CSZf9FpPw>bb
zBp^P5pm;#`8i5+}YOM=}os1}W3LN*0I1gpBazWb0-brl7pkzchiXeT91>+n-30Z##
z7d~fB$})SL<)<OjH^0b}PIzCKnLKA)ysa-}!t00AO9X%4Q<cY^jW5oeJU`KHm5x#x
zbRP^_R4Lvkb9-Fcq;Jl)H-@_;k&Ih9J2f}nYQF9$rG}yGLYARcSIHTwR}{2fzgZux
zL|89FrA-{0XEm|feI;}`*kr;g+>Px<sq29@+S%6KU^EEpIb+6@@wsua<~uhhVDE?u
zcl~EmR4o&vz$*_tTEcx*Ydvx0&z9j1e*Hk6KW$Q`-D*yYjWPES!+u9G^@OwJ!@jYh
zMD*gY;F!yWh!ujv%V7qfJRHkS3N*$PD2zQ|3Qij-4*vtZg*oft0N+di0000<MNUMn
GLSTZOB$M_4

literal 751
zcmV<L0ucR)P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0008ENkl<ZNK3Vr
zy>HV%7{;GB9|#8i09s%m7a>}NKr{%jGqAu03=}6SI}%-5C=*B&38ogxQY3b&*pva-
z+JzwwAX)@Mv<T(G0JQu83?TCHqC4W$Y3({F!h;9jd+&38?(y$T_|F%0(tqfc=&M!H
zPlTPSo*CZ~Ni5AAmCI4{Lj^7@?%PrOS-l9tIRO13jh4W8oY<Cp@NnSc_n?|U0m~I5
z1Y8Bs17Mz*78)^LAdWBSH=ueZ)}Ra%X8@c8u*$%MW6FE$MK%cJieemu8%-<jI9WNi
znGIG^OcLRWu3_A?vvS;D-zH!c#UK$LsRAM#FBtM=l*ej3UlPZd@uIn?^G;UIdh=QW
z+Vfx4MP&;Ugk#9c`sP+qOsi*3Rt|3%D~S{_q_QiqH96qzNlU=9h8e?7R^AU<dCnEj
z)pOgFCxXVUqPRqaX}?u10m~I-B7C+Dc`D47C;>GuR}yo~*yETot*utK!BYBQocS$4
zleSq_=?T0#5^&QK0FTv)4$T_ncUr*PTqe#tM#b(%z$&G3#8hC0-fS(9bHyltyV%0J
z?IV@1IvK8b#=!PYQbfRyf+<hyUawQT@SDB>xNMtps$Br_UfcY%+I*{NBJ_14z>H-t
zSvhxa4^Ure6IindXB|U6?am@`h8R!UEK)G5*RVuPw+q?w^=<_6#q=#Ez7|iQU%_zg
zJ8;DZ04uiHWlUW$2cXwB<^EPo_2x7g#Eek>M8&klB_ERlQ4z)=l`ORwFEM^AeLM<A
zg-*_2OiyWOh43g45o;U*1EYRyN8vh@OP)}RKYCRWxb{s_*j9%}4+!&Mde78&LrIi$
zpDGOE*kKSK05=aD#)u!&Ua!a_lL<ovh#+eiki?kz=Oc4{GX=v~gVX*)zY(Ldf?3p;
h-qBx0RFlod{{ToQUMNa1&WQj3002ovPDHLkV1lQ3O2hyF

diff --git a/src/assets/img/icon-del.png b/src/assets/img/icon-del.png
index e79000569b59557e6db2f6a1f99217c8f87f826a..4806f77898e42f98ff5d655e0015f651cea284b3 100644
GIT binary patch
literal 1147
zcmV->1cdvEP)<h;3K|Lk000e1NJLTq001Tc001Tk1^@s6s6FYf00001b5ch_0Itp)
z=>Px(HAzH4R9HvNSbt0#briqv_uA5<?On@c;sSp#GnZ@;FtTY3F^0IYAuzE;=r-Ch
zjy9XoME~$_{xtrf|7}^@WgF}V2&@?}_k#qDZblhVhS`$2IRAh+g4*`3EmwNI@0p&K
zU@7HVdoB0J{c(Bk^FHsr`@Zjc4`5k5A&28dgitLKq8bzv06<8KiAa>700bh05vamN
zh-;z{!fCzB^>e0XfLw*elPC3Bp0^0gTuCh8e-ynlIV(gsA)P+1C2&n$eU-{++KCqt
zzKB{qy!F(nkQ|#E5)*rSRqXuyVH6Hiq1mY$;%~n$$pKE50hP}e>udHNgoKVE%gZl=
z-riU`oV3Ikr*ntMacz-@Go#Umv%YKyCF^K*Rh4LW)wBSD7^2RcdAuIxy2Jtw$9^FY
zC=ZW+aWfZ$k}-5GZ3l7EG-q_VZl}UeNsOiGL(xAL;L^nS4@!_qU>5IddPP%OhDeX+
z+M3iSe_))>1N`FC;-y=o-z!Nffla*mR;_yLbDYuRnOJS_KM`Y3oY=|x|Evp-4&BHH
zse}zfv!wwqDgBN-efm-2+X}Jx>0_Qe`IsH<JD*Qd30tJac8uD-{nNy0T_MKMw2hmY
z`Y~6hFH`5#yQ@vQs@hue?AZ%aosPfa#Z%4ryMo>;Bbfr`Qr^&NHS?6|T)YTN#Mqvm
zV}Y-3evAD+$K}#crdaVJOubfLN4nkTC1QTt(T{?|7Y8y0QbOKfIoe_ByZ9OK(R5X8
zVWB)SIX<I=p-eHg^-VRZva)%=(sUPl_0j~2a41s{CFG%&fMo08{UBhsJJ_KM<4PFG
z7L#nZH3MJgk@rF)m%Q16D50k}A87@CtM&chwZfK(War{#1Nb{SJ_wEu49oFc1i&j|
z*j_oZDK6zHAd0PWbPX*Xmb?)YG3*{Lif_v&wpmlTX@CAem(9rz_KnF2alT}va=~_Y
zA7{OnZ*RH+yJ@c^=@Rek{4hAuKbWsnrL$u&ceb1Q`#=Au?V;(ez}L6FDRkR|ZL1)R
zZ#2A4dOYV=8buZ3vxmF`1-+UKhpcAaw5m~*qSoDQ56@0d^AGO(3z5>4t#zD8p@$Kw
z&3>G$to&rnFd{{*K;xUP>D>eBEnDuU9N!Y@%lE*m-`DgqEG>(q9e5Muq!qzmi@4I$
zcyU9^tD0w?6-l>y&7oU&slw27V=Nfl79Jb?Qi;Q$Yi@5;QPfk)<+`2<KkXWd?df>|
zMWg1(gP+E7H3&;<sNF9$LycyHbi039&uMv!ySX_l;=-oj)ZOdZ7GY^|SG}hZ5;{Lw
zQE}yeE$&u(<8wGD6+-U_97n~1fyc{tChu=_@y92gqPqHOmBF|JCkQ46;nfnCi;?qd
zY#6arAkuPJ5cVJxD?&Vv0ff{ThT;Fp3L=C&RI4!vRm%{^?`5+b{u`S;)w-Nkp4$Kb
N002ovPDHLkV1mVEG0*@2

literal 753
zcmV<N0uKF&P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0008GNkl<ZNK37j
zKWG#|6vn@AHl@KjB8U;s!onhgC=nvDQ4+b^<kDD}+gzezqo{>~7!kAyXd$S{Wlsc~
z#M=udV4;#A(aJP}f)NxOMJyz-Om?2^+#mPua%V1=t!`)De7~9ZX1{ktjYpF4oxbmP
zD#%HY+W@rW!+${Jy9S?Fmi3CM$*<L9xYmRuqitHNAp%2X^I!7st>JM2MwQZ|OieA6
z>s0{!gnfm?t$g5;Kqds3x1i?fW(+`_o>m{aoj^OmJ^)+IxZtXl_HKtEB>>;ChY4KI
z1@JkQe{HQ@mFzwlZ4+(X1mu{305>ex8!p5Y0WuJai*Uk7i|S_j=}fKql+Q_`w@av}
z&3Z~7$Fq~>x1pL{sCQ;SaUWBe_w|SuVx_-lw<uZ6>FE8z=?%bl?1w=?DI8%sb9p1;
zMTldc7vN4%c+2%pQwC!Z@%ahBPZ9?>?tN<nkh=u-3jvPOl0Ebt`yzo60n(Q1IgN_v
zG7>vS@SXsds1vbSkR61arJH@Q8Gx1kXoscLEJWt09Xm)*#2jZVYYNopBhHCtLDMpT
z#Q?Aj!EcrJc9aVjPFE8sGN;nnBNc0N8*j-0fM3e>c5O1?BY^GyQUvZQSV6-nipRG|
zv;QZTqI{7x<W!TJecY(Hxu%KULqh$=6nQmaClxU!kTJ{6mb>SMc;fV&5y*Wl7-Zo2
zqW!=nm#B2-|IBSYL~-o50vx2WT1%`Va8TuDj;}|gT8!`5DFOpUtEe!$4LE55w$k5w
z*i!m+h1r?UJJe{X8R4VM=Xy>OcG7U;soHP|T%haST@OU^4r;Pdt>F~yHr#lCml`sq
zwR~t&dV%h<;BF(Zf>o{Bl;U0mMg!+GX$du&f?mB%zu;Ao@X6|G`XvhoV-fAMn<8Cn
j{cRC)Mp-gl%Ow8-+S^l4H1$X?00000NkvXXu0mjfhQnkh

diff --git a/src/assets/scss/modules/management/list-main.scss b/src/assets/scss/modules/management/list-main.scss
index 48187b012..28c4f4e57 100644
--- a/src/assets/scss/modules/management/list-main.scss
+++ b/src/assets/scss/modules/management/list-main.scss
@@ -7,12 +7,11 @@
   }
 
   .div_search {
-
     padding: 10px;
     // box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
     background-color: #f6f6f6;
     border: 1px solid #D3DCE6;
-    margin-top:18px;
+    margin:7px 7px;
 
     .div_search_btn{
       float:right;
@@ -45,6 +44,38 @@
     width: 151px;
   }
 
+  .div_table{
+    margin:15px 7px 7px;
+    // padding: 10px 20px;
+    position: relative;
+
+    .div_btn {
+      display: flex;
+      // margin-top: 10px;
+      justify-content: space-between;
+    
+      .div_btn_left{
+        display: flex;
+    
+        .btn_upload {
+          margin-left: 10px;
+          display: flex;
+        }
+      }
+    
+      .div_btn_right{
+        
+      }
+    
+     
+    }
+
+    .div_table_item {
+      margin-top: 10px;
+      position: relative;
+    }
+  }
+
    .item_width_2{
     width: 138px;
   }
@@ -66,41 +97,41 @@
   }
 }
 
-.div_table {
-  // background: #ffffff;
-  // box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
-  // border-radius: 4px;
-  margin-top: 15px;
-  // padding: 10px 20px;
-  position: relative;
+// .div_table {
+//   // background: #ffffff;
+//   // box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
+//   // border-radius: 4px;
+//   margin-top: 15px;
+//   // padding: 10px 20px;
+//   position: relative;
 
   
 
-  .div_btn {
-    margin-top: 10px;
-    // margin-left: 10px;
-    display: flex;
-
-    .btn_upload {
-      margin-left: 10px;
-      display: flex;
-    }
-  }
-  .table {
-    margin-top: 20px;
-
-    .img-voice{
-      width:30px;
-      height:30px;
-    }
-  }
-
-  .div_notice {
-    position: absolute;
-    left: 15px;
-    bottom: 0;
-  }
-}
+//   .div_btn {
+//     margin-top: 10px;
+//     // margin-left: 10px;
+//     display: flex;
+
+//     .btn_upload {
+//       margin-left: 10px;
+//       display: flex;
+//     }
+//   }
+//   .table {
+//     margin-top: 20px;
+
+//     .img-voice{
+//       width:30px;
+//       height:30px;
+//     }
+//   }
+
+//   .div_notice {
+//     position: absolute;
+//     left: 15px;
+//     bottom: 0;
+//   }
+// }
 
 .div-mult-form {
   margin-top: 20px;
diff --git a/src/assets/scss/modules/visual/communityManage.scss b/src/assets/scss/modules/visual/communityManage.scss
index 8c0e4a09f..d3d96abf3 100644
--- a/src/assets/scss/modules/visual/communityManage.scss
+++ b/src/assets/scss/modules/visual/communityManage.scss
@@ -1,8 +1,5 @@
 
-.div_table_item {
-  margin-top: 10px;
-  position: relative;
-}
+
 .div_del {
   position: absolute;
   left: 10px;
@@ -29,26 +26,7 @@
   }
 }
 
-.div_btn {
-  display: flex;
-  margin-top: 10px;
-  justify-content: space-between;
-
-  .div_btn_left{
-    display: flex;
 
-    .btn_upload {
-      margin-left: 10px;
-      display: flex;
-    }
-  }
-
-  .div_btn_right{
-    
-  }
-
- 
-}
 
 .el-row {
   /* margin-bottom: 20px; */
diff --git a/src/views/components/resiSearch copy.vue b/src/views/components/resiSearch copy.vue
new file mode 100644
index 000000000..0caa14e6c
--- /dev/null
+++ b/src/views/components/resiSearch copy.vue	
@@ -0,0 +1,813 @@
+<template>
+  <div class="resi-container">
+    <!-- <el-card class="resi-card"> -->
+      <el-row class="resi-row-box" :class="!isArrow && 'resi-row-more'">
+        <el-row v-if="showGrid" class="resi-row">
+          <el-col :span="6">
+            <div class="resi-cell">
+              <div class="resi-cell-label">所属组织</div>
+              <div class="resi-cell-value">
+                <el-cascader class="customer_cascader"
+                             ref="myCascader"
+                             v-model="agencyIdArray"
+                             :options="orgOptions"
+                             :props="orgOptionProps"
+                             :show-all-levels="false"
+                             @change="handleChangeAgency"></el-cascader>
+              </div>
+            </div>
+          </el-col>
+<!--          <el-col :span="6">
+            <div class="resi-cell">
+              <div class="resi-cell-label">所属网格</div>
+              <div class="resi-cell-value">
+                <el-select
+                  v-model.trim="form.GRID_ID"
+                  placeholder="请选择"
+                  size="small"
+                  clearable
+                  class="resi-cell-select"
+                  @change="handleChangeGrid"
+                >
+                  <el-option
+                    v-for="item in optionsG"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+              </div>
+            </div>
+          </el-col>-->
+          <el-col :span="18">
+            <div class="resi-cell">
+              <div class="resi-cell-label">所属房屋</div>
+              <div class="resi-cell-value">
+                <el-select
+                  v-model.trim="form.VILLAGE_ID"
+                  placeholder="请选择小区"
+                  size="small"
+                  filterable
+                  clearable
+                  class="resi-cell-select"
+                  @clear="handleClearVillage"
+                  @change="handleChangeV"
+                >
+                  <el-option
+                    v-for="item in optionsV"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+                <el-select
+                  v-model.trim="form.BUILD_ID"
+                  placeholder="楼号"
+                  size="small"
+                  filterable
+                  clearable
+                  style="width: 120px;"
+                  class="resi-cell-select"
+                  :disabled="changeVDisabled"
+                  @clear="handleClearBuild"
+                  @change="handleChangeB"
+                >
+                  <el-option
+                    v-for="item in optionsB"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+                <el-select
+                  v-model.trim="form.UNIT_ID"
+                  :disabled="changeBDisabled"
+                  placeholder="单元"
+                  size="small"
+                  filterable
+                  clearable
+                  style="width: 120px;"
+                  class="resi-cell-select"
+                  @click="handleClearDan"
+                  @change="handleChangeD"
+                >
+                  <el-option
+                    v-for="item in optionsD"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+                <el-select
+                  v-model.trim="form.HOME_ID"
+                  :disabled="changeDDisabled"
+                  placeholder="房号"
+                  size="small"
+                  filterable
+                  clearable
+                  style="width: 120px;"
+                  class="resi-cell-select"
+                >
+                  <el-option
+                    v-for="item in optionsH"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+              </div>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row
+          v-for="(item, index) in sliceList(itemList, 4)"
+          :key="index"
+          class="resi-row"
+        >
+          <el-col v-for="n in item" :key="n.id" :span="computdSpan(item.length)">
+            <div class="resi-cell">
+              <div class="resi-cell-label" :class="item.length != 4 && 'resi-cell-label1'">{{ n.label }}</div>
+              <div
+                class="resi-cell-value"
+                :class="n.itemType === 'radio' && 'resi-cell-value-radio'"
+              >
+                <el-input
+                  v-if="n.itemType === 'input' || n.itemType === 'textarea'"
+                  v-model.trim="form[n.columnName]"
+                  class="resi-cell-input"
+                  size="small"
+                  clearable
+                  placeholder="请输入内容"
+                >
+                </el-input>
+                <template v-else-if="n.itemType == 'inputRange'">
+                  <!-- <el-input
+                    v-model.trim="form[n.columnName]"
+                    class="resi-cell-input"
+                    size="small"
+                    clearable
+                    placeholder="请输入内容"
+                  /> -->
+                  <inputRange v-model="form[n.columnName]" :type="n.validType" @change="handleAgeChange" />
+                </template>
+                <template v-else-if="n.itemType === 'datepicker'">
+                  <el-date-picker
+                    v-if="n.queryType === 'daterange'"
+                    v-model.trim="form[n.columnName]"
+                    type="daterange"
+                    align="right"
+                    unlink-panels
+                    range-separator="至"
+                    start-placeholder="开始日期"
+                    end-placeholder="结束日期"
+                    class="resi-cell--daterange"
+                    size="small"
+                    format="yyyy-MM-dd"
+                    value-format="yyyy-MM-dd"
+                  >
+                  </el-date-picker>
+                  <el-date-picker
+                    v-else
+                    v-model.trim="form[n.columnName]"
+                    class="resi-cell-input"
+                    type="date"
+                    size="small"
+                    clearable
+                    format="yyyy-MM-dd"
+                    value-format="yyyy-MM-dd"
+                    placeholder="选择日期"
+                  >
+                  </el-date-picker>
+                </template>
+                <el-select
+                  v-else-if="n.itemType === 'select' || n.itemType === 'radio'"
+                  v-model.trim="form[n.columnName]"
+                  placeholder="请选择"
+                  size="small"
+                  clearable
+                  class="resi-cell-select"
+                  :collapse-tags="n.multiSelect == 1 ? true : false"
+                  :multiple="n.multiSelect == 1 ? true : false"
+                >
+                  <el-option
+                    v-for="item in n.options"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+                <el-cascader
+                  v-else-if="n.itemType === 'cascader'"
+                  v-model.trim="form[n.columnName]"
+                  :options="n.options"
+                  :props="{ checkStrictly: true }"
+                  clearable
+                  size="small"
+                  class="resi-cell-select"
+                >
+                </el-cascader>
+                <template v-else-if="n.itemType === 'checkbox'">
+                  <el-checkbox-group v-model="form[n.columnName]">
+                    <el-checkbox v-for="ns in n.options" :key="ns.value" :label="ns.value">{{ns.label}}</el-checkbox>
+                    <!-- <el-checkbox label="n.la"></el-checkbox> -->
+                  </el-checkbox-group>
+                </template>
+              </div>
+            </div>
+          </el-col>
+        </el-row>
+      </el-row>
+      <el-row v-if="isArrow" class="resi-search">
+        <!-- <el-col :span="20">
+          <el-button type="primary" size="mini">查询</el-button>
+        </el-col> -->
+        <el-col :span="24">
+          <el-button type="primary" size="small" @click="handleSearch">查询</el-button>
+          <el-button class="diy-button--reset" size="small" @click="resetForm">重置</el-button>
+        </el-col>
+      </el-row>
+      <!-- <div v-if="isArrow" class="resi-down" @click="handleOpenSearch">
+        <img v-if="openSearch" src="../../assets/img/arrow-up.png" />
+        <img v-else src="../../assets/img/arrow-down.png" />
+      </div> -->
+    <!-- </el-card> -->
+  </div>
+</template>
+
+<script>
+import inputRange from './rangeInput.vue'
+export default {
+  name: 'ResiSearch',
+  components: {
+    inputRange
+  },
+  props: {
+    formList: {
+      type: Array,
+      default: () => []
+    },
+    columnName: {
+      type: String,
+      default: ''
+    },
+    showGrid: {
+      type: Boolean,
+      default: false
+    },
+    isArrow: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    let initForm = (arr, columnName) => {
+      let _form = {}
+      // console.log('formInfo', obj)
+      // if (Object.keys(obj).length > 0) {
+      //   _form = { ...obj }
+      //   return _form
+      // }
+      arr.forEach((item) => {
+        if (item.itemType == 'checkbox') _form[item.columnName] = []
+        else if (item.queryType == 'resi_category' && columnName ){
+           _form[item.columnName] = [columnName]
+        } else if (columnName && columnName === item.columnName) _form[item.columnName] = '1'
+        else if (item.itemType == 'inputRange') _form[item.columnName] = { start: '', end: ''}
+        else _form[item.columnName] = ''
+      })
+      return _form
+    }
+    let itemList = this.formList.map(item => {
+      if (item.itemType == 'inputRange' && item.funType == 'agetoyear') {
+        item.columnName = 'age'
+      }
+      return {
+        ...item
+      }
+    })
+    let form = initForm(itemList, this.columnName)
+    let tempFormList = itemList.map(item => {
+
+      return {
+        ...item,
+        isChange:( item.queryType == 'resi_category' && this.columnName) || this.columnName === item.columnName ? true : false
+      }
+    })
+    let constForm = {
+      ...form,
+      GRID_ID: '',
+      VILLAGE_ID: '',
+      BUILD_ID: '',
+      UNIT_ID: '',
+      HOME_ID: ''
+    }
+    let orgOptionProps = {
+      multiple: false,
+      value: 'agencyId',
+      label: 'agencyName',
+      children: 'subAgencyList',
+      checkStrictly: true
+    }
+
+    return {
+      pageLoading: false,
+      openSearch: false,
+      optionsV: [],
+      optionsB: [],
+      optionsH: [],
+      optionsD: [],
+      optionsG: [],
+      orgOptions: [],
+      orgOptionProps,
+      agencyIdArray:[],
+      value: '',
+      itemList,
+      fixedList: [],
+      fixedForm: {
+        AGENCY_ID: '',
+        GRID_ID: '',
+        VILLAGE_ID: '',
+        BUILD_ID: '',
+        UNIT_ID: '',
+        HOME_ID: ''
+      },
+      constForm,
+      form: {
+        ...form,
+        AGENCY_ID: '',
+        GRID_ID: '',
+        VILLAGE_ID: '',
+        BUILD_ID: '',
+        UNIT_ID: '',
+        HOME_ID: ''
+      },
+      tempFormList,
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: '最近一周',
+            onClick(picker) {
+              const end = new Date()
+              const start = new Date()
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+              picker.$emit('pick', [start, end])
+            }
+          },
+          {
+            text: '最近一个月',
+            onClick(picker) {
+              const end = new Date()
+              const start = new Date()
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+              picker.$emit('pick', [start, end])
+            }
+          },
+          {
+            text: '最近三个月',
+            onClick(picker) {
+              const end = new Date()
+              const start = new Date()
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+              picker.$emit('pick', [start, end])
+            }
+          }
+        ]
+      },
+
+      queryType:{
+        'AGENCY_ID':'like'
+      }
+    }
+  },
+  computed: {
+    sliceList() {
+      return function (data, count) {
+        if (data !== undefined) {
+          let index = 0
+          let arrTemp = []
+          for (let i = 0; i < data.length; i++) {
+            index = parseInt(i / count)
+            if (arrTemp.length <= index) {
+              arrTemp.push([])
+            }
+            arrTemp[index].push(data[i])
+          }
+          return arrTemp
+        }
+      }
+    },
+    changeVDisabled () {
+      return !this.form.VILLAGE_ID
+    },
+    changeBDisabled () {
+      return !this.form.BUILD_ID
+    },
+    changeDDisabled () {
+      return !this.form.UNIT_ID
+    },
+  },
+  watch: {
+    form: {
+      handler(val, val2) {
+        // console.log('valpppp----', val, val2)
+        for (let n in val) {
+          if (this.constForm[n] !== val[n]) {
+            this.handleChangeForm(n)
+            console.log('nnnnnn', n)
+          }
+        }
+        this.constForm = { ...val }
+      },
+      deep: true
+    }
+  },
+  created () {
+    // this.initForm()
+    // console.log('formcccc---', this.form)
+    this.getOrgTreeList()
+    this.getGridList()
+    this.getValiheList()
+    if (this.columnName) this.handleChangeForm(this.columnName)
+  },
+  methods: {
+    initForm() {
+      this.formList.forEach((item) => {
+        this.$set(this.form, item.columnName, '')
+      })
+      console.log('formcccc---', this.form)
+    },
+    computdSpan(len) {
+      return len == 1 ? 24 : 6
+    },
+    handleClearVillage() {
+      this.form.BUILD_ID = ''
+      this.form.HOME_ID = ''
+    },
+    handleClearBuild() {
+      this.form.BUILD_ID = ''
+      this.form.UNIT_ID = ''
+      this.form.HOME_ID = ''
+    },
+    handleClearDan() {
+      this.form.UNIT_ID = ''
+      this.form.HOME_ID = ''
+    },
+    resetForm(formName) {
+      for(const n in this.form) {
+        if (n == 'age') {
+          this.form.age = {
+            start: '',
+            end: ''
+          }
+        } else if (typeof this.form[n] == 'object') this.form[n] = []
+        else this.form[n] = ''
+
+      }
+      this. agencyIdArray=[]
+      // let arr3 = [...arr1, ...arr]
+      this.$emit('search', [])
+      // this.handleSearch()
+      // this.orgOptions = [];
+    },
+    handleSearch() {
+      // console.log('formmmmm---', this.form)
+      const itemTypes = ['daterange', 'timerange', 'checkbox']
+      let a = this.tempFormList.filter(item => item.itemType != 'inputRange')
+      let arr = a.filter((n) => n.isChange).map((item) => {
+          return {
+            queryType: item.queryType,
+            tableName: item.tableName,
+            columnName: item.columnName,
+            // columnValue: []
+            columnValue: this.form[item.columnName] &&
+              (itemTypes.includes(item.queryType) ||
+              itemTypes.includes(item.itemType) || item.multiSelect == 1
+                ? this.form[item.columnName]
+                : [this.form[item.columnName].toString()])
+          }
+        })
+      const arr2 = arr.filter(item => item.columnValue.length > 0)
+      let arr1 = this.fixedList
+        .filter((n) => n.columnValue.length > 0)
+        .map((item) => {
+          return {
+            ...item
+          }
+        })
+      let arr3 = [...arr1, ...arr2]
+      this.$emit('search', arr3)
+      return arr3
+    },
+    handleOpenSearch() {
+      this.openSearch = !this.openSearch
+    },
+    handleAgeChange(val) {
+      console.log('val----age---', val)
+      if (val.end) {
+        const s = this.computedBirth(val.end)
+        const e = this.computedBirth(val.start)
+        this.form.BIRTHDAY = [s, e]
+      }
+    },
+    handleChangeAgency(val) {
+      let obj = this.$refs["myCascader"].getCheckedNodes()[0].data
+      if (obj) {
+        if(obj.level === 'grid'){
+          this.form.GRID_ID =  this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
+          this.form.AGENCY_ID=''
+        }else{
+          this.form.AGENCY_ID = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
+          this.form.GRID_ID = ''
+        }
+
+      }else{
+         this.form.AGENCY_ID=''
+         this.form.GRID_ID = ''
+      }
+
+      this.form.VILLAGE_ID = ''
+      this.form.BUILD_ID = ''
+      this.form.UNIT_ID = ''
+      this.form.HOME_ID = ''
+      this.getValiheList()
+    },
+    handleChangeGrid(val) {
+      console.log('val', val)
+      this.form.VILLAGE_ID = ''
+      this.form.BUILD_ID = ''
+      this.form.UNIT_ID = ''
+      this.form.HOME_ID = ''
+      this.getValiheList()
+    },
+    handleChangeV(val) {
+      console.log('val', val)
+      this.form.BUILD_ID = ''
+      this.form.UNIT_ID = ''
+      this.form.HOME_ID = ''
+      this.getBuildList()
+    },
+    handleChangeB(val) {
+      console.log('val', val)
+      this.form.UNIT_ID = ''
+      this.form.HOME_ID = ''
+      this.getUniList()
+    },
+    handleChangeD(val) {
+      console.log('val', val)
+      this.form.HOME_ID = ''
+      this.getHouseList()
+    },
+    // 监听基础form
+    handleChangeForm(val) {
+      for (let n in this.fixedForm) {
+
+        if (n === val) {
+          if (this.fixedList.length > 0) {
+            let _item = {}
+            let hasVal = false
+            this.fixedList.forEach((item, index) => {
+              if (item.columnName == val) {
+                hasVal = true
+                item.columnValue[0] = this.form[val]
+                if (!this.form[val]) this.fixedList.splice(index, 1)
+                console.log('fixedList----val', this.fixedList)
+              } else {
+                _item = {
+                  queryType: this.queryType[val]?this.queryType[val]:'equal',//'equal',
+                  tableName: 'ic_resi_user',
+                  columnName: val,
+                  columnValue: [this.form[val]]
+                }
+                console.log('fixedList----else', _item)
+                // this.$set(this.fixedList, index, _item)
+              }
+            })
+            if (Object.keys(_item).length > 0 && !hasVal) this.fixedList.push(_item)
+          } else {
+            this.$set(this.fixedList, 0, {
+              queryType: this.queryType[val]?this.queryType[val]:'equal',//'equal',
+              tableName: 'ic_resi_user',
+              columnName: val,
+              columnValue: [this.form[val]]
+            })
+          }
+        }
+      }
+      console.log('fixedList----999', this.fixedList)
+      this.tempFormList.forEach((item) => {
+        if (item.columnName === val) item.isChange = true
+      })
+    },
+    getOrgTreeList() {
+      const { user } = this.$store.state
+      this.$http
+          .post('/gov/org/customeragency/agencygridtree', {})
+          .then(({ data: res }) => {
+            if (res.code !== 0) {
+              return this.$message.error(res.msg)
+            } else {
+              console.log('获取组织树成功', res.data)
+              this.orgOptions=[]
+              this.orgOptions .push( res.data)
+            }
+          })
+          .catch(() => {
+            return this.$message.error('网络错误')
+          })
+    },
+    getGridList() {
+      const { user } = this.$store.state
+      this.$http
+        .post('/gov/org/customergrid/gridoption', { agencyId: user.agencyId, purpose: 'query' })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('获取查询详情成功', res.data)
+            this.optionsG = res.data
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+    getValiheList() {
+      const { user } = this.$store.state
+      this.$http
+        .post('/gov/org/icneighborhood/neighborhoodoption', {
+          gridId: this.form.GRID_ID,
+          agencyId: this.form.AGENCY_ID,
+          // agencyId: user.agencyId
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('获取查询详情成功', res.data)
+            this.optionsV = res.data
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+    getBuildList() {
+      this.$http
+        .post('/gov/org/icbuilding/buildingoption', {
+          neighborHoodId: this.form.VILLAGE_ID
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('获取查询详情成功', res.data)
+            this.optionsB = res.data
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+    getUniList() {
+      this.$http
+        .post('/gov/org/icbuildingunit/unitoption', {
+          buildingId: this.form.BUILD_ID
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('获取查询详情成功', res.data)
+            this.optionsD = res.data
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+    getHouseList() {
+      this.$http
+        .post('/gov/org/ichouse/houseoption', { unitId: this.form.UNIT_ID })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('获取查询详情成功', res.data)
+            this.optionsH = res.data
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+    computedBirth(age) {
+      let now = new Date();
+      let nowYear = now.getFullYear();
+      let nowMonth = now.getMonth()+1;
+      let nowDay = now.getDate(); // 按照减法原理，先day相减，不够向month借；然后month相减，不够向year借；最后year相减。
+      let subYear = nowYear - age
+      if(nowMonth < 10){
+        nowMonth = '0'+ nowMonth
+      }
+      if(nowDay < 10){
+        nowDay = '0' + nowDay
+      }
+      console.log(subYear+'-'+nowMonth+'-'+nowDay);
+      return subYear + '-' + nowMonth + '-' + nowDay
+    }
+  }
+}
+</script>
+
+<style lang="scss" scope>
+// .resi-container {
+//   position: relative;
+//   overflow: visible;
+// }
+// .resi-container .resi-card {
+//   position: relative;
+//   overflow: visible;
+// }
+.resi-down {
+  position: absolute;
+  left: 50%;
+  bottom: -10px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 46px;
+  height: 12px;
+  box-sizing: border-box;
+  margin-left: -23rpx;
+  cursor: pointer;
+  background: #ffffff;
+  border-radius: 0 0 10px 10px;
+  img {
+    display: block;
+  }
+}
+.resi-row-box {
+  height: 214px;
+  overflow: hidden;
+  transition: height 0.5s;
+}
+.resi-row-more {
+  height: max-content;
+  transition: height 0.5s;
+}
+.resi-row {
+  margin-bottom: 20px;
+}
+.resi-search {
+  // padding-right: 20px;
+  .el-col {
+    text-align: right;
+  }
+}
+.resi-container .resi-cell {
+  display: flex;
+  align-items: center;
+  .resi-cell-label {
+    flex-shrink: 0;
+    min-width: 70px;
+    box-sizing: border-box;
+    margin-right: 15px;
+    text-align: right;
+    // line-height: 32;
+  }
+  .resi-cell-label1 {
+    width: max-content;
+  }
+  .resi-cell-value-radio {
+    display: flex;
+    align-items: center;
+    min-height: 32px;
+  }
+  .resi-cell-input {
+    max-width: 200px;
+  }
+  .resi-cell--daterange {
+    max-width: 240px;
+  }
+  .resi-cell-select {
+    max-width: 200px;
+    box-sizing: border-box;
+    margin-right: 10px;
+    &-middle {
+      width: 130px;
+    }
+    &-small {
+      width: 88px;
+    }
+  }
+  .resi-cell-select:last-child {
+    margin-right: 0;
+  }
+}
+</style>
diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue
index 0caa14e6c..2e551e86c 100644
--- a/src/views/components/resiSearch.vue
+++ b/src/views/components/resiSearch.vue
@@ -1,251 +1,230 @@
 <template>
   <div class="resi-container">
     <!-- <el-card class="resi-card"> -->
-      <el-row class="resi-row-box" :class="!isArrow && 'resi-row-more'">
-        <el-row v-if="showGrid" class="resi-row">
-          <el-col :span="6">
-            <div class="resi-cell">
-              <div class="resi-cell-label">所属组织</div>
-              <div class="resi-cell-value">
-                <el-cascader class="customer_cascader"
-                             ref="myCascader"
-                             v-model="agencyIdArray"
-                             :options="orgOptions"
-                             :props="orgOptionProps"
-                             :show-all-levels="false"
-                             @change="handleChangeAgency"></el-cascader>
-              </div>
+    <el-row :class="!isArrow && 'resi-row-more'">
+      <el-row v-if="showGrid"
+              class="resi-row">
+        <el-col :span="6">
+          <div class="resi-cell">
+            <div class="resi-cell-label">所属组织</div>
+            <div class="resi-cell-value">
+              <el-cascader class="customer_cascader"
+                           ref="myCascader"
+                           v-model="agencyIdArray"
+                           :options="orgOptions"
+                           :props="orgOptionProps"
+                           :show-all-levels="false"
+                           @change="handleChangeAgency"></el-cascader>
             </div>
-          </el-col>
-<!--          <el-col :span="6">
-            <div class="resi-cell">
-              <div class="resi-cell-label">所属网格</div>
-              <div class="resi-cell-value">
-                <el-select
-                  v-model.trim="form.GRID_ID"
-                  placeholder="请选择"
-                  size="small"
-                  clearable
-                  class="resi-cell-select"
-                  @change="handleChangeGrid"
-                >
-                  <el-option
-                    v-for="item in optionsG"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
-                  </el-option>
-                </el-select>
-              </div>
-            </div>
-          </el-col>-->
-          <el-col :span="18">
-            <div class="resi-cell">
-              <div class="resi-cell-label">所属房屋</div>
-              <div class="resi-cell-value">
-                <el-select
-                  v-model.trim="form.VILLAGE_ID"
-                  placeholder="请选择小区"
-                  size="small"
-                  filterable
-                  clearable
-                  class="resi-cell-select"
-                  @clear="handleClearVillage"
-                  @change="handleChangeV"
-                >
-                  <el-option
-                    v-for="item in optionsV"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
-                  </el-option>
-                </el-select>
-                <el-select
-                  v-model.trim="form.BUILD_ID"
-                  placeholder="楼号"
-                  size="small"
-                  filterable
-                  clearable
-                  style="width: 120px;"
-                  class="resi-cell-select"
-                  :disabled="changeVDisabled"
-                  @clear="handleClearBuild"
-                  @change="handleChangeB"
-                >
-                  <el-option
-                    v-for="item in optionsB"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
-                  </el-option>
-                </el-select>
-                <el-select
-                  v-model.trim="form.UNIT_ID"
-                  :disabled="changeBDisabled"
-                  placeholder="单元"
-                  size="small"
-                  filterable
-                  clearable
-                  style="width: 120px;"
-                  class="resi-cell-select"
-                  @click="handleClearDan"
-                  @change="handleChangeD"
-                >
-                  <el-option
-                    v-for="item in optionsD"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
-                  </el-option>
-                </el-select>
-                <el-select
-                  v-model.trim="form.HOME_ID"
-                  :disabled="changeDDisabled"
-                  placeholder="房号"
-                  size="small"
-                  filterable
-                  clearable
-                  style="width: 120px;"
-                  class="resi-cell-select"
-                >
-                  <el-option
-                    v-for="item in optionsH"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
-                  </el-option>
-                </el-select>
-              </div>
+          </div>
+        </el-col>
+
+        <el-col :span="18">
+          <div class="resi-cell">
+            <div class="resi-cell-label">所属房屋</div>
+            <div class="resi-cell-value">
+              <el-select v-model.trim="form.VILLAGE_ID"
+                         placeholder="请选择小区"
+                         size="small"
+                         filterable
+                         clearable
+                         class="resi-cell-select"
+                         @clear="handleClearVillage"
+                         @change="handleChangeV">
+                <el-option v-for="item in optionsV"
+                           :key="item.value"
+                           :label="item.label"
+                           :value="item.value">
+                </el-option>
+              </el-select>
+              <el-select v-model.trim="form.BUILD_ID"
+                         placeholder="楼号"
+                         size="small"
+                         filterable
+                         clearable
+                         style="width: 120px;"
+                         class="resi-cell-select"
+                         :disabled="changeVDisabled"
+                         @clear="handleClearBuild"
+                         @change="handleChangeB">
+                <el-option v-for="item in optionsB"
+                           :key="item.value"
+                           :label="item.label"
+                           :value="item.value">
+                </el-option>
+              </el-select>
+              <el-select v-model.trim="form.UNIT_ID"
+                         :disabled="changeBDisabled"
+                         placeholder="单元"
+                         size="small"
+                         filterable
+                         clearable
+                         style="width: 120px;"
+                         class="resi-cell-select"
+                         @click="handleClearDan"
+                         @change="handleChangeD">
+                <el-option v-for="item in optionsD"
+                           :key="item.value"
+                           :label="item.label"
+                           :value="item.value">
+                </el-option>
+              </el-select>
+              <el-select v-model.trim="form.HOME_ID"
+                         :disabled="changeDDisabled"
+                         placeholder="房号"
+                         size="small"
+                         filterable
+                         clearable
+                         style="width: 120px;"
+                         class="resi-cell-select">
+                <el-option v-for="item in optionsH"
+                           :key="item.value"
+                           :label="item.label"
+                           :value="item.value">
+                </el-option>
+              </el-select>
             </div>
-          </el-col>
-        </el-row>
-        <el-row
-          v-for="(item, index) in sliceList(itemList, 4)"
-          :key="index"
-          class="resi-row"
-        >
-          <el-col v-for="n in item" :key="n.id" :span="computdSpan(item.length)">
-            <div class="resi-cell">
-              <div class="resi-cell-label" :class="item.length != 4 && 'resi-cell-label1'">{{ n.label }}</div>
-              <div
-                class="resi-cell-value"
-                :class="n.itemType === 'radio' && 'resi-cell-value-radio'"
-              >
-                <el-input
-                  v-if="n.itemType === 'input' || n.itemType === 'textarea'"
-                  v-model.trim="form[n.columnName]"
-                  class="resi-cell-input"
-                  size="small"
-                  clearable
-                  placeholder="请输入内容"
-                >
-                </el-input>
-                <template v-else-if="n.itemType == 'inputRange'">
-                  <!-- <el-input
+          </div>
+        </el-col>
+      </el-row>
+      <el-row v-for="(item, index) in sliceList(itemList, 4)"
+              :key="index"
+              class="resi-row">
+        <el-col v-for="n in item"
+                :key="n.id"
+                :span="computdSpan(item.length)">
+          <div class="resi-cell">
+            <div class="resi-cell-label"
+                 :class="item.length != 4 && 'resi-cell-label1'">{{ n.label }}</div>
+            <div class="resi-cell-value"
+                 :class="n.itemType === 'radio' && 'resi-cell-value-radio'">
+              <el-input v-if="n.itemType === 'input' || n.itemType === 'textarea'"
+                        v-model.trim="form[n.columnName]"
+                        class="resi-cell-input"
+                        size="small"
+                        clearable
+                        placeholder="请输入内容">
+              </el-input>
+              <template v-else-if="n.itemType == 'inputRange'">
+                <!-- <el-input
                     v-model.trim="form[n.columnName]"
                     class="resi-cell-input"
                     size="small"
                     clearable
                     placeholder="请输入内容"
                   /> -->
-                  <inputRange v-model="form[n.columnName]" :type="n.validType" @change="handleAgeChange" />
-                </template>
-                <template v-else-if="n.itemType === 'datepicker'">
-                  <el-date-picker
-                    v-if="n.queryType === 'daterange'"
-                    v-model.trim="form[n.columnName]"
-                    type="daterange"
-                    align="right"
-                    unlink-panels
-                    range-separator="至"
-                    start-placeholder="开始日期"
-                    end-placeholder="结束日期"
-                    class="resi-cell--daterange"
-                    size="small"
-                    format="yyyy-MM-dd"
-                    value-format="yyyy-MM-dd"
-                  >
-                  </el-date-picker>
-                  <el-date-picker
-                    v-else
-                    v-model.trim="form[n.columnName]"
-                    class="resi-cell-input"
-                    type="date"
-                    size="small"
-                    clearable
-                    format="yyyy-MM-dd"
-                    value-format="yyyy-MM-dd"
-                    placeholder="选择日期"
-                  >
-                  </el-date-picker>
-                </template>
-                <el-select
-                  v-else-if="n.itemType === 'select' || n.itemType === 'radio'"
-                  v-model.trim="form[n.columnName]"
-                  placeholder="请选择"
-                  size="small"
-                  clearable
-                  class="resi-cell-select"
-                  :collapse-tags="n.multiSelect == 1 ? true : false"
-                  :multiple="n.multiSelect == 1 ? true : false"
-                >
-                  <el-option
-                    v-for="item in n.options"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
-                  </el-option>
-                </el-select>
-                <el-cascader
-                  v-else-if="n.itemType === 'cascader'"
-                  v-model.trim="form[n.columnName]"
-                  :options="n.options"
-                  :props="{ checkStrictly: true }"
-                  clearable
-                  size="small"
-                  class="resi-cell-select"
-                >
-                </el-cascader>
-                <template v-else-if="n.itemType === 'checkbox'">
-                  <el-checkbox-group v-model="form[n.columnName]">
-                    <el-checkbox v-for="ns in n.options" :key="ns.value" :label="ns.value">{{ns.label}}</el-checkbox>
-                    <!-- <el-checkbox label="n.la"></el-checkbox> -->
-                  </el-checkbox-group>
-                </template>
-              </div>
+                <inputRange v-model="form[n.columnName]"
+                            :type="n.validType"
+                            @change="handleAgeChange" />
+              </template>
+              <template v-else-if="n.itemType === 'datepicker'">
+                <el-date-picker v-if="n.queryType === 'daterange'"
+                                v-model.trim="form[n.columnName]"
+                                type="daterange"
+                                align="right"
+                                unlink-panels
+                                range-separator="至"
+                                start-placeholder="开始日期"
+                                end-placeholder="结束日期"
+                                class="resi-cell--daterange"
+                                size="small"
+                                format="yyyy-MM-dd"
+                                value-format="yyyy-MM-dd">
+                </el-date-picker>
+                <el-date-picker v-else
+                                v-model.trim="form[n.columnName]"
+                                class="resi-cell-input"
+                                type="date"
+                                size="small"
+                                clearable
+                                format="yyyy-MM-dd"
+                                value-format="yyyy-MM-dd"
+                                placeholder="选择日期">
+                </el-date-picker>
+              </template>
+              <el-select v-else-if="n.itemType === 'select' || n.itemType === 'radio'"
+                         v-model.trim="form[n.columnName]"
+                         placeholder="请选择"
+                         size="small"
+                         clearable
+                         class="resi-cell-select"
+                         :collapse-tags="n.multiSelect == 1 ? true : false"
+                         :multiple="n.multiSelect == 1 ? true : false">
+                <el-option v-for="item in n.options"
+                           :key="item.value"
+                           :label="item.label"
+                           :value="item.value">
+                </el-option>
+              </el-select>
+              <el-cascader v-else-if="n.itemType === 'cascader'"
+                           v-model.trim="form[n.columnName]"
+                           :options="n.options"
+                           :props="{ checkStrictly: true }"
+                           clearable
+                           size="small"
+                           class="resi-cell-select">
+              </el-cascader>
+              <template v-else-if="n.itemType === 'checkbox'">
+                <el-checkbox-group v-model="form[n.columnName]">
+                  <el-checkbox v-for="ns in n.options"
+                               :key="ns.value"
+                               :label="ns.value">{{ns.label}}</el-checkbox>
+
+                </el-checkbox-group>
+              </template>
             </div>
-          </el-col>
-        </el-row>
-      </el-row>
-      <el-row v-if="isArrow" class="resi-search">
-        <!-- <el-col :span="20">
-          <el-button type="primary" size="mini">查询</el-button>
-        </el-col> -->
-        <el-col :span="24">
-          <el-button type="primary" size="small" @click="handleSearch">查询</el-button>
-          <el-button class="diy-button--reset" size="small" @click="resetForm">重置</el-button>
+          </div>
         </el-col>
       </el-row>
-      <!-- <div v-if="isArrow" class="resi-down" @click="handleOpenSearch">
-        <img v-if="openSearch" src="../../assets/img/arrow-up.png" />
-        <img v-else src="../../assets/img/arrow-down.png" />
-      </div> -->
-    <!-- </el-card> -->
+    </el-row>
+
+    <el-row v-if="showSmartSearchForm"
+            class="resi-row-more">
+      <el-col :span="24">
+
+        <el-button v-for="btnItem in btnList"
+                   :key="btnItem.index"
+                   size="small"
+                   :class="selBtnIndex===btnItem.index?'diy-button--blue':'diy-button--gray'"
+                   @click="handelSelSmartBtn(btnItem.index)">{{btnItem.name}}</el-button>
+
+      </el-col>
+      <el-col>
+        <smart-search-rule :ref="'ref_rule'+selBtnIndex"
+                           :formType="formType"
+                           :index="selBtnIndex"></smart-search-rule>
+      </el-col>
+    </el-row>
+
+    <el-row v-if="isArrow"
+            class="resi-search">
+
+      <el-col :span="24">
+        <el-button type="primary"
+                   size="small"
+                   class="diy-button--blue"
+                   @click="handleSearch">查询</el-button>
+        <el-button type="primary"
+                   size="small"
+                   class="diy-button--orange"
+                   @click="handleSmartSearch">智能查询</el-button>
+        <el-button style="margin-left:10px"
+                   size="small"
+                   class="diy-button--gray"
+                   @click="resetForm">重置</el-button>
+      </el-col>
+    </el-row>
+
   </div>
 </template>
 
 <script>
 import inputRange from './rangeInput.vue'
+import smartSearchRule from './smartSearchRule.vue'
 export default {
   name: 'ResiSearch',
   components: {
-    inputRange
+    inputRange, smartSearchRule
   },
   props: {
     formList: {
@@ -265,7 +244,7 @@ export default {
       default: false
     }
   },
-  data() {
+  data () {
     let initForm = (arr, columnName) => {
       let _form = {}
       // console.log('formInfo', obj)
@@ -275,10 +254,10 @@ export default {
       // }
       arr.forEach((item) => {
         if (item.itemType == 'checkbox') _form[item.columnName] = []
-        else if (item.queryType == 'resi_category' && columnName ){
-           _form[item.columnName] = [columnName]
+        else if (item.queryType == 'resi_category' && columnName) {
+          _form[item.columnName] = [columnName]
         } else if (columnName && columnName === item.columnName) _form[item.columnName] = '1'
-        else if (item.itemType == 'inputRange') _form[item.columnName] = { start: '', end: ''}
+        else if (item.itemType == 'inputRange') _form[item.columnName] = { start: '', end: '' }
         else _form[item.columnName] = ''
       })
       return _form
@@ -296,7 +275,7 @@ export default {
 
       return {
         ...item,
-        isChange:( item.queryType == 'resi_category' && this.columnName) || this.columnName === item.columnName ? true : false
+        isChange: (item.queryType == 'resi_category' && this.columnName) || this.columnName === item.columnName ? true : false
       }
     })
     let constForm = {
@@ -325,7 +304,7 @@ export default {
       optionsG: [],
       orgOptions: [],
       orgOptionProps,
-      agencyIdArray:[],
+      agencyIdArray: [],
       value: '',
       itemList,
       fixedList: [],
@@ -352,7 +331,7 @@ export default {
         shortcuts: [
           {
             text: '最近一周',
-            onClick(picker) {
+            onClick (picker) {
               const end = new Date()
               const start = new Date()
               start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
@@ -361,7 +340,7 @@ export default {
           },
           {
             text: '最近一个月',
-            onClick(picker) {
+            onClick (picker) {
               const end = new Date()
               const start = new Date()
               start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
@@ -370,7 +349,7 @@ export default {
           },
           {
             text: '最近三个月',
-            onClick(picker) {
+            onClick (picker) {
               const end = new Date()
               const start = new Date()
               start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
@@ -380,13 +359,32 @@ export default {
         ]
       },
 
-      queryType:{
-        'AGENCY_ID':'like'
-      }
+      queryType: {
+        'AGENCY_ID': 'like'
+      },
+
+      showSmartSearchForm: true,
+      formType: 'add',
+      selBtnIndex: 1,
+      btnList: [
+        {
+          name: '智能查询',
+          index: 1
+        },
+        {
+          name: '租户',
+          index: 2
+        },
+        {
+          name: '第一党支部党员',
+          index: 3
+        }
+      ]
+
     }
   },
   computed: {
-    sliceList() {
+    sliceList () {
       return function (data, count) {
         if (data !== undefined) {
           let index = 0
@@ -414,7 +412,7 @@ export default {
   },
   watch: {
     form: {
-      handler(val, val2) {
+      handler (val, val2) {
         // console.log('valpppp----', val, val2)
         for (let n in val) {
           if (this.constForm[n] !== val[n]) {
@@ -436,30 +434,39 @@ export default {
     if (this.columnName) this.handleChangeForm(this.columnName)
   },
   methods: {
-    initForm() {
+    handleSmartSearch () {
+      this.showSmartSearchForm = !this.showSmartSearchForm
+    },
+
+    handelSelSmartBtn (index) {
+
+      this.selBtnIndex = index
+    },
+
+    initForm () {
       this.formList.forEach((item) => {
         this.$set(this.form, item.columnName, '')
       })
       console.log('formcccc---', this.form)
     },
-    computdSpan(len) {
+    computdSpan (len) {
       return len == 1 ? 24 : 6
     },
-    handleClearVillage() {
+    handleClearVillage () {
       this.form.BUILD_ID = ''
       this.form.HOME_ID = ''
     },
-    handleClearBuild() {
+    handleClearBuild () {
       this.form.BUILD_ID = ''
       this.form.UNIT_ID = ''
       this.form.HOME_ID = ''
     },
-    handleClearDan() {
+    handleClearDan () {
       this.form.UNIT_ID = ''
       this.form.HOME_ID = ''
     },
-    resetForm(formName) {
-      for(const n in this.form) {
+    resetForm (formName) {
+      for (const n in this.form) {
         if (n == 'age') {
           this.form.age = {
             start: '',
@@ -469,29 +476,29 @@ export default {
         else this.form[n] = ''
 
       }
-      this. agencyIdArray=[]
+      this.agencyIdArray = []
       // let arr3 = [...arr1, ...arr]
       this.$emit('search', [])
       // this.handleSearch()
       // this.orgOptions = [];
     },
-    handleSearch() {
+    handleSearch () {
       // console.log('formmmmm---', this.form)
       const itemTypes = ['daterange', 'timerange', 'checkbox']
       let a = this.tempFormList.filter(item => item.itemType != 'inputRange')
       let arr = a.filter((n) => n.isChange).map((item) => {
-          return {
-            queryType: item.queryType,
-            tableName: item.tableName,
-            columnName: item.columnName,
-            // columnValue: []
-            columnValue: this.form[item.columnName] &&
-              (itemTypes.includes(item.queryType) ||
+        return {
+          queryType: item.queryType,
+          tableName: item.tableName,
+          columnName: item.columnName,
+          // columnValue: []
+          columnValue: this.form[item.columnName] &&
+            (itemTypes.includes(item.queryType) ||
               itemTypes.includes(item.itemType) || item.multiSelect == 1
-                ? this.form[item.columnName]
-                : [this.form[item.columnName].toString()])
-          }
-        })
+              ? this.form[item.columnName]
+              : [this.form[item.columnName].toString()])
+        }
+      })
       const arr2 = arr.filter(item => item.columnValue.length > 0)
       let arr1 = this.fixedList
         .filter((n) => n.columnValue.length > 0)
@@ -504,10 +511,10 @@ export default {
       this.$emit('search', arr3)
       return arr3
     },
-    handleOpenSearch() {
+    handleOpenSearch () {
       this.openSearch = !this.openSearch
     },
-    handleAgeChange(val) {
+    handleAgeChange (val) {
       console.log('val----age---', val)
       if (val.end) {
         const s = this.computedBirth(val.end)
@@ -515,20 +522,20 @@ export default {
         this.form.BIRTHDAY = [s, e]
       }
     },
-    handleChangeAgency(val) {
+    handleChangeAgency (val) {
       let obj = this.$refs["myCascader"].getCheckedNodes()[0].data
       if (obj) {
-        if(obj.level === 'grid'){
-          this.form.GRID_ID =  this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
-          this.form.AGENCY_ID=''
-        }else{
+        if (obj.level === 'grid') {
+          this.form.GRID_ID = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
+          this.form.AGENCY_ID = ''
+        } else {
           this.form.AGENCY_ID = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
           this.form.GRID_ID = ''
         }
 
-      }else{
-         this.form.AGENCY_ID=''
-         this.form.GRID_ID = ''
+      } else {
+        this.form.AGENCY_ID = ''
+        this.form.GRID_ID = ''
       }
 
       this.form.VILLAGE_ID = ''
@@ -537,7 +544,7 @@ export default {
       this.form.HOME_ID = ''
       this.getValiheList()
     },
-    handleChangeGrid(val) {
+    handleChangeGrid (val) {
       console.log('val', val)
       this.form.VILLAGE_ID = ''
       this.form.BUILD_ID = ''
@@ -545,26 +552,26 @@ export default {
       this.form.HOME_ID = ''
       this.getValiheList()
     },
-    handleChangeV(val) {
+    handleChangeV (val) {
       console.log('val', val)
       this.form.BUILD_ID = ''
       this.form.UNIT_ID = ''
       this.form.HOME_ID = ''
       this.getBuildList()
     },
-    handleChangeB(val) {
+    handleChangeB (val) {
       console.log('val', val)
       this.form.UNIT_ID = ''
       this.form.HOME_ID = ''
       this.getUniList()
     },
-    handleChangeD(val) {
+    handleChangeD (val) {
       console.log('val', val)
       this.form.HOME_ID = ''
       this.getHouseList()
     },
     // 监听基础form
-    handleChangeForm(val) {
+    handleChangeForm (val) {
       for (let n in this.fixedForm) {
 
         if (n === val) {
@@ -579,7 +586,7 @@ export default {
                 console.log('fixedList----val', this.fixedList)
               } else {
                 _item = {
-                  queryType: this.queryType[val]?this.queryType[val]:'equal',//'equal',
+                  queryType: this.queryType[val] ? this.queryType[val] : 'equal',//'equal',
                   tableName: 'ic_resi_user',
                   columnName: val,
                   columnValue: [this.form[val]]
@@ -591,7 +598,7 @@ export default {
             if (Object.keys(_item).length > 0 && !hasVal) this.fixedList.push(_item)
           } else {
             this.$set(this.fixedList, 0, {
-              queryType: this.queryType[val]?this.queryType[val]:'equal',//'equal',
+              queryType: this.queryType[val] ? this.queryType[val] : 'equal',//'equal',
               tableName: 'ic_resi_user',
               columnName: val,
               columnValue: [this.form[val]]
@@ -604,24 +611,24 @@ export default {
         if (item.columnName === val) item.isChange = true
       })
     },
-    getOrgTreeList() {
+    getOrgTreeList () {
       const { user } = this.$store.state
       this.$http
-          .post('/gov/org/customeragency/agencygridtree', {})
-          .then(({ data: res }) => {
-            if (res.code !== 0) {
-              return this.$message.error(res.msg)
-            } else {
-              console.log('获取组织树成功', res.data)
-              this.orgOptions=[]
-              this.orgOptions .push( res.data)
-            }
-          })
-          .catch(() => {
-            return this.$message.error('网络错误')
-          })
+        .post('/gov/org/customeragency/agencygridtree', {})
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('获取组织树成功', res.data)
+            this.orgOptions = []
+            this.orgOptions.push(res.data)
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
     },
-    getGridList() {
+    getGridList () {
       const { user } = this.$store.state
       this.$http
         .post('/gov/org/customergrid/gridoption', { agencyId: user.agencyId, purpose: 'query' })
@@ -637,7 +644,7 @@ export default {
           return this.$message.error('网络错误')
         })
     },
-    getValiheList() {
+    getValiheList () {
       const { user } = this.$store.state
       this.$http
         .post('/gov/org/icneighborhood/neighborhoodoption', {
@@ -657,7 +664,7 @@ export default {
           return this.$message.error('网络错误')
         })
     },
-    getBuildList() {
+    getBuildList () {
       this.$http
         .post('/gov/org/icbuilding/buildingoption', {
           neighborHoodId: this.form.VILLAGE_ID
@@ -674,7 +681,7 @@ export default {
           return this.$message.error('网络错误')
         })
     },
-    getUniList() {
+    getUniList () {
       this.$http
         .post('/gov/org/icbuildingunit/unitoption', {
           buildingId: this.form.BUILD_ID
@@ -691,7 +698,7 @@ export default {
           return this.$message.error('网络错误')
         })
     },
-    getHouseList() {
+    getHouseList () {
       this.$http
         .post('/gov/org/ichouse/houseoption', { unitId: this.form.UNIT_ID })
         .then(({ data: res }) => {
@@ -706,19 +713,19 @@ export default {
           return this.$message.error('网络错误')
         })
     },
-    computedBirth(age) {
+    computedBirth (age) {
       let now = new Date();
       let nowYear = now.getFullYear();
-      let nowMonth = now.getMonth()+1;
+      let nowMonth = now.getMonth() + 1;
       let nowDay = now.getDate(); // 按照减法原理，先day相减，不够向month借；然后month相减，不够向year借；最后year相减。
       let subYear = nowYear - age
-      if(nowMonth < 10){
-        nowMonth = '0'+ nowMonth
+      if (nowMonth < 10) {
+        nowMonth = '0' + nowMonth
       }
-      if(nowDay < 10){
+      if (nowDay < 10) {
         nowDay = '0' + nowDay
       }
-      console.log(subYear+'-'+nowMonth+'-'+nowDay);
+      console.log(subYear + '-' + nowMonth + '-' + nowDay);
       return subYear + '-' + nowMonth + '-' + nowDay
     }
   }
@@ -726,43 +733,17 @@ export default {
 </script>
 
 <style lang="scss" scope>
-// .resi-container {
-//   position: relative;
-//   overflow: visible;
-// }
-// .resi-container .resi-card {
-//   position: relative;
-//   overflow: visible;
-// }
-.resi-down {
-  position: absolute;
-  left: 50%;
-  bottom: -10px;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  width: 46px;
-  height: 12px;
-  box-sizing: border-box;
-  margin-left: -23rpx;
-  cursor: pointer;
-  background: #ffffff;
-  border-radius: 0 0 10px 10px;
-  img {
-    display: block;
-  }
-}
-.resi-row-box {
-  height: 214px;
-  overflow: hidden;
-  transition: height 0.5s;
-}
 .resi-row-more {
   height: max-content;
   transition: height 0.5s;
+  width: 100%;
+
+  border-top: 1px dotted #8b8b8b;
+  margin-top: 5px;
+  padding-top: 15px;
 }
 .resi-row {
-  margin-bottom: 20px;
+  margin-bottom: 14px;
 }
 .resi-search {
   // padding-right: 20px;
@@ -773,6 +754,7 @@ export default {
 .resi-container .resi-cell {
   display: flex;
   align-items: center;
+
   .resi-cell-label {
     flex-shrink: 0;
     min-width: 70px;
diff --git a/src/views/components/smartSearchRule.vue b/src/views/components/smartSearchRule.vue
new file mode 100644
index 000000000..bcfe0f034
--- /dev/null
+++ b/src/views/components/smartSearchRule.vue
@@ -0,0 +1,951 @@
+<template>
+  <div>
+    <!-- <div>
+      <el-checkbox v-model="personChecked"></el-checkbox>
+      <span @click="clickTab('person')"
+            :class="['tab-title',{'tab-title-sel':personSel}]">人员信息</span>
+      <el-checkbox v-model="houseChecked"></el-checkbox>
+      <span @click="clickTab('house')"
+            :class="['tab-title',{'tab-title-sel':houseSel}]">房屋信息</span>
+
+    </div> -->
+    <div class="m-main">
+      <div v-for="(ruleItem,ruleIndex) in smartRuleList"
+           :key="ruleIndex"
+           class="row-item">
+        <el-select class="item_width_1"
+                   v-model="selSmartType"
+                   size="mini"
+                   placeholder="请选择">
+          <el-option v-for="item in smartList1"
+                     @click.native="handleSelSmartType(item.value)"
+                     :key="item.value"
+                     :label="item.label"
+                     :value="item.value">
+          </el-option>
+        </el-select>
+      </div>
+
+      <div v-if="houseSel"
+           style="margin-top:10px">
+        <div v-for="(houseItem,houseIndex) in houseRuleList"
+             :key="houseIndex"
+             class="row-item">
+          <el-input class="item_width_1"
+                    size="mini"
+                    placeholder="请输入"
+                    :disabled="true"
+                    v-model="houseTitleName">
+          </el-input>
+          <el-select class="item_width_1"
+                     v-model="houseItem.colKey"
+                     size="mini"
+                     placeholder="请选择">
+            <el-option v-for="item in houseItemList"
+                       @click.native="handleSelHouseItem(houseIndex,item)"
+                       :key="item.colKey"
+                       :label="item.label"
+                       :value="item.colKey">
+            </el-option>
+          </el-select>
+          <el-select class="item_width_1"
+                     v-model="houseItem.queryType"
+                     size="mini"
+                     placeholder="请选择">
+            <el-option v-for="item in queryList"
+                       @click.native="handleSelHouseQuery(houseIndex,item)"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+          <div v-if="houseItem.queryType!=='is_null'&&houseItem.queryType!=='is_not_null'">
+
+            <el-select v-if="houseItem.colType==='select'||houseItem.colType==='radio'||houseItem.colType==='checkbox'"
+                       class="item_width_2"
+                       v-model="houseItem.colVal"
+                       size="mini"
+                       placeholder="请选择">
+              <el-option v-for="item in houseItem.colOption"
+                         @click.native="handleSelHouseValue(houseIndex,item)"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
+            <el-input-number v-else-if="houseItem.colType==='inputNum'"
+                             class="item_width_2"
+                             v-model="houseItem.colVal"
+                             :min="0"
+                             size="mini"
+                             label="请输入"></el-input-number>
+            <el-date-picker v-else-if="houseItem.colType==='datepicker'||houseItem.colType==='date'"
+                            v-model="houseItem.colVal"
+                            class="item_width_2"
+                            type="datetime"
+                            size="mini"
+                            value-format="yyyy-MM-dd HH:mm:ss"
+                            value="yyyy-MM-dd HH:mm:ss"
+                            placeholder="开始时间">
+            </el-date-picker>
+            <el-input v-else
+                      class="item_width_2"
+                      size="mini"
+                      placeholder="请输入"
+                      v-model="houseItem.colVal">
+            </el-input>
+          </div>
+
+          <el-select v-if="houseIndex<(houseRuleList.length-1)"
+                     class="item_width_1"
+                     v-model="houseItem.nextLogicalRel"
+                     size="mini"
+                     placeholder="请选择">
+            <el-option v-for="item in logicalList"
+                       @click.native="handleSelHouseLogical(houseIndex,item)"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+
+          <img v-if=" houseIndex<houseRuleList.length-1"
+               class="img_del"
+               src="@/assets/img/icon-del.png"
+               @click="delHouse(houseIndex)">
+          <img v-if=" houseIndex==houseRuleList.length-1"
+               class="img_del"
+               src="@/assets/img/icon-add.png"
+               @click="addHouse(houseIndex)">
+
+        </div>
+
+      </div>
+
+      <div v-if="personSel">
+        <div v-for="(personItem,personIndex) in resiRuleList"
+             :key="personIndex"
+             class="row-item">
+
+          <el-select class="item_width_1"
+                     v-model="personItem.itemGroupId"
+                     size="mini"
+                     placeholder="请选择">
+            <el-option v-for="item in groupList"
+                       @click.native="handleSelGroup(personIndex,item)"
+                       :key="item.id"
+                       :label="item.label"
+                       :value="item.id">
+            </el-option>
+          </el-select>
+          <el-select class="item_width_1"
+                     v-model="personItem.itemId"
+                     size="mini"
+                     placeholder="请选择">
+            <el-option v-for="item in personItem.itemList"
+                       @click.native="handleSelGroupItem(personIndex,item)"
+                       :key="item.itemId"
+                       :label="item.label"
+                       :value="item.itemId">
+            </el-option>
+          </el-select>
+          <el-select class="item_width_1"
+                     v-model="personItem.queryType"
+                     size="mini"
+                     placeholder="请选择">
+            <el-option v-for="item in queryList"
+                       @click.native="handleSelPersonQuery(personIndex,item)"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+          <div v-if="personItem.queryType!=='is_null'&&personItem.queryType!=='is_not_null'">
+
+            <el-select v-if="personItem.colType==='select'||personItem.colType==='radio'||personItem.colType==='checkbox'"
+                       class="item_width_2"
+                       v-model="personItem.colVal"
+                       size="mini"
+                       placeholder="请选择">
+              <el-option v-for="item in personItem.colOption"
+                         @click.native="handleSelPersonValue(personIndex,item)"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
+            <el-input-number v-else-if="personItem.colType==='inputNum'"
+                             class="item_width_2"
+                             v-model="personItem.colVal"
+                             :min="0"
+                             size="mini"
+                             label="请输入"></el-input-number>
+
+            <el-date-picker v-else-if="personItem.colType==='datepicker'||personItem.colType==='date'"
+                            v-model="personItem.colVal"
+                            class="item_width_2"
+                            type="datetime"
+                            value-format="yyyy-MM-dd HH:mm:ss"
+                            value="yyyy-MM-dd HH:mm:ss"
+                            placeholder="开始时间">
+            </el-date-picker>
+            <el-input v-else
+                      class="item_width_2"
+                      size="mini"
+                      placeholder="请输入"
+                      v-model="personItem.colVal">
+            </el-input>
+
+          </div>
+
+          <el-select v-if="personIndex<(resiRuleList.length-1)"
+                     class="item_width_1"
+                     v-model="personItem.nextLogicalRel"
+                     size="mini"
+                     placeholder="请选择">
+            <el-option v-for="item in logicalList"
+                       @click.native="handleSelPersonLogical(personIndex,item)"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+
+          <img v-if="personIndex<resiRuleList.length-1"
+               class="img_del"
+               src="@/assets/img/icon-del.png"
+               @click="delPerson(personIndex)">
+          <img v-if="personIndex==resiRuleList.length-1"
+               class="img_del"
+               src="@/assets/img/icon-add.png"
+               @click="addPerson(personIndex)">
+
+        </div>
+
+      </div>
+
+    </div>
+
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost } from '@/js/dai/request'
+
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+
+      personChecked: false,
+      houseChecked: false,
+
+      houseSel: true,
+      personSel: false,
+
+      selSmartType: 'fangwu',
+      smartList1: [
+        {
+          value: 'fangwu',
+          label: '房屋信息'
+        },
+        {
+          value: 'jumin',
+          label: '居民信息'
+        }
+      ],
+      groupList: [],
+      queryList: [],
+      logicalList: [
+        {
+          label: '并且',
+          value: 'and'
+        },
+        {
+          label: '或者',
+          value: 'or'
+        }
+      ],
+      houseItemList: [],//房屋信息第二列
+
+      resiRuleList: [
+        {
+          ruleDesc: '',//规则描述文字，例如：基础信息性别等于女	
+          nextLogicalRel: '',//与上一条的关系；and、or	
+          itemGroupId: '',
+          itemId: '',
+          queryType: '',
+          colTable: '',
+          colKey: '',
+          colVal: '',
+
+          itemList: [],
+          colType: '',//详细参数的组件类型
+          colOption: [],
+          itemGroupName: '',
+          itemLabel: '',
+          queryTypeName: '',
+          colValLabel: '',
+          nextLogicalRelName: '',
+        }
+      ],
+
+      houseRuleList: [
+        {
+          ruleDesc: '',
+          nextLogicalRel: '',//与上一条的关系；and、or	
+          queryType: '',
+          colTable: '',
+          colKey: '',
+          colVal: '',
+
+          titleName: '房屋信息',
+          colType: '',//详细参数的组件类型
+          colOption: [],
+          itemGroupName: '房屋信息',
+          itemLabel: '',
+          queryTypeName: '',
+          colValLabel: '',
+          nextLogicalRelName: '',
+        }
+      ],
+      houseTitleName: '房屋信息',
+
+      okflag: false,
+
+      showPersonList: false,
+      ruleList: {},
+
+      smartRuleList: [],
+
+    }
+  },
+
+  watch: {
+
+  },
+  components: {
+    // personListItem
+  },
+  async created () {
+    // this.startLoading()
+    await this.loadPersonGroup()
+    await this.loadHouseItem()
+    await this.loadDicOption()
+
+  },
+
+
+  methods: {
+    handleSelSmartType (value) {
+      if (value === '房屋') {
+        this.houseSel = true
+        this.personSel = false
+      } else {
+        this.houseSel = false
+        this.personSel = true
+      }
+    },
+    async setRule (resiRuleList, houseRuleList) {
+      // this.startLoading()
+      if (this.groupList.length == 0 || this.houseItemList.length === 0) {
+        setTimeout(() => {
+          this.setRule(resiRuleList, houseRuleList);
+        }, 500);
+        return false
+      }
+
+
+      this.resiRuleList = resiRuleList
+      if (this.resiRuleList && this.resiRuleList.length > 0) {
+        this.personChecked = true
+        for (let i = 0; i < this.resiRuleList.length; i++) {
+          let element = this.resiRuleList[i]
+
+          let selGroup = this.groupList.filter((item) =>
+            element.itemGroupId === item.id
+          );
+          console.log(selGroup)
+
+          if (selGroup.length > 0) {
+            await this.handleSelGroup(i, selGroup[0], true)
+
+
+            let selItem = element.itemList.filter((item) =>
+              element.itemId === item.itemId);
+            if (selItem.length > 0) {
+              await this.handleSelGroupItem(i, selItem[0], true)
+            }
+
+          }
+        }
+      }
+
+      this.houseRuleList = houseRuleList
+      if (this.houseRuleList && this.houseRuleList.length > 0) {
+        this.houseChecked = true
+        this.houseRuleList.forEach((element, index) => {
+
+          let selHouseItem = this.houseItemList.filter((item) =>
+            element.colKey === item.colKey
+          );
+
+          if (selHouseItem.length > 0) {
+            this.handleSelHouseItem(index, selHouseItem[0], true)
+          }
+
+        });
+      }
+
+    },
+
+    getRule () {
+      this.okflag = false
+
+      let messageObj = this.validateRule(this.personChecked, this.houseChecked)
+
+      // console.log('resiRuleList', this.resiRuleList)
+      // console.log('houseRuleList', this.houseRuleList)
+
+      if (messageObj) {
+        this.$message.error(messageObj)
+
+      } else {
+
+        if (this.resiRuleList.length > 0) {
+          this.resiRuleList[this.resiRuleList.length - 1].nextLogicalRel = ''
+        }
+
+        if (this.houseRuleList.length > 0) {
+          this.houseRuleList[this.houseRuleList.length - 1].nextLogicalRel = ''
+        }
+
+
+
+        this.okflag = true
+      }
+
+    },
+
+    validateRule (valPerson, valHouse) {
+
+      let message = ''
+      if (valPerson) {
+
+        this.resiRuleList.forEach((item, index) => {
+
+          if (item.itemGroupId === '' ||
+            item.itemId === '' ||
+            item.queryType === '' ||
+            item.colKey === ''
+          ) {
+            message = '匹配规则' + (this.index + 1) + '人员信息不完整，请填写完整！'
+            return message
+          }
+          if ((index != this.resiRuleList.length - 1) && item.nextLogicalRel === '') {
+            message = '匹配规则' + (this.index + 1) + '人员信息不完整，请填写完整！'
+            return message
+          }
+
+          if ((item.queryType !== 'is_null' && item.queryType !== 'is_not_null') && item.colVal === '') {
+            message = '匹配规则' + (this.index + 1) + '人员信息不完整，请填写完整！'
+            return message
+          }
+
+        });
+
+
+      }
+
+      if (valHouse) {
+
+        this.houseRuleList.forEach((item, index) => {
+
+          if (item.itemGroupId === '' ||
+            item.itemId === '' ||
+            item.queryType === '' ||
+            item.colKey === ''
+          ) {
+            message = '匹配规则' + (this.index + 1) + '房屋信息不完整，请填写完整！'
+            return message
+          }
+          if ((index != this.houseRuleList.length - 1) && item.nextLogicalRel === '') {
+            message = '匹配规则' + (this.index + 1) + '房屋信息不完整，请填写完整！'
+            return message
+          }
+
+          if ((item.queryType !== 'is_null' && item.queryType !== 'is_not_null') && item.colVal === '') {
+            message = '匹配规则' + (this.index + 1) + '房屋信息不完整，请填写完整！'
+            return message
+          }
+
+
+        });
+      }
+
+
+
+
+      return message
+    },
+
+    handlePreview () {
+      if (!this.personChecked && !this.houseChecked) {
+        this.$message.info('请勾选要预览的规则')
+        return false
+      }
+
+      this.getRule()
+      if (!this.okflag) {
+        return false
+      }
+      this.ruleList = {}
+      this.ruleList = {
+        resiRuleList: [],
+        houseRuleList: [],
+
+      }
+
+      if (this.personChecked) {
+        this.ruleList.resiRuleList = this.resiRuleList
+      }
+      if (this.houseChecked) {
+        this.ruleList.houseRuleList = this.houseRuleList
+      }
+
+
+      this.showPersonList = true
+    },
+
+    handleClose () {
+      this.showPersonList = false
+
+    },
+
+
+    //选择人员信息第一列下拉框
+    async handleSelGroup (personIndex, item, isSet) {
+      const url = '/oper/customize/icformitem/getItemListV2'
+      // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/isServiceProject/service/serviceScopeTree'
+      let params = {
+        policyFlag: '1',
+        groupId: item.id,
+
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+
+        let oneData = this.resiRuleList[personIndex]
+        oneData.itemGroupName = item.label
+        oneData.itemList = data
+        oneData.colTable = item.tableName
+
+        if (!isSet) {//如果是详情，赋值，不需要置空
+          oneData.nextLogicalRel = ''
+          oneData.itemId = ''
+          oneData.queryType = ''
+          oneData.colKey = ''
+          oneData.colVal = ''
+        }
+
+        this.$set(this.resiRuleList, personIndex, oneData)
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    //选择人员信息第二列下拉框
+    async handleSelGroupItem (personIndex, item, isSet) {
+
+      let oneData = this.resiRuleList[personIndex]
+
+      oneData.colKey = item.columnName
+      oneData.colType = item.itemType
+      oneData.itemLabel = item.label
+
+      if (!isSet) {//如果是详情，赋值，不需要置空
+        oneData.nextLogicalRel = ''
+        oneData.queryType = ''
+        oneData.colVal = ''
+      }
+
+      if (item.optionSourceType === 'remote') {
+        const url = item.optionSourceValue
+
+        let params = {}
+
+        const { data, code, msg } = await requestPost(url, params)
+
+        if (code === 0) {
+          oneData.colOption = data
+        } else {
+          this.$message.error(msg)
+        }
+      } else {
+        oneData.colOption = item.options
+      }
+
+
+      this.$set(this.resiRuleList, personIndex, oneData)
+
+    },
+
+    //选择人员信息第三列
+    handleSelPersonQuery (personIndex, item) {
+      let oneData = this.resiRuleList[personIndex]
+      oneData.queryTypeName = item.label
+
+      oneData.nextLogicalRel = ''
+      oneData.colVal = ''
+      oneData.colValLabel = ''
+
+      this.$set(this.resiRuleList, personIndex, oneData)
+    },
+    //选择人员信息第四列
+    handleSelPersonValue (personIndex, item) {
+      let oneData = this.resiRuleList[personIndex]
+
+      oneData.colValLabel = item.label
+      oneData.nextLogicalRel = ''
+
+      this.$set(this.resiRuleList, personIndex, oneData)
+    },
+    //选择人员信息第五列
+    handleSelPersonLogical (personIndex, item) {
+      let oneData = this.resiRuleList[personIndex]
+
+      oneData.nextLogicalRelName = item.label
+
+      this.$set(this.resiRuleList, personIndex, oneData)
+    },
+
+    //选择房屋信息第二列下拉框
+    async handleSelHouseItem (houseIndex, item, isSet) {
+
+      let oneData = this.houseRuleList[houseIndex]
+
+      oneData.colTable = item.tableName
+      oneData.colType = item.itemType
+      oneData.itemLabel = item.label
+
+      if (!isSet) {//如果是详情，赋值，不需要置空
+        oneData.nextLogicalRel = ''
+        oneData.queryType = ''
+        oneData.colVal = ''
+      }
+
+      if (item.optionSourceType === 'remote') {
+        const url = item.optionSourceUrl
+        let params = {}
+        if (item.optionSourceParam) {
+          params = JSON.parse(item.optionSourceParam)
+        } else {
+          params = {}
+        }
+
+        const { data, code, msg } = await requestPost(url, params)
+
+        if (code === 0) {
+          oneData.colOption = data
+        } else {
+          this.$message.error(msg)
+        }
+      } else {
+        oneData.colOption = []
+      }
+
+      this.$set(this.houseRuleList, houseIndex, oneData)
+
+    },
+
+    //选择房屋第三列
+    handleSelHouseQuery (houseIndex, item) {
+      let oneData = this.houseRuleList[houseIndex]
+      oneData.queryTypeName = item.label
+
+      oneData.nextLogicalRel = ''
+      oneData.colVal = ''
+      oneData.colValLabel = ''
+
+      this.$set(this.houseRuleList, houseIndex, oneData)
+    },
+    //选择房屋第四列
+    handleSelHouseValue (houseIndex, item) {
+      let oneData = this.houseRuleList[houseIndex]
+      oneData.colValLabel = item.label
+      oneData.nextLogicalRel = ''
+
+      this.$set(this.houseRuleList, houseIndex, oneData)
+    },
+    //选择房屋第五列
+    handleSelHouseLogical (houseIndex, item) {
+      let oneData = this.houseRuleList[houseIndex]
+      oneData.nextLogicalRelName = item.label
+
+      this.$set(this.houseRuleList, houseIndex, oneData)
+    },
+
+
+
+    clickTab (type) {
+      if (type === 'person') {
+        this.personSel = true
+        this.houseSel = false
+
+      }
+      if (type === 'house') {
+        this.personSel = false
+        this.houseSel = true
+
+      }
+
+    },
+
+    addRule () {
+      if (this.personSel) {
+        this.addPerson()
+      }
+
+      if (this.houseSel) {
+        this.addHouse()
+      }
+
+
+    },
+
+    addPerson () {
+
+      let obj = {
+        ruleDesc: '',//规则描述文字，例如：基础信息性别等于女	
+        nextLogicalRel: '',//与上一条的关系；and、or	
+        itemGroupId: '',
+        itemId: '',
+        queryType: '',
+        colTable: '',
+        colKey: '',
+        colVal: '',
+
+        itemList: [],
+        colType: '',//详细参数的组件类型
+        colOption: [],
+        itemGroupName: '',
+        itemLabel: '',
+        queryTypeName: '',
+        colValLabel: '',
+        nextLogicalRelName: '',
+      }
+
+      this.resiRuleList.push(obj)
+    },
+
+    delPerson (index) {
+      this.resiRuleList.splice(index, 1);
+    },
+
+    addHouse () {
+
+      let obj = {
+        ruleDesc: '',
+        nextLogicalRel: '',//与上一条的关系；and、or	
+        queryType: '',
+        colTable: '',
+        colKey: '',
+        colVal: '',
+
+        titleName: '房屋信息',
+        colType: '',//详细参数的组件类型
+        colOption: [],
+        itemGroupName: '房屋信息',
+        itemLabel: '',
+        queryTypeName: '',
+        colValLabel: '',
+        nextLogicalRelName: '',
+      }
+
+      this.houseRuleList.push(obj)
+    },
+
+    delHouse (index) {
+      this.houseRuleList.splice(index, 1);
+    },
+
+
+
+
+
+    // 获取人员信息---第一列
+    async loadPersonGroup () {
+      const url = '/oper/customize/icformitemgroup/list'
+      // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/isServiceProject/service/serviceScopeTree'
+      let params = {
+        formCode: 'resi_base_info',
+        policyFlag: '1'
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.groupList = data
+      } else {
+        this.$message.error(msg)
+      }
+
+
+    },
+    // 获取房屋信息--第二列
+    async loadHouseItem () {
+      const url = '/heart/policy/item-list/' + 'house'
+
+      let params = {}
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.houseItemList = data
+      } else {
+        this.$message.error(msg)
+      }
+
+
+    },
+
+    async loadDicOption () {
+      const url = '/sys/dict/data/dictlist'
+      // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/isServiceProject/service/serviceScopeTree'
+      let params = {
+        dictType: "sql_query_type"
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.queryList = data
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+
+
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+
+
+        serviceTimeStart: [
+          { required: true, message: '服务时间不能为空', trigger: 'blur' }
+        ],
+        serviceScope: [
+          { required: true, message: '服务范围不能为空', trigger: 'blur' }
+        ],
+
+      }
+    },
+    feedbackDataRule () {
+      return {
+
+
+        serviceGoal: [
+          { required: true, message: '服务目标不能为空', trigger: 'blur' }
+        ],
+
+        serviceEffect: [
+          { required: true, message: '服务效果不能为空', trigger: 'blur' }
+        ],
+        servicePeopleNumber: [
+          { required: true, message: '服务人数不能为空', trigger: 'blur' }
+        ],
+        serviceStatus: [
+          { required: true, message: '服务状态不能为空', trigger: 'blur' }
+        ],
+        satisfaction: [
+          { required: true, message: '满意度不能为空', trigger: 'blur' }
+        ],
+        address: [
+          { required: true, message: '地址不能为空', trigger: 'blur' }
+        ]
+      }
+    },
+
+  },
+  props: {
+
+    formType: {
+      type: String,
+      required: 'true'
+    },
+    index: {
+      type: Number,
+      default: 1
+    },
+
+  }
+}
+</script>
+
+
+<style lang="scss" scoped >
+.m-main {
+  display: flex;
+  margin-top: 15px;
+}
+
+.tab-title {
+  margin-right: 20px;
+  cursor: pointer;
+}
+
+.tab-title-sel {
+  color: #3e8ef7;
+  text-decoration: underline;
+}
+
+.row-item {
+  display: flex;
+  margin-bottom: 10px;
+}
+.item_width_1 {
+  width: 120px;
+  margin-right: 10px;
+}
+.item_width_2 {
+  width: 200px;
+  margin-right: 10px;
+}
+
+/deep/ .el-checkbox {
+  margin-right: 10px;
+}
+/deep/.el-checkbox:last-of-type {
+  margin-right: 10px;
+}
+
+.img_del {
+  width: 25px;
+  height: 25px;
+  margin-top: 3px;
+  cursor: pointer;
+}
+</style>
diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue
index aa0da356f..95584973d 100644
--- a/src/views/modules/base/community/community.vue
+++ b/src/views/modules/base/community/community.vue
@@ -197,7 +197,7 @@
         </el-form>
 
       </div>
-      <div class="div_table div_left_table">
+      <div class="div_table">
         <build-table v-if="selTreeObj.level==='neighborHood'&&!showRoomTable"
                      ref="ref_neighTable"
                      :staffAgencyId="staffAgencyId"
@@ -372,11 +372,11 @@ export default {
   computed: {
     rowHeight () {
 
-      return this.$store.state.inIframe ? this.clientHeight - 150 + this.iframeHeight + 'px' : this.clientHeight - 150 + 'px'
+      return this.$store.state.inIframe ? this.clientHeight - 160 + this.iframeHeight + 'px' : this.clientHeight - 160 + 'px'
 
     },
     treeHeight () {
-      return this.$store.state.inIframe ? this.clientHeight - 210 + this.iframeHeight + 'px' : this.clientHeight - 210 + 'px'
+      return this.$store.state.inIframe ? this.clientHeight - 215 + this.iframeHeight + 'px' : this.clientHeight - 215 + 'px'
 
     },
 
@@ -849,7 +849,7 @@ export default {
 }
 
 .div_tree {
-  margin: 15px;
+  margin: 7px 8px 7px 7px;
   /deep/ .el-scrollbar__wrap {
     overflow-x: hidden !important;
   }
@@ -875,14 +875,7 @@ export default {
 
 .div_left {
   // flex: 1;
-  width: calc(100% - 330px);
-}
-.div_left_table {
-  // margin-top: 10px;
-  // margin-left: 15px;
-  // background-color: #ffffff;
-  // border-radius: 5px;
-  // padding: 10px;
+  width: calc(100% - 300px);
 }
 </style>
 
diff --git a/src/views/modules/base/resi copy.vue b/src/views/modules/base/resi copy.vue
new file mode 100644
index 000000000..63d9fb32e
--- /dev/null
+++ b/src/views/modules/base/resi copy.vue	
@@ -0,0 +1,1543 @@
+<template>
+  <div class="resi-container">
+    <el-card class="resi-card">
+      <el-collapse v-if="openSearch"
+                   v-model="activeNames">
+        <el-collapse-item v-for="item in searchList"
+                          :key="item.itemGroupId"
+                          :name="item.itemGroupId">
+          <template slot="title">
+            <div class="collapse-title">{{ item.groupName }}</div>
+          </template>
+          <resi-search v-if="searchList.length > 0"
+                       :ref="'resiSearch' + item.itemGroupId"
+                       :form-list="item.queryItemList"
+                       :column-name="defaultCategotyKey"
+                       :show-grid="item.groupName == '基础信息'" />
+        </el-collapse-item>
+      </el-collapse>
+      <template v-else>
+        <resi-search v-if="searchList.length > 0"
+                     ref="resiSearch"
+                     :form-list="searchList[0].queryItemList"
+                     :column-name="defaultCategotyKey"
+                     :show-grid="true"
+                     :is-arrow="true"
+                     @search="handleSearch" />
+      </template>
+      <el-row v-if="openSearch"
+              class="resi-search">
+        <!-- <el-col :span="20">
+          <el-button type="primary" size="mini">查询</el-button>
+        </el-col> -->
+        <el-col :span="24">
+          <el-button type="primary"
+                     size="small"
+                     @click="handleSearchFrom">查询</el-button>
+          <el-button class="diy-button--reset"
+                     size="small"
+                     @click="resetSearchForm">重置</el-button>
+        </el-col>
+      </el-row>
+      <div class="resi-down"
+           @click="handleOpenSearch">
+        <img v-if="openSearch"
+             src="../../../assets/img/arrow-up.png" />
+        <img v-else
+             src="../../../assets/img/arrow-down.png" />
+      </div>
+    </el-card>
+    <el-card class="resi-card-table">
+      <div class="resi-row-btn">
+        <el-button v-if="btnAuths.ic_resi_add"
+                   size="small"
+                   class="diy-button--add"
+                   @click="handleAdd">新增</el-button>
+        <el-button v-if="btnAuths.ic_resi_import"
+                   class="diy-button--export"
+                   size="small"
+                   @click="handleExportModule('room')">下载模板</el-button>
+        <el-upload v-if="btnAuths.ic_resi_import"
+                   :headers="$getElUploadHeaders()"
+                   ref="upload"
+                   class="upload-demo"
+                   action="uploadUlr"
+                   :limit="1"
+                   :accept="'.xls,.xlsx'"
+                   :with-credentials="true"
+                   :show-file-list="false"
+                   :auto-upload="true"
+                   :on-progress="handleProgress"
+                   :on-success="handleExcelSuccess"
+                   :before-upload="beforeExcelUpload"
+                   :http-request="uploadHttpRequest">
+          <el-button size="small"
+                     class="diy-button--delete"
+                     :loading="importLoading">{{ importBtnTitle }}</el-button>
+        </el-upload>
+
+        <!-- <el-button size="small"
+                   class="diy-button--reset"
+                   :loading="exportBtn"
+                   @click="handleExport">{{exportBtnTitle}}</el-button> -->
+        <el-button v-if="btnAuths.ic_resi_export"
+                   class="diy-button--reset"
+                   size="small"
+                   @click="diyExport">导出</el-button>
+        <el-button v-if="btnAuths.ic_resi_batch_del"
+                   class="diy-button--add"
+                   size="small"
+                   @click="deleteBatch">批量删除</el-button>
+        <!-- <el-button type="primary" size="small">下载人口模板</el-button> -->
+
+        <el-button size="small"
+                   v-if="btnAuths.ic_resi_smart_import && displayedBaobiaoBtn"
+                   class="diy-button--add"
+                   @click="reportForm">智能填报</el-button>
+      </div>
+      <el-table ref="ref_table"
+                :data="tableData"
+                v-loading="tableLoading"
+                border
+                style="width: 100%"
+                class="resi-table"
+                :height="tableHeight"
+                @select-all="selectAll"
+                @selection-change="selectionChange">
+        <el-table-column type="selection"
+                         fixed="left"
+                         align="center"
+                         :selectable="checkSelect"
+                         width="55" />
+        <el-table-column label="序号"
+                         type="index"
+                         fixed="left"
+                         align="center"
+                         width="50">
+        </el-table-column>
+        <el-table-column v-for="item in tableHeader"
+                         :key="item.columnName"
+                         :prop="item.columnName"
+                         :label="item.label"
+                         align="center"
+                         :fixed="item.columnName == 'NAME' ? 'left' : false"
+                         :show-overflow-tooltip="true"
+                         :width="item.width || computedWidth(item.label, item.itemType)">
+          <!-- :width="item.itemType === 'radio' ? computedWidth(item.label) : 180" -->
+          <template slot-scope="scope">
+            <a v-if="item.columnName == 'NAME' && btnAuths.ic_resi_view"
+               class="name-a"
+               @click="handleLook(scope.row)">
+              {{ handleFilterSpan(scope.row, item) }}
+            </a>
+            <span v-else>{{ handleFilterSpan(scope.row, item) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column fixed="right"
+                         label="操作"
+                         align="center"
+                         width="150">
+          <template slot-scope="scope">
+            <!-- <el-button @click="handleLook(scope.row)"
+                       type="text"
+                       size="small"
+                       class="btn-color-look">查看</el-button> -->
+            <!-- <el-button @click="handleTransfer(scope.row)" 
+                       type="text"
+                       size="small"
+                       class="div-table-button--detail">变动</el-button> -->
+            <el-button v-if="btnAuths.ic_resi_change_rec"
+                       @click="handleChangeRecord(scope.row)"
+                       type="text"
+                       size="small"
+                       class="div-table-button--detail">变更记录</el-button>
+            <template v-if="filterEdit(scope.row.ORG_ID)">
+              <el-button v-if="btnAuths.ic_resi_update"
+                         @click="handleEdit(scope.row)"
+                         type="text"
+                         size="small"
+                         class="div-table-button--edit">修改</el-button>
+              <el-popconfirm v-if="btnAuths.ic_resi_del"
+                             title="删除之后无法回复，确认删除？"
+                             @onConfirm="handleDel(scope.row)">
+                <!-- <el-button slot="reference"
+                           type="text"
+                           size="small"
+                           class="btn-color-del">删除</el-button> -->
+              </el-popconfirm>
+            </template>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="div-flex">
+        <div class="div_del">
+          <!-- <el-checkbox :indeterminate="isIndeterminate"
+                       v-model="selAllFlag"
+                       :disabled="selAllFlagDisabled"
+                       @change="handleSelectAll">全选</el-checkbox>
+          <el-button v-if="selection.length > 0"
+                     style="margin-left:15px"
+                     type="danger"
+                     size="small"
+                     @click="deleteBatch">删除</el-button> -->
+        </div>
+        <div>
+          <el-pagination @size-change="handleSizeChange"
+                         @current-change="handleCurrentChange"
+                         :current-page.sync="currentPage"
+                         :page-sizes="[20, 50, 100, 200]"
+                         :page-size="pageSize"
+                         layout="sizes, prev, pager, next, total"
+                         :total="total">
+          </el-pagination>
+        </div>
+      </div>
+    </el-card>
+
+    <el-dialog :title="formName"
+               :visible.sync="dialogVisible"
+               width="80%"
+               top="5vh"
+               append-to-body
+               class="dialog-h"
+               :close-on-click-modal="false"
+               :before-close="handlerCancle">
+      <div class="dialog-h-content scroll-h">
+        <resi-form v-if="dialogVisible"
+                   ref="baseForm"
+                   :fixed="true"
+                   :form-list="formList"
+                   @changegroup="handleChangeGroup" />
+        <div v-if="dialogVisible"
+             class="resi-other">
+          <div class="resi-other-title">其他</div>
+          <div class="tabs-other-info">
+            <el-tabs v-model="activeName"
+                     @tab-click="handleClick">
+              <el-tab-pane v-for="item in tabsList"
+                           :key="item.groupId"
+                           :label="item.label"
+                           :name="'group' + item.groupId">
+                <resi-form :ref="'group' + item.groupId"
+                           :columns="3"
+                           :form-info="item.formInfo && item.formInfo"
+                           :support-add="item.supportAdd"
+                           :form-id="item.columnName"
+                           :form-list="item.itemList" />
+              </el-tab-pane>
+            </el-tabs>
+          </div>
+        </div>
+      </div>
+
+      <div class="resi-btns">
+        <el-button size="small"
+                   @click="handlerCancle">取消</el-button>
+        <el-button type="primary"
+                   size="small"
+                   :loading="btnLoading"
+                   @click="handleSUbmit">提交</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog :title="formName"
+               :visible.sync="dialogEditVisible"
+               width="80%"
+               append-to-body
+               class="dialog-h"
+               top="5vh"
+               :close-on-click-modal="false"
+               :before-close="handlerEditCancle">
+      <div class="dialog-h-content scroll-h">
+        <edit-resi v-if="dialogEditVisible"
+                   ref="baseForm"
+                   :disabled="disabled"
+                   :editUserId="editUserId"
+                   :form-info="editForm"
+                   :fixed="true"
+                   :form-list="formList"
+                   :agency-id="editAgencyId"
+                   @changegroup="handleChangeGroup" />
+        <div v-if="dialogEditVisible"
+             class="resi-other">
+          <div class="resi-other-title">其他</div>
+          <div class="tabs-other-info">
+            <el-tabs v-model="activeName"
+                     @tab-click="handleClick">
+              <el-tab-pane v-for="item in tabsList"
+                           :key="item.groupId"
+                           :label="item.label"
+                           :name="'group' + item.groupId">
+                <edit-resi :ref="'group' + item.groupId"
+                           :columns="3"
+                           :support-add="item.supportAdd"
+                           :form-id="item.columnName"
+                           :muti-list="item.mutiList"
+                           :form-list="item.itemList"
+                           :disabled="disabled"
+                           :label-width="'140px'"
+                           :agency-id="editAgencyId" />
+              </el-tab-pane>
+            </el-tabs>
+          </div>
+        </div>
+      </div>
+      <div class="resi-btns">
+        <el-button size="small"
+                   @click="handlerEditCancle">取消</el-button>
+        <el-button v-if="!disabled"
+                   type="primary"
+                   size="small"
+                   :loading="btnLoading"
+                   @click="handleEditSUbmit">提交</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 调动 -->
+    <el-dialog :visible.sync="tranferShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="'人员变动'"
+               width="950px"
+               top="5vh"
+               class="dialog-h"
+               @closed="diaClose">
+      <resi-transfer ref="ref_transfer"
+                     @dialogCancle="transferClose"></resi-transfer>
+    </el-dialog>
+
+    <!-- 变更记录 -->
+    <el-dialog :visible.sync="changeRecordShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="'变更记录'"
+               width="1150px"
+               top="5vh"
+               @closed="diaClose">
+      <resi-change-record ref="ref_changerecord"></resi-change-record>
+    </el-dialog>
+    <el-dialog :visible.sync="diyDialog"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               width="1150px"
+               top="5vh"
+               class="dialog-h">
+      <diy-info v-if="diyDialog"
+                ref="ref_diy"
+                :list="exportList"
+                :search="{
+          formCode: 'resi_base_info',
+          pageNo: currentPage,
+          pageSize: pageSize,
+          conditions: conditions,
+        }"
+                @close="handleDiyClose"></diy-info>
+    </el-dialog>
+    <people-more v-if="showedPeopleMoreInfo && lookInfo.userId"
+                 :view_real_data="btnAuths.ic_resi_view_real_data"
+                 :userId="lookInfo.userId"
+                 :gridName="lookInfo.gridName"
+                 @close="handleCancleLook" />
+    <baobiao ref="baobiao" />
+  </div>
+</template>
+
+<script>
+import nextTick from "dai-js/tools/nextTick";
+import resiSearch from "../../components/resiSearch.vue";
+import resiForm from "../../components/resiForm.vue";
+import editResi from "../../components/editResi.vue";
+import axios from "axios";
+import { mapGetters } from "vuex";
+import resiTransfer from "../../components/resiTransfer.vue";
+import resiChangeRecord from "../../components/resiChangeRecord.vue";
+import peopleMore from "@/views/modules/shequ/cpts/people-more";
+import baobiao from "@/views/modules/cpts/baobiao";
+import diyInfo from "./diyInfo.vue";
+import { requestPost } from "@/js/dai/request";
+
+export default {
+  components: {
+    baobiao,
+    resiSearch,
+    resiForm,
+    editResi,
+    resiTransfer,
+    resiChangeRecord,
+    peopleMore,
+    diyInfo,
+  },
+  data () {
+    return {
+      activeNames: [],
+      diyDialog: false,
+      openSearch: false,
+      exportBtn: false,
+      exportBtnTitle: "导出",
+      importBtnTitle: "导入",
+      importLoading: false,
+      rowVisible: false,
+      tableLoading: false,
+      btnLoading: false,
+      disabled: false,
+      pageLoading: false,
+      selAllFlag: false,
+      selAllFlagDisabled: false,
+      isIndeterminate: false,
+      dialogEditVisible: false,
+      dialogVisible: false,
+      // 显示人员详情
+      showedPeopleMoreInfo: false,
+      uploadUlr:
+        window.SITE_CONFIG["apiURL"] + "/epmetuser/icresiuser/importExcel",
+      currentPage: 1,
+      pageSize: 20,
+      total: null,
+      searchH: 0,
+      conditions: [],
+      activeName: "",
+      tableData: [],
+      searchList: [],
+      exportList: [],
+      editAgencyId: "",
+      editForm: {
+        GRID_ID: "",
+        VILLAGE_ID: "",
+        BUILD_ID: "",
+        HOME_ID: "",
+      },
+      editTableName: {},
+      formName: "",
+      formList: [],
+      tableHeader: [],
+      tabsList: [],
+      selection: [],
+
+      defaultCategotyKey: "",
+
+      tranferShow: false,
+      changeRecordShow: false,
+      lookInfo: {
+        userId: "",
+        gridName: "",
+      },
+      editUserId: '',
+
+      displayedBaobiaoBtn: false,
+
+      btnAuths: {
+        ic_resi_add: false, //新增
+        ic_resi_import: false, //导入
+        ic_resi_export: false, //导出
+        ic_resi_batch_del: false, //批量删除
+        ic_resi_smart_import: false, //智能填表
+        ic_resi_del: false, //删除
+        ic_resi_view: false, //查看
+        ic_resi_update: false, //修改
+        ic_resi_change_rec: false, //变更记录
+        ic_resi_view_real_data: false, //显示脱敏信息
+      },
+    };
+  },
+  props: {},
+  async activated () {
+    console.log("this.$route.query---", this.$route.query);
+    if (this.$route.query && this.$route.query.columnName) {
+      this.searchList = [];
+      let query = this.$route.query;
+      this.defaultCategotyKey = query.columnName;
+      console.log("defaultCategotyKey----", this.defaultCategotyKey);
+      await this.getSearchList();
+      this.$refs.resiSearch.handleSearch();
+    }
+  },
+  computed: {
+    ...mapGetters(["clientHeight", "iframeHeight"]),
+    tableHeight () {
+      const h = this.clientHeight - this.searchH - 310 + this.iframeHeight;
+      const _h = this.clientHeight - 310 - this.searchH;
+      return this.$store.state.inIframe ? h : _h;
+    },
+  },
+  async created () {
+    this.updateBtnAuths();
+
+    if (this.$route.query) {
+      let query = this.$route.query;
+      this.defaultCategotyKey = query.columnName;
+    }
+
+    await this.getSearchList();
+    // await this.getFormList()
+    await this.getTableHeader();
+    // console.log('this.$refs.resiSearch', this)
+    this.$refs.resiSearch.handleSearch();
+
+    // this.handleSearch()
+    // this.getTableData()
+    this.pageLoading = true;
+    this.searchH = this.$refs.resiSearch.$el.offsetHeight;
+    console.log("storeoooo----0000", this.$store);
+    console.log("resiSearch", this.$refs.resiSearch.$el.offsetHeight);
+  },
+  async mounted () {
+    // this.$nextTick(() => {
+    //   this.tableHeight = document.documentElement.clientHeight - this.$refs.resiSearch.$el.offsetHeight - 280 + 'px'
+    // })
+    console.log(
+      "document.documentElement.clientWidth",
+      document.documentElement.clientHeight
+    );
+    this.displayedBaobiaoBtn = await this.$refs.baobiao.existsTemplate({
+      elseParams: {
+        categoryKeys: ["resi_info"],
+        categoryKey: "resi_info",
+      },
+    });
+  },
+  methods: {
+    // 更新按钮权限
+    updateBtnAuths () {
+      let rot = this.$route;
+      if (Array.isArray(rot.meta.btns)) {
+        rot.meta.btns.forEach((item) => {
+          this.btnAuths[item.permissions] = true;
+        });
+      }
+    },
+    reportForm () {
+      this.$refs.baobiao.init({
+        elseParams: {
+          categoryKeys: ["resi_info"],
+          categoryKey: "resi_info",
+          paramMap: {
+            searchForm: {
+              formCode: "resi_base_info",
+              pageNo: this.currentPage,
+              pageSize: this.pageSize,
+              conditions: this.conditions,
+            },
+          },
+        },
+      });
+    },
+    checkSelect (row, index) {
+      return row.isChecked;
+    },
+    //调动
+    async handleTransfer (row) {
+      this.tranferShow = true;
+
+      await nextTick(200);
+
+      this.$refs.ref_transfer.initForm(row);
+    },
+    //变更记录
+    async handleChangeRecord (row) {
+      this.changeRecordShow = true;
+
+      await nextTick(200);
+
+      this.$refs.ref_changerecord.initForm(row);
+    },
+
+    diaClose () {
+      this.tranferShow = false;
+      this.changeRecordShow = false;
+    },
+
+    transferClose () {
+      this.tranferShow = false;
+      this.getTableData();
+    },
+    handleDiyClose () {
+      this.diyDialog = false;
+    },
+    handleOpenSearch () {
+      if (!this.openSearch) this.activeNames = [this.searchList[0].itemGroupId];
+      this.openSearch = !this.openSearch;
+    },
+    async diyExport () {
+      await this.getExportList();
+    },
+    computedWidth (label, type) {
+      let wd = "";
+      if (type == "input" || type == "select") wd = 40 * label.length;
+      else if (type == "radio") wd = 20 * label.length;
+      console.log("type-----wd", wd);
+      return wd > 80 ? wd : 80;
+    },
+    filterEdit (id) {
+      const { user } = this.$store.state;
+      return id === user.agencyId;
+    },
+    selectionChange (selection) {
+      this.selection = selection;
+
+      if (selection.length === this.tableData.length) {
+        this.selAllFlag = true;
+        this.isIndeterminate = false;
+      } else if (selection.length > 0) {
+        this.selAllFlag = false;
+        this.isIndeterminate = true;
+      } else {
+        this.selAllFlag = false;
+        this.isIndeterminate = false;
+      }
+    },
+    handleSelectAll (selectAllFlag) {
+      // if (this.tableData.length == 0) {
+      //   this.selAllFlag = false
+      //   return
+      // }
+      this.$refs.ref_table.clearSelection();
+      if (selectAllFlag) {
+        this.tableData.forEach((row) => {
+          // this.$refs.ref_table.toggleRowSelection(row);
+          if (row.isChecked) {
+            this.$refs.ref_table.toggleRowSelection(row);
+          }
+        });
+      }
+    },
+    selectAll (selection) {
+      this.selection = selection;
+
+      if (selection.length > 0) {
+        this.selAllFlag = true;
+      } else {
+        this.selAllFlag = false;
+      }
+    },
+    deleteBatch () {
+      if (this.selection.length > 0) {
+        this.$confirm("删除之后无法恢复，确认删除？", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            this.deleteresiBatch();
+          })
+          .catch((err) => {
+            if (err == "cancel") {
+              // this.$message({
+              //   type: "info",
+              //   message: "已取消删除"
+              // });
+            }
+          });
+      } else {
+        this.$message.warning("请先选择要删除的居民");
+      }
+    },
+    handleSizeChange (val) {
+      console.log(`每页 ${val} 条`);
+      this.pageSize = val;
+      this.getTableData();
+    },
+    handleCurrentChange (val) {
+      console.log(`当前页: ${val}`);
+      this.currentPage = val;
+      this.getTableData();
+    },
+    handleFilterSpan (row, item) {
+      let _val = "";
+      if (item.itemType === "radio" && item.options.length > 0) {
+        item.options.forEach((n) => {
+          if (n.value === row[item.columnName]) _val = n.label;
+        });
+        if (row[item.columnName] == "0") return (_val = "");
+      }
+
+      return _val || row[item.columnName];
+    },
+    handleSearchFrom () {
+      let arr = [];
+      this.searchList.forEach((item) => {
+        const arr1 =
+          this.$refs[`resiSearch${item.itemGroupId}`][0].handleSearch();
+        arr = arr.concat(arr1);
+        // console.log('search-----refs', this.$refs[`resiSearch${item.itemGroupId}`])
+      });
+      console.log("search-----refs", this.$refs);
+
+      console.log("search-----arr", arr);
+      this.currentPage = 1;
+      this.conditions = arr;
+      this.getTableData();
+    },
+    handleSearch (val) {
+      console.log("searchhh--", val);
+      this.currentPage = 1;
+      this.conditions = val;
+      this.getTableData();
+    },
+    resetSearchForm (formName) {
+      // for(const n in this.form) {
+      //   this.form[n] = ''
+      // }
+      // this.handleSearch()
+      this.searchList.forEach((item) => {
+        this.$refs[`resiSearch${item.itemGroupId}`][0].resetForm();
+        // console.log('search-----refs', this.$refs[`resiSearch${item.itemGroupId}`])
+      });
+      this.currentPage = 1;
+      this.conditions = [];
+      this.getTableData();
+    },
+    async handleExportModule () {
+      let url = "/epmetuser/icresiuser/import/download-template";
+
+      let params = {};
+      await this.$http({
+        method: "POST",
+        url,
+        responseType: "blob",
+        data: params,
+      })
+        .then((res) => {
+          console.log("res----dddd", res);
+          // this.download(res.data, title + '.xls')
+          if (res.headers["content-disposition"]) {
+            let fileName = window.decodeURI(
+              res.headers["content-disposition"].split(";")[1].split("=")[1]
+            );
+            console.log("filename", fileName);
+            let blob = new Blob([res.data], {
+              type: "application/vnd.ms-excel",
+            });
+            var url = window.URL.createObjectURL(blob);
+            var aLink = document.createElement("a");
+            aLink.style.display = "none";
+            aLink.href = url;
+            aLink.setAttribute("download", fileName);
+            document.body.appendChild(aLink);
+            aLink.click();
+            document.body.removeChild(aLink); //下载完成移除元素
+            window.URL.revokeObjectURL(url); //释放掉blob对象
+          } else this.$message.error("下载失败");
+        })
+        .catch((err) => {
+          console.log("err", err);
+          return this.$message.error("网络错误");
+        });
+    },
+    // 下载文件
+    download (data, fileName) {
+      console.log("data", data);
+      if (!data) {
+        return;
+      }
+
+      var csvData = new Blob([data]);
+
+      if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+        window.navigator.msSaveOrOpenBlob(csvData, fileName);
+      }
+      // for Non-IE (chrome, firefox etc.)
+      else {
+        var a = document.createElement("a");
+        document.body.appendChild(a);
+        a.style = "display: none";
+        var url = window.URL.createObjectURL(csvData);
+        a.href = url;
+        a.download = fileName;
+        a.click();
+        a.remove();
+        window.URL.revokeObjectURL(url);
+      }
+    },
+    async handleExport () {
+      this.exportBtn = true;
+      this.exportBtnTitle = "正在导出...";
+      let params = {
+        formCode: "resi_base_info",
+        conditions: this.conditions,
+      };
+
+      // .post('epmetuser/icresiuser/exportExcel', params)
+      await axios({
+        url: window.SITE_CONFIG["apiURL"] + "/epmetuser/icresiuser/exportExcel",
+        // url: 'epmetuser/icresiuser/exportExcel',
+        method: "post",
+        data: params,
+        responseType: "blob",
+      })
+        .then((res) => {
+          console.log("resllll", res);
+          let fileName = window.decodeURI(
+            res.headers["content-disposition"].split(";")[1].split("=")[1]
+          );
+          console.log("filename", fileName);
+          let blob = new Blob([res.data], { type: "application/vnd.ms-excel" });
+          var url = window.URL.createObjectURL(blob);
+          var aLink = document.createElement("a");
+          aLink.style.display = "none";
+          aLink.href = url;
+          aLink.setAttribute("download", fileName);
+          document.body.appendChild(aLink);
+          aLink.click();
+          document.body.removeChild(aLink); //下载完成移除元素
+          window.URL.revokeObjectURL(url); //释放掉blob对象
+        })
+        .catch((err) => {
+          console.log("获取导出情失败", err);
+          this.$message.error("获取导出失败");
+        });
+      this.exportBtnTitle = "导出";
+      this.exportBtn = false;
+    },
+    // 上传大图标成功
+    handleExcelSuccess (res, file) {
+      if (res.code === 0 && res.msg === "success") {
+        console.log("resss---ppp", res);
+      } else {
+        this.$message.error(res.msg);
+      }
+    },
+    handleProgress (event, file, fileList) {
+      console.log("percentage", file.percentage);
+    },
+
+    beforeExcelUpload (file) {
+      console.log("file", file);
+      const isType = file.type === "application/vnd.ms-excel";
+      const isTypeComputer =
+        file.type ===
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
+      const fileType = isType || isTypeComputer;
+      const isLt1M = file.size / 1024 / 1024 < 100;
+      if (!fileType) {
+        this.$message.error("上传文件只能是xls/xlsx格式！");
+      }
+
+      if (!isLt1M) {
+        this.$message.error("上传文件大小不能超过 100MB!");
+      }
+      return fileType && isLt1M;
+    },
+    async uploadHttpRequest (file) {
+      this.importLoading = true;
+      this.importBtnTitle = "正在上传中...";
+      this.$message({
+        showClose: true,
+        message: "导入中，请到系统管理-导入记录中查看进度",
+        duration: 0,
+      });
+      const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
+      formData.append("file", file.file); //添加文件对象
+      await this.$http
+        .post("/epmetuser/icresiuser/importExcel", formData)
+        .then((res) => {
+          console.log("res-up", res);
+          if (res.data.code == 0 && res.data.msg == "success") {
+            // this.$message.success('导入成功')
+            this.getTableData();
+          } else this.$message.error(res.data.msg);
+        })
+        .catch((err) => {
+          console.log("失败", err);
+          file.onError(); //上传失败的文件会从文件列表中删除
+          // this.$message.error('导入失败')
+        });
+      // await axios({
+      //   url: window.SITE_CONFIG['apiURL'] + '/epmetuser/icresiuser/importExcel',
+      //   method: 'post',
+      //   data: formData,
+      //   timeout: '300000',
+      //   responseType: 'blob'
+      // })
+      //   .then((res) => {
+      //     console.log('res-up', res)
+      //     // if (res.headers["content-disposition"]) {
+      //     //   let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
+      //     //   console.log('filename', fileName)
+      //     //   let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
+      //     //   var url = window.URL.createObjectURL(blob)
+      //     //   var aLink = document.createElement('a')
+      //     //   aLink.style.display = 'none'
+      //     //   aLink.href = url
+      //     //   aLink.setAttribute('download', fileName)
+      //     //   document.body.appendChild(aLink)
+      //     //   aLink.click()
+      //     //   document.body.removeChild(aLink) //下载完成移除元素
+      //     //   window.URL.revokeObjectURL(url) //释放掉blob对象
+      //     // }
+
+      //     this.getTableData()
+      //   })
+      //   .catch(err => {
+      //     console.log('失败', err)
+      //     file.onError() //上传失败的文件会从文件列表中删除
+      //     this.$message.error('导入失败')
+      //   })
+      this.importLoading = false;
+      this.importBtnTitle = "导入";
+      this.$refs.upload.clearFiles();
+    },
+    handleClick (tab, event) {
+      console.log(tab, event);
+    },
+    async handleLook (row) {
+      this.lookInfo.userId = row.icResiUserId;
+      this.lookInfo.gridName = row.GRID_ID;
+      this.showedPeopleMoreInfo = true;
+      // this.disabled = true
+      // this.editAgencyId = row.ORG_ID
+      // await this.getFormList('edit')
+      // this.getrowInfo(row.icResiUserId)
+    },
+    handleCancleLook () {
+      this.lookInfo.userId = "";
+      this.lookInfo.gridName = "";
+      this.showedPeopleMoreInfo = false;
+    },
+    async handleEdit (row) {
+      this.disabled = false;
+      this.editAgencyId = row.ORG_ID;
+      this.editUserId = row.icResiUserId
+      await this.getFormList("edit");
+      await this.getrowInfo(row.icResiUserId);
+    },
+    async handleAdd () {
+      await this.getFormList();
+      this.dialogVisible = true;
+    },
+    async handleChangeGroup (val) {
+      console.log("changeguoprrrrr----", val);
+      let { childGroup, value, partyInfo } = val;
+
+      let hasT = false;
+      let i = 0;
+      let list = [...this.tabsList];
+      list.forEach((item, index) => {
+        if (item.tableName === childGroup.tableName) {
+          hasT = true;
+          i = index;
+        }
+      });
+      if (value === 1 || value === "1") {
+        // console.log('changegroup----999', value)
+        if (!hasT) {
+          childGroup.itemList.forEach(async (item) => {
+            if (item.optionSourceType === "remote") {
+              await this.getOptionsList(item.optionSourceValue).then((res) => {
+                item.options = this.getTreeData(res);
+              });
+              // console.log('')
+            }
+          });
+          if (
+            partyInfo &&
+            partyInfo.length > 0 &&
+            childGroup.tableName == "ic_party_member"
+          ) {
+            list.push({ ...childGroup, formInfo: partyInfo[0] });
+          } else list.push(childGroup);
+        }
+      } else {
+        // console.log('changegroup----000', value)
+        if (hasT) list.splice(i, 1);
+      }
+      this.tabsList = [...list];
+    },
+    formetForm () {
+      const _baseForm = this.$refs.baseForm.handleForm();
+      let arr = [];
+      if (_baseForm.length === 0) return false;
+      arr.push([..._baseForm]);
+      this.tabsList.forEach((item) => {
+        arr.push([...this.$refs["group" + item.groupId][0].handleForm()]);
+      });
+      let arr2 = arr.reduce(function (a, b) {
+        return a.concat(b);
+      });
+      let noChange = true;
+      arr2.forEach((item) => {
+        if (item.list.length !== 0) noChange = false;
+      });
+      console.log("arr2", arr2);
+      if (noChange) {
+        this.$message.warning("您还没有做任何修改");
+        return false;
+      }
+      // 合并相同tableName的多个数组
+      let hash = {};
+      let i = 0;
+      let res = [];
+      let finalArr = [];
+      arr2.forEach(function (item) {
+        let name = item.tableName;
+        if (hash[name]) {
+          res[hash[name] - 1].list.push(...item.list);
+        } else {
+          hash[name] = ++i;
+          res.push({
+            list: [...item.list],
+            supportAdd: item.supportAdd,
+            tableName: name,
+          });
+        }
+      });
+      console.log("res", res);
+      // 多个list合并成一个list子集
+      res.forEach((item) => {
+        let _form = {};
+        item.list.length > 0 &&
+          item.list.forEach((n) => {
+            _form = { ..._form, ...n };
+          });
+        if (item.list.length > 0) {
+          finalArr.push({
+            tableName: item.tableName,
+            list: item.supportAdd ? [...item.list] : [{ ..._form }],
+          });
+        }
+      });
+      console.log("finalArr", finalArr);
+      return finalArr;
+    },
+    async handleEditSUbmit () {
+      const arr = await this.formetForm();
+      if (arr) this.submitEdit(arr);
+    },
+    async handleSUbmit () {
+      const arr = await this.formetForm();
+      if (arr) this.submitAdd(arr);
+    },
+    handleDel (row) {
+      let params = {
+        formCode: "resi_base_info",
+        userIds: [row.icResiUserId],
+      };
+      console.log("row1", row);
+      this.$http
+        .post("/epmetuser/icresiuser/delete", params)
+        .then(({ data: res }) => {
+          console.log("row2", row);
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            console.log("row3", row);
+            this.$message.success("删除成功");
+            this.getTableData();
+          }
+        })
+        .catch((err) => {
+          console.log("row4", err);
+          return this.$message.error("网络错误");
+        });
+    },
+    handleFormatUrl (url) {
+      return url.includes("?");
+    },
+    handlerEditCancle () {
+      this.$refs.baseForm.resetForm();
+      this.tabsList.forEach((item) => {
+        this.$refs["group" + item.groupId][0].resetForm();
+      });
+      this.dialogEditVisible = false;
+    },
+    handlerCancle () {
+      this.$refs.baseForm.resetForm();
+      this.tabsList.forEach((item) => {
+        this.$refs["group" + item.groupId][0].resetForm();
+      });
+      this.dialogVisible = false;
+    },
+    async submitAdd (arr) {
+      this.btnLoading = true;
+      await this.$http
+        .post("/epmetuser/icresiuser/add", arr)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            this.$message.success("提交成功");
+            // this.$refs[formName].resetFields();
+            this.$refs.baseForm.resetForm();
+            this.tabsList.forEach((item) => {
+              this.$refs["group" + item.groupId][0].resetForm();
+            });
+            this.getTableData();
+            this.dialogVisible = false;
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        });
+      this.btnLoading = false;
+    },
+    async submitEdit (arr) {
+      this.btnLoading = true;
+      await this.$http
+        .post("/epmetuser/icresiuser/edit", arr)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            this.$message.success("提交成功");
+            // this.$refs[formName].resetFields();
+            this.$refs.baseForm.resetForm();
+            this.tabsList.forEach((item) => {
+              this.$refs["group" + item.groupId][0].resetForm();
+            });
+            this.getTableData();
+            this.dialogEditVisible = false;
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        });
+      this.btnLoading = false;
+    },
+    async getTableHeader () {
+      await this.$http
+        .post("/oper/customize/icform/tableheaders", {
+          formCode: "resi_base_info",
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            this.tableHeader = res.data;
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        });
+    },
+    async getTableData () {
+      this.tableLoading = true;
+      let params = {
+        formCode: "resi_base_info",
+        pageNo: this.currentPage,
+        pageSize: this.pageSize,
+        conditions: this.conditions,
+      };
+      await this.$http
+        .post("/epmetuser/icresiuser/listresi", params)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            this.tableData = res.data.list.map((item) => {
+              return {
+                ...item,
+                isChecked: this.filterEdit(item.ORG_ID),
+              };
+            });
+            let _selAllFlagDisabled = true;
+            this.tableData.forEach((item) => {
+              if (item.isChecked) _selAllFlagDisabled = false;
+            });
+            this.selAllFlagDisabled = _selAllFlagDisabled;
+            this.total = res.data.total;
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        });
+      this.tableLoading = false;
+    },
+    getrowInfo (id) {
+      let params = {
+        formCode: "resi_base_info",
+        icResiUserId: id,
+      };
+      this.$http
+        .post("/epmetuser/icresiuser/detail", params)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            // console.log('getrowInfo----', res.data)
+            let info = res.data;
+            this.editTableName = { ...info };
+            let list = info[this.formList[0].tableName][0];
+            for (let n in list) {
+              this.editForm[n] = list[n];
+            }
+            this.formList.forEach((item) => {
+              item.columnValue = list[item.columnName];
+              item.ID = list.ID;
+
+              if (
+                item.columnValue == "1" &&
+                item.itemType === "radio" &&
+                item.childGroup
+              ) {
+                this.tabsList.push(item.childGroup);
+              }
+
+              // if (item.childGroup && info[item.childGroup.tableName]) {
+
+              // }
+            });
+            this.tabsList.forEach((item) => {
+              let _info = info[item.tableName];
+              if (item.supportAdd) {
+                // console.log('tabsList---333', item.label)
+                const _list = [...item.itemList];
+                let mutiList = [];
+                if (_info) {
+                  _info.forEach((fo, index) => {
+                    // console.log('mutiList----555' + index, mutiList, _list)
+                    mutiList.splice(index, 0, {
+                      row: index,
+                      itemList: _list.map((m) => {
+                        // console.log('itemList---item' + index, m)
+                        return {
+                          ...m,
+                          ID: fo.ID,
+                          columnValue: fo[m.columnName],
+                        };
+                      }),
+                    });
+                    // console.log('mutiList----666' + index, mutiList)
+                  });
+                }
+                item.mutiList = mutiList;
+              } else {
+                if (_info) {
+                  item.itemList.forEach((n) => {
+                    n.ID = _info[0].ID;
+                    n.columnValue = _info[0][n.columnName];
+                  });
+                }
+              }
+            });
+            // console.log('getrowInfo---formname', this.tabsList)
+            this.dialogEditVisible = true;
+          }
+        })
+        .catch((err) => {
+          console.log("getrowInfo---formnameerr", err);
+          return this.$message.error("网络错误");
+        });
+    },
+    async getOptionsList (url) {
+      let options = [];
+      // console.log('getOptionsList----', url)
+      await this.$http
+        .post(url, { formCode: "resi_base_info" })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            options = res.data;
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        });
+      return options;
+    },
+    async getSearchList () {
+      //  /oper/customize/icform/conditionlist
+      await this.$http
+        .post("/oper/customize/icform/conditionlist-bygroup", {
+          formCode: "resi_base_info",
+          dynamic: true,
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            console.log("获取查询详情成功--sss", res);
+
+            res.data.forEach((item) => {
+              item.queryItemList.forEach((n) => {
+                if (n.optionSourceType === "remote") {
+                  this.getOptionsList(n.optionSourceValue).then((res) => {
+                    n.options = this.getTreeData(res);
+                  });
+                  // console.log('')
+                } else if (n.itemType == "radio" && n.options.length == 0) {
+                  n.options = [
+                    {
+                      label: "是",
+                      value: "1",
+                    },
+                    {
+                      label: "否",
+                      value: "0",
+                    },
+                  ];
+                }
+              });
+            });
+            this.searchList = res.data;
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        });
+    },
+    getTreeData (data) {
+      if (!Array.isArray(data)) return [];
+      let arr = data.map((item) => {
+        let _item = {};
+        if (item.children) {
+          if (item.children.length === 0)
+            _item = { ...item, children: undefined };
+          else _item = { ...item, children: this.getTreeData(item.children) };
+        } else {
+          _item = { ...item };
+        }
+        return _item;
+      });
+      return arr;
+    },
+    async getFormList (type) {
+      await this.$http
+        .post("/oper/customize/icform/getcustomerform", {
+          formCode: "resi_base_info",
+          dynamic: true,
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            console.log("获取详情成功getFormList");
+            let { itemList, groupList, formName } = res.data;
+            this.formName = formName;
+            this.activeName = "group" + res.data.groupList[0].groupId;
+            if (type !== "edit") {
+              itemList.forEach(async (item) => {
+                if (item.optionSourceType === "remote") {
+                  await this.getOptionsList(item.optionSourceValue).then(
+                    (res) => {
+                      item.options = this.getTreeData(res);
+                    }
+                  );
+                }
+              });
+            }
+            groupList.forEach((item) => {
+              item.itemList.forEach(async (n) => {
+                n.tableName = item.tableName;
+                if (n.optionSourceType === "remote" && type !== "edit") {
+                  await this.getOptionsList(n.optionSourceValue).then((res) => {
+                    n.options = this.getTreeData(res);
+                  });
+                }
+              });
+            });
+            // }
+            this.formList = itemList;
+            this.tabsList = groupList;
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        });
+    },
+    async getExportList (type) {
+      const url = "/oper/customize//icformitemgroup/list";
+      let params = {
+        formCode: "resi_base_info",
+      };
+
+      const { data, code, msg } = await requestPost(url, params);
+
+      if (code === 0) {
+        data.forEach((item) => {
+          (async (id) => {
+            // item.queryItemList = await this.getExportChildList(id)
+            item.queryItemList = [];
+          })(item.id);
+        });
+        this.exportList = [...data];
+        this.$nextTick(() => {
+          this.diyDialog = true;
+        });
+        console.log("获取详情成功getExportList----", this.exportList);
+      } else {
+        this.$message.error(msg);
+      }
+    },
+    async getExportChildList (groupId) {
+      const url = `/oper/customize/icformitem/getItemList/${groupId}`;
+      let params = {};
+
+      const { data, code, msg } = await requestPost(url, params);
+
+      if (code === 0) {
+        return data;
+      } else {
+        this.$message.error(msg);
+      }
+    },
+    async deleteresiBatch () {
+      if (this.selection.length === 0)
+        return this.$message.error("请选择之后进行操作");
+      let userIds = this.selection.map((item) => item.icResiUserId);
+      let params = {
+        formCode: "resi_base_info",
+        userIds,
+      };
+      this.$http
+        .post("/epmetuser/icresiuser/delete", params)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            this.$message.success("删除成功");
+            this.getTableData();
+          }
+        })
+        .catch((err) => {
+          console.log("row4", err);
+          return this.$message.error("网络错误");
+        });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.tabs-other-info {
+  ::v-deep .el-tabs__item {
+    // width: 50px;
+    height: 24px;
+    box-sizing: border-box;
+    margin-right: 7px;
+    padding: 0 10px !important;
+    font-size: 16px;
+    font-weight: 400;
+    color: #666666;
+    line-height: 24px;
+    background: #ebecf1;
+    border-radius: 2px;
+  }
+  ::v-deep .el-tabs__nav-wrap::after,
+  ::v-deep .el-tabs__active-bar {
+    display: none;
+  }
+  ::v-deep .el-tabs__nav-next,
+  ::v-deep .el-tabs__nav-prev {
+    // width: 12px;
+    // height: 12px;
+    color: rgba(30, 122, 254, 1);
+    line-height: 20px;
+    background: rgba(30, 122, 254, 0.2);
+    // border-radius: 50%;
+  }
+  ::v-deep .el-tabs__item.is-active {
+    color: #fff;
+    background: linear-gradient(90deg, #1a5afd, #26c4ff);
+  }
+}
+.resi-container .resi-card {
+  position: relative;
+  overflow: visible;
+}
+.resi-container .resi-card-table {
+  ::v-deep .el-table th {
+    color: #fff;
+    background-color: rgba(33, 149, 254, 1);
+    // border-right: 1px solid rgba(33, 149, 254, 1);
+  }
+}
+.collapse-title {
+  font-weight: bold;
+}
+.resi-table {
+  ::v-deep .el-button--text {
+    text-decoration: underline;
+  }
+  ::v-deep .btn-color-del {
+    margin-left: 10px;
+    color: rgba(213, 16, 16, 1);
+  }
+  ::v-deep .btn-color-edit {
+    color: rgba(0, 167, 169, 1);
+  }
+}
+.resi-search {
+  // padding-right: 20px;
+  margin-top: 10px;
+  .el-col {
+    text-align: right;
+  }
+}
+.resi-down {
+  position: absolute;
+  left: 50%;
+  bottom: -10px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 46px;
+  height: 12px;
+  box-sizing: border-box;
+  margin-left: -23rpx;
+  cursor: pointer;
+  background: #ffffff;
+  border-radius: 0 0 10px 10px;
+  img {
+    display: block;
+  }
+}
+</style>
+
+<style lang="scss" scoped>
+.resi-card-table {
+  margin-top: 20px;
+}
+.resi-row-btn {
+  display: flex;
+  margin-bottom: 13px;
+  .el-button {
+    margin-left: 10px;
+    border: 0;
+  }
+  // .el-button--success {
+  //   background: rgba(34, 193, 195, 1);
+  // }
+  // .el-button--warning {
+  //   background: rgba(254, 179, 73, 1);
+  // }
+  // .el-button--danger {
+  //   background: rgba(254, 98, 82, 1);
+  // }
+}
+.resi-other {
+  width: 100%;
+  display: flex;
+  .resi-other-title {
+    flex-shrink: 0;
+    // display: inline-block;
+    width: 100px;
+    box-sizing: border-box;
+    margin-bottom: 10px;
+    // padding: 6px 12px 0 0;
+    font-size: 16px;
+    font-weight: 500;
+    color: #333;
+    text-align: center;
+  }
+  .tabs-other-info {
+    // display: inline-block;
+    // flex: 1;
+    // padding-left: 60px;
+    width: calc(100% - 100px);
+  }
+}
+
+.resi-btns {
+  margin-top: 20px;
+  text-align: center;
+}
+.div-flex {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  width: 100%;
+  .div_del {
+    margin-top: 15px;
+  }
+}
+</style>
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 63d9fb32e..746c75374 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -1,7 +1,7 @@
 <template>
-  <div class="resi-container">
-    <el-card class="resi-card">
-      <el-collapse v-if="openSearch"
+  <div class="div_main">
+    <div class="div_search">
+      <!-- <el-collapse v-if="openSearch"
                    v-model="activeNames">
         <el-collapse-item v-for="item in searchList"
                           :key="item.itemGroupId"
@@ -15,92 +15,98 @@
                        :column-name="defaultCategotyKey"
                        :show-grid="item.groupName == '基础信息'" />
         </el-collapse-item>
-      </el-collapse>
-      <template v-else>
-        <resi-search v-if="searchList.length > 0"
-                     ref="resiSearch"
-                     :form-list="searchList[0].queryItemList"
-                     :column-name="defaultCategotyKey"
-                     :show-grid="true"
-                     :is-arrow="true"
-                     @search="handleSearch" />
-      </template>
-      <el-row v-if="openSearch"
+      </el-collapse> -->
+      <!-- <template v-else> -->
+      <resi-search v-if="searchList.length > 0"
+                   ref="resiSearch"
+                   :form-list="searchList[0].queryItemList"
+                   :column-name="defaultCategotyKey"
+                   :show-grid="true"
+                   :is-arrow="true"
+                   @search="handleSearch" />
+      <!-- </template> -->
+      <!-- <el-row v-if="openSearch"
               class="resi-search">
-        <!-- <el-col :span="20">
-          <el-button type="primary" size="mini">查询</el-button>
-        </el-col> -->
+       
         <el-col :span="24">
-          <el-button type="primary"
-                     size="small"
+          <el-button size="small"
+                     class="diy-button--blue"
                      @click="handleSearchFrom">查询</el-button>
-          <el-button class="diy-button--reset"
+          <el-button style="margin-left:10px"
                      size="small"
+                     class="diy-button--gray"
                      @click="resetSearchForm">重置</el-button>
         </el-col>
-      </el-row>
-      <div class="resi-down"
+      </el-row> -->
+      <!-- <div class="resi-down"
            @click="handleOpenSearch">
         <img v-if="openSearch"
              src="../../../assets/img/arrow-up.png" />
         <img v-else
              src="../../../assets/img/arrow-down.png" />
-      </div>
-    </el-card>
-    <el-card class="resi-card-table">
-      <div class="resi-row-btn">
-        <el-button v-if="btnAuths.ic_resi_add"
-                   size="small"
-                   class="diy-button--add"
-                   @click="handleAdd">新增</el-button>
-        <el-button v-if="btnAuths.ic_resi_import"
-                   class="diy-button--export"
-                   size="small"
-                   @click="handleExportModule('room')">下载模板</el-button>
-        <el-upload v-if="btnAuths.ic_resi_import"
-                   :headers="$getElUploadHeaders()"
-                   ref="upload"
-                   class="upload-demo"
-                   action="uploadUlr"
-                   :limit="1"
-                   :accept="'.xls,.xlsx'"
-                   :with-credentials="true"
-                   :show-file-list="false"
-                   :auto-upload="true"
-                   :on-progress="handleProgress"
-                   :on-success="handleExcelSuccess"
-                   :before-upload="beforeExcelUpload"
-                   :http-request="uploadHttpRequest">
-          <el-button size="small"
-                     class="diy-button--delete"
-                     :loading="importLoading">{{ importBtnTitle }}</el-button>
-        </el-upload>
+      </div> -->
+    </div>
 
-        <!-- <el-button size="small"
-                   class="diy-button--reset"
-                   :loading="exportBtn"
-                   @click="handleExport">{{exportBtnTitle}}</el-button> -->
-        <el-button v-if="btnAuths.ic_resi_export"
-                   class="diy-button--reset"
-                   size="small"
-                   @click="diyExport">导出</el-button>
-        <el-button v-if="btnAuths.ic_resi_batch_del"
-                   class="diy-button--add"
-                   size="small"
-                   @click="deleteBatch">批量删除</el-button>
-        <!-- <el-button type="primary" size="small">下载人口模板</el-button> -->
+    <div class="div_table">
+      <div class="div_btn">
+        <div class="div_btn_left">
+          <el-button v-if="btnAuths.ic_resi_add"
+                     size="small"
+                     class="diy-button--purple"
+                     @click="handleAdd">新增</el-button>
+          <el-button v-if="btnAuths.ic_resi_export"
+                     style="margin-left:10px"
+                     class="diy-button--green"
+                     size="small"
+                     @click="diyExport">导出</el-button>
 
-        <el-button size="small"
-                   v-if="btnAuths.ic_resi_smart_import && displayedBaobiaoBtn"
-                   class="diy-button--add"
-                   @click="reportForm">智能填报</el-button>
+          <el-button v-if="btnAuths.ic_resi_import"
+                     style="margin-left:10px"
+                     class="diy-button--blue"
+                     size="small"
+                     @click="handleExportModule('room')">下载模板</el-button>
+          <el-upload v-if="btnAuths.ic_resi_import"
+                     :headers="$getElUploadHeaders()"
+                     ref="upload"
+                     class="upload-demo"
+                     action="uploadUlr"
+                     :limit="1"
+                     :accept="'.xls,.xlsx'"
+                     :with-credentials="true"
+                     :show-file-list="false"
+                     :auto-upload="true"
+                     :on-progress="handleProgress"
+                     :on-success="handleExcelSuccess"
+                     :before-upload="beforeExcelUpload"
+                     :http-request="uploadHttpRequest">
+            <el-button style="margin-left:10px"
+                       class="diy-button--yellow"
+                       size="small"
+                       :loading="importLoading">{{ importBtnTitle }}</el-button>
+          </el-upload>
+
+          <el-button style="margin-left:10px"
+                     v-if="btnAuths.ic_resi_batch_del"
+                     class="diy-button--red"
+                     size="small"
+                     @click="deleteBatch">批量删除</el-button>
+          <!-- <el-button type="primary" size="small">下载人口模板</el-button> -->
+
+          <el-button v-if="btnAuths.ic_resi_smart_import && displayedBaobiaoBtn"
+                     style="margin-left:10px"
+                     class="diy-button--orange"
+                     size="small"
+                     @click="reportForm">智能填报</el-button>
+        </div>
       </div>
+
       <el-table ref="ref_table"
+                class="div_table_item"
                 :data="tableData"
                 v-loading="tableLoading"
                 border
+                :header-cell-style="tableHeaderStyle"
                 style="width: 100%"
-                class="resi-table"
                 :height="tableHeight"
                 @select-all="selectAll"
                 @selection-change="selectionChange">
@@ -149,14 +155,14 @@
             <el-button v-if="btnAuths.ic_resi_change_rec"
                        @click="handleChangeRecord(scope.row)"
                        type="text"
-                       size="small"
-                       class="div-table-button--detail">变更记录</el-button>
+                       class="div-table-button--orange"
+                       size="small">变更记录</el-button>
             <template v-if="filterEdit(scope.row.ORG_ID)">
               <el-button v-if="btnAuths.ic_resi_update"
                          @click="handleEdit(scope.row)"
                          type="text"
-                         size="small"
-                         class="div-table-button--edit">修改</el-button>
+                         class="div-table-button--blue"
+                         size="small">修改</el-button>
               <el-popconfirm v-if="btnAuths.ic_resi_del"
                              title="删除之后无法回复，确认删除？"
                              @onConfirm="handleDel(scope.row)">
@@ -192,7 +198,7 @@
           </el-pagination>
         </div>
       </div>
-    </el-card>
+    </div>
 
     <el-dialog :title="formName"
                :visible.sync="dialogVisible"
@@ -454,8 +460,8 @@ export default {
   computed: {
     ...mapGetters(["clientHeight", "iframeHeight"]),
     tableHeight () {
-      const h = this.clientHeight - this.searchH - 310 + this.iframeHeight;
-      const _h = this.clientHeight - 310 - this.searchH;
+      const h = this.clientHeight - this.searchH - 275 + this.iframeHeight;
+      const _h = this.clientHeight - 275 - this.searchH;
       return this.$store.state.inIframe ? h : _h;
     },
   },
@@ -1398,6 +1404,8 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+@import "@/assets/scss/modules/management/list-main.scss";
+
 .tabs-other-info {
   ::v-deep .el-tabs__item {
     // width: 50px;