Merge branch 'v1.1' into dev

src/views/components/addResi.vue

@@ -1185,6 +1185,8 @@ export default {
         },
         handleValidBlur() {
             if (this.form.baseInfoDto.idType != 1) return
+            this.getResidentInfoByIdNum()
+
             if (!isCard(this.form.baseInfoDto.idNum) && !isPassport(this.form.baseInfoDto.idNum)) return
             const { user } = this.$store.state
             let huji = '', i = 0
@@ -1206,6 +1208,36 @@ export default {
             }
 
         },
+        async getResidentInfoByIdNum(){
+            try {
+                let url = '/actual/base/residentBaseInfo/getResidentInfoByIdNum'
+                let parm = {
+                    idType: this.form.baseInfoDto.idType,
+                    idNum: this.form.baseInfoDto.idNum
+                }
+                let { code, data, msg } = await requestGet(url,parm)
+                if (code == 0 && data != null) {
+                    this.$confirm(`该居民已存在于“${data.name}”是否继续填写`, {
+                    confirmButtonText: '前往修改',
+                    cancelButtonText: '继续填写',
+                    type: 'warning'
+                }).then(() => {
+                    this.$router.push({ name: 'edit-resi', query: { id: data.id }, params: { idNum: data.idNum, mobile: data.mobile } });
+
+                }).catch(() => {
+                    
+                });
+
+                } else if (code >= 8000) {
+                    this.$message.error(msg);
+                    this.btnLoading = false;
+                }
+            }
+            catch (error) {
+                // this.$message.error(msg);
+                console.log(msg);
+            }
+        },
         handleLocalRadio(e) {
             if (e.target.type === 'radio') return
             this.form.baseInfoDto.localResidenceFlag = this.form.baseInfoDto.localResidenceFlag === 0 ? 1 : 0;
@@ -1270,6 +1302,7 @@ export default {
             })
         },
         async submitForm(house) {
+            this.btnLoading = true;
             try {
                 let url = '/actual/base/residentBaseInfo/save'
                 let parm = {
@@ -1287,14 +1320,16 @@ export default {
                         this.$refs['addForm'].resetFields();
                         this.form.resideInfoDtos = homeArr
                     }
+                    this.btnLoading = false;
+
                 } else if (code >= 8000) {
                     this.$message.error(msg);
+                    this.btnLoading = false;
                 }
             }
             catch (error) {
                 this.$message.error(msg);
             }
-
         },
         showDialog({ index, value }, event) {
             if (value == 1) {

src/views/components/resiExpand/editExpand.vue

@@ -69,7 +69,7 @@
                             <template v-else-if="itemk.itemType == 'cascader1'">
                                 <el-cascader v-model="form[itemj.id].partyOrgId" :props="casProps"
                                     :options="itemk.opction" class="list_item_width_1" clearable size="small"
-                                    @change="handlePartyOrgCascadarChange" @change.native="handleFormChange(itemj.id,itemk.formName,itemk.itemType)"></el-cascader>
+                                    @change="handlePartyOrgCascadarChange" ></el-cascader>
                             </template>
 
                             <template v-else-if="itemk.itemType == 'number'">
@@ -233,6 +233,8 @@ export default {
         },
         showForm() {
             this.$nextTick(() => {
+                // console.log(this.formList,'拓展组件formList');
+                // console.log(this.form,'拓展组件form');
                 const promises = this.formList.forEach((item) => {
                     item.form.map(async (group) => {
                         return group.children.reduce(async (accPromise, item) => {
@@ -276,6 +278,7 @@ export default {
 
         handlePartyOrgCascadarChange(selectedNode) {
             this.form.parymemberInfoDto.partyOrgId = selectedNode[selectedNode.length - 1];
+            this.handleFormChange('parymemberInfoDto','partyOrgId','cascader1')
         },
         async handleNextOrgTreeClick(node, resolve) {
             await this.getTreeChildenList(node, resolve)

src/views/modules/base/resi.vue

@@ -588,6 +588,9 @@ export default {
             for (const n in this.$refs.myResiSearch.form) {
                 this.$refs.myResiSearch.form[n] = "";
             }
+            this.$refs.myResiSearch.form.healthStatus = [];
+            this.$refs.myResiSearch.form.attentionCrowds = [];
+            this.$refs.myResiSearch.form.specialCategoryCodes = [];
             this.currentPage = 1
             this.$refs.myResiSearch.level = ''
             this.getTableData();

src/views/modules/portrayal/jumin/cpts/staffTag.vue

@@ -161,7 +161,7 @@ export default {
                 const { data } = await this.$http.post('sys/dict/data/dictlist', { dictType: 'special_resident_category' });
                 this.formData.tableData[3].option = data.data
             } catch (error) {
-                console.log(error, `获取 ${dictType} 字典`);
+                console.log(error);
             }
         },
         updatedForm() {

src/views/modules/portrayal/jumin/index.vue

@@ -326,9 +326,10 @@
         <el-col
           :span="6"
           class="f-flex"
-          v-if=" resiDetailObj.workInfoDto && 
-          ( resiDetailObj.workInfoDto.careerStatus >= 1 &&
-            resiDetailObj.workInfoDto.careerStatus <= 5)
+          v-if="
+            resiDetailObj.workInfoDto &&
+            resiDetailObj.workInfoDto.careerStatus >= 1 &&
+            resiDetailObj.workInfoDto.careerStatus <= 5
           "
         >
           <div class="f-label">工作单位：</div>
@@ -343,7 +344,7 @@
         <el-col
           :span="6"
           class="f-flex"
-          v-if=" 
+          v-if="
             resiDetailObj.workInfoDto &&
             (resiDetailObj.workInfoDto.careerStatus == 0 ||
               resiDetailObj.workInfoDto.careerStatus == 6)
@@ -363,9 +364,10 @@
         <el-col
           :span="6"
           class="f-flex"
-          v-if=" resiDetailObj.workInfoDto && 
-          ( resiDetailObj.workInfoDto.careerStatus >= 1 &&
-            resiDetailObj.workInfoDto.careerStatus <= 5)
+          v-if="
+            resiDetailObj.workInfoDto &&
+            resiDetailObj.workInfoDto.careerStatus >= 1 &&
+            resiDetailObj.workInfoDto.careerStatus <= 5
           "
         >
           <div class="f-flex">
@@ -382,10 +384,10 @@
         <el-col
           :span="6"
           class="f-flex"
-          v-if="resiDetailObj.workInfoDto &&
+          v-if="
+            resiDetailObj.workInfoDto &&
             (resiDetailObj.workInfoDto.careerStatus == 0 ||
-              resiDetailObj.workInfoDto.careerStatus == 6) 
-            
+              resiDetailObj.workInfoDto.careerStatus == 6)
           "
         >
           <div class="f-label">失业时间：</div>
@@ -400,9 +402,10 @@
         <el-col
           :span="6"
           class="f-flex"
-          v-if=" resiDetailObj.workInfoDto && 
-          ( resiDetailObj.workInfoDto.careerStatus >= 1 &&
-            resiDetailObj.workInfoDto.careerStatus <= 5)
+          v-if="
+            resiDetailObj.workInfoDto &&
+            resiDetailObj.workInfoDto.careerStatus >= 1 &&
+            resiDetailObj.workInfoDto.careerStatus <= 5
           "
         >
           <div class="f-flex">
@@ -419,10 +422,10 @@
         <el-col
           :span="6"
           class="f-flex"
-          v-if="resiDetailObj.workInfoDto &&
+          v-if="
+            resiDetailObj.workInfoDto &&
             (resiDetailObj.workInfoDto.careerStatus == 0 ||
-              resiDetailObj.workInfoDto.careerStatus == 6) 
-            
+              resiDetailObj.workInfoDto.careerStatus == 6)
           "
         >
           <div class="f-label">失业证号：</div>
@@ -438,10 +441,9 @@
           :span="6"
           class="f-flex"
           v-if="
-          resiDetailObj.workInfoDto &&
+            resiDetailObj.workInfoDto &&
             (resiDetailObj.workInfoDto.careerStatus == 0 ||
-              resiDetailObj.workInfoDto.careerStatus == 6) 
-            
+              resiDetailObj.workInfoDto.careerStatus == 6)
           "
         >
           <div class="f-label">失业原因：</div>
@@ -456,9 +458,10 @@
         <el-col
           :span="6"
           class="f-flex"
-          v-if=" resiDetailObj.workInfoDto && 
-          ( resiDetailObj.workInfoDto.careerStatus >= 1 &&
-            resiDetailObj.workInfoDto.careerStatus <= 5)
+          v-if="
+            resiDetailObj.workInfoDto &&
+            resiDetailObj.workInfoDto.careerStatus >= 1 &&
+            resiDetailObj.workInfoDto.careerStatus <= 5
           "
         >
           <div class="f-label">有无赡养人：</div>
@@ -478,10 +481,9 @@
           :span="6"
           class="f-flex"
           v-if="
-           resiDetailObj.workInfoDto &&
+            resiDetailObj.workInfoDto &&
             (resiDetailObj.workInfoDto.careerStatus == 0 ||
-              resiDetailObj.workInfoDto.careerStatus == 6) 
-           
+              resiDetailObj.workInfoDto.careerStatus == 6)
           "
         >
           <div class="f-label" style="width: 113px">再就业优惠证号：</div>
@@ -500,7 +502,7 @@
         v-if="
           resiDetailObj.workInfoDto &&
           (resiDetailObj.workInfoDto.careerStatus == 0 ||
-            resiDetailObj.workInfoDto.careerStatus == 6) 
+            resiDetailObj.workInfoDto.careerStatus == 6)
         "
       >
         <el-col :span="6" class="f-flex">
@@ -515,7 +517,7 @@
         </el-col>
         <el-col :span="6" class="f-flex">
           <div class="f-label" style="width: 113px">是否领取失业金：</div>
-          <span class="f-left8 f-font-color" v-if=" resiDetailObj.unemployedDto">
+          <span class="f-left8 f-font-color" v-if="resiDetailObj.unemployedDto">
             {{
               resiDetailObj.unemployedDto.unempCompensationFlag != null
                 ? resiDetailObj.unemployedDto.unempCompensationFlag === 0
@@ -530,7 +532,7 @@
         </el-col>
         <el-col :span="6" class="f-flex">
           <div class="f-label" style="width: 113px">是否就业困难对象：</div>
-          <span class="f-left8 f-font-color" v-if=" resiDetailObj.unemployedDto">
+          <span class="f-left8 f-font-color" v-if="resiDetailObj.unemployedDto">
             {{
               resiDetailObj.unemployedDto.employmentHardFlag != null
                 ? resiDetailObj.unemployedDto.employmentHardFlag === 0
@@ -542,32 +544,29 @@
             }}
           </span>
           <span v-else>--</span>
-
         </el-col>
         <el-col :span="6" class="f-flex">
           <div class="f-label" style="width: 113px">劳动就业愿望：</div>
           <span class="f-left8 f-font-color">
             {{
-            resiDetailObj.workInfoDto
-              ? resiDetailObj.workInfoDto.employmentWish
+              resiDetailObj.workInfoDto
                 ? resiDetailObj.workInfoDto.employmentWish
+                  ? resiDetailObj.workInfoDto.employmentWish
+                  : "--"
                 : "--"
-              : "--"
-          }}
-           
+            }}
           </span>
         </el-col>
       </el-row>
-      <el-row v-if=" resiDetailObj.workInfoDto &&
+      <el-row
+        v-if="
+          resiDetailObj.workInfoDto &&
           (resiDetailObj.workInfoDto.careerStatus == 0 ||
-            resiDetailObj.workInfoDto.careerStatus == 6) 
-          
-        "  class="f-m-top23">
-        <el-col
-          :span="6"
-          class="f-flex"
-         
-        >
+            resiDetailObj.workInfoDto.careerStatus == 6)
+        "
+        class="f-m-top23"
+      >
+        <el-col :span="6" class="f-flex">
           <div class="f-label">有无赡养人：</div>
           <div class="f-left8 f-font-color">
             {{
@@ -661,7 +660,7 @@ import { idTypeList } from "@/js/columns/constants";
 export default {
   data() {
     return {
-      loading: true,
+      loading: false,
       checkType: "edit", //edit或者view
       changeRecordList: [], //更新记录
       resiDetailObj: {}, //居民详情
@@ -1257,7 +1256,6 @@ export default {
         .catch((err) => {
           console.log(err);
         });
-      this.loading = false;
     },
     handelClickJumpEdit() {
       this.checkType = "edit";
@@ -1477,8 +1475,10 @@ export default {
           formCode: "resi_base_info",
         });
         this.houseHolderRelArr = data.data;
+        this.loading = false;
       } catch (error) {
         console.log(error, "获取与户主关系");
+        this.loading = false;
       }
     },
     houseHolderRelText(index) {
@@ -1509,6 +1509,7 @@ export default {
   watch: {
     "$store.state.huaXiang.userInfo.resiId": {
       handler(newValue, oldValue) {
+        this.loading = true;
         this.resiId = newValue;
         this.resiDetailObj = {};
         this.getNationalityList();
@@ -1519,7 +1520,6 @@ export default {
         this.getChangeRecordDetailById();
         this.getHouseholdSituation();
         this.gethouseHolderRel();
-        this.loading = false;
       },
       deep: true, // 开启深度监听
       immediate: true, // 立即触发一次handler