From 774d420ff98195772d4aad2caa69076f9717f43f Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Thu, 12 May 2022 15:53:29 +0800
Subject: [PATCH 1/4] dd

---
 .../modules/base/huji/immigration/edit.vue    | 166 ++++++++++--------
 .../modules/base/huji/immigration/index.vue   |   2 +-
 2 files changed, 89 insertions(+), 79 deletions(-)

diff --git a/src/views/modules/base/huji/immigration/edit.vue b/src/views/modules/base/huji/immigration/edit.vue
index 6754fd0d0..1365b5ec7 100644
--- a/src/views/modules/base/huji/immigration/edit.vue
+++ b/src/views/modules/base/huji/immigration/edit.vue
@@ -40,81 +40,90 @@
           label-width="150px"
           style="display: block"
         >
-          <el-select
-            v-model.trim="fmData.villageId"
-            placeholder="请选择小区"
-            size="small"
-            clearable
-            class="resi-cell-select"
-            @clear="handleClearVillage"
-            @change="handleChangeV"
-            :disabled="formType === 'edit'"
-            style="margin-right: 8px; width: 120px"
-          >
-            <el-option
-              v-for="item in optionsV"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
+          <el-input
+            v-if="formType == 'detail'"
+            class="item_width_2"
+            placeholder="请输入来源地"
+            disabled
+            v-model="fmData.allName"
+          />
+          <template v-else>
+            <el-select
+              v-model.trim="fmData.villageId"
+              placeholder="请选择小区"
+              size="small"
+              clearable
+              class="resi-cell-select"
+              @clear="handleClearVillage"
+              @change="handleChangeV"
+              :disabled="formType === 'edit'"
+              style="margin-right: 8px; width: 120px"
             >
-            </el-option>
-          </el-select>
-          <el-select
-            v-model.trim="fmData.buildId"
-            placeholder="楼号"
-            size="small"
-            clearable
-            style="margin-right: 8px; width: 120px"
-            class="resi-cell-select"
-            :disabled="changeVDisabled || formType === 'edit'"
-            @clear="handleClearBuild"
-            @change="handleChangeB"
-          >
-            <el-option
-              v-for="item in optionsB"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
+              <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="fmData.buildId"
+              placeholder="楼号"
+              size="small"
+              clearable
+              style="margin-right: 8px; width: 120px"
+              class="resi-cell-select"
+              :disabled="changeVDisabled || formType === 'edit'"
+              @clear="handleClearBuild"
+              @change="handleChangeB"
             >
-            </el-option>
-          </el-select>
-          <el-select
-            v-model.trim="fmData.unitId"
-            :disabled="changeBDisabled || formType === 'edit'"
-            placeholder="单元"
-            size="small"
-            clearable
-            style="margin-right: 8px; 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
+                v-for="item in optionsB"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+            <el-select
+              v-model.trim="fmData.unitId"
+              :disabled="changeBDisabled || formType === 'edit'"
+              placeholder="单元"
+              size="small"
+              clearable
+              style="margin-right: 8px; width: 120px"
+              class="resi-cell-select"
+              @click="handleClearDan"
+              @change="handleChangeD"
             >
-            </el-option>
-          </el-select>
-          <el-select
-            v-model.trim="fmData.homeId"
-            :disabled="changeDDisabled || formType === 'edit'"
-            placeholder="房号"
-            size="small"
-            clearable
-            @change="handleChangeH"
-            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
+                v-for="item in optionsD"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+            <el-select
+              v-model.trim="fmData.homeId"
+              :disabled="changeDDisabled || formType === 'edit'"
+              placeholder="房号"
+              size="small"
+              clearable
+              @change="handleChangeH"
+              style="width: 120px"
+              class="resi-cell-select"
             >
-            </el-option>
-          </el-select>
+              <el-option
+                v-for="item in optionsH"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+          </template>
         </el-form-item>
 
         <el-form-item
@@ -256,16 +265,17 @@
           label-width="150px"
           style="display: block"
         >
-          <el-cascader ref="nowArea" class="item_width_1" :props="areaProps" 
-            v-model="nowAllCode" clearable @change="handleNowArea"></el-cascader>
-          <!-- <el-input
-            class="item_width_1"
+          <el-input
+            v-if="formType == 'detail'"
+            class="item_width_2"
             placeholder="请输入来源地"
