diff --git a/src/api/onlineHome/homestead/application.js b/src/api/onlineHome/homestead/application.js index 9d5a35e4..c9ff9477 100644 --- a/src/api/onlineHome/homestead/application.js +++ b/src/api/onlineHome/homestead/application.js @@ -121,3 +121,104 @@ export function getHouseMembers(id){ method:'get' }) } + +//获取申请单明细 WLHT +export function allInformationWLHT(id){ + return request({ + url:'/house/allinformation/getAllInformation/'+id, + method:'get', + }) +} + +// 查询文件配置树 +export function getAttachmentConfigTree(query) { + return request({ + url: '/system/attachmentConfig/getAttachmentConfigTree', + method: 'get', + params: query + }) +} + +// 新增地房申请-申请人 +export function addProposer(data) { + return request({ + url: '/house/custom/saveHouseBaseInfo', + method: 'post', + data: data + }) +} + +//检查是否重复建房 +export function checkDuplicateBuilding(query) { + return request({ + url: '/house/custom/checkDuplicateBuilding', + method: 'get', + params: query + }) +} + +//查询宅地信息 +export function checkDuplicateBuildingQuery(query) { + return request({ + url: '/house/custom/checkDuplicateBuildingQuery', + method: 'get', + params: query + }) +} + +//乌兰浩特申请单人操作 +export function customSubmitWLHT(id) { + return request({ + url: '/house/custom/submitWLHT/' + id, + method: 'post' + }) +} +// 新增地房申请-开工申请 +export function submitStartWLHT(id) { + return request({ + url: '/house/start/submitWLHT/'+id, + method: 'post', + }) +} + +// 修改地房申请-开工申请 +export function updateStart(data) { + return request({ + url: '/house/start/edit', + method: 'post', + data: data + }) +} + +// 修改地房申请-验收意见 +export function updateEnd(data) { + return request({ + url: '/house/end/edit', + method: 'post', + data: data + }) +} + +// 提交地房申请-验收意见(乌兰浩特 简化流程) +export function submitEndWLHT(id) { + return request({ + url: '/house/end/submitWLHT/'+id, + method: 'post', + }) +} + +//查询当前登录账号坐标 +export function getQueryLand() { + return request({ + url: '/system/dept/get/current', + method: 'get' + }) +} + +//查询当前登录账号坐标 +export function getWorkflow() { + return request({ + url: '/house/custom/workflow', + method: 'get' + }) +} diff --git a/src/api/onlineHome/homestead/houseAnnounce.js b/src/api/onlineHome/homestead/houseAnnounce.js new file mode 100644 index 00000000..06d4d151 --- /dev/null +++ b/src/api/onlineHome/homestead/houseAnnounce.js @@ -0,0 +1,61 @@ +import request from '@/utils/request' + +// 查询地房申请-村组公示列表 +export function listAnnounce(query) { + return request({ + url: '/house/announce/list', + method: 'get', + params: query + }) +} + +// 查询地房申请-村组公示详细 +export function getAnnounce(id) { + return request({ + url: '/house/announce/get/' + id, + method: 'get' + }) +} + +// 新增地房申请-村组公示 +export function addAnnounce(data) { + return request({ + url: '/house/announce/add', + method: 'post', + data: data + }) +} + +// 修改地房申请-村组公示 +export function updateAnnounce(data) { + return request({ + url: '/house/announce/edit', + method: 'post', + data: data + }) +} + +// 删除地房申请-村组公示 +export function delAnnounce(id) { + return request({ + url: '/house/announce/remove/' + id, + method: 'get' + }) +} + +// 导出地房申请-村组公示 +export function exportAnnounce(query) { + return request({ + url: '/house/announce/export', + method: 'get', + params: query + }) +} + +// 查询地房申请-申请人详细 +export function getProposer(id) { + return request({ + url: '/house/proposer/get/' + id, + method: 'get' + }) +} diff --git a/src/api/onlineHome/homestead/houseProposer.js b/src/api/onlineHome/homestead/houseProposer.js new file mode 100644 index 00000000..82c8a2bf --- /dev/null +++ b/src/api/onlineHome/homestead/houseProposer.js @@ -0,0 +1,143 @@ +import request from '@/utils/request' + +// 查询地房申请-申请人列表 +export function listProposer(query) { + return request({ + url: '/house/proposer/list', + method: 'get', + params: query + }) +} + +// 查询地房申请-申请人列表 +export function queryAdmin(query) { + return request({ + url: '/house/proposer/queryAdmin', + method: 'get', + params: query + }) +} + + +// 查询地房申请-申请人详细 +export function getProposer(id) { + return request({ + url: '/house/proposer/get/' + id, + method: 'get' + }) +} + +// 新增地房申请-申请人 +export function addProposer(data) { + return request({ + url: '/house/custom/saveHouseBaseInfo', + method: 'post', + data: data + }) +} + +// 修改地房申请-申请人 +export function updateProposer(data) { + return request({ + url: '/house/proposer/edit', + method: 'post', + data: data + }) +} + +// 删除地房申请-申请人 +export function delProposer(id) { + return request({ + url: '/house/proposer/remove/' + id, + method: 'get' + }) +} + +// 导出地房申请-申请人 +export function exportProposer(query) { + return request({ + url: '/house/proposer/export', + method: 'get', + params: query + }) +} + +// 导出地房申请-申请人 +export function exportAdmin(query) { + return request({ + url: '/house/proposer/exportAdmin', + method: 'get', + params: query + }) +} + +// 查询地房申请-申请人详细 +export function selectProposer(id, data) { + return request({ + url: '/house/allinformation/' + id, + method: 'get', + params: data + }) +} + + +// 查询地房申请-申请人详细 +export function selectAllLicense(id) { + return request({ + url: '/house/allinformation/license/' + id, + method: 'get' + }) +} + + +//申请单人操作 +export function customSubmit(id) { + return request({ + url: '/house/custom/submit/' + id, + method: 'post' + }) +} + +//模糊查询申请人 +export function getHouseMembers(query) { + return request({ + url: '/house/custom/getHouseMembers', + method: 'get', + params: query + }) +} + +//检查是否重复建房 +export function checkDuplicateBuilding(query) { + return request({ + url: '/house/custom/checkDuplicateBuilding', + method: 'get', + params: query + }) +} + +//查询宅地信息 +export function checkDuplicateBuildingQuery(query) { + return request({ + url: '/house/custom/checkDuplicateBuildingQuery', + method: 'get', + params: query + }) +} + +//乌兰浩特申请单人操作 +export function customSubmitWLHT(id) { + return request({ + url: '/house/custom/submitWLHT/' + id, + method: 'post' + }) +} + +// 查询地房申请-申请人详细 +export function selectProposerWLHT(id, data) { + return request({ + url: '/house/allinformation/getAllInformation/' + id, + method: 'get', + params: data + }) +} diff --git a/src/api/onlineHome/homestead/license.js b/src/api/onlineHome/homestead/license.js new file mode 100644 index 00000000..86aac418 --- /dev/null +++ b/src/api/onlineHome/homestead/license.js @@ -0,0 +1,37 @@ +import request from '@/utils/request' + +// 新增地房申请-规划许可证 +export function addPermit(data) { + return request({ + url: '/house/permit/add', + method: 'post', + data: data + }) +} + +// 修改地房申请-规划许可证 +export function updatePermit(data) { + return request({ + url: '/house/permit/edit', + method: 'post', + data: data + }) +} + +// 新增地房申请-宅基地批准书 +export function addRatification(data) { + return request({ + url: '/house/ratification/add', + method: 'post', + data: data + }) +} + +// 修改地房申请-宅基地批准书 +export function updateRatification(data) { + return request({ + url: '/house/ratification/edit', + method: 'post', + data: data + }) +} diff --git a/src/api/system/config.js b/src/api/system/config.js index a4e2db3d..94089732 100644 --- a/src/api/system/config.js +++ b/src/api/system/config.js @@ -7,3 +7,11 @@ export function getGeoServerConfigKey() { method: 'get' }) } + +// 附件地址前缀 +export function getSystemAttachmentUrl() { + return request({ + url: '/system/config/configKey/system.attachment.url', + method: 'get' + }) +} diff --git a/src/components/form/FieldCalender.vue b/src/components/form/FieldCalender.vue new file mode 100644 index 00000000..120859a7 --- /dev/null +++ b/src/components/form/FieldCalender.vue @@ -0,0 +1,105 @@ + + + + + diff --git a/src/components/form/FieldCheckbox.vue b/src/components/form/FieldCheckbox.vue new file mode 100644 index 00000000..26e93d8e --- /dev/null +++ b/src/components/form/FieldCheckbox.vue @@ -0,0 +1,88 @@ + + + + + diff --git a/src/components/form/FieldDatePicker.vue b/src/components/form/FieldDatePicker.vue new file mode 100644 index 00000000..2fe03b0d --- /dev/null +++ b/src/components/form/FieldDatePicker.vue @@ -0,0 +1,132 @@ + + + + + diff --git a/src/components/form/FieldRadio.vue b/src/components/form/FieldRadio.vue new file mode 100644 index 00000000..bc2b4417 --- /dev/null +++ b/src/components/form/FieldRadio.vue @@ -0,0 +1,106 @@ + + + + + diff --git a/src/components/form/FieldSelect.vue b/src/components/form/FieldSelect.vue new file mode 100644 index 00000000..770d50c1 --- /dev/null +++ b/src/components/form/FieldSelect.vue @@ -0,0 +1,169 @@ + + + + + diff --git a/src/components/house/CommonMap.vue b/src/components/house/CommonMap.vue new file mode 100644 index 00000000..10dcabfc --- /dev/null +++ b/src/components/house/CommonMap.vue @@ -0,0 +1,340 @@ + + + + + diff --git a/src/components/house/HouseApplyUploadComp.vue b/src/components/house/HouseApplyUploadComp.vue new file mode 100644 index 00000000..3d200979 --- /dev/null +++ b/src/components/house/HouseApplyUploadComp.vue @@ -0,0 +1,270 @@ + + + + diff --git a/src/components/house/HouseLocationPlanComp.vue b/src/components/house/HouseLocationPlanComp.vue new file mode 100644 index 00000000..2151927a --- /dev/null +++ b/src/components/house/HouseLocationPlanComp.vue @@ -0,0 +1,155 @@ + + + + + diff --git a/src/components/house/RawImageCarousel.vue b/src/components/house/RawImageCarousel.vue new file mode 100644 index 00000000..d01b1a2e --- /dev/null +++ b/src/components/house/RawImageCarousel.vue @@ -0,0 +1,75 @@ + + + + + diff --git a/src/router/index.js b/src/router/index.js index 4e344a0a..0f9b9923 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -2374,6 +2374,60 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/homesteadSurvey/settle'], resolve) }, + { + path: '/houseAnnounce', + name: 'houseAnnounce', + meta: { + title: '公示查询', + hidden: true, + }, + component: (resolve) => require(['@/views/onlineHome/homestead/homeApplication/houseAnnounce'], resolve) + }, + { + path: '/houseLicense', + name: 'houseLicense', + meta: { + title: '证书查看', + hidden: true, + }, + component: (resolve) => require(['@/views/onlineHome/homestead/homeApplication/houseLicense'], resolve) + }, + { + path: '/houseLicenseDetail', + name: 'houseLicenseDetail', + meta: { + title: '证书查看', + hidden: true, + }, + component: (resolve) => require(['@/views/onlineHome/homestead/homeApplication/houseLicenseDetail'], resolve) + }, + { + path: '/licensePermitEdit', + name: 'licensePermitEdit', + meta: { + title: '修改许可证', + hidden: true, + }, + component: (resolve) => require(['@/views/onlineHome/homestead/homeApplication/licensePermitEdit'], resolve) + }, + { + path: '/licenseRatificationEdit', + name: 'licenseRatificationEdit', + meta: { + title: '修改批准书', + hidden: true, + }, + component: (resolve) => require(['@/views/onlineHome/homestead/homeApplication/licenseRatificationEdit'], resolve) + }, + { + path: '/proposerLite', + name: 'proposerLite', + meta: { + title: '农村宅基地申请(简)', + hidden: true, + }, + component: (resolve) => require(['@/views/onlineHome/homestead/homeApplication/proposerLite'], resolve) + }, ]; diff --git a/src/store/getters.js b/src/store/getters.js index 36e7cdb7..86179852 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -6,5 +6,8 @@ const getters = { roles: state => state.user.roles, permissions: state => state.user.permissions, bookName: state => state.user.bookName, + + nickName: state => state.user.nickName, + baseRoutingUrl: state => state.user.baseRoutingUrl, } export default getters diff --git a/src/store/modules/user.js b/src/store/modules/user.js index a9a765e2..c8415260 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -1,6 +1,7 @@ import { login, logout, getInfo, smsLogin } from '@/api/login'; import { registerOn } from "@/api/register"; import { getToken, setToken, removeToken } from '@/utils/auth' +import { getSystemAttachmentUrl } from '@/api/system/config' const user = { state: { @@ -9,7 +10,10 @@ const user = { avatar: '', roles: [], permissions: [], - bookName: '' + bookName: '', + + nickName: '', + baseRoutingUrl: '', }, mutations: { @@ -39,7 +43,13 @@ const user = { }, SET_BOOKNAME: (state, bookName) => { state.bookName = bookName - } + }, + SET_NICKNAME: (state, nickName) => { + state.nickName = nickName + }, + SET_baseRoutingUrl: (state, baseRoutingUrl) => { + state.baseRoutingUrl = baseRoutingUrl + }, }, actions: { @@ -113,6 +123,11 @@ const user = { commit('SET_LOGINBOOKID', user.loginBookId) commit('SET_DEPTNAME', user.deptName) commit('SET_AVATAR', avatar) + commit('SET_NICKNAME', user.nickName); + + getSystemAttachmentUrl().then((resp) => { + commit('SET_baseRoutingUrl', resp.msg); + }); resolve(res) }).catch(error => { reject(error) diff --git a/src/views/onlineHome/done.vue b/src/views/onlineHome/done.vue index c67fc373..291a3eec 100644 --- a/src/views/onlineHome/done.vue +++ b/src/views/onlineHome/done.vue @@ -2,16 +2,26 @@
- + - + + + + +
@@ -65,6 +77,9 @@ pageSize: 100, }, activityBusinessTypeOptions:[], + refreshing: false, + loading: false, + finished: false, } }, created() { @@ -81,12 +96,28 @@ goOnlineHomeIndex(){ this.$router.push({name:'onlineHomeWorkbench'}) }, - getList() { - this.taskList = [] - this.$set(this.queryParams, "systemType", '4'); + getList(target) { + if(!target) + { + this.refreshing = true; + this.finished = false; + this.queryParams.pageNum = 1; + this.taskList = [] + } + else if(typeof(target) === 'number') + this.queryParams.pageNum = target; + else { + this.queryParams.pageNum = eval(this.queryParams.pageNum + target.toString()) + } + this.$set(this.queryParams, "systemType", '11'); // 4 if(this.activeName=='1'){ ListTodo(this.queryParams).then((response) => { console.log(response) + if(response.rows.length === 0) + { + this.finished = true; + return; + } response.rows.map(res => { if(res.tableName?res.tableName.indexOf('house')>0:""){ res.tableName = '来自农村宅基地管理系统' @@ -104,10 +135,18 @@ }); } }) - }) + }).finally(() => { + this.loading = false; + this.refreshing = false; + }); }else{ ListDone(this.queryParams).then((response) => { console.log(response) + if(response.rows.length === 0) + { + this.finished = true; + return; + } response.rows.map(res => { if(res.tableName?res.tableName.indexOf('house')>0:""){ res.tableName = '来自农村宅基地管理系统' @@ -125,7 +164,10 @@ }); } }) - }) + }).finally(() => { + this.loading = false; + this.refreshing = false; + }); } }, goDetail(item){ @@ -136,6 +178,11 @@ case 'landscope': case 'accepting': this.$router.push({name:'approvalForm',query: {id:item.formData.id,taskId:item.taskId,instanceId:item.formData.instanceId,type:item.type}}) + break; + case 'baseApplyWLHT': + case 'landscopeWLHT': + case 'acceptingWLHT': + this.$router.push({name:'proposerLite',query: {id:item.formData.applyProposerId || item.formData.id,taskId:item.taskId,instanceId:item.formData.instanceId,type:item.type, processKey: item.formData.processKey}}) break; case 'yinnong_transfer': this.$router.push({name:'approvalApproval',query: {id:item.formData.id,taskId:item.taskId,type:item.type}}) diff --git a/src/views/onlineHome/homestead/flowChart/index.vue b/src/views/onlineHome/homestead/flowChart/index.vue index f1f47a2a..763c7c7b 100644 --- a/src/views/onlineHome/homestead/flowChart/index.vue +++ b/src/views/onlineHome/homestead/flowChart/index.vue @@ -35,23 +35,25 @@ diff --git a/src/views/onlineHome/homestead/homeApplication/houseAnnounce.vue b/src/views/onlineHome/homestead/homeApplication/houseAnnounce.vue new file mode 100644 index 00000000..d0cf0e41 --- /dev/null +++ b/src/views/onlineHome/homestead/homeApplication/houseAnnounce.vue @@ -0,0 +1,254 @@ + + + + + diff --git a/src/views/onlineHome/homestead/homeApplication/houseLicense.vue b/src/views/onlineHome/homestead/homeApplication/houseLicense.vue new file mode 100644 index 00000000..cf0f9e94 --- /dev/null +++ b/src/views/onlineHome/homestead/homeApplication/houseLicense.vue @@ -0,0 +1,195 @@ + + + + + diff --git a/src/views/onlineHome/homestead/homeApplication/houseLicenseDetail.vue b/src/views/onlineHome/homestead/homeApplication/houseLicenseDetail.vue new file mode 100644 index 00000000..ef68b3c1 --- /dev/null +++ b/src/views/onlineHome/homestead/homeApplication/houseLicenseDetail.vue @@ -0,0 +1,395 @@ + + + + + diff --git a/src/views/onlineHome/homestead/homeApplication/licensePermitEdit.vue b/src/views/onlineHome/homestead/homeApplication/licensePermitEdit.vue new file mode 100644 index 00000000..1b6747eb --- /dev/null +++ b/src/views/onlineHome/homestead/homeApplication/licensePermitEdit.vue @@ -0,0 +1,141 @@ + + + + + diff --git a/src/views/onlineHome/homestead/homeApplication/licenseRatificationEdit.vue b/src/views/onlineHome/homestead/homeApplication/licenseRatificationEdit.vue new file mode 100644 index 00000000..41b40542 --- /dev/null +++ b/src/views/onlineHome/homestead/homeApplication/licenseRatificationEdit.vue @@ -0,0 +1,189 @@ + + + + + diff --git a/src/views/onlineHome/homestead/homeApplication/proposerLite.vue b/src/views/onlineHome/homestead/homeApplication/proposerLite.vue new file mode 100644 index 00000000..47efcc2f --- /dev/null +++ b/src/views/onlineHome/homestead/homeApplication/proposerLite.vue @@ -0,0 +1,2812 @@ + + + + + diff --git a/src/views/onlineHome/mailList.vue b/src/views/onlineHome/mailList.vue index 5d214aa0..755b9c52 100644 --- a/src/views/onlineHome/mailList.vue +++ b/src/views/onlineHome/mailList.vue @@ -7,7 +7,7 @@ /> -

张村村民联系方式

+

{{this.$store.state.user.deptName}}村民联系方式

diff --git a/src/views/onlineHome/my.vue b/src/views/onlineHome/my.vue index 699eddfe..9904fa26 100644 --- a/src/views/onlineHome/my.vue +++ b/src/views/onlineHome/my.vue @@ -119,7 +119,7 @@ this.nickName = response.user.nickName this.deptName = response.user.dept.deptName this.userId = response.user.userId - this.avatar = location.protocol+"//"+location.host+request.defaults.baseURL+response.user.avatar + this.avatar = this.$store.getters.baseRoutingUrl + response.user.avatar }); }, methods: { diff --git a/src/views/onlineHome/workbench.vue b/src/views/onlineHome/workbench.vue index 88eb7e46..f9b21a98 100644 --- a/src/views/onlineHome/workbench.vue +++ b/src/views/onlineHome/workbench.vue @@ -7,7 +7,7 @@