From 46d0ea739e61a46d89d5c9a40046c465a3398845 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Fri, 24 Feb 2023 15:34:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B4=E8=B6=A3=E7=88=B1=E5=A5=BD/=E5=BF=97?=
 =?UTF-8?q?=E6=84=BF=E8=80=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/resiForm.vue |  10 +-
 src/views/components/resiInfo.vue | 211 ++++++++++++++++++------------
 2 files changed, 134 insertions(+), 87 deletions(-)

diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue
index 2015ecae9..07817648a 100644
--- a/src/views/components/resiForm.vue
+++ b/src/views/components/resiForm.vue
@@ -232,9 +232,11 @@
                                       size="small"
                                       v-model="form[itemj.id][itemk.formName]">
                                         <el-checkbox v-for="items in itemk.opction" 
-                                                     :label="items.label != itemk.label ? items.label :''"  
+                                                     :label="items.value"  
                                                      :style="{'margin-right':items.label != itemk.label? '' :'19px'}"   
-                                                     :key="items.label"></el-checkbox>
+                                                     :key="items.value"
+                                                     :value="items.value"
+                                                     >{{items.label}}</el-checkbox>
                                     </el-checkbox-group>
                                   </template>
                                   <template v-else-if="itemk.itemType == 'datepicker1'">
@@ -255,7 +257,9 @@
                                               :options="itemk.opction"
                                               clearable
                                               size="small"
-
+                                              :label="itemk.opction.label"
+                                              :value="itemk.opction.value"
+                                              @change="handleCateSlect"
                                               ></el-cascader>
                                 </template>
                                 <template v-else-if="itemk.itemType == 'number'">
diff --git a/src/views/components/resiInfo.vue b/src/views/components/resiInfo.vue
index b54561fe4..db8aa5cb9 100644
--- a/src/views/components/resiInfo.vue
+++ b/src/views/components/resiInfo.vue
@@ -444,68 +444,7 @@
                               </el-col>
                           </el-row>
                       </el-tab-pane>
