From 6aa6ea1583698228dcbaff43a28c674fc0390ead Mon Sep 17 00:00:00 2001 From: xyq <392009588@qq.com> Date: Tue, 3 Jan 2023 08:33:55 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E6=89=8B=E6=9C=BA=E7=AB=AF=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/onlineHome/homestead/houseProposer.js | 1 + .../sunVillage_info/homestead/application.js | 230 + src/components/home/HomeApplyUploadComp.vue | 302 + src/router/index.js | 22 +- .../homeApplication/applicationAdd.vue | 1039 ++++ .../homeApplication/applicationForm.vue | 1131 ++++ .../homeApplication/applicationList.vue | 241 + .../homeApplication/proposerLite.vue | 5072 +++++++++++++++++ .../sunVillage_info/index_code_rights.vue | 5 + src/views/yinnong/doneCompleted/completed.vue | 9 +- src/views/yinnong/doneCompleted/done.vue | 9 +- 11 files changed, 8057 insertions(+), 4 deletions(-) create mode 100644 src/api/sunVillage_info/homestead/application.js create mode 100644 src/components/home/HomeApplyUploadComp.vue create mode 100644 src/views/sunVillage_info/homeApplication/applicationAdd.vue create mode 100644 src/views/sunVillage_info/homeApplication/applicationForm.vue create mode 100644 src/views/sunVillage_info/homeApplication/applicationList.vue create mode 100644 src/views/sunVillage_info/homeApplication/proposerLite.vue diff --git a/src/api/onlineHome/homestead/houseProposer.js b/src/api/onlineHome/homestead/houseProposer.js index 82c8a2bf..ad5e8f39 100644 --- a/src/api/onlineHome/homestead/houseProposer.js +++ b/src/api/onlineHome/homestead/houseProposer.js @@ -141,3 +141,4 @@ export function selectProposerWLHT(id, data) { params: data }) } + diff --git a/src/api/sunVillage_info/homestead/application.js b/src/api/sunVillage_info/homestead/application.js new file mode 100644 index 00000000..0e98f786 --- /dev/null +++ b/src/api/sunVillage_info/homestead/application.js @@ -0,0 +1,230 @@ +import request from '@/utils/request' + +//查询列表 +export function getList(data){ + return request({ + url:'/home/mobile/proposer/list', + method:'get', + params:data + }) +} + +//获取申请单明细 +export function allInformation(id){ + return request({ + url:'/home/allinformation/'+id, + method:'get', + }) +} + +//获取申请单明细 +export function allInformationAnnounce(id){ + return request({ + url:'/home/allinformation/'+id+'?type=announce', + method:'get', + }) +} + +//获取文件配置 +export function treeSingleProcessView(data){ + return request({ + url:'/home/mobile/treeSingleProcessView', + method:'get', + params:data + }) +} + +//获取上传附件 +export function attachmentFind(data){ + return request({ + url:'/home/mobile/find', + method:'get', + params:data + }) +} + +//保存申请 +export function saveHomeBaseInfo(data){ + return request({ + url:'/home/mobile/saveHomeBaseInfo', + method:'post', + data:data + }) +} + +//提交申请 +export function saveHouseBaseInfoThenSubmit(data){ + return request({ + url:'/home/custom/saveHouseBaseInfoThenSubmit', + method:'post', + data:data + }) +} + +//同意审批 +export function agreeApply(data){ + return request({ + url:'/home/mobile/agreeApply', + method:'post', + data:data + }) +} + +//驳回审批 +export function rejectApply(data){ + return request({ + url:'/home/mobile/rejectApply', + method:'post', + data:data + }) +} + +//上传图片 +export function attach(data){ + console.log(data) + return request({ + url:'/common/attach', + method:'post', + headers:{'Content-Type': 'application/x-www-form-urlencoded;boundary=----WebKitFormBoundary7MA4YWxkTrZu0gW'}, + data:data + }) +} + +//删除列表项 +export function removeList(id){ + return request({ + url:'/home/mobile/proposer/remove/'+id, + method:'get' + }) +} + +//删除附件 +export function removeFile(id){ + return request({ + url:'/home/mobile/fileRemove/'+id, + method:'get' + }) +} + +//获取户主信息 +export function getHomeMembers(data){ + return request({ + url:'/home/mobile/getHomeMembers', + method:'get', + params:data + }) +} + +//获取申请单明细 WLHT +export function allInformationWLHT(id){ + return request({ + url:'/home/mobile/getYdjfsq/'+id, + method:'get', + }) +} + +// 查询文件配置树 +export function getAttachmentConfigTree(query) { + return request({ + url: '/home/mobile/getAttachmentConfigTree', + method: 'get', + params: query + }) +} + +// 新增地房申请-申请人 +export function addProposer(data) { + return request({ + url: '/home/custom/saveHouseBaseInfo', + method: 'post', + data: data + }) +} + +//检查是否重复建房 +export function checkDuplicateBuilding(query) { + return request({ + url: '/home/mobile/checkDuplicateBuilding', + method: 'get', + params: query + }) +} + +// 查询农房户型列表 +export function listHomeapplytype(query) { + return request({ + url: '/home/mobile/tytzList', + method: 'get', + params: query + }) +} +//查询宅地信息 +export function checkDuplicateBuildingQuery(id) { + return request({ + url: '/home/mobile/applyDetail/' + id, + method: 'get' + }) +} + +//乌兰浩特申请单人操作 +export function customSubmitWLHT(id) { + return request({ + url: '/home/mobile/publish/' + id, + method: 'post' + }) +} +// 新增地房申请-开工申请 +export function submitStartWLHT(id) { + return request({ + url: '/home/mobile/publishStart/'+id, + method: 'post', + }) +} + +// 修改地房申请-开工申请 +export function updateStart(data) { + return request({ + url: '/home/start/edit', + method: 'post', + data: data + }) +} + +// 提交地房申请-验收意见(乌兰浩特 简化流程) +export function submitEndWLHT(id) { + return request({ + url: '/home/mobile/publishCheck/'+id, + method: 'post', + }) +} + +//查询当前登录账号坐标 +export function getQueryLand(id) { + return request({ + url: '/home/mobile/get/current/' + id, + method: 'get' + }) +} + +//查询当前登录账号坐标 +export function getWorkflow() { + return request({ + url: '/home/mobile/workflow', + method: 'get' + }) +} +// 查询农户信息 +export function selectProposerNh(data) { + return request({ + url: '/home/mobile/queryHomeBaseNh' , + method: 'get', + params: data + }) +} +//驳回提交清空历史审批记录 +export function updateOpretion(id) { + return request({ + url: '/home/custom/updateOpretion/' + id, + method: 'post' + }) +} diff --git a/src/components/home/HomeApplyUploadComp.vue b/src/components/home/HomeApplyUploadComp.vue new file mode 100644 index 00000000..62b302b5 --- /dev/null +++ b/src/components/home/HomeApplyUploadComp.vue @@ -0,0 +1,302 @@ + + + + diff --git a/src/router/index.js b/src/router/index.js index e464f873..614e2b7b 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1291,7 +1291,7 @@ export const constantRoutes = [ title: '宅基地审批', hidden: true, }, - component: (resolve) => require(['@/views/onlineHome/homestead/homeApproval/approvalForm'], resolve) + component: (resolve) => require(['@/views/sunVillage_info/homeApplication/proposerLite'], resolve) }, // { // path: '/onlineHome/approvalList', @@ -2780,7 +2780,7 @@ export const constantRoutes = [ path: '/proposerLite', name: 'proposerLite', meta: { - title: '农村宅基地申请(简)', + title: '农村宅基地申请(信)', hidden: true, }, component: (resolve) => require(['@/views/onlineHome/homestead/homeApplication/proposerLite'], resolve) @@ -3524,6 +3524,24 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/sunVillage_info/list_vote'], resolve) }, + { ////阳光村务(新)-- 宅基地申请 + path: '/sunVillage_info/homeApplication/applicationList', + name: 'sunVillageInfoApplicationList', + meta: { + title: '宅基地申请', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/homeApplication/applicationList'], resolve) + }, + { + path: '/sunVillage_info/proposerLite', + name: 'sunVillageInfoProposerLite', + meta: { + title: '农村宅基地申请', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/homeApplication/proposerLite'], 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 new file mode 100644 index 00000000..53e41a5d --- /dev/null +++ b/src/views/sunVillage_info/homeApplication/applicationAdd.vue @@ -0,0 +1,1039 @@ + + + + + diff --git a/src/views/sunVillage_info/homeApplication/applicationForm.vue b/src/views/sunVillage_info/homeApplication/applicationForm.vue new file mode 100644 index 00000000..fb2caebe --- /dev/null +++ b/src/views/sunVillage_info/homeApplication/applicationForm.vue @@ -0,0 +1,1131 @@ + + + + + diff --git a/src/views/sunVillage_info/homeApplication/applicationList.vue b/src/views/sunVillage_info/homeApplication/applicationList.vue new file mode 100644 index 00000000..e13cc60f --- /dev/null +++ b/src/views/sunVillage_info/homeApplication/applicationList.vue @@ -0,0 +1,241 @@ + + + + + diff --git a/src/views/sunVillage_info/homeApplication/proposerLite.vue b/src/views/sunVillage_info/homeApplication/proposerLite.vue new file mode 100644 index 00000000..b519757a --- /dev/null +++ b/src/views/sunVillage_info/homeApplication/proposerLite.vue @@ -0,0 +1,5072 @@ + + + + + diff --git a/src/views/sunVillage_info/index_code_rights.vue b/src/views/sunVillage_info/index_code_rights.vue index 639f0f36..6ee302f1 100644 --- a/src/views/sunVillage_info/index_code_rights.vue +++ b/src/views/sunVillage_info/index_code_rights.vue @@ -27,6 +27,7 @@ @@ -233,6 +234,10 @@ background: url('../../assets/images/sunVillage_info/index_block_5.png') no-repeat; background-size: 100% 100%; } + &.n_6 { + background: url('../../assets/images/sunVillage_info/index_block_06.png') no-repeat center top; + background-size: 34.5PX; + } } } } diff --git a/src/views/yinnong/doneCompleted/completed.vue b/src/views/yinnong/doneCompleted/completed.vue index 898f6072..4ed3af35 100644 --- a/src/views/yinnong/doneCompleted/completed.vue +++ b/src/views/yinnong/doneCompleted/completed.vue @@ -93,7 +93,7 @@ }, getList() { this.taskList = [] - this.$set(this.queryParams, "systemType", '4'); + // this.$set(this.queryParams, "systemType", '4'); ListTodo(this.queryParams).then((response) => { response.rows.map(res => { if(res.tableName?res.tableName.indexOf('house')>0:""){ @@ -118,6 +118,13 @@ console.log(item) let type = item.formData.processKey; switch (type) { + case 'home_check': + case 'home_start': + this.$router.push({name:'approvalForm',query: {id:item.formData.ydjfsqId,taskId:item.taskId,instanceId:item.formData.instanceId,type:item.type}}) + break; + case 'home_apply': + this.$router.push({name:'approvalForm',query: {id:item.formData.id,taskId:item.taskId,instanceId:item.formData.instanceId,type:item.type}}) + break; case 'baseApply': case 'landscope': case 'accepting': diff --git a/src/views/yinnong/doneCompleted/done.vue b/src/views/yinnong/doneCompleted/done.vue index 787975dc..1494fa5e 100644 --- a/src/views/yinnong/doneCompleted/done.vue +++ b/src/views/yinnong/doneCompleted/done.vue @@ -93,7 +93,7 @@ }, getList() { this.taskList = [] - this.$set(this.queryParams, "systemType", '4'); + // this.$set(this.queryParams, "systemType", '4'); ListDone(this.queryParams).then((response) => { response.rows.map(res => { if(res.tableName?res.tableName.indexOf('house')>0:""){ @@ -118,6 +118,13 @@ console.log(item) let type = item.formData.processKey; switch (type) { + case 'home_check': + case 'home_start': + this.$router.push({name:'approvalForm',query: {id:item.formData.ydjfsqId,taskId:item.taskId,instanceId:item.formData.instanceId,type:item.type}}) + break; + case 'home_apply': + this.$router.push({name:'approvalForm',query: {id:item.formData.id,taskId:item.taskId,instanceId:item.formData.instanceId,type:item.type}}) + break; case 'baseApply': case 'landscope': case 'accepting': From 5ff623ff09e9644f56e925e17513fe0fb8216374 Mon Sep 17 00:00:00 2001 From: xyq <392009588@qq.com> Date: Tue, 3 Jan 2023 15:16:43 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E6=89=8B=E6=9C=BA=E7=AB=AF=E8=AE=BF=E9=97=AE=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/permission.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/permission.js b/src/permission.js index 16218d55..437666aa 100644 --- a/src/permission.js +++ b/src/permission.js @@ -128,6 +128,9 @@ const whiteList = [ '/sunVillage_info/list_vote', //详情页 '/sunVillage_info/list_vote_detail', //详情页 '/sunVillage_info/list_vote_form', //详情页 + '/sunVillage_info/homeApplication/applicationList', //列表页面 + '/sunVillage_info/applicationAdd', //列表页面 + '/sunVillage_info/proposerLite', // 新型经营主体 'newBusinessEntity/newsBulletin', //新闻公告 '/newBusinessEntity/index', //首页 From b9fa71fed68c8c50092421302ab42bee21941c5a Mon Sep 17 00:00:00 2001 From: xyq <392009588@qq.com> Date: Tue, 3 Jan 2023 15:17:35 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E6=89=8B=E6=9C=BA=E7=AB=AF=E8=AE=BF=E9=97=AE=E6=9D=83?= =?UTF-8?q?=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/permission.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/permission.js b/src/permission.js index 437666aa..7e4a2710 100644 --- a/src/permission.js +++ b/src/permission.js @@ -129,7 +129,6 @@ const whiteList = [ '/sunVillage_info/list_vote_detail', //详情页 '/sunVillage_info/list_vote_form', //详情页 '/sunVillage_info/homeApplication/applicationList', //列表页面 - '/sunVillage_info/applicationAdd', //列表页面 '/sunVillage_info/proposerLite', // 新型经营主体 'newBusinessEntity/newsBulletin', //新闻公告