From 8ff55a762b162ddf80239c4851e396c3c60d8354 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Thu, 12 May 2022 13:51:53 +0800
Subject: [PATCH 1/8] 66

---
 src/views/modules/base/huji/chusheng/cpts/edit.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/modules/base/huji/chusheng/cpts/edit.vue b/src/views/modules/base/huji/chusheng/cpts/edit.vue
index 003d84b3..2c9a6405 100644
--- a/src/views/modules/base/huji/chusheng/cpts/edit.vue
+++ b/src/views/modules/base/huji/chusheng/cpts/edit.vue
@@ -808,7 +808,6 @@ export default {
       this.optionsB = [];
       this.optionsH = [];
       this.optionsD = [];
-      this.optionsRelation = [];
       this.fmData = iniFmData();
     },
     // 开启加载动画

From aa2ffbe015938f79a40a82e15281cfed9f7c04f5 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Thu, 12 May 2022 14:45:53 +0800
Subject: [PATCH 2/8] dd

---
 src/views/modules/base/huji/immigration/edit.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/base/huji/immigration/edit.vue b/src/views/modules/base/huji/immigration/edit.vue
index 89424a12..f8dcf6eb 100644
--- a/src/views/modules/base/huji/immigration/edit.vue
+++ b/src/views/modules/base/huji/immigration/edit.vue
@@ -777,7 +777,7 @@ export default {
       // }, 10000)
       this.$refs['ref_form'].validate((valid, messageObj) => {
         if (!valid) {
-          app.util.validateRule(messageObj)
+          // app.util.validateRule(messageObj)
           this.btnDisable = false
         } else {
           if (!formVltHelper.userOrMobile(this.fmData.mobile)) {
@@ -846,6 +846,7 @@ export default {
       this.orgId = ''
       this.nowAllCode = []
       this.btnDisable = false
+      this.userInfo = {}
       this.fmData = iniFmData()
     }
   }

From 010ccbe8770c9c6924c6e08fb4c35a9065831087 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Thu, 12 May 2022 14:55:21 +0800
Subject: [PATCH 3/8] dd

---
 src/views/modules/base/huji/immigration/edit.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/views/modules/base/huji/immigration/edit.vue b/src/views/modules/base/huji/immigration/edit.vue
index f8dcf6eb..c226f35a 100644
--- a/src/views/modules/base/huji/immigration/edit.vue
+++ b/src/views/modules/base/huji/immigration/edit.vue
@@ -771,7 +771,7 @@ export default {
     },
 
     async handleComfirm() {
-      this.btnDisable = true
+      
       // setTimeout(() => {
       //   this.btnDisable = false
       // }, 10000)
@@ -786,6 +786,7 @@ export default {
               message: '手机号格式有误'
             })
           }
+          this.btnDisable = true
           if (this.fmData.isCheck && this.userInfo && this.userInfo.resiHomeId) {
             const { user } = this.$store.state
             if (user.agencyId == this.userInfo.resiAgencyId) {
@@ -804,8 +805,8 @@ export default {
                 return
               }
             }
-            
-          } else this.submit()
+          }
+          this.submit()
           
         }
       })

From 4828379239d73580798136d4f0e98b21f74e54cb Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Thu, 12 May 2022 15:03:11 +0800
Subject: [PATCH 4/8] dd

---
 src/views/modules/base/huji/immigration/edit.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/base/huji/immigration/edit.vue b/src/views/modules/base/huji/immigration/edit.vue
index c226f35a..6754fd0d 100644
--- a/src/views/modules/base/huji/immigration/edit.vue
+++ b/src/views/modules/base/huji/immigration/edit.vue
@@ -500,7 +500,7 @@ export default {
               message: `请联系${data.resiAgencyName}迁出该居民后操作`
             })
             this.btnDisable = true