-                      <el-tab-pane label="迁出" v-if="qcShowStatus">
-                        <el-row>
-                              <el-col :span="8">
-                                <div class="f-flex f-bto16 f-top24">
-                                   <div class="f-labels">迁出日期	 :</div>  
-                                <span class="f-left8 f-font-color">{{residentMoveOutRecordObj?residentMoveOutRecordObj.outOfTime?residentMoveOutRecordObj.outOfTime.substr(0,10):'--':'--'}}</span> 
-                               </div>
-                              </el-col>
-                              <el-col :span="8">
-                                <div class="f-flex f-bto16 f-top24">
-                                   <div class="f-labels">迁出类型	:</div>  
-                                <span class="f-left8 f-font-color">{{residentMoveOutRecordObj?residentMoveOutRecordObj.type	?residentMoveOutRecordObj.type	:'--':'--'}}</span> 
-                                </div>
-                              </el-col>
-                              <el-col :span="8">
-                                <div class="f-flex f-bto16 f-top24">
-                                   <div class="f-labels">迁出原因	:</div>  
-                                <span class="f-left8 f-font-color">{{residentMoveOutRecordObj?residentMoveOutRecordObj.reason	?residentMoveOutRecordObj.reason:'--':'--'}}</span> 
-                                </div>
-                              </el-col>
-                          </el-row>
-                          <el-row>
-                              <el-col :span="8">
-                                <div class="f-flex f-bto16 f-top24">
-                                   <div class="f-labels">迁出至组织		 :</div>  
-                                <span class="f-left8 f-font-color">{{residentMoveOutRecordObj?residentMoveOutRecordObj.deptId?residentMoveOutRecordObj.deptId:'--':'--'}}</span> 
-                               </div>
-                              </el-col>
-                              <el-col :span="8">
-                                <div class="f-flex f-bto16 f-top24">
-                                   <div class="f-labels">小区	:</div>  
-                                <span class="f-left8 f-font-color">{{residentMoveOutRecordObj?residentMoveOutRecordObj.villageName	?residentMoveOutRecordObj.villageName	:'--':'--'}}</span> 
-                                </div>
-                              </el-col>
-                              <el-col :span="8">
-                                <div class="f-flex f-bto16 f-top24">
-                                   <div class="f-labels">楼号		:</div>  
-                                <span class="f-left8 f-font-color">{{residentMoveOutRecordObj?residentMoveOutRecordObj.buildName	?residentMoveOutRecordObj.buildName:'--':'--'}}</span> 
-                                </div>
-                              </el-col>
-                          </el-row>
-                          <el-row>
-                              <el-col :span="8">
-                                <div class="f-flex f-bto16 f-top24">
-                                   <div class="f-labels">单元		 :</div>  
-                                <span class="f-left8 f-font-color">{{residentMoveOutRecordObj?residentMoveOutRecordObj.unitName	?residentMoveOutRecordObj.unitName	:'--':'--'}}</span> 
-                               </div>
-                              </el-col>
-                              <el-col :span="8">
-                                <div class="f-flex f-bto16 f-top24">
-                                   <div class="f-labels">房屋	:</div>  
-                                <span class="f-left8 f-font-color">{{residentMoveOutRecordObj?residentMoveOutRecordObj.homeName	?residentMoveOutRecordObj.homeName	:'--':'--'}}</span> 
-                                </div>
-                              </el-col>
-                              <el-col :span="8">
-                                <div class="f-flex f-bto16 f-top24">
-                                   <div class="f-labels">外迁地址 :</div>  
-                                <span class="f-left8 f-font-color">{{residentMoveOutRecordObj?residentMoveOutRecordObj.address	?residentMoveOutRecordObj.address:'--':'--'}}</span> 
-                                </div>
-                              </el-col>
-                          </el-row>
-                      </el-tab-pane>
+                     
                       <el-tab-pane label="更新记录">
                         <el-table
                           class="m-table-item"
@@ -538,6 +477,7 @@
       
       </el-table>
                       </el-tab-pane>
+                     
                       <el-tab-pane label="党员"  v-if="dyShowStatus">
                         <el-row>
                               <el-col :span="8">
@@ -826,7 +766,8 @@
                                   --
                                </span>
                          </section>
-                      </el-tab-pane>    <el-tab-pane label="死亡人员"  v-if="resiDetailObj.deathFlag">
+                      </el-tab-pane>    
+                      <el-tab-pane label="死亡人员"  v-if="resiDetailObj.deathFlag">
                         <el-row>
                               <el-col :span="8">
                                 <div class="f-flex f-bto16 f-top24">
@@ -856,6 +797,68 @@
                               </el-col>
                           </el-row>
                       </el-tab-pane>
