diff --git a/src/api/onlineHome/homestead/circulation.js b/src/api/onlineHome/homestead/circulation.js index 549d3036..96f32bcc 100644 --- a/src/api/onlineHome/homestead/circulation.js +++ b/src/api/onlineHome/homestead/circulation.js @@ -127,6 +127,15 @@ export function getByLyZjddm(data){ }) } +// 宅基地信息条件查询 +export function selectHomesteadObligeeMapList(query) { + return request({ + url: '/home/homesteadshyqr/selectHomesteadObligeeMapList', + method: 'get', + params: query + }) +} + //宅基地使用权流转农户查询 export function queryHouserBaseNh(query) { return request({ diff --git a/src/api/onlineHome/homestead/homeuseycsyjfbz.js b/src/api/onlineHome/homestead/homeuseycsyjfbz.js new file mode 100644 index 00000000..7ec3bc63 --- /dev/null +++ b/src/api/onlineHome/homestead/homeuseycsyjfbz.js @@ -0,0 +1,54 @@ +import request from '@/utils/request' + +// 查询有偿计费标准列表 +export function listYcsyjfbz(query) { + return request({ + url: '/home/ycsyjfbz/list', + method: 'get', + params: query + }) +} + +// 导出有偿计费标准 +export function exportYcsyjfbz(query) { + return request({ + url: '/home/ycsyjfbz/export', + method: 'get', + params: query + }) +} + +// 查询有偿计费标准详细 +export function getYcsyjfbz(id) { + return request({ + url: '/home/ycsyjfbz/get/' + id, + method: 'get' + }) +} + +// 新增有偿计费标准 +export function addYcsyjfbz(data) { + return request({ + url: '/home/ycsyjfbz/add', + method: 'post', + data: data + }) +} + +// 修改有偿计费标准 +export function updateYcsyjfbz(data) { + return request({ + url: '/home/ycsyjfbz/edit', + method: 'post', + data: data + }) +} + +// 删除有偿计费标准 +export function delYcsyjfbz(id) { + return request({ + url: '/home/ycsyjfbz/remove/' + id, + method: 'get' + }) +} + diff --git a/src/api/onlineHome/homestead/programme.js b/src/api/onlineHome/homestead/programme.js new file mode 100644 index 00000000..8a52ef73 --- /dev/null +++ b/src/api/onlineHome/homestead/programme.js @@ -0,0 +1,61 @@ +import request from '@/utils/request' + +// 查询村庄规划列表 +export function listProgramme(query) { + return request({ + url: '/home/programme/list', + method: 'get', + params: query + }) +} +// 查询村庄规划预警列表 +export function programmeWarninglist(query) { + return request({ + url: '/home/programme/programmeWarninglist', + method: 'get', + params: query + }) +} + +// 查询村庄规划详细 +export function getProgramme(id) { + return request({ + url: '/home/programme/get/' + id, + method: 'get' + }) +} + +// 新增村庄规划 +export function addProgramme(data) { + return request({ + url: '/home/programme/add', + method: 'post', + data: data + }) +} + +// 修改村庄规划 +export function updateProgramme(data) { + return request({ + url: '/home/programme/edit', + method: 'post', + data: data + }) +} + +// 删除村庄规划 +export function delProgramme(id) { + return request({ + url: '/home/programme/remove/' + id, + method: 'get' + }) +} + +// 导出村庄规划 +export function exportProgramme(query) { + return request({ + url: '/home/programme/export', + method: 'get', + params: query + }) +} diff --git a/src/api/sunVillage_info/fixedAssets.js b/src/api/sunVillage_info/fixedAssets.js index 0fbc9b87..afe3ff70 100644 --- a/src/api/sunVillage_info/fixedAssets.js +++ b/src/api/sunVillage_info/fixedAssets.js @@ -698,3 +698,57 @@ export function previewContractFile(id) { method: 'get', }) } + +// 查询多标段合同列表 +export function listMultiplelots(query) { + return request({ + url: '/transaction/multiplelots/list', + method: 'get', + params: query + }) +} + +// 查询多标段合同详情 +export function getMultiplelots(query, id) { + return request({ + url: '/transaction/multiplelots/get/' + id, + method: 'get', + params: query + }) +} + +// 标段合同甲方签字 +export function multipleLotsFirstSign(data, id) { + return request({ + url: '/transaction/multiplelots/firstSign/' + id, + method: 'post', + data: data + }) +} + +// 查询标段农户信息 +export function listMultipleLotsNh(query) { + return request({ + url: '/home/mobile/multipleLotsNh/list', + method: 'get', + params: query + }) +} + +// 查询标段农户详情 +export function getMultiplelotsNh(query, id) { + return request({ + url: '/home/mobile/multipleLotsNh/get/' + id, + method: 'get', + params: query + }) +} + +// 标段合同乙方签字 +export function multipleLotsSecondSign(data, id) { + return request({ + url: '/transaction/multiplelotsnh/secondSign/' + id, + method: 'post', + data: data + }) +} diff --git a/src/assets/images/sunVillage_info/index_icon_10.png b/src/assets/images/sunVillage_info/index_icon_10.png new file mode 100644 index 00000000..c9d28cf3 Binary files /dev/null and b/src/assets/images/sunVillage_info/index_icon_10.png differ diff --git a/src/assets/images/sunVillage_info/index_icon_11.png b/src/assets/images/sunVillage_info/index_icon_11.png new file mode 100644 index 00000000..2dee98d6 Binary files /dev/null and b/src/assets/images/sunVillage_info/index_icon_11.png differ diff --git a/src/router/index.js b/src/router/index.js index 711657e7..1dadfeff 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -3839,6 +3839,42 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/sunVillage_info/list_official'], resolve) }, + { ////阳光村务(新)-- 标段合同网签 + path: '/sunVillage_info/list_multipleLots', + name: 'sunVillageInfoListMultipleLots', + meta: { + title: '标段合同网签', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/list_multipleLots'], resolve) + }, + { ////阳光村务(新)-- 标段合同详情 + path: '/sunVillage_info/list_multipleLots_detail', + name: 'sunVillageInfoListMultipleLotsDetail', + meta: { + title: '标段合同详情', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/list_multipleLots_detail'], resolve) + }, + { ////阳光村务(新)-- 标段农户网签 + path: '/sunVillage_info/list_multipleLotsNh', + name: 'sunVillageInfoListMultipleLotsNh', + meta: { + title: '标段合同网签', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/list_multipleLotsNh'], resolve) + }, + { ////阳光村务(新)-- 标段农户详情 + path: '/sunVillage_info/list_multipleLotsNh_detail', + name: 'sunVillageInfoListMultipleLotsNhDetail', + meta: { + title: '标段合同详情', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/list_multipleLotsNh_detail'], resolve) + }, { ////阳光村务(新)-- 宅基地申请 path: '/sunVillage_info/homeApplication/applicationList', name: 'sunVillageInfoApplicationList', diff --git a/src/views/sunVillage_info/index_code_rights.vue b/src/views/sunVillage_info/index_code_rights.vue index 5d6633e0..f4f7c099 100644 --- a/src/views/sunVillage_info/index_code_rights.vue +++ b/src/views/sunVillage_info/index_code_rights.vue @@ -222,6 +222,7 @@ justify-content: center; padding-top: 40PX; width: 25%; + margin-top: 10PX; &:nth-child(3){ margin-right: 0; } diff --git a/src/views/sunVillage_info/list_multipleLots.vue b/src/views/sunVillage_info/list_multipleLots.vue new file mode 100644 index 00000000..7e864d36 --- /dev/null +++ b/src/views/sunVillage_info/list_multipleLots.vue @@ -0,0 +1,528 @@ + + + + + diff --git a/src/views/sunVillage_info/list_multipleLotsNh.vue b/src/views/sunVillage_info/list_multipleLotsNh.vue new file mode 100644 index 00000000..c8091773 --- /dev/null +++ b/src/views/sunVillage_info/list_multipleLotsNh.vue @@ -0,0 +1,526 @@ + + + + + diff --git a/src/views/sunVillage_info/list_multipleLotsNh_detail.vue b/src/views/sunVillage_info/list_multipleLotsNh_detail.vue new file mode 100644 index 00000000..b897d135 --- /dev/null +++ b/src/views/sunVillage_info/list_multipleLotsNh_detail.vue @@ -0,0 +1,190 @@ + + + + + diff --git a/src/views/sunVillage_info/list_multipleLots_detail.vue b/src/views/sunVillage_info/list_multipleLots_detail.vue new file mode 100644 index 00000000..43205031 --- /dev/null +++ b/src/views/sunVillage_info/list_multipleLots_detail.vue @@ -0,0 +1,194 @@ + + + + + diff --git a/src/views/sunVillage_info/login.vue b/src/views/sunVillage_info/login.vue index 82f0d4a0..9f57f627 100644 --- a/src/views/sunVillage_info/login.vue +++ b/src/views/sunVillage_info/login.vue @@ -146,11 +146,6 @@ } }, handleLogin(values) { - console.log(this.formData.username) - console.log(this.formData.password) - console.log(this.formData.code) - - if (this.formData.rememberMe) { Cookies.set("username", this.formData.username, { expires: 30 }); Cookies.set("password", encrypt(this.formData.password), { expires: 30 }); diff --git a/src/views/sunVillage_info/login_code.vue b/src/views/sunVillage_info/login_code.vue index 4de825de..c32eddb7 100644 --- a/src/views/sunVillage_info/login_code.vue +++ b/src/views/sunVillage_info/login_code.vue @@ -120,7 +120,7 @@ return false; } checkFarmer(this.formData).then(response => { - console.log(response.data) + // console.log(response.data) if (response.code == 200){ Cookies.set("user", response.data, { expires: 30 }); this.$router.push({path:'/sunVillage_info/index_code_rights'}) diff --git a/src/views/yinnong/homestead/paidUtilize/paidUtilizeAdd.vue b/src/views/yinnong/homestead/paidUtilize/paidUtilizeAdd.vue index e3005349..03c48010 100644 --- a/src/views/yinnong/homestead/paidUtilize/paidUtilizeAdd.vue +++ b/src/views/yinnong/homestead/paidUtilize/paidUtilizeAdd.vue @@ -106,10 +106,17 @@ @confirm="onConfirmYcsydqsj" /> - - - - + + + + + + + @@ -132,10 +139,12 @@