diff --git a/src/api/onlineHome/bankAgriculture/paymentApproval.js b/src/api/onlineHome/bankAgriculture/paymentApproval.js
index 70fff9a8..0a7f1762 100644
--- a/src/api/onlineHome/bankAgriculture/paymentApproval.js
+++ b/src/api/onlineHome/bankAgriculture/paymentApproval.js
@@ -125,6 +125,15 @@ export function approval(data) {
params:data
})
}
+
+// 上传附件
+export function attach(data) {
+ return request({
+ url: '/common/attach',
+ method: 'post',
+ data:data
+ })
+}
// 删除银行转账
export function delTransfer(id) {
return request({
diff --git a/src/api/onlineHome/homestead/application.js b/src/api/onlineHome/homestead/application.js
index 02de3109..9d5a35e4 100644
--- a/src/api/onlineHome/homestead/application.js
+++ b/src/api/onlineHome/homestead/application.js
@@ -61,6 +61,24 @@ export function saveHouseBaseInfoThenSubmit(data){
})
}
+//同意审批
+export function agreeApply(data){
+ return request({
+ url:'/house/mobile/agreeApply',
+ method:'post',
+ data:data
+ })
+}
+
+//驳回审批
+export function rejectApply(data){
+ return request({
+ url:'/house/mobile/rejectApply',
+ method:'post',
+ data:data
+ })
+}
+
//上传图片
export function attach(data){
console.log(data)
diff --git a/src/api/onlineHome/homestead/paidUtilize.js b/src/api/onlineHome/homestead/paidUtilize.js
new file mode 100644
index 00000000..56a9f685
--- /dev/null
+++ b/src/api/onlineHome/homestead/paidUtilize.js
@@ -0,0 +1,60 @@
+import request from '@/utils/request'
+
+//查询列表
+export function getList(data){
+ return request({
+ url:'/house/mobile/ycsy/list',
+ method:'get',
+ params:data
+ })
+}
+
+//删除列表项
+export function removeList(id){
+ return request({
+ url:'/house/ycsy/remove/'+id,
+ method:'get'
+ })
+}
+
+//详情
+export function getYcsy(id){
+ return request({
+ url:'/house/ycsy/get/'+id,
+ method:'get'
+ })
+}
+
+//提交
+export function submitApply(id){
+ return request({
+ url:'/house/ycsy/submitApply/'+id,
+ method:'post'
+ })
+}
+
+//修改
+export function ycsyEdit(data){
+ return request({
+ url:'/house/ycsy/edit',
+ method:'post',
+ data:data
+ })
+}
+
+//新增
+export function ycsyAdd(data){
+ return request({
+ url:'/house/ycsy/add',
+ method:'post',
+ data:data
+ })
+}
+
+//使用权人查询
+export function listByDeptId(){
+ return request({
+ url:'house/obligee/listByDeptId',
+ method:'get',
+ })
+}
diff --git a/src/router/index.js b/src/router/index.js
index 81cbbd00..3e999269 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -852,6 +852,42 @@ export const constantRoutes = [
},
component: (resolve) => require(['@/views/onlineHome/homestead/paidExit/paidExitModify'], resolve)
},
+ {
+ path: '/paidUtilizeList',
+ name: 'paidUtilizeList',
+ meta: {
+ title: '有偿利用',
+ hidden: true,
+ },
+ component: (resolve) => require(['@/views/onlineHome/homestead/paidUtilize/paidUtilizeList'], resolve)
+ },
+ {
+ path: '/paidUtilizeModify',
+ name: 'paidUtilizeModify',
+ meta: {
+ title: '修改有偿利用',
+ hidden: true,
+ },
+ component: (resolve) => require(['@/views/onlineHome/homestead/paidUtilize/paidUtilizeModify'], resolve)
+ },
+ {
+ path: '/paidUtilizeDteail',
+ name: 'paidUtilizeDteail',
+ meta: {
+ title: '查看有偿利用',
+ hidden: true,
+ },
+ component: (resolve) => require(['@/views/onlineHome/homestead/paidUtilize/paidUtilizeDteail'], resolve)
+ },
+ {
+ path: '/paidUtilizeAdd',
+ name: 'paidUtilizeAdd',
+ meta: {
+ title: '添加有偿利用',
+ hidden: true,
+ },
+ component: (resolve) => require(['@/views/onlineHome/homestead/paidUtilize/paidUtilizeAdd'], resolve)
+ },
{
path: '/task',
name: 'task',
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd.vue
index 8031432d..fc90cc44 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd.vue
@@ -219,6 +219,11 @@
+
+
+
+
+
@@ -237,7 +242,7 @@
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalProcess.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalProcess.vue
index 3bb2f6bd..a0e177a5 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalProcess.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalProcess.vue
@@ -19,10 +19,10 @@
已申请
- {{processList.申请人}}
+ 申请人:{{processList.申请人}}
- {{processList.申请时间}}
+ 申请时间:{{processList.申请时间}}
diff --git a/src/views/onlineHome/done.vue b/src/views/onlineHome/done.vue
index 02fc297a..c9cf88f2 100644
--- a/src/views/onlineHome/done.vue
+++ b/src/views/onlineHome/done.vue
@@ -127,7 +127,7 @@
case 'baseApply':
case 'landscope':
case 'accepting':
- this.$router.push({name:'approvalForm',query: {id:item.formData.id}})
+ this.$router.push({name:'approvalForm',query: {id:item.formData.id,taskId:item.taskId,instanceId:item.formData.instanceId,type:item.type}})
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/homeApplication/applicationForm.vue b/src/views/onlineHome/homestead/homeApplication/applicationForm.vue
index 6cd9ef2e..fb2caebe 100644
--- a/src/views/onlineHome/homestead/homeApplication/applicationForm.vue
+++ b/src/views/onlineHome/homestead/homeApplication/applicationForm.vue
@@ -393,122 +393,6 @@
-
-
-
- 审核
意见
-
-
- 同意
- 驳回
-
-
-
-
-
-
-
-
- 农业
农村
部门
审查
意见
-
-
-
-
-
- 通过
- 不通过
-
-
-
-
-
-
- 符合
- 不符合
-
-
-
-
-
-
- 齐全
- 不齐全
-
-
-
-
-
-
-
-
-
-
-
- 自然
资源
部门
意见
-
-
-
- ㎡
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 农业
农村
部门
审查
意见
-
-
-
-
-
-
- ㎡
-
-
-
-
-
- ㎡
-
-
-
-
-
- 层
-
-
-
-
-
- m
-
-
-
-
-
-
-
-
-
-
-
-
-
- 上传
附件
-
-
-
-
-
-
diff --git a/src/views/onlineHome/homestead/homeApproval/approvalForm.vue b/src/views/onlineHome/homestead/homeApproval/approvalForm.vue
index f39dec0a..26234aa5 100644
--- a/src/views/onlineHome/homestead/homeApproval/approvalForm.vue
+++ b/src/views/onlineHome/homestead/homeApproval/approvalForm.vue
@@ -7,6 +7,9 @@
placeholder
@click-left="$router.back(-1)"
>
+
+
+
申请
@@ -229,51 +232,35 @@
-
-
- 审核
意见
-
-
- 同意
- 驳回
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
村级
审核
意见
-
- 同意
- 驳回
-
-
-
-
-
-
-
- 镇级
审核
意见
-
-
- 同意
- 驳回
-
-
+
-
+
农业
农村
部门
审查
意见
-
+
通过
不通过
@@ -281,7 +268,7 @@
-
+
符合
不符合
@@ -289,67 +276,148 @@
-
+
齐全
不齐全
-
+
-
+
自然
资源
部门
意见
- ㎡
-
-
-
-
-
-
+ ㎡
+
+
+
+
+
+
+
+
+
+
-
+
- 农业
农村
部门
审查
意见
+ 其他
部门
意见
(住宅
部门)
-
-
- ㎡
- ㎡
- 层
- m
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+ ㎡
+ ㎡
+ 层
+ m
+
+
+
+
+
-
+
- 上传
附件
+ 镇级
审核
意见
-
+
+
+
+
+ {{item.fileTypeName}}
+
+
+
+
+
+
+
+
+
+ 同意
+
+
+ 驳回
+
+
+
+
@@ -914,7 +1376,6 @@
.submitButton{
width: 80%;
margin: 0 auto;
- background-color: #1D6FE9;
border-radius: 14px;
}
.timeTit{
diff --git a/src/views/onlineHome/homestead/paidUtilize/paidUtilizeAdd.vue b/src/views/onlineHome/homestead/paidUtilize/paidUtilizeAdd.vue
new file mode 100644
index 00000000..8d6eaed5
--- /dev/null
+++ b/src/views/onlineHome/homestead/paidUtilize/paidUtilizeAdd.vue
@@ -0,0 +1,321 @@
+
+
+
+
+ 添加有偿使用
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 是
+ 否
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+
+
+ 保存
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/onlineHome/homestead/paidUtilize/paidUtilizeDteail.vue b/src/views/onlineHome/homestead/paidUtilize/paidUtilizeDteail.vue
new file mode 100644
index 00000000..8741d416
--- /dev/null
+++ b/src/views/onlineHome/homestead/paidUtilize/paidUtilizeDteail.vue
@@ -0,0 +1,235 @@
+
+
+
+
+ 查看有偿使用
+
+
+
+
+
+
+
+
+
+
+ {{circulation.sfyhdz == 'Y' ? '是' : '否'}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/onlineHome/homestead/paidUtilize/paidUtilizeList.vue b/src/views/onlineHome/homestead/paidUtilize/paidUtilizeList.vue
new file mode 100644
index 00000000..9252ad76
--- /dev/null
+++ b/src/views/onlineHome/homestead/paidUtilize/paidUtilizeList.vue
@@ -0,0 +1,186 @@
+
+
+
+
+ 有偿使用
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.shyqrdm}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/onlineHome/homestead/paidUtilize/paidUtilizeModify.vue b/src/views/onlineHome/homestead/paidUtilize/paidUtilizeModify.vue
new file mode 100644
index 00000000..43777aac
--- /dev/null
+++ b/src/views/onlineHome/homestead/paidUtilize/paidUtilizeModify.vue
@@ -0,0 +1,329 @@
+
+
+
+
+ 修改有偿使用
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 是
+ 否
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+
+
+ 保存
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/onlineHome/workbench.vue b/src/views/onlineHome/workbench.vue
index 1af9e31e..cd4b3515 100644
--- a/src/views/onlineHome/workbench.vue
+++ b/src/views/onlineHome/workbench.vue
@@ -379,26 +379,34 @@
公示信息
+
+
+
+

+
+
+ 有偿利用
+
-
-

+
+
任务上报
-
-

+
+
任务发布
-
-

+
+
违法监管
diff --git a/static/images/icon/icon_sy.png b/static/images/icon/icon_sy.png
new file mode 100644
index 00000000..cfdb1f21
Binary files /dev/null and b/static/images/icon/icon_sy.png differ
diff --git a/static/images/onlineHome/icon21.png b/static/images/onlineHome/icon21.png
new file mode 100644
index 00000000..c8263f66
Binary files /dev/null and b/static/images/onlineHome/icon21.png differ
diff --git a/static/images/onlineHome/icon22.png b/static/images/onlineHome/icon22.png
new file mode 100644
index 00000000..f4dcde92
Binary files /dev/null and b/static/images/onlineHome/icon22.png differ