+            disabled
             v-model="fmData.sourceAddress"
-          > -->
-          </el-input>
+          />
+          <el-cascader v-else ref="nowArea" class="item_width_1" :props="areaProps" 
+            v-model="nowAllCode" clearable @change="handleNowArea"></el-cascader>
+          
         </el-form-item>
-
         <el-form-item
           label="详细地址"
           prop="address"
diff --git a/src/views/modules/base/huji/immigration/index.vue b/src/views/modules/base/huji/immigration/index.vue
index 283abe28f..316ca2031 100644
--- a/src/views/modules/base/huji/immigration/index.vue
+++ b/src/views/modules/base/huji/immigration/index.vue
@@ -292,7 +292,7 @@
         >
         </el-table-column>
 
-        <el-table-column prop="gender" align="center" width="60" label="性别">
+        <el-table-column prop="genderName" align="center" width="60" label="性别">
         </el-table-column>
 
         <el-table-column prop="age" align="center" width="60" label="年龄">

From 694dfbd64ef59c64ea1be59069e016a0ee5bbad0 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 12 May 2022 15:56:50 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=8F=AF=E8=A7=86=E5=8C=96=E5=B9=B3?=
 =?UTF-8?q?=E5=8F=B0-=E7=A4=BE=E5=8C=BA=E6=B2=BB=E7=90=86-=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=E4=B8=8B=E6=8B=89=E6=A1=86=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visual/communityGovern/processAnalyze.vue | 47 +++++++++----------
 .../visual/communityGovern/typeAnalyze.vue    |  6 ++-
 2 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/src/views/modules/visual/communityGovern/processAnalyze.vue b/src/views/modules/visual/communityGovern/processAnalyze.vue
