diff --git a/src/components/form/FieldSelect.vue b/src/components/form/FieldSelect.vue
index 770d50c1..f205df61 100644
--- a/src/components/form/FieldSelect.vue
+++ b/src/components/form/FieldSelect.vue
@@ -111,16 +111,21 @@ export default {
syncIndex() {
let columns = this.getColumns();
if(!columns)
- return 0;
+ return -1;
for(let i in columns)
{
if(this.getValue(columns[i]) == this.internalValue) {
this.defaultIndex = i;
this.visibleValue = this.getLabel(columns[i]);
- break;
+ return i;
}
}
- return 0;
+ if(1) // 不存在
+ {
+ this.defaultIndex = -1;
+ this.visibleValue = this.internalValue;
+ }
+ return -1;
},
getColumns() {
return this.columns ? this.columns : this.remoteColumns;
diff --git a/src/views/onlineHome/homestead/homeApplication/applicationList.vue b/src/views/onlineHome/homestead/homeApplication/applicationList.vue
index f6c0cede..d7a0d0f8 100644
--- a/src/views/onlineHome/homestead/homeApplication/applicationList.vue
+++ b/src/views/onlineHome/homestead/homeApplication/applicationList.vue
@@ -158,7 +158,6 @@ export default {
func(item.id).then((resp) => {
this.$toast.success("提交成功");
this.refresh();
- this.getList();
}).catch((e) => {
this.$toast.fail("提交失败!");
});
diff --git a/src/views/onlineHome/homestead/homeApplication/proposerLite.vue b/src/views/onlineHome/homestead/homeApplication/proposerLite.vue
index 50e080ae..33c30552 100644
--- a/src/views/onlineHome/homestead/homeApplication/proposerLite.vue
+++ b/src/views/onlineHome/homestead/homeApplication/proposerLite.vue
@@ -27,7 +27,7 @@
申请户主信息
-
+
-
+
-
-
+
+
-
+
@@ -331,10 +331,10 @@
remote-url="/system/dict/data/type/rights_type"
:on-remote-response="'data'"
/>
-
-
-
-
+
+
+
+
-
+
@@ -399,7 +399,7 @@
镇级
审核
意见
-
+
@@ -511,15 +511,15 @@
required
:readonly="true"
/>
-
-
- m
- 层
- m
- 层
- ㎡
- ㎡
- ㎡
+
+
+ m
+ 层
+ m
+ 层
+ ㎡
+ ㎡
+ ㎡
- 万元
-
- ㎡
- ㎡
+ 万元
+
+ ㎡
+ ㎡
-
+
@@ -675,7 +675,7 @@
乡镇
农业
农村
部门
意见
-
+
@@ -684,7 +684,7 @@
乡镇
自然
资源
部门
意见
-
+
@@ -693,7 +693,7 @@
乡镇
住建
部门
意见
-
+
@@ -702,12 +702,12 @@
乡镇
政府
验收
意见
-
+
-
+
@@ -992,7 +992,7 @@ export default {
// 当前附件tab
attachmentActive: 0,
// 家庭成员tab
- familyMembersActive: '0',
+ familyMembersActive: 0,
};
},
created() {
@@ -1257,7 +1257,7 @@ export default {
this.$set(this.applicationDetail.tHouseApproveVillageOptions, 'villageLeader', handlerName);
if(!this.applicationDetail.tHouseApproveVillageOptions.villageTime)
this.$set(this.applicationDetail.tHouseApproveVillageOptions, 'villageTime', handlerTime);
- if(!this.applicationDetail.tHouseApproveVillageOptions.villageOption)
+ if(!this.applicationDetail.tHouseApproveVillageOptions.villageOption || true) // always generate options
this.$set(this.applicationDetail.tHouseApproveVillageOptions, 'villageOption', defaultVillageOption);
}
}
@@ -1657,11 +1657,17 @@ export default {
idcard :'',
householdRegister:'',
});
+ this.$nextTick(() => {
+ this.$refs.memberTabs.scrollTo(this.applicationDetail.tHouseApplyFamilyMembers.length - 1);
+ });
},
//删除家庭成员
deleteFamily(index){
this.applicationDetail.tHouseApplyProposer.members--;
this.applicationDetail.tHouseApplyFamilyMembers.splice(index,1)
+ this.$nextTick(() => {
+ this.$refs.memberTabs.scrollTo(Math.max(index - 1, 0));
+ });
},
// 获取户型配置
getHouseList() {
@@ -2455,14 +2461,18 @@ export default {
},
validateAcceptingFormBase() {
if(!this.applicationDetail.tHouseApplyEnd) return '请填写验收数据';
- if (this.checkString(this.applicationDetail.tHouseApplyEnd.location)) {
- return "用地建房位置不能为空";
+
+ if (this.checkString(this.applicationDetail.tHouseApplyEnd.houseCertificateNo)) {
+ return "权属证书号（不动产）不能为空";
+ }
+ if (this.checkString(this.applicationDetail.tHouseApplyEnd.landCertificateNo)) {
+ return "权属证书号（宅基地）不能为空";
}
- if (this.checkString(this.applicationDetail.tHouseApplyEnd.startDate)) {
- return "开工日期不能为空";
+ if (this.checkString(this.applicationDetail.tHouseApplyEnd.buildingHight)) {
+ return "批建高度不能为空";
}
- if (this.checkString(this.applicationDetail.tHouseApplyEnd.endDate)) {
- return "竣工日期不能为空";
+ if (this.checkString(this.applicationDetail.tHouseApplyEnd.buildingFloors)) {
+ return "批建层数不能为空";
}
if (this.checkString(this.applicationDetail.tHouseApplyEnd.actualBuildingHight)) {
return "竣工高度不能为空";
@@ -2473,37 +2483,21 @@ export default {
if (this.checkString(this.applicationDetail.tHouseApplyEnd.buildingArea)) {
return "建筑面积不能为空";
}
+ if (this.checkString(this.applicationDetail.tHouseApplyEnd.buildingHouseArea)) {
+ return "房屋建筑面积不能为空";
+ }
+ if (this.checkString(this.applicationDetail.tHouseApplyEnd.buildingOtherArea)) {
+ return "配套附属设施建筑面积不能为空";
+ }
if (this.checkString(this.applicationDetail.tHouseApplyEnd.designPaper)) {
return "建筑风貌不能为空";
}
if (this.checkString(this.applicationDetail.tHouseApplyEnd.oldHouseStatus)) {
return "旧宅基地退还情况不能为空";
}
- if (this.checkString(this.applicationDetail.tHouseApplyEnd.buildingArea)) {
- return "建筑面积不能为空";
- }
- if (this.checkString(this.applicationDetail.tHouseApplyEnd.houseCertificateNo)) {
- return "权属证书号（不动产）不能为空";
- }
- if (this.checkString(this.applicationDetail.tHouseApplyEnd.landCertificateNo)) {
- return "权属证书号（宅基地）不能为空";
- }
- if (this.checkString(this.applicationDetail.tHouseApplyEnd.isEnjoySubsidy)) {
- return "是否享受住房建设补助政策不能为空";
- }
- if (this.applicationDetail.tHouseApplyEnd.isEnjoySubsidy === 'Y' && this.checkString(this.applicationDetail.tHouseApplyEnd.enjoySubsidyContent)) {
- return "享受住房建设补助政策不能为空";
- }
-
if (this.checkString(this.applicationDetail.tHouseApplyEnd.houseCost)) {
return "住房造价不能为空";
}
- if (this.checkString(this.applicationDetail.tHouseApplyEnd.buildingHouseArea)) {
- return "房屋建筑面积不能为空";
- }
- if (this.checkString(this.applicationDetail.tHouseApplyEnd.buildingOtherArea)) {
- return "配套附属设施建筑面积不能为空";
- }
if (this.checkString(this.applicationDetail.tHouseApplyEnd.facadeColor)) {
return "外立面颜色不能为空";
}
@@ -2513,6 +2507,13 @@ export default {
if (this.checkString(this.applicationDetail.tHouseApplyEnd.actualFangjiArea)) {
return "实际房基占地面积不能为空";
}
+ if (this.checkString(this.applicationDetail.tHouseApplyEnd.isEnjoySubsidy)) {
+ return "是否享受住房建设补助政策不能为空";
+ }
+ if (this.applicationDetail.tHouseApplyEnd.isEnjoySubsidy === 'Y' && this.checkString(this.applicationDetail.tHouseApplyEnd.enjoySubsidyContent)) {
+ return "享受住房建设补助政策不能为空";
+ }
+
return false;
},
validateAcceptingFormTown(pass) {
@@ -2520,6 +2521,29 @@ export default {
if (this.checkString(this.applicationDetail.tHouseApplyEnd.cartographer)) {
return "竣工平面简图经办人不能为空";
}
+
+ if (this.checkString(this.applicationDetail.tHouseApplyEnd.isProjectFinished)) {
+ return "是否已完成工程设计和合同约定的各项内容不能为空";
+ }
+ if (this.checkString(this.applicationDetail.tHouseApplyEnd.isQualifiedQuality)) {
+ return "承揽人对完工住房质量自查是否合格不能为空";
+ }
+ if (this.checkString(this.applicationDetail.tHouseApplyEnd.hasBuildingRecord)) {
+ return "是否有施工记录资料不能为空";
+ }
+ if (this.checkString(this.applicationDetail.tHouseApplyEnd.isSignWarranty)) {
+ return "建房村民和承揽人是否已经共同签署农村住房质量保修书不能为空";
+ }
+ if (this.checkString(this.applicationDetail.tHouseApplyEnd.isHandleProblem)) {
+ return "住房城乡建设行政主管部门或乡（镇）人民政府责令整改的问题是否全部整改完毕不能为空";
+ }
+ if (this.checkString(this.applicationDetail.tHouseApplyEnd.isDesignPaperSame)) {
+ return "建筑风貌是否与设计图基本一致不能为空";
+ }
+ if (this.checkString(this.applicationDetail.tHouseApplyEnd.isOtherAcceptanceFinished)) {
+ return "法律、法规规定的其他验收条件完成情况不能为空";
+ }
+
if (this.checkString(this.applicationDetail.tHouseApplyEnd.nongyeOption)) {
return "乡镇农业农村部门意见不能为空";
}
@@ -2557,28 +2581,6 @@ export default {
return "乡镇政府验收时间不能为空";
}
- if (this.checkString(this.applicationDetail.tHouseApplyEnd.isProjectFinished)) {
- return "是否已完成工程设计和合同约定的各项内容不能为空";
- }
- if (this.checkString(this.applicationDetail.tHouseApplyEnd.isQualifiedQuality)) {
- return "承揽人对完工住房质量自查是否合格不能为空";
- }
- if (this.checkString(this.applicationDetail.tHouseApplyEnd.hasBuildingRecord)) {
- return "是否有施工记录资料不能为空";
- }
- if (this.checkString(this.applicationDetail.tHouseApplyEnd.isSignWarranty)) {
- return "建房村民和承揽人是否已经共同签署农村住房质量保修书不能为空";
- }
- if (this.checkString(this.applicationDetail.tHouseApplyEnd.isHandleProblem)) {
- return "住房城乡建设行政主管部门或乡（镇）人民政府责令整改的问题是否全部整改完毕不能为空";
- }
- if (this.checkString(this.applicationDetail.tHouseApplyEnd.isDesignPaperSame)) {
- return "建筑风貌是否与设计图基本一致不能为空";
- }
- if (this.checkString(this.applicationDetail.tHouseApplyEnd.isOtherAcceptanceFinished)) {
- return "法律、法规规定的其他验收条件完成情况不能为空";
- }
-
// 通过时检查打勾, 农业部门
if(pass)
{