diff --git a/src/router/index.js b/src/router/index.js index abb259af..27542f2e 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -675,7 +675,7 @@ export const constantRoutes = [ path: '/circulationAdd', name: 'circulationAdd', meta: { - title: '添加宅基地使用流转权', + title: '添加宅基地使用权流转', hidden: true, }, component: (resolve) => require(['@/views/onlineHome/homestead/circulation/circulationAdd'], resolve) @@ -856,7 +856,7 @@ export const constantRoutes = [ path: '/circulationDetail', name: 'circulationDetail', meta: { - title: '查看宅基地使用流转权', + title: '查看宅基地使用权流转', hidden: true, }, component: (resolve) => require(['@/views/onlineHome/homestead/circulation/circulationDetail'], resolve) @@ -865,7 +865,7 @@ export const constantRoutes = [ path: '/circulationModify', name: 'circulationModify', meta: { - title: '修改宅基地使用流转权', + title: '修改宅基地使用权流转', hidden: true, }, component: (resolve) => require(['@/views/onlineHome/homestead/circulation/circulationModify'], resolve) diff --git a/src/views/onlineHome/done.vue b/src/views/onlineHome/done.vue index d4f75635..29f98be4 100644 --- a/src/views/onlineHome/done.vue +++ b/src/views/onlineHome/done.vue @@ -75,7 +75,10 @@ queryParams: { pageNum: 1, pageSize: 100, + isAsc: 'DESC', }, + orderByColumn_todo: 'CREATE_TIME_', + orderByColumn_done: 'END_TIME_', activityBusinessTypeOptions:[], refreshing: false, loading: false, @@ -120,6 +123,7 @@ else { this.queryParams.pageNum = eval(this.queryParams.pageNum + target.toString()) } + this.queryParams.orderByColumn = this.activeName == '1' ? this.orderByColumn_todo : this.orderByColumn_done; this.$set(this.queryParams, "systemType", '11'); // 4 if(this.activeName=='1'){ ListTodo(this.queryParams).then((response) => { diff --git a/src/views/onlineHome/homestead/circulation/circulationDetail.vue b/src/views/onlineHome/homestead/circulation/circulationDetail.vue index f07cc644..0fb773b9 100644 --- a/src/views/onlineHome/homestead/circulation/circulationDetail.vue +++ b/src/views/onlineHome/homestead/circulation/circulationDetail.vue @@ -7,7 +7,7 @@ @click-left="$router.back(-1)" >

转出方信息

diff --git a/src/views/onlineHome/homestead/circulation/circulationModify.vue b/src/views/onlineHome/homestead/circulation/circulationModify.vue index 7aeafd0b..b5bd73d6 100644 --- a/src/views/onlineHome/homestead/circulation/circulationModify.vue +++ b/src/views/onlineHome/homestead/circulation/circulationModify.vue @@ -7,7 +7,7 @@ @click-left="$router.back(-1)" > diff --git a/src/views/onlineHome/homestead/homeApplication/proposerLite.vue b/src/views/onlineHome/homestead/homeApplication/proposerLite.vue index 700b7229..163e83b2 100644 --- a/src/views/onlineHome/homestead/homeApplication/proposerLite.vue +++ b/src/views/onlineHome/homestead/homeApplication/proposerLite.vue @@ -42,7 +42,7 @@ /> - + @@ -88,7 +88,7 @@ - + @@ -571,7 +571,7 @@ /> - + @@ -604,7 +604,7 @@ - + @@ -2273,6 +2273,13 @@ export default { this.applicationDetail.tHouseApplyProposer.applyTime = this.getDate(); this.getMemberCurrentSituation(); this.updateUserInfo(); + if(this.applicationDetail.tHouseApplyFamilyMembers.length > 0) + { + for(let i = 0; i < this.applicationDetail.tHouseApplyFamilyMembers.length; i++) + { + this.updateMemberInfo(i); + } + } } }); }, @@ -2898,11 +2905,14 @@ export default { } } - if (this.checkString(this.applicationDetail.tHouseApplyProposedSituation.location)) { - return "拟建地址不能为空"; - } if (this.checkString(this.applicationDetail.tHouseApplyProposedSituation.landArea)) { - return "拟建宅基地面积不能为空"; + return "宅基地面积不能为空"; + } + if (this.checkString(this.applicationDetail.tHouseApplyProposedSituation.buildingLandArea)) { + return "房基占地面积不能为空"; + } + if (this.checkString(this.applicationDetail.tHouseApplyProposedSituation.location)) { + return "地址不能为空"; } if (this.checkString(this.applicationDetail.tHouseApplyProposedSituation.east)) { return "东至不能为空"; @@ -2919,9 +2929,6 @@ export default { if (this.checkString(this.applicationDetail.tHouseApplyProposedSituation.buildingArea)) { return "住房建筑面积不能为空"; } - if (this.checkString(this.applicationDetail.tHouseApplyProposedSituation.buildingLandArea)) { - return "房基占地面积不能为空"; - } if (this.checkString(this.applicationDetail.tHouseApplyProposedSituation.buildingFloors)) { return "建筑层数不能为空"; } diff --git a/src/views/onlineHome/homestead/homesteadUtilize/homesteadUtilizeAdd.vue b/src/views/onlineHome/homestead/homesteadUtilize/homesteadUtilizeAdd.vue index 8981a5bd..efd4218f 100644 --- a/src/views/onlineHome/homestead/homesteadUtilize/homesteadUtilizeAdd.vue +++ b/src/views/onlineHome/homestead/homesteadUtilize/homesteadUtilizeAdd.vue @@ -7,7 +7,7 @@ @click-left="$router.back(-1)" > diff --git a/src/views/onlineHome/homestead/mortgage/mortgageAdd.vue b/src/views/onlineHome/homestead/mortgage/mortgageAdd.vue index 5b900c53..854b03d8 100644 --- a/src/views/onlineHome/homestead/mortgage/mortgageAdd.vue +++ b/src/views/onlineHome/homestead/mortgage/mortgageAdd.vue @@ -7,7 +7,7 @@ @click-left="$router.back(-1)" > @@ -155,7 +155,7 @@
- 保存 + 保存 提交 diff --git a/src/views/onlineHome/homestead/paidExit/paidExitAdd.vue b/src/views/onlineHome/homestead/paidExit/paidExitAdd.vue index 46f1285f..7d1ff218 100644 --- a/src/views/onlineHome/homestead/paidExit/paidExitAdd.vue +++ b/src/views/onlineHome/homestead/paidExit/paidExitAdd.vue @@ -150,7 +150,7 @@
- 保存 + 保存 提交 diff --git a/src/views/onlineHome/homestead/supervision/supervisionDetail.vue b/src/views/onlineHome/homestead/supervision/supervisionDetail.vue index c13978b4..dcee3c14 100644 --- a/src/views/onlineHome/homestead/supervision/supervisionDetail.vue +++ b/src/views/onlineHome/homestead/supervision/supervisionDetail.vue @@ -14,6 +14,7 @@
+ diff --git a/src/views/onlineHome/homestead/utilization/utilizationAdd.vue b/src/views/onlineHome/homestead/utilization/utilizationAdd.vue index 3f992768..766caaef 100644 --- a/src/views/onlineHome/homestead/utilization/utilizationAdd.vue +++ b/src/views/onlineHome/homestead/utilization/utilizationAdd.vue @@ -7,7 +7,7 @@ @click-left="$router.back(-1)" > @@ -171,7 +171,7 @@ @confirm="onConfirmDcsj" /> - +

照片信息

diff --git a/src/views/onlineHome/homestead/utilization/utilizationModify.vue b/src/views/onlineHome/homestead/utilization/utilizationModify.vue index ab9419cc..ff6ec642 100644 --- a/src/views/onlineHome/homestead/utilization/utilizationModify.vue +++ b/src/views/onlineHome/homestead/utilization/utilizationModify.vue @@ -171,7 +171,7 @@ @confirm="onConfirmDcsj" /> - +

照片信息

diff --git a/src/views/yinnong/homestead/circulation/circulationAdd.vue b/src/views/yinnong/homestead/circulation/circulationAdd.vue index a796acee..be0e6e7f 100644 --- a/src/views/yinnong/homestead/circulation/circulationAdd.vue +++ b/src/views/yinnong/homestead/circulation/circulationAdd.vue @@ -7,7 +7,7 @@ @click-left="$router.back(-1)" >

转出方信息

diff --git a/src/views/yinnong/homestead/circulation/circulationDetail.vue b/src/views/yinnong/homestead/circulation/circulationDetail.vue index 50c0e224..1b2a6d6d 100644 --- a/src/views/yinnong/homestead/circulation/circulationDetail.vue +++ b/src/views/yinnong/homestead/circulation/circulationDetail.vue @@ -7,7 +7,7 @@ @click-left="$router.back(-1)" >

转出方信息

@@ -116,7 +116,6 @@ export default { data() { return { value: '', - circulation:[], houseApplyStatus:[], circulation:[], }; diff --git a/src/views/yinnong/homestead/circulation/circulationModify.vue b/src/views/yinnong/homestead/circulation/circulationModify.vue index 8ceee677..02530d65 100644 --- a/src/views/yinnong/homestead/circulation/circulationModify.vue +++ b/src/views/yinnong/homestead/circulation/circulationModify.vue @@ -7,7 +7,7 @@ @click-left="$router.back(-1)" >

转出方信息

diff --git a/src/views/yinnong/homestead/mortgage/mortgageAdd.vue b/src/views/yinnong/homestead/mortgage/mortgageAdd.vue index 8924fac9..91ecfd0d 100644 --- a/src/views/yinnong/homestead/mortgage/mortgageAdd.vue +++ b/src/views/yinnong/homestead/mortgage/mortgageAdd.vue @@ -7,7 +7,7 @@ @click-left="$router.back(-1)" >
diff --git a/src/views/yinnong/homestead/mortgage/mortgageDetail.vue b/src/views/yinnong/homestead/mortgage/mortgageDetail.vue index 45bf1795..6b10d185 100644 --- a/src/views/yinnong/homestead/mortgage/mortgageDetail.vue +++ b/src/views/yinnong/homestead/mortgage/mortgageDetail.vue @@ -7,7 +7,7 @@ @click-left="$router.back(-1)" >
diff --git a/src/views/yinnong/homestead/mortgage/mortgageModify.vue b/src/views/yinnong/homestead/mortgage/mortgageModify.vue index ac2cec72..e22147f2 100644 --- a/src/views/yinnong/homestead/mortgage/mortgageModify.vue +++ b/src/views/yinnong/homestead/mortgage/mortgageModify.vue @@ -7,7 +7,7 @@ @click-left="$router.back(-1)" >
@@ -268,13 +268,6 @@ export default { this.circulation.djsj = this.getNowFormatDate(data).substr(0,10); this.showdjsj = false; }, - goEdit(){ - dyApply(this.circulation).then(response => { - if(response.code = 200){ - this.$toast.success('保存成功'); - } - }); - }, goEdit(){ dyEdit(this.circulation).then(response => { if(response.code = 200){