From c3cb81f9ac92fd6c61e662b636414b6437379d52 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Fri, 22 Mar 2024 10:23:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E5=8D=95=E4=B8=AA=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/addResi.vue              | 34 +++++----
 src/views/components/editResi.vue             | 69 +++++++++----------
 .../base/smartImport/cpts/createdTask.vue     |  2 +-
 src/views/modules/portrayal/house/index.vue   |  4 +-
 src/views/modules/portrayal/jumin/index.vue   | 49 ++++++-------
 5 files changed, 75 insertions(+), 83 deletions(-)

diff --git a/src/views/components/addResi.vue b/src/views/components/addResi.vue
index 814288282..1c481069e 100644
--- a/src/views/components/addResi.vue
+++ b/src/views/components/addResi.vue
@@ -94,7 +94,8 @@
                     </el-form-item>
                 </div>
                 <h5>居住信息登记</h5>
-                    <section v-for="(item, index) in this.form.resideInfoDtos" :key="index"  class="flex_box">
+                    <section v-for="(item, index) in this.form.resideInfoDtos" :key="index" >
+                               <div class="flex_box">
                                 <el-form-item label="所属组织" class="font-color-orange flex_item_width1"
                                     :prop="`resideInfoDtos[${index}].gridId`" :rules="[
                                     { required: true, message: '请选择所属组织', trigger: 'blur' },
@@ -119,8 +120,8 @@
 
                                 <el-form-item :prop="`resideInfoDtos[${index}].buildId`" label-width="0"
                                     style="margin:0px" :rules="[
-                { required: true, message: '请选择楼栋', trigger: 'blur' },
-            ]" class="flex_item_width3">
+                                    { required: true, message: '请选择楼栋', trigger: 'blur' },
+                                ]" class="flex_item_width3">
                                     <el-select v-model.trim="form.resideInfoDtos[index].buildId" placeholder="楼号"
                                         size="small" clearable @change="handleChangeB(index)"
                                         class=" f-bto0">
@@ -131,8 +132,8 @@
                                 </el-form-item>
                                 <el-form-item :prop="`resideInfoDtos[${index}].unitId`" label-width="0"
                                     style="margin:0px" :rules="[
-                { required: true, message: '请选择单元', trigger: 'blur' },
-            ]"  class="flex_item_width3">
+                                    { required: true, message: '请选择单元', trigger: 'blur' },
+                                ]"  class="flex_item_width3">
                                     <el-select v-model.trim="form.resideInfoDtos[index].unitId" placeholder="单元"
                                         size="small" clearable class=" f-bto0"
                                         @change="handleChangeD(index)">
@@ -143,8 +144,8 @@
                                 </el-form-item>
                                 <el-form-item :prop="`resideInfoDtos[${index}].homeId`" label-width="0"
                                     style="margin:0px " :rules="[
-                { required: true, message: '请选择房屋', trigger: 'blur' },
-            ]"  class="flex_item_width3">
+                                    { required: true, message: '请选择房屋', trigger: 'blur' },
+                                ]"  class="flex_item_width3">
                                     <el-select v-model.trim="form.resideInfoDtos[index].homeId" placeholder="房号"
                                         size="small" clearable class=" f-bto0"
                                         @change="handleChangeH(index)">
@@ -153,7 +154,15 @@
                                         </el-option>
                                     </el-select>
                                 </el-form-item>
-                              
+                                <el-button type="primary" size="mini" icon="el-icon-plus" circle
+                                    @click="handelClickAddHouse" style="margin-left: 16px; height: 30px;"></el-button>
+                                <el-button type="danger" v-if="form.resideInfoDtos.length > 1" size="small"
+                                    icon="el-icon-minus" @click="handelClickDelHouse(index)" style="height: 30px;"
+                                    circle>
+                                </el-button>
+                               </div>
+                               <div  class="flex_box">
+
                                 <el-form-item label="人房关系" class="font-color-blue flex_item_width1">
                                     <el-select v-model="form.resideInfoDtos[index].resiHouseRel" placeholder="请选择"
                                         size="small" class="list_item_width_1"
@@ -193,12 +202,9 @@
                                             :label="item.label" :value="item.value"></el-option>
                                     </el-select>
                                 </el-form-item>
