新增居民,死亡登记,迁出登记去除福利选项

src/assets/scss/modules/management/list-main.css

@@ -228,9 +228,9 @@
 .div_main .title-small {
   border-left: solid 4px #0056d6;
   height: 12px;
-  line-height: 20px;
-  margin-left: -36px;
-  padding-left: 30px;
+  line-height: 16px;
+  margin-left: 70px;
+  padding-left: 3px;
   font-size: 16px;
   font-weight: bold;
 }

src/assets/scss/modules/management/list-main.min.css

@@ -1 +1 @@
-.div_main{width:100%}.div_main .marginl-20{margin-left:16px}.div_main .div_search{padding:10px;background:#FFFFFF;box-shadow:0px 6px 16px 0px rgba(0,0,0,0.08),0px 3px 6px -4px rgba(0,0,0,0.12);margin:7px 7px}.div_main .div_search /deep/ .el-form-item{margin-bottom:14px}.div_main .div_search .div_search_btn{margin-right:10px;margin-top:5px;float:right}.div_main .div_search .div_search_label{line-height:36px;margin-left:24px;margin-right:6px;font-size:14px;color:#606266;vertical-align:middle}.div_main .data-tag{margin-left:10px}.div_main .item_width_normal{width:168px}.div_main .item_width_daterange{width:206px}.div_main .item_width_daterange2{width:445px}.div_main .item_width_communitycascader{width:141px}.div_main .item_width_buildcascader{width:96px}.div_main .div_table{margin:16px 7px 7px;background:#FFFFFF;box-shadow:0px 6px 16px 0px rgba(0,0,0,0.08),0px 3px 6px -4px rgba(0,0,0,0.12);position:relative;padding:24px 16px 10px}.div_main .div_table .div_btn{display:flex;justify-content:space-between}.div_main .div_table .div_btn .div_btn_left{display:flex}.div_main .div_table .div_btn .div_btn_left .btn_upload{margin-left:10px;display:flex;text-align:center}.div_main .div_table .div_table_item{margin-top:16px;position:relative}.div_main .setFormBoxHeight{max-height:153px;overflow:hidden}.div_main .setFormBoxHeightAuto{height:auto}.div_main .flex{display:flex;flex-wrap:nowrap}.div_main .hflex{display:flex;flex-flow:column;overflow:hidden;height:100%}.div_main .flex1{flex:1}.div_main .mean{justify-content:space-around}.div_main .endpoint{justify-content:space-between}.div_main .align_item{align-items:center}.div_main .font12{font-size:12px}.div_main .font14{font-size:14px !important}.div_main .font16{font-size:16px !important}.div_main .font18{font-size:18px !important}.div_main .p0{padding:0 !important}.div_main .p10{padding:10px}.div_main .p50{padding:50px}.div_main .p30{padding:30px}.div_main .right5{margin-right:5px}.div_main .right24{margin-right:24px}.div_main .bottom8{margin-bottom:8px}.div_main .bottom16{margin-bottom:16px}.div_main .top2{margin-top:2px}.div_main .top12{margin-top:12px}.div_main .top24{margin-top:24px !important}.div_main .top32{margin-top:32px !important}.div_main .top40{margin-top:40px !important}.div_main .top48{margin-top:48px !important}.div_main .top8{margin-top:8px !important}.div_main .bot8{margin-bottom:8px}.div_main .bot24{margin-bottom:24px !important}.div_main .top16{margin-top:16px !important}.div_main .bot16{margin-bottom:16px !important}.div_main .right8{margin-right:8px !important}.div_main .margin30{margin:30px}.div_main .m0{margin:0 !important}.div_main .title-small{border-left:solid 4px #0056d6;height:12px;line-height:20px;margin-left:-36px;padding-left:30px;font-size:16px;font-weight:bold}@media only screen and (min-width: 2013px){.div_main .showUnfold{display:none}}.div_main .item_width_2{width:138px}.div_main .item_width_1{width:260px}.div_main .item_width_3{width:200px}.div_main .list_item_width_1{width:165px}.div_main .list_item_width_2{width:135px}.div-mult-form{margin-top:20px}.div-mult-form .div_person{display:flex;font-size:14px;padding-bottom:20px}.div-mult-form .div_person .person_title{text-align:right;flex:0 0 100px;line-height:36px;padding:0 12px 0 0}.div-mult-form .div_person .tag_item{margin-right:10px;margin-top:10px}.div-mult-form .div_person .tag_tip{margin-top:10px;color:#9c9c9c}.div-mult-table{position:relative;padding:0 20px}.div-mult-table .div_selcount{position:absolute;bottom:10px;left:30px}.div_dialog_table{padding:10px}.div_dialog_table .table{margin-top:20px}.twoline{display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden}
+.div_main{width:100%}.div_main .marginl-20{margin-left:16px}.div_main .div_search{padding:10px;background:#FFFFFF;box-shadow:0px 6px 16px 0px rgba(0,0,0,0.08),0px 3px 6px -4px rgba(0,0,0,0.12);margin:7px 7px}.div_main .div_search /deep/ .el-form-item{margin-bottom:14px}.div_main .div_search .div_search_btn{margin-right:10px;margin-top:5px;float:right}.div_main .div_search .div_search_label{line-height:36px;margin-left:24px;margin-right:6px;font-size:14px;color:#606266;vertical-align:middle}.div_main .data-tag{margin-left:10px}.div_main .item_width_normal{width:168px}.div_main .item_width_daterange{width:206px}.div_main .item_width_daterange2{width:445px}.div_main .item_width_communitycascader{width:141px}.div_main .item_width_buildcascader{width:96px}.div_main .div_table{margin:16px 7px 7px;background:#FFFFFF;box-shadow:0px 6px 16px 0px rgba(0,0,0,0.08),0px 3px 6px -4px rgba(0,0,0,0.12);position:relative;padding:24px 16px 10px}.div_main .div_table .div_btn{display:flex;justify-content:space-between}.div_main .div_table .div_btn .div_btn_left{display:flex}.div_main .div_table .div_btn .div_btn_left .btn_upload{margin-left:10px;display:flex;text-align:center}.div_main .div_table .div_table_item{margin-top:16px;position:relative}.div_main .setFormBoxHeight{max-height:153px;overflow:hidden}.div_main .setFormBoxHeightAuto{height:auto}.div_main .flex{display:flex;flex-wrap:nowrap}.div_main .hflex{display:flex;flex-flow:column;overflow:hidden;height:100%}.div_main .flex1{flex:1}.div_main .mean{justify-content:space-around}.div_main .endpoint{justify-content:space-between}.div_main .align_item{align-items:center}.div_main .font12{font-size:12px}.div_main .font14{font-size:14px !important}.div_main .font16{font-size:16px !important}.div_main .font18{font-size:18px !important}.div_main .p0{padding:0 !important}.div_main .p10{padding:10px}.div_main .p50{padding:50px}.div_main .p30{padding:30px}.div_main .right5{margin-right:5px}.div_main .right24{margin-right:24px}.div_main .bottom8{margin-bottom:8px}.div_main .bottom16{margin-bottom:16px}.div_main .top2{margin-top:2px}.div_main .top12{margin-top:12px}.div_main .top24{margin-top:24px !important}.div_main .top32{margin-top:32px !important}.div_main .top40{margin-top:40px !important}.div_main .top48{margin-top:48px !important}.div_main .top8{margin-top:8px !important}.div_main .bot8{margin-bottom:8px}.div_main .bot24{margin-bottom:24px !important}.div_main .top16{margin-top:16px !important}.div_main .bot16{margin-bottom:16px !important}.div_main .right8{margin-right:8px !important}.div_main .margin30{margin:30px}.div_main .m0{margin:0 !important}.div_main .title-small{border-left:solid 4px #0056d6;height:12px;line-height:16px;margin-left:70px;padding-left:3px;font-size:16px;font-weight:bold}@media only screen and (min-width: 2013px){.div_main .showUnfold{display:none}}.div_main .item_width_2{width:138px}.div_main .item_width_1{width:260px}.div_main .item_width_3{width:200px}.div_main .list_item_width_1{width:165px}.div_main .list_item_width_2{width:135px}.div-mult-form{margin-top:20px}.div-mult-form .div_person{display:flex;font-size:14px;padding-bottom:20px}.div-mult-form .div_person .person_title{text-align:right;flex:0 0 100px;line-height:36px;padding:0 12px 0 0}.div-mult-form .div_person .tag_item{margin-right:10px;margin-top:10px}.div-mult-form .div_person .tag_tip{margin-top:10px;color:#9c9c9c}.div-mult-table{position:relative;padding:0 20px}.div-mult-table .div_selcount{position:absolute;bottom:10px;left:30px}.div_dialog_table{padding:10px}.div_dialog_table .table{margin-top:20px}.twoline{display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden}

src/assets/scss/modules/management/list-main.scss

@@ -236,9 +236,9 @@
 .title-small {
   border-left: solid 4px rgba(0, 86, 214, 1);
   height: 12px;
-  line-height: 20px;
-  margin-left: -36px;
-  padding-left: 30px;
+  line-height: 16px;
+  margin-left: 70px;
+  padding-left: 3px;
   font-size: 16px;
   font-weight: bold;
 }

src/views/components/resiChangeTransfer.vue

@@ -139,10 +139,10 @@
                     v-model="dataForm.reason">
           </el-input>
         </el-form-item>
-        <el-form-item label=""
+        <!-- <el-form-item label=""
                       prop="welfareFlag">
           <el-checkbox v-model="dataForm.welfareFlag">享受福利</el-checkbox>
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
 
     </div>

src/views/components/resiForm.vue

@@ -291,7 +291,7 @@ export default {
     // 渲染一行几列
     columns: {
       type: Number,
-      default: 4
+      default: 3
     },
     supportAdd: { // 单表多条数据
       type: Boolean,

src/views/components/resiSearch.vue

@@ -7,7 +7,7 @@
         :class="boxHeight ? 'setFormBoxHeightAuto' : 'setFormBoxHeight'" :key="index">
         <el-form-item v-for="n in item" :key="n.id">
           <div class="resi-cell">
-            <div style="width:100px;text-align: right;">{{ n.label }}:</div>
+            <div style="width:100px;text-align: right;padding-right:14px ;">{{ 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="item_width_normal" size="small" clearable placeholder="请输入内容">
@@ -53,14 +53,16 @@
           </div>
         </el-form-item>
 
-        <el-form-item label="所属组织" prop="agencyIdArray" :label-width="'100px'" >
+        <el-form-item  prop="agencyIdArray">
+          <span style="width:100px;text-align: right;padding-right:14px;display: inline-block; " >所属组织:</span>
           <el-cascader class="item_width_normal" ref="myCascader" v-model="agencyIdArray" :options="orgOptions"
             :props="orgOptionProps" :show-all-levels="false" @change="handleChangeAgency"></el-cascader>
         </el-form-item>
 
-        <el-form-item label="所属房屋" prop="VILLAGE_ID" :label-width="'100px'" >
+        <el-form-item prop="VILLAGE_ID"  >
           <div class="resi-cell">
             <div class="resi-cell-value">
+              <span style="width:100px;text-align: right;padding-right:14px;display: inline-block; " >所属房屋:</span>
               <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">

src/views/modules/base/community/community.vue

@@ -38,6 +38,7 @@
       <div class="div_search">
 
         <el-form :inline="true"
+                  class="communityHeight"
                  ref="ref_searchform"
                  :class="boxHeight ? 'setFormBoxHeightAuto' : 'setFormBoxHeight'"
                  :label-width="'100px'">

src/views/modules/base/resi.vue

@@ -54,7 +54,7 @@
                      size="small"
                      @click="handleAdd"
                      class="diy-button--blue"
-                     icon="el-icon-plus"> 新增小区</el-button>
+                     icon="el-icon-plus"> 新增</el-button>
           <el-button v-if="btnAuths.ic_resi_export"
                      style="margin-left:10px"
                      size="small"
@@ -359,12 +359,13 @@
     <el-dialog :visible.sync="deathShow"
                :close-on-click-modal="false"
                :close-on-press-escape="false"
+            
                :title="'死亡登记'"
                width="950px"
                top="5vh"
                class="dialog-h"
                @closed="diaClose">
-      <resideath-add ref="ref_death"
+      <resideath-add ref="ref_death"    :resideathAddObj="resideathAddObj1"
                      @dialogCancle="deathClose"></resideath-add>
     </el-dialog>
   </div>
@@ -430,6 +431,7 @@ export default {
       pageSize: 20,
       total: null,
       searchH: 0,
+      resideathAddObj1:{}, // 死亡登记子组件
       conditions: [],
       activeName: "",
       tableData: [],
@@ -575,6 +577,7 @@ export default {
       this.deathShow = true;
       await nextTick(200);
       this.$refs.ref_death.initForm(row)
+      this.resideathAddObj1 = {name:row.NAME,GRID_ID:row.GRID_ID}
     },
 
     //变更记录
@@ -1474,19 +1477,17 @@ export default {
     // 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-wrap::after,
+  ::v-deep .el-tabs__active-bar_active {
+    background-color: #0055d7;
   }
   ::v-deep .el-tabs__nav-next,
   ::v-deep .el-tabs__nav-prev {
@@ -1498,8 +1499,7 @@ export default {
     // border-radius: 50%;
   }
   ::v-deep .el-tabs__item.is-active {
-    color: #fff;
-    background: linear-gradient(90deg, #1a5afd, #26c4ff);
+    color: #17b3a3;
   }
 }
 .resi-container .resi-card {

src/views/modules/plugins/change/resideathAdd.vue

@@ -7,24 +7,26 @@
                label-width="90px"
                :rules="dataRule"
                class="m-form">
-
-        <div class="item-textarea">
-          <el-form-item label="死亡原因"
+        <template >
+          <el-form-item class="top24" label="当前组织"
                         style="display: block"
-                        prop="blacklistReason">
-            <el-input type="textarea"
-                      resize="none"
-                      class="edit_item_width_1"
-                      placeholder='请输入迁出原因'
-                      v-model="dataForm.blacklistReason">
-            </el-input>
+                       >
+                       {{resideathAddObj.GRID_ID}}
           </el-form-item>
-        </div>
+        </template>
+        <template>
+          <el-form-item label="姓名"
+                        style="display: block"
+                       >
+                       {{resideathAddObj.name}}
+          </el-form-item>
+        </template>
+       
         <el-form-item label="死亡日期"
                       style="display: block"
                       prop="deathDate">
           <el-date-picker v-model="dataForm.deathDate"
-                          class="edit_item_width_1"
+                          class="item_width_daterange"
                           type="date"
                           value-format="yyyy-MM-dd HH:mm:ss"
                           format="yyyy-MM-dd"
@@ -32,7 +34,18 @@
                           :clearable="false">
           </el-date-picker>
         </el-form-item>
-
+        <div class="item-textarea">
+          <el-form-item label="死亡原因"
+                        style="display: block"
+                        prop="blacklistReason">
+            <el-input type="textarea"
+                      resize="none"
+                      class="item_width_daterange"
+                      placeholder='请输入死亡原因'
+                      v-model="dataForm.blacklistReason">
+            </el-input>
+          </el-form-item>
+        </div>
         <!-- <el-form-item label="享受福利"
                       style="display: block"
                       prop="welfareFlag">
@@ -43,7 +56,7 @@
     </div>
     <div class="div_btn">
       <el-button size="small"
-                 class="diy-button--gray"
+                 class=""
                  @click="handleCancle">取 消</el-button>
       <el-button size="small"
                  class="diy-button--blue"
@@ -98,7 +111,6 @@ export default {
   },
   methods: {
     async initForm (row) {
-
       this.customerId = localStorage.getItem("customerId");
 
       this.$refs.ref_form.resetFields();
@@ -189,11 +201,17 @@ export default {
       }
     }
   },
-  props: {}
+  props: {
+    resideathAddObj:{
+      type:Object,
+      default: ()=>{ return {} }
+    }
+  }
 }
 </script>
 <style lang="scss" scoped>
 @import "@/assets/scss/modules/management/edit-main.scss";
+@import "@/assets/scss/modules/management/list-main.scss";
 
 .resi-cell-col {
   width: 750px;

src/views/modules/shequ/cpts/peopleDetail.vue

@@ -1,14 +1,14 @@
 <template>
   <div class="m-pop">
     <div class="wrap">
-        <div class="wrap2 p0">
-          <div class="flex endpoint">
-                 <span class="font16">居民详情</span>
-                <el-button size="small" type="text" @click="handleClose">
-                    <i class="el-icon-close font16"></i>
-                </el-button>
+      <div class="btn-close"
+           @click="handleClose">
+        <img src="@/assets/img/shuju/people/close.png" />
+      </div>
+      <div class="wrap2">
+        <div class="title">
+          <span>居民详情</span>
         </div>
-          <hr/>
         <div v-if="view_real_data"
              class="div_tuomin">
           <el-button size="mini"
@@ -705,9 +705,4 @@
 };
 </script>
 
-  <style lang="scss"  scoped>
-    @import "@/assets/scss/modules/management/list-main.scss";
-    @import '@/assets/scss/people-info.scss'
-
-</style>
-  
+<style lang="scss" src="@/assets/scss/people-info.scss" scoped></style>