-          }
+          } else this.btnDisable = false
           this.userInfo = { ...data }
         } else {
           this.$message.error(msg)

From 5c62e71359d23768ffd95d61d9f770f3ce6544a9 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Thu, 12 May 2022 15:08:26 +0800
Subject: [PATCH 5/8] dd

---
 src/views/modules/base/huji/immigration/index.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/base/huji/immigration/index.vue b/src/views/modules/base/huji/immigration/index.vue
index 06faa43f..283abe28 100644
--- a/src/views/modules/base/huji/immigration/index.vue
+++ b/src/views/modules/base/huji/immigration/index.vue
@@ -347,9 +347,10 @@
         >
         </el-table-column>
 
-        <el-table-column fixed="right" label="操作" align="center" width="160">
+        <el-table-column fixed="right" label="操作" align="center" width="120">
           <template slot-scope="scope">
             <el-button
+              v-if="false"
               @click="handleWatch(scope.$index)"
               type="text"
               size="small"

From 7ea189d71dbffb7d20c8c1e4231d726996776f1a Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Thu, 12 May 2022 15:14:04 +0800
Subject: [PATCH 6/8] dd

---
 src/views/components/resiChangeRecord.vue | 41 ++++++++++++-----------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/src/views/components/resiChangeRecord.vue b/src/views/components/resiChangeRecord.vue
index 7d92656a..a13585a8 100644
--- a/src/views/components/resiChangeRecord.vue
+++ b/src/views/components/resiChangeRecord.vue
@@ -20,38 +20,46 @@
                        label="变更类型"
                        width="80">
       </el-table-column>
-      <el-table-column prop="beforeChangeName"
-                       header-align="center"
-                       align="center"
-                       label="变更前"
-                       width="230">
-      </el-table-column>
-      <el-table-column prop="afterChangeName"
+      <el-table-column prop="reason"
                        header-align="center"
                        align="center"
-                       label="变更后"
-                       min-width="230">
+                       label="原因"
+                       show-overflow-tooltip
+                       min-width="120">
       </el-table-column>
-
       <el-table-column prop="changeTime"
                        header-align="center"
                        align="center"
                        label="变更时间"
                        width="160">
       </el-table-column>
-      <el-table-column prop="remark"
+      <el-table-column prop="beforeChangeName"
                        header-align="center"
                        align="center"
-                       label="原因"
+                       label="变更前"
                        show-overflow-tooltip
-                       min-width="120">
+                       width="230">
       </el-table-column>
+      <el-table-column prop="afterChangeName"
+                       header-align="center"
+                       align="center"
+                       label="变更后"
+                       show-overflow-tooltip
+                       min-width="230">
+      </el-table-column>
+      
       <el-table-column prop="operatorName"
                        header-align="center"
                        align="center"
                        label="操作人"
                        width="80">
       </el-table-column>
+      <el-table-column prop="createdTime"
+                       header-align="center"
+                       align="center"
+                       label="调整时间"
+                       width="160">
+      </el-table-column>
 
       <el-table-column prop="remark"
                        header-align="center"
@@ -60,12 +68,7 @@
                        show-overflow-tooltip
                        min-width="120">
       </el-table-column>
-      <el-table-column prop="createdTime"
-                       header-align="center"
-                       align="center"
-                       label="调整时间"
-                       width="160">
-      </el-table-column>
+      
     </el-table>
     <div>
       <el-pagination @size-change="handleSizeChange"

From c99fae3264581adfb5cf9ff2f2f6168c01446433 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Thu, 12 May 2022 15:36:56 +0800
Subject: [PATCH 7/8] 000

---
 .../modules/base/huji/chusheng/index.vue      | 38 ++++++++++++++++---
 1 file changed, 33 insertions(+), 5 deletions(-)

diff --git a/src/views/modules/base/huji/chusheng/index.vue b/src/views/modules/base/huji/chusheng/index.vue
index bdf9db96..e8677dac 100644
--- a/src/views/modules/base/huji/chusheng/index.vue
+++ b/src/views/modules/base/huji/chusheng/index.vue
@@ -275,41 +275,69 @@
           width="100"
           align="center"
           label="手机号"
+          :show-overflow-tooltip="true"
         >
         </el-table-column>
 
-        <el-table-column prop="idCard" align="center" label="身份证号">
+        <el-table-column
+          prop="idCard"
+          align="center"
+          label="身份证号"
+          :show-overflow-tooltip="true"
+        >
         </el-table-column>
 
         <el-table-column prop="gender" align="center" label="性别">
         </el-table-column>
 
-        <el-table-column prop="birthday" align="center" label="出生日期">
+        <el-table-column
+          prop="birthday"
+          align="center"
+          label="出生日期"
+          :show-overflow-tooltip="true"
+        >
         </el-table-column>
 
-        <el-table-column prop="birthplace" align="center" label="出生地">
+        <el-table-column
+          prop="birthplace"
+          align="center"
+          label="出生地"
+          :show-overflow-tooltip="true"
+        >
         </el-table-column>
 
         <el-table-column
           prop="parentName"
           align="center"
           label="出生人父/母姓名"
+          :show-overflow-tooltip="true"
         >
         </el-table-column>
 
         <el-table-column prop="count" align="center" label="胎次">
         </el-table-column>
 
-        <el-table-column prop="reportDate" align="center" label="申报户口日期">
+        <el-table-column
+          prop="reportDate"
+          align="center"
+          label="申报户口日期"
+          :show-overflow-tooltip="true"
+        >
         </el-table-column>
 
-        <el-table-column prop="householderName" align="center" label="户主姓名">
+        <el-table-column
+          prop="householderName"
+          align="center"
+          label="户主姓名"
+          :show-overflow-tooltip="true"
+        >
         </el-table-column>
 
         <el-table-column
           prop="householderRelation"
           align="center"
           label="与户主关系"
+          :show-overflow-tooltip="true"
         >
         </el-table-column>
 

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 8/8] 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 6754fd0d..1365b5ec 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 283abe28..316ca203 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="年龄">