-                                <el-button type="primary" size="mini" icon="el-icon-plus" circle
-                                    @click="handelClickAddHouse" style="margin-left: 16px; height: 30px;"></el-button>
-                                <el-button type="danger" v-if="form.resideInfoDtos.length > 1" size="small"
-                                    icon="el-icon-minus" @click="handelClickDelHouse(index)" style="height: 30px;"
-                                    circle>
-                                </el-button>
+                               </div>
+                                
+                              
                     </section>
                 <h5>拓展信息登记</h5>
                 <div class="flex_box">
diff --git a/src/views/components/editResi.vue b/src/views/components/editResi.vue
index 2b333c934..4e964e28f 100644
--- a/src/views/components/editResi.vue
+++ b/src/views/components/editResi.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="div_form" v-loading="loading">
     <div class="form">
-      <el-form :model="form" :rules="rules" label-width="100px" ref="editForm">
+      <el-form :model="form" :rules="rules" label-width="105px" ref="editForm">
         <h5 style="margin-top: 6px">基础信息登记</h5>
         <div class="flex_box">
               <el-form-item
@@ -197,7 +197,7 @@
                 </el-select>
               </el-form-item>
           
-              <el-form-item label="籍贯" prop="baseInfoDto.nativePlace">
+              <el-form-item label="籍贯" class="flex_item_width1" prop="baseInfoDto.nativePlace">
                 <el-input
                   v-model="form.baseInfoDto.nativePlace"
                   placeholder="请输入内容"
@@ -229,12 +229,11 @@
           <section
             v-for="(rowItem, index) in this.form.resideInfoDtos"
             :key="index"
-            class="flex_box"
           >
-                <el-form-item
+          <div class="flex_box">  
+             <el-form-item
                   label="所属组织"
                   class="font-color-orange flex_item_width1"
