diff --git a/src/api/onlineHome/bankAgriculture/cashExpense.js b/src/api/onlineHome/bankAgriculture/cashExpense.js
new file mode 100644
index 00000000..fff7f983
--- /dev/null
+++ b/src/api/onlineHome/bankAgriculture/cashExpense.js
@@ -0,0 +1,80 @@
+import request from '@/utils/request'
+
+// 查询资金审批申请列表
+export function listCashExpense(query) {
+ return request({
+ url: '/yinnong/cashExpense/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 统计查询资金审批申请列表
+export function statisticCashExpense(query) {
+ return request({
+ url: '/yinnong/cashExpense/statistic',
+ method: 'get',
+ params: query
+ })
+}
+
+// 导出资金审批申请
+export function exportCashExpense(query) {
+ return request({
+ url: '/yinnong/cashExpense/export',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询资金审批申请详细
+export function getCashExpense(id) {
+ return request({
+ url: '/yinnong/cashExpense/get/' + id,
+ method: 'get',
+ params: arguments[1] || {}
+ })
+}
+
+// 新增资金审批申请
+export function addCashExpense(data) {
+ return request({
+ url: '/yinnong/cashExpense/add',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改资金审批申请
+export function updateCashExpense(data) {
+ return request({
+ url: '/yinnong/cashExpense/edit',
+ method: 'post',
+ data: data
+ })
+}
+
+// 删除资金审批申请
+export function delCashExpense(id) {
+ return request({
+ url: '/yinnong/cashExpense/remove/' + id,
+ method: 'get'
+ })
+}
+
+// 资金申请审批
+export function applyCashExpense(id) {
+ return request({
+ url: '/yinnong/cashExpense/submitApply/' + id,
+ method: 'get'
+ });
+}
+
+// 撤销资金申请审批
+export function revokeCashExpense(id) {
+ return request({
+ url: '/yinnong/cashExpense/revokeApply/' + id,
+ method: 'get'
+ });
+}
+
diff --git a/src/router/index.js b/src/router/index.js
index be091e2c..3b52ab05 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -2686,6 +2686,51 @@ export const constantRoutes = [
},
component: (resolve) => require(['@/views/yinnong/homestead/supervision/supervisionDetail'], resolve)
},
+ {
+ path: '/yinnong/cashExpenseList',
+ name: 'yinnongCashExpenseList',
+ meta: {
+ title: '资金审批申请列表',
+ hidden: true,
+ },
+ component: (resolve) => require(['@/views/yinnong/bankAgriculture/cashExpense/cashExpenseList'], resolve)
+ },
+ {
+ path: '/yinnong/cashExpenseForm',
+ name: 'yinnongCashExpenseForm',
+ meta: {
+ title: '资金审批申请表单',
+ hidden: true,
+ },
+ component: (resolve) => require(['@/views/yinnong/bankAgriculture/cashExpense/cashExpenseForm'], resolve)
+ },
+ {
+ path: '/yinnong/cashExpenseDetail',
+ name: 'yinnongCashExpenseDetail',
+ meta: {
+ title: '资金审批申请详情',
+ hidden: true,
+ },
+ component: (resolve) => require(['@/views/yinnong/bankAgriculture/cashExpense/cashExpenseDetail'], resolve)
+ },
+ {
+ path: '/yinnong/cashExpenseApproval',
+ name: 'yinnongCashExpenseApproval',
+ meta: {
+ title: '资金审批申请',
+ hidden: true,
+ },
+ component: (resolve) => require(['@/views/yinnong/bankAgriculture/cashExpense/cashExpenseApproval'], resolve)
+ },
+ {
+ path: '/yinnong/cashExpenseProcess',
+ name: 'yinnongCashExpenseProcess',
+ meta: {
+ title: '资金审批申请流程',
+ hidden: true,
+ },
+ component: (resolve) => require(['@/views/yinnong/bankAgriculture/cashExpense/cashExpenseProcess'], resolve)
+ },
{
path: '/lawEnforcement',
name: 'lawEnforcement',
diff --git a/src/views/lawEnforcement/index.vue b/src/views/lawEnforcement/index.vue
index b3724a25..787b0817 100644
--- a/src/views/lawEnforcement/index.vue
+++ b/src/views/lawEnforcement/index.vue
@@ -165,7 +165,7 @@ export default {
})
},
/** 查询待办列表 */
- getTaskList() {
+ /*getTaskList() {
this.loading = true;
return request({
url: "/activiti/process/taskList",
@@ -181,7 +181,7 @@ export default {
})
.then(() => {
});
- },
+ },*/
getList(){
this.loading = true;
this.queryParams.number = 2 ;
diff --git a/src/views/lawEnforcement/user/index.vue b/src/views/lawEnforcement/user/index.vue
index 4b3911c4..dbafce04 100644
--- a/src/views/lawEnforcement/user/index.vue
+++ b/src/views/lawEnforcement/user/index.vue
@@ -188,10 +188,10 @@ export default {
console.log(res.data.companyName)
this.companyName = res.data.companyName;
});
- this.getTaskList();
+ //this.getTaskList();
});
},
- getTaskList() {
+ /*getTaskList() {
this.loading = true;
return request({
url: "/activiti/process/taskList",
@@ -208,7 +208,7 @@ export default {
.then(() => {
});
- },
+ },*/
},
};
diff --git a/src/views/lawEnforcement/user/waitingProcessing.vue b/src/views/lawEnforcement/user/waitingProcessing.vue
index d7b76760..fe4f7944 100644
--- a/src/views/lawEnforcement/user/waitingProcessing.vue
+++ b/src/views/lawEnforcement/user/waitingProcessing.vue
@@ -169,7 +169,7 @@ export default {
});
},
methods: {
- getTaskList() {
+ /*getTaskList() {
this.loading = true;
return request({
url: "/activiti/process/taskList",
@@ -189,8 +189,8 @@ export default {
}).then(() => {
});
- },
- getTaskDoneList(){
+ },*/
+ /*getTaskDoneList(){
this.doneLoading = true;
return request({
url: "/activiti/process/taskDoneList",
@@ -211,18 +211,18 @@ export default {
})
.then(() => {
});
- },
+ },*/
getListchange(type){
if(type == 'db'){
this.taskList = [];
this.queryParamsTask.pageNum = 1;
this.finished = false;
- this.getTaskList()
+ //this.getTaskList()
} else {
this.taskDoneList = [];
this.queryParams.pageNum = 1 ;
this.doneFinished = false;
- this.getTaskDoneList()
+ //this.getTaskDoneList()
}
}
},
diff --git a/src/views/lawEnforcement/userNew/user_new.vue b/src/views/lawEnforcement/userNew/user_new.vue
index 617c0e37..b8e466d1 100644
--- a/src/views/lawEnforcement/userNew/user_new.vue
+++ b/src/views/lawEnforcement/userNew/user_new.vue
@@ -134,10 +134,10 @@ export default {
console.log(res.data.companyName)
this.companyName = res.data.companyName;
});
- this.getTaskList();
+ //this.getTaskList();
});
},
- getTaskList() {
+ /*getTaskList() {
this.loading = true;
return request({
url: "/activiti/process/taskList",
@@ -154,7 +154,7 @@ export default {
.then(() => {
});
- },
+ },*/
},
};
diff --git a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalProcess.vue b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalProcess.vue
index 012f7344..f2324453 100644
--- a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalProcess.vue
+++ b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalProcess.vue
@@ -11,52 +11,41 @@
-
批次号:{{this.$route.query.auditbatchNo}}
-
-
- 草稿
-
-
-
- 已申请
-
- {{form.applyUserName}}
- {{form.applyDate}}
-
-
-
-
-
-
-
-
-
-
-
-
- {{item1.nodeName}}
- {{item1.nodeName}}
- {{item1.nodeName}}
-
-
- {{item1.auditTime}}
- {{item1.auditTime}}
- {{item1.auditTime}}
-
-
-
-
- {{item1.auditBy}}
- {{item1.auditBy}}
- {{item1.auditBy}}
-
-
- {{item1.auditRemark}}
- {{item1.auditRemark}}
- {{item1.auditRemark}}
-
-
-
+
+ 批次号:{{index}}
+
+
+
+
+
+
+
+
+
+ {{item1.actorName}}
+ {{item1.actorName}}
+ {{item1.actorName}}
+
+
+ {{item1.auditTime}}
+ {{item1.auditTime}}
+ {{item1.auditTime}}
+
+
+
+
+ {{item1.auditBy}}
+ {{item1.auditBy}}
+ {{item1.auditBy}}
+
+
+ {{item1.auditRemark}}
+ {{item1.auditRemark}}
+ {{item1.auditRemark}}
+
+
+
+
审批流程
@@ -111,12 +100,8 @@ export default {
//查询审批进程
getTransferProcess(id){
getTransferProcess(id).then(res => {
- this.processList = res.data[auditbatchNo]
- // console.info( this.processList);
- // this.processList.乡镇审批时间 = this.processList.乡镇审批时间?this.format(this.processList.乡镇审批时间, "yyyy-MM-dd HH:mm:ss"):""
- // this.processList.区县审批时间 = this.processList.区县审批时间?this.format(this.processList.区县审批时间, "yyyy-MM-dd HH:mm:ss"):""
- // this.processList.支付状态时间 = this.processList.支付状态时间?this.format(this.processList.支付状态时间, "yyyy-MM-dd HH:mm:ss"):""
- // this.processList.入账状态时间 = this.processList.入账状态时间?this.format(this.processList.入账状态时间, "yyyy-MM-dd HH:mm:ss"):""
+ this.processList = res.data
+ console.info( this.processList);
})
},
handleUpdate(id) {
@@ -214,12 +199,4 @@ export default {
color: #878787;
line-height: 22Px;
}
- .van-row{
- .van-row{
- .van-col{
- padding: 5Px 0 0 0!important;
- color: #878787;
- }
- }
- }
diff --git a/src/views/yinnong/bankAgriculture/cashExpense/cashExpenseApproval.vue b/src/views/yinnong/bankAgriculture/cashExpense/cashExpenseApproval.vue
new file mode 100644
index 00000000..e696cacf
--- /dev/null
+++ b/src/views/yinnong/bankAgriculture/cashExpense/cashExpenseApproval.vue
@@ -0,0 +1,312 @@
+
+
+
+
+ 资金审批申请
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查看附件
+
+
+
+
+
+ 附件
+
+
+
+
+
+
+
+
+ 审批
意见
+
+
+ 同意
+ 驳回
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/yinnong/bankAgriculture/cashExpense/cashExpenseDetail.vue b/src/views/yinnong/bankAgriculture/cashExpense/cashExpenseDetail.vue
new file mode 100644
index 00000000..efdd7c23
--- /dev/null
+++ b/src/views/yinnong/bankAgriculture/cashExpense/cashExpenseDetail.vue
@@ -0,0 +1,192 @@
+
+
+
+
+ 资金审批申请详情
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/yinnong/bankAgriculture/cashExpense/cashExpenseForm.vue b/src/views/yinnong/bankAgriculture/cashExpense/cashExpenseForm.vue
new file mode 100644
index 00000000..56b56fac
--- /dev/null
+++ b/src/views/yinnong/bankAgriculture/cashExpense/cashExpenseForm.vue
@@ -0,0 +1,246 @@
+
+
+
+
+ {{ navBarTitle }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 保存
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/yinnong/bankAgriculture/cashExpense/cashExpenseList.vue b/src/views/yinnong/bankAgriculture/cashExpense/cashExpenseList.vue
new file mode 100644
index 00000000..ef9f8719
--- /dev/null
+++ b/src/views/yinnong/bankAgriculture/cashExpense/cashExpenseList.vue
@@ -0,0 +1,258 @@
+
+
+
+
+ 资金审批申请
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.cashAt}}
+ {{item.capitalExpenditureType}}
+ {{item.cashAmount}} 元
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 附件
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/yinnong/bankAgriculture/cashExpense/cashExpenseProcess.vue b/src/views/yinnong/bankAgriculture/cashExpense/cashExpenseProcess.vue
new file mode 100644
index 00000000..443e66e4
--- /dev/null
+++ b/src/views/yinnong/bankAgriculture/cashExpense/cashExpenseProcess.vue
@@ -0,0 +1,190 @@
+
+
+
+
+ 资金审批申请流程
+
+
+
+
+
审批历史
+
批次号:{{ auditbatchNo }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.actorName }}
+ {{ item.actorName }}
+ {{ item.actorName }}
+
+
+ {{ item.auditTime }}
+ {{ item.auditTime }}
+ {{ item.auditTime }}
+
+
+
+
+ {{ item.auditBy }}
+ {{ item.auditBy }}
+ {{ item.auditBy }}
+
+
+ {{ item.auditRemark }}
+ {{ item.auditRemark }}
+ {{ item.auditRemark }}
+
+
+
+
+
+
审批流程
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+ 组级审批
+ 村级审批
+ 镇级审批
+ 区县审批
+
+
+
+
+ {{ item.nickName }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalProcess.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalProcess.vue
index 82906b32..e6821d4c 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalProcess.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalProcess.vue
@@ -11,52 +11,41 @@
-
批次号:{{this.$route.query.auditbatchNo}}
-
-
- 草稿
-
-
-
- 已申请
-
- {{form.applyUserName}}
- {{form.applyDate}}
-
-
-
-
-
-
-
-
-
-
-
-
- {{item1.nodeName}}
- {{item1.nodeName}}
- {{item1.nodeName}}
-
-
- {{item1.auditTime}}
- {{item1.auditTime}}
- {{item1.auditTime}}
-
-
-
-
- {{item1.auditBy}}
- {{item1.auditBy}}
- {{item1.auditBy}}
-
-
- {{item1.auditRemark}}
- {{item1.auditRemark}}
- {{item1.auditRemark}}
-
-
-
+
+ 批次号:{{index}}
+
+
+
+
+
+
+
+
+
+ {{item1.actorName}}
+ {{item1.actorName}}
+ {{item1.actorName}}
+
+
+ {{item1.auditTime}}
+ {{item1.auditTime}}
+ {{item1.auditTime}}
+
+
+
+
+ {{item1.auditBy}}
+ {{item1.auditBy}}
+ {{item1.auditBy}}
+
+
+ {{item1.auditRemark}}
+ {{item1.auditRemark}}
+ {{item1.auditRemark}}
+
+
+
+
审批流程
@@ -111,7 +100,7 @@ export default {
//查询审批进程
getTransferProcess(id){
getTransferProcess(id).then(res => {
- this.processList = res.data[auditbatchNo]
+ this.processList = res.data
})
},
handleUpdate(id) {
@@ -209,12 +198,4 @@ export default {
color: #878787;
line-height: 22Px;
}
- .van-row{
- .van-row{
- .van-col{
- padding: 5Px 0 0 0!important;
- color: #878787;
- }
- }
- }
diff --git a/src/views/yinnong/doneCompleted/completedNew.vue b/src/views/yinnong/doneCompleted/completedNew.vue
index 955ea8ce..69b948ed 100644
--- a/src/views/yinnong/doneCompleted/completedNew.vue
+++ b/src/views/yinnong/doneCompleted/completedNew.vue
@@ -190,6 +190,12 @@
case 'yinnong_majorevent':
this.$router.push({name:'approvalApproval13',query: {id:item.data.id,taskId:item.id,type:"todo"}})
break;
+ case 't_yinnong_cashexpense':
+ this.$router.push({
+ path: '/yinnong/cashExpenseApproval',
+ query: { id: item.data.id, taskId: item.id, auditbatchNo: item.auditbatchNo, type: "todo" }
+ });
+ break;
}
}
},
diff --git a/src/views/yinnong/doneCompleted/doneNew.vue b/src/views/yinnong/doneCompleted/doneNew.vue
index 51e9eccd..dba0a135 100644
--- a/src/views/yinnong/doneCompleted/doneNew.vue
+++ b/src/views/yinnong/doneCompleted/doneNew.vue
@@ -160,6 +160,12 @@ done.vue
case 'yinnong_majorevent':
this.$router.push({name:'approvalApproval13',query: {id:item.formData.id,taskId:item.taskId,type:item.type}})
break;
+ case 't_yinnong_cashexpense':
+ this.$router.push({
+ path: '/yinnong/cashExpenseApproval',
+ query: { id: item.data.id, taskId: item.id, auditbatchNo: item.auditbatchNo, type: "done" }
+ });
+ break;
}
}
},
diff --git a/src/views/yinnong/workbench.vue b/src/views/yinnong/workbench.vue
index b9377b0e..c51f1399 100644
--- a/src/views/yinnong/workbench.vue
+++ b/src/views/yinnong/workbench.vue
@@ -218,10 +218,10 @@
this.hcAreaInfoOption = res.data;
}
}),
- this.$set(this.queryParams, "systemType", '4');
+ /* this.$set(this.queryParams, "systemType", '4');
ListTodo(this.queryParams).then((response) => {
this.taskList = response.rows
- })
+ })*/
menus({identityType : 4}).then((response) => {
this.menusList = response.data