Merge branch 'dev-huji' into dev

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

@@ -40,6 +40,14 @@
           label-width="150px"
           style="display: block"
         >
+          <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="请选择小区"
@@ -115,6 +123,7 @@
               >
               </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-form-item>
+          />
+          <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"

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="年龄">