diff --git a/src/api/audit/aaudit.js b/src/api/audit/aaudit.js new file mode 100644 index 00000000..fac53905 --- /dev/null +++ b/src/api/audit/aaudit.js @@ -0,0 +1,17 @@ +export const AAUDIT_INTENT = { + NONE: '', // 无 + VIEW: 'VIEW', // 查看 + AUDIT: 'audit', // 审批 + HISTORY: 'history', // 审批历史 + PIPELINE: 'pipeline', // 审批流程图 +}; +export const AAUDIT_STATUS = { + /* READY : "1", // 未提交 + AUDITING : "3", // 审批中 + PASS : "5", // 审批通过 + REJECT : "7", // 审批驳回 */ + READY : "0", // 未提交 + AUDITING : "1", // 审批中 + PASS : "3", // 审批通过 + REJECT : "2", // 审批驳回 +}; diff --git a/src/api/audit/aauditmodel.js b/src/api/audit/aauditmodel.js new file mode 100644 index 00000000..267470f8 --- /dev/null +++ b/src/api/audit/aauditmodel.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询审批模板列表 +export function A_listAuditModel(query) { + return request({ + url: '/open/home/mobile/modelList', + method: 'get', + params: query + }) +} + +// 查询审批模板详细 +export function A_getAuditModel(id) { + return request({ + url: '/approval/auditmodel/get/' + id, + method: 'get' + }) +} + +// 新增审批模板 +export function A_addAuditModel(data) { + return request({ + url: '/approval/auditmodel/add', + method: 'post', + data: data + }) +} + +// 修改审批模板 +export function A_updateAuditModel(data) { + return request({ + url: '/approval/auditmodel/edit', + method: 'post', + data: data + }) +} + +// 删除审批模板 +export function A_deleteAuditModel(id) { + return request({ + url: '/approval/auditmodel/remove/' + id, + method: 'post' + }) +} diff --git a/src/api/audit/aauditpipeline.js b/src/api/audit/aauditpipeline.js new file mode 100644 index 00000000..679c69cf --- /dev/null +++ b/src/api/audit/aauditpipeline.js @@ -0,0 +1,76 @@ +import request from '@/utils/request' + +// 我的待办列表 +export function A_myTodoList(query) { + return request({ + url: '/approval/audit/todoList', + method: 'get', + params: query + }) +} + +// 我的已办列表 +export function A_myDoneList(query) { + return request({ + url: '/approval/audit/doneList', + method: 'get', + params: query + }) +} + +// 审批历史列表 +export function A_auditHistoryList(id, query) { + return request({ + url: '/approval/audit/historyList/' + id, + method: 'get', + params: query + }) +} + +// 获取后台流程图地址 +export function A_pipelineImageUrl(no, format = 'png') { + return `/approval/audit/pipeline/${no}.${format}`; +} + +// 审批状态列表 +export function A_pipelineState(no) { + return request({ + url: '/approval/audit/pipelineState/' + no, + method: 'get', + }) +} + +// 审批批次列表 +export function A_auditBatchList(no) { + return request({ + url: '/approval/audit/auditBatchList/' + no, + method: 'get', + }) +} + +// 审批历史详情 +export function A_auditHistoryDetail(id, parms) { + return request({ + url: '/approval/audit/history/' + id, + method: 'get', + params: parms, + }) +} + +// 审批 +export function A_audit(data) { + return request({ + url: '/approval/audit/audit', + method: 'post', + data: data, + }) +} + +// 提交 +export function A_start(data) { + return request({ + url: '/open/home/mobile/start', + method: 'post', + data: data, + }) +} diff --git a/src/api/onlineHome/homestead/paidUtilize.js b/src/api/onlineHome/homestead/paidUtilize.js index 7a11c120..2dcc21a1 100644 --- a/src/api/onlineHome/homestead/paidUtilize.js +++ b/src/api/onlineHome/homestead/paidUtilize.js @@ -43,8 +43,22 @@ export function ycsyAdd(data){ data:data }) } - - +// 生成收费计划 +export function generateFeePlan(data) { + return request({ + url: '/home/ycsy/generateFeePlan', + method: 'post', + data: data + }) +} +//有偿使用超期 +export function overdueList(data) { + return request({ + url:'/home/ycsy/overdueList', + method:'get', + params:data + }) +} //使用权人查询 export function listByDeptId(){ return request({ diff --git a/src/api/onlineHome/homestead/ycsysfmx.js b/src/api/onlineHome/homestead/ycsysfmx.js new file mode 100644 index 00000000..0f94fdcb --- /dev/null +++ b/src/api/onlineHome/homestead/ycsysfmx.js @@ -0,0 +1,64 @@ +import request from '@/utils/request' + +// 查询有偿收费明细列表 +export function listYcsysfmx(query) { + return request({ + url: '/home/ycsysfmx/list', + method: 'get', + params: query + }) +} + +// 统计查询有偿收费明细列表 +export function statisticYcsysfmx(query) { + return request({ + url: '/home/ycsysfmx/statistic', + method: 'get', + params: query + }) +} + +// 导出有偿收费明细 +export function exportYcsysfmx(query) { + return request({ + url: '/home/ycsysfmx/export', + method: 'get', + params: query + }) +} + +// 查询有偿收费明细详细 +export function getYcsysfmx(id) { + return request({ + url: '/home/ycsysfmx/get/' + id, + method: 'get', + params: arguments[1] || {} + }) +} + +// 新增有偿收费明细 +export function addYcsysfmx(data) { + return request({ + url: '/home/ycsysfmx/add', + method: 'post', + data: data + }) +} + +// 修改有偿收费明细 +export function updateYcsysfmx(data) { + return request({ + url: '/home/ycsysfmx/edit', + method: 'post', + data: data + }) +} + +// 删除有偿收费明细 +export function delYcsysfmx(id) { + return request({ + url: '/home/ycsysfmx/remove/' + id, + method: 'get' + }) +} + diff --git a/src/api/sunVillage_info/homestead/application.js b/src/api/sunVillage_info/homestead/application.js index bc38282e..d5ca8b26 100644 --- a/src/api/sunVillage_info/homestead/application.js +++ b/src/api/sunVillage_info/homestead/application.js @@ -196,6 +196,22 @@ export function customSubmitWLHT(id) { method: 'post' }) } +//新增地房申请(新) +export function submitApplication(id) { + return request({ + url: '/open/home/mobile/submitApplication/' + id, + method: 'post' + }) +} + +// 新增地房申请-开工申请(新) +export function submitStart(id) { + return request({ + url: '/open/home/mobile/submitStart/'+id, + method: 'post', + }) +} + // 新增地房申请-开工申请 export function submitStartWLHT(id) { return request({ @@ -213,6 +229,14 @@ export function updateStart(data) { }) } +// 提交地房申请-验收意见(新) +export function submitCheck(id) { + return request({ + url: '/open/home/mobile/submitCheck/'+id, + method: 'post', + }) +} + // 提交地房申请-验收意见(乌兰浩特 简化流程) export function submitEndWLHT(id) { return request({ @@ -257,3 +281,12 @@ export function updateOpretion(id) { method: 'post' }) } + + +//获取用地建房申请状态信息 +export function getHomeApplyStatus(id) { + return request({ + url: '/open/home/mobile/homeApplyStatusNew/'+id, + method: 'get' + }) +} diff --git a/src/api/sunVillage_info/homestead/paidExit.js b/src/api/sunVillage_info/homestead/paidExit.js index c4cf6c62..ce4987a8 100644 --- a/src/api/sunVillage_info/homestead/paidExit.js +++ b/src/api/sunVillage_info/homestead/paidExit.js @@ -87,7 +87,12 @@ export function zyyctcApply(id){ method:'post', }) } - +export function zyyctcApplyNew(id){ + return request({ + url:'/open/home/mobile/paidExitSubmitApplyNew/'+id, + method:'post', + }) +} // 查询权利人列表 export function getShyqrs(query) { return request({ diff --git a/src/permission.js b/src/permission.js index feddb106..53292217 100644 --- a/src/permission.js +++ b/src/permission.js @@ -109,11 +109,15 @@ const whiteList = [ '/sunVillage_info/list_message_add', //详情页 '/sunVillage_info/list_message_detail', //详情页 '/sunVillage_info/homeApplication/applicationList', //列表页面 + '/sunVillage_info/homeApplication/applicationNewList', //列表页面 '/sunVillage_info/proposerLite', + '/sunVillage_info/proposerLiteNew', '/sunVillage_info/paidExit/paidExitList', //列表页面 + '/sunVillage_info/paidExit/paidExitNewList', //宅基地退出列表页面(新) '/sunVillage_info/paidExitAdd', '/sunVillage_info/paidExitModify', '/sunVillage_info/paidExitDetail', + '/sunVillage_info/paidExitDetailNew', '/sunVillage_info/arbitrationList', '/sunVillage_info/arbitrationDetail', '/sunVillage_info/familyMember', diff --git a/src/router/index.js b/src/router/index.js index b81be5ac..d49e1a8a 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1068,6 +1068,33 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/yinnong/homestead/paidUtilize/paidUtilizeList'], resolve) }, + { + path: '/paidUtilizeCqList', + name: 'paidUtilizeCqList', + meta: { + title: '有偿使用', + hidden: true, + }, + component: (resolve) => require(['@/views/yinnong/homestead/paidUtilize/paidUtilizeCqList'], resolve) + }, + { + path: '/paidUtilizeFeeplanList', + name: 'paidUtilizeFeeplanList', + meta: { + title: '收费计划', + hidden: true, + }, + component: (resolve) => require(['@/views/yinnong/homestead/paidUtilizeFeeplan/paidUtilizeFeeplanList'], resolve) + }, + { + path: '/paidUtilizeFeeplanDteail', + name: 'paidUtilizeFeeplanDteail', + meta: { + title: '收费计划详情', + hidden: true, + }, + component: (resolve) => require(['@/views/yinnong/homestead/paidUtilizeFeeplan/paidUtilizeFeeplanDteail'], resolve) + }, { path: '/paidUtilizeModify', name: 'paidUtilizeModify', @@ -1988,13 +2015,13 @@ export const constantRoutes = [ component: (resolve) => require(['@/views/yinnong/done'], resolve) }, { - path: '/yinnong/doneCompleted/done', - name: 'yinnongDoneCompletedDone', + path: '/yinnong/doneCompleted/doneNew', + name: 'yinnongDoneCompletedDoneNew', meta: { title: '我的已办', hidden: true, }, - component: (resolve) => require(['@/views/yinnong/doneCompleted/done'], resolve) + component: (resolve) => require(['@/views/yinnong/doneCompleted/doneNew'], resolve) }, { path: '/yinnong/doneCompleted/completed', @@ -2005,6 +2032,15 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/yinnong/doneCompleted/completed'], resolve) }, + { + path: '/yinnong/doneCompleted/completedNew', + name: 'yinnongDoneCompletedCompletedNew', + meta: { + title: '我的待办(新)', + hidden: true, + }, + component: (resolve) => require(['@/views/yinnong/doneCompleted/completedNew'], resolve) + }, { path: '/yinnong/advice', name: 'yinnongAdvice', @@ -4002,6 +4038,15 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/sunVillage_info/homeApplication/applicationList'], resolve) }, + { ////阳光村务(新)-- 宅基地申请 + path: '/sunVillage_info/homeApplication/applicationNewList', + name: 'sunVillageInfoApplicationNewList', + meta: { + title: '宅基地申请(新)', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/homeApplication/applicationNewList'], resolve) + }, { path: '/sunVillage_info/proposerLite', name: 'sunVillageInfoProposerLite', @@ -4011,6 +4056,15 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/sunVillage_info/homeApplication/proposerLite'], resolve) }, + { + path: '/sunVillage_info/proposerLiteNew', + name: 'sunVillageInfoProposerLiteNew', + meta: { + title: '农村宅基地申请(新)', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/homeApplication/proposerLiteNew'], resolve) + }, { path: '/homesteadProposerLite', name: 'homesteadProposerLite', @@ -4029,6 +4083,15 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/sunVillage_info/paidExit/paidExitList'], resolve) }, + { + path: '/sunVillage_info/paidExit/paidExitNewList', + name: 'sunVillageInfoPaidExitNewList', + meta: { + title: '有偿退出', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/paidExit/paidExitNewList'], resolve) + }, { path: '/sunVillage_info/paidExitAdd', name: 'sunVillageInfoPaidExitAdd', @@ -4056,6 +4119,15 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/sunVillage_info/paidExit/paidExitDetail'], resolve) }, + { + path: '/sunVillage_info/paidExitDetailNew', + name: 'sunVillageInfoPaidExitDetailNew', + meta: { + title: '有偿退出审批', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/paidExit/paidExitDetailNew'], resolve) + }, { path: '/sunVillage_info/arbitrationList', name: 'sunVillageInfoArbitrationList', diff --git a/src/views/sunVillage_info/homeApplication/applicationNewList.vue b/src/views/sunVillage_info/homeApplication/applicationNewList.vue new file mode 100644 index 00000000..9a43a996 --- /dev/null +++ b/src/views/sunVillage_info/homeApplication/applicationNewList.vue @@ -0,0 +1,293 @@ + + + + + diff --git a/src/views/sunVillage_info/homeApplication/proposerLiteNew.vue b/src/views/sunVillage_info/homeApplication/proposerLiteNew.vue new file mode 100644 index 00000000..63ff6c2c --- /dev/null +++ b/src/views/sunVillage_info/homeApplication/proposerLiteNew.vue @@ -0,0 +1,5572 @@ + + + + + diff --git a/src/views/sunVillage_info/index_code_rights.vue b/src/views/sunVillage_info/index_code_rights.vue index a98ee40b..a4aadf17 100644 --- a/src/views/sunVillage_info/index_code_rights.vue +++ b/src/views/sunVillage_info/index_code_rights.vue @@ -244,6 +244,9 @@ &:nth-child(5n+1){ margin-top: 15PX; } + &:nth-child(6n+1){ + margin-top: 15PX; + } &:nth-child(1){ margin-top: 0PX; } diff --git a/src/views/sunVillage_info/paidExit/paidExitDetailNew.vue b/src/views/sunVillage_info/paidExit/paidExitDetailNew.vue new file mode 100644 index 00000000..638b8aac --- /dev/null +++ b/src/views/sunVillage_info/paidExit/paidExitDetailNew.vue @@ -0,0 +1,876 @@ + + + + + diff --git a/src/views/sunVillage_info/paidExit/paidExitNewList.vue b/src/views/sunVillage_info/paidExit/paidExitNewList.vue new file mode 100644 index 00000000..0ca0a262 --- /dev/null +++ b/src/views/sunVillage_info/paidExit/paidExitNewList.vue @@ -0,0 +1,234 @@ + + + + + diff --git a/src/views/yinnong/doneCompleted/completedNew.vue b/src/views/yinnong/doneCompleted/completedNew.vue new file mode 100644 index 00000000..ffc2c94f --- /dev/null +++ b/src/views/yinnong/doneCompleted/completedNew.vue @@ -0,0 +1,177 @@ + + + + + diff --git a/src/views/yinnong/doneCompleted/done.vue b/src/views/yinnong/doneCompleted/done.vue index 670ea05b..2d81f866 100644 --- a/src/views/yinnong/doneCompleted/done.vue +++ b/src/views/yinnong/doneCompleted/done.vue @@ -1,4 +1,4 @@ - {{item.ycsyfy}}元 +
+ 正常 + 终止 - + + +
+ 重新生成收费计划 +
+ +
+ + diff --git a/src/views/yinnong/homestead/paidUtilizeFeeplan/paidUtilizeFeeplanList.vue b/src/views/yinnong/homestead/paidUtilizeFeeplan/paidUtilizeFeeplanList.vue new file mode 100644 index 00000000..6b9aab53 --- /dev/null +++ b/src/views/yinnong/homestead/paidUtilizeFeeplan/paidUtilizeFeeplanList.vue @@ -0,0 +1,244 @@ + + + + + diff --git a/src/views/yinnongIndex.vue b/src/views/yinnongIndex.vue index 79d7e3a7..6b79f04f 100644 --- a/src/views/yinnongIndex.vue +++ b/src/views/yinnongIndex.vue @@ -3,8 +3,10 @@ - 待办 - 已办 + + 待办(新) + + 已办(新) 工作台 我的 diff --git a/src/views/yinnongLogin.vue b/src/views/yinnongLogin.vue index d03c5ec6..dbf9e5b7 100644 --- a/src/views/yinnongLogin.vue +++ b/src/views/yinnongLogin.vue @@ -306,7 +306,7 @@ export default { this.$store .dispatch("SmsLogin", this.formData) .then(() => { - this.$router.push({ path: "/yinnong/doneCompleted/completed" }).catch(() => {}); + this.$router.push({ path: "/yinnong/doneCompleted/completedNew" }).catch(() => {}); }) .catch((error) => { this.loading = false; @@ -341,7 +341,7 @@ export default { this.$store .dispatch("Login", this.formData) .then(() => { - this.$router.push({ path: "/yinnong/doneCompleted/completed" }).catch(() => {}); + this.$router.push({ path: "/yinnong/doneCompleted/completedNew" }).catch(() => {}); }) .catch((error) => { console.log(error) @@ -428,7 +428,7 @@ export default { this.$dialog.alert({ message: '您的初始密码:'+res.password, }).then(() => { - this.$router.push({ path: "/yinnong/doneCompleted/completed" }).catch(() => {}); + this.$router.push({ path: "/yinnong/doneCompleted/completedNew" }).catch(() => {}); }); } })