+                      <el-tab-pane label="迁出" v-if="qcShowStatus">
+                        <el-row>
+                              <el-col :span="8">
+                                <div class="f-flex f-bto16 f-top24">
+                                   <div class="f-labels">迁出日期	 :</div>  
+                                <span class="f-left8 f-font-color">{{residentMoveOutRecordObj?residentMoveOutRecordObj.outOfTime?residentMoveOutRecordObj.outOfTime.substr(0,10):'--':'--'}}</span> 
+                               </div>
+                              </el-col>
+                              <el-col :span="8">
+                                <div class="f-flex f-bto16 f-top24">
+                                   <div class="f-labels">迁出类型	:</div>  
+                                <span class="f-left8 f-font-color">{{residentMoveOutRecordObj?residentMoveOutRecordObj.type	?residentMoveOutRecordObj.type	:'--':'--'}}</span> 
+                                </div>
+                              </el-col>
+                              <el-col :span="8">
+                                <div class="f-flex f-bto16 f-top24">
+                                   <div class="f-labels">迁出原因	:</div>  
+                                <span class="f-left8 f-font-color">{{residentMoveOutRecordObj?residentMoveOutRecordObj.reason	?residentMoveOutRecordObj.reason:'--':'--'}}</span> 
+                                </div>
+                              </el-col>
+                          </el-row>
+                          <el-row>
+                              <el-col :span="8">
+                                <div class="f-flex f-bto16 f-top24">
+                                   <div class="f-labels">迁出至组织		 :</div>  
+                                <span class="f-left8 f-font-color">{{residentMoveOutRecordObj?residentMoveOutRecordObj.deptId?residentMoveOutRecordObj.deptId:'--':'--'}}</span> 
+                               </div>
+                              </el-col>
+                              <el-col :span="8">
+                                <div class="f-flex f-bto16 f-top24">
+                                   <div class="f-labels">小区	:</div>  
+                                <span class="f-left8 f-font-color">{{residentMoveOutRecordObj?residentMoveOutRecordObj.villageName	?residentMoveOutRecordObj.villageName	:'--':'--'}}</span> 
+                                </div>
+                              </el-col>
+                              <el-col :span="8">
+                                <div class="f-flex f-bto16 f-top24">
+                                   <div class="f-labels">楼号		:</div>  
+                                <span class="f-left8 f-font-color">{{residentMoveOutRecordObj?residentMoveOutRecordObj.buildName	?residentMoveOutRecordObj.buildName:'--':'--'}}</span> 
+                                </div>
+                              </el-col>
+                          </el-row>
+                          <el-row>
+                              <el-col :span="8">
+                                <div class="f-flex f-bto16 f-top24">
+                                   <div class="f-labels">单元		 :</div>  
+                                <span class="f-left8 f-font-color">{{residentMoveOutRecordObj?residentMoveOutRecordObj.unitName	?residentMoveOutRecordObj.unitName	:'--':'--'}}</span> 
+                               </div>
+                              </el-col>
+                              <el-col :span="8">
+                                <div class="f-flex f-bto16 f-top24">
+                                   <div class="f-labels">房屋	:</div>  
+                                <span class="f-left8 f-font-color">{{residentMoveOutRecordObj?residentMoveOutRecordObj.homeName	?residentMoveOutRecordObj.homeName	:'--':'--'}}</span> 
+                                </div>
+                              </el-col>
+                              <el-col :span="8">
+                                <div class="f-flex f-bto16 f-top24">
+                                   <div class="f-labels">外迁地址 :</div>  
+                                <span class="f-left8 f-font-color">{{residentMoveOutRecordObj?residentMoveOutRecordObj.address	?residentMoveOutRecordObj.address:'--':'--'}}</span> 
+                                </div>
+                              </el-col>
+                          </el-row>
+                      </el-tab-pane>
                 </el-tabs>
 
   </div>
