diff --git a/src/assets/scss/buttonstyle.scss b/src/assets/scss/buttonstyle.scss
index dbf80ad00..51b592f90 100644
--- a/src/assets/scss/buttonstyle.scss
+++ b/src/assets/scss/buttonstyle.scss
@@ -39,7 +39,9 @@
   border: none !important;
 
 }
-
+.diy-button--blue:hover{
+  background: #0042a3 !important;
+}
 //黄色
 .diy-button--yellow {
   background:  linear-gradient(0deg, #FAA700 0%, #FFBF28 100%) !important;
@@ -95,15 +97,18 @@
   font-size: 14px  !important;
   font-family: PingFangSC-Regular, PingFang SC;
   font-weight: 400;
-  color: #0056D6 !important;
+  color: #0056d6 !important;
   // line-height: 22px  !important;
   min-width: 60px !important;
   height: 32px !important;
-
   // padding:0 8px  !important;
   background: #FFFFFF !important;
   border-radius: 2px !important;
-  border: 1px solid #0056D6 !important;
+  border: 1px solid #0056d6 !important;
+}
+.diy-button--white:hover{
+  border: 1px solid #0042a3 !important;
+  color: #0042a3 !important;
 }
 // 普通按钮
 .diy-button--common {
diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue
index 9f40b73b9..2a2cb1eee 100644
--- a/src/views/components/resiForm.vue
+++ b/src/views/components/resiForm.vue
@@ -195,6 +195,7 @@
                                                   :multiple="itemk.formName=='specialCategoryCode'"
                                                   :collapse-tags="itemk.formName=='specialCategoryCode'"
                                                   clearable
+                                                  :style="{'width':itemk.formName=='specialCategoryCode'?'183px':''}"
                                                   class="u-item-width-normal">
                                                 <el-option v-for="items in itemk.opction"
                                                     :key="items.value"
@@ -294,6 +295,7 @@ export default {
     activeName: 'groupeduInfoDto',
     validateFlag:null,
     disabilityCategoryCode:[],
+    tabFlag:true,
     // 基本信息input
     basicInformation: [
       {
@@ -1221,7 +1223,11 @@ export default {
   watch: {
     form:{
     handler (val, val2) {
-
+     for(let i in this.form){
+        if(typeof(this.form[i]) === "object"){
+          this.tabFlag = false
+        }
+     }
     },
       deep:true,
       immediate:true
@@ -1498,7 +1504,7 @@ export default {
     handleTabShow(val,e){
       if(e == 1){
       if(val.formName == 'partyFlag'){
-        this.tabsList.push({label:'党员信息',id:'0',groupId:'parymemberInfoDto'})
+        this.tabsList.push({label:'党员',id:'0',groupId:'parymemberInfoDto'})
       }else if(val.formName == 'ensureHouseFlag'){
         this.tabsList.push({label:'保障房信息',id:'1',groupId:'ensureHouseDto'})
       }else if(val.formName == 'unemployedFlag'){
@@ -1675,7 +1681,7 @@ export default {
         } else {
           await this.residentBirthRecord(this.form.resiId)
         }
-      } else if (tab._props.label == '党员信息') {
+      } else if (tab._props.label == '党员') {
         if (!this.form.resiId) {
           this.newForm.parymemberInfoDto = this.form.parymemberInfoDto
         } else {
@@ -1907,7 +1913,7 @@ export default {
           this.form.floatingFlag = data.categoryInfo.floatingFlag.toString()
           this.form.liveAloneFlag = data.categoryInfo.liveAloneFlag.toString()
 
-          if(this.form.partyFlag == '1') this.tabsList.push({label:'党员信息',id:'0',groupId:'parymemberInfoDto'})
+          if(this.form.partyFlag == '1') this.tabsList.push({label:'党员',id:'0',groupId:'parymemberInfoDto'})
           if(this.form.ensureHouseFlag == '1') this.tabsList.push({label:'保障房信息',id:'1',groupId:'ensureHouseDto'})
           if(this.form.unemployedFlag == '1') this.tabsList.push({label:'失业',id:'2',groupId:'unemployedDto'})
           if(this.form.veteranFlag == '1') this.tabsList.push({label:'退役军人',id:'3',groupId:'veteranDto'})
@@ -2012,7 +2018,7 @@ export default {
     },
     // 健康信息详情
     getHealthInfoDetailById(id) {
-      this.$http.post(`/actual/base/residentHealthInfo/getHealthInfoDetailById/${id}`).then(({ data: res }) => {
+        this.$http.post(`/actual/base/residentHealthInfo/getHealthInfoDetailById/${id}`).then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg);
           } else {
@@ -2039,6 +2045,7 @@ export default {
             this.newForm.healthDto = this.form.healthDto
           }
         })
+      
     },
     // 工作信息详情
     residentWorkInfo(id) {
@@ -2457,4 +2464,5 @@ export default {
 .f-bto0{
   margin-bottom: 0px !important;
 }
+
 </style>
diff --git a/src/views/components/resiInfo.vue b/src/views/components/resiInfo.vue
index 30d13cac2..6a2dd0280 100644
--- a/src/views/components/resiInfo.vue
+++ b/src/views/components/resiInfo.vue
@@ -444,36 +444,6 @@
                               </el-col>
                           </el-row>
                       </el-tab-pane>
-                      <el-tab-pane label="死亡人员" >
-                        <el-row>
-                              <el-col :span="8">
-                                <div class="f-flex f-bto16 f-top24">
-                                   <div class="f-labels">死亡时间 :</div>  
-                                <span class="f-left8 f-font-color">{{residentDeathRecordObj?residentDeathRecordObj.deathDate?residentDeathRecordObj.deathDate.substr(0,10):'--':'--'}}</span> 
-                               </div>
-                              </el-col>
-                              <el-col :span="8">
-                                <div class="f-flex f-bto16 f-top24">
-                                   <div class="f-labels">加入原因 :</div>  
-                                <span class="f-left8 f-font-color">{{residentDeathRecordObj?residentDeathRecordObj.deathReason	?residentDeathRecordObj.deathReason	:'--':'--'}}</span> 
-                                </div>
-                              </el-col>
-                              <el-col :span="8">
-                                <div class="f-flex f-bto16 f-top24">
-                                   <div class="f-labels">移除时间	:</div>  
-                                <span class="f-left8 f-font-color">{{residentDeathRecordObj?residentDeathRecordObj.removeDate	?residentDeathRecordObj.removeDate.substr(0,10)	:'--':'--'}}</span> 
-                                </div>
-                              </el-col>
-                          </el-row>
-                          <el-row>
-                              <el-col :span="8">
-                                <div class="f-flex f-bto16 f-top24">
-                                   <div class="f-labels">移除原因 :</div>  
-                                <span class="f-left8 f-font-color">{{residentDeathRecordObj?residentDeathRecordObj.removeReason?residentDeathRecordObj.removeReason:'--':'--'}}</span> 
-                               </div>
-                              </el-col>
-                          </el-row>
-                      </el-tab-pane>
                       <el-tab-pane label="迁出" >
                         <el-row>
                               <el-col :span="8">
@@ -856,6 +826,35 @@
                                   --
                                </span>
                          </section>
+                      </el-tab-pane>    <el-tab-pane label="死亡人员"  v-if="resiDetailObj.deathFlag">
+                        <el-row>
+                              <el-col :span="8">
+                                <div class="f-flex f-bto16 f-top24">
+                                   <div class="f-labels">死亡时间 :</div>  
+                                <span class="f-left8 f-font-color">{{residentDeathRecordObj?residentDeathRecordObj.deathDate?residentDeathRecordObj.deathDate.substr(0,10):'--':'--'}}</span> 
+                               </div>
+                              </el-col>
+                              <el-col :span="8">
+                                <div class="f-flex f-bto16 f-top24">
+                                   <div class="f-labels">加入原因 :</div>  
+                                <span class="f-left8 f-font-color">{{residentDeathRecordObj?residentDeathRecordObj.deathReason	?residentDeathRecordObj.deathReason	:'--':'--'}}</span> 
+                                </div>
+                              </el-col>
+                              <el-col :span="8">
+                                <div class="f-flex f-bto16 f-top24">
+                                   <div class="f-labels">移除时间	:</div>  
+                                <span class="f-left8 f-font-color">{{residentDeathRecordObj?residentDeathRecordObj.removeDate	?residentDeathRecordObj.removeDate.substr(0,10)	:'--':'--'}}</span> 
+                                </div>
+                              </el-col>
+                          </el-row>
+                          <el-row>
+                              <el-col :span="8">
+                                <div class="f-flex f-bto16 f-top24">
+                                   <div class="f-labels">移除原因 :</div>  
+                                <span class="f-left8 f-font-color">{{residentDeathRecordObj?residentDeathRecordObj.removeReason?residentDeathRecordObj.removeReason:'--':'--'}}</span> 
+                               </div>
+                              </el-col>
+                          </el-row>
                       </el-tab-pane>
                 </el-tabs>
 
diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue
index a47077356..9c8c1bbcd 100644
--- a/src/views/components/resiSearch.vue
+++ b/src/views/components/resiSearch.vue
@@ -39,10 +39,10 @@
                   </el-date-picker>
           </el-form-item>
           <el-form-item label="居民年龄" >
-              <el-input v-model="form.ageStart" class="u-item-width-resiAge" placeholder="请输入" clearable size="small">
+              <el-input v-model="form.ageStart" class="u-item-width-daterange" placeholder="请输入" clearable size="small">
               </el-input>
               <span class="u-data-tag">至</span>
-              <el-input v-model="form.ageEnd" class="u-item-width-resiAge u-data-tag" placeholder="请输入" clearable size="small">
+              <el-input v-model="form.ageEnd" class="u-item-width-daterange u-data-tag" placeholder="请输入" clearable size="small">
               </el-input>
           </el-form-item>
           <el-form-item label="文化程度" >
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index c6d73f8c9..28bf62b13 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -16,7 +16,7 @@
             style="margin-left: 10px"
             size="small"
             plain
-            class=" f-right5"
+            class=" f-right5 diy-button--white"
             @click="resetSearchForm"
             >重置</el-button>
           <el-button
@@ -56,6 +56,7 @@
             v-if="btnAuths.ic_resi_export"
             style="margin-left: 10px"
             size="small"
+            class="diy-button--white"
             @click="diyExport"
             plain
             >导出</el-button
@@ -64,6 +65,7 @@
             v-if="btnAuths.ic_resi_export"
             style="margin-left: 10px"
             size="small"
+            class="diy-button--white"
             @click=""
             plain
             >核对</el-button
@@ -106,6 +108,7 @@
             style="margin-left: 10px"
             v-if="btnAuths.ic_resi_batch_del"
             size="small"
+            class="diy-button--white"
             plain
             @click="deleteBatch"
             >批量删除</el-button
@@ -650,12 +653,14 @@ export default {
     },
     handleSearchFrom() {
       let obj = this.$refs.myResiSearch.form
-      if (typeof obj.categoryKey == 'object'&&obj.categoryKey .length != 0) {
+      let categoryArr = this.$refs.myResiSearch.form.categoryKey
+      let agencyId =  this.$refs.myResiSearch.form.agencyId
+      if (typeof obj.categoryKey == 'object'&&obj.categoryKey.length != 0) {
         obj.categoryKey = obj.categoryKey.join(',')
       } else  {
         obj.categoryKey = "";
       }
-      if (typeof obj.agencyId == 'object'&&obj.agencyId .length != 0) {
+      if (typeof obj.agencyId == 'object'&&obj.agencyId.length != 0) {
         obj.agencyId = obj.agencyId.join(',')
       } else  {
         obj.agencyId = "";
@@ -663,7 +668,8 @@ export default {
       this.currentPage = 1
       console.log(obj);
       this.getTableData(obj)
-
+      this.$refs.myResiSearch.form.categoryKey = categoryArr
+      this.$refs.myResiSearch.form.agencyId = agencyId
     },
     // 是否可以选中
     checkSelectable(row, index) {
@@ -1034,17 +1040,17 @@ export default {
       await this.residentBaseInfo();
     },
     // 获取详情
-    // residentBaseInfo () {
-    //   this.$http.post(`/actual/base/residentBaseInfo/detail/${this.editUserId}`).then(({ data: res }) => {
-    //     if (res.code !== 0) {
-    //       return this.$message.error(res.msg);
-    //     } else {
-    //       this.$refs.baseForm.old_from(res.data);
-    //     }
-    //   }).catch((err) => {
-    //     return this.$message.error("网络错误");
-    //   });
-    // },
+    residentBaseInfo () {
+      this.$http.post(`/actual/base/residentBaseInfo/detail/${this.editUserId}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg);
+        } else {
+          this.$refs.baseForm.old_from(res.data);
+        }
+      }).catch((err) => {
+        return this.$message.error("网络错误");
+      });
+    },
     handlerReset() {
       this.$refs.baseForm.resetForm();
     },