|
|
@@ -1999,8 +1999,8 @@ export default { |
|
|
|
this.formVisible.acceptingVisible = this.isProposeStatus(houseApplyStatus, ["18", "20", "21", "22", "23", "24", "25", "30", "29", "26"]); |
|
|
|
this.formVisible.acceptingForm.baseFormVisible = this.isProposeStatus(houseApplyStatus, ["18", "20", "21", "22", "23", "24", "25", "30", "29", "26"]); |
|
|
|
this.formVisible.acceptingForm.townFormVisible = this.isProposeStatus(houseApplyStatus, [this.isInRoles(role, 'town_leader') ? '29' : -99, "26"]); |
|
|
|
this.formVisible.acceptingForm.agricultureFormVisible = this.isProposeStatus(houseApplyStatus, [this.isInRoles(role, ['town_leader', 'agriculture']) ? '29' : -99, "26"]); |
|
|
|
this.formVisible.acceptingForm.nature_resourceFormVisible = this.isProposeStatus(houseApplyStatus, [this.isInRoles(role, ['town_leader', 'nature_resource']) ? '29' : -99, "26"]); |
|
|
|
this.formVisible.acceptingForm.agricultureFormVisible = this.isProposeStatus(houseApplyStatus, [this.isInRoles(role, ['town_leader', 'agriculture']) ? '29' : -99, this.isInRoles(role, ['town_leader', 'agriculture']) ? '25' : -99, "26"]); |
|
|
|
this.formVisible.acceptingForm.nature_resourceFormVisible = this.isProposeStatus(houseApplyStatus, [this.isInRoles(role, ['town_leader', 'nature_resource']) ? '29' : -99, this.isInRoles(role, ['town_leader', 'nature_resource']) ? '25' : -99, "26"]); |
|
|
|
if(this.type =='done') { |
|
|
|
this.formVisible.editVisible = false; |
|
|
|
} |
|
|
@@ -2571,8 +2571,13 @@ export default { |
|
|
|
this.selectedTabName = PROPOSER_STAGE_START; |
|
|
|
this.processKeyField = PROPOSER_STAGE_START_ACTIVITY; |
|
|
|
this.attachmentActive = PROPOSER_STAGE_START; |
|
|
|
} |
|
|
|
else { // this.isBaseApply() |
|
|
|
}else if(this.isLandscope()){ |
|
|
|
this.active = PROPOSER_STAGE_START; |
|
|
|
this.selectedTabName = PROPOSER_STAGE_START; |
|
|
|
this.processKeyField = PROPOSER_STAGE_START_ACTIVITY; |
|
|
|
this.attachmentActive = PROPOSER_STAGE_START; |
|
|
|
}else |
|
|
|
{ // this.isBaseApply() |
|
|
|
this.active = PROPOSER_STAGE_BASE_APPLY; |
|
|
|
this.selectedTabName = PROPOSER_STAGE_BASE_APPLY; |
|
|
|
this.attachmentActive = PROPOSER_STAGE_BASE_APPLY; |
|
|
@@ -2595,7 +2600,8 @@ export default { |
|
|
|
} else if (this.isAccepting()) { |
|
|
|
this.active = PROPOSER_STAGE_END; |
|
|
|
this.selectedTabName = PROPOSER_STAGE_END; |
|
|
|
if(this.isProposeStatus(houseApplyStatus, ["20"])){ |
|
|
|
// 编辑时且为申请通过状态 -> 查看验收草稿 |
|
|
|
if(this.proposerStatus == PROPOSER_VIEW && this.isProposeStatus(houseApplyStatus, ["20"])){ |
|
|
|
this.selectedTabName = PROPOSER_STAGE_START; |
|
|
|
} |
|
|
|
|
|
|
@@ -2803,7 +2809,11 @@ export default { |
|
|
|
this.auditProposer(true); |
|
|
|
break; |
|
|
|
case 'reject': |
|
|
|
this.auditProposer(false); |
|
|
|
this.$dialog.confirm({ |
|
|
|
message: '是否确认驳回此条申请', |
|
|
|
}).then(() => { |
|
|
|
this.auditProposer(false); |
|
|
|
}); |
|
|
|
break; |
|
|
|
case 'start': |
|
|
|
this.startProposerApply(); |
|
|
@@ -3011,6 +3021,7 @@ export default { |
|
|
|
}, |
|
|
|
// 审批(同意/驳回) |
|
|
|
auditProposer(pass) { |
|
|
|
let _this = this; |
|
|
|
switch (this.processKeyField) { |
|
|
|
case PROPOSER_STAGE_BASE_APPLY_ACTIVITY: { |
|
|
|
let comment; |
|
|
@@ -3026,6 +3037,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); |
|
|
@@ -3036,23 +3069,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; |
|
|
@@ -3062,26 +3130,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)) |
|
|
@@ -3099,7 +3202,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); |
|
|
|
} |
|
|
|
} |
|
|
|
//} |
|
|
@@ -3138,18 +3251,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: |
|
|
@@ -3165,7 +3270,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); |
|
|
@@ -3173,13 +3299,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) { |
|
|
@@ -3188,10 +3370,7 @@ export default { |
|
|
|
return; |
|
|
|
} |
|
|
|
|
|
|
|
if (this.$refs.pictureUploadAccepting && this.$refs.pictureUploadAccepting.isValid()) { |
|
|
|
this.submitHouseApplyEndLocationplanOptions(pass); |
|
|
|
return; |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// //农村农业部 |
|
|
|
// if (this.$refs.tHouseApplyEndNongye && this.$refs.tHouseApplyEndNongye.isValid()) { |
|
|
@@ -3210,11 +3389,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: |
|
|
@@ -3223,7 +3398,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 = { |
|
|
@@ -3252,7 +3428,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 = { |
|
|
@@ -3275,7 +3452,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 = { |
|
|
@@ -3289,7 +3467,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 "农村农业部现场拍照不能为空"; |
|
|
|
} |
|
|
@@ -3299,7 +3476,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 = { |
|
|
@@ -3322,7 +3500,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 = { |
|
|
@@ -3345,7 +3524,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 = { |
|
|
@@ -3368,7 +3548,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 = { |
|
|
@@ -3391,6 +3572,7 @@ export default { |
|
|
|
}, |
|
|
|
//验收住建部门审批现场图片 |
|
|
|
submitHouseApproveEndBuildingOptions() { |
|
|
|
this.applicationDetail.tHouseApplyEnd.buildingPlan = null; |
|
|
|
this.$refs.tHouseApplyEndBuilding.updatePlanFiles().then((x) => { |
|
|
|
let list = []; |
|
|
|
x.data.forEach((f) => { |
|
|
@@ -3414,7 +3596,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 = { |
|
|
@@ -3437,7 +3620,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 = { |
|
|
@@ -3451,18 +3635,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) => { |
|
|
@@ -3478,12 +3657,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'); |
|
|
|
}); |
|
|
@@ -3851,13 +4024,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) { |
|
|
@@ -3881,13 +4047,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) |
|
|
|
{ |
|
|
@@ -3941,17 +4101,10 @@ export default { |
|
|
|
return "说明不能为空"; |
|
|
|
} |
|
|
|
if (this.checkString(this.applicationDetail.tHouseApproveOtherOptions.approveLeader)) { |
|
|
|
return "其他部门签名不能为空"; |
|
|
|
return "住建部门签名不能为空"; |
|
|
|
} |
|
|
|
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 "住建部门现场定位不能为空"; |
|
|
|
} |
|
|
|
return false; |
|
|
|
}, |
|
|
@@ -3965,13 +4118,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() { |
|
|
@@ -4073,13 +4219,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') |
|
|
|
{ |
|
|
@@ -4095,13 +4235,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) |
|
|
|
{ |
|
|
@@ -4142,13 +4276,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 "乡镇政府现场拍照不能为空"; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
// 通过时检查打勾, 农业部门 |
|
|
|