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 1/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 2c9a6405..ccf2018e 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 e8677dac..9995bdaf 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>

From 0954a007e48b9a0db8220c95dcdf923fc33f4af5 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Fri, 13 May 2022 09:59:52 +0800
Subject: [PATCH 2/4] dd

---
 src/views/modules/base/huji/immigration/edit.vue  | 11 ++++++-----
 src/views/modules/base/huji/immigration/index.vue | 11 +++++++----
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/views/modules/base/huji/immigration/edit.vue b/src/views/modules/base/huji/immigration/edit.vue
index 1365b5ec..8cf1a260 100644
--- a/src/views/modules/base/huji/immigration/edit.vue
+++ b/src/views/modules/base/huji/immigration/edit.vue
@@ -138,6 +138,7 @@
             placeholder="请输入姓名	"
             v-model="fmData.name"
             :disabled="formType === 'edit'"
+            maxlength="30"
           >
           </el-input>
 
@@ -199,7 +200,7 @@
             size="small"
             clearable
             class="item_width_1"
-            :disabled="formType === 'edit'"
+            :disabled="true"
           >
             <el-option
               v-for="item in optionsGender"
@@ -222,7 +223,7 @@
             show-word-limit
             placeholder="请输入"
             v-model="fmData.age"
-            :disabled="formType === 'edit'"
+            :disabled="true"
           >
           </el-input>
         </el-form-item>
@@ -235,9 +236,9 @@
         >
           <el-date-picker
             v-model="fmData.inTime"
-            type="datetime"
+            type="date"
             placeholder="迁入时间"
-            value-format="yyyy-MM-dd HH:mm:ss"
+            value-format="yyyy-MM-dd"
             class="item_width_1"
             :disabled="formType === 'edit'"
           >
@@ -797,7 +798,7 @@ export default {
             })
           }
           this.btnDisable = true
-          if (this.fmData.isCheck && this.userInfo && this.userInfo.resiHomeId) {
+          if (this.fmData.isCheck == '1' && this.userInfo && this.userInfo.resiHomeId) {
             const { user } = this.$store.state
             if (user.agencyId == this.userInfo.resiAgencyId) {
               if (this.userInfo.resiHomeId !== this.fmData.homeId) {
diff --git a/src/views/modules/base/huji/immigration/index.vue b/src/views/modules/base/huji/immigration/index.vue
index 316ca203..64134370 100644
--- a/src/views/modules/base/huji/immigration/index.vue
+++ b/src/views/modules/base/huji/immigration/index.vue
@@ -53,9 +53,10 @@
                 <el-form-item prop="buildId">
                   <el-select
                     v-model.trim="fmData.buildId"
-                    placeholder="请选择楼号"
+                    placeholder="楼号"
                     size="small"
                     clearable
+                    :disabled="changeVDisabled"
                     class="resi-cell-select resi-cell-select-middle"
                     @change="handleChangeB"
                   >
@@ -71,9 +72,10 @@
                 <el-form-item prop="unitId">
                   <el-select
                     v-model.trim="fmData.unitId"
-                    placeholder="请选择单元"
+                    placeholder="单元"
                     size="small"
                     clearable
+                    :disabled="changeBDisabled"
                     class="resi-cell-select resi-cell-select-middle"
                     @change="handleChangeD"
                   >
@@ -89,9 +91,10 @@
                 <el-form-item prop="homeId">
                   <el-select
                     v-model.trim="fmData.homeId"
-                    placeholder="请选择房号"
+                    placeholder="房号"
                     size="small"
                     clearable
+                    :disabled="changeDDisabled"
                     class="resi-cell-select resi-cell-select-middle"
                   >
                     <el-option
@@ -1032,7 +1035,7 @@ export default {
     box-sizing: border-box;
     margin-right: 10px;
     &-middle {
-      width: 130px;
+      width: 120px;
     }
     &-small {
       width: 88px;

From 3b9fe8ab3f68f54cdba91a9129ca1cd4eaa3f64f Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Fri, 13 May 2022 10:07:39 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=AF=B9=E6=96=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/resi.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 7f2b7357..a76cfa99 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -126,10 +126,10 @@
                        type="text"
                        size="small"
                        class="btn-color-look">查看</el-button> -->
-            <el-button @click="handleTransfer(scope.row)"
+            <!-- <el-button @click="handleTransfer(scope.row)" 
                        type="text"
                        size="small"
-                       class="div-table-button--detail">变动</el-button>
+                       class="div-table-button--detail">变动</el-button> -->
             <el-button @click="handleChangeRecord(scope.row)"
                        type="text"
                        size="small"

From e5d8e469c5b80caa25800429f37e4f0810d95601 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Fri, 13 May 2022 10:12:48 +0800
Subject: [PATCH 4/4] 0

---
 src/views/modules/base/huji/chusheng/index.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/modules/base/huji/chusheng/index.vue b/src/views/modules/base/huji/chusheng/index.vue
index 9995bdaf..99b9837f 100644
--- a/src/views/modules/base/huji/chusheng/index.vue
+++ b/src/views/modules/base/huji/chusheng/index.vue
@@ -5,6 +5,7 @@
         ref="searchForm"
         :inline="true"
         :model="fmData"
+        :label-width="'100px'"
         class="demo-form-inline"
       >
         <div>