index 7c2c32763..186b05bd6 100644
--- a/src/views/modules/visual/communityGovern/processAnalyze.vue
+++ b/src/views/modules/visual/communityGovern/processAnalyze.vue
@@ -183,26 +183,7 @@ export default {
       status: 'pending',//状态:待处理 pending，结案closed
       agencyInfo: {},
       projectList: [],
-      projectList1: [
-        {
-          agencyId: '',
-          projectId: '',
-          origin: '',
-          status: 'pending',
-          title: '南宁第二网格南宁第二网格',
-          latitude: 36.062227,
-          longitude: 120.389455,
-        },
-        {
-          agencyId: '',
-          projectId: '',
-          origin: '',
-          status: 'closed',
-          latitude: 36.082227,
-          longitude: 120.389455,
-          title: "南宁第二网格",
-        }
-      ],
+
 
       iconUrlArray: [],
       iconTextStyle: {},
@@ -212,6 +193,7 @@ export default {
       customerList: [],
       iscascaderShow: 0,
 
+
       optionProps: {
         multiple: false,
         value: 'agencyId',
@@ -273,6 +255,13 @@ export default {
 
       const { data, code, msg } = await requestPost(url, params);
       if (code === 0) {
+        let treeData = []
+        console.log(this.treeData)
+        treeData.push(data)
+        //重构树，去除网格
+        let treeDataNew
+        treeDataNew = this.filterTree(treeData)
+
         this.agencyInfo = data
         this.agencyId = this.agencyInfo.agencyId
         if (!this.agencyInfo.latitude) {
@@ -291,7 +280,7 @@ export default {
         this.agencyIdArray.length = []
 
         if (data) {
-          this.casOptions.push(data)
+          this.casOptions = treeDataNew
           this.agencyIdArray.push(this.agencyId)
         }
 
@@ -301,6 +290,17 @@ export default {
 
     },
 
+    //重构树，去除网格
+    filterTree (treeData) {
+
+      let newTree = treeData.filter(x => x.level !== 'grid')
+      newTree.forEach(x => x.subAgencyList && (x.subAgencyList = this.filterTree(x.subAgencyList)))
+      return newTree
+
+    },
+
+
+
     //加载项目
     async getProjectTotal () {
       if (this.$refs.pieChart) {
@@ -370,12 +370,7 @@ export default {
       if (code === 0) {
 
         this.projectList = [...data]
-        // if (this.status === 'closed') {
-        //   this.projectList = this.projectList1
-        // } else {
-        //   this.projectList = this.projectList2
 
-        // }
         this.projectList.forEach(item => {
           item.values_ = {
             name: item.title
diff --git a/src/views/modules/visual/communityGovern/typeAnalyze.vue b/src/views/modules/visual/communityGovern/typeAnalyze.vue
index d5ec15164..32c4c41d4 100644
--- a/src/views/modules/visual/communityGovern/typeAnalyze.vue
+++ b/src/views/modules/visual/communityGovern/typeAnalyze.vue
@@ -210,12 +210,14 @@ export default {
 
     // 获取当前登录人员信息及组织信息
     async getAgencylist () {
-      const url = "/gov/org/customeragency/agencygridtree";
+      // const url = "/gov/org/customeragency/agencygridtree";
+      const url = '/gov/org/customeragency/agencylist'
 
       let params = {};
 
       const { data, code, msg } = await requestPost(url, params);
       if (code === 0) {
+
         this.agencyInfo = data
         this.agencyId = this.agencyInfo.agencyId
         if (!this.agencyInfo.latitude) {
@@ -389,7 +391,7 @@ export default {
     },
 
     async handleChangeAgency (value) {
-
+      this.demand.list = []
       this.agencyName = this.$refs["myCascader"].getCheckedNodes()[0].label
       this.agencyId = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : ''
       await this.getPieChart()

From 07055a98e8f4bf7154ab5920b8239740aeb5f6ca Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Fri, 13 May 2022 09:37:29 +0800
Subject: [PATCH 3/4] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scss/modules/management/epidemic.scss     |  7 +++--
 .../base/huji/houseChange/houseChangeList.vue | 28 +++++++++++--------
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/src/assets/scss/modules/management/epidemic.scss b/src/assets/scss/modules/management/epidemic.scss
index 5de15397e..f8ff057cd 100644
--- a/src/assets/scss/modules/management/epidemic.scss
+++ b/src/assets/scss/modules/management/epidemic.scss
@@ -37,12 +37,15 @@
   .div_search {
     background: #ffffff;
     border-radius: 4px;
-    padding: 30px 20px 5px;
+    padding: 20px 20px 5px 5px;
     box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
   }
 
   .list_item_width_1 {
-    width: 185px;
+    width: 165px;
+  }
+  .list_item_width_2 {
+    width: 135px;
   }
 }
 
diff --git a/src/views/modules/base/huji/houseChange/houseChangeList.vue b/src/views/modules/base/huji/houseChange/houseChangeList.vue
index 32ac78153..5ff47c77c 100644
--- a/src/views/modules/base/huji/houseChange/houseChangeList.vue
+++ b/src/views/modules/base/huji/houseChange/houseChangeList.vue
@@ -4,7 +4,7 @@
       <el-form :inline="true"
                :model="formData"
                ref="ref_searchform"
-               :label-width="'90px'">
+               :label-width="'80px'">
         <div>
 
           <el-form-item label="所属网格"
@@ -48,7 +48,7 @@
                              :disabled="!this.formData.neighborHoodId"
                              size="small"
                              clearable
-                             class="resi-cell-select resi-cell-select-middle list_item_width_1"
+                             class="resi-cell-select resi-cell-select-middle list_item_width_2"
                              @change="handleChangeB">
                     <el-option v-for="item in optionsB"
                                :key="item.value"
@@ -63,7 +63,7 @@
                              size="small"
                              :disabled="!this.formData.buildingId"
                              clearable
-                             class="resi-cell-select resi-cell-select-middle list_item_width_1"
+                             class="resi-cell-select resi-cell-select-middle list_item_width_2"
                              @change="handleChangeD">
                     <el-option v-for="item in optionsD"
                                :key="item.value"
@@ -78,7 +78,7 @@
                              :disabled="!this.formData.buildingUnitId"
                              size="small"
                              clearable
-                             class="resi-cell-select resi-cell-select-middle list_item_width_1">
+                             class="resi-cell-select resi-cell-select-middle list_item_width_2">
                     <el-option v-for="item in optionsH"
                                :key="item.value"
                                :label="item.label"
@@ -305,9 +305,9 @@ export default {
       this.formData.buildingUnitId = ''
       this.formData.houseId = ''
       this.getValiheList()
-      this.getBuildList()
-      this.getUniList()
-      this.getHouseList()
+      // this.getBuildList()
+      // this.getUniList()
+      // this.getHouseList()
     },
     handleChangeV (val) {
       console.log('val', val)
@@ -315,15 +315,15 @@ export default {
       this.formData.buildingUnitId = ''
       this.formData.houseId = ''
       this.getBuildList()
-      this.getUniList()
-      this.getHouseList()
+      // this.getUniList()
+      // this.getHouseList()
     },
     handleChangeB (val) {
       console.log('val', val)
       this.formData.buildingUnitId = ''
       this.formData.houseId = ''
       this.getUniList()
-      this.getHouseList()
+      // this.getHouseList()
     },
     handleChangeD () {
       this.formData.houseId = ''
@@ -379,7 +379,7 @@ export default {
     },
     getHouseList () {
       this.$http
-        .post('/gov/org/ichouse/houseoption', { buildingUnitId: this.formData.buildingUnitId })
+        .post('/gov/org/ichouse/houseoption', { unitId: this.formData.buildingUnitId })
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
@@ -462,7 +462,7 @@ export default {
   },
   computed: {
     tableHeight () {
-      return this.$store.state.inIframe ? this.clientHeight - 415 + this.iframeHeight : this.clientHeight - 415
+      return this.$store.state.inIframe ? this.clientHeight - 365 + this.iframeHeight : this.clientHeight - 365
 
     },
 
@@ -479,6 +479,10 @@ export default {
 
 <style lang="scss" scoped >
 @import "@/assets/scss/modules/management/epidemic.scss";
+
+.item_width_1 {
+  width: 260px;
+}
 </style>
 
 

From 12f6caa1c380f1c15f4acec3556d482cc0bc3771 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Fri, 13 May 2022 09:58:01 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/base/huji/chusheng/cpts/edit.vue  |  10 +-
 .../modules/base/huji/chusheng/index.vue      | 376 +++++++++---------
 2 files changed, 194 insertions(+), 192 deletions(-)

diff --git a/src/views/modules/base/huji/chusheng/cpts/edit.vue b/src/views/modules/base/huji/chusheng/cpts/edit.vue
index 2c9a6405f..ccf2018e4 100644
--- a/src/views/modules/base/huji/chusheng/cpts/edit.vue
+++ b/src/views/modules/base/huji/chusheng/cpts/edit.vue
@@ -126,7 +126,7 @@
         >
           <el-input
             class="item_width_1"
-            maxlength="50"
+            maxlength="30"
             show-word-limit
             style="width: 200px; margin-right: 20px"
             placeholder="请输入姓名	"
@@ -160,8 +160,7 @@
         >
           <el-input
             class="item_width_1"
-            type="number"
-            maxlength="50"
+            maxlength="30"
             show-word-limit
             placeholder="请输入手机号	"
             v-model="fmData.mobile"
@@ -178,6 +177,7 @@
         >
           <el-input
             class="item_width_1"
+            maxlength="30"
             placeholder="请输入身份证号"
             v-model="fmData.idCard"
             @blur="handleBlurId"
@@ -250,7 +250,7 @@
         >
           <el-input
             class="item_width_1"
-            maxlength="50"
+            maxlength="30"
             show-word-limit
             placeholder="请输入出生人父亲姓名"
             v-model="fmData.father"
@@ -266,7 +266,7 @@
         >
           <el-input
             class="item_width_1"
-            maxlength="50"
+            maxlength="30"
             show-word-limit
             placeholder="请输入出生人母亲姓名"
             v-model="fmData.mother"
diff --git a/src/views/modules/base/huji/chusheng/index.vue b/src/views/modules/base/huji/chusheng/index.vue
index e8677dac4..9995bdaf9 100644
--- a/src/views/modules/base/huji/chusheng/index.vue
+++ b/src/views/modules/base/huji/chusheng/index.vue
@@ -7,189 +7,188 @@
         :model="fmData"
         class="demo-form-inline"
       >
-        <el-row class="resi-row">
-          <el-col :span="6">
-            <div class="resi-cell2">
-              <div class="resi-cell2-label">所属网格</div>
-              <div class="resi-cell2-value">
-                <el-select
-                  v-model.trim="fmData.gridId"
-                  placeholder="请选择"
-                  size="small"
-                  clearable
-                  class="resi-cell2-select"
-                  @change="handleChangeGrid"
+        <div>
+          <el-form-item prop="gridId" label="所属网格">
+            <div class="resi-cell-value">
+              <el-select
+                v-model.trim="fmData.gridId"
+                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
-                    v-for="item in optionsG"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
-                  </el-option>
-                </el-select>
-              </div>
+                </el-option>
+              </el-select>
             </div>
-          </el-col>
-          <el-col :span="18">
-            <div class="resi-cell2">
-              <div class="resi-cell2-label">所属房屋</div>
-              <div class="resi-cell2-value">
-                <el-select
-                  v-model.trim="fmData.villageId"
-                  placeholder="请选择小区"
-                  size="small"
-                  clearable
-                  class="resi-cell2-select"
-                  @clear="handleClearVillage"
-                  @change="handleChangeV"
+          </el-form-item>
+
+          <el-form-item label="所属房屋">
+            <div class="resi-cell-value">
+              <el-select
+                v-model.trim="fmData.villageId"
+                placeholder="请选择小区"
+                size="small"
+                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
-                    v-for="item in optionsV"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
-                  </el-option>
-                </el-select>
-                <el-select
-                  v-model.trim="fmData.buildId"
-                  placeholder="楼号"
-                  size="small"
-                  clearable
-                  style="width: 120px"
-                  class="resi-cell2-select"
-                  :disabled="changeVDisabled"
-                  @clear="handleClearBuild"
-                  @change="handleChangeB"
+                </el-option>
+              </el-select>
+              <el-select
+                v-model.trim="fmData.buildId"
+                placeholder="楼号"
+                size="small"
+                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
-                    v-for="item in optionsB"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
-                  </el-option>
-                </el-select>
-                <el-select
-                  v-model.trim="fmData.unitId"
-                  :disabled="changeBDisabled"
-                  placeholder="单元"
-                  size="small"
-                  clearable
-                  style="width: 120px"
-                  class="resi-cell2-select"
-                  @click="handleClearDan"
-                  @change="handleChangeD"
+                </el-option>
+              </el-select>
+              <el-select
+                v-model.trim="fmData.unitId"
+                :disabled="changeBDisabled"
+                placeholder="单元"
+                size="small"
+                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
-                    v-for="item in optionsD"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
-                  </el-option>
-                </el-select>
-                <el-select
-                  v-model.trim="fmData.homeId"
-                  :disabled="changeDDisabled"
-                  placeholder="房号"
-                  size="small"
-                  clearable
-                  style="width: 120px"
-                  class="resi-cell2-select"
+                </el-option>
+              </el-select>
+              <el-select
+                v-model.trim="fmData.homeId"
+                :disabled="changeDDisabled"
+                placeholder="房号"
+                size="small"
+                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
-                    v-for="item in optionsH"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
-                  </el-option>
-                </el-select>
-              </div>
+                </el-option>
+              </el-select>
             </div>
-          </el-col>
-        </el-row>
-
-        <el-form-item label="姓名" prop="name">
-          <el-input
-            v-model="fmData.name"
-            class="resi-cell2-input"
-            size="small"
-            clearable
-            placeholder="请输入"
-          >
-          </el-input>
-        </el-form-item>
+          </el-form-item>
+        </div>
+
+        <div>
+          <el-form-item label="姓名" prop="name">
+            <el-input
+              v-model="fmData.name"
+              class="resi-cell-input"
+              size="small"
+              clearable
+              placeholder="请输入"
+            >
+            </el-input>
+          </el-form-item>
 
-        <el-form-item label="手机号" prop="mobile">
-          <el-input
-            v-model="fmData.mobile"
-            class="resi-cell2-input"
-            size="small"
-            clearable
-            placeholder="请输入"
-          >
-          </el-input>
-        </el-form-item>
+          <el-form-item label="手机号" prop="mobile">
+            <el-input
+              v-model="fmData.mobile"
+              class="resi-cell-input"
+              size="small"
+              clearable
+              placeholder="请输入"
+            >
+            </el-input>
+          </el-form-item>
 
-        <el-form-item label="身份证号" prop="idCard">
-          <el-input
-            v-model="fmData.idCard"
-            class="resi-cell2-input"
-            size="small"
-            clearable
-            placeholder="请输入"
-          >
-          </el-input>
-        </el-form-item>
-
-        <el-form-item label="出生日期" prop="birthdayTime">
-          <el-date-picker
-            v-model="fmData.birthdayTime"
-            type="daterange"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-            value-format="yyyy-MM-dd"
-          >
-          </el-date-picker>
-        </el-form-item>
+          <el-form-item label="身份证号" prop="idCard">
+            <el-input
+              v-model="fmData.idCard"
+              class="resi-cell-input"
+              size="small"
+              clearable
+              placeholder="请输入"
+            >
+            </el-input>
+          </el-form-item>
+        </div>
+
+        <div>
+          <el-form-item label="出生日期" prop="birthdayTime">
+            <el-date-picker
+              v-model="fmData.birthdayTime"
+              type="daterange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              value-format="yyyy-MM-dd"
+            >
+            </el-date-picker>
+          </el-form-item>
 
-        <el-form-item label="享受福利" prop="remark">
-          <el-select
-            v-model.trim="fmData.isWelfare"
-            placeholder="享受福利"
-            size="small"
-            clearable
-            style="width: 120px"
-            class="resi-cell2-select"
-          >
-            <el-option
-              v-for="item in optionsWelfare"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
+          <el-form-item label="享受福利" prop="remark">
+            <el-select
+              v-model.trim="fmData.isWelfare"
+              placeholder="请选择"
+              size="small"
+              clearable
+              style="width: 120px"
+              class="resi-cell-select"
             >
-            </el-option>
-          </el-select>
-        </el-form-item>
+              <el-option
+                v-for="item in optionsWelfare"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
 
-        <el-form-item>
-          <el-button
-            class="diy-button--search"
-            size="small"
-            @click="handleSearch"
-            >查询</el-button
-          >
-          <el-button
-            class="diy-button--reset"
-            size="small"
-            @click="resetForm('searchForm')"
-            >重置</el-button
-          >
-        </el-form-item>
+          <el-form-item>
+            <el-button
+              class="diy-button--search"
+              size="small"
+              @click="handleSearch"
+              >查询</el-button
+            >
+            <el-button
+              class="diy-button--reset"
+              size="small"
+              @click="resetForm('searchForm')"
+              >重置</el-button
+            >
+          </el-form-item>
+        </div>
       </el-form>
     </el-card>
     <el-card class="resi-card-table">
@@ -440,10 +439,10 @@ export default {
       optionsG: [],
 
       optionsWelfare: [
-        {
-          value: "",
-          label: "全部",
-        },
+        // {
+        //   value: "",
+        //   label: "全部",
+        // },
         {
           value: "1",
           label: "是",
@@ -882,7 +881,6 @@ export default {
   },
 };
 </script>
-
 <style lang="scss" scoped>
 @import "@/assets/scss/buttonstyle.scss";
 
@@ -919,12 +917,12 @@ export default {
   overflow: visible;
 }
 
-.demo-form-inline .resi-cell2 {
-  display: flex;
-  align-items: center;
-  margin-bottom: 20px;
+.demo-form-inline {
+  // display: flex;
+  // align-items: center;
+  // margin-bottom: 20px;
 
-  .resi-cell2-label {
+  .resi-cell-label {
     flex-shrink: 0;
     min-width: 0;
     box-sizing: border-box;
@@ -932,21 +930,21 @@ export default {
     // text-align: right;
     // line-height: 32;
   }
-  .resi-cell2-label1 {
+  .resi-cell-label1 {
     width: max-content;
   }
-  .resi-cell2-value-radio {
+  .resi-cell-value-radio {
     display: flex;
     align-items: center;
     min-height: 32px;
   }
-  .resi-cell2-input {
+  .resi-cell-input {
     width: 200px;
   }
-  .resi-cell2--daterange {
+  .resi-cell--daterange {
     max-width: 260px;
   }
-  .resi-cell2-select {
+  .resi-cell-select {
     width: 200px;
     box-sizing: border-box;
     margin-right: 10px;
@@ -957,8 +955,12 @@ export default {
       width: 88px;
     }
   }
-  .resi-cell2-select:last-child {
+  .resi-cell-select:last-child {
     margin-right: 0;
   }
 }
+
+.mt10 {
+  margin-top: 10px;
+}
 </style>