-                  style="margin: 0px"
                   :prop="`resideInfoDtos[${index}].gridId`"
                   :rules="[
                     {
@@ -260,7 +259,6 @@
                 <el-form-item
                   :prop="`resideInfoDtos[${index}].villageId`"
                   label="所属房屋"
-                  style="margin: 0px"
                   label-width="100px"
                   class="font-color-orange flex_item_width4"
                   :rules="[
@@ -364,8 +362,27 @@
                     </el-option>
                   </el-select>
                 </el-form-item>
-            
-                <el-form-item label="人房关系" class="font-color-blue">
+                <el-button
+                  type="primary"
+                  size="mini"
+                  icon="el-icon-plus"
+                  circle
+                  @click="handelClickAddHouse"
+                  style="margin-left: 16px; height: 30px"
+                ></el-button>
+                <el-button
+                  type="danger"
+                  v-if="form.resideInfoDtos.length > 1 && rowItem.accessable !== 0"
+                  size="small"
+                  icon="el-icon-minus"
+                  @click="handelClickDelHouse(index)"
+                  style="height: 30px"
+                  circle
+                >
+                </el-button>
+              </div>
+          <div class="flex_box">
+            <el-form-item label="人房关系" class="font-color-blue flex_item_width1">
                   <el-select
                     v-model="form.resideInfoDtos[index].resiHouseRel"
                     placeholder="请选择"
@@ -383,7 +400,7 @@
                     ></el-option>
                   </el-select>
                 </el-form-item>
-                <el-form-item label="人户状况" class="font-color-blue">
+                <el-form-item label="人户状况" class="font-color-blue flex_item_width1">
                   <el-select
                     v-model="form.resideInfoDtos[index].householdSituation"
                     placeholder="请选择"
@@ -402,7 +419,7 @@
                 </el-form-item>
                 <el-form-item
                   label="与户主关系"
-                  class="font-color-blue font-color-blue2"
+                  class="font-color-blue font-color-blue2 flex_item_width1"
                 >
                   <el-select
                     v-model="form.resideInfoDtos[index].houseHolderRel"
@@ -421,7 +438,7 @@
                   </el-select>
                 </el-form-item>
            
-                <el-form-item label="户籍所在地" v-if="form.resideInfoDtos[index].householdSituation == 'rzhbz'">
+                <el-form-item label="户籍所在地" v-if="form.resideInfoDtos[index].householdSituation == 'rzhbz'" class="flex_item_width1">
                   <el-input
                     class="list_item_width_1"
                     v-model="form.resideInfoDtos[index].placeOfDomicile"
@@ -434,7 +451,7 @@
              
                 <el-form-item label="现居住地址"   v-else-if="
                   form.resideInfoDtos[index].householdSituation == 'hzrbz'
-                ">
+                " class="flex_item_width1">
                   <el-input
                     class="list_item_width_1"
                     v-model="form.resideInfoDtos[index].currentResidence"
@@ -445,7 +462,8 @@
                   ></el-input>
                 </el-form-item>
              
-                <el-form-item label="迁出时间"  v-else-if="
+                <el-form-item label="迁出时间" 
+                 class="flex_item_width1"  v-else-if="
                   form.resideInfoDtos[index].householdSituation == 'rhdbz'
                 ">
                   <el-date-picker
@@ -461,24 +479,7 @@
                   >
                   </el-date-picker>
                 </el-form-item>
-                <el-button
-                  type="primary"
-                  size="mini"
-                  icon="el-icon-plus"
-                  circle
-                  @click="handelClickAddHouse"
-                  style="margin-left: 16px; height: 30px"
-                ></el-button>
-                <el-button
-                  type="danger"
-                  v-if="form.resideInfoDtos.length > 1 && rowItem.accessable !== 0"
-                  size="small"
-                  icon="el-icon-minus"
-                  @click="handelClickDelHouse(index)"
-                  style="height: 30px"
-                  circle
-                >
-                </el-button>
+          </div> 
           </section>
         <h5>拓展信息登记</h5>
         <div class="flex_box">
@@ -638,7 +639,6 @@
            
               <el-form-item  class="flex_item_width1"
                 label="再就业优惠证号"
-                label-width="120px"
                 prop="unemployedDto.employmentNum"
                 v-if="
               (form.workInfoDto.careerStatus == 0 ||
@@ -677,7 +677,6 @@
             "
               class="flex_item_width1"
                 label="是否领取失业金"
-                label-width="120px"
                 prop="unemployedDto.unempCompensationFlag"
               >
                 <el-radio-group
@@ -699,7 +698,6 @@
             "
               class="flex_item_width1"
                 label="是否就业困难对象"
-                label-width="150px"
                 prop="unemployedDto.employmentHardFlag"
               >
                 <el-radio-group v-model="form.unemployedDto.employmentHardFlag">
@@ -719,7 +717,6 @@
             "
               class="flex_item_width1"
                 label="劳动就业愿望"
-                label-width="105px"
                 prop="workInfoDto.employmentWish"
               >
                 <el-select
@@ -755,7 +752,6 @@
               <el-form-item
               v-if="form.familyInfoDto.elderlyFlag == 1" class="flex_item_width1"
                 label="与赡养人关系"
-                label-width="105px"
                 prop="familyInfoDto.elderlyRelation"
               >
                 <el-select
@@ -776,7 +772,6 @@
               <el-form-item
               v-if="form.familyInfoDto.elderlyFlag == 1" class="flex_item_width1"
                 label="赡养人联系电话"
-                label-width="150px"
                 prop="familyInfoDto.dependantMobile"
               >
                 <el-input
diff --git a/src/views/modules/base/smartImport/cpts/createdTask.vue b/src/views/modules/base/smartImport/cpts/createdTask.vue
index cf0634400..8089b9832 100644
--- a/src/views/modules/base/smartImport/cpts/createdTask.vue
+++ b/src/views/modules/base/smartImport/cpts/createdTask.vue
@@ -417,7 +417,7 @@ export default {
     },
     // 下载单个模板
     async handelClickDownModule() {
-      let url = "/actual/base/intelligentImportData/downloadImportModule";
+      let url = "/actual/base/intelligentImportData/autoGenerateExcelModule";
       let params = {
         importCategory: this.form.importCategory,
       };
diff --git a/src/views/modules/portrayal/house/index.vue b/src/views/modules/portrayal/house/index.vue
index 98435f874..b9b808e4e 100644
--- a/src/views/modules/portrayal/house/index.vue
+++ b/src/views/modules/portrayal/house/index.vue
@@ -55,7 +55,7 @@
         </el-col>
         
         <el-col :span="6" class="f-flex">
-          <div class="f-label"><b>证件号：</b></div>
+          <div class="f-label">证件号：</div>
             <div class="f-left8 f-font-color">
               {{
                 houseDetailObj.ownerIdCard
@@ -86,7 +86,7 @@
             >
         </el-col>
         <el-col :span="6" class="f-flex">
-          <div class="f-label"><b>联系电话：</b></div>
+          <div class="f-label">联系电话：</div>
           <div class="f-left8 f-font-color">
             {{
               houseDetailObj.ownerPhone
diff --git a/src/views/modules/portrayal/jumin/index.vue b/src/views/modules/portrayal/jumin/index.vue
index 5fcba222e..17efcf43a 100644
--- a/src/views/modules/portrayal/jumin/index.vue
+++ b/src/views/modules/portrayal/jumin/index.vue
@@ -168,7 +168,6 @@
           >
         </div>
         <div  class="f-flex">
-          <div class="f-flex">
             <div class="f-label">婚姻状况：</div>
             <span
               class="f-left8 f-font-color"
@@ -177,10 +176,8 @@
               {{ categoryDictText() }}</span
             >
             <span v-else> -- </span>
-          </div>
         </div>
         <div  class="f-flex">
-          <div class="f-flex">
             <div class="f-label">配偶情况：</div>
             <span
               class="f-left8 f-font-color"
@@ -188,7 +185,16 @@
               >{{ spouseText() }}</span
             >
             <span v-else> -- </span>
-          </div>
+        </div>
+        <div class="f-flex">
+            <div class="f-label">籍贯：</div>
+            <span class="f-left8 f-font-color">{{
+              resiDetailObj.baseInfoDto
+                ? resiDetailObj.baseInfoDto.nativePlace
+                  ? resiDetailObj.baseInfoDto.nativePlace
+                  : "--"
+                : "--"
+            }}</span>
         </div>
         <div  class="f-flex">
           <div class="f-label">备注：</div>
@@ -211,7 +217,6 @@
           >
         </div>
         <div  class="f-flex">
-          <div class="f-flex">
             <div class="f-label">更新时间：</div>
             <span class="f-left8 f-font-color" v-if="resiDetailObj.baseInfoDto">
               {{
@@ -221,27 +226,28 @@
               }}</span
             >
           </div>
-        </div>
       </div>
       <div class="title-small">居住信息</div>
       <section
         v-for="(item, indexK) in resiDetailObj.resideInfoDtos"
         :key="indexK"
-        class="flex_box"
       >
-            <div class="f-flex">
+      <div  class="flex_box">
+        <div class="f-flex">
               <div class="f-label"><b>所属网格：</b></div>
               <span class="f-left8 f-font-color">
                 {{ item.gridName || "--" }}
               </span>
             </div>
-            <div class="f-flex">
+            <div class="f-flex" style="width: 600px">
               <div class="f-label"><b>所属房屋：</b></div>
               <span class="f-left8 f-font-color">
                 {{ item.gridName + "-" + item.homeName || "--" }}
               </span>
             </div>
-            <div class="f-flex">
+        </div>
+      <div  class="flex_box">
+        <div class="f-flex">
               <div class="f-label"><b>人房关系：</b></div>
               <span class="f-left8 f-font-color">
                 {{
@@ -273,7 +279,8 @@
               houseHolderRelText(indexK)
             }}</span>
           </div>
-      </section>
+      </div>
+    </section>
 
       <div class="title-small" id="ext">拓展信息</div>
           <section class="flex_box">
@@ -285,16 +292,7 @@
                 : "--"
             }}</span>
           </div>
-          <div class="f-flex">
-            <div class="f-label">籍贯：</div>
-            <span class="f-left8 f-font-color">{{
-              resiDetailObj.baseInfoDto
-                ? resiDetailObj.baseInfoDto.nativePlace
-                  ? resiDetailObj.baseInfoDto.nativePlace
-                  : "--"
-                : "--"
-            }}</span>
-        </div>
+          
         <div  class="f-flex">
           <div class="f-label"><b>就业状态：</b></div>
           <span class="f-left8 f-font-color" v-if="resiDetailObj.workInfoDto">
@@ -426,14 +424,7 @@
               : "--"
           }}</span>
         </div>
-        <div
-          class="f-flex"
-          v-if="
-            resiDetailObj.workInfoDto &&
-            resiDetailObj.workInfoDto.careerStatus >= 1 &&
-            resiDetailObj.workInfoDto.careerStatus <= 5
-          "
-        >
+        <div class="f-flex">
           <div class="f-label">有无赡养人：</div>
           <div class="f-left8 f-font-color">
             {{