diff --git a/src/router/index.js b/src/router/index.js index 85553089..2e5fd561 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -852,6 +852,24 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/yinnong/homestead/freeExit/freeExitList'], resolve) }, + { + path: '/homesteadPaidExitAdd', + name: 'homesteadPaidExitAdd', + meta: { + title: '有偿退出(阳光村务)', + hidden: true, + }, + component: (resolve) => require(['@/views/yinnong/homestead/paidExit/paidExitAdd'], resolve) + }, + { + path: '/homesteadPaidExitModify', + name: 'homesteadPaidExitModify', + meta: { + title: '有偿退出(阳光村务)', + hidden: true, + }, + component: (resolve) => require(['@/views/yinnong/homestead/paidExit/paidExitModify'], resolve) + }, { path: '/paidExitAdd', name: 'paidExitAdd', @@ -3912,6 +3930,15 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/sunVillage_info/homeApplication/proposerLite'], resolve) }, + { + path: '/homesteadProposerLite', + name: 'homesteadProposerLite', + meta: { + title: '农村宅基地申请(阳光村务)', + hidden: true, + }, + component: (resolve) => require(['@/views/yinnong/homestead/homeApplication/proposerLite'], resolve) + }, { path: '/sunVillage_info/paidExit/paidExitList', name: 'sunVillageInfoPaidExitList', diff --git a/src/views/homesteadSurvey/add.vue b/src/views/homesteadSurvey/add.vue index fc19bbbc..246d896a 100644 --- a/src/views/homesteadSurvey/add.vue +++ b/src/views/homesteadSurvey/add.vue @@ -849,11 +849,17 @@ export default { return; } if(this.form.id == null){ + let surveyItem = JSON.parse(localStorage.getItem("surveyItem")); + this.$set(this.form, 'theGeomJson', JSON.parse( this.form.theGeomJson)); + if(this.form.theGeomJson.hasOwnProperty('coordinates')) // 从后台获取的 + this.$set(this.form, 'theGeomJson',this.form.theGeomJson.coordinates); + this.$set(this.form, 'theGeomJson', JSON.stringify( this.form.theGeomJson)); this.$set(this.form, 'surveyId', surveyItem.id); addZjdzd(this.form).then(response => { let _this =this; getZjdzd(response.data).then((res) => { + console.info(res.data); localStorage.setItem("zjdzdxxItem",JSON.stringify(res.data)); this.$toast({ icon: 'success', // 找到自己需要的图标 diff --git a/src/views/homesteadSurvey/fsssAdd.vue b/src/views/homesteadSurvey/fsssAdd.vue index f970787d..b768c4f9 100644 --- a/src/views/homesteadSurvey/fsssAdd.vue +++ b/src/views/homesteadSurvey/fsssAdd.vue @@ -209,6 +209,10 @@ export default { }, submitzjd(){ this.$refs.form.validate().then(() => { + this.$set(this.form, 'theGeomJson', JSON.parse( this.form.theGeomJson)); + if(this.form.theGeomJson.hasOwnProperty('coordinates')) // 从后台获取的 + this.$set(this.form, 'theGeomJson',this.form.theGeomJson.coordinates); + this.$set(this.form, 'theGeomJson', JSON.stringify( this.form.theGeomJson)); if(this.form.id == null){ addFsss(this.form).then(response => { let _this =this diff --git a/src/views/homesteadSurvey/zrzAdd.vue b/src/views/homesteadSurvey/zrzAdd.vue index 636805ff..c090134f 100644 --- a/src/views/homesteadSurvey/zrzAdd.vue +++ b/src/views/homesteadSurvey/zrzAdd.vue @@ -243,6 +243,7 @@ export default { let data = this.$route.query; this.form = data; this.zjdzdxx = JSON.parse(localStorage.getItem("zjdzdxxItem")); + console.info(this.zjdzdxx); this.permission = localStorage.getItem("executePermission"); if(this.form.shyqrdbzjhm != null){ this.getList(); @@ -269,6 +270,10 @@ export default { submitzjd(){ this.$refs.form.validate().then(() => { if(this.form.id == null){ + this.$set(this.form, 'theGeomJson', JSON.parse( this.form.theGeomJson)); + if(this.form.theGeomJson.hasOwnProperty('coordinates')) // 从后台获取的 + this.$set(this.form, 'theGeomJson',this.form.theGeomJson.coordinates); + this.$set(this.form, 'theGeomJson', JSON.stringify( this.form.theGeomJson)); addZrz(this.form).then(response => { let _this =this this.$toast({ diff --git a/src/views/sunVillage_info/paidExit/paidExitList.vue b/src/views/sunVillage_info/paidExit/paidExitList.vue index e1973d9c..4a1ababc 100644 --- a/src/views/sunVillage_info/paidExit/paidExitList.vue +++ b/src/views/sunVillage_info/paidExit/paidExitList.vue @@ -28,7 +28,7 @@ @load="getList" > - + @@ -39,13 +39,13 @@ diff --git a/src/views/yinnong/homestead/circulation/circulationAdd.vue b/src/views/yinnong/homestead/circulation/circulationAdd.vue index 1852e910..77906f99 100644 --- a/src/views/yinnong/homestead/circulation/circulationAdd.vue +++ b/src/views/yinnong/homestead/circulation/circulationAdd.vue @@ -1,15 +1,9 @@