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,81 +40,90 @@
           label-width="150px"
           style="display: block"
         >
-          <el-select
+          <el-input
-            v-model.trim="fmData.villageId"
+            v-if="formType == 'detail'"
-            placeholder="请选择小区"
+            class="item_width_2"
-            size="small"
+            placeholder="请输入来源地"
-            clearable
+            disabled
-            class="resi-cell-select"
+            v-model="fmData.allName"
-            @clear="handleClearVillage"
+          />
-            @change="handleChangeV"
+          <template v-else>
-            :disabled="formType === 'edit'"
+            <el-select
-            style="margin-right: 8px; width: 120px"
+              v-model.trim="fmData.villageId"
-          >
+              placeholder="请选择小区"
-            <el-option
+              size="small"
-              v-for="item in optionsV"
+              clearable
-              :key="item.value"
+              class="resi-cell-select"
-              :label="item.label"
+              @clear="handleClearVillage"
-              :value="item.value"
+              @change="handleChangeV"
+              :disabled="formType === 'edit'"
+              style="margin-right: 8px; width: 120px"
             >
-            </el-option>
+              <el-option
-          </el-select>
+                v-for="item in optionsV"
-          <el-select
+                :key="item.value"
-            v-model.trim="fmData.buildId"
+                :label="item.label"
-            placeholder="楼号"
+                :value="item.value"
-            size="small"
+              >
-            clearable
+              </el-option>
-            style="margin-right: 8px; width: 120px"
+            </el-select>
-            class="resi-cell-select"
+            <el-select
-            :disabled="changeVDisabled || formType === 'edit'"
+              v-model.trim="fmData.buildId"
-            @clear="handleClearBuild"
+              placeholder="楼号"
-            @change="handleChangeB"
+              size="small"
-          >
+              clearable
-            <el-option
+              style="margin-right: 8px; width: 120px"
-              v-for="item in optionsB"
+              class="resi-cell-select"
-              :key="item.value"
+              :disabled="changeVDisabled || formType === 'edit'"
-              :label="item.label"
+              @clear="handleClearBuild"
-              :value="item.value"
+              @change="handleChangeB"
             >
-            </el-option>
+              <el-option
-          </el-select>
+                v-for="item in optionsB"
-          <el-select
+                :key="item.value"
-            v-model.trim="fmData.unitId"
+                :label="item.label"
-            :disabled="changeBDisabled || formType === 'edit'"
+                :value="item.value"
-            placeholder="单元"
+              >
-            size="small"
+              </el-option>
-            clearable
+            </el-select>
-            style="margin-right: 8px; width: 120px"
+            <el-select
-            class="resi-cell-select"
+              v-model.trim="fmData.unitId"
-            @click="handleClearDan"
+              :disabled="changeBDisabled || formType === 'edit'"
-            @change="handleChangeD"
+              placeholder="单元"
-          >
+              size="small"
-            <el-option
+              clearable
-              v-for="item in optionsD"
+              style="margin-right: 8px; width: 120px"
-              :key="item.value"
+              class="resi-cell-select"
-              :label="item.label"
+              @click="handleClearDan"
-              :value="item.value"
+              @change="handleChangeD"
             >
-            </el-option>
+              <el-option
-          </el-select>
+                v-for="item in optionsD"
-          <el-select
+                :key="item.value"
-            v-model.trim="fmData.homeId"
+                :label="item.label"
-            :disabled="changeDDisabled || formType === 'edit'"
+                :value="item.value"
-            placeholder="房号"
+              >
-            size="small"
+              </el-option>
-            clearable
+            </el-select>
-            @change="handleChangeH"
+            <el-select
-            style="width: 120px"
+              v-model.trim="fmData.homeId"
-            class="resi-cell-select"
+              :disabled="changeDDisabled || formType === 'edit'"
-          >
+              placeholder="房号"
-            <el-option
+              size="small"
-              v-for="item in optionsH"
+              clearable
-              :key="item.value"
+              @change="handleChangeH"
-              :label="item.label"
+              style="width: 120px"
-              :value="item.value"
+              class="resi-cell-select"
             >
-            </el-option>
+              <el-option
-          </el-select>
+                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" 
+          <el-input
-            v-model="nowAllCode" clearable @change="handleNowArea"></el-cascader>
+            v-if="formType == 'detail'"
-          <!-- <el-input
+            class="item_width_2"
-            class="item_width_1"
             placeholder="请输入来源地"
+            disabled
             v-model="fmData.sourceAddress"
-          > -->
+          />
-          </el-input>
+          <el-cascader v-else ref="nowArea" class="item_width_1" :props="areaProps" 
-        </el-form-item>
+            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="年龄">