@@ -908,6 +911,8 @@ export default {
     residentMoveOutRecordObj:{},//迁出
     // 字典分割线
     educationDictonArr:[],
+    hobbyArr:[],
+    volunteerArr:[],
     disability_levelArr:[],
     illnessArr:[],
     householdArr:[],
@@ -923,7 +928,7 @@ export default {
    }
   },
   computed: {
-    gridName(){
+        gridName(){
        let arr = []
        if(this.resiDetailObj.houseInfo&&this.resiDetailObj.houseInfo.gridName){
         arr = this.resiDetailObj.houseInfo.gridName
@@ -931,8 +936,8 @@ export default {
         arr = '--'
        }
         return arr
-      },
-      homeName(item){
+        },
+        homeName(item){
        let arr = []
        if(this.resiDetailObj.houseInfo&&this.resiDetailObj.houseInfo.homeName){
         arr = this.resiDetailObj.houseInfo.homeName
@@ -940,8 +945,8 @@ export default {
         arr = '--'
        }
         return arr
-      },
-      educationText(){
+        },
+        educationText(){
             let text = '--'
             this.educationDictonArr.forEach(item=>{
               if(item.value == this.eduInfoDto.cultureLevel){
@@ -954,7 +959,14 @@ export default {
         hobbyCodeArr(){
           let arr = []
           if(this.hobbyInfoObj.hobbyCode){
-             arr = this.hobbyInfoObj.hobbyCode.split(',')
+             let test = this.hobbyInfoObj.hobbyCode.split(',')
+             for(let i of this.hobbyArr){
+                for(let j of test){
+                    if(i.value == j){
+                      arr.push(i.label)
+                    }
+                }
+             }
           }else{
             arr = []
           }
@@ -1103,7 +1115,14 @@ export default {
         volunteerCategoryArr(){
           let arr = []
           if(this.residentVolunteerObj.volunteerCategory){
-             arr = this.residentVolunteerObj.volunteerCategory.split(',')
+             let test = this.residentVolunteerObj.volunteerCategory.split(',')
+             for(let i of this.volunteerArr){
+                for(let j of test){
+                    if(i.value == j){
+                      arr.push(i.label)
+                    }
+                }
+             }
           }else{
             arr = []
           }
@@ -1128,6 +1147,7 @@ export default {
         },
         dyShowStatus(){
           let flag = false
+          console.log(this.resiDetailObj);
           if(this.resiDetailObj.categoryInfo){
               if(this.resiDetailObj.categoryInfo.partyFlag==1){
                 flag = true
@@ -1139,19 +1159,7 @@ export default {
           }
           return flag
         },
-        qcShowStatus(){
-          let flag = false
-          if(this.resiDetailObj.houseInfo.moveOutFlag){
-              if(this.resiDetailObj.houseInfo.moveOutFlag==1){
-                flag = true
-              }else{
-                flag = false
-              }
-          }else{
-            flag = false
-          }
-          return flag
-        },
+       
         bzfShowStatus(){
           let flag = false
           if(this.resiDetailObj.categoryInfo){
@@ -1242,7 +1250,21 @@ export default {
             flag = false
           }
           return flag
-        }
+        },
+        qcShowStatus(){
+          let flag = false
+          console.log(this.resiDetailObj);
+          if(this.resiDetailObj.houseInfo){
+              if(this.resiDetailObj.houseInfo.moveOutFlag==1){
+                flag = true
+              }else{
+                flag = false
+              }
+          }else{
+            flag = false
+          }
+          return flag
+        },
   },
   watch: {
     
@@ -1271,12 +1293,22 @@ export default {
       }
 
       return _val || row[item.columnName];
+    },
+    async getVolunteerNation(){
+      try {
+        const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'VOLUNTEER_CATEGORY'})
+        this.volunteerArr = data.data
+      } catch (error) {
+        console.log(error,'获取志愿者字典');
+      }
+
     },
       handleClick(tab){
           if(tab._props.label=="教育"){
             this.getEducation()
             this.getEduInfoDtoObj()
           }else if(tab._props.label == "兴趣爱好"){
+            this.gethobbyNation()
             this.getResidentHobbyInfoObj()
           }
           else if(tab._props.label == "宗教信仰"){
@@ -1312,6 +1344,7 @@ export default {
           }else if(tab._props.label == "统战人员"){
             this.getResidentUnitedFront()
           }else if(tab._props.label == "志愿者"){
+            this.getVolunteerNation()
             this.getVolunteerDetailById()
           }else if(tab._props.label == "老年人"){
             this.getOldPeopleDetailById()
@@ -1365,6 +1398,16 @@ export default {
           console.log(error);
          }
       },
+      async gethobbyNation(){
+      try {
+        const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'SPECIAL_SKILL'})
+        this.hobbyArr= data.data
+
+      } catch (error) {
+        console.log(error,'获取兴趣爱好字典');
+      }
+
+    },
        //获取宗教信仰
        async getResidentReligionObj(){
         try {