新增相关

src/views/components/resiForm.vue

@@ -974,6 +974,7 @@ export default {
           homeId: '', //房屋id
           name:'', //姓名
           nation:'', //民族
+          remark:'', //备注
           localResidenceFlag:'', //本地户籍
           birthday:'', //生日
           idNum:'', //证件号
@@ -1151,9 +1152,10 @@ export default {
   methods: {
 
     submit_from(){
-      this.$refs.formId.validate(v=>{
-        this.validateFlag = v
-      })
+      return this.form
+      // this.$refs.formId.validate(v=>{
+      //   this.validateFlag = v
+      // })
     },
 
     getAllNation(){
@@ -1500,7 +1502,7 @@ export default {
               const _id = this.form.idNum.substr(0, 6)
               const { sex, birth, age } = computedCard(this.form.idNum)
               this.form.birthday = birth
-              this.form.gender = sex == 1 ? '1' : '0'
+              this.form.gender = sex == 1 ? '1' : '2'
               this.form.oldPeopleFlag = age >= 60 ? 1 : 0
               // this.form.IS_BDHJ = huji == _id ? '1' : ''
               this.validateIdcard(this.form.idNum)

src/views/modules/base/resi.vue

@@ -1146,33 +1146,50 @@ export default {
     },
 
     async handleSUbmit() {
-      this.$refs.baseForm.submit_from();
-      for (const key of this.$refs.baseForm) {
-        if (typeof key == "Object") {
-          console.log(key);
-        }
+      const _baseForm = this.$refs.baseForm.submit_from();
+      _baseForm.partyFlag = parseInt(_baseForm.partyFlag),//党员
+      _baseForm.subsistenceAllowanceFlag = parseInt(_baseForm.subsistenceAllowanceFlag), //低保
+      _baseForm.ensureHouseFlag = parseInt(_baseForm.ensureHouseFlag), //保障房
+      _baseForm.unemployedFlag = parseInt(_baseForm.unemployedFlag),//失业
+      _baseForm.fertileWomanFlag = parseInt(_baseForm.fertileWomanFlag), //育龄妇女
+      _baseForm.veteranFlag = parseInt(_baseForm.veteranFlag), //退役军人
+      _baseForm.unitedFrontFlag = parseInt(_baseForm.unitedFrontFlag),//统战人员
+      _baseForm.petitionOfficerFlag = parseInt(_baseForm.petitionOfficerFlag),//信访人员
+      _baseForm.volunteerFlag = parseInt(_baseForm.volunteerFlag), //志愿者
+      _baseForm.bereavedPersonFlag = parseInt(_baseForm.bereavedPersonFlag), //失独
+      _baseForm.tenantFlag = parseInt(_baseForm.tenantFlag), //租户
+      _baseForm.floatingFlag = parseInt(_baseForm.floatingFlag),//流动人口
+      _baseForm.specialCrowdFlag = parseInt(_baseForm.specialCrowdFlag),//特殊人群
+      _baseForm.oldPeopleFlag = parseInt(_baseForm.oldPeopleFlag), //老年人
+      _baseForm.emptyNesterFlag = parseInt(_baseForm.emptyNesterFlag), //空巢
+      _baseForm.liveAloneFlag = parseInt(_baseForm.liveAloneFlag), //独居老人
+      _baseForm.disabledFlag = parseInt(_baseForm.disabledFlag), //失能老人
+      _baseForm.dementedFlag = parseInt(_baseForm.dementedFlag), //失智老人
+      _baseForm.disabilityFlag = parseInt(_baseForm.disabilityFlag),//是否残疾
+      _baseForm.seriousIllnessFlag = parseInt(_baseForm.seriousIllnessFlag), //大病
+      _baseForm.chronicDiseaseFlag = parseInt(_baseForm.chronicDiseaseFlag) //慢病
+      if(_baseForm.hobbyInfoDto.hobbyCode = []) {
+        _baseForm.hobbyInfoDto.hobbyCode = ''
+      } else {
+        _baseForm.hobbyInfoDto.hobbyCode.forEach(element => {
+          _baseForm.hobbyInfoDto.hobbyCode = _baseForm.hobbyInfoDto.hobbyCode + ',' + element
+        });
       }
-      // console.log(this,$refs.baseForm);
-      // const arr = await this.formetForm();
-
-      // this.$refs.baseForm.tabsList.forEach(item=>{
-      //     if(item.id){
-      //         console.log(item.id);
-      //     }
-      // })
-      // console.log(this.$refs.baseForm.tabsList);
-      //   if(this.$refs.baseForm.form.hobbyInfoDto.hobbyCode.length != 0 || this.$refs.baseForm.form.volunteerDto.volunteerCategory.length != 0 ||this.$refs.baseForm.form.specialDto.specialCategoryCode.length != 0){
-      //     this.$refs.baseForm.form.hobbyInfoDto.hobbyCode = this.$refs.baseForm.form.hobbyInfoDto.hobbyCode.join(',')
-      //     this.$refs.baseForm.form.volunteerDto.volunteerCategory = this.$refs.baseForm.form.volunteerDto.volunteerCategory.join(',')
-      //     this.$refs.baseForm.form.specialDto.specialCategoryCode = this.$refs.baseForm.form.specialDto.specialCategoryCode.join(',')
-      //   }else {
-      //    this.$refs.baseForm.form.hobbyInfoDto.hobbyCode = ''
-      //     this.$refs.baseForm.form.volunteerDto.volunteerCategory=''
-      //     this.$refs.baseForm.form.specialDto.specialCategoryCode = ''
-      //   }
-      // this.submitAdd(this.$refs.baseForm.form);
-      console.log(this.$refs.baseForm.form);
-      // this.dialogVisible = false;
+      if(_baseForm.volunteerDto.volunteerCategory = []) {
+        _baseForm.volunteerDto.volunteerCategory = ''
+      } else {
+        _baseForm.volunteerDto.volunteerCategory.forEach(element => {
+          _baseForm.volunteerDto.volunteerCategory = _baseForm.volunteerDto.volunteerCategory + ',' + element
+        });
+      }
+      if(_baseForm.specialDto.specialCategoryCode = []) {
+        _baseForm.specialDto.specialCategoryCode = ''
+      } else {
+        _baseForm.specialDto.specialCategoryCode.forEach(element => {
+          _baseForm.specialDto.specialCategoryCode = _baseForm.specialDto.specialCategoryCode + ',' + element
+        });
+      }
+      this.submitAdd(_baseForm)
     },
     handleDel(row) {
       let params = {