修改bug

src/views/components/resiForm.vue

@@ -1817,7 +1817,7 @@ export default {
       }
     },
     getFormData(data) {
-        this.form.categoryId = '111222333',// 临时写死
+        this.form.categoryId = data.categoryInfo.id,// 临时写死
         this.form.resiId = data.resiId
         this.form.buildId = data.houseInfo.buildId
         this.form.gridId = data.houseInfo.gridId
@@ -1915,6 +1915,7 @@ export default {
             cultureLevel:'',
             eduRemark:''
           }
+          this.newForm.eduInfoDto = this.form.eduInfoDto
         }
       })
     },
@@ -1924,11 +1925,15 @@ export default {
         if (res.code !== 0) {
           return this.$message.error(res.msg);
         } else {
+          if (res.data) {
+            res.data.hobbyCode = res.data.hobbyCode.split(',')
+          }
           this.form.hobbyInfoDto = res.data ? res.data : { //兴趣爱好
             hobbyCode:[],//兴趣特长
             interestDesc:'',//兴趣
             hobbyRemark:''//备注
           }
+          this.newForm.hobbyInfoDto = this.form.hobbyInfoDto
         }
       })
     },
@@ -1942,6 +1947,8 @@ export default {
               religion:'',
               religionRemark:''
             }
+
+            this.newForm.religionDto = this.form.religionDto
           }
         })
     },
@@ -1971,6 +1978,7 @@ export default {
               deliveranceNum:'',//享受救助明细序号
               healthRemark:''//备注
             }
+            this.newForm.healthDto = this.form.healthDto
           }
         })
     },
@@ -1986,6 +1994,8 @@ export default {
               retireTime:'',//离退休时间		
               workRemark:'',//备注		
             }
+
+            this.newForm.workInfoDto = this.form.workInfoDto
           }
         })
     },
@@ -1999,6 +2009,7 @@ export default {
               retirementAmount:'',//退休金额	
               monthIncome:'',//月收入
             }
+            this.newForm.economyDto = this.form.economyDto
           }
         })
     },
@@ -2015,6 +2026,7 @@ export default {
               householdSituation:'',//人户情况，字典code
               resiRemark:'',//备注
             }
+            this.newForm.resideInfoDto = this.form.resideInfoDto
           }
         })
     },
@@ -2034,6 +2046,7 @@ export default {
               dependantMobile:'',//赡养人联系电话			
               familyInfoRemark:'',//备注		
             }
+            this.newForm.familyInfoDto = this.form.familyInfoDto
           }
         })
     },
@@ -2056,6 +2069,7 @@ export default {
               joinCommunityTime:'',//组织关系转入社区时间yyyy-MM-dd
               longHolidayFlag:null,//是否请长假：1是，0否
             }
+            this.newForm.parymemberInfoDto = this.form.parymemberInfoDto
           }
         })
     },
@@ -2072,6 +2086,7 @@ export default {
               subsidyNum:'',//补贴编号	
               subsidyAmount:'',//补贴金额	
             }
+            this.newForm.ensureHouseDto = this.form.ensureHouseDto
           }
         })
     },
@@ -2091,6 +2106,7 @@ export default {
               employmentHardFlag:null,//是否就业困难对象；1是0不是	
               employmentWish:'',//劳动能力就业愿望	
             }
+            this.newForm.unemployedDto = this.form.unemployedDto
           }
         })
     },
@@ -2112,6 +2128,7 @@ export default {
               joinWarEndTime:'',//参战时间截止日期yyyy-MM-dd	
               pubWelfareJobFlag:null,//是否办理公益性岗位;1是0否
             }
+            this.newForm.veteranDto = this.form.veteranDto
           }
         })
     },
@@ -2125,6 +2142,7 @@ export default {
               duty:'',//职务
               visitation:'',//探亲情况	
             }
+            this.newForm.unitedFrontDto = this.form.unitedFrontDto
           }
         })
     },
@@ -2134,10 +2152,15 @@ export default {
           if (res.code !== 0) {
             return this.$message.error(res.msg);
           } else {
+            if (res.data) {
+              res.data.volunteerCategory = res.data.volunteerCategory.split(',')
+            }
             this.form.volunteerDto = res.data ? res.data : {//志愿者信息	
               volunteerCategory:[],//志愿者类别
               volunteerRemark:''//备注
             }
+
+            this.newForm.volunteerDto = this.form.volunteerDto
           }
         })
     },
@@ -2150,6 +2173,8 @@ export default {
             this.form.oldPeopleDto = res.data ? res.data : {
               oldSubsidy:''//高龄补助	
             }
+
+            this.newForm.oldPeopleDto = this.form.oldPeopleDto
           }
         })
     },
@@ -2159,9 +2184,14 @@ export default {
           if (res.code !== 0) {
             return this.$message.error(res.msg);
           } else {
+            if (res.data) {
+              res.data.specialCategoryCode = res.data.specialCategoryCode.split(',')
+            }
             this.form.specialDto = res.data ? res.data : {//特殊人群
               specialCategoryCode:[]//人群类别【字典表】,可多选，以英文逗号隔开；	
             }
+
+            this.newForm.specialDto = this.form.specialDto
           }
         })
     },

src/views/modules/base/resi.vue

@@ -1190,6 +1190,7 @@ export default {
       if (_baseForm.hobbyInfoDto) {
         if (_baseForm.hobbyInfoDto.hobbyCode.length === 0) {
           hobbyCode = "";
+          _baseForm.hobbyInfoDto.hobbyCode = hobbyCode
         } else {
           _baseForm.hobbyInfoDto.hobbyCode.forEach((element,index) => {
             hobbyCode = index === 0 ? element : hobbyCode + "," + element
@@ -1202,6 +1203,7 @@ export default {
       if (_baseForm.volunteerDto) {
         if (_baseForm.volunteerDto.volunteerCategory.length === 0) {
           volunteerCategory = "";
+          _baseForm.volunteerDto.volunteerCategory = volunteerCategory
         } else {
           _baseForm.volunteerDto.volunteerCategory.forEach((element,index) => {
             volunteerCategory = index === 0 ? element : volunteerCategory + "," + element
@@ -1214,6 +1216,7 @@ export default {
       if (_baseForm.specialDto) {
         if (_baseForm.specialDto.specialCategoryCode.length === 0) {
           specialCategoryCode = "";
+          _baseForm.specialDto.specialCategoryCode = specialCategoryCode
         } else {
           _baseForm.specialDto.specialCategoryCode.forEach((element,index) => {
             specialCategoryCode = index === 0 ? element : specialCategoryCode + "," + element