From 5e3e048af1afef88e017da5da4649c49770690fe Mon Sep 17 00:00:00 2001 From: xyq <392009588@qq.com> Date: Fri, 6 Jan 2023 13:35:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0=E9=80=80=E5=87=BA?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E6=89=8B=E6=9C=BA=E7=AB=AF=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=8A=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/sunVillage_info/homestead/paidExit.js | 98 ++ src/components/Map/MapGisObtainTc.vue | 262 ++++ src/components/home/HomeApplyUploadComp.vue | 3 +- src/permission.js | 7 +- src/router/index.js | 42 +- .../homeApplication/applicationAdd.vue | 1039 --------------- .../homeApplication/applicationForm.vue | 1131 ----------------- .../homeApplication/applicationList.vue | 33 +- .../homeApplication/proposerLite.vue | 151 ++- .../sunVillage_info/index_code_rights.vue | 1 + .../sunVillage_info/paidExit/paidExitAdd.vue | 649 ++++++++++ .../paidExit/paidExitDetail.vue | 810 ++++++++++++ .../sunVillage_info/paidExit/paidExitList.vue | 193 +++ .../paidExit/paidExitModify.vue | 567 +++++++++ src/views/yinnong/doneCompleted/completed.vue | 15 +- src/views/yinnong/doneCompleted/done.vue | 3 + 16 files changed, 2760 insertions(+), 2244 deletions(-) create mode 100644 src/api/sunVillage_info/homestead/paidExit.js create mode 100644 src/components/Map/MapGisObtainTc.vue delete mode 100644 src/views/sunVillage_info/homeApplication/applicationAdd.vue delete mode 100644 src/views/sunVillage_info/homeApplication/applicationForm.vue create mode 100644 src/views/sunVillage_info/paidExit/paidExitAdd.vue create mode 100644 src/views/sunVillage_info/paidExit/paidExitDetail.vue create mode 100644 src/views/sunVillage_info/paidExit/paidExitList.vue create mode 100644 src/views/sunVillage_info/paidExit/paidExitModify.vue diff --git a/src/api/sunVillage_info/homestead/paidExit.js b/src/api/sunVillage_info/homestead/paidExit.js new file mode 100644 index 00000000..a2ac7202 --- /dev/null +++ b/src/api/sunVillage_info/homestead/paidExit.js @@ -0,0 +1,98 @@ +import request from '@/utils/request' + +//查询列表 +export function getList(data){ + return request({ + url:'/home/mobile/zyyctcList', + method:'get', + params:data + }) +} + +//删除列表项 +export function removeList(id){ + return request({ + url:'/house/zyyctc/remove/'+id, + method:'get' + }) +} + +//宅基地流转详情 +export function getZyyctc(id){ + return request({ + url:'/home/mobile/getZyyctc/'+id, + method:'get' + }) +} + +//宅基地流转详情 +export function dyAdd(data){ + return request({ + url:'/home/mobile/zyyctcAdd', + method:'post', + data:data + }) +} +// 条件查询使用权人列表 +export function selectHomesteadObligeeMapList(query) { + return request({ + url: '/home/mobile/selectHomesteadObligeeMapList', + method: 'get', + params: query + }) +} +//宅基地信息 +export function getByLyZjddm(data){ + return request({ + url:'/home/mobile/getByZjddm/'+ data, + method:'get', + }) +} + +// 查询农民房屋列表 +export function listHomesteadnmfw(query) { + return request({ + url: '/home/mobile/nmfwList', + method: 'get', + params: query + }) +} + +//查询当前登录账号坐标 +export function getQueryLand(id) { + return request({ + url: '/home/mobile/get/current/' + id, + method: 'get' + }) +} +//宅基地流转保存 +export function zyyctcEdit(data){ + return request({ + url:'/home/mobile/editZyyctc', + method:'post', + data:data + }) +} + +//宅基地流转提交 +/*export function zyyctcApply(id){ + return request({ + url:'/house/zyyctc/submitApply/'+id, + method:'post', + }) +}*/ +export function zyyctcApply(id){ + return request({ + url:'/home/mobile/paidExitSubmitApply/'+id, + method:'post', + }) +} + +// 查询权利人列表 +export function getShyqrs(query) { + return request({ + url: '/home/mobile/getShyqrs', + method: 'get', + params: query + }) +} diff --git a/src/components/Map/MapGisObtainTc.vue b/src/components/Map/MapGisObtainTc.vue new file mode 100644 index 00000000..1f6c1f95 --- /dev/null +++ b/src/components/Map/MapGisObtainTc.vue @@ -0,0 +1,262 @@ + + + + + diff --git a/src/components/home/HomeApplyUploadComp.vue b/src/components/home/HomeApplyUploadComp.vue index 62b302b5..5f550ee8 100644 --- a/src/components/home/HomeApplyUploadComp.vue +++ b/src/components/home/HomeApplyUploadComp.vue @@ -63,8 +63,7 @@ export default { }, }, created() { - console.info(this.houseApplyStatus); - if (this.businessType !== null && this.proposerId == -1) { + if (this.businessType !== null) { this.showAttachmentComp(this.businessType, this.proposerId, this.houseApplyStatus, this.processKey, this.tableName, this.full) } }, diff --git a/src/permission.js b/src/permission.js index 7e4a2710..60c2a4f9 100644 --- a/src/permission.js +++ b/src/permission.js @@ -120,7 +120,7 @@ const whiteList = [ '/sunVillage_info/list_issues', //详情页 '/sunVillage_info/list_tourists_detail', //详情页 '/sunVillage_info/list_issues_detail', //详情页 - '/sunVillage_info/list_finance_detail', //详情页 + '/sunVillage_info/list_finance_detail', //详情页 '/sunVillage_info/list_finance_ranking', //详情页 '/sunVillage_info/list_tourists_ranking', //详情页 '/sunVillage_info/login_code', //详情页 @@ -130,6 +130,11 @@ const whiteList = [ '/sunVillage_info/list_vote_form', //详情页 '/sunVillage_info/homeApplication/applicationList', //列表页面 '/sunVillage_info/proposerLite', + '/sunVillage_info/paidExit/paidExitList', //列表页面 + '/sunVillage_info/paidExitAdd', + '/sunVillage_info/paidExitModify', + '/sunVillage_info/paidExitDetail', + // 新型经营主体 'newBusinessEntity/newsBulletin', //新闻公告 '/newBusinessEntity/index', //首页 diff --git a/src/router/index.js b/src/router/index.js index 614e2b7b..48aa8e8a 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -2432,7 +2432,7 @@ export const constantRoutes = [ component: (resolve) => require(['@/views/yinnong/bankAgriculture/bankOfDeposit/bankOfDepositModify'], resolve) }, { - + path: '/yinnong/listBalanceRanking', name: 'yinnongListBalanceRanking', meta: { @@ -2442,7 +2442,7 @@ export const constantRoutes = [ component: (resolve) => require(['@/views/yinnong/listBalanceRanking'], resolve) }, { - + path: '/yinnong/detailedLedger', name: 'yinnongDetailedLedger', meta: { @@ -2452,7 +2452,7 @@ export const constantRoutes = [ component: (resolve) => require(['@/views/yinnong/detailedLedger'], resolve) }, { - + path: '/yinnong/detailedVoucher', name: 'yinnongDetailedVoucher', meta: { @@ -3542,6 +3542,42 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/sunVillage_info/homeApplication/proposerLite'], resolve) }, + { + path: '/sunVillage_info/paidExit/paidExitList', + name: 'sunVillageInfoPaidExitList', + meta: { + title: '有偿退出', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/paidExit/paidExitList'], resolve) + }, + { + path: '/sunVillage_info/paidExitAdd', + name: 'sunVillageInfoPaidExitAdd', + meta: { + title: '有偿退出新增', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/paidExit/paidExitAdd'], resolve) + }, + { + path: '/sunVillage_info/paidExitModify', + name: 'sunVillageInfoPaidExitModify', + meta: { + title: '有偿退出修改', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/paidExit/paidExitModify'], resolve) + }, + { + path: '/sunVillage_info/paidExitDetail', + name: 'sunVillageInfoPaidExitDetail', + meta: { + title: '有偿退出审批', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/paidExit/paidExitDetail'], resolve) + }, { ////阳光村务(新)-- 合同信息 path: '/sunVillage_info/list_vote_detail', name: 'sunVillageInfoListVoteDetail', diff --git a/src/views/sunVillage_info/homeApplication/applicationAdd.vue b/src/views/sunVillage_info/homeApplication/applicationAdd.vue deleted file mode 100644 index 53e41a5d..00000000 --- a/src/views/sunVillage_info/homeApplication/applicationAdd.vue +++ /dev/null @@ -1,1039 +0,0 @@ - - - - - diff --git a/src/views/sunVillage_info/homeApplication/applicationForm.vue b/src/views/sunVillage_info/homeApplication/applicationForm.vue deleted file mode 100644 index fb2caebe..00000000 --- a/src/views/sunVillage_info/homeApplication/applicationForm.vue +++ /dev/null @@ -1,1131 +0,0 @@ - - - - - diff --git a/src/views/sunVillage_info/homeApplication/applicationList.vue b/src/views/sunVillage_info/homeApplication/applicationList.vue index e13cc60f..2a675cc3 100644 --- a/src/views/sunVillage_info/homeApplication/applicationList.vue +++ b/src/views/sunVillage_info/homeApplication/applicationList.vue @@ -62,7 +62,7 @@ + + diff --git a/src/views/sunVillage_info/paidExit/paidExitDetail.vue b/src/views/sunVillage_info/paidExit/paidExitDetail.vue new file mode 100644 index 00000000..a67239ba --- /dev/null +++ b/src/views/sunVillage_info/paidExit/paidExitDetail.vue @@ -0,0 +1,810 @@ + + + + + diff --git a/src/views/sunVillage_info/paidExit/paidExitList.vue b/src/views/sunVillage_info/paidExit/paidExitList.vue new file mode 100644 index 00000000..5c82d4ce --- /dev/null +++ b/src/views/sunVillage_info/paidExit/paidExitList.vue @@ -0,0 +1,193 @@ + + + + + diff --git a/src/views/sunVillage_info/paidExit/paidExitModify.vue b/src/views/sunVillage_info/paidExit/paidExitModify.vue new file mode 100644 index 00000000..c5dedb09 --- /dev/null +++ b/src/views/sunVillage_info/paidExit/paidExitModify.vue @@ -0,0 +1,567 @@ + + + + + diff --git a/src/views/yinnong/doneCompleted/completed.vue b/src/views/yinnong/doneCompleted/completed.vue index 4ed3af35..d9295242 100644 --- a/src/views/yinnong/doneCompleted/completed.vue +++ b/src/views/yinnong/doneCompleted/completed.vue @@ -48,6 +48,7 @@