Merge branch 'dev-huji' into test

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"

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>
 

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)
@@ -771,13 +771,13 @@ export default {
     },
 
     async handleComfirm() {
-      this.btnDisable = true
+      
       // setTimeout(() => {
       //   this.btnDisable = false
       // }, 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)) {
@@ -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()
           
         }
       })
@@ -846,6 +847,7 @@ export default {
       this.orgId = ''
       this.nowAllCode = []
       this.btnDisable = false
+      this.userInfo = {}
       this.fmData = iniFmData()
     }
   }

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"