宅基地申请待办已办优化

src/views/onlineHome/homestead/homeApplication/proposerLite.vue

@@ -3015,6 +3015,7 @@ export default {
     },
     // 审批(同意/驳回)
     auditProposer(pass) {
+      let _this = this;
       switch (this.processKeyField) {
         case PROPOSER_STAGE_BASE_APPLY_ACTIVITY: {
           let comment;
@@ -3030,6 +3031,28 @@ export default {
               this.$set(this.applicationDetail, 'tHouseApproveNatureOptions', null);
               this.$set(this.applicationDetail, 'tHouseApproveOtherOptions', null);
               comment = this.applicationDetail.tHouseApproveAgricultureOptions.approveOption;
+              if(this.$refs.pictureUploadApplyingTHouseApproveAgriculture && this.$refs.pictureUploadApplyingTHouseApproveAgriculture.isValid()) {
+
+                this.submitHouseApproveAgricultureOptions().then(item=>{
+                  if (msg) {
+                    return;
+                  }
+                  setTimeout(() => {
+
+                    saveHouseBaseInfo(_this.applicationDetail).then((response) => {
+                      _this.complete(pass, comment);
+                    }).catch(resp => {
+                      _this.notify(msg, 'danger');
+                      _this.notify("保存失败!", 'danger');
+                    });
+                  }, 500);
+                });
+              } else {
+                if (this.checkString(this.applicationDetail.tHouseApproveAgricultureOptions.agriculturePlan)) {
+                  msg = "农村农业部门现场拍照不能为空";
+                  break;
+                }
+              }
               break;
             case "building":
               msg = this.validateBuildingForm(pass);
@@ -3040,23 +3063,58 @@ export default {
               this.$set(this.applicationDetail, 'tHouseApproveNatureOptions', null);
               this.$set(this.applicationDetail, 'tHouseApproveAgricultureOptions', null);
               comment = this.applicationDetail.tHouseApproveOtherOptions.approveOption;
+              if(this.$refs.pictureUploadApplyingTHouseApproveOther && this.$refs.pictureUploadApplyingTHouseApproveOther.isValid()) {
+                this.submitHouseApproveOtherOptions().then(item=>{
+                  setTimeout(() => {
+
+                    saveHouseBaseInfo(_this.applicationDetail).then((response) => {
+                      _this.complete(pass, comment);
+                    }).catch(resp => {
+                      _this.notify(msg, 'danger');
+                      _this.notify("保存失败!", 'danger');
+                    });
+                  }, 500);
+                });
+              } else {
+                if (this.checkString(this.applicationDetail.tHouseApproveOtherOptions.otherPlan)) {
+                  msg =  "住建部门现场拍照不能为空";
+                  break;
+                }
+              }
               break;
             case "nature_resource":
               msg = this.validateNatureForm(pass);
               if (msg) {
                 break;
               }
+
               this.$set(this.applicationDetail, 'tHouseApproveTownOptions', null);
               this.$set(this.applicationDetail, 'tHouseApproveOtherOptions', null);
               this.$set(this.applicationDetail, 'tHouseApproveAgricultureOptions', null);
               comment = this.applicationDetail.tHouseApproveNatureOptions.approveOption;
+              if(this.$refs.pictureUploadApplyingTHouseApproveNature && this.$refs.pictureUploadApplyingTHouseApproveNature.isValid()) {
+                this.submitHouseApproveNatureplanOptions().then(item=>{
+                  setTimeout(() => {
+                    saveHouseBaseInfo(_this.applicationDetail).then((response) => {
+                      _this.complete(pass, comment);
+                    }).catch(resp => {
+                      _this.notify(msg, 'danger');
+                      _this.notify("保存失败!", 'danger');
+                    });
+                  }, 500);
+                });
+              } else {
+                if (this.checkString(this.applicationDetail.tHouseApproveNatureOptions.naturePlan)) {
+                  msg =  "自然资源部门现场拍照不能为空";
+                  break;
+                }
+              }
               break;
             case "town_leader":
               msg = this.validateAgricultureForm(pass);
               if (msg) {
                 break;
               }
-
               msg = this.validateNatureForm();
               if (msg) {
                 break;
@@ -3066,26 +3124,61 @@ export default {
               if (msg) {
                 break;
               }
-
               msg = this.validateTownForm();
               if (msg) {
                 break;
               }
               comment = this.applicationDetail.tHouseApproveTownOptions.approveOption;
-              //地图判断
-              if (this.drawInsert != null) {
-                this.applicationDetail.tHouseApproveNatureOptions.theGeom = JSON.stringify(this.drawInsert);
-              }
-              else {
-                if(this.applicationDetail.tHouseApproveNatureOptions && this.applicationDetail.tHouseApproveNatureOptions.theGeom == null){
-                  this.applicationDetail.tHouseApproveNatureOptions.theGeom = this.convertGeom(this.applicationDetail.tHouseApplyProposedSituation.theGeom);
-                }
-              }
-              //console.log(this.$refs.pictureUploadApplying, this.$refs.pictureUploadApplying.isValid());
-              if(this.$refs.pictureUploadApplying && this.$refs.pictureUploadApplying.isValid()) {
-                this.submitHouseApproveLocationplanOptions(pass, comment);
-                return;
-              }
+                this.submitHouseApproveAgricultureOptions().then(item=>{
+                    _this.submitHouseApproveNatureplanOptions().then(item2=>{
+                        _this.submitHouseApproveOtherOptions().then(item3=>{
+                          if(_this.$refs.pictureUploadApplyingTHouseApproveTown && _this.$refs.pictureUploadApplyingTHouseApproveTown.isValid()) {
+                            _this.submitHouseApproveTownOptions().then(item4=>{
+                              //地图判断
+                              if (_this.drawInsert != null) {
+                                _this.applicationDetail.tHouseApproveNatureOptions.theGeom = JSON.stringify(_this.drawInsert);
+                              }
+                              else {
+                                if(_this.applicationDetail.tHouseApproveNatureOptions && _this.applicationDetail.tHouseApproveNatureOptions.theGeom == null){
+                                  _this.applicationDetail.tHouseApproveNatureOptions.theGeom = _this.convertGeom(_this.applicationDetail.tHouseApplyProposedSituation.theGeom);
+                                }
+                              }
+                              if(_this.$refs.pictureUploadApplying && _this.$refs.pictureUploadApplying.isValid()) {
+                                _this.submitHouseApproveLocationplanOptions(pass, comment).then(item5=>{
+                                  _this.submitHouseApproveNatureplanOptions().then(item6=>{
+                                    setTimeout(() => {
+                                      saveHouseBaseInfo(_this.applicationDetail).then((response) => {
+                                        _this.complete(pass, comment);
+                                      }).catch(resp => {
+                                        _this.notify(msg, 'danger');
+                                        _this.notify("保存失败!", 'danger');
+                                      });
+                                    }, 500);
+                                  });
+                                });
+                              }else{
+                                if (this.checkString(this.applicationDetail.tHouseApproveLocationplanOptions.locationPlan)) {
+                                  msg =  "现场踏勘不能为空";
+                                }
+                              }
+                            });
+                          } else {
+                            if (this.checkString(this.applicationDetail.tHouseApproveTownOptions.townPlan)) {
+                              msg =  "镇政府审批现场拍照不能为空";
+                            }else{
+                              setTimeout(() => {
+                                saveHouseBaseInfo(_this.applicationDetail).then((response) => {
+                                  _this.complete(pass, comment);
+                                }).catch(resp => {
+                                  _this.notify(msg, 'danger');
+                                  _this.notify("保存失败!", 'danger');
+                                });
+                              }, 500);
+                            }
+                          }
+                        });
+                    });
+                });
               break;
             default:
               if(this.checkString(this.applicationDetail.tHouseApproveVillageOptions.villageOption))
@@ -3103,7 +3196,17 @@ export default {
                 return;
               } else {
                 if (this.checkString(this.applicationDetail.tHouseApproveVillageOptions.villagePlan)) {
+
                   msg = "村级现场拍照不能为空";
+                }else{
+                  setTimeout(() => {
+                    saveHouseBaseInfo(_this.applicationDetail).then((response) => {
+                      _this.complete(pass, comment);
+                    }).catch(resp => {
+                      _this.notify(msg, 'danger');
+                      _this.notify("保存失败!", 'danger');
+                    });
+                  }, 500);
                 }
               }
               //}
@@ -3142,18 +3245,10 @@ export default {
               break;
           }
           if (msg) {
-            this.notify(msg, 'danger');
-            this.$refs.form.validate().then(() => {}).catch((e)=>{})
+            _this.notify(msg, 'danger');
+            _this.$refs.form.validate().then(() => {}).catch((e)=>{})
             return;
           }
-          setTimeout(() => {
-            saveHouseBaseInfo(this.applicationDetail).then((response) => {
-              this.complete(pass, comment);
-            }).catch(resp => {
-              this.notify(msg, 'danger');
-              this.notify("保存失败!", 'danger');
-            });
-          }, 500);
         }
           break;
         case PROPOSER_STAGE_START_ACTIVITY:
@@ -3169,7 +3264,28 @@ export default {
               if (msg) {
                 break;
               }
-              comment = this.applicationDetail.tHouseApplyEnd.nongyeOption;
+              comment = _this.applicationDetail.tHouseApplyEnd.nongyeOption;
+              if(this.$refs.tHouseApplyEndNongye && this.$refs.tHouseApplyEndNongye.isValid()) {
+                this.submitHouseApproveEndNongyeOptions().then(item=>{
+                  updateEnd(_this.applicationDetail.tHouseApplyEnd).then((response) => {
+                    _this.complete(pass, comment);
+                  }).catch(err => {
+                    _this.notify('保存失败', 'danger');
+                  });
+
+                });
+              } else {
+                if (this.checkString(this.applicationDetail.tHouseApplyEnd.nongyePlan)) {
+                  msg =  "农业农村部门现场拍照不能为空";
+                }else{
+                    updateEnd(_this.applicationDetail.tHouseApplyEnd).then((response) => {
+                      _this.complete(pass, comment);
+                    }).catch(err => {
+                      _this.notify('保存失败', 'danger');
+                    });
+                }
+              }
+
               break;
             case "nature_resource":
               msg = this.validateAcceptingFormTown(undefined, role);
@@ -3177,13 +3293,69 @@ export default {
                 break;
               }
               comment = this.applicationDetail.tHouseApplyEnd.natureOption;
+              if(this.$refs.tHouseApplyEndNature && this.$refs.tHouseApplyEndNature.isValid()) {
+                this.submitHouseApproveEndNatureOptions().then(item=>{
+                  updateEnd(_this.applicationDetail.tHouseApplyEnd).then((response) => {
+                    _this.complete(pass, comment);
+                  }).catch(err => {
+                    _this.notify('保存失败', 'danger');
+                  });
+                });
+              } else {
+                if (this.checkString(this.applicationDetail.tHouseApplyEnd.naturePlan)) {
+                  msg =  "自然资源部门现场拍照不能为空";
+                }else{
+                  updateEnd(_this.applicationDetail.tHouseApplyEnd).then((response) => {
+                    _this.complete(pass, comment);
+                  }).catch(err => {
+                    _this.notify('保存失败', 'danger');
+                  });
+                }
+              }
               break;
             case "town_leader":
               msg = this.validateAcceptingFormTown();
+              if (msg) {
+                break;
+              }
               comment = this.applicationDetail.tHouseApplyEnd.zhenOption;
+              if(this.$refs.tHouseApplyEndZhen && this.$refs.tHouseApplyEndZhen.isValid()) {
+                this.submitHouseApproveEndBZhenOptions().then(item=>{
+                  comment = this.applicationDetail.tHouseApplyEnd.zhenOption;
+                  if (_this.$refs.pictureUploadAccepting && _this.$refs.pictureUploadAccepting.isValid()) {
+                    this.submitHouseApplyEndLocationplanOptions(pass).then(item2=>{
+                      updateEnd(_this.applicationDetail.tHouseApplyEnd).then((response) => {
+                        _this.complete(pass, comment);
+                      }).catch(err => {
+                        _this.notify('保存失败', 'danger');
+                      });
+                    });
+                  }else{
+                    if (this.checkString(this.applicationDetail.tHouseApplyEnd.locationPlan)) {
+                      msg =  "竣工平面简图不能为空";
+                    }
+                  }
+                });
+              } else {
+                if (this.checkString(this.applicationDetail.tHouseApplyEnd.zhenPlan)) {
+                  msg =  "乡镇政府现场拍照不能为空";
+                }else{
+                  updateEnd(this.applicationDetail.tHouseApplyEnd).then((response) => {
+                    this.complete(pass, comment);
+                  }).catch(err => {
+                    this.notify('保存失败', 'danger');
+                  });
+                }
+              }
+
               break;
             default:
               comment = '同意';
+              updateEnd(this.applicationDetail.tHouseApplyEnd).then((response) => {
+                this.complete(pass, comment);
+              }).catch(err => {
+                this.notify('保存失败', 'danger');
+              });
               break;
           }
           if (msg) {
@@ -3192,10 +3364,7 @@ export default {
             return;
           }
 
-          if (this.$refs.pictureUploadAccepting && this.$refs.pictureUploadAccepting.isValid()) {
-            this.submitHouseApplyEndLocationplanOptions(pass);
-            return;
-          }
+
 
           // //农村农业部
           // if (this.$refs.tHouseApplyEndNongye && this.$refs.tHouseApplyEndNongye.isValid()) {
@@ -3214,11 +3383,7 @@ export default {
           // }
 
           console.log(this.applicationDetail.tHouseApplyEnd);
-          updateEnd(this.applicationDetail.tHouseApplyEnd).then((response) => {
-            this.complete(pass, comment);
-          }).catch(err => {
-            this.notify('保存失败', 'danger');
-          });
+
         }
           break;
         default:
@@ -3227,7 +3392,8 @@ export default {
     },
     //村级领导审批现场图片
     submitHouseApproveVillageplanOptions(pass, commentText) {
-      this.$refs.pictureUploadApplyingTHouseApproveVillage.updatePlanFiles().then((x) => {
+      this.applicationDetail.tHouseApproveVillageOptions.villagePlan = null;
+      return this.$refs.pictureUploadApplyingTHouseApproveVillage.updatePlanFiles().then((x) => {
         let list = [];
         x.data.forEach((f) => {
           let item = {
@@ -3256,7 +3422,8 @@ export default {
     },
     //自然资源部门审批现场图片
     submitHouseApproveNatureplanOptions() {
-      this.$refs.pictureUploadApplyingTHouseApproveNature.updatePlanFiles().then((x) => {
+      this.applicationDetail.tHouseApproveNatureOptions.naturePlan = null;
+     return   this.$refs.pictureUploadApplyingTHouseApproveNature.updatePlanFiles().then((x) => {
         let list = [];
         x.data.forEach((f) => {
           let item = {
@@ -3279,7 +3446,8 @@ export default {
     },
     //农村农业部门审批现场图片
     submitHouseApproveAgricultureOptions() {
-      this.$refs.pictureUploadApplyingTHouseApproveAgriculture.updatePlanFiles().then((x) => {
+      this.applicationDetail.tHouseApproveAgricultureOptions.agriculturePlan = null;
+      return this.$refs.pictureUploadApplyingTHouseApproveAgriculture.updatePlanFiles().then((x) => {
         let list = [];
         x.data.forEach((f) => {
           let item = {
@@ -3293,7 +3461,6 @@ export default {
           list.push(item);
         });
         this.applicationDetail.tHouseApproveAgricultureOptions.agriculturePlan = JSON.stringify(list);
-        console.log(this.applicationDetail.tHouseApproveAgricultureOptions.agriculturePlan);
         if(this.checkString(this.applicationDetail.tHouseApproveAgricultureOptions.agriculturePlan)){
           return "农村农业部现场拍照不能为空";
         }
@@ -3303,7 +3470,8 @@ export default {
     },
     //其他部门审批现场图片
     submitHouseApproveOtherOptions() {
-      this.$refs.pictureUploadApplyingTHouseApproveOther.updatePlanFiles().then((x) => {
+      this.applicationDetail.tHouseApproveOtherOptions.otherPlan = null;
+      return this.$refs.pictureUploadApplyingTHouseApproveOther.updatePlanFiles().then((x) => {
         let list = [];
         x.data.forEach((f) => {
           let item = {
@@ -3326,7 +3494,8 @@ export default {
     },
     //镇级领导审批现场图片
     submitHouseApproveTownOptions() {
-      this.$refs.pictureUploadApplyingTHouseApproveTown.updatePlanFiles().then((x) => {
+      this.applicationDetail.tHouseApproveTownOptions.townPlan = null;
+     return this.$refs.pictureUploadApplyingTHouseApproveTown.updatePlanFiles().then((x) => {
         let list = [];
         x.data.forEach((f) => {
           let item = {
@@ -3349,7 +3518,8 @@ export default {
     },
     //验收农业部门审批现场图片
     submitHouseApproveEndNongyeOptions() {
-      this.$refs.tHouseApplyEndNongye.updatePlanFiles().then((x) => {
+      this.applicationDetail.tHouseApplyEnd.nongyePlan = null;
+      return this.$refs.tHouseApplyEndNongye.updatePlanFiles().then((x) => {
         let list = [];
         x.data.forEach((f) => {
           let item = {
@@ -3372,7 +3542,8 @@ export default {
     },
     //验收自然资源部门审批现场图片
     submitHouseApproveEndNatureOptions() {
-      this.$refs.tHouseApplyEndNature.updatePlanFiles().then((x) => {
+      this.applicationDetail.tHouseApplyEnd.naturePlan = null;
+      return this.$refs.tHouseApplyEndNature.updatePlanFiles().then((x) => {
         let list = [];
         x.data.forEach((f) => {
           let item = {
@@ -3395,6 +3566,7 @@ export default {
     },
     //验收住建部门审批现场图片
     submitHouseApproveEndBuildingOptions() {
+      this.applicationDetail.tHouseApplyEnd.buildingPlan = null;
       this.$refs.tHouseApplyEndBuilding.updatePlanFiles().then((x) => {
         let list = [];
         x.data.forEach((f) => {
@@ -3418,7 +3590,8 @@ export default {
     },
     //验收镇政府审批现场图片
     submitHouseApproveEndBZhenOptions() {
-      this.$refs.tHouseApplyEndZhen.updatePlanFiles().then((x) => {
+      this.applicationDetail.tHouseApplyEnd.zhenPlan = null;
+      return this.$refs.tHouseApplyEndZhen.updatePlanFiles().then((x) => {
         let list = [];
         x.data.forEach((f) => {
           let item = {
@@ -3441,7 +3614,8 @@ export default {
     },
     // 带平面图附件上传的镇级申请审批
     submitHouseApproveLocationplanOptions(pass, commentText) {
-      this.$refs.pictureUploadApplying.updatePlanFiles().then((x) => {
+      this.applicationDetail.tHouseApproveLocationplanOptions.locationPlan = null;
+     return this.$refs.pictureUploadApplying.updatePlanFiles().then((x) => {
           let list = [];
           x.data.forEach((f) => {
             let item = {
@@ -3455,18 +3629,13 @@ export default {
             list.push(item);
           });
           this.applicationDetail.tHouseApproveLocationplanOptions.locationPlan = JSON.stringify(list);
-          saveHouseBaseInfo(this.applicationDetail).then((response) => {
-            this.complete(pass, commentText);
-          }).catch(resp => {
-            this.notify("保存失败!", 'danger');
-          });
         }).catch((x) => {
         this.notify("上传宅基地坐落平面位置图失败!", 'danger');
       });
     },
     // 带平面图附件上传的镇级验收审批
     submitHouseApplyEndLocationplanOptions(pass, commentText) {
-      this.$refs.pictureUploadAccepting.updatePlanFiles()
+      return this.$refs.pictureUploadAccepting.updatePlanFiles()
         .then((x) => {
           let list = [];
           x.data.forEach((f) => {
@@ -3482,12 +3651,6 @@ export default {
           });
 
           this.applicationDetail.tHouseApplyEnd.locationPlan = JSON.stringify(list);
-
-          updateEnd(this.applicationDetail.tHouseApplyEnd).then((response) => {
-            this.complete(pass, commentText);
-          }).catch(err => {
-            this.notify("保存失败!", 'danger');
-          });
         }).catch((x) => {
         this.notify("上传宅基地坐落平面位置图失败!", 'danger');
       });
@@ -3855,13 +4018,6 @@ export default {
       else if (this.checkString(this.applicationDetail.tHouseApproveNatureOptions.theGeomPoint)) {
         return "自然资源部门现场定位不能为空";
       }
-      if(this.$refs.pictureUploadApplyingTHouseApproveNature && this.$refs.pictureUploadApplyingTHouseApproveNature.isValid()) {
-        this.submitHouseApproveNatureplanOptions();
-      } else {
-        if (this.checkString(this.applicationDetail.tHouseApproveNatureOptions.naturePlan)) {
-          return "自然资源部门现场拍照不能为空";
-        }
-      }
       return false;
     },
     validateAgricultureForm(pass) {
@@ -3885,13 +4041,7 @@ export default {
       if (this.checkString(this.applicationDetail.tHouseApproveAgricultureOptions.theGeomPoint)) {
         return "农村农业部门现场定位不能为空";
       }
-      if(this.$refs.pictureUploadApplyingTHouseApproveAgriculture && this.$refs.pictureUploadApplyingTHouseApproveAgriculture.isValid()) {
-        this.submitHouseApproveAgricultureOptions();
-      } else {
-        if (this.checkString(this.applicationDetail.tHouseApproveAgricultureOptions.agriculturePlan)) {
-          return "农村农业部门现场拍照不能为空";
-        }
-      }
+
       // 通过时检查打勾, 农业部门
       if(pass)
       {
@@ -3950,13 +4100,6 @@ export default {
       if (this.checkString(this.applicationDetail.tHouseApproveOtherOptions.theGeomPoint)) {
         return "住建部门现场定位不能为空";
       }
-      if(this.$refs.pictureUploadApplyingTHouseApproveOther && this.$refs.pictureUploadApplyingTHouseApproveOther.isValid()) {
-        this.submitHouseApproveOtherOptions();
-      } else {
-        if (this.checkString(this.applicationDetail.tHouseApproveOtherOptions.otherPlan)) {
-          return "住建部门现场拍照不能为空";
-        }
-      }
       return false;
     },
     validateTownForm() {
@@ -3969,13 +4112,6 @@ export default {
       if (this.checkString(this.applicationDetail.tHouseApproveTownOptions.theGeomPoint)) {
         return "镇政府审批现场定位不能为空";
       }
-      if(this.$refs.pictureUploadApplyingTHouseApproveTown && this.$refs.pictureUploadApplyingTHouseApproveTown.isValid()) {
-        this.submitHouseApproveTownOptions();
-      } else {
-        if (this.checkString(this.applicationDetail.tHouseApproveTownOptions.townPlan)) {
-          return "镇政府审批现场拍照不能为空";
-        }
-      }
       return false;
     },
     validateAcceptingFormBase() {
@@ -4077,13 +4213,7 @@ export default {
         if (this.checkString(this.applicationDetail.tHouseApplyEnd.nongyeGeom)) {
           return "农业农村部门现场定位不能为空";
         }
-        if(this.$refs.tHouseApplyEndNongye && this.$refs.tHouseApplyEndNongye.isValid()) {
-          this.submitHouseApproveEndNongyeOptions();
-        } else {
-          if (this.checkString(this.applicationDetail.tHouseApplyEnd.nongyePlan)) {
-            return "农业农村部门现场拍照不能为空";
-          }
-        }
+
       }
       if(!role || role === 'nature_resource')
       {
@@ -4099,13 +4229,7 @@ export default {
         if (this.checkString(this.applicationDetail.tHouseApplyEnd.natureGeom)) {
           return "自然资源部门现场定位不能为空";
         }
-        if(this.$refs.tHouseApplyEndNature && this.$refs.tHouseApplyEndNature.isValid()) {
-          this.submitHouseApproveEndNatureOptions();
-        } else {
-          // if (this.checkString(this.applicationDetail.tHouseApplyEnd.naturePlan)) {
-          //   return "自然资源部门现场拍照不能为空";
-          // }
-        }
+
       }
       if(0)
       {
@@ -4146,13 +4270,7 @@ export default {
         if (this.checkString(this.applicationDetail.tHouseApplyEnd.zhenGeom)) {
           return "乡镇政府现场定位不能为空";
         }
-        if(this.$refs.tHouseApplyEndZhen && this.$refs.tHouseApplyEndZhen.isValid()) {
-          this.submitHouseApproveEndBZhenOptions();
-        } else {
-          if (this.checkString(this.applicationDetail.tHouseApplyEnd.zhenPlan)) {
-            return "乡镇政府现场拍照不能为空";
-          }
-        }
+
       }
 
       // 通过时检查打勾, 农业部门