From b6b5707a5e4be68d997519b68d5df347d9ab9f2f Mon Sep 17 00:00:00 2001
From: yujk <990961482@qq.com>
Date: Mon, 11 Oct 2021 19:33:29 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E9=93=B6=E5=86=9C=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A8=A1=E5=9D=97=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bankAgriculture/paymentApproval.js        | 101 +++
 src/router/index.js                           | 182 +++-
 .../collectionAccount/collectionList.vue      |   2 +-
 .../paymentAccount/paymentAccountList.vue     |   2 +-
 .../paymentApproval/approvalAdd.vue           | 276 ++++--
 .../paymentApproval/approvalAdd10.vue         | 176 ++--
 .../paymentApproval/approvalAdd11.vue         |  95 +--
 .../paymentApproval/approvalAdd12.vue         | 358 ++++----
 .../paymentApproval/approvalAdd2.vue          | 306 +++++--
 .../paymentApproval/approvalAdd3.vue          | 347 ++++++--
 .../paymentApproval/approvalAdd4.vue          |  84 +-
 .../paymentApproval/approvalAdd5.vue          | 120 ++-
 .../paymentApproval/approvalDetail.vue        |  43 +-
 .../paymentApproval/approvalDetail10.vue      | 430 ++++++++++
 .../paymentApproval/approvalDetail11.vue      | 431 ++++++++++
 .../paymentApproval/approvalDetail12.vue      | 482 +++++++++++
 .../paymentApproval/approvalDetail2.vue       | 437 ++++++++++
 .../paymentApproval/approvalDetail3.vue       | 437 ++++++++++
 .../paymentApproval/approvalDetail4.vue       | 437 ++++++++++
 .../paymentApproval/approvalDetail5.vue       | 437 ++++++++++
 .../paymentApproval/approvalList.vue          |  12 +-
 .../paymentApproval/approvalList10.vue        |  13 +-
 .../paymentApproval/approvalList11.vue        |  12 +-
 .../paymentApproval/approvalList12.vue        |  14 +-
 .../paymentApproval/approvalList2.vue         |   4 +-
 .../paymentApproval/approvalList3.vue         |   4 +-
 .../paymentApproval/approvalList4.vue         |   4 +-
 .../paymentApproval/approvalList5.vue         |   4 +-
 .../paymentApproval/approvalModify.vue        |  43 +-
 .../paymentApproval/approvalModify10.vue      | 732 ++++++++++++++++
 .../paymentApproval/approvalModify11.vue      | 793 +++++++++++++++++
 .../paymentApproval/approvalModify12.vue      | 794 +++++++++++++++++
 .../paymentApproval/approvalModify2.vue       | 794 +++++++++++++++++
 .../paymentApproval/approvalModify3.vue       | 800 ++++++++++++++++++
 .../paymentApproval/approvalModify4.vue       | 794 +++++++++++++++++
 .../paymentApproval/approvalModify5.vue       | 794 +++++++++++++++++
 src/views/onlineHome/workbench.vue            |  44 +-
 static/images/onlineHome/yinnongIcon1.png     | Bin 0 -> 2066 bytes
 static/images/onlineHome/yinnongIcon10.png    | Bin 0 -> 1858 bytes
 static/images/onlineHome/yinnongIcon2.png     | Bin 0 -> 1935 bytes
 static/images/onlineHome/yinnongIcon3.png     | Bin 0 -> 2022 bytes
 static/images/onlineHome/yinnongIcon4.png     | Bin 0 -> 1784 bytes
 static/images/onlineHome/yinnongIcon5.png     | Bin 0 -> 1873 bytes
 static/images/onlineHome/yinnongIcon6.png     | Bin 0 -> 1817 bytes
 static/images/onlineHome/yinnongIcon7.png     | Bin 0 -> 1660 bytes
 static/images/onlineHome/yinnongIcon8.png     | Bin 0 -> 1598 bytes
 static/images/onlineHome/yinnongIcon9.png     | Bin 0 -> 1900 bytes
 static/images/onlineHome/yinnongList1.png     | Bin 0 -> 2328 bytes
 static/images/onlineHome/yinnongList10.png    | Bin 0 -> 1896 bytes
 static/images/onlineHome/yinnongList2.png     | Bin 0 -> 2042 bytes
 static/images/onlineHome/yinnongList3.png     | Bin 0 -> 2119 bytes
 static/images/onlineHome/yinnongList4.png     | Bin 0 -> 1893 bytes
 static/images/onlineHome/yinnongList5.png     | Bin 0 -> 1904 bytes
 static/images/onlineHome/yinnongList6.png     | Bin 0 -> 1852 bytes
 static/images/onlineHome/yinnongList7.png     | Bin 0 -> 1744 bytes
 static/images/onlineHome/yinnongList8.png     | Bin 0 -> 1612 bytes
 static/images/onlineHome/yinnongList9.png     | Bin 0 -> 1930 bytes
 57 files changed, 10163 insertions(+), 675 deletions(-)
 create mode 100644 src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail10.vue
 create mode 100644 src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail11.vue
 create mode 100644 src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail12.vue
 create mode 100644 src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail2.vue
 create mode 100644 src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail3.vue
 create mode 100644 src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail4.vue
 create mode 100644 src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail5.vue
 create mode 100644 src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify10.vue
 create mode 100644 src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify11.vue
 create mode 100644 src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify12.vue
 create mode 100644 src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify2.vue
 create mode 100644 src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify3.vue
 create mode 100644 src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify4.vue
 create mode 100644 src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify5.vue
 create mode 100644 static/images/onlineHome/yinnongIcon1.png
 create mode 100644 static/images/onlineHome/yinnongIcon10.png
 create mode 100644 static/images/onlineHome/yinnongIcon2.png
 create mode 100644 static/images/onlineHome/yinnongIcon3.png
 create mode 100644 static/images/onlineHome/yinnongIcon4.png
 create mode 100644 static/images/onlineHome/yinnongIcon5.png
 create mode 100644 static/images/onlineHome/yinnongIcon6.png
 create mode 100644 static/images/onlineHome/yinnongIcon7.png
 create mode 100644 static/images/onlineHome/yinnongIcon8.png
 create mode 100644 static/images/onlineHome/yinnongIcon9.png
 create mode 100644 static/images/onlineHome/yinnongList1.png
 create mode 100644 static/images/onlineHome/yinnongList10.png
 create mode 100644 static/images/onlineHome/yinnongList2.png
 create mode 100644 static/images/onlineHome/yinnongList3.png
 create mode 100644 static/images/onlineHome/yinnongList4.png
 create mode 100644 static/images/onlineHome/yinnongList5.png
 create mode 100644 static/images/onlineHome/yinnongList6.png
 create mode 100644 static/images/onlineHome/yinnongList7.png
 create mode 100644 static/images/onlineHome/yinnongList8.png
 create mode 100644 static/images/onlineHome/yinnongList9.png

diff --git a/src/api/onlineHome/bankAgriculture/paymentApproval.js b/src/api/onlineHome/bankAgriculture/paymentApproval.js
index fa051101..9a788742 100644
--- a/src/api/onlineHome/bankAgriculture/paymentApproval.js
+++ b/src/api/onlineHome/bankAgriculture/paymentApproval.js
@@ -31,6 +31,21 @@ export function queryTransferDetail(transferId){
   })
 }
 
+// 查询银行转账详细
+export function getCash(id) {
+  return request({
+    url: '/yinnong/cash/get/' + id,
+    method: 'get'
+  })
+}
+// 查询其他申请详情列表
+export function listCashdetailByCashId(id) {
+  return request({
+    url: '/yinnong/cashdetail/listCashdetailByCashId/'+id,
+    method: 'get'
+  })
+}
+
 export function listPayee(query) {
   return request({
     url: '/yinnong/payee/selectlist',
@@ -48,6 +63,15 @@ export function updateTransfer(data) {
   })
 }
 
+// 修改现金提现申请
+export function updateCash(data) {
+  return request({
+    url: '/yinnong/cash/edit',
+    method: 'post',
+    data: data
+  })
+}
+
 // 查询工程项目关联关系详细
 export function getProjectto(query) {
   return request({
@@ -83,6 +107,20 @@ export function customSubmit(id) {
   })
 }
 
+// 现金提交审批
+export function cashSubmit(id) {
+  return request({
+    url: '/yinnong/cash/customSubmit/' + id,
+    method: 'post'
+  })
+}
+// 删除现金提现申请
+export function delCash(id) {
+  return request({
+    url: '/yinnong/cash/remove/' + id,
+    method: 'get'
+  })
+}
 // 新增银行转账
 export function addTransfer(data) {
   return request({
@@ -92,6 +130,24 @@ export function addTransfer(data) {
   })
 }
 
+// 新增现金提现申请
+export function addCash(data) {
+  return request({
+    url: '/yinnong/cash/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 新增其他申请详情
+export function addCashdetail(data) {
+  return request({
+    url: '/yinnong/cashdetail/add',
+    method: 'post',
+    data: data
+  })
+}
+
 // 查询转账账户详情详细
 export function getTransferProcess(id) {
   return request({
@@ -148,3 +204,48 @@ export function delTransfer(id) {
     method: 'get'
   })
 }
+
+// 查询村级账户列表
+export function listVaccount(query) {
+  return request({
+    url: '/yinnong/vaccount/list',
+    method: 'get',
+    params: query
+  })
+}
+// 查询乡镇账户列表
+export function listTaccount(query) {
+  return request({
+    url: '/yinnong/taccount/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询银行汇票列表
+export function listMoneyorder(query) {
+  return request({
+    url: '/yinnong/moneyorder/list',
+    method: 'get',
+    params: query
+  })
+}
+
+//上传全局方法附件
+
+export function commonAttach(data) {
+  return request({
+    url: '/common/attach',
+    method: 'post',
+    header: { "Content-Type": 'application/x-www-form-urlencoded' },
+    data: data
+  })
+}
+//查询已上传附件
+export const attachmentList = (data) => {
+  return request({
+    url: '/system/attachment/query',
+    method: 'get',
+    params: data
+  })
+}
diff --git a/src/router/index.js b/src/router/index.js
index 8a915ee9..1d5018de 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1024,7 +1024,7 @@ export const constantRoutes = [
     component: (resolve) => require(['@/views/onlineHome/homestead/homeApproval/approvalForm'], resolve)
   },
   {
-    path: '/approvalList',
+    path: '/onlineHome/approvalList',
     name: 'approvalList',
     meta: {
       title: '银农支付付款申请',
@@ -1033,7 +1033,7 @@ export const constantRoutes = [
     component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalList'], resolve)
   },
   {
-    path: '/approvalList2',
+    path: '/onlineHome/approvalList2',
     name: 'approvalList2',
     meta: {
       title: '信用卡转账',
@@ -1042,7 +1042,7 @@ export const constantRoutes = [
     component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalList2'], resolve)
   },
   {
-    path: '/approvalList3',
+    path: '/onlineHome/approvalList3',
     name: 'approvalList3',
     meta: {
       title: '虚拟挂账',
@@ -1051,7 +1051,7 @@ export const constantRoutes = [
     component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalList3'], resolve)
   },
   {
-    path: '/approvalList4',
+    path: '/onlineHome/approvalList4',
     name: 'approvalList4',
     meta: {
       title: '虚拟转账',
@@ -1060,7 +1060,7 @@ export const constantRoutes = [
     component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalList4'], resolve)
   },
   {
-    path: '/approvalList5',
+    path: '/onlineHome/approvalList5',
     name: 'approvalList5',
     meta: {
       title: '母子转张',
@@ -1069,7 +1069,7 @@ export const constantRoutes = [
     component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalList5'], resolve)
   },
   {
-    path: '/approvalList10',
+    path: '/onlineHome/approvalList10',
     name: 'approvalList10',
     meta: {
       title: '资金提现',
@@ -1078,7 +1078,7 @@ export const constantRoutes = [
     component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalList10'], resolve)
   },
   {
-    path: '/approvalList11',
+    path: '/onlineHome/approvalList11',
     name: 'approvalList11',
     meta: {
       title: '资金使用',
@@ -1087,7 +1087,7 @@ export const constantRoutes = [
     component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalList11'], resolve)
   },
   {
-    path: '/approvalList12',
+    path: '/onlineHome/approvalList12',
     name: 'approvalList12',
     meta: {
       title: '汇票支出',
@@ -1096,7 +1096,7 @@ export const constantRoutes = [
     component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalList12'], resolve)
   },
   {
-    path: '/approvalDetail',
+    path: '/onlineHome/approvalDetail',
     name: 'approvalDetail',
     meta: {
       title: '银农支付付款申请',
@@ -1105,7 +1105,70 @@ export const constantRoutes = [
     component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail'], resolve)
   },
   {
-    path: '/approvalAdd',
+    path: '/onlineHome/approvalDetail2',
+    name: 'approvalDetail2',
+    meta: {
+      title: '银农支付付款申请',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail2'], resolve)
+  },
+  {
+    path: '/onlineHome/approvalDetail3',
+    name: 'approvalDetail3',
+    meta: {
+      title: '银农支付付款申请',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail3'], resolve)
+  },
+  {
+    path: '/onlineHome/approvalDetail4',
+    name: 'approvalDetail4',
+    meta: {
+      title: '银农支付付款申请',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail4'], resolve)
+  },
+  {
+    path: '/onlineHome/approvalDetail5',
+    name: 'approvalDetail5',
+    meta: {
+      title: '银农支付付款申请',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail5'], resolve)
+  },
+  {
+    path: '/onlineHome/approvalDetail10',
+    name: 'approvalDetail10',
+    meta: {
+      title: '银农支付付款申请',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail10'], resolve)
+  },
+  {
+    path: '/onlineHome/approvalDetail11',
+    name: 'approvalDetail11',
+    meta: {
+      title: '银农支付付款申请',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail11'], resolve)
+  },
+  {
+    path: '/onlineHome/approvalDetail12',
+    name: 'approvalDetail12',
+    meta: {
+      title: '银农支付付款申请',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail12'], resolve)
+  },
+  {
+    path: '/onlineHome/approvalAdd',
     name: 'approvalAdd',
     meta: {
       title: '添加常用转账付款申请',
@@ -1114,7 +1177,7 @@ export const constantRoutes = [
     component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd'], resolve)
   },
   {
-    path: '/approvalAdd2',
+    path: '/onlineHome/approvalAdd2',
     name: 'approvalAdd2',
     meta: {
       title: '添加信用卡转账付款申请',
@@ -1123,7 +1186,7 @@ export const constantRoutes = [
     component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd2'], resolve)
   },
   {
-    path: '/approvalAdd3',
+    path: '/onlineHome/approvalAdd3',
     name: 'approvalAdd3',
     meta: {
       title: '添加虚拟挂账付款申请',
@@ -1132,7 +1195,7 @@ export const constantRoutes = [
     component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd3'], resolve)
   },
   {
-    path: '/approvalAdd4',
+    path: '/onlineHome/approvalAdd4',
     name: 'approvalAdd4',
     meta: {
       title: '添加虚拟转账付款申请',
@@ -1141,7 +1204,7 @@ export const constantRoutes = [
     component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd4'], resolve)
   },
   {
-    path: '/approvalAdd5',
+    path: '/onlineHome/approvalAdd5',
     name: 'approvalAdd5',
     meta: {
       title: '添加母子转账付款申请',
@@ -1150,7 +1213,7 @@ export const constantRoutes = [
     component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd5'], resolve)
   },
   {
-    path: '/approvalAdd10',
+    path: '/onlineHome/approvalAdd10',
     name: 'approvalAdd10',
     meta: {
       title: '添加资金提现付款申请',
@@ -1159,7 +1222,7 @@ export const constantRoutes = [
     component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd10'], resolve)
   },
   {
-    path: '/approvalAdd11',
+    path: '/onlineHome/approvalAdd11',
     name: 'approvalAdd11',
     meta: {
       title: '添加资金使用付款申请',
@@ -1168,7 +1231,7 @@ export const constantRoutes = [
     component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd11'], resolve)
   },
   {
-    path: '/approvalAdd12',
+    path: '/onlineHome/approvalAdd12',
     name: 'approvalAdd12',
     meta: {
       title: '添加汇票支出付款申请',
@@ -1177,7 +1240,7 @@ export const constantRoutes = [
     component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd12'], resolve)
   },
   {
-    path: '/approvalApproval',
+    path: '/onlineHome/approvalApproval',
     name: 'approvalApproval',
     meta: {
       title: '付款审批',
@@ -1186,7 +1249,7 @@ export const constantRoutes = [
     component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalApproval'], resolve)
   },
   {
-    path: '/approvalModify',
+    path: '/onlineHome/approvalModify',
     name: 'approvalModify',
     meta: {
       title: '修改银农支付付款申请',
@@ -1195,7 +1258,70 @@ export const constantRoutes = [
     component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalModify'], resolve)
   },
   {
-    path: '/approvalProcess',
+    path: '/onlineHome/approvalModify2',
+    name: 'approvalModify2',
+    meta: {
+      title: '修改银农支付付款申请',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalModify2'], resolve)
+  },
+  {
+    path: '/onlineHome/approvalModify3',
+    name: 'approvalModify3',
+    meta: {
+      title: '修改银农支付付款申请',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalModify3'], resolve)
+  },
+  {
+    path: '/onlineHome/approvalModify4',
+    name: 'approvalModify4',
+    meta: {
+      title: '修改银农支付付款申请',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalModify4'], resolve)
+  },
+  {
+    path: '/onlineHome/approvalModify5',
+    name: 'approvalModify5',
+    meta: {
+      title: '修改银农支付付款申请',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalModify5'], resolve)
+  },
+  {
+    path: '/onlineHome/approvalModify10',
+    name: 'approvalModify10',
+    meta: {
+      title: '修改银农支付付款申请',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalModify10'], resolve)
+  },
+  {
+    path: '/onlineHome/approvalModify11',
+    name: 'approvalModify11',
+    meta: {
+      title: '修改银农支付付款申请',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalModify11'], resolve)
+  },
+  {
+    path: '/onlineHome/approvalModify12',
+    name: 'approvalModify12',
+    meta: {
+      title: '修改银农支付付款申请',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalModify12'], resolve)
+  },
+  {
+    path: '/onlineHome/approvalProcess',
     name: 'approvalProcess',
     meta: {
       title: '付款申请流程',
@@ -1204,7 +1330,7 @@ export const constantRoutes = [
     component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalProcess'], resolve)
   },
   {
-    path: '/collectionList',
+    path: '/onlineHome/collectionList',
     name: 'collectionList',
     meta: {
       title: '银农支付收款账户',
@@ -1213,7 +1339,7 @@ export const constantRoutes = [
     component: (resolve) => require(['@/views/onlineHome/bankAgriculture/collectionAccount/collectionList'], resolve)
   },
   {
-    path: '/collectionAdd',
+    path: '/onlineHome/collectionAdd',
     name: 'collectionAdd',
     meta: {
       title: '添加支付收款账户',
@@ -1222,7 +1348,7 @@ export const constantRoutes = [
     component: (resolve) => require(['@/views/onlineHome/bankAgriculture/collectionAccount/collectionAdd'], resolve)
   },
   {
-    path: '/collectionModify',
+    path: '/onlineHome/collectionModify',
     name: 'collectionModify',
     meta: {
       title: '修改支付收款账户',
@@ -1231,7 +1357,7 @@ export const constantRoutes = [
     component: (resolve) => require(['@/views/onlineHome/bankAgriculture/collectionAccount/collectionModify'], resolve)
   },
   {
-    path: '/collectionDetail',
+    path: '/onlineHome/collectionDetail',
     name: 'collectionDetail',
     meta: {
       title: '查看支付收款账户',
@@ -1240,7 +1366,7 @@ export const constantRoutes = [
     component: (resolve) => require(['@/views/onlineHome/bankAgriculture/collectionAccount/collectionDetail'], resolve)
   },
   {
-    path: '/paymentAccountList',
+    path: '/onlineHome/paymentAccountList',
     name: 'paymentAccountList',
     meta: {
       title: '查看支付收款账户',
@@ -1249,7 +1375,7 @@ export const constantRoutes = [
     component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentAccount/paymentAccountList'], resolve)
   },
   {
-    path: '/paymentAccountAdd',
+    path: '/onlineHome/paymentAccountAdd',
     name: 'paymentAccountAdd',
     meta: {
       title: '添加出纳账户设置',
@@ -1258,7 +1384,7 @@ export const constantRoutes = [
     component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentAccount/paymentAccountAdd'], resolve)
   },
   {
-    path: '/paymentAccountModify',
+    path: '/onlineHome/paymentAccountModify',
     name: 'paymentAccountModify',
     meta: {
       title: '修改出纳账户设置',
@@ -1267,7 +1393,7 @@ export const constantRoutes = [
     component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentAccount/paymentAccountModify'], resolve)
   },
   {
-    path: '/paymentAccountDetail',
+    path: '/onlineHome/paymentAccountDetail',
     name: 'paymentAccountDetail',
     meta: {
       title: '付款账户详情',
diff --git a/src/views/onlineHome/bankAgriculture/collectionAccount/collectionList.vue b/src/views/onlineHome/bankAgriculture/collectionAccount/collectionList.vue
index 3f9a733b..bc32dfd2 100644
--- a/src/views/onlineHome/bankAgriculture/collectionAccount/collectionList.vue
+++ b/src/views/onlineHome/bankAgriculture/collectionAccount/collectionList.vue
@@ -24,7 +24,7 @@
         <van-swipe-cell v-for="(item,index) in applicationList" :key="index">
           <van-cell center :to="{name:'collectionDetail', query: {id:item.id}}">
             <template #icon>
-              <van-icon name="../../../static/images/icon/icon_yl.png" size="22" color="#539FFD" style="margin-right: 10px;" />
+              <van-icon name="../../../../../static/images/onlineHome/yinnongList5.png" size="22" color="#539FFD" style="margin-right: 10px;" />
             </template>
             <template #label>
               <p>{{item.payeeAccount}}</p>
diff --git a/src/views/onlineHome/bankAgriculture/paymentAccount/paymentAccountList.vue b/src/views/onlineHome/bankAgriculture/paymentAccount/paymentAccountList.vue
index 39796022..02497b8c 100644
--- a/src/views/onlineHome/bankAgriculture/paymentAccount/paymentAccountList.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentAccount/paymentAccountList.vue
@@ -24,7 +24,7 @@
         <van-swipe-cell v-for="(item,index) in applicationList" :key="index">
           <van-cell :title="item.accountType" center :to="{name:'paymentAccountDetail', query: {id:item.id,type:'modify'}}">
             <template #icon>
-              <van-icon name="../../../static/images/icon/icon_yl.png" size="22" color="#539FFD" style="margin-right: 10px;" />
+              <van-icon name="../../../../../static/images/onlineHome/yinnongList2.png" size="22" color="#539FFD" style="margin-right: 10px;" />
             </template>
             <template #label>
               <p><span><i>￥</i>{{item.balance}}</span></p>
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd.vue
index 565c6609..8b29bff8 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd.vue
@@ -7,7 +7,7 @@
       @click-left="$router.back(-1)"
     >
       <template #title>
-        <p style="font-weight: bold;">添加付款申请</p>
+        <p style="font-weight: bold;">添加常用转账申请</p>
       </template>
     </van-nav-bar>
     <van-form @submit="getChange" @failed="getError" :show-error-message="false" scroll-to-error validate-first>
@@ -196,7 +196,7 @@
           </van-popup>
           <van-field required :rules="[{ required: true , message:'请输入账户' }]" v-model="item.payeeAccount" label="收款账户" placeholder="请输入账户" input-align="right" label-width="auto"/>
           <van-field required :rules="[{ required: true , message:'请输入银行' }]" v-model="item.bankDeposit" label="开户银行" placeholder="请输入银行" input-align="right" label-width="auto"/>
-          <van-field required :rules="[{ required: true , message:'请输入金额' }]" v-model="item.incomeAmount" label="收入金额" placeholder="请输入金额" input-align="right" label-width="auto" @change="moneyChange"/>
+          <van-field required :rules="[{ required: true , message:'请输入金额' }]" v-model="item.incomeAmount" type="number" label="收入金额" placeholder="请输入金额" input-align="right" label-width="auto" @change="moneyChange"/>
           <van-field
             readonly
             clickable
@@ -219,11 +219,10 @@
           </van-popup>
         </div>
       </div>
-<!--      <p class="main_title">上传附件</p>-->
-<!--      <div class="main_box" style="padding: 10px 0 0 10px">-->
-<!--        <van-uploader v-model="fileList" :after-read="beforeRead"></van-uploader>-->
-<!--        <van-button type="button">上传</van-button>-->
-<!--      </div>-->
+      <p class="main_title">上传附件</p>
+      <div class="main_box" style="padding: 5px 0 0 8px;">
+        <van-uploader v-model="fileList" :after-read="beforeRead" @delete="deleteFile"></van-uploader>
+      </div>
       <div style="padding: 16px 0;">
         <van-row>
           <van-col span="12" align="center">
@@ -243,6 +242,9 @@
 
 <script>
   import { addTransfer , listPayee , updateTransfer , getProjectto , listProject , addProjectto , customSubmit , getAccount ,getQmyeFlow , attach} from "@/api/onlineHome/bankAgriculture/paymentApproval";
+  import request from '@/utils/request'
+  import {attachmentList, commonAttach} from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
+  import Dialog from "vant/lib/dialog";
   export default {
     name: "approvalAdd",
     data() {
@@ -300,15 +302,7 @@
           ynType:'1'
         },
         projectFundType:'',
-        //上传附件
-        uploadAttachmentData: {
-          rows: {},
-          visible: false,
-          //业务表名
-          tableName: "t_yinnong_transfer",
-          //存放目录 默认系统模块
-          bizPath: "upload",
-        },
+        uploadFiles:[],
       };
     },
     created() {
@@ -345,11 +339,6 @@
       this.getDictionaries();
     },
     methods: {
-      // 返回布尔值
-      beforeRead(file) {
-        console.log(file)
-        console.log(this.fileList)
-      },
       // 表单重置
       reset() {
         this.form = {
@@ -388,28 +377,12 @@
         }
       },
       getChange(){
-        console.log(this.buttonType)
         if(this.buttonType == 'update'){
-          console.log('update')
           this.goUpdate();
         }else if(this.buttonType == 'add'){
-          console.log('add')
           this.goAdd();
         }
       },
-      //更新文件回显
-      afterRead(file) {
-        this.$forceUpdate();
-      },
-      //删除图片
-      deleteFile(elIndex){
-        this.$forceUpdate();
-        return (file, name) => {
-          let fileIndex = name.index
-          this.fileList[elIndex].splice(fileIndex, 1)
-          this.upLoadList[elIndex].splice(fileIndex, 1)
-        }
-      },
       getDictionaries(){
         this.getDicts("capital_expenditure_type").then((res) => {
           for (var i = 0; i < res.data.length; i++) {
@@ -465,8 +438,10 @@
         listPayee(this.queryParams).then((response) => {
           this.payeeList = response.rows;
           response.rows.map((res,index) => {
-            this.payeeList[index].text = res.payee;
-            this.payeeList[index].value = res.id;
+            if(res.payeeType==1||res.payeeType==2){
+              this.payeeList[index].text = res.payee;
+              this.payeeList[index].value = res.id;
+            }
           })
         });
       },
@@ -580,31 +555,130 @@
             return;
           }
         }
-        this.$set(this.form, "payeeList", this.chargeItme);
-        this.$set(this.form, "bankTypeList", this.chargeItme);
-        this.$set(this.form, "accountTypeList", this.chargeItme);
-        this.$set(this.form, "transferStatusList", this.chargeItme);
-        addTransfer(this.form).then(response => {
-          this.projectForm.outId = response.data.id
-          this.$set(this.projectForm, "ynType", '1');
-          if(this.form.capitalExpenditureType==2){
-            addProjectto(this.projectForm).then(res => {
-              customSubmit(response.data.id).then(res => {
-                this.$toast.success('提交成功');
-                setTimeout(function(){
-                  history.go(-1)
-                },2000)
-              })
-            })
-          }else{
-            customSubmit(response.data.id).then(res => {
-              this.$toast.success('提交成功');
-              setTimeout(function(){
-                history.go(-1)
-              },2000)
+        if(this.uploadFiles==null||this.uploadFiles.length==0){
+          Dialog.confirm({
+            title: '提示',
+            message: '此申请单中未上传任何附件，是否确认提交？',
+          })
+            .then(() => {
+              this.$set(this.form, "payeeList", this.chargeItme);
+              this.$set(this.form, "bankTypeList", this.chargeItme);
+              this.$set(this.form, "accountTypeList", this.chargeItme);
+              this.$set(this.form, "transferStatusList", this.chargeItme);
+              addTransfer(this.form).then(response => {
+                this.projectForm.outId = response.data.id
+                this.$set(this.projectForm, "ynType", '1');
+                if(this.uploadFiles!=null&&this.uploadFiles.length>0){
+                  this.uploadFiles.map(rr => {
+                    const params = new FormData();
+                    params.append("tableId", response.data.id);
+                    params.append("tableName", "t_yinnong_transfer");
+                    params.append("bizPath", "upload");
+                    params.append("fileType", "0");
+                    params.append("file", rr);
+                    commonAttach(params).then((r) => {
+                    })
+                  })
+                  if(this.form.capitalExpenditureType==2){
+                    addProjectto(this.projectForm).then(res => {
+                      customSubmit(response.data.id).then(res => {
+                        this.$toast.success('提交成功');
+                        setTimeout(function(){
+                          history.go(-1)
+                        },2000)
+                      })
+                    })
+                  }else{
+                    customSubmit(response.data.id).then(res => {
+                      this.$toast.success('提交成功');
+                      setTimeout(function(){
+                        history.go(-1)
+                      },2000)
+                    })
+                  }
+                }else{
+                  if(this.form.capitalExpenditureType==2){
+                    addProjectto(this.projectForm).then(res => {
+                      customSubmit(response.data.id).then(res => {
+                        this.$toast.success('提交成功');
+                        setTimeout(function(){
+                          history.go(-1)
+                        },2000)
+                      })
+                    })
+                  }else{
+                    customSubmit(response.data.id).then(res => {
+                      this.$toast.success('提交成功');
+                      setTimeout(function(){
+                        history.go(-1)
+                      },2000)
+                    })
+                  }
+                }
+              });
             })
-          }
-        });
+            .catch(() => {
+              return false;
+            });
+        }else{
+          this.$set(this.form, "payeeList", this.chargeItme);
+          this.$set(this.form, "bankTypeList", this.chargeItme);
+          this.$set(this.form, "accountTypeList", this.chargeItme);
+          this.$set(this.form, "transferStatusList", this.chargeItme);
+          addTransfer(this.form).then(response => {
+            this.projectForm.outId = response.data.id
+            this.$set(this.projectForm, "ynType", '1');
+            if(this.uploadFiles!=null&&this.uploadFiles.length>0){
+              this.uploadFiles.map(rr => {
+                const params = new FormData();
+                params.append("tableId", response.data.id);
+                params.append("tableName", "t_yinnong_transfer");
+                params.append("bizPath", "upload");
+                params.append("fileType", "0");
+                params.append("file", rr);
+                commonAttach(params).then((r) => {
+                })
+              })
+              if(this.form.capitalExpenditureType==2){
+                addProjectto(this.projectForm).then(res => {
+                  customSubmit(response.data.id).then(res => {
+                    this.$toast.success('提交成功');
+                    setTimeout(function(){
+                      history.go(-1)
+                    },2000)
+                  })
+                })
+              }else{
+                customSubmit(response.data.id).then(res => {
+                  this.$toast.success('提交成功');
+                  setTimeout(function(){
+                    history.go(-1)
+                  },2000)
+                })
+              }
+            }else{
+              if(this.form.capitalExpenditureType==2){
+                addProjectto(this.projectForm).then(res => {
+                  customSubmit(response.data.id).then(res => {
+                    this.$toast.success('提交成功');
+                    setTimeout(function(){
+                      history.go(-1)
+                    },2000)
+                  })
+                })
+              }else{
+                customSubmit(response.data.id).then(res => {
+                  this.$toast.success('提交成功');
+                  setTimeout(function(){
+                    history.go(-1)
+                  },2000)
+                })
+              }
+            }
+          });
+        }
+
+
       },
       goUpdate(){
         if(this.chargeItme.length<1){
@@ -629,23 +703,51 @@
         this.$set(this.form, "bankTypeList", this.chargeItme);
         this.$set(this.form, "accountTypeList", this.chargeItme);
         this.$set(this.form, "transferStatusList", this.chargeItme);
-        this.projectForm.outId = this.form.id
+        console.log(this.form)
         addTransfer(this.form).then((response) => {
           this.projectForm.outId = response.data.id
           this.$set(this.projectForm, "ynType", '1');
-          if(this.form.capitalExpenditureType==2){
-            addProjectto(this.projectForm).then(res => {
+          if(this.uploadFiles!=null&&this.uploadFiles.length>0){
+            console.log(this.uploadFiles)
+            this.uploadFiles.map(rr => {
+              const params = new FormData();
+              params.append("tableId", response.data.id);
+              params.append("tableName", "t_yinnong_transfer");
+              params.append("bizPath", "upload");
+              params.append("fileType", "0");
+              params.append("file", rr);
+              commonAttach(params).then((r) => {
+              })
+            })
+            if(this.form.capitalExpenditureType==2){
+              addProjectto(this.projectForm).then(res => {
+                this.$toast.success('保存成功');
+                setTimeout(function(){
+                  history.go(-1)
+                },2000)
+              })
+            }else{
               this.$toast.success('保存成功');
               setTimeout(function(){
                 history.go(-1)
               },2000)
-            })
+            }
           }else{
-            this.$toast.success('保存成功');
-            setTimeout(function(){
-              history.go(-1)
-            },2000)
+            if(this.form.capitalExpenditureType==2){
+              addProjectto(this.projectForm).then(res => {
+                this.$toast.success('保存成功');
+                setTimeout(function(){
+                  history.go(-1)
+                },2000)
+              })
+            }else{
+              this.$toast.success('保存成功');
+              setTimeout(function(){
+                history.go(-1)
+              },2000)
+            }
           }
+
         });
       },
       payeeSelectChange(select, i) {
@@ -746,17 +848,39 @@
           }
         }
       },
+      beforeRead(file) {
+        this.uploadFiles.push(file.file);
+      },
+      deleteFile(file){
+        this.uploadFiles.map((response,index) => {
+          if(file.file == response){
+            this.uploadFiles.splice(index,1)
+          }
+        })
+      },
+      getFileList(){
+        let oData= {
+          tableId: this.$route.query.id,
+          tableName: "t_yinnong_transfer",
+          bizPath: "upload",
+          fileType: "0",
+        }
+        attachmentList(oData).then(res => {
+          console.log(res)
+          console.log(location.protocol+"//"+location.host+request.defaults.baseURL)
+          res.rows.map(r => {
+            let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
+            this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{})})
+            console.log(r)
+          })
+        })
+      },
       goBack(){
         window.history.go(-1)
       },
       deleteChargeItme(index){
         this.chargeItme.splice(index,1)
       },
-      goUpload(){
-        attach(this.uploadAttachmentData).then((response) => {
-          console.log(response)
-        });
-      }
     },
   }
 </script>
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd10.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd10.vue
index 4b3294da..ae3d0bd9 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd10.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd10.vue
@@ -7,7 +7,7 @@
       @click-left="$router.back(-1)"
     >
       <template #title>
-        <p style="font-weight: bold;">添加付款申请</p>
+        <p style="font-weight: bold;">添加资金提现申请</p>
       </template>
     </van-nav-bar>
     <van-form @submit="getChange" @failed="getError" :show-error-message="false" scroll-to-error validate-first>
@@ -59,7 +59,7 @@
         <van-field
           readonly
           required
-          label="支出总金额"
+          label="提现总金额"
           v-model="form.expenditureAmount"
           placeholder="根据下方收款金额自动核算"
           input-align="right"
@@ -174,51 +174,16 @@
       <div :style="{position:'relative',padding: index == 0 ? '':'10px 0 0 0'}" v-for="(item, index) in chargeItme" :key="index">
         <van-button icon="minus" size="mini" type="danger" class="deleteFamily" native-type="button" v-if="index!=0" @click="deleteChargeItme(index)" />
         <div class="main_box" style="margin-bottom: 10px;position:relative;">
-          <van-field
-            readonly
-            clickable
-            label="收款方"
-            placeholder="请选择"
-            v-model="item.payee"
-            @click="item.showPayee = true"
-            input-align="right"
-            right-icon="arrow-down"
-            required
-            :rules="[{ required: true , message:'请选择收款方' }]"
-          />
-          <van-popup v-model="item.showPayee" position="bottom">
-            <van-picker
-              show-toolbar
-              :columns="payeeList"
-              @confirm="onConfirmPayee($event,index)"
-              @cancel="item.showPayee = false"
-            />
-          </van-popup>
-          <van-field required :rules="[{ required: true , message:'请输入账户' }]" v-model="item.payeeAccount" label="收款账户" placeholder="请输入账户" input-align="right" label-width="auto"/>
-          <van-field required :rules="[{ required: true , message:'请输入银行' }]" v-model="item.bankDeposit" label="开户银行" placeholder="请输入银行" input-align="right" label-width="auto"/>
-          <van-field required :rules="[{ required: true , message:'请输入金额' }]" v-model="item.incomeAmount" label="收入金额" placeholder="请输入金额" input-align="right" label-width="auto" @change="moneyChange"/>
-          <van-field
-            readonly
-            clickable
-            label="所属银行"
-            placeholder="请选择"
-            v-model="item.bankTypeText"
-            @click="item.showbankType = true"
-            input-align="right"
-            right-icon="arrow-down"
-            required
-            :rules="[{ required: true , message:'请选择所属银行' }]"
-          />
-          <van-popup v-model="item.showbankType" position="bottom">
-            <van-picker
-              show-toolbar
-              :columns="bankTypeDictionaries"
-              @confirm="onConfirmBankType($event,index)"
-              @cancel="item.showbankType = false"
-            />
-          </van-popup>
+          <van-field required :rules="[{ required: true , message:'请输入收款方全称' }]" v-model="item.payee" label="收款方" placeholder="请输入收款方全称" input-align="right" label-width="auto"/>
+          <van-field required :rules="[{ required: true , message:'请输入提款人' }]" v-model="item.drawer" label="提款人" placeholder="请输入提款人" input-align="right" label-width="auto"/>
+          <van-field required :rules="[{ required: true , message:'请输入提款金额' }]" v-model="item.incomeAmount" type="number"  label="提款金额（元）" placeholder="请输入提款金额" input-align="right" label-width="auto" @change="moneyChange"/>
+          <van-field required :rules="[{ required: true , message:'请输入资金用途' }]" v-model="item.remark" label="资金用途" placeholder="请输入资金用途" input-align="right" label-width="auto" />
         </div>
       </div>
+      <p class="main_title">上传附件</p>
+      <div class="main_box" style="padding: 5px 0 0 8px;">
+        <van-uploader v-model="fileList" :after-read="beforeRead" ></van-uploader>
+      </div>
       <div style="padding: 16px 0;">
         <van-row>
           <van-col span="12" align="center">
@@ -238,6 +203,13 @@
 
 <script>
   import { addTransfer , listPayee , updateTransfer , getProjectto , listProject , addProjectto , customSubmit , getAccount ,getQmyeFlow} from "@/api/onlineHome/bankAgriculture/paymentApproval";
+  import request from '@/utils/request'
+  import {
+    addCash,
+    addCashdetail, attachmentList,
+    commonAttach,
+    updateCash
+  } from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
   export default {
     name: "approvalAdd10",
     data() {
@@ -256,7 +228,7 @@
         maxDate: new Date(2050, 10, 1),
         currentDate: new Date(),
         form:{},
-
+        fileList:[],
         capitalExpenditureType:'',
         payee:'',
         bankType:'',
@@ -291,7 +263,7 @@
           projectBillNum:null,
           projectFundType:'1',
           outId:null,
-          ynType:'1'
+          ynType:'2'
         },
         projectFundType:''
       };
@@ -328,6 +300,7 @@
         })
       });
       this.getDictionaries();
+      this.getFileList();
     },
     methods: {
       // 表单重置
@@ -338,7 +311,7 @@
           downId: null,
           orderId: null,
           cashierId: null,
-          transferType: '1',
+          cashType: '10',
           accountType: '2',
           explainSituation: null,
           succeedAmount: null,
@@ -368,30 +341,21 @@
         }
       },
       getChange(){
-        console.log(this.buttonType)
         if(this.buttonType == 'update'){
-          console.log('update')
           this.goUpdate();
         }else if(this.buttonType == 'add'){
-          console.log('add')
           this.goAdd();
         }
       },
       getDictionaries(){
         this.getDicts("capital_expenditure_type").then((res) => {
-          for (var i = 0; i < res.data.length; i++) {
+          for (let i = 0; i < res.data.length; i++) {
             this.capitalExpenditureTypeOptions.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
           }
         });
-        this.getDicts("bank_type").then(res => {
-          for (var i = 0; i < res.data.length; i++) {
-            this.bankTypeDictionaries.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
-          }
-        });
         this.getPayeeList();
       },
       getError(e){
-        console.log(e)
         this.$notify({ type: 'danger', message: e.errors[0].message });
       },
       addChargeItme(index){
@@ -399,27 +363,23 @@
           this.$notify({ type: 'danger', message: '请勿添加多个空列表信息' });
           return;
         }else if(this.chargeItme.length>0&&this.chargeItme[index-1].incomeAmount == ''){
-          this.$notify({ type: 'danger', message: '请输入收入金额！' });
-          return;
-        }else if(this.chargeItme.length>0&&this.chargeItme[index-1].payeeAccount == ''){
-          this.$notify({ type: 'danger', message: '请输入收款账户！' });
+          this.$notify({ type: 'danger', message: '请输入提款金额！' });
           return;
-        }else if(this.chargeItme.length>0&&this.chargeItme[index-1].bankDeposit == ''){
-          this.$notify({ type: 'danger', message: '请输入开户银行！' });
+        }else if(this.chargeItme.length>0&&this.chargeItme[index-1].drawer == ''){
+          this.$notify({ type: 'danger', message: '请输入提款人！' });
           return;
-        }else if(this.chargeItme.length>0&&this.chargeItme[index-1].bankType == ''){
-          this.$notify({ type: 'danger', message: '请选择所属银行！' });
+        }else if(this.chargeItme.length>0&&this.chargeItme[index-1].remark == ''){
+          this.$notify({ type: 'danger', message: '请输入资金用途！' });
           return;
         }
         this.getDicts("bank_type").then(res => {
           this.chargeItme.splice(index + 1, 0, {
             payeeId: "", //收款方ID
-            payee: "", //收款方
+            payee: "", //收款方全称
             payeeAccount: "", //收款账户
-            bankDeposit: "", //开户银行
-            incomeAmount: "", //收入金额
-            bankType: "1", //所属银行
-            bankTypeText:this.selectDictLabel(res.data, 1), //所属银行
+            drawer: "", //提款人
+            incomeAmount: "", //提款金额
+            bankType: "", //资金用途
             showPayee:false,
             showbankType:false
           });
@@ -438,7 +398,7 @@
         });
       },
       payeeDictLabel(datas, value) {
-        var actions = [];
+        let actions = [];
         Object.keys(datas).some((key) => {
           if (datas[key].payeeId == ('' + value)) {
             actions.push(datas[key].payee);
@@ -551,7 +511,7 @@
         this.$set(this.form, "bankTypeList", this.chargeItme);
         this.$set(this.form, "accountTypeList", this.chargeItme);
         this.$set(this.form, "transferStatusList", this.chargeItme);
-        addTransfer(this.form).then(response => {
+        addCash(this.form).then(response => {
           this.projectForm.outId = response.data.id
           this.$set(this.projectForm, "ynType", '1');
           if(this.form.capitalExpenditureType==2){
@@ -592,27 +552,28 @@
             return;
           }
         }
-        this.$set(this.form, "payeeList", this.chargeItme);
-        this.$set(this.form, "bankTypeList", this.chargeItme);
-        this.$set(this.form, "accountTypeList", this.chargeItme);
-        this.$set(this.form, "transferStatusList", this.chargeItme);
         this.projectForm.outId = this.form.id
-        addTransfer(this.form).then((response) => {
-          this.projectForm.outId = response.data.id
-          this.$set(this.projectForm, "ynType", '1');
-          if(this.form.capitalExpenditureType==2){
-            addProjectto(this.projectForm).then(res => {
-              this.$toast.success('保存成功');
-              setTimeout(function(){
-                history.go(-1)
-              },2000)
+        addCash(this.form).then((response) => {
+          this.chargeItme.map(res => {
+            res.cashId = response.data.id
+            addCashdetail(res).then(r => {
+              if(this.form.capitalExpenditureType==2){
+                this.projectForm.outId = response.data.id
+                this.$set(this.projectForm, "ynType", '2');
+                addProjectto(this.projectForm).then(res => {
+                  this.$toast.success('保存成功');
+                  setTimeout(function(){
+                    history.go(-1)
+                  },2000)
+                })
+              }else{
+                this.$toast.success('保存成功');
+                setTimeout(function(){
+                  history.go(-1)
+                },2000)
+              }
             })
-          }else{
-            this.$toast.success('保存成功');
-            setTimeout(function(){
-              history.go(-1)
-            },2000)
-          }
+          })
         });
       },
       payeeSelectChange(select, i) {
@@ -713,6 +674,37 @@
           }
         }
       },
+      beforeRead(file) {
+        console.log(file)
+        console.log(this.fileList)
+        const params = new FormData();
+        params.append("tableId", this.$route.query.id);
+        params.append("tableName", "t_yinnong_cash");
+        params.append("bizPath", "upload");
+        params.append("fileType", "0");
+        params.append("file", file.file);
+        commonAttach(params).then((response) => {
+          console.log(response)
+        })
+      },
+      getFileList(){
+        let oData= {
+          tableId: this.$route.query.id,
+          tableName: "t_yinnong_transfer",
+          bizPath: "upload",
+          fileType: "0",
+        }
+        attachmentList(oData).then(res => {
+          console.log(res)
+          console.log(location.protocol+"//"+location.host+request.defaults.baseURL)
+          res.rows.map(r => {
+
+            let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
+            this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{})})
+            console.log(r)
+          })
+        })
+      },
       goBack(){
         window.history.go(-1)
       },
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd11.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd11.vue
index 1df8db71..c01e692d 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd11.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd11.vue
@@ -7,7 +7,7 @@
       @click-left="$router.back(-1)"
     >
       <template #title>
-        <p style="font-weight: bold;">添加付款申请</p>
+        <p style="font-weight: bold;">添加资金使用申请</p>
       </template>
     </van-nav-bar>
     <van-form @submit="getChange" @failed="getError" :show-error-message="false" scroll-to-error validate-first>
@@ -59,7 +59,7 @@
         <van-field
           readonly
           required
-          label="支出总金额"
+          label="使用总金额"
           v-model="form.expenditureAmount"
           placeholder="根据下方收款金额自动核算"
           input-align="right"
@@ -157,7 +157,7 @@
             @cancel="showpayer = false"
           />
         </van-popup>
-        <van-field :rules="[{ required: true , message:'请输入付款方账户' }]" required label="付款方账户" v-model="form.payerAccount" placeholder="请输入账户" input-align="right" label-width="auto"/>
+        <van-field :rules="[{ required: true , message:'请输入付款方账户' }]" required label="可用余额（元）" v-model="form.payerAccount" placeholder="请输入账户" input-align="right" label-width="auto"/>
       </div>
 
       <p class="main_title">收款方信息<van-button icon="plus" @click="addChargeItme(chargeItme.length)" size="mini" type="info" native-type="button" class="addFamily"/></p>
@@ -174,59 +174,22 @@
       <div :style="{position:'relative',padding: index == 0 ? '':'10px 0 0 0'}" v-for="(item, index) in chargeItme" :key="index">
         <van-button icon="minus" size="mini" type="danger" class="deleteFamily" native-type="button" v-if="index!=0" @click="deleteChargeItme(index)" />
         <div class="main_box" style="margin-bottom: 10px;position:relative;">
-          <van-field
-            readonly
-            clickable
-            label="收款方"
-            placeholder="请选择"
-            v-model="item.payee"
-            @click="item.showPayee = true"
-            input-align="right"
-            right-icon="arrow-down"
-            required
-            :rules="[{ required: true , message:'请选择收款方' }]"
-          />
-          <van-popup v-model="item.showPayee" position="bottom">
-            <van-picker
-              show-toolbar
-              :columns="payeeList"
-              @confirm="onConfirmPayee($event,index)"
-              @cancel="item.showPayee = false"
-            />
-          </van-popup>
-          <van-field required :rules="[{ required: true , message:'请输入账户' }]" v-model="item.payeeAccount" label="收款账户" placeholder="请输入账户" input-align="right" label-width="auto"/>
-          <van-field required :rules="[{ required: true , message:'请输入银行' }]" v-model="item.bankDeposit" label="开户银行" placeholder="请输入银行" input-align="right" label-width="auto"/>
-          <van-field required :rules="[{ required: true , message:'请输入金额' }]" v-model="item.incomeAmount" label="收入金额" placeholder="请输入金额" input-align="right" label-width="auto" @change="moneyChange"/>
-          <van-field
-            readonly
-            clickable
-            label="所属银行"
-            placeholder="请选择"
-            v-model="item.bankTypeText"
-            @click="item.showbankType = true"
-            input-align="right"
-            right-icon="arrow-down"
-            required
-            :rules="[{ required: true , message:'请选择所属银行' }]"
-          />
-          <van-popup v-model="item.showbankType" position="bottom">
-            <van-picker
-              show-toolbar
-              :columns="bankTypeDictionaries"
-              @confirm="onConfirmBankType($event,index)"
-              @cancel="item.showbankType = false"
-            />
-          </van-popup>
+          <van-field label="收款方" placeholder="请选择" v-model="item.payee" input-align="right" required :rules="[{ required: true , message:'请选择收款方' }]" />
+          <van-field required :rules="[{ required: true , message:'联系方式不能为空' }]" v-model="item.phone" label="联系方式" placeholder="请输入联系方式" input-align="right" label-width="auto"/>
+          <van-field required :rules="[{ required: true , message:'申请使用金额不能为空' }]" v-model="item.incomeAmount"  label="申请使用金额（元）" placeholder="请输入申请使用金额" type="number" input-align="right" label-width="auto"/>
+          <van-field required :rules="[{ required: true , message:'请输入资金用途' }]" v-model="item.remark" label="资金用途" placeholder="请输入资金用途" input-align="right" label-width="auto"/>
         </div>
       </div>
+      <p class="main_title">上传附件</p>
+      <div class="main_box" style="padding: 5px 0 0 8px;">
+        <van-uploader v-model="fileList" :after-read="beforeRead" ></van-uploader>
+      </div>
       <div style="padding: 16px 0;">
         <van-row>
           <van-col span="12" align="center">
-<!--            @click="goUpdate"-->
             <van-button type="info" native-type="submit" @click="buttonType='update'" class="submitButton">保<i style="margin-right: 1em;"></i>存</van-button>
           </van-col>
           <van-col span="12" align="center">
-<!--            @click="goAdd"-->
             <van-button type="info" native-type="submit" @click="buttonType='add'" class="submitButton">保存并提交</van-button>
           </van-col>
         </van-row>
@@ -238,6 +201,8 @@
 
 <script>
   import { addTransfer , listPayee , updateTransfer , getProjectto , listProject , addProjectto , customSubmit , getAccount ,getQmyeFlow} from "@/api/onlineHome/bankAgriculture/paymentApproval";
+  import request from '@/utils/request'
+  import {attachmentList, commonAttach} from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
   export default {
     name: "approvalAdd11",
     data() {
@@ -256,7 +221,7 @@
         maxDate: new Date(2050, 10, 1),
         currentDate: new Date(),
         form:{},
-
+        fileList:[],
         capitalExpenditureType:'',
         payee:'',
         bankType:'',
@@ -328,6 +293,7 @@
         })
       });
       this.getDictionaries();
+      this.getFileList();
     },
     methods: {
       // 表单重置
@@ -713,6 +679,37 @@
           }
         }
       },
+      beforeRead(file) {
+        console.log(file)
+        console.log(this.fileList)
+        const params = new FormData();
+        params.append("tableId", this.$route.query.id);
+        params.append("tableName", "t_yinnong_transfer");
+        params.append("bizPath", "upload");
+        params.append("fileType", "0");
+        params.append("file", file.file);
+        commonAttach(params).then((response) => {
+          console.log(response)
+        })
+      },
+      getFileList(){
+        let oData= {
+          tableId: this.$route.query.id,
+          tableName: "t_yinnong_transfer",
+          bizPath: "upload",
+          fileType: "0",
+        }
+        attachmentList(oData).then(res => {
+          console.log(res)
+          console.log(location.protocol+"//"+location.host+request.defaults.baseURL)
+          res.rows.map(r => {
+
+            let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
+            this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{})})
+            console.log(r)
+          })
+        })
+      },
       goBack(){
         window.history.go(-1)
       },
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd12.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd12.vue
index 0b67a4b1..c16c8cab 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd12.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd12.vue
@@ -7,7 +7,7 @@
       @click-left="$router.back(-1)"
     >
       <template #title>
-        <p style="font-weight: bold;">添加付款申请</p>
+        <p style="font-weight: bold;">添加汇票支出申请</p>
       </template>
     </van-nav-bar>
     <van-form @submit="getChange" @failed="getError" :show-error-message="false" scroll-to-error validate-first>
@@ -56,15 +56,7 @@
             @cancel="showcapital = false"
           />
         </van-popup>
-        <van-field
-          readonly
-          required
-          label="支出总金额"
-          v-model="form.expenditureAmount"
-          placeholder="根据下方收款金额自动核算"
-          input-align="right"
-          label-width="auto"
-        />
+
 
       </div>
 
@@ -133,21 +125,21 @@
         <van-field required :rules="[{ required: true , message:'请输入工程发票号' }]" v-model="projectForm.projectBillNum" label="工程发票号" placeholder="请输入工程发票号" input-align="right" label-width="auto"/>
       </div>
 
-      <p class="main_title">付款方信息</p>
+      <p class="main_title">出票方信息</p>
       <div class="main_box">
         <!--      <van-field label="付款方" v-model="form.payer" placeholder="请输入付款方" input-align="right" label-width="auto"/>-->
         <van-field
           readonly
           clickable
-          label="付款方"
-          placeholder="请选择付款方"
+          label="出票方"
+          placeholder="请选择出票方"
           v-model="form.payer"
           @click="showpayer = true"
           input-align="right"
           right-icon="arrow-down"
           label-width="auto"
           required
-          :rules="[{ required: true , message:'请选择付款方' }]"
+          :rules="[{ required: true , message:'请选择出票方' }]"
         />
         <van-popup v-model="showpayer" position="bottom">
           <van-picker
@@ -157,68 +149,76 @@
             @cancel="showpayer = false"
           />
         </van-popup>
-        <van-field :rules="[{ required: true , message:'请输入付款方账户' }]" required label="付款方账户" v-model="form.payerAccount" placeholder="请输入账户" input-align="right" label-width="auto"/>
-      </div>
+        <van-field :rules="[{ required: true , message:'请输入汇票号码' }]" required label="汇票号码" v-model="form.payerAccount" placeholder="请输入汇票号码" input-align="right" label-width="auto"/>
+        <van-field
+          readonly
+          label="出票金额（元）"
+          v-model="form.expenditureAmount"
+          placeholder=""
+          input-align="right"
+          label-width="auto"
+          required
+          :rules="[{ required: true , message:'出票金额不能为空！' }]"
+        />
+        <van-field
+          readonly
+          label="汇票类型"
+          v-model="orderTypeName"
+          placeholder=""
+          input-align="right"
+          label-width="auto"
+          required
+          :rules="[{ required: true , message:'汇票类型不能为空！' }]"
+        />
 
-      <p class="main_title">收款方信息<van-button icon="plus" @click="addChargeItme(chargeItme.length)" size="mini" type="info" native-type="button" class="addFamily"/></p>
-      <div class="main_box" style="margin-bottom: 15px;">
-        <van-cell title="收款账户类型">
-          <template #right-icon>
-            <van-radio-group direction="horizontal" v-model="form.accountType" @change="accountTypeChange">
-              <van-radio name="1">公户</van-radio>
-              <van-radio name="2">私户</van-radio>
-            </van-radio-group>
-          </template>
-        </van-cell>
+        <van-field
+          readonly
+          label="汇票类型"
+          v-model="form.orderType"
+          placeholder=""
+          input-align="right"
+          label-width="auto"
+          style="display: none"
+          required
+          :rules="[{ required: true , message:'汇票类型不能为空！' }]"
+        />
+        <van-field
+          readonly
+          label="开票日"
+          v-model="form.startTime"
+          placeholder=""
+          input-align="right"
+          label-width="auto"
+          required
+          :rules="[{ required: true , message:'开票日不能为空！' }]"
+        />
+        <van-field
+          readonly
+          label="到期日"
+          v-model="form.endTime"
+          placeholder=""
+          input-align="right"
+          label-width="auto"
+          required
+          :rules="[{ required: true , message:'到期日不能为空！' }]"
+        />
       </div>
+
+      <p class="main_title">收票方信息<van-button icon="plus" @click="addChargeItme(chargeItme.length)" size="mini" type="info" native-type="button" class="addFamily"/></p>
       <div :style="{position:'relative',padding: index == 0 ? '':'10px 0 0 0'}" v-for="(item, index) in chargeItme" :key="index">
         <van-button icon="minus" size="mini" type="danger" class="deleteFamily" native-type="button" v-if="index!=0" @click="deleteChargeItme(index)" />
         <div class="main_box" style="margin-bottom: 10px;position:relative;">
-          <van-field
-            readonly
-            clickable
-            label="收款方"
-            placeholder="请选择"
-            v-model="item.payee"
-            @click="item.showPayee = true"
-            input-align="right"
-            right-icon="arrow-down"
-            required
-            :rules="[{ required: true , message:'请选择收款方' }]"
-          />
-          <van-popup v-model="item.showPayee" position="bottom">
-            <van-picker
-              show-toolbar
-              :columns="payeeList"
-              @confirm="onConfirmPayee($event,index)"
-              @cancel="item.showPayee = false"
-            />
-          </van-popup>
-          <van-field required :rules="[{ required: true , message:'请输入账户' }]" v-model="item.payeeAccount" label="收款账户" placeholder="请输入账户" input-align="right" label-width="auto"/>
-          <van-field required :rules="[{ required: true , message:'请输入银行' }]" v-model="item.bankDeposit" label="开户银行" placeholder="请输入银行" input-align="right" label-width="auto"/>
-          <van-field required :rules="[{ required: true , message:'请输入金额' }]" v-model="item.incomeAmount" label="收入金额" placeholder="请输入金额" input-align="right" label-width="auto" @change="moneyChange"/>
-          <van-field
-            readonly
-            clickable
-            label="所属银行"
-            placeholder="请选择"
-            v-model="item.bankTypeText"
-            @click="item.showbankType = true"
-            input-align="right"
-            right-icon="arrow-down"
-            required
-            :rules="[{ required: true , message:'请选择所属银行' }]"
-          />
-          <van-popup v-model="item.showbankType" position="bottom">
-            <van-picker
-              show-toolbar
-              :columns="bankTypeDictionaries"
-              @confirm="onConfirmBankType($event,index)"
-              @cancel="item.showbankType = false"
-            />
-          </van-popup>
+          <van-field required :rules="[{ required: true , message:'收款方不能为空' }]" v-model="item.payee" label="收款方" placeholder="请输入收款方全称" input-align="right" label-width="auto"/>
+          <van-field required :rules="[{ required: true , message:'联系方式不能为空' }]" v-model="item.phone" label="联系方式" placeholder="请输入联系方式" input-align="right" label-width="auto"/>
+          <van-field required :rules="[{ required: true , message:'所属单位补鞥你为空' }]" v-model="item.unit" label="所属单位" placeholder="请输入所属单位" input-align="right" label-width="auto"/>
+          <van-field required :rules="[{ required: true , message:'负责人全称不能为空' }]" v-model="item.leader"  label="负责人全称" placeholder="请输入负责人全称" input-align="right" label-width="auto"/>
+          <van-field required :rules="[{ required: true , message:'资金用途不能为空' }]" v-model="item.remark" label="资金用途" placeholder="请输入资金用途" input-align="right" label-width="auto"/>
         </div>
       </div>
+      <p class="main_title">上传附件</p>
+      <div class="main_box" style="padding: 5px 0 0 8px;">
+        <van-uploader v-model="fileList" :after-read="beforeRead" ></van-uploader>
+      </div>
       <div style="padding: 16px 0;">
         <van-row>
           <van-col span="12" align="center">
@@ -238,6 +238,13 @@
 
 <script>
   import { addTransfer , listPayee , updateTransfer , getProjectto , listProject , addProjectto , customSubmit , getAccount ,getQmyeFlow} from "@/api/onlineHome/bankAgriculture/paymentApproval";
+  import request from '@/utils/request'
+  import {
+    addCash,
+    addCashdetail, attachmentList, commonAttach,
+    listMoneyorder,
+    updateCash
+  } from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
   export default {
     name: "approvalAdd12",
     data() {
@@ -252,11 +259,11 @@
 
         buttonType:'a',
 
-        minDate: new Date(),
+        minDate: new Date(2000, 10, 1),
         maxDate: new Date(2050, 10, 1),
         currentDate: new Date(),
         form:{},
-
+        fileList:[],
         capitalExpenditureType:'',
         payee:'',
         bankType:'',
@@ -293,7 +300,9 @@
           outId:null,
           ynType:'1'
         },
-        projectFundType:''
+        projectFundType:'',
+        orderTypeName:'',
+        orderTypeOptions:[]
       };
     },
     created() {
@@ -314,20 +323,25 @@
         }
         this.projectFundTypeDictionaries = response.data;
       });
+      this.getDicts("order_type").then(response => {
+        this.orderTypeOptions = response.data;
+      });
       let params1={
-        accountType: "102",
-        status: "N",
+        pageNum: 1,
+        pageSize: 1000,
       }
-      getAccount(params1).then((response) => {
+      listMoneyorder(params1).then((response) => {
+        console.log(response)
         this.payerOptions = response.rows;
         response.rows.map((res,index) => {
-          res['payerFrom'] = '1'
+          res['payerFrom'] = '12'
           console.log(res)
-          this.payerOptions[index].text = res.accountName;
+          this.payerOptions[index].text = res.billReceiveUnit;
           this.payerOptions[index].value = res.id;
         })
       });
       this.getDictionaries();
+      this.getFileList();
     },
     methods: {
       // 表单重置
@@ -338,7 +352,7 @@
           downId: null,
           orderId: null,
           cashierId: null,
-          transferType: '1',
+          cashType: '12',
           accountType: '2',
           explainSituation: null,
           succeedAmount: null,
@@ -364,7 +378,7 @@
           projectBillNum:null,
           projectFundType:'1',
           outId:null,
-          ynType:'1'
+          ynType:'3'
         }
       },
       getChange(){
@@ -379,15 +393,10 @@
       },
       getDictionaries(){
         this.getDicts("capital_expenditure_type").then((res) => {
-          for (var i = 0; i < res.data.length; i++) {
+          for (let i = 0; i < res.data.length; i++) {
             this.capitalExpenditureTypeOptions.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
           }
         });
-        this.getDicts("bank_type").then(res => {
-          for (var i = 0; i < res.data.length; i++) {
-            this.bankTypeDictionaries.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
-          }
-        });
         this.getPayeeList();
       },
       getError(e){
@@ -398,18 +407,6 @@
         if(this.chargeItme.length>0&&this.chargeItme[this.chargeItme.length-1].payee == ''){
           this.$notify({ type: 'danger', message: '请勿添加多个空列表信息' });
           return;
-        }else if(this.chargeItme.length>0&&this.chargeItme[index-1].incomeAmount == ''){
-          this.$notify({ type: 'danger', message: '请输入收入金额！' });
-          return;
-        }else if(this.chargeItme.length>0&&this.chargeItme[index-1].payeeAccount == ''){
-          this.$notify({ type: 'danger', message: '请输入收款账户！' });
-          return;
-        }else if(this.chargeItme.length>0&&this.chargeItme[index-1].bankDeposit == ''){
-          this.$notify({ type: 'danger', message: '请输入开户银行！' });
-          return;
-        }else if(this.chargeItme.length>0&&this.chargeItme[index-1].bankType == ''){
-          this.$notify({ type: 'danger', message: '请选择所属银行！' });
-          return;
         }
         this.getDicts("bank_type").then(res => {
           this.chargeItme.splice(index + 1, 0, {
@@ -418,8 +415,8 @@
             payeeAccount: "", //收款账户
             bankDeposit: "", //开户银行
             incomeAmount: "", //收入金额
-            bankType: "1", //所属银行
-            bankTypeText:this.selectDictLabel(res.data, 1), //所属银行
+            bankType: "", //所属银行
+            bankTypeText:"", //所属银行
             showPayee:false,
             showbankType:false
           });
@@ -438,7 +435,7 @@
         });
       },
       payeeDictLabel(datas, value) {
-        var actions = [];
+        let actions = [];
         Object.keys(datas).some((key) => {
           if (datas[key].payeeId == ('' + value)) {
             actions.push(datas[key].payee);
@@ -492,11 +489,50 @@
         this.chargeItme[index].bankType = data.value;
         this.chargeItme[index].showbankType = false;
       },
-      onConfirmPayer(data){
-        this.form.payer = data.text;
-        this.form.cashierId = data.value;
+      onConfirmPayer(select){
         this.showpayer = false;
-        this.selectChange(data.value)
+        console.log(this.form,select)
+        if(this.form.applyDate==""||this.form.applyDate==null){
+          this.$set(this.form, "payer", "")
+          this.$notify({ type: 'danger', message: "请先选择申请时间！"});
+          this.orderTypeName = ''
+        }else{
+          if(this.form.applyDate>select.endTime){
+            this.$notify({ type: 'danger', message: "当前申请时间大于汇票的到期日为"+select.endTime+"，无法使用！"});
+            this.$set(this.form, "payer", "")
+            this.form.payerAccount = ""
+            this.form.startTime = ""
+            this.form.endTime = ""
+            this.form.orderType = ""
+            this.form.expenditureAmount = ""
+            this.$set(this.form, "cashierId", "")
+            this.orderTypeName = ''
+          }else if(this.form.applyDate<select.startTime){
+            this.$notify({ type: 'danger', message: "当前申请时间小于汇票的开票日为"+select.startTime+"，无法使用！" });
+            this.$set(this.form, "payer", "")
+            this.form.payerAccount = ""
+            this.form.startTime = ""
+            this.form.endTime = ""
+            this.form.orderType = ""
+            this.form.expenditureAmount = ""
+            this.$set(this.form, "cashierId", "")
+            this.orderTypeName = ''
+          }else{
+            this.form.payerAccount = select.orderNum
+            this.form.startTime = select.startTime
+            this.form.endTime = select.endTime
+            this.form.orderType = select.orderType
+            this.form.expenditureAmount = select.orderAmount
+            this.$set(this.form, "cashierId", select.id)
+            this.$set(this.form, "payer", select.billReceiveUnit)
+            this.orderTypeOptions.map(res => {
+              console.log(this.orderTypeOptions)
+              if(res.dictValue==this.form.orderType){
+                this.orderTypeName = res.dictLabel
+              }
+            })
+          }
+        }
       },
       onConfirmLasj(data){
         this.form.applyDate = this.getNowFormatDate(data).substr(0,10);
@@ -551,26 +587,31 @@
         this.$set(this.form, "bankTypeList", this.chargeItme);
         this.$set(this.form, "accountTypeList", this.chargeItme);
         this.$set(this.form, "transferStatusList", this.chargeItme);
-        addTransfer(this.form).then(response => {
-          this.projectForm.outId = response.data.id
-          this.$set(this.projectForm, "ynType", '1');
-          if(this.form.capitalExpenditureType==2){
-            addProjectto(this.projectForm).then(res => {
-              customSubmit(response.data.id).then(res => {
-                this.$toast.success('提交成功');
-                setTimeout(function(){
-                  history.go(-1)
-                },2000)
-              })
-            })
-          }else{
-            customSubmit(response.data.id).then(res => {
-              this.$toast.success('提交成功');
-              setTimeout(function(){
-                history.go(-1)
-              },2000)
+        addCash(this.form).then((response) => {
+          this.chargeItme.map(res => {
+            res.cashId = response.data.id
+            addCashdetail(res).then(r => {
+              if(this.form.capitalExpenditureType==2){
+                this.projectForm.outId = response.data.id
+                this.$set(this.projectForm, "ynType", '3');
+                addProjectto(this.projectForm).then(res => {
+                  customSubmit(response.data.id).then(res => {
+                    this.$toast.success('提交成功');
+                    setTimeout(function(){
+                      history.go(-1)
+                    },2000)
+                  })
+                })
+              }else{
+                customSubmit(response.data.id).then(res => {
+                  this.$toast.success('提交成功');
+                  setTimeout(function(){
+                    history.go(-1)
+                  },2000)
+                })
+              }
             })
-          }
+          })
         });
       },
       goUpdate(){
@@ -592,27 +633,27 @@
             return;
           }
         }
-        this.$set(this.form, "payeeList", this.chargeItme);
-        this.$set(this.form, "bankTypeList", this.chargeItme);
-        this.$set(this.form, "accountTypeList", this.chargeItme);
-        this.$set(this.form, "transferStatusList", this.chargeItme);
-        this.projectForm.outId = this.form.id
-        addTransfer(this.form).then((response) => {
-          this.projectForm.outId = response.data.id
-          this.$set(this.projectForm, "ynType", '1');
-          if(this.form.capitalExpenditureType==2){
-            addProjectto(this.projectForm).then(res => {
-              this.$toast.success('保存成功');
-              setTimeout(function(){
-                history.go(-1)
-              },2000)
+        addCash(this.form).then((response) => {
+          this.chargeItme.map(res => {
+            res.cashId = response.data.id
+            addCashdetail(res).then(r => {
+              if(this.form.capitalExpenditureType==2){
+                this.projectForm.outId = response.data.id
+                this.$set(this.projectForm, "ynType", '3');
+                addProjectto(this.projectForm).then(res => {
+                  this.$toast.success('保存成功');
+                  setTimeout(function(){
+                    history.go(-1)
+                  },2000)
+                })
+              }else{
+                this.$toast.success('保存成功');
+                setTimeout(function(){
+                  history.go(-1)
+                },2000)
+              }
             })
-          }else{
-            this.$toast.success('保存成功');
-            setTimeout(function(){
-              history.go(-1)
-            },2000)
-          }
+          })
         });
       },
       payeeSelectChange(select, i) {
@@ -713,6 +754,37 @@
           }
         }
       },
+      beforeRead(file) {
+        console.log(file)
+        console.log(this.fileList)
+        const params = new FormData();
+        params.append("tableId", this.$route.query.id);
+        params.append("tableName", "t_yinnong_transfer");
+        params.append("bizPath", "upload");
+        params.append("fileType", "0");
+        params.append("file", file.file);
+        commonAttach(params).then((response) => {
+          console.log(response)
+        })
+      },
+      getFileList(){
+        let oData= {
+          tableId: this.$route.query.id,
+          tableName: "t_yinnong_transfer",
+          bizPath: "upload",
+          fileType: "0",
+        }
+        attachmentList(oData).then(res => {
+          console.log(res)
+          console.log(location.protocol+"//"+location.host+request.defaults.baseURL)
+          res.rows.map(r => {
+
+            let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
+            this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{})})
+            console.log(r)
+          })
+        })
+      },
       goBack(){
         window.history.go(-1)
       },
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd2.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd2.vue
index af8eac1f..cc40afbf 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd2.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd2.vue
@@ -7,7 +7,7 @@
       @click-left="$router.back(-1)"
     >
       <template #title>
-        <p style="font-weight: bold;">添加付款申请</p>
+        <p style="font-weight: bold;">添加信用卡转账申请</p>
       </template>
     </van-nav-bar>
     <van-form @submit="getChange" @failed="getError" :show-error-message="false" scroll-to-error validate-first>
@@ -194,31 +194,26 @@
               @cancel="item.showPayee = false"
             />
           </van-popup>
-          <van-field required :rules="[{ required: true , message:'请输入账户' }]" v-model="item.payeeAccount" label="收款账户" placeholder="请输入账户" input-align="right" label-width="auto"/>
-          <van-field required :rules="[{ required: true , message:'请输入银行' }]" v-model="item.bankDeposit" label="开户银行" placeholder="请输入银行" input-align="right" label-width="auto"/>
-          <van-field required :rules="[{ required: true , message:'请输入金额' }]" v-model="item.incomeAmount" label="收入金额" placeholder="请输入金额" input-align="right" label-width="auto" @change="moneyChange"/>
+          <van-field required :rules="[{ required: true , message:'收款账户不能为空' }]" v-model="item.payeeAccount" label="收款账户" placeholder="请选择收款方" input-align="right" label-width="auto"/>
+          <van-field required :rules="[{ required: true , message:'开户银行不能为空' }]" v-model="item.bankDeposit" label="开户银行" placeholder="请选择收款方" input-align="right" label-width="auto"/>
+          <van-field required :rules="[{ required: true , message:'请输入金额' }]" v-model="item.incomeAmount" type="number"  label="收入金额" placeholder="请输入金额" input-align="right" label-width="auto" @change="moneyChange"/>
           <van-field
             readonly
             clickable
             label="所属银行"
-            placeholder="请选择"
+            placeholder="请选择收款方"
             v-model="item.bankTypeText"
             @click="item.showbankType = true"
             input-align="right"
-            right-icon="arrow-down"
             required
-            :rules="[{ required: true , message:'请选择所属银行' }]"
+            :rules="[{ required: true , message:'所属银行不能为空' }]"
           />
-          <van-popup v-model="item.showbankType" position="bottom">
-            <van-picker
-              show-toolbar
-              :columns="bankTypeDictionaries"
-              @confirm="onConfirmBankType($event,index)"
-              @cancel="item.showbankType = false"
-            />
-          </van-popup>
         </div>
       </div>
+      <p class="main_title">上传附件</p>
+      <div class="main_box" style="padding: 5px 0 0 8px;">
+        <van-uploader v-model="fileList" :after-read="beforeRead" @delete="deleteFile"></van-uploader>
+      </div>
       <div style="padding: 16px 0;">
         <van-row>
           <van-col span="12" align="center">
@@ -238,6 +233,9 @@
 
 <script>
   import { addTransfer , listPayee , updateTransfer , getProjectto , listProject , addProjectto , customSubmit , getAccount ,getQmyeFlow} from "@/api/onlineHome/bankAgriculture/paymentApproval";
+  import request from '@/utils/request'
+  import {attachmentList, commonAttach} from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
+  import Dialog from "vant/lib/dialog";
   export default {
     name: "approvalAdd2",
     data() {
@@ -256,7 +254,7 @@
         maxDate: new Date(2050, 10, 1),
         currentDate: new Date(),
         form:{},
-
+        fileList:[],
         capitalExpenditureType:'',
         payee:'',
         bankType:'',
@@ -293,7 +291,8 @@
           outId:null,
           ynType:'1'
         },
-        projectFundType:''
+        projectFundType:'',
+        uploadFiles:[],
       };
     },
     created() {
@@ -322,7 +321,6 @@
         this.payerOptions = response.rows;
         response.rows.map((res,index) => {
           res['payerFrom'] = '1'
-          console.log(res)
           this.payerOptions[index].text = res.accountName;
           this.payerOptions[index].value = res.id;
         })
@@ -338,7 +336,7 @@
           downId: null,
           orderId: null,
           cashierId: null,
-          transferType: '1',
+          transferType: '2',
           accountType: '2',
           explainSituation: null,
           succeedAmount: null,
@@ -368,12 +366,9 @@
         }
       },
       getChange(){
-        console.log(this.buttonType)
         if(this.buttonType == 'update'){
-          console.log('update')
           this.goUpdate();
         }else if(this.buttonType == 'add'){
-          console.log('add')
           this.goAdd();
         }
       },
@@ -391,7 +386,6 @@
         this.getPayeeList();
       },
       getError(e){
-        console.log(e)
         this.$notify({ type: 'danger', message: e.errors[0].message });
       },
       addChargeItme(index){
@@ -418,27 +412,30 @@
             payeeAccount: "", //收款账户
             bankDeposit: "", //开户银行
             incomeAmount: "", //收入金额
-            bankType: "1", //所属银行
-            bankTypeText:this.selectDictLabel(res.data, 1), //所属银行
+            bankType: "", //所属银行
+            bankTypeText:"", //所属银行
             showPayee:false,
             showbankType:false
           });
         });
       },
       getPayeeList() {
-        //普通转账
+        //信用卡转账
         this.queryParams.accountType = this.form.accountType
         this.queryParams.status = "0"
+        console.log(this.queryParams)
         listPayee(this.queryParams).then((response) => {
-          this.payeeList = response.rows;
           response.rows.map((res,index) => {
-            this.payeeList[index].text = res.payee;
-            this.payeeList[index].value = res.id;
+            if(res.payeeType==4){
+              res.text = res.payee
+              res.value = res.id
+              this.payeeList.push(res)
+            }
           })
         });
       },
       payeeDictLabel(datas, value) {
-        var actions = [];
+        let actions = [];
         Object.keys(datas).some((key) => {
           if (datas[key].payeeId == ('' + value)) {
             actions.push(datas[key].payee);
@@ -459,7 +456,6 @@
         this.showcapital = false;
       },
       onConfirmFundType(data){
-        console.log(data)
         this.projectForm.projectFundType = data.value;
         this.projectFundType = data.text;
         this.showFundType = false;
@@ -476,21 +472,24 @@
         this.showproject = false;
       },
       onConfirmPayee(data,index){
-        for (var i = 0 ; i < this.chargeItme.length ; i++){
+        for (let i = 0 ; i < this.chargeItme.length ; i++){
           this.chargeItme[i].showPayee = false;
         }
         this.chargeItme[index].payee = data.text;
         this.chargeItme[index].payeeId = data.value;
         this.chargeItme[index].showpayee = false;
         this.payeeSelectChange(data.value , index)
+        this.onConfirmBankType(data,index)
       },
       onConfirmBankType(data,index){
-        for (var i = 0 ; i < this.chargeItme.length ; i++){
-          this.chargeItme[i].showbankType = false;
-        }
-        this.chargeItme[index].bankTypeText = data.text;
-        this.chargeItme[index].bankType = data.value;
-        this.chargeItme[index].showbankType = false;
+        console.log(this.bankTypeDictionaries)
+        this.bankTypeDictionaries.map(res => {
+          if(res.value==data.bankType){
+            this.chargeItme[index].bankTypeText = res.text;
+            this.chargeItme[index].bankType = res.value;
+          }
+        })
+
       },
       onConfirmPayer(data){
         this.form.payer = data.text;
@@ -504,19 +503,21 @@
       },
       accountTypeChange(e){
         this.payeeList = [];
+        this.chargeItme = [];
         this.queryParams.accountType = this.form.accountType
         this.queryParams.status = "0"
         listPayee(this.queryParams).then((response) => {
-          this.payeeList = response.rows;
           response.rows.map((res,index) => {
-            this.payeeList[index].text = res.payee;
-            this.payeeList[index].value = res.id;
+            if(res.payeeType==4){
+              res.text = res.payee
+              res.value = res.id
+              this.payeeList.push(res)
+            }
           })
         });
       },
       // 钱计算
       moneyChange(input) {
-        console.log(input)
         let obj = {};
         obj = this.chargeItme.find((account) => {
           //model就是上面的数据源
@@ -547,31 +548,130 @@
             return;
           }
         }
-        this.$set(this.form, "payeeList", this.chargeItme);
-        this.$set(this.form, "bankTypeList", this.chargeItme);
-        this.$set(this.form, "accountTypeList", this.chargeItme);
-        this.$set(this.form, "transferStatusList", this.chargeItme);
-        addTransfer(this.form).then(response => {
-          this.projectForm.outId = response.data.id
-          this.$set(this.projectForm, "ynType", '1');
-          if(this.form.capitalExpenditureType==2){
-            addProjectto(this.projectForm).then(res => {
-              customSubmit(response.data.id).then(res => {
-                this.$toast.success('提交成功');
-                setTimeout(function(){
-                  history.go(-1)
-                },2000)
-              })
-            })
-          }else{
-            customSubmit(response.data.id).then(res => {
-              this.$toast.success('提交成功');
-              setTimeout(function(){
-                history.go(-1)
-              },2000)
+        if(this.uploadFiles==null||this.uploadFiles.length==0){
+          Dialog.confirm({
+            title: '提示',
+            message: '此申请单中未上传任何附件，是否确认提交？',
+          })
+            .then(() => {
+              this.$set(this.form, "payeeList", this.chargeItme);
+              this.$set(this.form, "bankTypeList", this.chargeItme);
+              this.$set(this.form, "accountTypeList", this.chargeItme);
+              this.$set(this.form, "transferStatusList", this.chargeItme);
+              addTransfer(this.form).then(response => {
+                this.projectForm.outId = response.data.id
+                this.$set(this.projectForm, "ynType", '1');
+                if(this.uploadFiles!=null&&this.uploadFiles.length>0){
+                  this.uploadFiles.map(rr => {
+                    const params = new FormData();
+                    params.append("tableId", response.data.id);
+                    params.append("tableName", "t_yinnong_transfer");
+                    params.append("bizPath", "upload");
+                    params.append("fileType", "0");
+                    params.append("file", rr);
+                    commonAttach(params).then((r) => {
+                    })
+                  })
+                  if(this.form.capitalExpenditureType==2){
+                    addProjectto(this.projectForm).then(res => {
+                      customSubmit(response.data.id).then(res => {
+                        this.$toast.success('提交成功');
+                        setTimeout(function(){
+                          history.go(-1)
+                        },2000)
+                      })
+                    })
+                  }else{
+                    customSubmit(response.data.id).then(res => {
+                      this.$toast.success('提交成功');
+                      setTimeout(function(){
+                        history.go(-1)
+                      },2000)
+                    })
+                  }
+                }else{
+                  if(this.form.capitalExpenditureType==2){
+                    addProjectto(this.projectForm).then(res => {
+                      customSubmit(response.data.id).then(res => {
+                        this.$toast.success('提交成功');
+                        setTimeout(function(){
+                          history.go(-1)
+                        },2000)
+                      })
+                    })
+                  }else{
+                    customSubmit(response.data.id).then(res => {
+                      this.$toast.success('提交成功');
+                      setTimeout(function(){
+                        history.go(-1)
+                      },2000)
+                    })
+                  }
+                }
+              });
             })
-          }
-        });
+            .catch(() => {
+              return false;
+            });
+        }else{
+          this.$set(this.form, "payeeList", this.chargeItme);
+          this.$set(this.form, "bankTypeList", this.chargeItme);
+          this.$set(this.form, "accountTypeList", this.chargeItme);
+          this.$set(this.form, "transferStatusList", this.chargeItme);
+          addTransfer(this.form).then(response => {
+            this.projectForm.outId = response.data.id
+            this.$set(this.projectForm, "ynType", '1');
+            if(this.uploadFiles!=null&&this.uploadFiles.length>0){
+              this.uploadFiles.map(rr => {
+                const params = new FormData();
+                params.append("tableId", response.data.id);
+                params.append("tableName", "t_yinnong_transfer");
+                params.append("bizPath", "upload");
+                params.append("fileType", "0");
+                params.append("file", rr);
+                commonAttach(params).then((r) => {
+                })
+              })
+              if(this.form.capitalExpenditureType==2){
+                addProjectto(this.projectForm).then(res => {
+                  customSubmit(response.data.id).then(res => {
+                    this.$toast.success('提交成功');
+                    setTimeout(function(){
+                      history.go(-1)
+                    },2000)
+                  })
+                })
+              }else{
+                customSubmit(response.data.id).then(res => {
+                  this.$toast.success('提交成功');
+                  setTimeout(function(){
+                    history.go(-1)
+                  },2000)
+                })
+              }
+            }else{
+              if(this.form.capitalExpenditureType==2){
+                addProjectto(this.projectForm).then(res => {
+                  customSubmit(response.data.id).then(res => {
+                    this.$toast.success('提交成功');
+                    setTimeout(function(){
+                      history.go(-1)
+                    },2000)
+                  })
+                })
+              }else{
+                customSubmit(response.data.id).then(res => {
+                  this.$toast.success('提交成功');
+                  setTimeout(function(){
+                    history.go(-1)
+                  },2000)
+                })
+              }
+            }
+          });
+        }
+
+
       },
       goUpdate(){
         if(this.chargeItme.length<1){
@@ -596,28 +696,59 @@
         this.$set(this.form, "bankTypeList", this.chargeItme);
         this.$set(this.form, "accountTypeList", this.chargeItme);
         this.$set(this.form, "transferStatusList", this.chargeItme);
-        this.projectForm.outId = this.form.id
+        console.log(this.form)
         addTransfer(this.form).then((response) => {
           this.projectForm.outId = response.data.id
           this.$set(this.projectForm, "ynType", '1');
-          if(this.form.capitalExpenditureType==2){
-            addProjectto(this.projectForm).then(res => {
+          if(this.uploadFiles!=null&&this.uploadFiles.length>0){
+            console.log(this.uploadFiles)
+            this.uploadFiles.map(rr => {
+              const params = new FormData();
+              params.append("tableId", response.data.id);
+              params.append("tableName", "t_yinnong_transfer");
+              params.append("bizPath", "upload");
+              params.append("fileType", "0");
+              params.append("file", rr);
+              commonAttach(params).then((r) => {
+              })
+            })
+            if(this.form.capitalExpenditureType==2){
+              addProjectto(this.projectForm).then(res => {
+                this.$toast.success('保存成功');
+                setTimeout(function(){
+                  history.go(-1)
+                },2000)
+              })
+            }else{
               this.$toast.success('保存成功');
               setTimeout(function(){
                 history.go(-1)
               },2000)
-            })
+            }
           }else{
-            this.$toast.success('保存成功');
-            setTimeout(function(){
-              history.go(-1)
-            },2000)
+            if(this.form.capitalExpenditureType==2){
+              addProjectto(this.projectForm).then(res => {
+                this.$toast.success('保存成功');
+                setTimeout(function(){
+                  history.go(-1)
+                },2000)
+              })
+            }else{
+              this.$toast.success('保存成功');
+              setTimeout(function(){
+                history.go(-1)
+              },2000)
+            }
           }
+
         });
       },
       payeeSelectChange(select, i) {
         let obj = {};
         let fuzhitype = 0;
+        console.log(this.payeeList)
+        console.log(select,i)
+        console.log(this.chargeItme)
         obj = this.payeeList.find((account) => {
           //model就是上面的数据源
           return account.id === select ; //筛选出匹配数据
@@ -713,6 +844,33 @@
           }
         }
       },
+      beforeRead(file) {
+        this.uploadFiles.push(file.file);
+      },
+      deleteFile(file){
+        this.uploadFiles.map((response,index) => {
+          if(file.file == response){
+            this.uploadFiles.splice(index,1)
+          }
+        })
+      },
+      getFileList(){
+        let oData= {
+          tableId: this.$route.query.id,
+          tableName: "t_yinnong_transfer",
+          bizPath: "upload",
+          fileType: "0",
+        }
+        attachmentList(oData).then(res => {
+          console.log(res)
+          console.log(location.protocol+"//"+location.host+request.defaults.baseURL)
+          res.rows.map(r => {
+            let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
+            this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{})})
+            console.log(r)
+          })
+        })
+      },
       goBack(){
         window.history.go(-1)
       },
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd3.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd3.vue
index 85eb9433..2c60c066 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd3.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd3.vue
@@ -7,7 +7,7 @@
       @click-left="$router.back(-1)"
     >
       <template #title>
-        <p style="font-weight: bold;">添加付款申请</p>
+        <p style="font-weight: bold;">添加虚拟挂账申请</p>
       </template>
     </van-nav-bar>
     <van-form @submit="getChange" @failed="getError" :show-error-message="false" scroll-to-error validate-first>
@@ -194,31 +194,25 @@
               @cancel="item.showPayee = false"
             />
           </van-popup>
-          <van-field required :rules="[{ required: true , message:'请输入账户' }]" v-model="item.payeeAccount" label="收款账户" placeholder="请输入账户" input-align="right" label-width="auto"/>
-          <van-field required :rules="[{ required: true , message:'请输入银行' }]" v-model="item.bankDeposit" label="开户银行" placeholder="请输入银行" input-align="right" label-width="auto"/>
-          <van-field required :rules="[{ required: true , message:'请输入金额' }]" v-model="item.incomeAmount" label="收入金额" placeholder="请输入金额" input-align="right" label-width="auto" @change="moneyChange"/>
+          <van-field required :rules="[{ required: true , message:'收款账户不能为空' }]" v-model="item.payeeAccount" label="收款账户" placeholder="请选择收款方" input-align="right" label-width="auto"/>
+          <van-field required :rules="[{ required: true , message:'开户银行不能为空' }]" v-model="item.bankDeposit" label="开户银行" placeholder="请选择收款方" input-align="right" label-width="auto"/>
+          <van-field required :rules="[{ required: true , message:'请输入金额' }]" v-model="item.incomeAmount" type="number"  label="收入金额" placeholder="请输入金额" input-align="right" label-width="auto" @change="moneyChange"/>
           <van-field
             readonly
-            clickable
             label="所属银行"
-            placeholder="请选择"
+            placeholder="请选择收款方"
             v-model="item.bankTypeText"
             @click="item.showbankType = true"
             input-align="right"
-            right-icon="arrow-down"
             required
             :rules="[{ required: true , message:'请选择所属银行' }]"
           />
-          <van-popup v-model="item.showbankType" position="bottom">
-            <van-picker
-              show-toolbar
-              :columns="bankTypeDictionaries"
-              @confirm="onConfirmBankType($event,index)"
-              @cancel="item.showbankType = false"
-            />
-          </van-popup>
         </div>
       </div>
+      <p class="main_title">上传附件</p>
+      <div class="main_box" style="padding: 5px 0 0 8px;">
+        <van-uploader v-model="fileList" :after-read="beforeRead" @delete="deleteFile"></van-uploader>
+      </div>
       <div style="padding: 16px 0;">
         <van-row>
           <van-col span="12" align="center">
@@ -238,6 +232,14 @@
 
 <script>
   import { addTransfer , listPayee , updateTransfer , getProjectto , listProject , addProjectto , customSubmit , getAccount ,getQmyeFlow} from "@/api/onlineHome/bankAgriculture/paymentApproval";
+  import request from '@/utils/request'
+  import {
+    attachmentList,
+    commonAttach,
+    listTaccount,
+    listVaccount
+  } from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
+  import Dialog from "vant/lib/dialog";
   export default {
     name: "approvalAdd3",
     data() {
@@ -256,7 +258,7 @@
         maxDate: new Date(2050, 10, 1),
         currentDate: new Date(),
         form:{},
-
+        fileList:[],
         capitalExpenditureType:'',
         payee:'',
         bankType:'',
@@ -291,9 +293,10 @@
           projectBillNum:null,
           projectFundType:'1',
           outId:null,
-          ynType:'1'
+          ynType:'2'
         },
-        projectFundType:''
+        projectFundType:'',
+        uploadFiles:[],
       };
     },
     created() {
@@ -315,16 +318,17 @@
         this.projectFundTypeDictionaries = response.data;
       });
       let params1={
-        accountType: "102",
-        status: "N",
+        townAccountType:'3'
       }
-      getAccount(params1).then((response) => {
-        this.payerOptions = response.rows;
+      listTaccount(params1).then((response) => {
+        console.log(response)
         response.rows.map((res,index) => {
-          res['payerFrom'] = '1'
-          console.log(res)
-          this.payerOptions[index].text = res.accountName;
-          this.payerOptions[index].value = res.id;
+          if(res.townAccountType=='3'){
+            res['payerFrom'] = '3'
+            this.payerOptions.push(res);
+            this.payerOptions[index].text = res.payee;
+            this.payerOptions[index].value = res.id;
+          }
         })
       });
       this.getDictionaries();
@@ -338,7 +342,7 @@
           downId: null,
           orderId: null,
           cashierId: null,
-          transferType: '1',
+          transferType: '3',
           accountType: '2',
           explainSituation: null,
           succeedAmount: null,
@@ -418,23 +422,29 @@
             payeeAccount: "", //收款账户
             bankDeposit: "", //开户银行
             incomeAmount: "", //收入金额
-            bankType: "1", //所属银行
-            bankTypeText:this.selectDictLabel(res.data, 1), //所属银行
+            bankType: "", //所属银行
+            bankTypeText: "", //所属银行
             showPayee:false,
             showbankType:false
           });
         });
       },
       getPayeeList() {
-        //普通转账
-        this.queryParams.accountType = this.form.accountType
-        this.queryParams.status = "0"
-        listPayee(this.queryParams).then((response) => {
-          this.payeeList = response.rows;
-          response.rows.map((res,index) => {
-            this.payeeList[index].text = res.payee;
-            this.payeeList[index].value = res.id;
-          })
+        let params = {
+          villageAccountType : 1,
+          status:'0',
+          accountType : this.form.accountType
+        }
+        console.log(params)
+        listVaccount(params).then(response => {
+          console.log(response)
+          if(response.rows.length>0){
+            this.payeeList = response.rows;
+            response.rows.map((res,index) => {
+              this.payeeList[index].text = res.payee;
+              this.payeeList[index].value = res.id;
+            })
+          }
         });
       },
       payeeDictLabel(datas, value) {
@@ -476,42 +486,53 @@
         this.showproject = false;
       },
       onConfirmPayee(data,index){
-        for (var i = 0 ; i < this.chargeItme.length ; i++){
+        console.log(data,index)
+        for (let i = 0 ; i < this.chargeItme.length ; i++){
           this.chargeItme[i].showPayee = false;
         }
+
         this.chargeItme[index].payee = data.text;
         this.chargeItme[index].payeeId = data.value;
         this.chargeItme[index].showpayee = false;
         this.payeeSelectChange(data.value , index)
+        this.onConfirmBankType(data,index);
       },
       onConfirmBankType(data,index){
-        for (var i = 0 ; i < this.chargeItme.length ; i++){
-          this.chargeItme[i].showbankType = false;
-        }
-        this.chargeItme[index].bankTypeText = data.text;
-        this.chargeItme[index].bankType = data.value;
-        this.chargeItme[index].showbankType = false;
+        this.bankTypeDictionaries.map(res => {
+          if(res.value==data.bankType){
+            this.chargeItme[index].bankTypeText = res.text;
+            this.chargeItme[index].bankType = res.value;
+          }
+        })
       },
       onConfirmPayer(data){
+        console.log(data)
         this.form.payer = data.text;
         this.form.cashierId = data.value;
+        this.form.payerAccount = data.payeeAccount;
         this.showpayer = false;
-        this.selectChange(data.value)
       },
       onConfirmLasj(data){
         this.form.applyDate = this.getNowFormatDate(data).substr(0,10);
         this.showlasj = false;
       },
       accountTypeChange(e){
+        this.chargeItme = [];
         this.payeeList = [];
-        this.queryParams.accountType = this.form.accountType
-        this.queryParams.status = "0"
-        listPayee(this.queryParams).then((response) => {
-          this.payeeList = response.rows;
-          response.rows.map((res,index) => {
-            this.payeeList[index].text = res.payee;
-            this.payeeList[index].value = res.id;
-          })
+        let params = {
+          villageAccountType : 1,
+          status:'0',
+          accountType : this.form.accountType
+        }
+        listVaccount(params).then(response => {
+          console.log(response)
+          if(response.rows.length>0){
+            this.payeeList = response.rows;
+            response.rows.map((res,index) => {
+              this.payeeList[index].text = res.payee;
+              this.payeeList[index].value = res.id;
+            })
+          }
         });
       },
       // 钱计算
@@ -547,31 +568,130 @@
             return;
           }
         }
-        this.$set(this.form, "payeeList", this.chargeItme);
-        this.$set(this.form, "bankTypeList", this.chargeItme);
-        this.$set(this.form, "accountTypeList", this.chargeItme);
-        this.$set(this.form, "transferStatusList", this.chargeItme);
-        addTransfer(this.form).then(response => {
-          this.projectForm.outId = response.data.id
-          this.$set(this.projectForm, "ynType", '1');
-          if(this.form.capitalExpenditureType==2){
-            addProjectto(this.projectForm).then(res => {
-              customSubmit(response.data.id).then(res => {
-                this.$toast.success('提交成功');
-                setTimeout(function(){
-                  history.go(-1)
-                },2000)
-              })
-            })
-          }else{
-            customSubmit(response.data.id).then(res => {
-              this.$toast.success('提交成功');
-              setTimeout(function(){
-                history.go(-1)
-              },2000)
+        if(this.uploadFiles==null||this.uploadFiles.length==0){
+          Dialog.confirm({
+            title: '提示',
+            message: '此申请单中未上传任何附件，是否确认提交？',
+          })
+            .then(() => {
+              this.$set(this.form, "payeeList", this.chargeItme);
+              this.$set(this.form, "bankTypeList", this.chargeItme);
+              this.$set(this.form, "accountTypeList", this.chargeItme);
+              this.$set(this.form, "transferStatusList", this.chargeItme);
+              addTransfer(this.form).then(response => {
+                this.projectForm.outId = response.data.id
+                this.$set(this.projectForm, "ynType", '1');
+                if(this.uploadFiles!=null&&this.uploadFiles.length>0){
+                  this.uploadFiles.map(rr => {
+                    const params = new FormData();
+                    params.append("tableId", response.data.id);
+                    params.append("tableName", "t_yinnong_transfer");
+                    params.append("bizPath", "upload");
+                    params.append("fileType", "0");
+                    params.append("file", rr);
+                    commonAttach(params).then((r) => {
+                    })
+                  })
+                  if(this.form.capitalExpenditureType==2){
+                    addProjectto(this.projectForm).then(res => {
+                      customSubmit(response.data.id).then(res => {
+                        this.$toast.success('提交成功');
+                        setTimeout(function(){
+                          history.go(-1)
+                        },2000)
+                      })
+                    })
+                  }else{
+                    customSubmit(response.data.id).then(res => {
+                      this.$toast.success('提交成功');
+                      setTimeout(function(){
+                        history.go(-1)
+                      },2000)
+                    })
+                  }
+                }else{
+                  if(this.form.capitalExpenditureType==2){
+                    addProjectto(this.projectForm).then(res => {
+                      customSubmit(response.data.id).then(res => {
+                        this.$toast.success('提交成功');
+                        setTimeout(function(){
+                          history.go(-1)
+                        },2000)
+                      })
+                    })
+                  }else{
+                    customSubmit(response.data.id).then(res => {
+                      this.$toast.success('提交成功');
+                      setTimeout(function(){
+                        history.go(-1)
+                      },2000)
+                    })
+                  }
+                }
+              });
             })
-          }
-        });
+            .catch(() => {
+              return false;
+            });
+        }else{
+          this.$set(this.form, "payeeList", this.chargeItme);
+          this.$set(this.form, "bankTypeList", this.chargeItme);
+          this.$set(this.form, "accountTypeList", this.chargeItme);
+          this.$set(this.form, "transferStatusList", this.chargeItme);
+          addTransfer(this.form).then(response => {
+            this.projectForm.outId = response.data.id
+            this.$set(this.projectForm, "ynType", '1');
+            if(this.uploadFiles!=null&&this.uploadFiles.length>0){
+              this.uploadFiles.map(rr => {
+                const params = new FormData();
+                params.append("tableId", response.data.id);
+                params.append("tableName", "t_yinnong_transfer");
+                params.append("bizPath", "upload");
+                params.append("fileType", "0");
+                params.append("file", rr);
+                commonAttach(params).then((r) => {
+                })
+              })
+              if(this.form.capitalExpenditureType==2){
+                addProjectto(this.projectForm).then(res => {
+                  customSubmit(response.data.id).then(res => {
+                    this.$toast.success('提交成功');
+                    setTimeout(function(){
+                      history.go(-1)
+                    },2000)
+                  })
+                })
+              }else{
+                customSubmit(response.data.id).then(res => {
+                  this.$toast.success('提交成功');
+                  setTimeout(function(){
+                    history.go(-1)
+                  },2000)
+                })
+              }
+            }else{
+              if(this.form.capitalExpenditureType==2){
+                addProjectto(this.projectForm).then(res => {
+                  customSubmit(response.data.id).then(res => {
+                    this.$toast.success('提交成功');
+                    setTimeout(function(){
+                      history.go(-1)
+                    },2000)
+                  })
+                })
+              }else{
+                customSubmit(response.data.id).then(res => {
+                  this.$toast.success('提交成功');
+                  setTimeout(function(){
+                    history.go(-1)
+                  },2000)
+                })
+              }
+            }
+          });
+        }
+
+
       },
       goUpdate(){
         if(this.chargeItme.length<1){
@@ -596,23 +716,51 @@
         this.$set(this.form, "bankTypeList", this.chargeItme);
         this.$set(this.form, "accountTypeList", this.chargeItme);
         this.$set(this.form, "transferStatusList", this.chargeItme);
-        this.projectForm.outId = this.form.id
+        console.log(this.form)
         addTransfer(this.form).then((response) => {
           this.projectForm.outId = response.data.id
           this.$set(this.projectForm, "ynType", '1');
-          if(this.form.capitalExpenditureType==2){
-            addProjectto(this.projectForm).then(res => {
+          if(this.uploadFiles!=null&&this.uploadFiles.length>0){
+            console.log(this.uploadFiles)
+            this.uploadFiles.map(rr => {
+              const params = new FormData();
+              params.append("tableId", response.data.id);
+              params.append("tableName", "t_yinnong_transfer");
+              params.append("bizPath", "upload");
+              params.append("fileType", "0");
+              params.append("file", rr);
+              commonAttach(params).then((r) => {
+              })
+            })
+            if(this.form.capitalExpenditureType==2){
+              addProjectto(this.projectForm).then(res => {
+                this.$toast.success('保存成功');
+                setTimeout(function(){
+                  history.go(-1)
+                },2000)
+              })
+            }else{
               this.$toast.success('保存成功');
               setTimeout(function(){
                 history.go(-1)
               },2000)
-            })
+            }
           }else{
-            this.$toast.success('保存成功');
-            setTimeout(function(){
-              history.go(-1)
-            },2000)
+            if(this.form.capitalExpenditureType==2){
+              addProjectto(this.projectForm).then(res => {
+                this.$toast.success('保存成功');
+                setTimeout(function(){
+                  history.go(-1)
+                },2000)
+              })
+            }else{
+              this.$toast.success('保存成功');
+              setTimeout(function(){
+                history.go(-1)
+              },2000)
+            }
           }
+
         });
       },
       payeeSelectChange(select, i) {
@@ -713,6 +861,33 @@
           }
         }
       },
+      beforeRead(file) {
+        this.uploadFiles.push(file.file);
+      },
+      deleteFile(file){
+        this.uploadFiles.map((response,index) => {
+          if(file.file == response){
+            this.uploadFiles.splice(index,1)
+          }
+        })
+      },
+      getFileList(){
+        let oData= {
+          tableId: this.$route.query.id,
+          tableName: "t_yinnong_transfer",
+          bizPath: "upload",
+          fileType: "0",
+        }
+        attachmentList(oData).then(res => {
+          console.log(res)
+          console.log(location.protocol+"//"+location.host+request.defaults.baseURL)
+          res.rows.map(r => {
+            let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
+            this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{})})
+            console.log(r)
+          })
+        })
+      },
       goBack(){
         window.history.go(-1)
       },
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd4.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd4.vue
index d1952fa9..f3586fe1 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd4.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd4.vue
@@ -7,7 +7,7 @@
       @click-left="$router.back(-1)"
     >
       <template #title>
-        <p style="font-weight: bold;">添加付款申请</p>
+        <p style="font-weight: bold;">添加虚拟转账申请</p>
       </template>
     </van-nav-bar>
     <van-form @submit="getChange" @failed="getError" :show-error-message="false" scroll-to-error validate-first>
@@ -196,7 +196,7 @@
           </van-popup>
           <van-field required :rules="[{ required: true , message:'请输入账户' }]" v-model="item.payeeAccount" label="收款账户" placeholder="请输入账户" input-align="right" label-width="auto"/>
           <van-field required :rules="[{ required: true , message:'请输入银行' }]" v-model="item.bankDeposit" label="开户银行" placeholder="请输入银行" input-align="right" label-width="auto"/>
-          <van-field required :rules="[{ required: true , message:'请输入金额' }]" v-model="item.incomeAmount" label="收入金额" placeholder="请输入金额" input-align="right" label-width="auto" @change="moneyChange"/>
+          <van-field required :rules="[{ required: true , message:'请输入金额' }]" v-model="item.incomeAmount" type="number" label="收入金额" placeholder="请输入金额" input-align="right" label-width="auto" @change="moneyChange"/>
           <van-field
             readonly
             clickable
@@ -209,16 +209,12 @@
             required
             :rules="[{ required: true , message:'请选择所属银行' }]"
           />
-          <van-popup v-model="item.showbankType" position="bottom">
-            <van-picker
-              show-toolbar
-              :columns="bankTypeDictionaries"
-              @confirm="onConfirmBankType($event,index)"
-              @cancel="item.showbankType = false"
-            />
-          </van-popup>
         </div>
       </div>
+      <p class="main_title">上传附件</p>
+      <div class="main_box" style="padding: 5px 0 0 8px;">
+        <van-uploader v-model="fileList" :after-read="beforeRead" ></van-uploader>
+      </div>
       <div style="padding: 16px 0;">
         <van-row>
           <van-col span="12" align="center">
@@ -238,6 +234,8 @@
 
 <script>
   import { addTransfer , listPayee , updateTransfer , getProjectto , listProject , addProjectto , customSubmit , getAccount ,getQmyeFlow} from "@/api/onlineHome/bankAgriculture/paymentApproval";
+  import {attachmentList, commonAttach, listVaccount} from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
+  import request from '@/utils/request'
   export default {
     name: "approvalAdd4",
     data() {
@@ -256,7 +254,7 @@
         maxDate: new Date(2050, 10, 1),
         currentDate: new Date(),
         form:{},
-
+        fileList:[],
         capitalExpenditureType:'',
         payee:'',
         bankType:'',
@@ -315,19 +313,19 @@
         this.projectFundTypeDictionaries = response.data;
       });
       let params1={
-        accountType: "102",
-        status: "N",
+        villageAccountType:'1'
       }
-      getAccount(params1).then((response) => {
+      listVaccount(params1).then((response) => {
         this.payerOptions = response.rows;
         response.rows.map((res,index) => {
           res['payerFrom'] = '1'
           console.log(res)
-          this.payerOptions[index].text = res.accountName;
+          this.payerOptions[index].text = res.payee;
           this.payerOptions[index].value = res.id;
         })
       });
       this.getDictionaries();
+      this.getFileList();
     },
     methods: {
       // 表单重置
@@ -338,7 +336,7 @@
           downId: null,
           orderId: null,
           cashierId: null,
-          transferType: '1',
+          transferType: '4',
           accountType: '2',
           explainSituation: null,
           succeedAmount: null,
@@ -418,8 +416,8 @@
             payeeAccount: "", //收款账户
             bankDeposit: "", //开户银行
             incomeAmount: "", //收入金额
-            bankType: "1", //所属银行
-            bankTypeText:this.selectDictLabel(res.data, 1), //所属银行
+            bankType: "", //所属银行
+            bankTypeText:'', //所属银行
             showPayee:false,
             showbankType:false
           });
@@ -476,21 +474,23 @@
         this.showproject = false;
       },
       onConfirmPayee(data,index){
-        for (var i = 0 ; i < this.chargeItme.length ; i++){
+        for (let i = 0 ; i < this.chargeItme.length ; i++){
           this.chargeItme[i].showPayee = false;
         }
         this.chargeItme[index].payee = data.text;
         this.chargeItme[index].payeeId = data.value;
         this.chargeItme[index].showpayee = false;
         this.payeeSelectChange(data.value , index)
+        this.onConfirmBankType(data,index)
       },
       onConfirmBankType(data,index){
-        for (var i = 0 ; i < this.chargeItme.length ; i++){
-          this.chargeItme[i].showbankType = false;
-        }
-        this.chargeItme[index].bankTypeText = data.text;
-        this.chargeItme[index].bankType = data.value;
-        this.chargeItme[index].showbankType = false;
+        console.log(this.bankTypeDictionaries)
+        this.bankTypeDictionaries.map(res => {
+          if(res.value==data.bankType){
+            this.chargeItme[index].bankTypeText = res.text;
+            this.chargeItme[index].bankType = res.value;
+          }
+        })
       },
       onConfirmPayer(data){
         this.form.payer = data.text;
@@ -665,6 +665,7 @@
           //model就是上面的数据源
           return account.id === select; //筛选出匹配数据
         });
+        console.log(obj)
         if(obj.payerFrom==1&&obj.operatorCode != null && obj.operatorCode != "" &&
           obj.enterpriseCode != null && obj.enterpriseCode != "" &&
           obj.accountPassword != null && obj.accountPassword != ""){
@@ -679,7 +680,7 @@
         }else{
           if(obj.payerFrom==1){
             this.diglogStatus = false;
-            this.$notify({ type: 'danger', message: "请完善付款方“操作员代码”、“企业编码”、“支付口令”等信息！" });
+            this.$notify({ type: 'danger', message: "请完善付款方“支付口令”等信息！" });
             this.$set(this.form,"payer","")
             this.$set(this.form,"payerAccount","")
           }else{
@@ -713,6 +714,37 @@
           }
         }
       },
+      beforeRead(file) {
+        console.log(file)
+        console.log(this.fileList)
+        const params = new FormData();
+        params.append("tableId", this.$route.query.id);
+        params.append("tableName", "t_yinnong_transfer");
+        params.append("bizPath", "upload");
+        params.append("fileType", "0");
+        params.append("file", file.file);
+        commonAttach(params).then((response) => {
+          console.log(response)
+        })
+      },
+      getFileList(){
+        let oData= {
+          tableId: this.$route.query.id,
+          tableName: "t_yinnong_transfer",
+          bizPath: "upload",
+          fileType: "0",
+        }
+        attachmentList(oData).then(res => {
+          console.log(res)
+          console.log(location.protocol+"//"+location.host+request.defaults.baseURL)
+          res.rows.map(r => {
+
+            let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
+            this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{})})
+            console.log(r)
+          })
+        })
+      },
       goBack(){
         window.history.go(-1)
       },
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd5.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd5.vue
index 3ea6f57a..6daf0524 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd5.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd5.vue
@@ -7,7 +7,7 @@
       @click-left="$router.back(-1)"
     >
       <template #title>
-        <p style="font-weight: bold;">添加付款申请</p>
+        <p style="font-weight: bold;">添加母子转账申请</p>
       </template>
     </van-nav-bar>
     <van-form @submit="getChange" @failed="getError" :show-error-message="false" scroll-to-error validate-first>
@@ -194,31 +194,26 @@
               @cancel="item.showPayee = false"
             />
           </van-popup>
-          <van-field required :rules="[{ required: true , message:'请输入账户' }]" v-model="item.payeeAccount" label="收款账户" placeholder="请输入账户" input-align="right" label-width="auto"/>
-          <van-field required :rules="[{ required: true , message:'请输入银行' }]" v-model="item.bankDeposit" label="开户银行" placeholder="请输入银行" input-align="right" label-width="auto"/>
-          <van-field required :rules="[{ required: true , message:'请输入金额' }]" v-model="item.incomeAmount" label="收入金额" placeholder="请输入金额" input-align="right" label-width="auto" @change="moneyChange"/>
+          <van-field required :rules="[{ required: true , message:'收款账户不能为空' }]" v-model="item.payeeAccount" label="收款账户" placeholder="请选择收款方" input-align="right" label-width="auto"/>
+          <van-field required :rules="[{ required: true , message:'开户银行不能为空' }]" v-model="item.bankDeposit" label="开户银行" placeholder="请选择收款方" input-align="right" label-width="auto"/>
+          <van-field required :rules="[{ required: true , message:'请输入金额' }]" v-model="item.incomeAmount" type="number"  label="收入金额" placeholder="请输入金额" input-align="right" label-width="auto" @change="moneyChange"/>
           <van-field
             readonly
             clickable
             label="所属银行"
-            placeholder="请选择"
+            placeholder="请选择收款方"
             v-model="item.bankTypeText"
             @click="item.showbankType = true"
             input-align="right"
-            right-icon="arrow-down"
             required
-            :rules="[{ required: true , message:'请选择所属银行' }]"
+            :rules="[{ required: true , message:'所属银行不能为空 ' }]"
           />
-          <van-popup v-model="item.showbankType" position="bottom">
-            <van-picker
-              show-toolbar
-              :columns="bankTypeDictionaries"
-              @confirm="onConfirmBankType($event,index)"
-              @cancel="item.showbankType = false"
-            />
-          </van-popup>
         </div>
       </div>
+      <p class="main_title">上传附件</p>
+      <div class="main_box" style="padding: 5px 0 0 8px;">
+        <van-uploader v-model="fileList" :after-read="beforeRead" ></van-uploader>
+      </div>
       <div style="padding: 16px 0;">
         <van-row>
           <van-col span="12" align="center">
@@ -238,6 +233,13 @@
 
 <script>
   import { addTransfer , listPayee , updateTransfer , getProjectto , listProject , addProjectto , customSubmit , getAccount ,getQmyeFlow} from "@/api/onlineHome/bankAgriculture/paymentApproval";
+  import {
+    attachmentList,
+    commonAttach,
+    listTaccount,
+    listVaccount
+  } from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
+  import request from '@/utils/request'
   export default {
     name: "approvalAdd5",
     data() {
@@ -256,7 +258,7 @@
         maxDate: new Date(2050, 10, 1),
         currentDate: new Date(),
         form:{},
-
+        fileList:[],
         capitalExpenditureType:'',
         payee:'',
         bankType:'',
@@ -304,30 +306,33 @@
       }
       listProject(queryParams).then(response => {
         this.projectList = response.rows;
-        for (var i = 0; i < response.rows.length; i++) {
+        for (let i = 0; i < response.rows.length; i++) {
           this.projectListShow.push({text: response.rows[i].projectName, value: response.rows[i].id});
         }
       });
       this.getDicts("project_fund_type").then((response) => {
-        for (var i = 0; i < response.data.length; i++) {
+        for (let i = 0; i < response.data.length; i++) {
           this.projectFundTypeOptions.push({text: response.data[i].dictLabel, value: response.data[i].dictValue});
         }
         this.projectFundTypeDictionaries = response.data;
       });
       let params1={
-        accountType: "102",
-        status: "N",
+        townAccountType:'2'
       }
-      getAccount(params1).then((response) => {
-        this.payerOptions = response.rows;
+      listTaccount(params1).then((response) => {
+        console.log(response)
         response.rows.map((res,index) => {
-          res['payerFrom'] = '1'
-          console.log(res)
-          this.payerOptions[index].text = res.accountName;
-          this.payerOptions[index].value = res.id;
+          if(res.townAccountType=='2'){
+            res['payerFrom'] = '2'
+            this.payerOptions.push(res);
+            console.log(res)
+            this.payerOptions[index].text = res.payee;
+            this.payerOptions[index].value = res.id;
+          }
         })
       });
       this.getDictionaries();
+      this.getFileList();
     },
     methods: {
       // 表单重置
@@ -338,7 +343,7 @@
           downId: null,
           orderId: null,
           cashierId: null,
-          transferType: '1',
+          transferType: '5',
           accountType: '2',
           explainSituation: null,
           succeedAmount: null,
@@ -418,8 +423,8 @@
             payeeAccount: "", //收款账户
             bankDeposit: "", //开户银行
             incomeAmount: "", //收入金额
-            bankType: "1", //所属银行
-            bankTypeText:this.selectDictLabel(res.data, 1), //所属银行
+            bankType: "", //所属银行
+            bankTypeText:"", //所属银行
             showPayee:false,
             showbankType:false
           });
@@ -429,7 +434,7 @@
         //普通转账
         this.queryParams.accountType = this.form.accountType
         this.queryParams.status = "0"
-        listPayee(this.queryParams).then((response) => {
+        listVaccount(this.queryParams).then((response) => {
           this.payeeList = response.rows;
           response.rows.map((res,index) => {
             this.payeeList[index].text = res.payee;
@@ -438,7 +443,7 @@
         });
       },
       payeeDictLabel(datas, value) {
-        var actions = [];
+        let actions = [];
         Object.keys(datas).some((key) => {
           if (datas[key].payeeId == ('' + value)) {
             actions.push(datas[key].payee);
@@ -476,27 +481,31 @@
         this.showproject = false;
       },
       onConfirmPayee(data,index){
-        for (var i = 0 ; i < this.chargeItme.length ; i++){
+        for (let i = 0 ; i < this.chargeItme.length ; i++){
           this.chargeItme[i].showPayee = false;
         }
         this.chargeItme[index].payee = data.text;
         this.chargeItme[index].payeeId = data.value;
         this.chargeItme[index].showpayee = false;
         this.payeeSelectChange(data.value , index)
+        this.onConfirmBankType(data,index);
       },
       onConfirmBankType(data,index){
-        for (var i = 0 ; i < this.chargeItme.length ; i++){
-          this.chargeItme[i].showbankType = false;
-        }
-        this.chargeItme[index].bankTypeText = data.text;
-        this.chargeItme[index].bankType = data.value;
-        this.chargeItme[index].showbankType = false;
+        console.log(this.bankTypeDictionaries)
+        this.bankTypeDictionaries.map(res => {
+          if(res.value==data.bankType){
+            this.chargeItme[index].bankTypeText = res.text;
+            this.chargeItme[index].bankType = res.value;
+          }
+        })
       },
       onConfirmPayer(data){
+        console.log(data)
         this.form.payer = data.text;
         this.form.cashierId = data.value;
+        this.form.payerAccount = data.payeeAccount;
         this.showpayer = false;
-        this.selectChange(data.value)
+        // this.selectChange(data.value)
       },
       onConfirmLasj(data){
         this.form.applyDate = this.getNowFormatDate(data).substr(0,10);
@@ -506,7 +515,7 @@
         this.payeeList = [];
         this.queryParams.accountType = this.form.accountType
         this.queryParams.status = "0"
-        listPayee(this.queryParams).then((response) => {
+        listPayee(this.queryParams).then((response ) => {
           this.payeeList = response.rows;
           response.rows.map((res,index) => {
             this.payeeList[index].text = res.payee;
@@ -713,6 +722,37 @@
           }
         }
       },
+      beforeRead(file) {
+        console.log(file)
+        console.log(this.fileList)
+        const params = new FormData();
+        params.append("tableId", this.$route.query.id);
+        params.append("tableName", "t_yinnong_transfer");
+        params.append("bizPath", "upload");
+        params.append("fileType", "0");
+        params.append("file", file.file);
+        commonAttach(params).then((response) => {
+          console.log(response)
+        })
+      },
+      getFileList(){
+        let oData= {
+          tableId: this.$route.query.id,
+          tableName: "t_yinnong_transfer",
+          bizPath: "upload",
+          fileType: "0",
+        }
+        attachmentList(oData).then(res => {
+          console.log(res)
+          console.log(location.protocol+"//"+location.host+request.defaults.baseURL)
+          res.rows.map(r => {
+
+            let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
+            this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{})})
+            console.log(r)
+          })
+        })
+      },
       goBack(){
         window.history.go(-1)
       },
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail.vue
index 107b0e51..e14147e4 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail.vue
@@ -42,7 +42,7 @@
       <van-field readonly label="工程发票号" v-model="projectForm.projectBillNum" input-align="right" label-width="auto"/>
     </div>
 
-    <p class="main_title">列表信息</p>
+    <p class="main_title">收款方信息</p>
 
     <div class="main_box" style="margin-bottom: 15px;">
       <van-field readonly label="收款账户类型" v-model="form.accountType == 1 ? '公户':'私户'" input-align="right" label-width="auto" />
@@ -57,11 +57,18 @@
         <van-field readonly label="所属银行" v-model="item.bankTypeText" input-align="right" />
       </div>
     </div>
+    <p class="main_title">上传附件</p>
+    <div class="main_box" style="padding: 5px 0 0 8px;">
+      <van-uploader v-model="fileList" v-if="fileList==null||fileList.length==0" :deletable="false"  disabled  :upload-text="'未上传附件'"></van-uploader>
+      <van-uploader v-model="fileList" v-if="fileList!=null&&fileList.length>0" :deletable="false" :max-count="fileList.length"  ></van-uploader>
+    </div>
   </div>
 </template>
 
 <script>
   import { getTransfer , queryTransferDetail , listPayee , updateTransfer , getProjectto , listProject , addProjectto , customSubmit} from "@/api/onlineHome/bankAgriculture/paymentApproval";
+  import request from '@/utils/request'
+  import {attachmentList, commonAttach} from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
   export default {
     name: "approvalDetail",
     data() {
@@ -77,7 +84,7 @@
         maxDate: new Date(2025, 10, 1),
         currentDate: new Date(),
         form:{},
-
+        fileList:[],
         capitalExpenditureType:'',
         payee:'',
         bankType:'',
@@ -135,6 +142,7 @@
         this.projectFundTypeDictionaries = response.data;
       });
       this.getDictionaries();
+      this.getFileList();
     },
     methods: {
       goFlow(){
@@ -348,6 +356,37 @@
           }
         });
       },
+      beforeRead(file) {
+        console.log(file)
+        console.log(this.fileList)
+        const params = new FormData();
+        params.append("tableId", this.$route.query.id);
+        params.append("tableName", "t_yinnong_transfer");
+        params.append("bizPath", "upload");
+        params.append("fileType", "0");
+        params.append("file", file.file);
+        commonAttach(params).then((response) => {
+          console.log(response)
+        })
+      },
+      getFileList(){
+        let oData= {
+          tableId: this.$route.query.id,
+          tableName: "t_yinnong_transfer",
+          bizPath: "upload",
+          fileType: "0",
+        }
+        attachmentList(oData).then(res => {
+          console.log(res)
+          console.log(location.protocol+"//"+location.host+request.defaults.baseURL)
+          res.rows.map(r => {
+
+            let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
+            this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{})})
+            console.log(r)
+          })
+        })
+      },
       goBack(){
         window.history.go(-1)
       },
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail10.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail10.vue
new file mode 100644
index 00000000..b1bac363
--- /dev/null
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail10.vue
@@ -0,0 +1,430 @@
+<template>
+  <div class="app-container">
+    <van-nav-bar
+      left-arrow
+      fixed
+      placeholder
+      @click-left="$router.back(-1)"
+    >
+      <template #title>
+        <p style="font-weight: bold;">查看现金提现申请详情</p>
+      </template>
+      <template #right>
+        <van-icon name="../../../static/images/icon/icon_flow.png" size="20" @click="goFlow"/>
+      </template>
+    </van-nav-bar>
+    <p class="main_title">基础信息</p>
+    <div class="main_box">
+      <van-field readonly label="申请时间" v-model="form.applyDate" input-align="right" />
+      <van-field readonly label="资金支出类别" v-model="capitalExpenditureType" input-align="right" label-width="auto" />
+      <van-field readonly label="提现总金额" v-model="form.expenditureAmount" input-align="right" label-width="auto"/>
+    </div>
+
+    <div class="main_box" style="margin-top: 10px;">
+      <van-field readonly label="付款事由" v-model="form.remark" type="textarea" input-align="right" rows="3" label-width="auto"/>
+    </div>
+
+    <div class="main_box" style="margin-top: 10px;">
+      <van-field readonly label="说明情况" v-model="form.explainSituation" type="textarea" input-align="right" rows="3" label-width="auto"/>
+    </div>
+
+    <p class="main_title">付款方信息</p>
+    <div class="main_box">
+      <van-field readonly label="付款方" v-model="form.payer" input-align="right" label-width="auto"/>
+      <van-field readonly label="付款方账户" v-model="form.payerAccount" input-align="right" label-width="auto"/>
+    </div>
+
+    <div class="main_box" v-if="capitalExpenditureOpen" style="margin-bottom: 10px;margin-top: 10px;position:relative;">
+      <van-field readonly label="项目名称" v-model="projectForm.projectName" input-align="right" />
+      <van-field readonly label="承建单位" v-model="projectForm.projectContractor" input-align="right" label-width="auto"/>
+      <van-field readonly label="合同价款（元）" v-model="projectForm.projectAmount" input-align="right" label-width="auto"/>
+      <van-field readonly label="工程款类型" v-model="projectFundType" input-align="right" />
+      <van-field readonly label="工程发票号" v-model="projectForm.projectBillNum" input-align="right" label-width="auto"/>
+    </div>
+
+    <p class="main_title">收款方信息</p>
+
+    <div class="main_box" style="margin-bottom: 15px;">
+      <van-field readonly label="收款账户类型" v-model="form.accountType == 1 ? '公户':'私户'" input-align="right" label-width="auto" />
+    </div>
+
+    <div :style="{position:'relative',padding: index == 0 ? '':'10px 0 0 0'}" v-for="(item, index) in chargeItme" :key="index">
+      <div class="main_box" style="margin-bottom: 10px;position:relative;">
+        <van-field readonly label="收款方" v-model="item.payee" input-align="right" />
+        <van-field readonly label="提款人" v-model="item.drawer" input-align="right" label-width="auto"/>
+        <van-field readonly label="提款金额（元）" v-model="item.incomeAmount" input-align="right" label-width="auto"/>
+        <van-field readonly label="资金用途" v-model="item.remark" input-align="right" />
+      </div>
+    </div>
+    <p class="main_title">上传附件</p>
+    <div class="main_box" style="padding: 5px 0 0 8px;">
+      <van-uploader v-model="fileList" :after-read="beforeRead" :deletable="false" disabled  :upload-text="'未上传附件'"></van-uploader>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { getCash , listCashdetailByCashId , listPayee , getProjectto , listProject , addProjectto , customSubmit} from "@/api/onlineHome/bankAgriculture/paymentApproval";
+  import request from '@/utils/request'
+  import {attachmentList, commonAttach} from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
+  export default {
+    name: "approvalDetail10",
+    data() {
+      return {
+        showcapital:false,
+        showpayee:false,
+        showlasj:false,
+        showbankType:false,
+        showproject:false,
+        showFundType:false,
+
+        minDate: new Date(),
+        maxDate: new Date(2050, 10, 1),
+        currentDate: new Date(),
+        form:{},
+        fileList:[],
+        capitalExpenditureType:'',
+        payee:'',
+        bankType:'',
+
+        wfydlxDictionaries:[],
+        jglxDictionaries:[],
+        sysDictionaries:[],
+        capitalExpenditureTypeOptions:[],
+        bankTypeDictionaries:[],
+        projectList:[],
+        projectFundTypeOptions:[],
+        projectFundTypeDictionaries:[],
+        projectListShow:[],
+
+        chargeItme:[],
+        chargeItmeShow:[],
+
+        payeeList:[],
+        // 查询参数
+        queryParams: {
+          transferType:"",
+          orderByColumn: "id",
+          isAsc: "desc",
+        },
+        capitalExpenditureOpen:false,
+        projectForm:{
+          projectId:null,
+          projectName:null,
+          projectContractor:null,
+          projectAmount:null,
+          projectBillNum:null,
+          projectFundType:'1',
+          outId:null,
+          ynType:'1'
+        },
+        projectFundType:''
+      };
+    },
+    created() {
+      let queryParams={
+        pageNum: 1,
+        pageSize: 100,
+      }
+      listProject(queryParams).then(response => {
+        console.log(response)
+        this.projectList = response.rows;
+        for (var i = 0; i < response.rows.length; i++) {
+          this.projectListShow.push({text: response.rows[i].projectName, value: response.rows[i].id});
+        }
+      });
+      this.getDicts("project_fund_type").then((response) => {
+        for (var i = 0; i < response.data.length; i++) {
+          this.projectFundTypeOptions.push({text: response.data[i].dictLabel, value: response.data[i].dictValue});
+        }
+        this.projectFundTypeDictionaries = response.data;
+      });
+      this.getDictionaries();
+      this.getFileList();
+    },
+    methods: {
+      goFlow(){
+        window.location='approvalProcess?id='+this.$route.query.id;
+      },
+      getDictionaries(){
+        getCash(this.$route.query.id).then((response) => {
+          this.getDicts("capital_expenditure_type").then((res) => {
+            for (var i = 0; i < res.data.length; i++) {
+              this.capitalExpenditureTypeOptions.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
+            }
+            this.capitalExpenditureType = this.selectDictLabel(res.data, response.data.capitalExpenditureType);
+          });
+          if(response.data.capitalExpenditureType==2){
+            this.capitalExpenditureOpen = true
+            let param={
+              'outId' : response.data.id,
+              'ynType' : '2'
+            }
+            getProjectto(param).then(res => {
+              this.projectFundType = this.selectDictLabel(this.projectFundTypeDictionaries, res.data.projectFundType);
+              this.projectForm = res.data
+            })
+          }else{
+            this.showproject = false
+          }
+          this.form = response.data;
+        });
+        console.log(this.$route.query.id)
+        listCashdetailByCashId(this.$route.query.id).then((response) => {
+          this.chargeItme = response.data;
+          console.log(response.data)
+          this.getPayeeList();
+        });
+      },
+      addChargeItme(index){
+        this.chargeItme.splice(index + 1, 0, {
+          payeeId: "", //收款方ID
+          payee: "", //收款方
+          payeeAccount: "", //收款账户
+          bankDeposit: "", //开户银行
+          incomeAmount: "", //收入金额
+          bankType: "", //所属银行
+        });
+      },
+      getPayeeList() {
+        //普通转账
+        this.queryParams.accountType = this.form.accountType
+        this.queryParams.status = "0"
+        listPayee(this.queryParams).then((response) => {
+          for (var i = 0; i < response.rows.length; i++) {
+            this.payeeList.push({text: response.rows[i].payee, value: response.rows[i].id});
+          }
+        });
+      },
+      payeeDictLabel(datas, value) {
+        var actions = [];
+        Object.keys(datas).some((key) => {
+          if (datas[key].payeeId == ('' + value)) {
+            actions.push(datas[key].payee);
+            return true;
+          }
+        })
+        return actions.join('');
+      },
+      onConfirmCapital(data){
+        console.log(data)
+        if (data.value != 2){
+          this.capitalExpenditureOpen = false;
+          this.projectForm = [];
+        }else{
+          this.capitalExpenditureOpen = true;
+        }
+        this.capitalExpenditureType = data.text;
+        this.form.capitalExpenditureType = data.value;
+        this.showcapital = false;
+      },
+      onConfirmFundType(data){
+        console.log(data)
+        this.projectForm.projectFundType = data.value;
+        this.projectFundType = data.text;
+        this.showFundType = false;
+      },
+      onConfirmProject(data){
+        console.log(data)
+        this.projectList.map(res => {
+          console.log(res)
+          if(res.projectName==data.text){
+            this.projectForm.projectId = res.id
+            this.projectForm.projectName = res.projectName
+            this.projectForm.projectContractor = res.projectContractor
+            this.projectForm.projectAmount = res.projectAmount
+            console.log(this.projectForm)
+          }
+        })
+        this.showproject = false;
+      },
+      onConfirmPayee(data){
+        // this.chargeItme[this.chargeItme.length-1].payeeText = data.text;
+        this.chargeItme[this.chargeItme.length-1].payee = data.text;
+        this.chargeItme[this.chargeItme.length-1].payeeId = data.value;
+        console.log(this.chargeItme)
+        this.showpayee = false;
+      },
+      onConfirmBankType(data){
+        console.log(this.chargeItme)
+        this.chargeItme[this.chargeItme.length-1].bankTypeText = data.text;
+        this.chargeItme[this.chargeItme.length-1].bankType = data.value;
+        this.showbankType = false;
+      },
+      onConfirmLasj(data){
+        this.form.applyDate = this.getNowFormatDate(data).substr(0,10);
+        this.showlasj = false;
+      },
+      accountTypeChange(e){
+        console.log(e)
+        this.payeeList = [];
+        this.queryParams.accountType = this.form.accountType
+        this.queryParams.status = "0"
+        listPayee(this.queryParams).then((response) => {
+          for (var i = 0; i < response.rows.length; i++) {
+            this.payeeList.push({text: response.rows[i].payee, value: response.rows[i].id});
+          }
+        });
+      },
+      goAdd(){
+        if(this.form.remark != null && this.form.remark.indexOf("|")!=-1){
+          this.$toast.error("付款事由禁止包含|。");
+          return;
+        }
+        if(this.form.capitalExpenditureType==2){
+          if(this.projectForm.projectName==""||this.projectForm.projectName==null){
+            this.$toast.error('请选择项目名称！');
+            return;
+          }
+          if(this.projectForm.projectBillNum==""||this.projectForm.projectBillNum==null){
+            this.$toast.error('请输入工程发票号！');
+            return;
+          }
+        }
+        this.$set(this.form, "payeeList", this.chargeItme);
+        this.$set(this.form, "bankTypeList", this.chargeItme);
+        this.$set(this.form, "accountTypeList", this.chargeItme);
+        this.$set(this.form, "transferStatusList", this.chargeItme);
+        console.log(this.form);
+        updateTransfer(this.form).then(response => {
+          console.log(response);
+          this.projectForm.outId = this.form.id
+          this.$set(this.projectForm, "ynType", '1');
+          console.log(this.projectForm)
+          if(this.form.capitalExpenditureType==2){
+            addProjectto(this.projectForm).then(res => {
+              customSubmit(this.form.id).then(res => {
+                this.$toast.success('提交成功');
+                setTimeout(function(){
+                  history.go(-1)
+                },2000)
+              })
+            })
+          }else{
+            customSubmit(this.form.id).then(res => {
+              this.$toast.success('提交成功');
+              setTimeout(function(){
+                history.go(-1)
+              },2000)
+            })
+          }
+        });
+      },
+      goUpdate(){
+        if(this.form.remark != null && this.form.remark.indexOf("|")!=-1){
+          this.$toast.error("付款事由禁止包含|。");
+          return;
+        }
+        if(this.form.capitalExpenditureType==2){
+          if(this.projectForm.projectName==""||this.projectForm.projectName==null){
+            this.$toast.error('请选择项目名称！');
+            return;
+          }
+          if(this.projectForm.projectBillNum==""||this.projectForm.projectBillNum==null){
+            this.$toast.error('请输入工程发票号！');
+            return;
+          }
+        }
+        this.$set(this.form, "payeeList", this.chargeItme);
+        this.$set(this.form, "bankTypeList", this.chargeItme);
+        this.$set(this.form, "accountTypeList", this.chargeItme);
+        this.$set(this.form, "transferStatusList", this.chargeItme);
+        this.projectForm.outId = this.form.id
+        updateTransfer(this.form).then((response) => {
+          this.projectForm.outId = this.form.id
+          this.$set(this.projectForm, "ynType", '1');
+          if(this.form.capitalExpenditureType==2){
+            addProjectto(this.projectForm).then(res => {
+              this.$toast.success('修改成功');
+              setTimeout(function(){
+                history.go(-1)
+              },2000)
+            })
+          }else{
+            this.$toast.success('修改成功');
+            setTimeout(function(){
+              history.go(-1)
+            },2000)
+          }
+        });
+      },
+      beforeRead(file) {
+        console.log(file)
+        console.log(this.fileList)
+        const params = new FormData();
+        params.append("tableId", this.$route.query.id);
+        params.append("tableName", "t_yinnong_cash");
+        params.append("bizPath", "upload");
+        params.append("fileType", "0");
+        params.append("file", file.file);
+        commonAttach(params).then((response) => {
+          console.log(response)
+        })
+      },
+      getFileList(){
+        let oData= {
+          tableId: this.$route.query.id,
+          tableName: "t_yinnong_transfer",
+          bizPath: "upload",
+          fileType: "0",
+        }
+        attachmentList(oData).then(res => {
+          console.log(res)
+          console.log(location.protocol+"//"+location.host+request.defaults.baseURL)
+          res.rows.map(r => {
+
+            let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
+            this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{})})
+            console.log(r)
+          })
+        })
+      },
+      goBack(){
+        window.history.go(-1)
+      },
+      //删除家庭成员
+      deleteChargeItme(index){
+        this.chargeItme.splice(index,1)
+      },
+    },
+  }
+</script>
+
+<style scoped lang="scss">
+  .app-container {
+    padding: 2% 0;
+  }
+  .main_title{
+    font-size: 0.4rem;
+    color: #1D6FE9;
+    margin: 0.2rem 6%;
+    position: relative;
+  }
+  .main_box{
+    width: 96%;
+    margin: 0 auto;
+    border-radius: 6px;
+    box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);
+    overflow: hidden;
+    background-color: #FFF;
+  }
+  .submitButton{
+    width: 80%;
+    margin: 0 auto;
+    background-color: #1D6FE9;
+  }
+
+  .addFamily{
+    position: absolute;
+    top: -2px;
+    right: 0;
+    border-radius: 50%;
+  }
+  .deleteFamily{
+    position: absolute;
+    top: 0rem;
+    right: 6%;
+    z-index: 9;
+    border-radius: 50%;
+  }
+</style>
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail11.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail11.vue
new file mode 100644
index 00000000..84fa0a0f
--- /dev/null
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail11.vue
@@ -0,0 +1,431 @@
+<template>
+  <div class="app-container">
+    <van-nav-bar
+      left-arrow
+      fixed
+      placeholder
+      @click-left="$router.back(-1)"
+    >
+      <template #title>
+        <p style="font-weight: bold;">查看付款申请</p>
+      </template>
+      <template #right>
+        <van-icon name="../../../static/images/icon/icon_flow.png" size="20" @click="goFlow"/>
+      </template>
+    </van-nav-bar>
+    <p class="main_title">基础信息</p>
+    <div class="main_box">
+      <van-field readonly label="申请时间" v-model="form.applyDate" input-align="right" />
+      <van-field readonly label="资金支出类别" v-model="capitalExpenditureType" input-align="right" label-width="auto" />
+      <van-field readonly label="支出总金额" v-model="form.expenditureAmount" input-align="right" label-width="auto"/>
+    </div>
+
+    <div class="main_box" style="margin-top: 10px;">
+      <van-field readonly label="付款事由" v-model="form.remark" type="textarea" input-align="right" rows="3" label-width="auto"/>
+    </div>
+
+    <div class="main_box" style="margin-top: 10px;">
+      <van-field readonly label="说明情况" v-model="form.explainSituation" type="textarea" input-align="right" rows="3" label-width="auto"/>
+    </div>
+
+    <p class="main_title">付款方信息</p>
+    <div class="main_box">
+      <van-field readonly label="付款方" v-model="form.payer" input-align="right" label-width="auto"/>
+      <van-field readonly label="付款方账户" v-model="form.payerAccount" input-align="right" label-width="auto"/>
+    </div>
+
+    <div class="main_box" v-if="capitalExpenditureOpen" style="margin-bottom: 10px;margin-top: 10px;position:relative;">
+      <van-field readonly label="项目名称" v-model="projectForm.projectName" input-align="right" />
+      <van-field readonly label="承建单位" v-model="projectForm.projectContractor" input-align="right" label-width="auto"/>
+      <van-field readonly label="合同价款（元）" v-model="projectForm.projectAmount" input-align="right" label-width="auto"/>
+      <van-field readonly label="工程款类型" v-model="projectFundType" input-align="right" />
+      <van-field readonly label="工程发票号" v-model="projectForm.projectBillNum" input-align="right" label-width="auto"/>
+    </div>
+
+    <p class="main_title">收款方信息</p>
+
+    <div :style="{position:'relative',padding: index == 0 ? '':'10px 0 0 0'}" v-for="(item, index) in chargeItme" :key="index">
+      <div class="main_box" style="margin-bottom: 10px;position:relative;">
+        <van-field readonly label="收款方" v-model="item.payee" input-align="right" />
+        <van-field readonly label="收款账户" v-model="item.payeeAccount" input-align="right" label-width="auto"/>
+        <van-field readonly label="开户银行" v-model="item.bankDeposit" input-align="right" label-width="auto"/>
+        <van-field readonly label="收入金额" v-model="item.incomeAmount" input-align="right" label-width="auto"/>
+        <van-field readonly label="所属银行" v-model="item.bankTypeText" input-align="right" />
+      </div>
+    </div>
+    <p class="main_title">上传附件</p>
+    <div class="main_box" style="padding: 5px 0 0 8px;">
+      <van-uploader v-model="fileList" :after-read="beforeRead" :deletable="false" disabled  :upload-text="'未上传附件'"></van-uploader>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { getTransfer , queryTransferDetail , listPayee , updateTransfer , getProjectto , listProject , addProjectto , customSubmit} from "@/api/onlineHome/bankAgriculture/paymentApproval";
+  import request from '@/utils/request'
+  import {
+    attachmentList,
+    commonAttach,
+    getCash,
+    listCashdetailByCashId
+  } from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
+  export default {
+    name: "approvalDetail11",
+    data() {
+      return {
+        showcapital:false,
+        showpayee:false,
+        showlasj:false,
+        showbankType:false,
+        showproject:false,
+        showFundType:false,
+
+        minDate: new Date(),
+        maxDate: new Date(2025, 10, 1),
+        currentDate: new Date(),
+        form:{},
+        fileList:[],
+        capitalExpenditureType:'',
+        payee:'',
+        bankType:'',
+
+        wfydlxDictionaries:[],
+        jglxDictionaries:[],
+        sysDictionaries:[],
+        capitalExpenditureTypeOptions:[],
+        bankTypeDictionaries:[],
+        projectList:[],
+        projectFundTypeOptions:[],
+        projectFundTypeDictionaries:[],
+        projectListShow:[],
+
+        chargeItme:[],
+        chargeItmeShow:[],
+
+        payeeList:[],
+        // 查询参数
+        queryParams: {
+          transferType:"",
+          orderByColumn: "id",
+          isAsc: "desc",
+        },
+        capitalExpenditureOpen:false,
+        projectForm:{
+          projectId:null,
+          projectName:null,
+          projectContractor:null,
+          projectAmount:null,
+          projectBillNum:null,
+          projectFundType:'1',
+          outId:null,
+          ynType:'1'
+        },
+        projectFundType:''
+      };
+    },
+    created() {
+      let queryParams={
+        pageNum: 1,
+        pageSize: 100,
+      }
+      listProject(queryParams).then(response => {
+        this.projectList = response.rows;
+        for (var i = 0; i < response.rows.length; i++) {
+          this.projectListShow.push({text: response.rows[i].projectName, value: response.rows[i].id});
+        }
+      });
+      this.getDicts("project_fund_type").then((response) => {
+        for (var i = 0; i < response.data.length; i++) {
+          this.projectFundTypeOptions.push({text: response.data[i].dictLabel, value: response.data[i].dictValue});
+        }
+        this.projectFundTypeDictionaries = response.data;
+      });
+      this.getDictionaries();
+      this.getFileList();
+    },
+    methods: {
+      goFlow(){
+        window.location='approvalProcess?id='+this.$route.query.id;
+      },
+      getDictionaries(){
+        getCash(this.$route.query.id).then((response) => {
+          this.getDicts("capital_expenditure_type").then((res) => {
+            for (var i = 0; i < res.data.length; i++) {
+              this.capitalExpenditureTypeOptions.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
+            }
+            this.capitalExpenditureType = this.selectDictLabel(res.data, response.data.capitalExpenditureType);
+          });
+          if(response.data.capitalExpenditureType==2){
+            this.capitalExpenditureOpen = true
+            let param={
+              'outId' : response.data.id,
+              'ynType' : '2'
+            }
+            getProjectto(param).then(res => {
+              this.projectFundType = this.selectDictLabel(this.projectFundTypeDictionaries, res.data.projectFundType);
+              this.projectForm = res.data
+            })
+          }else{
+            this.showproject = false
+          }
+          this.form = response.data;
+        });
+        console.log(this.$route.query.id)
+        listCashdetailByCashId(this.$route.query.id).then((response) => {
+          this.chargeItme = response.data;
+          console.log(response)
+          this.getPayeeList();
+        });
+      },
+      addChargeItme(index){
+        this.chargeItme.splice(index + 1, 0, {
+          payeeId: "", //收款方ID
+          payee: "", //收款方
+          payeeAccount: "", //收款账户
+          bankDeposit: "", //开户银行
+          incomeAmount: "", //收入金额
+          bankType: "", //所属银行
+        });
+      },
+      getPayeeList() {
+        //普通转账
+        this.queryParams.accountType = this.form.accountType
+        this.queryParams.status = "0"
+        listPayee(this.queryParams).then((response) => {
+          for (var i = 0; i < response.rows.length; i++) {
+            this.payeeList.push({text: response.rows[i].payee, value: response.rows[i].id});
+          }
+        });
+      },
+      payeeDictLabel(datas, value) {
+        var actions = [];
+        Object.keys(datas).some((key) => {
+          if (datas[key].payeeId == ('' + value)) {
+            actions.push(datas[key].payee);
+            return true;
+          }
+        })
+        return actions.join('');
+      },
+      onConfirmCapital(data){
+        console.log(data)
+        if (data.value != 2){
+          this.capitalExpenditureOpen = false;
+          this.projectForm = [];
+        }else{
+          this.capitalExpenditureOpen = true;
+        }
+        this.capitalExpenditureType = data.text;
+        this.form.capitalExpenditureType = data.value;
+        this.showcapital = false;
+      },
+      onConfirmFundType(data){
+        console.log(data)
+        this.projectForm.projectFundType = data.value;
+        this.projectFundType = data.text;
+        this.showFundType = false;
+      },
+      onConfirmProject(data){
+        console.log(data)
+        this.projectList.map(res => {
+          console.log(res)
+          if(res.projectName==data.text){
+            this.projectForm.projectId = res.id
+            this.projectForm.projectName = res.projectName
+            this.projectForm.projectContractor = res.projectContractor
+            this.projectForm.projectAmount = res.projectAmount
+            console.log(this.projectForm)
+          }
+        })
+        this.showproject = false;
+      },
+      onConfirmPayee(data){
+        // this.chargeItme[this.chargeItme.length-1].payeeText = data.text;
+        this.chargeItme[this.chargeItme.length-1].payee = data.text;
+        this.chargeItme[this.chargeItme.length-1].payeeId = data.value;
+        console.log(this.chargeItme)
+        this.showpayee = false;
+      },
+      onConfirmBankType(data){
+        console.log(this.chargeItme)
+        this.chargeItme[this.chargeItme.length-1].bankTypeText = data.text;
+        this.chargeItme[this.chargeItme.length-1].bankType = data.value;
+        this.showbankType = false;
+      },
+      onConfirmLasj(data){
+        this.form.applyDate = this.getNowFormatDate(data).substr(0,10);
+        this.showlasj = false;
+      },
+      accountTypeChange(e){
+        console.log(e)
+        this.payeeList = [];
+        this.queryParams.accountType = this.form.accountType
+        this.queryParams.status = "0"
+        listPayee(this.queryParams).then((response) => {
+          for (var i = 0; i < response.rows.length; i++) {
+            this.payeeList.push({text: response.rows[i].payee, value: response.rows[i].id});
+          }
+        });
+      },
+      goAdd(){
+        if(this.form.remark != null && this.form.remark.indexOf("|")!=-1){
+          this.$toast.error("付款事由禁止包含|。");
+          return;
+        }
+        if(this.form.capitalExpenditureType==2){
+          if(this.projectForm.projectName==""||this.projectForm.projectName==null){
+            this.$toast.error('请选择项目名称！');
+            return;
+          }
+          if(this.projectForm.projectBillNum==""||this.projectForm.projectBillNum==null){
+            this.$toast.error('请输入工程发票号！');
+            return;
+          }
+        }
+        this.$set(this.form, "payeeList", this.chargeItme);
+        this.$set(this.form, "bankTypeList", this.chargeItme);
+        this.$set(this.form, "accountTypeList", this.chargeItme);
+        this.$set(this.form, "transferStatusList", this.chargeItme);
+        console.log(this.form);
+        updateTransfer(this.form).then(response => {
+          console.log(response);
+          this.projectForm.outId = this.form.id
+          this.$set(this.projectForm, "ynType", '1');
+          console.log(this.projectForm)
+          if(this.form.capitalExpenditureType==2){
+            addProjectto(this.projectForm).then(res => {
+              customSubmit(this.form.id).then(res => {
+                this.$toast.success('提交成功');
+                setTimeout(function(){
+                  history.go(-1)
+                },2000)
+              })
+            })
+          }else{
+            customSubmit(this.form.id).then(res => {
+              this.$toast.success('提交成功');
+              setTimeout(function(){
+                history.go(-1)
+              },2000)
+            })
+          }
+        });
+      },
+      goUpdate(){
+        if(this.form.remark != null && this.form.remark.indexOf("|")!=-1){
+          this.$toast.error("付款事由禁止包含|。");
+          return;
+        }
+        if(this.form.capitalExpenditureType==2){
+          if(this.projectForm.projectName==""||this.projectForm.projectName==null){
+            this.$toast.error('请选择项目名称！');
+            return;
+          }
+          if(this.projectForm.projectBillNum==""||this.projectForm.projectBillNum==null){
+            this.$toast.error('请输入工程发票号！');
+            return;
+          }
+        }
+        this.$set(this.form, "payeeList", this.chargeItme);
+        this.$set(this.form, "bankTypeList", this.chargeItme);
+        this.$set(this.form, "accountTypeList", this.chargeItme);
+        this.$set(this.form, "transferStatusList", this.chargeItme);
+        this.projectForm.outId = this.form.id
+        updateTransfer(this.form).then((response) => {
+          this.projectForm.outId = this.form.id
+          this.$set(this.projectForm, "ynType", '1');
+          if(this.form.capitalExpenditureType==2){
+            addProjectto(this.projectForm).then(res => {
+              this.$toast.success('修改成功');
+              setTimeout(function(){
+                history.go(-1)
+              },2000)
+            })
+          }else{
+            this.$toast.success('修改成功');
+            setTimeout(function(){
+              history.go(-1)
+            },2000)
+          }
+        });
+      },
+      beforeRead(file) {
+        console.log(file)
+        console.log(this.fileList)
+        const params = new FormData();
+        params.append("tableId", this.$route.query.id);
+        params.append("tableName", "t_yinnong_cash");
+        params.append("bizPath", "upload");
+        params.append("fileType", "0");
+        params.append("file", file.file);
+        commonAttach(params).then((response) => {
+          console.log(response)
+        })
+      },
+      getFileList(){
+        let oData= {
+          tableId: this.$route.query.id,
+          tableName: "t_yinnong_transfer",
+          bizPath: "upload",
+          fileType: "0",
+        }
+        attachmentList(oData).then(res => {
+          console.log(res)
+          console.log(location.protocol+"//"+location.host+request.defaults.baseURL)
+          res.rows.map(r => {
+
+            let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
+            this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{})})
+            console.log(r)
+          })
+        })
+      },
+      goBack(){
+        window.history.go(-1)
+      },
+      //删除家庭成员
+      deleteChargeItme(index){
+        this.chargeItme.splice(index,1)
+      },
+    },
+  }
+</script>
+
+<style scoped lang="scss">
+  .app-container {
+    padding: 2% 0;
+  }
+  .main_title{
+    font-size: 0.4rem;
+    color: #1D6FE9;
+    margin: 0.2rem 6%;
+    position: relative;
+  }
+  .main_box{
+    width: 96%;
+    margin: 0 auto;
+    border-radius: 6px;
+    box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);
+    overflow: hidden;
+    background-color: #FFF;
+  }
+  .submitButton{
+    width: 80%;
+    margin: 0 auto;
+    background-color: #1D6FE9;
+  }
+
+  .addFamily{
+    position: absolute;
+    top: -2px;
+    right: 0;
+    border-radius: 50%;
+  }
+  .deleteFamily{
+    position: absolute;
+    top: 0rem;
+    right: 6%;
+    z-index: 9;
+    border-radius: 50%;
+  }
+</style>
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail12.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail12.vue
new file mode 100644
index 00000000..e6cc3bbe
--- /dev/null
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail12.vue
@@ -0,0 +1,482 @@
+<template>
+  <div class="app-container">
+    <van-nav-bar
+      left-arrow
+      fixed
+      placeholder
+      @click-left="$router.back(-1)"
+    >
+      <template #title>
+        <p style="font-weight: bold;">查看汇票支出申请</p>
+      </template>
+      <template #right>
+        <van-icon name="../../../static/images/icon/icon_flow.png" size="20" @click="goFlow"/>
+      </template>
+    </van-nav-bar>
+    <p class="main_title">基础信息</p>
+    <div class="main_box">
+      <van-field readonly label="申请时间" v-model="form.applyDate" input-align="right" />
+      <van-field readonly label="资金支出类别" v-model="capitalExpenditureType" input-align="right" label-width="auto" />
+    </div>
+
+    <div class="main_box" style="margin-top: 10px;">
+      <van-field readonly label="付款事由" v-model="form.remark" type="textarea" input-align="right" rows="3" label-width="auto"/>
+    </div>
+
+    <div class="main_box" style="margin-top: 10px;">
+      <van-field readonly label="说明情况" v-model="form.explainSituation" type="textarea" input-align="right" rows="3" label-width="auto"/>
+    </div>
+
+    <div class="main_box" v-if="capitalExpenditureOpen" style="margin-bottom: 10px;margin-top: 10px;position:relative;">
+      <van-field readonly label="项目名称" v-model="projectForm.projectName" input-align="right" />
+      <van-field readonly label="承建单位" v-model="projectForm.projectContractor" input-align="right" label-width="auto"/>
+      <van-field readonly label="合同价款（元）" v-model="projectForm.projectAmount" input-align="right" label-width="auto"/>
+      <van-field readonly label="工程款类型" v-model="projectFundType" input-align="right" />
+      <van-field readonly label="工程发票号" v-model="projectForm.projectBillNum" input-align="right" label-width="auto"/>
+    </div>
+
+    <p class="main_title">出票方信息</p>
+    <div class="main_box">
+      <van-field readonly label="付款方" v-model="form.payer" input-align="right" label-width="auto"/>
+      <van-field :rules="[{ required: true , message:'请输入汇票号码' }]" required label="汇票号码" v-model="form.payerAccount" placeholder="请输入汇票号码" input-align="right" label-width="auto"/>
+      <van-field
+        readonly
+        label="出票金额（元）"
+        v-model="form.expenditureAmount"
+        placeholder=""
+        input-align="right"
+        label-width="auto"
+        required
+        :rules="[{ required: true , message:'出票金额不能为空！' }]"
+      />
+      <van-field
+        readonly
+        label="汇票类型"
+        v-model="orderTypeName"
+        placeholder=""
+        input-align="right"
+        label-width="auto"
+        required
+        :rules="[{ required: true , message:'汇票类型不能为空！' }]"
+      />
+      <van-field
+        readonly
+        label="汇票类型"
+        v-model="form.orderType"
+        placeholder=""
+        input-align="right"
+        label-width="auto"
+        style="display: none"
+        required
+        :rules="[{ required: true , message:'汇票类型不能为空！' }]"
+      />
+      <van-field
+        readonly
+        label="开票日"
+        v-model="form.startTime"
+        placeholder=""
+        input-align="right"
+        label-width="auto"
+        required
+        :rules="[{ required: true , message:'开票日不能为空！' }]"
+      />
+      <van-field
+        readonly
+        label="到期日"
+        v-model="form.endTime"
+        placeholder=""
+        input-align="right"
+        label-width="auto"
+        required
+        :rules="[{ required: true , message:'到期日不能为空！' }]"
+      />
+    </div>
+
+    <p class="main_title">收票方信息</p>
+
+    <div :style="{position:'relative',padding: index == 0 ? '':'10px 0 0 0'}" v-for="(item, index) in chargeItme" :key="index">
+      <div class="main_box" style="margin-bottom: 10px;position:relative;">
+        <van-field readonly label="收款方" v-model="item.payee" input-align="right" />
+        <van-field readonly label="收款账户" v-model="item.payeeAccount" input-align="right" label-width="auto"/>
+        <van-field readonly label="开户银行" v-model="item.bankDeposit" input-align="right" label-width="auto"/>
+        <van-field readonly label="收入金额" v-model="item.incomeAmount" input-align="right" label-width="auto"/>
+        <van-field readonly label="所属银行" v-model="item.bankTypeText" input-align="right" />
+      </div>
+    </div>
+    <p class="main_title">上传附件</p>
+    <div class="main_box" style="padding: 5px 0 0 8px;">
+      <van-uploader v-model="fileList" :after-read="beforeRead" :deletable="false" disabled  :upload-text="'未上传附件'"></van-uploader>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { getTransfer , queryTransferDetail , listPayee , updateTransfer , getProjectto , listProject , addProjectto , customSubmit} from "@/api/onlineHome/bankAgriculture/paymentApproval";
+  import request from '@/utils/request'
+  import {
+    attachmentList,
+    commonAttach,
+    getCash,
+    listCashdetailByCashId
+  } from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
+  export default {
+    name: "approvalDetail12",
+    data() {
+      return {
+        showcapital:false,
+        showpayee:false,
+        showlasj:false,
+        showbankType:false,
+        showproject:false,
+        showFundType:false,
+
+        minDate: new Date(),
+        maxDate: new Date(2025, 10, 1),
+        currentDate: new Date(),
+        form:{},
+        fileList:[],
+        capitalExpenditureType:'',
+        payee:'',
+        bankType:'',
+
+        wfydlxDictionaries:[],
+        jglxDictionaries:[],
+        sysDictionaries:[],
+        capitalExpenditureTypeOptions:[],
+        bankTypeDictionaries:[],
+        projectList:[],
+        projectFundTypeOptions:[],
+        projectFundTypeDictionaries:[],
+        projectListShow:[],
+
+        chargeItme:[],
+        chargeItmeShow:[],
+
+        payeeList:[],
+        // 查询参数
+        queryParams: {
+          transferType:"",
+          orderByColumn: "id",
+          isAsc: "desc",
+        },
+        capitalExpenditureOpen:false,
+        projectForm:{
+          projectId:null,
+          projectName:null,
+          projectContractor:null,
+          projectAmount:null,
+          projectBillNum:null,
+          projectFundType:'1',
+          outId:null,
+          ynType:'1'
+        },
+        projectFundType:''
+      };
+    },
+    created() {
+      let queryParams={
+        pageNum: 1,
+        pageSize: 100,
+      }
+      listProject(queryParams).then(response => {
+        console.log(response)
+        this.projectList = response.rows;
+        for (var i = 0; i < response.rows.length; i++) {
+          this.projectListShow.push({text: response.rows[i].projectName, value: response.rows[i].id});
+        }
+      });
+      this.getDicts("project_fund_type").then((response) => {
+        for (var i = 0; i < response.data.length; i++) {
+          this.projectFundTypeOptions.push({text: response.data[i].dictLabel, value: response.data[i].dictValue});
+        }
+        this.projectFundTypeDictionaries = response.data;
+      });
+      this.getDictionaries();
+      this.getFileList();
+    },
+    methods: {
+      goFlow(){
+        window.location='approvalProcess?id='+this.$route.query.id;
+      },
+      getDictionaries(){
+        getCash(this.$route.query.id).then((response) => {
+          this.getDicts("capital_expenditure_type").then((res) => {
+            for (var i = 0; i < res.data.length; i++) {
+              this.capitalExpenditureTypeOptions.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
+            }
+            this.capitalExpenditureType = this.selectDictLabel(res.data, response.data.capitalExpenditureType);
+          });
+          if(response.data.capitalExpenditureType==2){
+            this.capitalExpenditureOpen = true
+            let param={
+              'outId' : response.data.id,
+              'ynType' : '2'
+            }
+            getProjectto(param).then(res => {
+              this.projectFundType = this.selectDictLabel(this.projectFundTypeDictionaries, res.data.projectFundType);
+              this.projectForm = res.data
+            })
+          }else{
+            this.showproject = false
+          }
+          this.form = response.data;
+        });
+        console.log(this.$route.query.id)
+        listCashdetailByCashId(this.$route.query.id).then((response) => {
+          this.chargeItme = response.data;
+          console.log(response.data)
+          this.getPayeeList();
+        });
+      },
+      addChargeItme(index){
+        this.chargeItme.splice(index + 1, 0, {
+          payeeId: "", //收款方ID
+          payee: "", //收款方
+          payeeAccount: "", //收款账户
+          bankDeposit: "", //开户银行
+          incomeAmount: "", //收入金额
+          bankType: "", //所属银行
+        });
+      },
+      getPayeeList() {
+        //普通转账
+        this.queryParams.accountType = this.form.accountType
+        this.queryParams.status = "0"
+        listPayee(this.queryParams).then((response) => {
+          for (var i = 0; i < response.rows.length; i++) {
+            this.payeeList.push({text: response.rows[i].payee, value: response.rows[i].id});
+          }
+        });
+      },
+      payeeDictLabel(datas, value) {
+        var actions = [];
+        Object.keys(datas).some((key) => {
+          if (datas[key].payeeId == ('' + value)) {
+            actions.push(datas[key].payee);
+            return true;
+          }
+        })
+        return actions.join('');
+      },
+      onConfirmCapital(data){
+        console.log(data)
+        if (data.value != 2){
+          this.capitalExpenditureOpen = false;
+          this.projectForm = [];
+        }else{
+          this.capitalExpenditureOpen = true;
+        }
+        this.capitalExpenditureType = data.text;
+        this.form.capitalExpenditureType = data.value;
+        this.showcapital = false;
+      },
+      onConfirmFundType(data){
+        console.log(data)
+        this.projectForm.projectFundType = data.value;
+        this.projectFundType = data.text;
+        this.showFundType = false;
+      },
+      onConfirmProject(data){
+        console.log(data)
+        this.projectList.map(res => {
+          console.log(res)
+          if(res.projectName==data.text){
+            this.projectForm.projectId = res.id
+            this.projectForm.projectName = res.projectName
+            this.projectForm.projectContractor = res.projectContractor
+            this.projectForm.projectAmount = res.projectAmount
+            console.log(this.projectForm)
+          }
+        })
+        this.showproject = false;
+      },
+      onConfirmPayee(data){
+        // this.chargeItme[this.chargeItme.length-1].payeeText = data.text;
+        this.chargeItme[this.chargeItme.length-1].payee = data.text;
+        this.chargeItme[this.chargeItme.length-1].payeeId = data.value;
+        console.log(this.chargeItme)
+        this.showpayee = false;
+      },
+      onConfirmBankType(data){
+        console.log(this.chargeItme)
+        this.chargeItme[this.chargeItme.length-1].bankTypeText = data.text;
+        this.chargeItme[this.chargeItme.length-1].bankType = data.value;
+        this.showbankType = false;
+      },
+      onConfirmLasj(data){
+        this.form.applyDate = this.getNowFormatDate(data).substr(0,10);
+        this.showlasj = false;
+      },
+      accountTypeChange(e){
+        console.log(e)
+        this.payeeList = [];
+        this.queryParams.accountType = this.form.accountType
+        this.queryParams.status = "0"
+        listPayee(this.queryParams).then((response) => {
+          for (var i = 0; i < response.rows.length; i++) {
+            this.payeeList.push({text: response.rows[i].payee, value: response.rows[i].id});
+          }
+        });
+      },
+      goAdd(){
+        if(this.form.remark != null && this.form.remark.indexOf("|")!=-1){
+          this.$toast.error("付款事由禁止包含|。");
+          return;
+        }
+        if(this.form.capitalExpenditureType==2){
+          if(this.projectForm.projectName==""||this.projectForm.projectName==null){
+            this.$toast.error('请选择项目名称！');
+            return;
+          }
+          if(this.projectForm.projectBillNum==""||this.projectForm.projectBillNum==null){
+            this.$toast.error('请输入工程发票号！');
+            return;
+          }
+        }
+        this.$set(this.form, "payeeList", this.chargeItme);
+        this.$set(this.form, "bankTypeList", this.chargeItme);
+        this.$set(this.form, "accountTypeList", this.chargeItme);
+        this.$set(this.form, "transferStatusList", this.chargeItme);
+        console.log(this.form);
+        updateTransfer(this.form).then(response => {
+          console.log(response);
+          this.projectForm.outId = this.form.id
+          this.$set(this.projectForm, "ynType", '1');
+          console.log(this.projectForm)
+          if(this.form.capitalExpenditureType==2){
+            addProjectto(this.projectForm).then(res => {
+              customSubmit(this.form.id).then(res => {
+                this.$toast.success('提交成功');
+                setTimeout(function(){
+                  history.go(-1)
+                },2000)
+              })
+            })
+          }else{
+            customSubmit(this.form.id).then(res => {
+              this.$toast.success('提交成功');
+              setTimeout(function(){
+                history.go(-1)
+              },2000)
+            })
+          }
+        });
+      },
+      goUpdate(){
+        if(this.form.remark != null && this.form.remark.indexOf("|")!=-1){
+          this.$toast.error("付款事由禁止包含|。");
+          return;
+        }
+        if(this.form.capitalExpenditureType==2){
+          if(this.projectForm.projectName==""||this.projectForm.projectName==null){
+            this.$toast.error('请选择项目名称！');
+            return;
+          }
+          if(this.projectForm.projectBillNum==""||this.projectForm.projectBillNum==null){
+            this.$toast.error('请输入工程发票号！');
+            return;
+          }
+        }
+        this.$set(this.form, "payeeList", this.chargeItme);
+        this.$set(this.form, "bankTypeList", this.chargeItme);
+        this.$set(this.form, "accountTypeList", this.chargeItme);
+        this.$set(this.form, "transferStatusList", this.chargeItme);
+        this.projectForm.outId = this.form.id
+        updateTransfer(this.form).then((response) => {
+          this.projectForm.outId = this.form.id
+          this.$set(this.projectForm, "ynType", '1');
+          if(this.form.capitalExpenditureType==2){
+            addProjectto(this.projectForm).then(res => {
+              this.$toast.success('修改成功');
+              setTimeout(function(){
+                history.go(-1)
+              },2000)
+            })
+          }else{
+            this.$toast.success('修改成功');
+            setTimeout(function(){
+              history.go(-1)
+            },2000)
+          }
+        });
+      },
+      beforeRead(file) {
+        console.log(file)
+        console.log(this.fileList)
+        const params = new FormData();
+        params.append("tableId", this.$route.query.id);
+        params.append("tableName", "t_yinnong_cash");
+        params.append("bizPath", "upload");
+        params.append("fileType", "0");
+        params.append("file", file.file);
+        commonAttach(params).then((response) => {
+          console.log(response)
+        })
+      },
+      getFileList(){
+        let oData= {
+          tableId: this.$route.query.id,
+          tableName: "t_yinnong_transfer",
+          bizPath: "upload",
+          fileType: "0",
+        }
+        attachmentList(oData).then(res => {
+          console.log(res)
+          console.log(location.protocol+"//"+location.host+request.defaults.baseURL)
+          res.rows.map(r => {
+
+            let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
+            this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{})})
+            console.log(r)
+          })
+        })
+      },
+      goBack(){
+        window.history.go(-1)
+      },
+      //删除家庭成员
+      deleteChargeItme(index){
+        this.chargeItme.splice(index,1)
+      },
+    },
+  }
+</script>
+
+<style scoped lang="scss">
+  .app-container {
+    padding: 2% 0;
+  }
+  .main_title{
+    font-size: 0.4rem;
+    color: #1D6FE9;
+    margin: 0.2rem 6%;
+    position: relative;
+  }
+  .main_box{
+    width: 96%;
+    margin: 0 auto;
+    border-radius: 6px;
+    box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);
+    overflow: hidden;
+    background-color: #FFF;
+  }
+  .submitButton{
+    width: 80%;
+    margin: 0 auto;
+    background-color: #1D6FE9;
+  }
+
+  .addFamily{
+    position: absolute;
+    top: -2px;
+    right: 0;
+    border-radius: 50%;
+  }
+  .deleteFamily{
+    position: absolute;
+    top: 0rem;
+    right: 6%;
+    z-index: 9;
+    border-radius: 50%;
+  }
+</style>
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail2.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail2.vue
new file mode 100644
index 00000000..c295f76e
--- /dev/null
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail2.vue
@@ -0,0 +1,437 @@
+<template>
+  <div class="app-container">
+    <van-nav-bar
+      left-arrow
+      fixed
+      placeholder
+      @click-left="$router.back(-1)"
+    >
+      <template #title>
+        <p style="font-weight: bold;">查看付款申请</p>
+      </template>
+      <template #right>
+        <van-icon name="../../../static/images/icon/icon_flow.png" size="20" @click="goFlow"/>
+      </template>
+    </van-nav-bar>
+    <p class="main_title">基础信息</p>
+    <div class="main_box">
+      <van-field readonly label="申请时间" v-model="form.applyDate" input-align="right" />
+      <van-field readonly label="资金支出类别" v-model="capitalExpenditureType" input-align="right" label-width="auto" />
+      <van-field readonly label="支出总金额" v-model="form.expenditureAmount" input-align="right" label-width="auto"/>
+    </div>
+
+    <div class="main_box" style="margin-top: 10px;">
+      <van-field readonly label="付款事由" v-model="form.remark" type="textarea" input-align="right" rows="3" label-width="auto"/>
+    </div>
+
+    <div class="main_box" style="margin-top: 10px;">
+      <van-field readonly label="说明情况" v-model="form.explainSituation" type="textarea" input-align="right" rows="3" label-width="auto"/>
+    </div>
+
+    <p class="main_title">付款方信息</p>
+    <div class="main_box">
+      <van-field readonly label="付款方" v-model="form.payer" input-align="right" label-width="auto"/>
+      <van-field readonly label="付款方账户" v-model="form.payerAccount" input-align="right" label-width="auto"/>
+    </div>
+
+    <div class="main_box" v-if="capitalExpenditureOpen" style="margin-bottom: 10px;margin-top: 10px;position:relative;">
+      <van-field readonly label="项目名称" v-model="projectForm.projectName" input-align="right" />
+      <van-field readonly label="承建单位" v-model="projectForm.projectContractor" input-align="right" label-width="auto"/>
+      <van-field readonly label="合同价款（元）" v-model="projectForm.projectAmount" input-align="right" label-width="auto"/>
+      <van-field readonly label="工程款类型" v-model="projectFundType" input-align="right" />
+      <van-field readonly label="工程发票号" v-model="projectForm.projectBillNum" input-align="right" label-width="auto"/>
+    </div>
+
+    <p class="main_title">列表信息</p>
+
+    <div class="main_box" style="margin-bottom: 15px;">
+      <van-field readonly label="收款账户类型" v-model="form.accountType == 1 ? '公户':'私户'" input-align="right" label-width="auto" />
+    </div>
+
+    <div :style="{position:'relative',padding: index == 0 ? '':'10px 0 0 0'}" v-for="(item, index) in chargeItme" :key="index">
+      <div class="main_box" style="margin-bottom: 10px;position:relative;">
+        <van-field readonly label="收款方" v-model="item.payee" input-align="right" />
+        <van-field readonly label="收款账户" v-model="item.payeeAccount" input-align="right" label-width="auto"/>
+        <van-field readonly label="开户银行" v-model="item.bankDeposit" input-align="right" label-width="auto"/>
+        <van-field readonly label="收入金额" v-model="item.incomeAmount" input-align="right" label-width="auto"/>
+        <van-field readonly label="所属银行" v-model="item.bankTypeText" input-align="right" />
+      </div>
+    </div>
+    <p class="main_title">上传附件</p>
+    <div class="main_box" style="padding: 5px 0 0 8px;">
+      <van-uploader v-model="fileList" :after-read="beforeRead" :deletable="false" disabled  :upload-text="'未上传附件'"></van-uploader>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { getTransfer , queryTransferDetail , listPayee , updateTransfer , getProjectto , listProject , addProjectto , customSubmit} from "@/api/onlineHome/bankAgriculture/paymentApproval";
+  import request from '@/utils/request'
+  import {attachmentList, commonAttach} from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
+  export default {
+    name: "approvalDetail",
+    data() {
+      return {
+        showcapital:false,
+        showpayee:false,
+        showlasj:false,
+        showbankType:false,
+        showproject:false,
+        showFundType:false,
+
+        minDate: new Date(),
+        maxDate: new Date(2025, 10, 1),
+        currentDate: new Date(),
+        form:{},
+        fileList:[],
+        capitalExpenditureType:'',
+        payee:'',
+        bankType:'',
+
+        wfydlxDictionaries:[],
+        jglxDictionaries:[],
+        sysDictionaries:[],
+        capitalExpenditureTypeOptions:[],
+        bankTypeDictionaries:[],
+        projectList:[],
+        projectFundTypeOptions:[],
+        projectFundTypeDictionaries:[],
+        projectListShow:[],
+
+        chargeItme:[],
+        chargeItmeShow:[],
+
+        payeeList:[],
+        // 查询参数
+        queryParams: {
+          transferType:"",
+          orderByColumn: "id",
+          isAsc: "desc",
+        },
+        capitalExpenditureOpen:false,
+        projectForm:{
+          projectId:null,
+          projectName:null,
+          projectContractor:null,
+          projectAmount:null,
+          projectBillNum:null,
+          projectFundType:'1',
+          outId:null,
+          ynType:'1'
+        },
+        projectFundType:''
+      };
+    },
+    created() {
+      let queryParams={
+        pageNum: 1,
+        pageSize: 100,
+      }
+      listProject(queryParams).then(response => {
+        console.log(response)
+        this.projectList = response.rows;
+        for (let i = 0; i < response.rows.length; i++) {
+          this.projectListShow.push({text: response.rows[i].projectName, value: response.rows[i].id});
+        }
+      });
+      this.getDicts("project_fund_type").then((response) => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.projectFundTypeOptions.push({text: response.data[i].dictLabel, value: response.data[i].dictValue});
+        }
+        this.projectFundTypeDictionaries = response.data;
+      });
+      this.getDictionaries();
+      this.getFileList();
+    },
+    methods: {
+      goFlow(){
+        window.location='approvalProcess?id='+this.$route.query.id;
+      },
+      getDictionaries(){
+        getTransfer(this.$route.query.id).then((response) => {
+          this.getDicts("capital_expenditure_type").then((res) => {
+            for (var i = 0; i < res.data.length; i++) {
+              this.capitalExpenditureTypeOptions.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
+            }
+            this.capitalExpenditureType = this.selectDictLabel(res.data, response.data.capitalExpenditureType);
+          });
+          if(response.data.capitalExpenditureType==2){
+            this.capitalExpenditureOpen = true
+            let param={
+              'outId' : response.data.id,
+              'ynType' : '1'
+            }
+            getProjectto(param).then(res => {
+              this.projectFundType = this.selectDictLabel(this.projectFundTypeDictionaries, res.data.projectFundType);
+              this.projectForm = res.data
+            })
+          }else{
+            this.showproject = false
+          }
+          this.form = response.data;
+        });
+        queryTransferDetail(this.$route.query.id).then((response) => {
+          this.getDicts("bank_type").then(res => {
+            for (var i = 0; i < res.data.length; i++) {
+              this.bankTypeDictionaries.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
+            }
+            for (var j = 0 ; j < response.rows.length ; j++){
+              response.rows[j].bankTypeText = this.selectDictLabel(res.data, response.rows[j].bankType);
+            }
+            this.chargeItme = response.rows;
+          });
+          this.getPayeeList();
+        });
+      },
+      addChargeItme(index){
+        this.chargeItme.splice(index + 1, 0, {
+          payeeId: "", //收款方ID
+          payee: "", //收款方
+          payeeAccount: "", //收款账户
+          bankDeposit: "", //开户银行
+          incomeAmount: "", //收入金额
+          bankType: "", //所属银行
+        });
+      },
+      getPayeeList() {
+        //普通转账
+        this.queryParams.accountType = this.form.accountType
+        this.queryParams.status = "0"
+        listPayee(this.queryParams).then((response) => {
+          for (var i = 0; i < response.rows.length; i++) {
+            this.payeeList.push({text: response.rows[i].payee, value: response.rows[i].id});
+          }
+        });
+      },
+      payeeDictLabel(datas, value) {
+        var actions = [];
+        Object.keys(datas).some((key) => {
+          if (datas[key].payeeId == ('' + value)) {
+            actions.push(datas[key].payee);
+            return true;
+          }
+        })
+        return actions.join('');
+      },
+      onConfirmCapital(data){
+        console.log(data)
+        if (data.value != 2){
+          this.capitalExpenditureOpen = false;
+          this.projectForm = [];
+        }else{
+          this.capitalExpenditureOpen = true;
+        }
+        this.capitalExpenditureType = data.text;
+        this.form.capitalExpenditureType = data.value;
+        this.showcapital = false;
+      },
+      onConfirmFundType(data){
+        console.log(data)
+        this.projectForm.projectFundType = data.value;
+        this.projectFundType = data.text;
+        this.showFundType = false;
+      },
+      onConfirmProject(data){
+        console.log(data)
+        this.projectList.map(res => {
+          console.log(res)
+          if(res.projectName==data.text){
+            this.projectForm.projectId = res.id
+            this.projectForm.projectName = res.projectName
+            this.projectForm.projectContractor = res.projectContractor
+            this.projectForm.projectAmount = res.projectAmount
+            console.log(this.projectForm)
+          }
+        })
+        this.showproject = false;
+      },
+      onConfirmPayee(data){
+        // this.chargeItme[this.chargeItme.length-1].payeeText = data.text;
+        this.chargeItme[this.chargeItme.length-1].payee = data.text;
+        this.chargeItme[this.chargeItme.length-1].payeeId = data.value;
+        console.log(this.chargeItme)
+        this.showpayee = false;
+      },
+      onConfirmBankType(data){
+        console.log(this.chargeItme)
+        this.chargeItme[this.chargeItme.length-1].bankTypeText = data.text;
+        this.chargeItme[this.chargeItme.length-1].bankType = data.value;
+        this.showbankType = false;
+      },
+      onConfirmLasj(data){
+        this.form.applyDate = this.getNowFormatDate(data).substr(0,10);
+        this.showlasj = false;
+      },
+      accountTypeChange(e){
+        console.log(e)
+        this.payeeList = [];
+        this.queryParams.accountType = this.form.accountType
+        this.queryParams.status = "0"
+        listPayee(this.queryParams).then((response) => {
+          for (var i = 0; i < response.rows.length; i++) {
+            this.payeeList.push({text: response.rows[i].payee, value: response.rows[i].id});
+          }
+        });
+      },
+      goAdd(){
+        if(this.form.remark != null && this.form.remark.indexOf("|")!=-1){
+          this.$toast.error("付款事由禁止包含|。");
+          return;
+        }
+        if(this.form.capitalExpenditureType==2){
+          if(this.projectForm.projectName==""||this.projectForm.projectName==null){
+            this.$toast.error('请选择项目名称！');
+            return;
+          }
+          if(this.projectForm.projectBillNum==""||this.projectForm.projectBillNum==null){
+            this.$toast.error('请输入工程发票号！');
+            return;
+          }
+        }
+        this.$set(this.form, "payeeList", this.chargeItme);
+        this.$set(this.form, "bankTypeList", this.chargeItme);
+        this.$set(this.form, "accountTypeList", this.chargeItme);
+        this.$set(this.form, "transferStatusList", this.chargeItme);
+        console.log(this.form);
+        updateTransfer(this.form).then(response => {
+          console.log(response);
+          this.projectForm.outId = this.form.id
+          this.$set(this.projectForm, "ynType", '1');
+          console.log(this.projectForm)
+          if(this.form.capitalExpenditureType==2){
+            addProjectto(this.projectForm).then(res => {
+              customSubmit(this.form.id).then(res => {
+                this.$toast.success('提交成功');
+                setTimeout(function(){
+                  history.go(-1)
+                },2000)
+              })
+            })
+          }else{
+            customSubmit(this.form.id).then(res => {
+              this.$toast.success('提交成功');
+              setTimeout(function(){
+                history.go(-1)
+              },2000)
+            })
+          }
+        });
+      },
+      goUpdate(){
+        if(this.form.remark != null && this.form.remark.indexOf("|")!=-1){
+          this.$toast.error("付款事由禁止包含|。");
+          return;
+        }
+        if(this.form.capitalExpenditureType==2){
+          if(this.projectForm.projectName==""||this.projectForm.projectName==null){
+            this.$toast.error('请选择项目名称！');
+            return;
+          }
+          if(this.projectForm.projectBillNum==""||this.projectForm.projectBillNum==null){
+            this.$toast.error('请输入工程发票号！');
+            return;
+          }
+        }
+        this.$set(this.form, "payeeList", this.chargeItme);
+        this.$set(this.form, "bankTypeList", this.chargeItme);
+        this.$set(this.form, "accountTypeList", this.chargeItme);
+        this.$set(this.form, "transferStatusList", this.chargeItme);
+        this.projectForm.outId = this.form.id
+        updateTransfer(this.form).then((response) => {
+          this.projectForm.outId = this.form.id
+          this.$set(this.projectForm, "ynType", '1');
+          if(this.form.capitalExpenditureType==2){
+            addProjectto(this.projectForm).then(res => {
+              this.$toast.success('修改成功');
+              setTimeout(function(){
+                history.go(-1)
+              },2000)
+            })
+          }else{
+            this.$toast.success('修改成功');
+            setTimeout(function(){
+              history.go(-1)
+            },2000)
+          }
+        });
+      },
+      beforeRead(file) {
+        console.log(file)
+        console.log(this.fileList)
+        const params = new FormData();
+        params.append("tableId", this.$route.query.id);
+        params.append("tableName", "t_yinnong_transfer");
+        params.append("bizPath", "upload");
+        params.append("fileType", "0");
+        params.append("file", file.file);
+        commonAttach(params).then((response) => {
+          console.log(response)
+        })
+      },
+      getFileList(){
+        let oData= {
+          tableId: this.$route.query.id,
+          tableName: "t_yinnong_transfer",
+          bizPath: "upload",
+          fileType: "0",
+        }
+        attachmentList(oData).then(res => {
+          console.log(res)
+          console.log(location.protocol+"//"+location.host+request.defaults.baseURL)
+          res.rows.map(r => {
+
+            let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
+            this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{})})
+            console.log(r)
+          })
+        })
+      },
+      goBack(){
+        window.history.go(-1)
+      },
+      //删除家庭成员
+      deleteChargeItme(index){
+        this.chargeItme.splice(index,1)
+      },
+    },
+  }
+</script>
+
+<style scoped lang="scss">
+  .app-container {
+    padding: 2% 0;
+  }
+  .main_title{
+    font-size: 0.4rem;
+    color: #1D6FE9;
+    margin: 0.2rem 6%;
+    position: relative;
+  }
+  .main_box{
+    width: 96%;
+    margin: 0 auto;
+    border-radius: 6px;
+    box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);
+    overflow: hidden;
+    background-color: #FFF;
+  }
+  .submitButton{
+    width: 80%;
+    margin: 0 auto;
+    background-color: #1D6FE9;
+  }
+
+  .addFamily{
+    position: absolute;
+    top: -2px;
+    right: 0;
+    border-radius: 50%;
+  }
+  .deleteFamily{
+    position: absolute;
+    top: 0rem;
+    right: 6%;
+    z-index: 9;
+    border-radius: 50%;
+  }
+</style>
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail3.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail3.vue
new file mode 100644
index 00000000..abbeba21
--- /dev/null
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail3.vue
@@ -0,0 +1,437 @@
+<template>
+  <div class="app-container">
+    <van-nav-bar
+      left-arrow
+      fixed
+      placeholder
+      @click-left="$router.back(-1)"
+    >
+      <template #title>
+        <p style="font-weight: bold;">查看付款申请</p>
+      </template>
+      <template #right>
+        <van-icon name="../../../static/images/icon/icon_flow.png" size="20" @click="goFlow"/>
+      </template>
+    </van-nav-bar>
+    <p class="main_title">基础信息</p>
+    <div class="main_box">
+      <van-field readonly label="申请时间" v-model="form.applyDate" input-align="right" />
+      <van-field readonly label="资金支出类别" v-model="capitalExpenditureType" input-align="right" label-width="auto" />
+      <van-field readonly label="支出总金额" v-model="form.expenditureAmount" input-align="right" label-width="auto"/>
+    </div>
+
+    <div class="main_box" style="margin-top: 10px;">
+      <van-field readonly label="付款事由" v-model="form.remark" type="textarea" input-align="right" rows="3" label-width="auto"/>
+    </div>
+
+    <div class="main_box" style="margin-top: 10px;">
+      <van-field readonly label="说明情况" v-model="form.explainSituation" type="textarea" input-align="right" rows="3" label-width="auto"/>
+    </div>
+
+    <p class="main_title">付款方信息</p>
+    <div class="main_box">
+      <van-field readonly label="付款方" v-model="form.payer" input-align="right" label-width="auto"/>
+      <van-field readonly label="付款方账户" v-model="form.payerAccount" input-align="right" label-width="auto"/>
+    </div>
+
+    <div class="main_box" v-if="capitalExpenditureOpen" style="margin-bottom: 10px;margin-top: 10px;position:relative;">
+      <van-field readonly label="项目名称" v-model="projectForm.projectName" input-align="right" />
+      <van-field readonly label="承建单位" v-model="projectForm.projectContractor" input-align="right" label-width="auto"/>
+      <van-field readonly label="合同价款（元）" v-model="projectForm.projectAmount" input-align="right" label-width="auto"/>
+      <van-field readonly label="工程款类型" v-model="projectFundType" input-align="right" />
+      <van-field readonly label="工程发票号" v-model="projectForm.projectBillNum" input-align="right" label-width="auto"/>
+    </div>
+
+    <p class="main_title">列表信息</p>
+
+    <div class="main_box" style="margin-bottom: 15px;">
+      <van-field readonly label="收款账户类型" v-model="form.accountType == 1 ? '公户':'私户'" input-align="right" label-width="auto" />
+    </div>
+
+    <div :style="{position:'relative',padding: index == 0 ? '':'10px 0 0 0'}" v-for="(item, index) in chargeItme" :key="index">
+      <div class="main_box" style="margin-bottom: 10px;position:relative;">
+        <van-field readonly label="收款方" v-model="item.payee" input-align="right" />
+        <van-field readonly label="收款账户" v-model="item.payeeAccount" input-align="right" label-width="auto"/>
+        <van-field readonly label="开户银行" v-model="item.bankDeposit" input-align="right" label-width="auto"/>
+        <van-field readonly label="收入金额" v-model="item.incomeAmount" input-align="right" label-width="auto"/>
+        <van-field readonly label="所属银行" v-model="item.bankTypeText" input-align="right" />
+      </div>
+    </div>
+    <p class="main_title">上传附件</p>
+    <div class="main_box" style="padding: 5px 0 0 8px;">
+      <van-uploader v-model="fileList" :after-read="beforeRead" :deletable="false" disabled  :upload-text="'未上传附件'"></van-uploader>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { getTransfer , queryTransferDetail , listPayee , updateTransfer , getProjectto , listProject , addProjectto , customSubmit} from "@/api/onlineHome/bankAgriculture/paymentApproval";
+  import request from '@/utils/request'
+  import {attachmentList, commonAttach} from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
+  export default {
+    name: "approvalDetail",
+    data() {
+      return {
+        showcapital:false,
+        showpayee:false,
+        showlasj:false,
+        showbankType:false,
+        showproject:false,
+        showFundType:false,
+
+        minDate: new Date(),
+        maxDate: new Date(2025, 10, 1),
+        currentDate: new Date(),
+        form:{},
+        fileList:[],
+        capitalExpenditureType:'',
+        payee:'',
+        bankType:'',
+
+        wfydlxDictionaries:[],
+        jglxDictionaries:[],
+        sysDictionaries:[],
+        capitalExpenditureTypeOptions:[],
+        bankTypeDictionaries:[],
+        projectList:[],
+        projectFundTypeOptions:[],
+        projectFundTypeDictionaries:[],
+        projectListShow:[],
+
+        chargeItme:[],
+        chargeItmeShow:[],
+
+        payeeList:[],
+        // 查询参数
+        queryParams: {
+          transferType:"",
+          orderByColumn: "id",
+          isAsc: "desc",
+        },
+        capitalExpenditureOpen:false,
+        projectForm:{
+          projectId:null,
+          projectName:null,
+          projectContractor:null,
+          projectAmount:null,
+          projectBillNum:null,
+          projectFundType:'1',
+          outId:null,
+          ynType:'1'
+        },
+        projectFundType:''
+      };
+    },
+    created() {
+      let queryParams={
+        pageNum: 1,
+        pageSize: 100,
+      }
+      listProject(queryParams).then(response => {
+        console.log(response)
+        this.projectList = response.rows;
+        for (var i = 0; i < response.rows.length; i++) {
+          this.projectListShow.push({text: response.rows[i].projectName, value: response.rows[i].id});
+        }
+      });
+      this.getDicts("project_fund_type").then((response) => {
+        for (var i = 0; i < response.data.length; i++) {
+          this.projectFundTypeOptions.push({text: response.data[i].dictLabel, value: response.data[i].dictValue});
+        }
+        this.projectFundTypeDictionaries = response.data;
+      });
+      this.getDictionaries();
+      this.getFileList();
+    },
+    methods: {
+      goFlow(){
+        window.location='approvalProcess?id='+this.$route.query.id;
+      },
+      getDictionaries(){
+        getTransfer(this.$route.query.id).then((response) => {
+          this.getDicts("capital_expenditure_type").then((res) => {
+            for (var i = 0; i < res.data.length; i++) {
+              this.capitalExpenditureTypeOptions.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
+            }
+            this.capitalExpenditureType = this.selectDictLabel(res.data, response.data.capitalExpenditureType);
+          });
+          if(response.data.capitalExpenditureType==2){
+            this.capitalExpenditureOpen = true
+            let param={
+              'outId' : response.data.id,
+              'ynType' : '1'
+            }
+            getProjectto(param).then(res => {
+              this.projectFundType = this.selectDictLabel(this.projectFundTypeDictionaries, res.data.projectFundType);
+              this.projectForm = res.data
+            })
+          }else{
+            this.showproject = false
+          }
+          this.form = response.data;
+        });
+        queryTransferDetail(this.$route.query.id).then((response) => {
+          this.getDicts("bank_type").then(res => {
+            for (var i = 0; i < res.data.length; i++) {
+              this.bankTypeDictionaries.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
+            }
+            for (var j = 0 ; j < response.rows.length ; j++){
+              response.rows[j].bankTypeText = this.selectDictLabel(res.data, response.rows[j].bankType);
+            }
+            this.chargeItme = response.rows;
+          });
+          this.getPayeeList();
+        });
+      },
+      addChargeItme(index){
+        this.chargeItme.splice(index + 1, 0, {
+          payeeId: "", //收款方ID
+          payee: "", //收款方
+          payeeAccount: "", //收款账户
+          bankDeposit: "", //开户银行
+          incomeAmount: "", //收入金额
+          bankType: "", //所属银行
+        });
+      },
+      getPayeeList() {
+        //普通转账
+        this.queryParams.accountType = this.form.accountType
+        this.queryParams.status = "0"
+        listPayee(this.queryParams).then((response) => {
+          for (var i = 0; i < response.rows.length; i++) {
+            this.payeeList.push({text: response.rows[i].payee, value: response.rows[i].id});
+          }
+        });
+      },
+      payeeDictLabel(datas, value) {
+        var actions = [];
+        Object.keys(datas).some((key) => {
+          if (datas[key].payeeId == ('' + value)) {
+            actions.push(datas[key].payee);
+            return true;
+          }
+        })
+        return actions.join('');
+      },
+      onConfirmCapital(data){
+        console.log(data)
+        if (data.value != 2){
+          this.capitalExpenditureOpen = false;
+          this.projectForm = [];
+        }else{
+          this.capitalExpenditureOpen = true;
+        }
+        this.capitalExpenditureType = data.text;
+        this.form.capitalExpenditureType = data.value;
+        this.showcapital = false;
+      },
+      onConfirmFundType(data){
+        console.log(data)
+        this.projectForm.projectFundType = data.value;
+        this.projectFundType = data.text;
+        this.showFundType = false;
+      },
+      onConfirmProject(data){
+        console.log(data)
+        this.projectList.map(res => {
+          console.log(res)
+          if(res.projectName==data.text){
+            this.projectForm.projectId = res.id
+            this.projectForm.projectName = res.projectName
+            this.projectForm.projectContractor = res.projectContractor
+            this.projectForm.projectAmount = res.projectAmount
+            console.log(this.projectForm)
+          }
+        })
+        this.showproject = false;
+      },
+      onConfirmPayee(data){
+        // this.chargeItme[this.chargeItme.length-1].payeeText = data.text;
+        this.chargeItme[this.chargeItme.length-1].payee = data.text;
+        this.chargeItme[this.chargeItme.length-1].payeeId = data.value;
+        console.log(this.chargeItme)
+        this.showpayee = false;
+      },
+      onConfirmBankType(data){
+        console.log(this.chargeItme)
+        this.chargeItme[this.chargeItme.length-1].bankTypeText = data.text;
+        this.chargeItme[this.chargeItme.length-1].bankType = data.value;
+        this.showbankType = false;
+      },
+      onConfirmLasj(data){
+        this.form.applyDate = this.getNowFormatDate(data).substr(0,10);
+        this.showlasj = false;
+      },
+      accountTypeChange(e){
+        console.log(e)
+        this.payeeList = [];
+        this.queryParams.accountType = this.form.accountType
+        this.queryParams.status = "0"
+        listPayee(this.queryParams).then((response) => {
+          for (var i = 0; i < response.rows.length; i++) {
+            this.payeeList.push({text: response.rows[i].payee, value: response.rows[i].id});
+          }
+        });
+      },
+      goAdd(){
+        if(this.form.remark != null && this.form.remark.indexOf("|")!=-1){
+          this.$toast.error("付款事由禁止包含|。");
+          return;
+        }
+        if(this.form.capitalExpenditureType==2){
+          if(this.projectForm.projectName==""||this.projectForm.projectName==null){
+            this.$toast.error('请选择项目名称！');
+            return;
+          }
+          if(this.projectForm.projectBillNum==""||this.projectForm.projectBillNum==null){
+            this.$toast.error('请输入工程发票号！');
+            return;
+          }
+        }
+        this.$set(this.form, "payeeList", this.chargeItme);
+        this.$set(this.form, "bankTypeList", this.chargeItme);
+        this.$set(this.form, "accountTypeList", this.chargeItme);
+        this.$set(this.form, "transferStatusList", this.chargeItme);
+        console.log(this.form);
+        updateTransfer(this.form).then(response => {
+          console.log(response);
+          this.projectForm.outId = this.form.id
+          this.$set(this.projectForm, "ynType", '1');
+          console.log(this.projectForm)
+          if(this.form.capitalExpenditureType==2){
+            addProjectto(this.projectForm).then(res => {
+              customSubmit(this.form.id).then(res => {
+                this.$toast.success('提交成功');
+                setTimeout(function(){
+                  history.go(-1)
+                },2000)
+              })
+            })
+          }else{
+            customSubmit(this.form.id).then(res => {
+              this.$toast.success('提交成功');
+              setTimeout(function(){
+                history.go(-1)
+              },2000)
+            })
+          }
+        });
+      },
+      goUpdate(){
+        if(this.form.remark != null && this.form.remark.indexOf("|")!=-1){
+          this.$toast.error("付款事由禁止包含|。");
+          return;
+        }
+        if(this.form.capitalExpenditureType==2){
+          if(this.projectForm.projectName==""||this.projectForm.projectName==null){
+            this.$toast.error('请选择项目名称！');
+            return;
+          }
+          if(this.projectForm.projectBillNum==""||this.projectForm.projectBillNum==null){
+            this.$toast.error('请输入工程发票号！');
+            return;
+          }
+        }
+        this.$set(this.form, "payeeList", this.chargeItme);
+        this.$set(this.form, "bankTypeList", this.chargeItme);
+        this.$set(this.form, "accountTypeList", this.chargeItme);
+        this.$set(this.form, "transferStatusList", this.chargeItme);
+        this.projectForm.outId = this.form.id
+        updateTransfer(this.form).then((response) => {
+          this.projectForm.outId = this.form.id
+          this.$set(this.projectForm, "ynType", '1');
+          if(this.form.capitalExpenditureType==2){
+            addProjectto(this.projectForm).then(res => {
+              this.$toast.success('修改成功');
+              setTimeout(function(){
+                history.go(-1)
+              },2000)
+            })
+          }else{
+            this.$toast.success('修改成功');
+            setTimeout(function(){
+              history.go(-1)
+            },2000)
+          }
+        });
+      },
+      beforeRead(file) {
+        console.log(file)
+        console.log(this.fileList)
+        const params = new FormData();
+        params.append("tableId", this.$route.query.id);
+        params.append("tableName", "t_yinnong_transfer");
+        params.append("bizPath", "upload");
+        params.append("fileType", "0");
+        params.append("file", file.file);
+        commonAttach(params).then((response) => {
+          console.log(response)
+        })
+      },
+      getFileList(){
+        let oData= {
+          tableId: this.$route.query.id,
+          tableName: "t_yinnong_transfer",
+          bizPath: "upload",
+          fileType: "0",
+        }
+        attachmentList(oData).then(res => {
+          console.log(res)
+          console.log(location.protocol+"//"+location.host+request.defaults.baseURL)
+          res.rows.map(r => {
+
+            let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
+            this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{})})
+            console.log(r)
+          })
+        })
+      },
+      goBack(){
+        window.history.go(-1)
+      },
+      //删除家庭成员
+      deleteChargeItme(index){
+        this.chargeItme.splice(index,1)
+      },
+    },
+  }
+</script>
+
+<style scoped lang="scss">
+  .app-container {
+    padding: 2% 0;
+  }
+  .main_title{
+    font-size: 0.4rem;
+    color: #1D6FE9;
+    margin: 0.2rem 6%;
+    position: relative;
+  }
+  .main_box{
+    width: 96%;
+    margin: 0 auto;
+    border-radius: 6px;
+    box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);
+    overflow: hidden;
+    background-color: #FFF;
+  }
+  .submitButton{
+    width: 80%;
+    margin: 0 auto;
+    background-color: #1D6FE9;
+  }
+
+  .addFamily{
+    position: absolute;
+    top: -2px;
+    right: 0;
+    border-radius: 50%;
+  }
+  .deleteFamily{
+    position: absolute;
+    top: 0rem;
+    right: 6%;
+    z-index: 9;
+    border-radius: 50%;
+  }
+</style>
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail4.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail4.vue
new file mode 100644
index 00000000..abbeba21
--- /dev/null
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail4.vue
@@ -0,0 +1,437 @@
+<template>
+  <div class="app-container">
+    <van-nav-bar
+      left-arrow
+      fixed
+      placeholder
+      @click-left="$router.back(-1)"
+    >
+      <template #title>
+        <p style="font-weight: bold;">查看付款申请</p>
+      </template>
+      <template #right>
+        <van-icon name="../../../static/images/icon/icon_flow.png" size="20" @click="goFlow"/>
+      </template>
+    </van-nav-bar>
+    <p class="main_title">基础信息</p>
+    <div class="main_box">
+      <van-field readonly label="申请时间" v-model="form.applyDate" input-align="right" />
+      <van-field readonly label="资金支出类别" v-model="capitalExpenditureType" input-align="right" label-width="auto" />
+      <van-field readonly label="支出总金额" v-model="form.expenditureAmount" input-align="right" label-width="auto"/>
+    </div>
+
+    <div class="main_box" style="margin-top: 10px;">
+      <van-field readonly label="付款事由" v-model="form.remark" type="textarea" input-align="right" rows="3" label-width="auto"/>
+    </div>
+
+    <div class="main_box" style="margin-top: 10px;">
+      <van-field readonly label="说明情况" v-model="form.explainSituation" type="textarea" input-align="right" rows="3" label-width="auto"/>
+    </div>
+
+    <p class="main_title">付款方信息</p>
+    <div class="main_box">
+      <van-field readonly label="付款方" v-model="form.payer" input-align="right" label-width="auto"/>
+      <van-field readonly label="付款方账户" v-model="form.payerAccount" input-align="right" label-width="auto"/>
+    </div>
+
+    <div class="main_box" v-if="capitalExpenditureOpen" style="margin-bottom: 10px;margin-top: 10px;position:relative;">
+      <van-field readonly label="项目名称" v-model="projectForm.projectName" input-align="right" />
+      <van-field readonly label="承建单位" v-model="projectForm.projectContractor" input-align="right" label-width="auto"/>
+      <van-field readonly label="合同价款（元）" v-model="projectForm.projectAmount" input-align="right" label-width="auto"/>
+      <van-field readonly label="工程款类型" v-model="projectFundType" input-align="right" />
+      <van-field readonly label="工程发票号" v-model="projectForm.projectBillNum" input-align="right" label-width="auto"/>
+    </div>
+
+    <p class="main_title">列表信息</p>
+
+    <div class="main_box" style="margin-bottom: 15px;">
+      <van-field readonly label="收款账户类型" v-model="form.accountType == 1 ? '公户':'私户'" input-align="right" label-width="auto" />
+    </div>
+
+    <div :style="{position:'relative',padding: index == 0 ? '':'10px 0 0 0'}" v-for="(item, index) in chargeItme" :key="index">
+      <div class="main_box" style="margin-bottom: 10px;position:relative;">
+        <van-field readonly label="收款方" v-model="item.payee" input-align="right" />
+        <van-field readonly label="收款账户" v-model="item.payeeAccount" input-align="right" label-width="auto"/>
+        <van-field readonly label="开户银行" v-model="item.bankDeposit" input-align="right" label-width="auto"/>
+        <van-field readonly label="收入金额" v-model="item.incomeAmount" input-align="right" label-width="auto"/>
+        <van-field readonly label="所属银行" v-model="item.bankTypeText" input-align="right" />
+      </div>
+    </div>
+    <p class="main_title">上传附件</p>
+    <div class="main_box" style="padding: 5px 0 0 8px;">
+      <van-uploader v-model="fileList" :after-read="beforeRead" :deletable="false" disabled  :upload-text="'未上传附件'"></van-uploader>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { getTransfer , queryTransferDetail , listPayee , updateTransfer , getProjectto , listProject , addProjectto , customSubmit} from "@/api/onlineHome/bankAgriculture/paymentApproval";
+  import request from '@/utils/request'
+  import {attachmentList, commonAttach} from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
+  export default {
+    name: "approvalDetail",
+    data() {
+      return {
+        showcapital:false,
+        showpayee:false,
+        showlasj:false,
+        showbankType:false,
+        showproject:false,
+        showFundType:false,
+
+        minDate: new Date(),
+        maxDate: new Date(2025, 10, 1),
+        currentDate: new Date(),
+        form:{},
+        fileList:[],
+        capitalExpenditureType:'',
+        payee:'',
+        bankType:'',
+
+        wfydlxDictionaries:[],
+        jglxDictionaries:[],
+        sysDictionaries:[],
+        capitalExpenditureTypeOptions:[],
+        bankTypeDictionaries:[],
+        projectList:[],
+        projectFundTypeOptions:[],
+        projectFundTypeDictionaries:[],
+        projectListShow:[],
+
+        chargeItme:[],
+        chargeItmeShow:[],
+
+        payeeList:[],
+        // 查询参数
+        queryParams: {
+          transferType:"",
+          orderByColumn: "id",
+          isAsc: "desc",
+        },
+        capitalExpenditureOpen:false,
+        projectForm:{
+          projectId:null,
+          projectName:null,
+          projectContractor:null,
+          projectAmount:null,
+          projectBillNum:null,
+          projectFundType:'1',
+          outId:null,
+          ynType:'1'
+        },
+        projectFundType:''
+      };
+    },
+    created() {
+      let queryParams={
+        pageNum: 1,
+        pageSize: 100,
+      }
+      listProject(queryParams).then(response => {
+        console.log(response)
+        this.projectList = response.rows;
+        for (var i = 0; i < response.rows.length; i++) {
+          this.projectListShow.push({text: response.rows[i].projectName, value: response.rows[i].id});
+        }
+      });
+      this.getDicts("project_fund_type").then((response) => {
+        for (var i = 0; i < response.data.length; i++) {
+          this.projectFundTypeOptions.push({text: response.data[i].dictLabel, value: response.data[i].dictValue});
+        }
+        this.projectFundTypeDictionaries = response.data;
+      });
+      this.getDictionaries();
+      this.getFileList();
+    },
+    methods: {
+      goFlow(){
+        window.location='approvalProcess?id='+this.$route.query.id;
+      },
+      getDictionaries(){
+        getTransfer(this.$route.query.id).then((response) => {
+          this.getDicts("capital_expenditure_type").then((res) => {
+            for (var i = 0; i < res.data.length; i++) {
+              this.capitalExpenditureTypeOptions.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
+            }
+            this.capitalExpenditureType = this.selectDictLabel(res.data, response.data.capitalExpenditureType);
+          });
+          if(response.data.capitalExpenditureType==2){
+            this.capitalExpenditureOpen = true
+            let param={
+              'outId' : response.data.id,
+              'ynType' : '1'
+            }
+            getProjectto(param).then(res => {
+              this.projectFundType = this.selectDictLabel(this.projectFundTypeDictionaries, res.data.projectFundType);
+              this.projectForm = res.data
+            })
+          }else{
+            this.showproject = false
+          }
+          this.form = response.data;
+        });
+        queryTransferDetail(this.$route.query.id).then((response) => {
+          this.getDicts("bank_type").then(res => {
+            for (var i = 0; i < res.data.length; i++) {
+              this.bankTypeDictionaries.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
+            }
+            for (var j = 0 ; j < response.rows.length ; j++){
+              response.rows[j].bankTypeText = this.selectDictLabel(res.data, response.rows[j].bankType);
+            }
+            this.chargeItme = response.rows;
+          });
+          this.getPayeeList();
+        });
+      },
+      addChargeItme(index){
+        this.chargeItme.splice(index + 1, 0, {
+          payeeId: "", //收款方ID
+          payee: "", //收款方
+          payeeAccount: "", //收款账户
+          bankDeposit: "", //开户银行
+          incomeAmount: "", //收入金额
+          bankType: "", //所属银行
+        });
+      },
+      getPayeeList() {
+        //普通转账
+        this.queryParams.accountType = this.form.accountType
+        this.queryParams.status = "0"
+        listPayee(this.queryParams).then((response) => {
+          for (var i = 0; i < response.rows.length; i++) {
+            this.payeeList.push({text: response.rows[i].payee, value: response.rows[i].id});
+          }
+        });
+      },
+      payeeDictLabel(datas, value) {
+        var actions = [];
+        Object.keys(datas).some((key) => {
+          if (datas[key].payeeId == ('' + value)) {
+            actions.push(datas[key].payee);
+            return true;
+          }
+        })
+        return actions.join('');
+      },
+      onConfirmCapital(data){
+        console.log(data)
+        if (data.value != 2){
+          this.capitalExpenditureOpen = false;
+          this.projectForm = [];
+        }else{
+          this.capitalExpenditureOpen = true;
+        }
+        this.capitalExpenditureType = data.text;
+        this.form.capitalExpenditureType = data.value;
+        this.showcapital = false;
+      },
+      onConfirmFundType(data){
+        console.log(data)
+        this.projectForm.projectFundType = data.value;
+        this.projectFundType = data.text;
+        this.showFundType = false;
+      },
+      onConfirmProject(data){
+        console.log(data)
+        this.projectList.map(res => {
+          console.log(res)
+          if(res.projectName==data.text){
+            this.projectForm.projectId = res.id
+            this.projectForm.projectName = res.projectName
+            this.projectForm.projectContractor = res.projectContractor
+            this.projectForm.projectAmount = res.projectAmount
+            console.log(this.projectForm)
+          }
+        })
+        this.showproject = false;
+      },
+      onConfirmPayee(data){
+        // this.chargeItme[this.chargeItme.length-1].payeeText = data.text;
+        this.chargeItme[this.chargeItme.length-1].payee = data.text;
+        this.chargeItme[this.chargeItme.length-1].payeeId = data.value;
+        console.log(this.chargeItme)
+        this.showpayee = false;
+      },
+      onConfirmBankType(data){
+        console.log(this.chargeItme)
+        this.chargeItme[this.chargeItme.length-1].bankTypeText = data.text;
+        this.chargeItme[this.chargeItme.length-1].bankType = data.value;
+        this.showbankType = false;
+      },
+      onConfirmLasj(data){
+        this.form.applyDate = this.getNowFormatDate(data).substr(0,10);
+        this.showlasj = false;
+      },
+      accountTypeChange(e){
+        console.log(e)
+        this.payeeList = [];
+        this.queryParams.accountType = this.form.accountType
+        this.queryParams.status = "0"
+        listPayee(this.queryParams).then((response) => {
+          for (var i = 0; i < response.rows.length; i++) {
+            this.payeeList.push({text: response.rows[i].payee, value: response.rows[i].id});
+          }
+        });
+      },
+      goAdd(){
+        if(this.form.remark != null && this.form.remark.indexOf("|")!=-1){
+          this.$toast.error("付款事由禁止包含|。");
+          return;
+        }
+        if(this.form.capitalExpenditureType==2){
+          if(this.projectForm.projectName==""||this.projectForm.projectName==null){
+            this.$toast.error('请选择项目名称！');
+            return;
+          }
+          if(this.projectForm.projectBillNum==""||this.projectForm.projectBillNum==null){
+            this.$toast.error('请输入工程发票号！');
+            return;
+          }
+        }
+        this.$set(this.form, "payeeList", this.chargeItme);
+        this.$set(this.form, "bankTypeList", this.chargeItme);
+        this.$set(this.form, "accountTypeList", this.chargeItme);
+        this.$set(this.form, "transferStatusList", this.chargeItme);
+        console.log(this.form);
+        updateTransfer(this.form).then(response => {
+          console.log(response);
+          this.projectForm.outId = this.form.id
+          this.$set(this.projectForm, "ynType", '1');
+          console.log(this.projectForm)
+          if(this.form.capitalExpenditureType==2){
+            addProjectto(this.projectForm).then(res => {
+              customSubmit(this.form.id).then(res => {
+                this.$toast.success('提交成功');
+                setTimeout(function(){
+                  history.go(-1)
+                },2000)
+              })
+            })
+          }else{
+            customSubmit(this.form.id).then(res => {
+              this.$toast.success('提交成功');
+              setTimeout(function(){
+                history.go(-1)
+              },2000)
+            })
+          }
+        });
+      },
+      goUpdate(){
+        if(this.form.remark != null && this.form.remark.indexOf("|")!=-1){
+          this.$toast.error("付款事由禁止包含|。");
+          return;
+        }
+        if(this.form.capitalExpenditureType==2){
+          if(this.projectForm.projectName==""||this.projectForm.projectName==null){
+            this.$toast.error('请选择项目名称！');
+            return;
+          }
+          if(this.projectForm.projectBillNum==""||this.projectForm.projectBillNum==null){
+            this.$toast.error('请输入工程发票号！');
+            return;
+          }
+        }
+        this.$set(this.form, "payeeList", this.chargeItme);
+        this.$set(this.form, "bankTypeList", this.chargeItme);
+        this.$set(this.form, "accountTypeList", this.chargeItme);
+        this.$set(this.form, "transferStatusList", this.chargeItme);
+        this.projectForm.outId = this.form.id
+        updateTransfer(this.form).then((response) => {
+          this.projectForm.outId = this.form.id
+          this.$set(this.projectForm, "ynType", '1');
+          if(this.form.capitalExpenditureType==2){
+            addProjectto(this.projectForm).then(res => {
+              this.$toast.success('修改成功');
+              setTimeout(function(){
+                history.go(-1)
+              },2000)
+            })
+          }else{
+            this.$toast.success('修改成功');
+            setTimeout(function(){
+              history.go(-1)
+            },2000)
+          }
+        });
+      },
+      beforeRead(file) {
+        console.log(file)
+        console.log(this.fileList)
+        const params = new FormData();
+        params.append("tableId", this.$route.query.id);
+        params.append("tableName", "t_yinnong_transfer");
+        params.append("bizPath", "upload");
+        params.append("fileType", "0");
+        params.append("file", file.file);
+        commonAttach(params).then((response) => {
+          console.log(response)
+        })
+      },
+      getFileList(){
+        let oData= {
+          tableId: this.$route.query.id,
+          tableName: "t_yinnong_transfer",
+          bizPath: "upload",
+          fileType: "0",
+        }
+        attachmentList(oData).then(res => {
+          console.log(res)
+          console.log(location.protocol+"//"+location.host+request.defaults.baseURL)
+          res.rows.map(r => {
+
+            let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
+            this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{})})
+            console.log(r)
+          })
+        })
+      },
+      goBack(){
+        window.history.go(-1)
+      },
+      //删除家庭成员
+      deleteChargeItme(index){
+        this.chargeItme.splice(index,1)
+      },
+    },
+  }
+</script>
+
+<style scoped lang="scss">
+  .app-container {
+    padding: 2% 0;
+  }
+  .main_title{
+    font-size: 0.4rem;
+    color: #1D6FE9;
+    margin: 0.2rem 6%;
+    position: relative;
+  }
+  .main_box{
+    width: 96%;
+    margin: 0 auto;
+    border-radius: 6px;
+    box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);
+    overflow: hidden;
+    background-color: #FFF;
+  }
+  .submitButton{
+    width: 80%;
+    margin: 0 auto;
+    background-color: #1D6FE9;
+  }
+
+  .addFamily{
+    position: absolute;
+    top: -2px;
+    right: 0;
+    border-radius: 50%;
+  }
+  .deleteFamily{
+    position: absolute;
+    top: 0rem;
+    right: 6%;
+    z-index: 9;
+    border-radius: 50%;
+  }
+</style>
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail5.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail5.vue
new file mode 100644
index 00000000..abbeba21
--- /dev/null
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail5.vue
@@ -0,0 +1,437 @@
+<template>
+  <div class="app-container">
+    <van-nav-bar
+      left-arrow
+      fixed
+      placeholder
+      @click-left="$router.back(-1)"
+    >
+      <template #title>
+        <p style="font-weight: bold;">查看付款申请</p>
+      </template>
+      <template #right>
+        <van-icon name="../../../static/images/icon/icon_flow.png" size="20" @click="goFlow"/>
+      </template>
+    </van-nav-bar>
+    <p class="main_title">基础信息</p>
+    <div class="main_box">
+      <van-field readonly label="申请时间" v-model="form.applyDate" input-align="right" />
+      <van-field readonly label="资金支出类别" v-model="capitalExpenditureType" input-align="right" label-width="auto" />
+      <van-field readonly label="支出总金额" v-model="form.expenditureAmount" input-align="right" label-width="auto"/>
+    </div>
+
+    <div class="main_box" style="margin-top: 10px;">
+      <van-field readonly label="付款事由" v-model="form.remark" type="textarea" input-align="right" rows="3" label-width="auto"/>
+    </div>
+
+    <div class="main_box" style="margin-top: 10px;">
+      <van-field readonly label="说明情况" v-model="form.explainSituation" type="textarea" input-align="right" rows="3" label-width="auto"/>
+    </div>
+
+    <p class="main_title">付款方信息</p>
+    <div class="main_box">
+      <van-field readonly label="付款方" v-model="form.payer" input-align="right" label-width="auto"/>
+      <van-field readonly label="付款方账户" v-model="form.payerAccount" input-align="right" label-width="auto"/>
+    </div>
+
+    <div class="main_box" v-if="capitalExpenditureOpen" style="margin-bottom: 10px;margin-top: 10px;position:relative;">
+      <van-field readonly label="项目名称" v-model="projectForm.projectName" input-align="right" />
+      <van-field readonly label="承建单位" v-model="projectForm.projectContractor" input-align="right" label-width="auto"/>
+      <van-field readonly label="合同价款（元）" v-model="projectForm.projectAmount" input-align="right" label-width="auto"/>
+      <van-field readonly label="工程款类型" v-model="projectFundType" input-align="right" />
+      <van-field readonly label="工程发票号" v-model="projectForm.projectBillNum" input-align="right" label-width="auto"/>
+    </div>
+
+    <p class="main_title">列表信息</p>
+
+    <div class="main_box" style="margin-bottom: 15px;">
+      <van-field readonly label="收款账户类型" v-model="form.accountType == 1 ? '公户':'私户'" input-align="right" label-width="auto" />
+    </div>
+
+    <div :style="{position:'relative',padding: index == 0 ? '':'10px 0 0 0'}" v-for="(item, index) in chargeItme" :key="index">
+      <div class="main_box" style="margin-bottom: 10px;position:relative;">
+        <van-field readonly label="收款方" v-model="item.payee" input-align="right" />
+        <van-field readonly label="收款账户" v-model="item.payeeAccount" input-align="right" label-width="auto"/>
+        <van-field readonly label="开户银行" v-model="item.bankDeposit" input-align="right" label-width="auto"/>
+        <van-field readonly label="收入金额" v-model="item.incomeAmount" input-align="right" label-width="auto"/>
+        <van-field readonly label="所属银行" v-model="item.bankTypeText" input-align="right" />
+      </div>
+    </div>
+    <p class="main_title">上传附件</p>
+    <div class="main_box" style="padding: 5px 0 0 8px;">
+      <van-uploader v-model="fileList" :after-read="beforeRead" :deletable="false" disabled  :upload-text="'未上传附件'"></van-uploader>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { getTransfer , queryTransferDetail , listPayee , updateTransfer , getProjectto , listProject , addProjectto , customSubmit} from "@/api/onlineHome/bankAgriculture/paymentApproval";
+  import request from '@/utils/request'
+  import {attachmentList, commonAttach} from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
+  export default {
+    name: "approvalDetail",
+    data() {
+      return {
+        showcapital:false,
+        showpayee:false,
+        showlasj:false,
+        showbankType:false,
+        showproject:false,
+        showFundType:false,
+
+        minDate: new Date(),
+        maxDate: new Date(2025, 10, 1),
+        currentDate: new Date(),
+        form:{},
+        fileList:[],
+        capitalExpenditureType:'',
+        payee:'',
+        bankType:'',
+
+        wfydlxDictionaries:[],
+        jglxDictionaries:[],
+        sysDictionaries:[],
+        capitalExpenditureTypeOptions:[],
+        bankTypeDictionaries:[],
+        projectList:[],
+        projectFundTypeOptions:[],
+        projectFundTypeDictionaries:[],
+        projectListShow:[],
+
+        chargeItme:[],
+        chargeItmeShow:[],
+
+        payeeList:[],
+        // 查询参数
+        queryParams: {
+          transferType:"",
+          orderByColumn: "id",
+          isAsc: "desc",
+        },
+        capitalExpenditureOpen:false,
+        projectForm:{
+          projectId:null,
+          projectName:null,
+          projectContractor:null,
+          projectAmount:null,
+          projectBillNum:null,
+          projectFundType:'1',
+          outId:null,
+          ynType:'1'
+        },
+        projectFundType:''
+      };
+    },
+    created() {
+      let queryParams={
+        pageNum: 1,
+        pageSize: 100,
+      }
+      listProject(queryParams).then(response => {
+        console.log(response)
+        this.projectList = response.rows;
+        for (var i = 0; i < response.rows.length; i++) {
+          this.projectListShow.push({text: response.rows[i].projectName, value: response.rows[i].id});
+        }
+      });
+      this.getDicts("project_fund_type").then((response) => {
+        for (var i = 0; i < response.data.length; i++) {
+          this.projectFundTypeOptions.push({text: response.data[i].dictLabel, value: response.data[i].dictValue});
+        }
+        this.projectFundTypeDictionaries = response.data;
+      });
+      this.getDictionaries();
+      this.getFileList();
+    },
+    methods: {
+      goFlow(){
+        window.location='approvalProcess?id='+this.$route.query.id;
+      },
+      getDictionaries(){
+        getTransfer(this.$route.query.id).then((response) => {
+          this.getDicts("capital_expenditure_type").then((res) => {
+            for (var i = 0; i < res.data.length; i++) {
+              this.capitalExpenditureTypeOptions.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
+            }
+            this.capitalExpenditureType = this.selectDictLabel(res.data, response.data.capitalExpenditureType);
+          });
+          if(response.data.capitalExpenditureType==2){
+            this.capitalExpenditureOpen = true
+            let param={
+              'outId' : response.data.id,
+              'ynType' : '1'
+            }
+            getProjectto(param).then(res => {
+              this.projectFundType = this.selectDictLabel(this.projectFundTypeDictionaries, res.data.projectFundType);
+              this.projectForm = res.data
+            })
+          }else{
+            this.showproject = false
+          }
+          this.form = response.data;
+        });
+        queryTransferDetail(this.$route.query.id).then((response) => {
+          this.getDicts("bank_type").then(res => {
+            for (var i = 0; i < res.data.length; i++) {
+              this.bankTypeDictionaries.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
+            }
+            for (var j = 0 ; j < response.rows.length ; j++){
+              response.rows[j].bankTypeText = this.selectDictLabel(res.data, response.rows[j].bankType);
+            }
+            this.chargeItme = response.rows;
+          });
+          this.getPayeeList();
+        });
+      },
+      addChargeItme(index){
+        this.chargeItme.splice(index + 1, 0, {
+          payeeId: "", //收款方ID
+          payee: "", //收款方
+          payeeAccount: "", //收款账户
+          bankDeposit: "", //开户银行
+          incomeAmount: "", //收入金额
+          bankType: "", //所属银行
+        });
+      },
+      getPayeeList() {
+        //普通转账
+        this.queryParams.accountType = this.form.accountType
+        this.queryParams.status = "0"
+        listPayee(this.queryParams).then((response) => {
+          for (var i = 0; i < response.rows.length; i++) {
+            this.payeeList.push({text: response.rows[i].payee, value: response.rows[i].id});
+          }
+        });
+      },
+      payeeDictLabel(datas, value) {
+        var actions = [];
+        Object.keys(datas).some((key) => {
+          if (datas[key].payeeId == ('' + value)) {
+            actions.push(datas[key].payee);
+            return true;
+          }
+        })
+        return actions.join('');
+      },
+      onConfirmCapital(data){
+        console.log(data)
+        if (data.value != 2){
+          this.capitalExpenditureOpen = false;
+          this.projectForm = [];
+        }else{
+          this.capitalExpenditureOpen = true;
+        }
+        this.capitalExpenditureType = data.text;
+        this.form.capitalExpenditureType = data.value;
+        this.showcapital = false;
+      },
+      onConfirmFundType(data){
+        console.log(data)
+        this.projectForm.projectFundType = data.value;
+        this.projectFundType = data.text;
+        this.showFundType = false;
+      },
+      onConfirmProject(data){
+        console.log(data)
+        this.projectList.map(res => {
+          console.log(res)
+          if(res.projectName==data.text){
+            this.projectForm.projectId = res.id
+            this.projectForm.projectName = res.projectName
+            this.projectForm.projectContractor = res.projectContractor
+            this.projectForm.projectAmount = res.projectAmount
+            console.log(this.projectForm)
+          }
+        })
+        this.showproject = false;
+      },
+      onConfirmPayee(data){
+        // this.chargeItme[this.chargeItme.length-1].payeeText = data.text;
+        this.chargeItme[this.chargeItme.length-1].payee = data.text;
+        this.chargeItme[this.chargeItme.length-1].payeeId = data.value;
+        console.log(this.chargeItme)
+        this.showpayee = false;
+      },
+      onConfirmBankType(data){
+        console.log(this.chargeItme)
+        this.chargeItme[this.chargeItme.length-1].bankTypeText = data.text;
+        this.chargeItme[this.chargeItme.length-1].bankType = data.value;
+        this.showbankType = false;
+      },
+      onConfirmLasj(data){
+        this.form.applyDate = this.getNowFormatDate(data).substr(0,10);
+        this.showlasj = false;
+      },
+      accountTypeChange(e){
+        console.log(e)
+        this.payeeList = [];
+        this.queryParams.accountType = this.form.accountType
+        this.queryParams.status = "0"
+        listPayee(this.queryParams).then((response) => {
+          for (var i = 0; i < response.rows.length; i++) {
+            this.payeeList.push({text: response.rows[i].payee, value: response.rows[i].id});
+          }
+        });
+      },
+      goAdd(){
+        if(this.form.remark != null && this.form.remark.indexOf("|")!=-1){
+          this.$toast.error("付款事由禁止包含|。");
+          return;
+        }
+        if(this.form.capitalExpenditureType==2){
+          if(this.projectForm.projectName==""||this.projectForm.projectName==null){
+            this.$toast.error('请选择项目名称！');
+            return;
+          }
+          if(this.projectForm.projectBillNum==""||this.projectForm.projectBillNum==null){
+            this.$toast.error('请输入工程发票号！');
+            return;
+          }
+        }
+        this.$set(this.form, "payeeList", this.chargeItme);
+        this.$set(this.form, "bankTypeList", this.chargeItme);
+        this.$set(this.form, "accountTypeList", this.chargeItme);
+        this.$set(this.form, "transferStatusList", this.chargeItme);
+        console.log(this.form);
+        updateTransfer(this.form).then(response => {
+          console.log(response);
+          this.projectForm.outId = this.form.id
+          this.$set(this.projectForm, "ynType", '1');
+          console.log(this.projectForm)
+          if(this.form.capitalExpenditureType==2){
+            addProjectto(this.projectForm).then(res => {
+              customSubmit(this.form.id).then(res => {
+                this.$toast.success('提交成功');
+                setTimeout(function(){
+                  history.go(-1)
+                },2000)
+              })
+            })
+          }else{
+            customSubmit(this.form.id).then(res => {
+              this.$toast.success('提交成功');
+              setTimeout(function(){
+                history.go(-1)
+              },2000)
+            })
+          }
+        });
+      },
+      goUpdate(){
+        if(this.form.remark != null && this.form.remark.indexOf("|")!=-1){
+          this.$toast.error("付款事由禁止包含|。");
+          return;
+        }
+        if(this.form.capitalExpenditureType==2){
+          if(this.projectForm.projectName==""||this.projectForm.projectName==null){
+            this.$toast.error('请选择项目名称！');
+            return;
+          }
+          if(this.projectForm.projectBillNum==""||this.projectForm.projectBillNum==null){
+            this.$toast.error('请输入工程发票号！');
+            return;
+          }
+        }
+        this.$set(this.form, "payeeList", this.chargeItme);
+        this.$set(this.form, "bankTypeList", this.chargeItme);
+        this.$set(this.form, "accountTypeList", this.chargeItme);
+        this.$set(this.form, "transferStatusList", this.chargeItme);
+        this.projectForm.outId = this.form.id
+        updateTransfer(this.form).then((response) => {
+          this.projectForm.outId = this.form.id
+          this.$set(this.projectForm, "ynType", '1');
+          if(this.form.capitalExpenditureType==2){
+            addProjectto(this.projectForm).then(res => {
+              this.$toast.success('修改成功');
+              setTimeout(function(){
+                history.go(-1)
+              },2000)
+            })
+          }else{
+            this.$toast.success('修改成功');
+            setTimeout(function(){
+              history.go(-1)
+            },2000)
+          }
+        });
+      },
+      beforeRead(file) {
+        console.log(file)
+        console.log(this.fileList)
+        const params = new FormData();
+        params.append("tableId", this.$route.query.id);
+        params.append("tableName", "t_yinnong_transfer");
+        params.append("bizPath", "upload");
+        params.append("fileType", "0");
+        params.append("file", file.file);
+        commonAttach(params).then((response) => {
+          console.log(response)
+        })
+      },
+      getFileList(){
+        let oData= {
+          tableId: this.$route.query.id,
+          tableName: "t_yinnong_transfer",
+          bizPath: "upload",
+          fileType: "0",
+        }
+        attachmentList(oData).then(res => {
+          console.log(res)
+          console.log(location.protocol+"//"+location.host+request.defaults.baseURL)
+          res.rows.map(r => {
+
+            let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
+            this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{})})
+            console.log(r)
+          })
+        })
+      },
+      goBack(){
+        window.history.go(-1)
+      },
+      //删除家庭成员
+      deleteChargeItme(index){
+        this.chargeItme.splice(index,1)
+      },
+    },
+  }
+</script>
+
+<style scoped lang="scss">
+  .app-container {
+    padding: 2% 0;
+  }
+  .main_title{
+    font-size: 0.4rem;
+    color: #1D6FE9;
+    margin: 0.2rem 6%;
+    position: relative;
+  }
+  .main_box{
+    width: 96%;
+    margin: 0 auto;
+    border-radius: 6px;
+    box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);
+    overflow: hidden;
+    background-color: #FFF;
+  }
+  .submitButton{
+    width: 80%;
+    margin: 0 auto;
+    background-color: #1D6FE9;
+  }
+
+  .addFamily{
+    position: absolute;
+    top: -2px;
+    right: 0;
+    border-radius: 50%;
+  }
+  .deleteFamily{
+    position: absolute;
+    top: 0rem;
+    right: 6%;
+    z-index: 9;
+    border-radius: 50%;
+  }
+</style>
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalList.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalList.vue
index 450f7515..4aef63c5 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalList.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalList.vue
@@ -19,15 +19,17 @@
         v-model="loading"
         :finished="finished"
         finished-text="没有更多了"
-        @load="getList"
-      >
+        @load="getList">
         <van-swipe-cell v-for="(item,index) in applicationList" :key="index">
-          <van-cell :title="item.payer" :value="item.auditStatus" center :to="{name:'approvalDetail', query: {id:item.id}}">
+          <van-cell :title="item.payer" center :to="{name:'approvalDetail', query: {id:item.id}}">
             <template #icon>
-              <van-icon name="../../../static/images/icon/icon_yl.png" size="22" color="#539FFD" style="margin-right: 10px;" />
+              <van-icon name="../../../../../static/images/onlineHome/yinnongList1.png" size="22" color="#FF4646" style="margin-right: 10px;" />
             </template>
             <template #label>
-              <p><span><i>￥</i>{{item.expenditureAmount}}</span><i style="margin-right: 1rem;"></i>{{item.applyDate}}</p>
+              <p><span><i>￥</i>{{item.expenditureAmount}}</span><i style="margin-right: 30px;"></i>{{item.applyDate}}</p>
+            </template>
+            <template #default>
+              <p style="width: 80px;display: inline-block">{{item.auditStatus}}</p>
             </template>
           </van-cell>
           <template #right>
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalList10.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalList10.vue
index 26de91d6..a0941340 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalList10.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalList10.vue
@@ -22,9 +22,9 @@
         @load="getList"
       >
         <van-swipe-cell v-for="(item,index) in applicationList" :key="index">
-          <van-cell :title="item.payer" :value="item.auditStatus" center :to="{name:'approvalDetail', query: {id:item.id}}">
+          <van-cell :title="item.payer" :value="item.auditStatus" center :to="{name:'approvalDetail10', query: {id:item.id}}">
             <template #icon>
-              <van-icon name="../../../static/images/icon/icon_yl.png" size="22" color="#539FFD" style="margin-right: 10px;" />
+              <van-icon name="../../../../../static/images/onlineHome/yinnongList7.png" size="22" color="#539FFD" style="margin-right: 10px;" />
             </template>
             <template #label>
               <p><span><i>￥</i>{{item.expenditureAmount}}</span><i style="margin-right: 1rem;"></i>{{item.applyDate}}</p>
@@ -33,7 +33,7 @@
           <template #right>
             <van-row>
               <van-col>
-                <van-button v-if="item.auditStatus=='草稿'||item.auditStatus=='驳回'" square text="修改" type="info" :to="{name:'approvalModify', query: {id:item.id}}" class="delete-button" />
+                <van-button v-if="item.auditStatus=='草稿'||item.auditStatus=='驳回'" square text="修改" type="info" :to="{name:'approvalModify10', query: {id:item.id}}" class="delete-button" />
               </van-col>
               <van-col>
                 <van-button v-if="item.auditStatus=='草稿'||item.auditStatus=='驳回'" color="#FFA63E" square text="提交" type="info" @click="onSubmit(item.id)" class="delete-button" />
@@ -50,7 +50,7 @@
 
 <script>
 import { listTransfer , customSubmit , delTransfer } from "@/api/onlineHome/bankAgriculture/paymentApproval";
-import {listCash} from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
+import {cashSubmit, delCash, listCash} from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
 export default {
   name: "approvalList10",
   data() {
@@ -101,7 +101,7 @@ export default {
       .then(() => {
         // on confirm
         this.applicationList.splice(index,1)
-        delTransfer(id).then(res => {
+        delCash(id).then(res => {
           if(res.code = 200){
             this.$toast.success('删除成功');
           }
@@ -116,7 +116,8 @@ export default {
         message: '您确认提交草稿？',
       })
       .then(() => {
-        customSubmit(id).then(res => {
+        console.log(id)
+        cashSubmit(id).then(res => {
           this.$toast.success('提交成功');
           setTimeout(function(){
             history.go(0)
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalList11.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalList11.vue
index ef1ed1c6..af651c86 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalList11.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalList11.vue
@@ -22,9 +22,9 @@
         @load="getList"
       >
         <van-swipe-cell v-for="(item,index) in applicationList" :key="index">
-          <van-cell :title="item.payer" :value="item.auditStatus" center :to="{name:'approvalDetail', query: {id:item.id}}">
+          <van-cell :title="item.payer" :value="item.auditStatus" center :to="{name:'approvalDetail11', query: {id:item.id}}">
             <template #icon>
-              <van-icon name="../../../static/images/icon/icon_yl.png" size="22" color="#539FFD" style="margin-right: 10px;" />
+              <van-icon name="../../../../../static/images/onlineHome/yinnongList6.png" size="22" color="#539FFD" style="margin-right: 10px;" />
             </template>
             <template #label>
               <p><span><i>￥</i>{{item.expenditureAmount}}</span><i style="margin-right: 1rem;"></i>{{item.applyDate}}</p>
@@ -33,7 +33,7 @@
           <template #right>
             <van-row>
               <van-col>
-                <van-button v-if="item.auditStatus=='草稿'||item.auditStatus=='驳回'" square text="修改" type="info" :to="{name:'approvalModify', query: {id:item.id}}" class="delete-button" />
+                <van-button v-if="item.auditStatus=='草稿'||item.auditStatus=='驳回'" square text="修改" type="info" :to="{name:'approvalModify11', query: {id:item.id}}" class="delete-button" />
               </van-col>
               <van-col>
                 <van-button v-if="item.auditStatus=='草稿'||item.auditStatus=='驳回'" color="#FFA63E" square text="提交" type="info" @click="onSubmit(item.id)" class="delete-button" />
@@ -50,7 +50,7 @@
 
 <script>
 import { listTransfer , customSubmit , delTransfer } from "@/api/onlineHome/bankAgriculture/paymentApproval";
-import {listCash} from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
+import {cashSubmit, delCash, listCash} from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
 export default {
   name: "approvalList11",
   data() {
@@ -101,7 +101,7 @@ export default {
       .then(() => {
         // on confirm
         this.applicationList.splice(index,1)
-        delTransfer(id).then(res => {
+        delCash(id).then(res => {
           if(res.code = 200){
             this.$toast.success('删除成功');
           }
@@ -116,7 +116,7 @@ export default {
         message: '您确认提交草稿？',
       })
       .then(() => {
-        customSubmit(id).then(res => {
+        cashSubmit(id).then(res => {
           this.$toast.success('提交成功');
           setTimeout(function(){
             history.go(0)
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalList12.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalList12.vue
index 5341a7bc..fd2c0c09 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalList12.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalList12.vue
@@ -22,9 +22,9 @@
         @load="getList"
       >
         <van-swipe-cell v-for="(item,index) in applicationList" :key="index">
-          <van-cell :title="item.payer" :value="item.auditStatus" center :to="{name:'approvalDetail', query: {id:item.id}}">
+          <van-cell :title="item.payer" :value="item.auditStatus" center :to="{name:'approvalDetail12', query: {id:item.id}}">
             <template #icon>
-              <van-icon name="../../../static/images/icon/icon_yl.png" size="22" color="#539FFD" style="margin-right: 10px;" />
+              <van-icon name="../../../../../static/images/onlineHome/yinnongList3.png" size="22" color="#539FFD" style="margin-right: 10px;" />
             </template>
             <template #label>
               <p><span><i>￥</i>{{item.expenditureAmount}}</span><i style="margin-right: 1rem;"></i>{{item.applyDate}}</p>
@@ -33,7 +33,7 @@
           <template #right>
             <van-row>
               <van-col>
-                <van-button v-if="item.auditStatus=='草稿'||item.auditStatus=='驳回'" square text="修改" type="info" :to="{name:'approvalModify', query: {id:item.id}}" class="delete-button" />
+                <van-button v-if="item.auditStatus=='草稿'||item.auditStatus=='驳回'" square text="修改" type="info" :to="{name:'approvalModify12', query: {id:item.id}}" class="delete-button" />
               </van-col>
               <van-col>
                 <van-button v-if="item.auditStatus=='草稿'||item.auditStatus=='驳回'" color="#FFA63E" square text="提交" type="info" @click="onSubmit(item.id)" class="delete-button" />
@@ -50,7 +50,7 @@
 
 <script>
 import { listTransfer , customSubmit , delTransfer } from "@/api/onlineHome/bankAgriculture/paymentApproval";
-import {listCash} from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
+import {cashSubmit, delCash, listCash} from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
 export default {
   name: "approvalList12",
   data() {
@@ -61,7 +61,7 @@ export default {
       finished: false,
       queryParams:{
         pageNum:1,
-        pageSize:10,
+        pageSize:100,
         cashType: '12',
       }
     };
@@ -101,7 +101,7 @@ export default {
       .then(() => {
         // on confirm
         this.applicationList.splice(index,1)
-        delTransfer(id).then(res => {
+        delCash33333333333333(id).then(res => {
           if(res.code = 200){
             this.$toast.success('删除成功');
           }
@@ -116,7 +116,7 @@ export default {
         message: '您确认提交草稿？',
       })
       .then(() => {
-        customSubmit(id).then(res => {
+        cashSubmit(id).then(res => {
           this.$toast.success('提交成功');
           setTimeout(function(){
             history.go(0)
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalList2.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalList2.vue
index b4555996..037d3468 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalList2.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalList2.vue
@@ -24,7 +24,7 @@
         <van-swipe-cell v-for="(item,index) in applicationList" :key="index">
           <van-cell :title="item.payer" :value="item.auditStatus" center :to="{name:'approvalDetail', query: {id:item.id}}">
             <template #icon>
-              <van-icon name="../../../static/images/icon/icon_yl.png" size="22" color="#539FFD" style="margin-right: 10px;" />
+              <van-icon name="../../../../../static/images/onlineHome/yinnongList8.png" size="22" color="#539FFD" style="margin-right: 10px;" />
             </template>
             <template #label>
               <p><span><i>￥</i>{{item.expenditureAmount}}</span><i style="margin-right: 1rem;"></i>{{item.applyDate}}</p>
@@ -33,7 +33,7 @@
           <template #right>
             <van-row>
               <van-col>
-                <van-button v-if="item.auditStatus=='草稿'||item.auditStatus=='驳回'" square text="修改" type="info" :to="{name:'approvalModify', query: {id:item.id}}" class="delete-button" />
+                <van-button v-if="item.auditStatus=='草稿'||item.auditStatus=='驳回'" square text="修改" type="info" :to="{name:'approvalModify2', query: {id:item.id}}" class="delete-button" />
               </van-col>
               <van-col>
                 <van-button v-if="item.auditStatus=='草稿'||item.auditStatus=='驳回'" color="#FFA63E" square text="提交" type="info" @click="onSubmit(item.id)" class="delete-button" />
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalList3.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalList3.vue
index d6560e13..17595a77 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalList3.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalList3.vue
@@ -24,7 +24,7 @@
         <van-swipe-cell v-for="(item,index) in applicationList" :key="index">
           <van-cell :title="item.payer" :value="item.auditStatus" center :to="{name:'approvalDetail', query: {id:item.id}}">
             <template #icon>
-              <van-icon name="../../../static/images/icon/icon_yl.png" size="22" color="#539FFD" style="margin-right: 10px;" />
+              <van-icon name="../../../../../static/images/onlineHome/yinnongList9.png" size="22" color="#539FFD" style="margin-right: 10px;" />
             </template>
             <template #label>
               <p><span><i>￥</i>{{item.expenditureAmount}}</span><i style="margin-right: 1rem;"></i>{{item.applyDate}}</p>
@@ -33,7 +33,7 @@
           <template #right>
             <van-row>
               <van-col>
-                <van-button v-if="item.auditStatus=='草稿'||item.auditStatus=='驳回'" square text="修改" type="info" :to="{name:'approvalModify', query: {id:item.id}}" class="delete-button" />
+                <van-button v-if="item.auditStatus=='草稿'||item.auditStatus=='驳回'" square text="修改" type="info" :to="{name:'approvalModify3', query: {id:item.id}}" class="delete-button" />
               </van-col>
               <van-col>
                 <van-button v-if="item.auditStatus=='草稿'||item.auditStatus=='驳回'" color="#FFA63E" square text="提交" type="info" @click="onSubmit(item.id)" class="delete-button" />
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalList4.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalList4.vue
index ef5316d2..1b1cbd74 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalList4.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalList4.vue
@@ -24,7 +24,7 @@
         <van-swipe-cell v-for="(item,index) in applicationList" :key="index">
           <van-cell :title="item.payer" :value="item.auditStatus" center :to="{name:'approvalDetail', query: {id:item.id}}">
             <template #icon>
-              <van-icon name="../../../static/images/icon/icon_yl.png" size="22" color="#539FFD" style="margin-right: 10px;" />
+              <van-icon name="../../../../../static/images/onlineHome/yinnongList10.png" size="22" color="#539FFD" style="margin-right: 10px;" />
             </template>
             <template #label>
               <p><span><i>￥</i>{{item.expenditureAmount}}</span><i style="margin-right: 1rem;"></i>{{item.applyDate}}</p>
@@ -33,7 +33,7 @@
           <template #right>
             <van-row>
               <van-col>
-                <van-button v-if="item.auditStatus=='草稿'||item.auditStatus=='驳回'" square text="修改" type="info" :to="{name:'approvalModify', query: {id:item.id}}" class="delete-button" />
+                <van-button v-if="item.auditStatus=='草稿'||item.auditStatus=='驳回'" square text="修改" type="info" :to="{name:'approvalModify4', query: {id:item.id}}" class="delete-button" />
               </van-col>
               <van-col>
                 <van-button v-if="item.auditStatus=='草稿'||item.auditStatus=='驳回'" color="#FFA63E" square text="提交" type="info" @click="onSubmit(item.id)" class="delete-button" />
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalList5.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalList5.vue
index 8d0f3695..20c9ac6a 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalList5.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalList5.vue
@@ -24,7 +24,7 @@
         <van-swipe-cell v-for="(item,index) in applicationList" :key="index">
           <van-cell :title="item.payer" :value="item.auditStatus" center :to="{name:'approvalDetail', query: {id:item.id}}">
             <template #icon>
-              <van-icon name="../../../static/images/icon/icon_yl.png" size="22" color="#539FFD" style="margin-right: 10px;" />
+              <van-icon name="../../../../../static/images/onlineHome/yinnongList4.png" size="22" color="#539FFD" style="margin-right: 10px;" />
             </template>
             <template #label>
               <p><span><i>￥</i>{{item.expenditureAmount}}</span><i style="margin-right: 1rem;"></i>{{item.applyDate}}</p>
@@ -33,7 +33,7 @@
           <template #right>
             <van-row>
               <van-col>
-                <van-button v-if="item.auditStatus=='草稿'||item.auditStatus=='驳回'" square text="修改" type="info" :to="{name:'approvalModify', query: {id:item.id}}" class="delete-button" />
+                <van-button v-if="item.auditStatus=='草稿'||item.auditStatus=='驳回'" square text="修改" type="info" :to="{name:'approvalModify5', query: {id:item.id}}" class="delete-button" />
               </van-col>
               <van-col>
                 <van-button v-if="item.auditStatus=='草稿'||item.auditStatus=='驳回'" color="#FFA63E" square text="提交" type="info" @click="onSubmit(item.id)" class="delete-button" />
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify.vue
index 116bf0ef..501573d0 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify.vue
@@ -219,7 +219,10 @@
           </van-popup>
         </div>
       </div>
-
+      <p class="main_title">上传附件</p>
+      <div class="main_box" style="padding: 5px 0 0 8px;">
+        <van-uploader v-model="fileList" :after-read="beforeRead" ></van-uploader>
+      </div>
       <div style="padding: 16px 0;">
         <van-row>
           <van-col span="12" align="center">
@@ -237,6 +240,8 @@
 
 <script>
   import { getAccount , getTransfer , queryTransferDetail , listPayee , updateTransfer , getProjectto , listProject , addProjectto , customSubmit ,getQmyeFlow} from "@/api/onlineHome/bankAgriculture/paymentApproval";
+  import {attachmentList, commonAttach} from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
+  import request from '@/utils/request';
   export default {
     name: "approvalModify",
     data() {
@@ -292,7 +297,8 @@
           outId:null,
           ynType:'1'
         },
-        projectFundType:''
+        projectFundType:'',
+        fileList:[],
       };
     },
     created() {
@@ -320,12 +326,12 @@
         this.payerOptions = response.rows;
         response.rows.map((res,index) => {
           res['payerFrom'] = '1'
-          console.log(res)
           this.payerOptions[index].text = res.accountName;
           this.payerOptions[index].value = res.id;
         })
       });
       this.getDictionaries();
+      this.getFileList();
     },
     methods: {
       getDictionaries(){
@@ -705,6 +711,37 @@
           }
         }
       },
+      beforeRead(file) {
+        console.log(file)
+        console.log(this.fileList)
+        const params = new FormData();
+        params.append("tableId", this.$route.query.id);
+        params.append("tableName", "t_yinnong_transfer");
+        params.append("bizPath", "upload");
+        params.append("fileType", "0");
+        params.append("file", file.file);
+        commonAttach(params).then((response) => {
+          console.log(response)
+        })
+      },
+      getFileList(){
+        let oData= {
+            tableId: this.$route.query.id,
+            tableName: "t_yinnong_transfer",
+            bizPath: "upload",
+            fileType: "0",
+        }
+        attachmentList(oData).then(res => {
+          console.log(res)
+          console.log(location.protocol+"//"+location.host+request.defaults.baseURL)
+          res.rows.map(r => {
+
+            let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
+            this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{})})
+            console.log(r)
+          })
+        })
+      },
       goBack(){
         window.history.go(-1)
       },
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify10.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify10.vue
new file mode 100644
index 00000000..e7370db1
--- /dev/null
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify10.vue
@@ -0,0 +1,732 @@
+<template>
+  <div class="app-container">
+    <van-nav-bar
+      left-arrow
+      fixed
+      placeholder
+      @click-left="$router.back(-1)"
+    >
+      <template #title>
+        <p style="font-weight: bold;">修改现金提现申请</p>
+      </template>
+    </van-nav-bar>
+    <van-form @submit="getChange" @failed="getError" :show-error-message="false" scroll-to-error validate-first>
+      <p class="main_title">基础信息</p>
+      <div class="main_box">
+        <van-field
+          readonly
+          clickable
+          required
+          :rules="[{ required: true , message:'请选择申请时间' }]"
+          v-model="form.applyDate"
+          label="申请时间"
+          placeholder="请选择申请时间"
+          @click="showlasj = true"
+          input-align="right"
+          right-icon="arrow-down"
+        />
+        <van-popup v-model="showlasj" position="bottom">
+          <van-datetime-picker
+            v-model="currentDate"
+            type="date"
+            title="选择年月日"
+            :min-date="minDate"
+            :max-date="maxDate"
+            @confirm="onConfirmLasj"
+          />
+        </van-popup>
+        <van-field
+          readonly
+          clickable
+          required
+          :rules="[{ required: true , message:'请选择资金支出类别' }]"
+          label="资金支出类别"
+          placeholder="请选择"
+          v-model="capitalExpenditureType"
+          @click="showcapital = true"
+          input-align="right"
+          right-icon="arrow-down"
+          label-width="auto"
+        />
+        <van-popup v-model="showcapital" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="capitalExpenditureTypeOptions"
+            @confirm="onConfirmCapital"
+            @cancel="showcapital = false"
+          />
+        </van-popup>
+        <van-field
+          readonly
+          required
+          label="支出总金额"
+          v-model="form.expenditureAmount"
+          placeholder="根据下方收款金额自动核算"
+          input-align="right"
+          label-width="auto"
+        />
+
+      </div>
+
+      <div class="main_box" style="margin-top: 10px;">
+        <van-field
+          label="付款事由"
+          v-model="form.remark"
+          type="textarea"
+          placeholder="请输入付款事由"
+          input-align="right"
+          rows="3"
+          label-width="auto"
+          required
+          :rules="[{ required: true , message:'请输入付款事由' }]"
+        />
+      </div>
+
+      <div class="main_box" style="margin-top: 10px;">
+        <van-field label="说明情况" v-model="form.explainSituation" type="textarea" placeholder="请输入说明情况" input-align="right" rows="3" label-width="auto"/>
+      </div>
+
+      <p class="main_title" v-if="capitalExpenditureOpen">关联项目</p>
+      <div class="main_box" v-if="capitalExpenditureOpen" style="margin-bottom: 10px;margin-top: 10px;position:relative;">
+        <van-field
+          readonly
+          clickable
+          label="项目名称"
+          placeholder="请选择"
+          v-model="projectForm.projectName"
+          @click="showproject = true"
+          input-align="right"
+          right-icon="arrow-down"
+          required
+          :rules="[{ required: true , message:'请选择项目名称' }]"
+        />
+        <van-popup v-model="showproject" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="projectListShow"
+            @confirm="onConfirmProject"
+            @cancel="showproject = false"
+          />
+        </van-popup>
+        <van-field required :rules="[{ required: true , message:'请输入承建单位' }]" v-model="projectForm.projectContractor" label="承建单位" placeholder="请输入承建单位" input-align="right" label-width="auto"/>
+        <van-field required :rules="[{ required: true , message:'请输入合同价款（元）' }]" v-model="projectForm.projectAmount" label="合同价款（元）" placeholder="请输入合同价款（元）" input-align="right" label-width="auto"/>
+        <van-field
+          readonly
+          clickable
+          label="工程款类型"
+          placeholder="请选择"
+          v-model="projectFundType"
+          @click="showFundType = true"
+          input-align="right"
+          right-icon="arrow-down"
+          required
+          :rules="[{ required: true , message:'请选择工程款类型' }]"
+        />
+        <van-popup v-model="showFundType" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="projectFundTypeOptions"
+            @confirm="onConfirmFundType"
+            @cancel="showFundType = false"
+          />
+        </van-popup>
+        <van-field required :rules="[{ required: true , message:'请输入工程发票号' }]" v-model="projectForm.projectBillNum" label="工程发票号" placeholder="请输入工程发票号" input-align="right" label-width="auto"/>
+      </div>
+      <p class="main_title">付款方信息</p>
+      <div class="main_box">
+        <!--      <van-field label="付款方" v-model="form.payer" placeholder="请输入付款方" input-align="right" label-width="auto"/>-->
+        <van-field
+          readonly
+          clickable
+          label="付款方"
+          placeholder="请选择付款方"
+          v-model="form.payer"
+          @click="showpayer = true"
+          input-align="right"
+          right-icon="arrow-down"
+          label-width="auto"
+          required
+          :rules="[{ required: true , message:'请选择付款方' }]"
+        />
+        <van-popup v-model="showpayer" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="payerOptions"
+            @confirm="onConfirmPayer($event)"
+            @cancel="showpayer = false"
+          />
+        </van-popup>
+        <van-field :rules="[{ required: true , message:'请输入账户' }]" required label="付款方账户" v-model="form.payerAccount" placeholder="请输入账户" input-align="right" label-width="auto"/>
+      </div>
+
+      <p class="main_title">收款方信息<van-button icon="plus" @click="addChargeItme(chargeItme.length)" size="mini" type="info" native-type="button" class="addFamily"/></p>
+
+      <div :style="{position:'relative',padding: index == 0 ? '':'10px 0 0 0'}" v-for="(item, index) in chargeItme" :key="index">
+        <van-button icon="minus" size="mini" type="danger" class="deleteFamily" native-type="button" v-if="index!=0" @click="deleteChargeItme(index)" />
+        <div class="main_box" style="margin-bottom: 10px;position:relative;">
+          <van-field required :rules="[{ required: true , message:'请输入收款方全称' }]" v-model="item.payee" label="收款方" placeholder="请输入收款方全称" input-align="right" label-width="auto"/>
+          <van-field required :rules="[{ required: true , message:'请输入提款人' }]" v-model="item.drawer" label="提款人" placeholder="请输入提款人" input-align="right" label-width="auto"/>
+          <van-field required :rules="[{ required: true , message:'请输入提款金额' }]" v-model="item.incomeAmount" label="提款金额（元）" placeholder="请输入提款金额" input-align="right" label-width="auto" @change="moneyChange"/>
+          <van-field required :rules="[{ required: true , message:'请输入资金用途' }]" v-model="item.remark" label="资金用途" placeholder="请输入资金用途" input-align="right" label-width="auto" />
+        </div>
+      </div>
+      <p class="main_title">上传附件</p>
+      <div class="main_box" style="padding: 5px 0 0 8px;">
+        <van-uploader v-model="fileList" :after-read="beforeRead" ></van-uploader>
+      </div>
+      <div style="padding: 16px 0;">
+        <van-row>
+          <van-col span="12" align="center">
+            <van-button type="info" native-type="submit" @click="buttonType='update'" class="submitButton">保<i style="margin-right: 1em;"></i>存</van-button>
+          </van-col>
+          <van-col span="12" align="center">
+            <van-button type="info" native-type="submit" @click="buttonType='add'" class="submitButton">保存并提交</van-button>
+          </van-col>
+        </van-row>
+        <div class="clear"></div>
+      </div>
+    </van-form>
+  </div>
+</template>
+
+<script>
+  import { getAccount , getTransfer , queryTransferDetail , listPayee , updateTransfer , getProjectto , listProject , addProjectto , customSubmit ,getQmyeFlow} from "@/api/onlineHome/bankAgriculture/paymentApproval";
+  import request from '@/utils/request';
+  import {
+    addCash,
+    addCashdetail, attachmentList, commonAttach,
+    getCash,
+    listCashdetailByCashId, updateCash
+  } from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
+  export default {
+    name: "approvalModify10",
+    data() {
+      return {
+        showcapital:false,
+        showpayee:false,
+        showlasj:false,
+        showbankType:false,
+        showproject:false,
+        showFundType:false,
+        showpayer:false,
+
+        minDate: new Date(),
+        maxDate: new Date(2025, 10, 1),
+        currentDate: new Date(),
+        form:{},
+
+        capitalExpenditureType:'',
+        payee:'',
+        bankType:'',
+
+        buttonType:'a',
+
+        wfydlxDictionaries:[],
+        jglxDictionaries:[],
+        sysDictionaries:[],
+        capitalExpenditureTypeOptions:[],
+        bankTypeDictionaries:[],
+        projectList:[],
+        projectFundTypeOptions:[],
+        projectFundTypeDictionaries:[],
+        projectListShow:[],
+        payerOptions:[],
+
+        chargeItme:[],
+        chargeItmeShow:[],
+
+        payeeList:[],
+        // 查询参数
+        queryParams: {
+          transferType:"",
+          orderByColumn: "id",
+          isAsc: "desc",
+        },
+        capitalExpenditureOpen:false,
+        projectForm:{
+          projectId:null,
+          projectName:null,
+          projectContractor:null,
+          projectAmount:null,
+          projectBillNum:null,
+          projectFundType:'10',
+          outId:null,
+          ynType:'2'
+        },
+        projectFundType:'',
+        fileList:[],
+      };
+    },
+    created() {
+      let queryParams={
+        pageNum: 1,
+        pageSize: 100,
+      }
+      listProject(queryParams).then(response => {
+        this.projectList = response.rows;
+        for (let i = 0; i < response.rows.length; i++) {
+          this.projectListShow.push({text: response.rows[i].projectName, value: response.rows[i].id});
+        }
+      });
+      this.getDicts("project_fund_type").then((response) => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.projectFundTypeOptions.push({text: response.data[i].dictLabel, value: response.data[i].dictValue});
+        }
+        this.projectFundTypeDictionaries = response.data;
+      });
+      let params1={
+        accountType: "102",
+        status: "N",
+      }
+      getAccount(params1).then((response) => {
+        this.payerOptions = response.rows;
+        response.rows.map((res,index) => {
+          res['payerFrom'] = '1'
+          console.log(res)
+          this.payerOptions[index].text = res.accountName;
+          this.payerOptions[index].value = res.id;
+        })
+      });
+      this.getDictionaries();
+      this.getFileList();
+    },
+    methods: {
+      getDictionaries(){
+        getCash(this.$route.query.id).then((response) => {
+          this.getDicts("capital_expenditure_type").then((res) => {
+            for (let i = 0; i < res.data.length; i++) {
+              this.capitalExpenditureTypeOptions.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
+            }
+            this.capitalExpenditureType = this.selectDictLabel(res.data, response.data.capitalExpenditureType);
+          });
+          if(response.data.capitalExpenditureType==2){
+            this.capitalExpenditureOpen = true
+            let param={
+              'outId' : response.data.id,
+              'ynType' : '2'
+            }
+            getProjectto(param).then(res => {
+              this.projectFundType = this.selectDictLabel(this.projectFundTypeDictionaries, res.data.projectFundType);
+              this.projectForm = res.data
+            })
+          }else{
+            this.showproject = false
+          }
+          this.form = response.data;
+          console.log(this.form)
+        });
+        listCashdetailByCashId(this.$route.query.id).then((response) => {
+          this.chargeItme = response.data;
+        });
+      },
+      getChange(){
+        console.log(this.buttonType)
+        if(this.buttonType == 'update'){
+          console.log('update')
+          this.goUpdate();
+        }else if(this.buttonType == 'add'){
+          console.log('add')
+          this.goAdd();
+        }
+      },
+      getError(e){
+        console.log(e)
+        this.$notify({ type: 'danger', message: e.errors[0].message });
+      },
+      addChargeItme(index){
+        if(this.chargeItme.length>0&&this.chargeItme[this.chargeItme.length-1].payee == ''){
+          this.$notify({ type: 'danger', message: '请勿添加多个空列表信息' });
+          return;
+        }else if(this.chargeItme.length>0&&this.chargeItme[index-1].incomeAmount == ''){
+          this.$notify({ type: 'danger', message: '请输入提款金额！' });
+          return;
+        }else if(this.chargeItme.length>0&&this.chargeItme[index-1].drawer == ''){
+          this.$notify({ type: 'danger', message: '请输入提款人！' });
+          return;
+        }else if(this.chargeItme.length>0&&this.chargeItme[index-1].remark == ''){
+          this.$notify({ type: 'danger', message: '请输入资金用途！' });
+          return;
+        }
+        this.getDicts("bank_type").then(res => {
+          this.chargeItme.splice(index + 1, 0, {
+            payeeId: "", //收款方ID
+            payee: "", //收款方全称
+            payeeAccount: "", //收款账户
+            drawer: "", //提款人
+            incomeAmount: "", //提款金额
+            bankType: "", //资金用途
+            showPayee:false,
+            showbankType:false
+          });
+        });
+      },
+      getPayeeList() {
+        //普通转账
+        this.queryParams.accountType = this.form.accountType
+        this.queryParams.status = "0"
+        listPayee(this.queryParams).then((response) => {
+          this.payeeList = response.rows;
+          response.rows.map((res,index) => {
+            this.payeeList[index].text = res.payee;
+            this.payeeList[index].value = res.id;
+          })
+        });
+      },
+      payeeDictLabel(datas, value) {
+        var actions = [];
+        Object.keys(datas).some((key) => {
+          if (datas[key].payeeId == ('' + value)) {
+            actions.push(datas[key].payee);
+            return true;
+          }
+        })
+        return actions.join('');
+      },
+      onConfirmCapital(data){
+        console.log(data)
+        if (data.value != 2){
+          this.capitalExpenditureOpen = false;
+          this.projectForm = [];
+        }else{
+          this.capitalExpenditureOpen = true;
+        }
+        this.capitalExpenditureType = data.text;
+        this.form.capitalExpenditureType = data.value;
+        this.showcapital = false;
+      },
+      onConfirmFundType(data){
+        console.log(data)
+        this.projectForm.projectFundType = data.value;
+        this.projectFundType = data.text;
+        this.showFundType = false;
+      },
+      onConfirmProject(data){
+        this.projectList.map(res => {
+          if(res.projectName==data.text){
+            this.projectForm.projectId = res.id
+            this.projectForm.projectName = res.projectName
+            this.projectForm.projectContractor = res.projectContractor
+            this.projectForm.projectAmount = res.projectAmount
+          }
+        })
+        this.showproject = false;
+      },
+      onConfirmPayee(data,index){
+        console.log(data)
+        for (var i = 0 ; i < this.chargeItme.length ; i++){
+          this.chargeItme[i].showPayee = false;
+        }
+        this.chargeItme[index].payee = data.text;
+        this.chargeItme[index].payeeId = data.value;
+        this.payeeSelectChange(data.value , index)
+      },
+      onConfirmBankType(data,index){
+        for (var i = 0 ; i < this.chargeItme.length ; i++){
+          this.chargeItme[i].showbankType = false;
+        }
+        this.chargeItme[index].bankTypeText = data.text;
+        this.chargeItme[index].bankType = data.value;
+        this.chargeItme[index].showbankType = false;
+      },
+      onConfirmPayer(data){
+        this.form.payer = data.text;
+        this.form.cashierId = data.value;
+        this.showpayer = false;
+        this.selectChange(data.value)
+      },
+      onConfirmLasj(data){
+        this.form.applyDate = this.getNowFormatDate(data).substr(0,10);
+        this.showlasj = false;
+      },
+      accountTypeChange(e){
+        this.payeeList = [];
+        this.queryParams.accountType = this.form.accountType
+        this.queryParams.status = "0"
+        listPayee(this.queryParams).then((response) => {
+          this.payeeList = response.rows;
+          response.rows.map((res,index) => {
+            this.payeeList[index].text = res.payee;
+            this.payeeList[index].value = res.id;
+          })
+        });
+      },
+      // 钱计算
+      moneyChange(input) {
+        console.log(input)
+        let obj = {};
+        obj = this.chargeItme.find((account) => {
+          //model就是上面的数据源
+          return parseFloat(account.incomeAmount).toFixed(2) === input; //筛选出匹配数据
+        });
+        let total = 0;
+        this.chargeItme.forEach((money) => {
+          total = (parseFloat(total) + parseFloat(money.incomeAmount)).toFixed(2)
+        });
+        this.$set(this.form, "expenditureAmount", total);
+      },
+      goAdd(){
+        if(this.chargeItme.length<1){
+          this.$notify({ type: 'danger', message: '请添加收款方信息' });
+          return;
+        }
+        if(this.form.remark != null && this.form.remark.indexOf("|")!=-1){
+          this.$notify({ type: 'danger', message: '付款事由禁止包含！' });
+          return;
+        }
+        if(this.form.capitalExpenditureType==2){
+          if(this.projectForm.projectName==""||this.projectForm.projectName==null){
+            this.$notify({ type: 'danger', message: '请选择项目名称！' });
+            return;
+          }
+          if(this.projectForm.projectBillNum==""||this.projectForm.projectBillNum==null){
+            this.$notify({ type: 'danger', message: '请输入工程发票号！' });
+            return;
+          }
+        }
+        this.$set(this.form, "payeeList", this.chargeItme);
+        this.$set(this.form, "bankTypeList", this.chargeItme);
+        this.$set(this.form, "accountTypeList", this.chargeItme);
+        this.$set(this.form, "transferStatusList", this.chargeItme);
+        addCash(this.form).then(response => {
+          this.projectForm.outId = response.data.id
+          this.$set(this.projectForm, "ynType", '2');
+          if(this.form.capitalExpenditureType==2){
+            addProjectto(this.projectForm).then(res => {
+              customSubmit(response.data.id).then(res => {
+                this.$toast.success('提交成功');
+                setTimeout(function(){
+                  history.go(-1)
+                },2000)
+              })
+            })
+          }else{
+            customSubmit(response.data.id).then(res => {
+              this.$toast.success('提交成功');
+              setTimeout(function(){
+                history.go(-1)
+              },2000)
+            })
+          }
+        });
+      },
+      goUpdate(){
+        if(this.chargeItme.length<1){
+          this.$notify({ type: 'danger', message: '请添加收款方信息' });
+          return;
+        }
+        if(this.form.remark != null && this.form.remark.indexOf("|")!=-1){
+          this.$notify({ type: 'danger', message: '付款事由禁止包含！' });
+          return;
+        }
+        if(this.form.capitalExpenditureType==2){
+          if(this.projectForm.projectName==""||this.projectForm.projectName==null){
+            this.$notify({ type: 'danger', message: '请选择项目名称！' });
+            return;
+          }
+          if(this.projectForm.projectBillNum==""||this.projectForm.projectBillNum==null){
+            this.$notify({ type: 'danger', message: '请输入工程发票号！' });
+            return;
+          }
+        }
+        this.projectForm.outId = this.form.id
+        updateCash(this.form).then((response) => {
+          this.chargeItme.map(res => {
+            res.cashId = this.form.id
+            addCashdetail(res).then(r => {
+              if(this.form.capitalExpenditureType==2){
+                this.projectForm.outId = this.form.id
+                this.$set(this.projectForm, "ynType", '2');
+                addProjectto(this.projectForm).then(res => {
+                  this.$toast.success('保存成功');
+                  setTimeout(function(){
+                    history.go(-1)
+                  },2000)
+                })
+              }else{
+                this.$toast.success('保存成功');
+                setTimeout(function(){
+                  history.go(-1)
+                },2000)
+              }
+            })
+          })
+        });
+      },
+      payeeSelectChange(select, i) {
+        let obj = {};
+        let fuzhitype = 0;
+        obj = this.payeeList.find((account) => {
+          //model就是上面的数据源
+          return account.id === select ; //筛选出匹配数据
+        });
+        if(this.chargeItme != [] && this.chargeItme.length>1){
+          this.chargeItme.some((value, index) => {
+            if(value.payeeAccount != undefined &&value.payeeAccount != '' && obj.payeeAccount == value.payeeAccount&&index!=i){
+              fuzhitype = 2;
+              return true;
+            }
+            if(value.accountType != undefined &&value.accountType != '' && obj.accountType != value.accountType&&index!=i){
+              fuzhitype = 1;
+              return true;
+            }
+          });
+        }
+        if(fuzhitype == 0){
+          this.$set(this.chargeItme[i], "payee",obj.payee)
+          this.$set(this.chargeItme[i], "bankType", obj.bankType)
+          this.$set(this.chargeItme[i], "payeeId", obj.id);
+          this.$set(this.chargeItme[i], "payeeAccount", obj.payeeAccount);
+          this.$set(this.chargeItme[i], "bankDeposit", obj.bankDeposit);
+          this.$set(this.chargeItme[i], "accountType", obj.accountType);
+        }else if(fuzhitype == 1){
+          this.$set(this.chargeItme[i], "payee",'')
+          this.$set(this.chargeItme[i], "bankType",'')
+          this.$set(this.chargeItme[i], "payeeId", '');
+          this.$set(this.chargeItme[i], "payeeAccount", '');
+          this.$set(this.chargeItme[i], "bankDeposit", '');
+          this.$set(this.chargeItme[i], "accountType", '');
+          this.$notify({ type: 'danger', message: '请选择账户类型相同的收款方！' });
+        }else if(fuzhitype == 2){
+          this.$set(this.chargeItme[i], "payee",'')
+          this.$set(this.chargeItme[i], "bankType",'')
+          this.$set(this.chargeItme[i], "payeeId", '');
+          this.$set(this.chargeItme[i], "payeeAccount", '');
+          this.$set(this.chargeItme[i], "bankDeposit", '');
+          this.$set(this.chargeItme[i], "accountType", '');
+          this.$notify({ type: 'danger', message: '收款方已存在！' });
+        }
+      },
+      selectChange(select) {
+        let obj = {};
+        obj = this.payerOptions.find((account) => {
+          //model就是上面的数据源
+          return account.id === select; //筛选出匹配数据
+        });
+        if(obj.payerFrom==1&&obj.operatorCode != null && obj.operatorCode != "" &&
+          obj.enterpriseCode != null && obj.enterpriseCode != "" &&
+          obj.accountPassword != null && obj.accountPassword != ""){
+          this.$set(this.form, "bookId", obj.bookId);
+          this.$set(this.form, "deptId", obj.deptId);
+          this.$set(this.form, "cashierId", obj.id);
+          this.$set(this.form, "payer", obj.accountName);
+          this.$set(this.form, "payerAccount", obj.bankAccountNumber);
+          this.$set(this.form, "operatorCode", obj.operatorCode);
+          this.$set(this.form, "enterpriseCode", obj.enterpriseCode);
+          this.$set(this.form, "payerFrom", '1');
+        }else{
+          if(obj.payerFrom==1){
+            this.diglogStatus = false;
+            this.$notify({ type: 'danger', message: "请完善付款方“操作员代码”、“企业编码”、“支付口令”等信息！" });
+            this.$set(this.form,"payer","")
+            this.$set(this.form,"payerAccount","")
+          }else{
+            this.$set(this.form, "payerFrom", obj.parerFrom);
+            if(obj.operatorCode!=null&&obj.operatorCode!=''){
+              this.$set(this.form, "operatorCode", obj.operatorCode);
+            }else{
+              this.$set(this.form, "operatorCode", '');
+            }
+            if(obj.enterpriseCode!=null&&obj.enterpriseCode!=''){
+              this.$set(this.form, "enterpriseCode", obj.enterpriseCode);
+            }else{
+              this.$set(this.form, "enterpriseCode", '');
+            }
+            if(obj.accountPassword!=null&&obj.accountPassword!=''){
+              this.$set(this.form, "accountPassword", obj.accountPassword);
+            }else{
+              this.$set(this.form, "accountPassword", '');
+            }
+            this.$set(this.form, "bookId",'');
+            this.$set(this.form, "deptId", '');
+            this.$set(this.form, "cashierId", obj.id);
+            this.$set(this.form, "payer", obj.accountName);
+            if(obj.payerFrom==6){
+              getQmyeFlow(obj.bankAccountNumber).then((response) => {
+                this.$set(this.form, "payerAccount", response.data);
+              });
+            }else {
+              this.$set(this.form, "payerAccount", obj.bankAccountNumber);
+            }
+          }
+        }
+      },
+      beforeRead(file) {
+        console.log(file)
+        console.log(this.fileList)
+        const params = new FormData();
+        params.append("tableId", this.$route.query.id);
+        params.append("tableName", "t_yinnong_cash");
+        params.append("bizPath", "upload");
+        params.append("fileType", "0");
+        params.append("file", file.file);
+        commonAttach(params).then((response) => {
+          console.log(response)
+        })
+      },
+      getFileList(){
+        let oData= {
+          tableId: this.$route.query.id,
+          tableName: "t_yinnong_cash",
+          bizPath: "upload",
+          fileType: "0",
+        }
+        attachmentList(oData).then(res => {
+          console.log(res)
+          console.log(location.protocol+"//"+location.host+request.defaults.baseURL)
+          res.rows.map(r => {
+
+            let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
+            this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{})})
+            console.log(r)
+          })
+        })
+      },
+      goBack(){
+        window.history.go(-1)
+      },
+      //删除家庭成员
+      deleteChargeItme(index){
+        this.chargeItme.splice(index,1)
+      },
+    },
+  }
+</script>
+
+<style scoped lang="scss">
+  .app-container {
+    padding: 2% 0;
+  }
+  .main_title{
+    font-size: 0.4rem;
+    color: #1D6FE9;
+    margin: 0.2rem 6%;
+    position: relative;
+  }
+  .main_box{
+    width: 96%;
+    margin: 0 auto;
+    border-radius: 6px;
+    box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);
+    overflow: hidden;
+    background-color: #FFF;
+  }
+  .submitButton{
+    width: 80%;
+    margin: 0 auto;
+    background-color: #1D6FE9;
+  }
+
+  .addFamily{
+    position: absolute;
+    top: -2px;
+    right: 0;
+    border-radius: 50%;
+  }
+  .deleteFamily{
+    position: absolute;
+    top: 0rem;
+    right: 6%;
+    z-index: 9;
+    border-radius: 50%;
+  }
+</style>
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify11.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify11.vue
new file mode 100644
index 00000000..cffbace9
--- /dev/null
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify11.vue
@@ -0,0 +1,793 @@
+<template>
+  <div class="app-container">
+    <van-nav-bar
+      left-arrow
+      fixed
+      placeholder
+      @click-left="$router.back(-1)"
+    >
+      <template #title>
+        <p style="font-weight: bold;">修改付款申请</p>
+      </template>
+    </van-nav-bar>
+    <van-form @submit="getChange" @failed="getError" :show-error-message="false" scroll-to-error validate-first>
+      <p class="main_title">基础信息</p>
+      <div class="main_box">
+        <van-field
+          readonly
+          clickable
+          required
+          :rules="[{ required: true , message:'请选择申请时间' }]"
+          v-model="form.applyDate"
+          label="申请时间"
+          placeholder="请选择申请时间"
+          @click="showlasj = true"
+          input-align="right"
+          right-icon="arrow-down"
+        />
+        <van-popup v-model="showlasj" position="bottom">
+          <van-datetime-picker
+            v-model="currentDate"
+            type="date"
+            title="选择年月日"
+            :min-date="minDate"
+            :max-date="maxDate"
+            @confirm="onConfirmLasj"
+          />
+        </van-popup>
+        <van-field
+          readonly
+          clickable
+          required
+          :rules="[{ required: true , message:'请选择资金支出类别' }]"
+          label="资金支出类别"
+          placeholder="请选择"
+          v-model="capitalExpenditureType"
+          @click="showcapital = true"
+          input-align="right"
+          right-icon="arrow-down"
+          label-width="auto"
+        />
+        <van-popup v-model="showcapital" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="capitalExpenditureTypeOptions"
+            @confirm="onConfirmCapital"
+            @cancel="showcapital = false"
+          />
+        </van-popup>
+        <van-field
+          readonly
+          required
+          label="支出总金额"
+          v-model="form.expenditureAmount"
+          placeholder="根据下方收款金额自动核算"
+          input-align="right"
+          label-width="auto"
+        />
+
+      </div>
+
+      <div class="main_box" style="margin-top: 10px;">
+        <van-field
+          label="付款事由"
+          v-model="form.remark"
+          type="textarea"
+          placeholder="请输入付款事由"
+          input-align="right"
+          rows="3"
+          label-width="auto"
+          required
+          :rules="[{ required: true , message:'请输入付款事由' }]"
+        />
+      </div>
+
+      <div class="main_box" style="margin-top: 10px;">
+        <van-field label="说明情况" v-model="form.explainSituation" type="textarea" placeholder="请输入说明情况" input-align="right" rows="3" label-width="auto"/>
+      </div>
+
+      <p class="main_title" v-if="capitalExpenditureOpen">关联项目</p>
+      <div class="main_box" v-if="capitalExpenditureOpen" style="margin-bottom: 10px;margin-top: 10px;position:relative;">
+        <van-field
+          readonly
+          clickable
+          label="项目名称"
+          placeholder="请选择"
+          v-model="projectForm.projectName"
+          @click="showproject = true"
+          input-align="right"
+          right-icon="arrow-down"
+          required
+          :rules="[{ required: true , message:'请选择项目名称' }]"
+        />
+        <van-popup v-model="showproject" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="projectListShow"
+            @confirm="onConfirmProject"
+            @cancel="showproject = false"
+          />
+        </van-popup>
+        <van-field required :rules="[{ required: true , message:'请输入承建单位' }]" v-model="projectForm.projectContractor" label="承建单位" placeholder="请输入承建单位" input-align="right" label-width="auto"/>
+        <van-field required :rules="[{ required: true , message:'请输入合同价款（元）' }]" v-model="projectForm.projectAmount" label="合同价款（元）" placeholder="请输入合同价款（元）" input-align="right" label-width="auto"/>
+        <van-field
+          readonly
+          clickable
+          label="工程款类型"
+          placeholder="请选择"
+          v-model="projectFundType"
+          @click="showFundType = true"
+          input-align="right"
+          right-icon="arrow-down"
+          required
+          :rules="[{ required: true , message:'请选择工程款类型' }]"
+        />
+        <van-popup v-model="showFundType" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="projectFundTypeOptions"
+            @confirm="onConfirmFundType"
+            @cancel="showFundType = false"
+          />
+        </van-popup>
+        <van-field required :rules="[{ required: true , message:'请输入工程发票号' }]" v-model="projectForm.projectBillNum" label="工程发票号" placeholder="请输入工程发票号" input-align="right" label-width="auto"/>
+      </div>
+      <p class="main_title">付款方信息</p>
+      <div class="main_box">
+        <!--      <van-field label="付款方" v-model="form.payer" placeholder="请输入付款方" input-align="right" label-width="auto"/>-->
+        <van-field
+          readonly
+          clickable
+          label="付款方"
+          placeholder="请选择付款方"
+          v-model="form.payer"
+          @click="showpayer = true"
+          input-align="right"
+          right-icon="arrow-down"
+          label-width="auto"
+          required
+          :rules="[{ required: true , message:'请选择付款方' }]"
+        />
+        <van-popup v-model="showpayer" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="payerOptions"
+            @confirm="onConfirmPayer($event)"
+            @cancel="showpayer = false"
+          />
+        </van-popup>
+        <van-field :rules="[{ required: true , message:'请输入账户' }]" required label="付款方账户" v-model="form.payerAccount" placeholder="请输入账户" input-align="right" label-width="auto"/>
+      </div>
+
+      <p class="main_title">收款方信息<van-button icon="plus" @click="addChargeItme(chargeItme.length)" size="mini" type="info" native-type="button" class="addFamily"/></p>
+
+      <div class="main_box" style="margin-bottom: 15px;">
+        <van-cell title="收款账户类型">
+          <template #right-icon>
+            <van-radio-group direction="horizontal" v-model="form.accountType" @change="accountTypeChange">
+              <van-radio name="1">公户</van-radio>
+              <van-radio name="2">私户</van-radio>
+            </van-radio-group>
+          </template>
+        </van-cell>
+      </div>
+      <div :style="{position:'relative',padding: index == 0 ? '':'10px 0 0 0'}" v-for="(item, index) in chargeItme" :key="index">
+        <van-button icon="minus" size="mini" type="danger" class="deleteFamily" native-type="button" v-if="index!=0" @click="deleteChargeItme(index)" />
+        <div class="main_box" style="margin-bottom: 10px;position:relative;">
+          <van-field
+            readonly
+            clickable
+            label="收款方"
+            placeholder="请选择"
+            v-model="item.payee"
+            @click="item.showPayee = true"
+            input-align="right"
+            right-icon="arrow-down"
+            required
+            :rules="[{ required: true , message:'请选择收款方' }]"
+          />
+          <van-popup v-model="item.showPayee" position="bottom">
+            <van-picker
+              show-toolbar
+              :columns="payeeList"
+              @confirm="onConfirmPayee($event,index)"
+              @cancel="item.showPayee = false"
+            />
+          </van-popup>
+          <van-field required :rules="[{ required: true , message:'请输入账户' }]" v-model="item.payeeAccount" label="收款账户" placeholder="请输入账户" input-align="right" label-width="auto"/>
+          <van-field required :rules="[{ required: true , message:'请输入银行' }]" v-model="item.bankDeposit" label="开户银行" placeholder="请输入银行" input-align="right" label-width="auto"/>
+          <van-field required :rules="[{ required: true , message:'请输入金额' }]" v-model="item.incomeAmount" label="收入金额" placeholder="请输入金额" input-align="right" label-width="auto" @change="moneyChange"/>
+          <van-field
+            readonly
+            clickable
+            label="所属银行"
+            placeholder="请选择"
+            v-model="item.bankTypeText"
+            @click="item.showbankType = true"
+            input-align="right"
+            right-icon="arrow-down"
+            required
+            :rules="[{ required: true , message:'请选择所属银行' }]"
+          />
+          <van-popup v-model="item.showbankType" position="bottom">
+            <van-picker
+              show-toolbar
+              :columns="bankTypeDictionaries"
+              @confirm="onConfirmBankType($event,index)"
+              @cancel="item.showbankType = false"
+            />
+          </van-popup>
+        </div>
+      </div>
+      <p class="main_title">上传附件</p>
+      <div class="main_box" style="padding: 5px 0 0 8px;">
+        <van-uploader v-model="fileList" :after-read="beforeRead" ></van-uploader>
+      </div>
+      <div style="padding: 16px 0;">
+        <van-row>
+          <van-col span="12" align="center">
+            <van-button type="info" native-type="submit" @click="buttonType='update'" class="submitButton">保<i style="margin-right: 1em;"></i>存</van-button>
+          </van-col>
+          <van-col span="12" align="center">
+            <van-button type="info" native-type="submit" @click="buttonType='add'" class="submitButton">保存并提交</van-button>
+          </van-col>
+        </van-row>
+        <div class="clear"></div>
+      </div>
+    </van-form>
+  </div>
+</template>
+
+<script>
+  import { getAccount , getTransfer , queryTransferDetail , listPayee , updateTransfer , getProjectto , listProject , addProjectto , customSubmit ,getQmyeFlow} from "@/api/onlineHome/bankAgriculture/paymentApproval";
+  import {attachmentList, commonAttach} from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
+  export default {
+    name: "approvalModify11",
+    data() {
+      return {
+        showcapital:false,
+        showpayee:false,
+        showlasj:false,
+        showbankType:false,
+        showproject:false,
+        showFundType:false,
+        showpayer:false,
+
+        minDate: new Date(),
+        maxDate: new Date(2025, 10, 1),
+        currentDate: new Date(),
+        form:{},
+
+        capitalExpenditureType:'',
+        payee:'',
+        bankType:'',
+
+        buttonType:'a',
+
+        wfydlxDictionaries:[],
+        jglxDictionaries:[],
+        sysDictionaries:[],
+        capitalExpenditureTypeOptions:[],
+        bankTypeDictionaries:[],
+        projectList:[],
+        projectFundTypeOptions:[],
+        projectFundTypeDictionaries:[],
+        projectListShow:[],
+        payerOptions:[],
+
+        chargeItme:[],
+        chargeItmeShow:[],
+
+        payeeList:[],
+        // 查询参数
+        queryParams: {
+          transferType:"",
+          orderByColumn: "id",
+          isAsc: "desc",
+        },
+        capitalExpenditureOpen:false,
+        projectForm:{
+          projectId:null,
+          projectName:null,
+          projectContractor:null,
+          projectAmount:null,
+          projectBillNum:null,
+          projectFundType:'1',
+          outId:null,
+          ynType:'1'
+        },
+        projectFundType:'',
+        fileList:[],
+      };
+    },
+    created() {
+      let queryParams={
+        pageNum: 1,
+        pageSize: 100,
+      }
+      listProject(queryParams).then(response => {
+        this.projectList = response.rows;
+        for (var i = 0; i < response.rows.length; i++) {
+          this.projectListShow.push({text: response.rows[i].projectName, value: response.rows[i].id});
+        }
+      });
+      this.getDicts("project_fund_type").then((response) => {
+        for (var i = 0; i < response.data.length; i++) {
+          this.projectFundTypeOptions.push({text: response.data[i].dictLabel, value: response.data[i].dictValue});
+        }
+        this.projectFundTypeDictionaries = response.data;
+      });
+      let params1={
+        accountType: "102",
+        status: "N",
+      }
+      getAccount(params1).then((response) => {
+        this.payerOptions = response.rows;
+        response.rows.map((res,index) => {
+          res['payerFrom'] = '1'
+          console.log(res)
+          this.payerOptions[index].text = res.accountName;
+          this.payerOptions[index].value = res.id;
+        })
+      });
+      this.getDictionaries();
+      this.getFileList();
+    },
+    methods: {
+      getDictionaries(){
+        getTransfer(this.$route.query.id).then((response) => {
+          this.getDicts("capital_expenditure_type").then((res) => {
+            for (var i = 0; i < res.data.length; i++) {
+              this.capitalExpenditureTypeOptions.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
+            }
+            this.capitalExpenditureType = this.selectDictLabel(res.data, response.data.capitalExpenditureType);
+          });
+          if(response.data.capitalExpenditureType==2){
+            this.capitalExpenditureOpen = true
+            let param={
+              'outId' : response.data.id,
+              'ynType' : '1'
+            }
+            getProjectto(param).then(res => {
+              console.log(this.selectDictLabel(this.projectFundTypeDictionaries, res.data.projectFundType))
+              this.projectFundType = this.selectDictLabel(this.projectFundTypeDictionaries, res.data.projectFundType);
+              this.projectForm = res.data
+              console.log(res.data)
+            })
+          }else{
+            this.showproject = false
+          }
+          this.form = response.data;
+        });
+        queryTransferDetail(this.$route.query.id).then((response) => {
+          this.getDicts("bank_type").then(res => {
+            for (var i = 0; i < res.data.length; i++) {
+              this.bankTypeDictionaries.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
+            }
+            for (var j = 0 ; j < response.rows.length ; j++){
+              // response.rows[j].payeeText = response.rows[j].payee;
+              response.rows[j].bankTypeText = this.selectDictLabel(res.data, response.rows[j].bankType);
+              response.rows[j].showPayee = false;
+            }
+            this.chargeItme = response.rows;
+          });
+          this.getPayeeList();
+        });
+      },
+      getChange(){
+        console.log(this.buttonType)
+        if(this.buttonType == 'update'){
+          console.log('update')
+          this.goUpdate();
+        }else if(this.buttonType == 'add'){
+          console.log('add')
+          this.goAdd();
+        }
+      },
+      getError(e){
+        console.log(e)
+        this.$notify({ type: 'danger', message: e.errors[0].message });
+      },
+      addChargeItme(index){
+        if(this.chargeItme.length>0&&this.chargeItme[this.chargeItme.length-1].payee == ''){
+          this.$notify({ type: 'danger', message: '请勿添加多个空列表信息' });
+          return;
+        }else if(this.chargeItme.length>0&&this.chargeItme[index-1].incomeAmount == ''){
+          this.$notify({ type: 'danger', message: '请输入收入金额！' });
+          return;
+        }else if(this.chargeItme.length>0&&this.chargeItme[index-1].payeeAccount == ''){
+          this.$notify({ type: 'danger', message: '请输入收款账户！' });
+          return;
+        }else if(this.chargeItme.length>0&&this.chargeItme[index-1].bankDeposit == ''){
+          this.$notify({ type: 'danger', message: '请输入开户银行！' });
+          return;
+        }else if(this.chargeItme.length>0&&this.chargeItme[index-1].bankType == ''){
+          this.$notify({ type: 'danger', message: '请选择所属银行！' });
+          return;
+        }
+        this.getDicts("bank_type").then(res => {
+          this.chargeItme.splice(index + 1, 0, {
+            payeeId: "", //收款方ID
+            payee: "", //收款方
+            payeeAccount: "", //收款账户
+            bankDeposit: "", //开户银行
+            incomeAmount: "", //收入金额
+            bankType: "1", //所属银行
+            bankTypeText:this.selectDictLabel(res.data, 1), //所属银行
+            showPayee:false,
+            showbankType:false
+          });
+        });
+      },
+      getPayeeList() {
+        //普通转账
+        this.queryParams.accountType = this.form.accountType
+        this.queryParams.status = "0"
+        listPayee(this.queryParams).then((response) => {
+          this.payeeList = response.rows;
+          response.rows.map((res,index) => {
+            this.payeeList[index].text = res.payee;
+            this.payeeList[index].value = res.id;
+          })
+        });
+      },
+      payeeDictLabel(datas, value) {
+        var actions = [];
+        Object.keys(datas).some((key) => {
+          if (datas[key].payeeId == ('' + value)) {
+            actions.push(datas[key].payee);
+            return true;
+          }
+        })
+        return actions.join('');
+      },
+      onConfirmCapital(data){
+        console.log(data)
+        if (data.value != 2){
+          this.capitalExpenditureOpen = false;
+          this.projectForm = [];
+        }else{
+          this.capitalExpenditureOpen = true;
+        }
+        this.capitalExpenditureType = data.text;
+        this.form.capitalExpenditureType = data.value;
+        this.showcapital = false;
+      },
+      onConfirmFundType(data){
+        console.log(data)
+        this.projectForm.projectFundType = data.value;
+        this.projectFundType = data.text;
+        this.showFundType = false;
+      },
+      onConfirmProject(data){
+        this.projectList.map(res => {
+          if(res.projectName==data.text){
+            this.projectForm.projectId = res.id
+            this.projectForm.projectName = res.projectName
+            this.projectForm.projectContractor = res.projectContractor
+            this.projectForm.projectAmount = res.projectAmount
+          }
+        })
+        this.showproject = false;
+      },
+      onConfirmPayee(data,index){
+        console.log(data)
+        for (var i = 0 ; i < this.chargeItme.length ; i++){
+          this.chargeItme[i].showPayee = false;
+        }
+        this.chargeItme[index].payee = data.text;
+        this.chargeItme[index].payeeId = data.value;
+        this.payeeSelectChange(data.value , index)
+      },
+      onConfirmBankType(data,index){
+        for (var i = 0 ; i < this.chargeItme.length ; i++){
+          this.chargeItme[i].showbankType = false;
+        }
+        this.chargeItme[index].bankTypeText = data.text;
+        this.chargeItme[index].bankType = data.value;
+        this.chargeItme[index].showbankType = false;
+      },
+      onConfirmPayer(data){
+        this.form.payer = data.text;
+        this.form.cashierId = data.value;
+        this.showpayer = false;
+        this.selectChange(data.value)
+      },
+      onConfirmLasj(data){
+        this.form.applyDate = this.getNowFormatDate(data).substr(0,10);
+        this.showlasj = false;
+      },
+      accountTypeChange(e){
+        this.payeeList = [];
+        this.queryParams.accountType = this.form.accountType
+        this.queryParams.status = "0"
+        listPayee(this.queryParams).then((response) => {
+          this.payeeList = response.rows;
+          response.rows.map((res,index) => {
+            this.payeeList[index].text = res.payee;
+            this.payeeList[index].value = res.id;
+          })
+        });
+      },
+      // 钱计算
+      moneyChange(input) {
+        console.log(input)
+        let obj = {};
+        obj = this.chargeItme.find((account) => {
+          //model就是上面的数据源
+          return parseFloat(account.incomeAmount).toFixed(2) === input; //筛选出匹配数据
+        });
+        let total = 0;
+        this.chargeItme.forEach((money) => {
+          total = (parseFloat(total) + parseFloat(money.incomeAmount)).toFixed(2)
+        });
+        this.$set(this.form, "expenditureAmount", total);
+      },
+      goAdd(){
+        if(this.chargeItme.length<1){
+          this.$notify({ type: 'danger', message: '请添加收款方信息' });
+          return;
+        }
+        if(this.form.remark != null && this.form.remark.indexOf("|")!=-1){
+          this.$notify({ type: 'danger', message: '付款事由禁止包含！' });
+          return;
+        }
+        if(this.form.capitalExpenditureType==2){
+          if(this.projectForm.projectName==""||this.projectForm.projectName==null){
+            this.$notify({ type: 'danger', message: '请选择项目名称！' });
+            return;
+          }
+          if(this.projectForm.projectBillNum==""||this.projectForm.projectBillNum==null){
+            this.$notify({ type: 'danger', message: '请输入工程发票号！' });
+            return;
+          }
+        }
+        this.$set(this.form, "payeeList", this.chargeItme);
+        this.$set(this.form, "bankTypeList", this.chargeItme);
+        this.$set(this.form, "accountTypeList", this.chargeItme);
+        this.$set(this.form, "transferStatusList", this.chargeItme);
+        console.log(this.form);
+        updateTransfer(this.form).then(response => {
+          console.log(response);
+          this.projectForm.outId = this.form.id
+          this.$set(this.projectForm, "ynType", '1');
+          console.log(this.projectForm)
+          if(this.form.capitalExpenditureType==2){
+            addProjectto(this.projectForm).then(res => {
+              customSubmit(this.form.id).then(res => {
+                this.$toast.success('提交成功');
+                setTimeout(function(){
+                  history.go(-1)
+                },2000)
+              })
+            })
+          }else{
+            customSubmit(this.form.id).then(res => {
+              this.$toast.success('提交成功');
+              setTimeout(function(){
+                history.go(-1)
+              },2000)
+            })
+          }
+        });
+      },
+      goUpdate(){
+        if(this.chargeItme.length<1){
+          this.$notify({ type: 'danger', message: '请添加收款方信息' });
+          return;
+        }
+        if(this.form.remark != null && this.form.remark.indexOf("|")!=-1){
+          this.$notify({ type: 'danger', message: '付款事由禁止包含！' });
+          return;
+        }
+        if(this.form.capitalExpenditureType==2){
+          if(this.projectForm.projectName==""||this.projectForm.projectName==null){
+            this.$notify({ type: 'danger', message: '请选择项目名称！' });
+            return;
+          }
+          if(this.projectForm.projectBillNum==""||this.projectForm.projectBillNum==null){
+            this.$notify({ type: 'danger', message: '请输入工程发票号！' });
+            return;
+          }
+        }
+        this.$set(this.form, "payeeList", this.chargeItme);
+        this.$set(this.form, "bankTypeList", this.chargeItme);
+        this.$set(this.form, "accountTypeList", this.chargeItme);
+        this.$set(this.form, "transferStatusList", this.chargeItme);
+        this.projectForm.outId = this.form.id
+        updateTransfer(this.form).then((response) => {
+          this.projectForm.outId = this.form.id
+          this.$set(this.projectForm, "ynType", '1');
+          if(this.form.capitalExpenditureType==2){
+            addProjectto(this.projectForm).then(res => {
+                this.$toast.success('修改成功');
+                setTimeout(function(){
+                  history.go(-1)
+                },2000)
+            })
+          }else{
+            this.$toast.success('修改成功');
+            setTimeout(function(){
+              history.go(-1)
+            },2000)
+          }
+        });
+      },
+      payeeSelectChange(select, i) {
+        let obj = {};
+        let fuzhitype = 0;
+        obj = this.payeeList.find((account) => {
+          //model就是上面的数据源
+          return account.id === select ; //筛选出匹配数据
+        });
+        if(this.chargeItme != [] && this.chargeItme.length>1){
+          this.chargeItme.some((value, index) => {
+            if(value.payeeAccount != undefined &&value.payeeAccount != '' && obj.payeeAccount == value.payeeAccount&&index!=i){
+              fuzhitype = 2;
+              return true;
+            }
+            if(value.accountType != undefined &&value.accountType != '' && obj.accountType != value.accountType&&index!=i){
+              fuzhitype = 1;
+              return true;
+            }
+          });
+        }
+        if(fuzhitype == 0){
+          this.$set(this.chargeItme[i], "payee",obj.payee)
+          this.$set(this.chargeItme[i], "bankType", obj.bankType)
+          this.$set(this.chargeItme[i], "payeeId", obj.id);
+          this.$set(this.chargeItme[i], "payeeAccount", obj.payeeAccount);
+          this.$set(this.chargeItme[i], "bankDeposit", obj.bankDeposit);
+          this.$set(this.chargeItme[i], "accountType", obj.accountType);
+        }else if(fuzhitype == 1){
+          this.$set(this.chargeItme[i], "payee",'')
+          this.$set(this.chargeItme[i], "bankType",'')
+          this.$set(this.chargeItme[i], "payeeId", '');
+          this.$set(this.chargeItme[i], "payeeAccount", '');
+          this.$set(this.chargeItme[i], "bankDeposit", '');
+          this.$set(this.chargeItme[i], "accountType", '');
+          this.$notify({ type: 'danger', message: '请选择账户类型相同的收款方！' });
+        }else if(fuzhitype == 2){
+          this.$set(this.chargeItme[i], "payee",'')
+          this.$set(this.chargeItme[i], "bankType",'')
+          this.$set(this.chargeItme[i], "payeeId", '');
+          this.$set(this.chargeItme[i], "payeeAccount", '');
+          this.$set(this.chargeItme[i], "bankDeposit", '');
+          this.$set(this.chargeItme[i], "accountType", '');
+          this.$notify({ type: 'danger', message: '收款方已存在！' });
+        }
+      },
+      selectChange(select) {
+        let obj = {};
+        obj = this.payerOptions.find((account) => {
+          //model就是上面的数据源
+          return account.id === select; //筛选出匹配数据
+        });
+        if(obj.payerFrom==1&&obj.operatorCode != null && obj.operatorCode != "" &&
+          obj.enterpriseCode != null && obj.enterpriseCode != "" &&
+          obj.accountPassword != null && obj.accountPassword != ""){
+          this.$set(this.form, "bookId", obj.bookId);
+          this.$set(this.form, "deptId", obj.deptId);
+          this.$set(this.form, "cashierId", obj.id);
+          this.$set(this.form, "payer", obj.accountName);
+          this.$set(this.form, "payerAccount", obj.bankAccountNumber);
+          this.$set(this.form, "operatorCode", obj.operatorCode);
+          this.$set(this.form, "enterpriseCode", obj.enterpriseCode);
+          this.$set(this.form, "payerFrom", '1');
+        }else{
+          if(obj.payerFrom==1){
+            this.diglogStatus = false;
+            this.$notify({ type: 'danger', message: "请完善付款方“操作员代码”、“企业编码”、“支付口令”等信息！" });
+            this.$set(this.form,"payer","")
+            this.$set(this.form,"payerAccount","")
+          }else{
+            this.$set(this.form, "payerFrom", obj.parerFrom);
+            if(obj.operatorCode!=null&&obj.operatorCode!=''){
+              this.$set(this.form, "operatorCode", obj.operatorCode);
+            }else{
+              this.$set(this.form, "operatorCode", '');
+            }
+            if(obj.enterpriseCode!=null&&obj.enterpriseCode!=''){
+              this.$set(this.form, "enterpriseCode", obj.enterpriseCode);
+            }else{
+              this.$set(this.form, "enterpriseCode", '');
+            }
+            if(obj.accountPassword!=null&&obj.accountPassword!=''){
+              this.$set(this.form, "accountPassword", obj.accountPassword);
+            }else{
+              this.$set(this.form, "accountPassword", '');
+            }
+            this.$set(this.form, "bookId",'');
+            this.$set(this.form, "deptId", '');
+            this.$set(this.form, "cashierId", obj.id);
+            this.$set(this.form, "payer", obj.accountName);
+            if(obj.payerFrom==6){
+              getQmyeFlow(obj.bankAccountNumber).then((response) => {
+                this.$set(this.form, "payerAccount", response.data);
+              });
+            }else {
+              this.$set(this.form, "payerAccount", obj.bankAccountNumber);
+            }
+          }
+        }
+      },
+      beforeRead(file) {
+        console.log(file)
+        console.log(this.fileList)
+        const params = new FormData();
+        params.append("tableId", this.$route.query.id);
+        params.append("tableName", "t_yinnong_cash");
+        params.append("bizPath", "upload");
+        params.append("fileType", "0");
+        params.append("file", file.file);
+        commonAttach(params).then((response) => {
+          console.log(response)
+        })
+      },
+      getFileList(){
+        let oData= {
+          tableId: this.$route.query.id,
+          tableName: "t_yinnong_cash",
+          bizPath: "upload",
+          fileType: "0",
+        }
+        attachmentList(oData).then(res => {
+          console.log(res)
+          console.log(location.protocol+"//"+location.host+request.defaults.baseURL)
+          res.rows.map(r => {
+
+            let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
+            this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{})})
+            console.log(r)
+          })
+        })
+      },
+      goBack(){
+        window.history.go(-1)
+      },
+      //删除家庭成员
+      deleteChargeItme(index){
+        this.chargeItme.splice(index,1)
+      },
+    },
+  }
+</script>
+
+<style scoped lang="scss">
+  .app-container {
+    padding: 2% 0;
+  }
+  .main_title{
+    font-size: 0.4rem;
+    color: #1D6FE9;
+    margin: 0.2rem 6%;
+    position: relative;
+  }
+  .main_box{
+    width: 96%;
+    margin: 0 auto;
+    border-radius: 6px;
+    box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);
+    overflow: hidden;
+    background-color: #FFF;
+  }
+  .submitButton{
+    width: 80%;
+    margin: 0 auto;
+    background-color: #1D6FE9;
+  }
+
+  .addFamily{
+    position: absolute;
+    top: -2px;
+    right: 0;
+    border-radius: 50%;
+  }
+  .deleteFamily{
+    position: absolute;
+    top: 0rem;
+    right: 6%;
+    z-index: 9;
+    border-radius: 50%;
+  }
+</style>
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify12.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify12.vue
new file mode 100644
index 00000000..d005ab55
--- /dev/null
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify12.vue
@@ -0,0 +1,794 @@
+<template>
+  <div class="app-container">
+    <van-nav-bar
+      left-arrow
+      fixed
+      placeholder
+      @click-left="$router.back(-1)"
+    >
+      <template #title>
+        <p style="font-weight: bold;">修改付款申请</p>
+      </template>
+    </van-nav-bar>
+    <van-form @submit="getChange" @failed="getError" :show-error-message="false" scroll-to-error validate-first>
+      <p class="main_title">基础信息</p>
+      <div class="main_box">
+        <van-field
+          readonly
+          clickable
+          required
+          :rules="[{ required: true , message:'请选择申请时间' }]"
+          v-model="form.applyDate"
+          label="申请时间"
+          placeholder="请选择申请时间"
+          @click="showlasj = true"
+          input-align="right"
+          right-icon="arrow-down"
+        />
+        <van-popup v-model="showlasj" position="bottom">
+          <van-datetime-picker
+            v-model="currentDate"
+            type="date"
+            title="选择年月日"
+            :min-date="minDate"
+            :max-date="maxDate"
+            @confirm="onConfirmLasj"
+          />
+        </van-popup>
+        <van-field
+          readonly
+          clickable
+          required
+          :rules="[{ required: true , message:'请选择资金支出类别' }]"
+          label="资金支出类别"
+          placeholder="请选择"
+          v-model="capitalExpenditureType"
+          @click="showcapital = true"
+          input-align="right"
+          right-icon="arrow-down"
+          label-width="auto"
+        />
+        <van-popup v-model="showcapital" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="capitalExpenditureTypeOptions"
+            @confirm="onConfirmCapital"
+            @cancel="showcapital = false"
+          />
+        </van-popup>
+        <van-field
+          readonly
+          required
+          label="支出总金额"
+          v-model="form.expenditureAmount"
+          placeholder="根据下方收款金额自动核算"
+          input-align="right"
+          label-width="auto"
+        />
+
+      </div>
+
+      <div class="main_box" style="margin-top: 10px;">
+        <van-field
+          label="付款事由"
+          v-model="form.remark"
+          type="textarea"
+          placeholder="请输入付款事由"
+          input-align="right"
+          rows="3"
+          label-width="auto"
+          required
+          :rules="[{ required: true , message:'请输入付款事由' }]"
+        />
+      </div>
+
+      <div class="main_box" style="margin-top: 10px;">
+        <van-field label="说明情况" v-model="form.explainSituation" type="textarea" placeholder="请输入说明情况" input-align="right" rows="3" label-width="auto"/>
+      </div>
+
+      <p class="main_title" v-if="capitalExpenditureOpen">关联项目</p>
+      <div class="main_box" v-if="capitalExpenditureOpen" style="margin-bottom: 10px;margin-top: 10px;position:relative;">
+        <van-field
+          readonly
+          clickable
+          label="项目名称"
+          placeholder="请选择"
+          v-model="projectForm.projectName"
+          @click="showproject = true"
+          input-align="right"
+          right-icon="arrow-down"
+          required
+          :rules="[{ required: true , message:'请选择项目名称' }]"
+        />
+        <van-popup v-model="showproject" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="projectListShow"
+            @confirm="onConfirmProject"
+            @cancel="showproject = false"
+          />
+        </van-popup>
+        <van-field required :rules="[{ required: true , message:'请输入承建单位' }]" v-model="projectForm.projectContractor" label="承建单位" placeholder="请输入承建单位" input-align="right" label-width="auto"/>
+        <van-field required :rules="[{ required: true , message:'请输入合同价款（元）' }]" v-model="projectForm.projectAmount" label="合同价款（元）" placeholder="请输入合同价款（元）" input-align="right" label-width="auto"/>
+        <van-field
+          readonly
+          clickable
+          label="工程款类型"
+          placeholder="请选择"
+          v-model="projectFundType"
+          @click="showFundType = true"
+          input-align="right"
+          right-icon="arrow-down"
+          required
+          :rules="[{ required: true , message:'请选择工程款类型' }]"
+        />
+        <van-popup v-model="showFundType" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="projectFundTypeOptions"
+            @confirm="onConfirmFundType"
+            @cancel="showFundType = false"
+          />
+        </van-popup>
+        <van-field required :rules="[{ required: true , message:'请输入工程发票号' }]" v-model="projectForm.projectBillNum" label="工程发票号" placeholder="请输入工程发票号" input-align="right" label-width="auto"/>
+      </div>
+      <p class="main_title">付款方信息</p>
+      <div class="main_box">
+        <!--      <van-field label="付款方" v-model="form.payer" placeholder="请输入付款方" input-align="right" label-width="auto"/>-->
+        <van-field
+          readonly
+          clickable
+          label="付款方"
+          placeholder="请选择付款方"
+          v-model="form.payer"
+          @click="showpayer = true"
+          input-align="right"
+          right-icon="arrow-down"
+          label-width="auto"
+          required
+          :rules="[{ required: true , message:'请选择付款方' }]"
+        />
+        <van-popup v-model="showpayer" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="payerOptions"
+            @confirm="onConfirmPayer($event)"
+            @cancel="showpayer = false"
+          />
+        </van-popup>
+        <van-field :rules="[{ required: true , message:'请输入账户' }]" required label="付款方账户" v-model="form.payerAccount" placeholder="请输入账户" input-align="right" label-width="auto"/>
+      </div>
+
+      <p class="main_title">收款方信息<van-button icon="plus" @click="addChargeItme(chargeItme.length)" size="mini" type="info" native-type="button" class="addFamily"/></p>
+
+      <div class="main_box" style="margin-bottom: 15px;">
+        <van-cell title="收款账户类型">
+          <template #right-icon>
+            <van-radio-group direction="horizontal" v-model="form.accountType" @change="accountTypeChange">
+              <van-radio name="1">公户</van-radio>
+              <van-radio name="2">私户</van-radio>
+            </van-radio-group>
+          </template>
+        </van-cell>
+      </div>
+      <div :style="{position:'relative',padding: index == 0 ? '':'10px 0 0 0'}" v-for="(item, index) in chargeItme" :key="index">
+        <van-button icon="minus" size="mini" type="danger" class="deleteFamily" native-type="button" v-if="index!=0" @click="deleteChargeItme(index)" />
+        <div class="main_box" style="margin-bottom: 10px;position:relative;">
+          <van-field
+            readonly
+            clickable
+            label="收款方"
+            placeholder="请选择"
+            v-model="item.payee"
+            @click="item.showPayee = true"
+            input-align="right"
+            right-icon="arrow-down"
+            required
+            :rules="[{ required: true , message:'请选择收款方' }]"
+          />
+          <van-popup v-model="item.showPayee" position="bottom">
+            <van-picker
+              show-toolbar
+              :columns="payeeList"
+              @confirm="onConfirmPayee($event,index)"
+              @cancel="item.showPayee = false"
+            />
+          </van-popup>
+          <van-field required :rules="[{ required: true , message:'请输入账户' }]" v-model="item.payeeAccount" label="收款账户" placeholder="请输入账户" input-align="right" label-width="auto"/>
+          <van-field required :rules="[{ required: true , message:'请输入银行' }]" v-model="item.bankDeposit" label="开户银行" placeholder="请输入银行" input-align="right" label-width="auto"/>
+          <van-field required :rules="[{ required: true , message:'请输入金额' }]" v-model="item.incomeAmount" label="收入金额" placeholder="请输入金额" input-align="right" label-width="auto" @change="moneyChange"/>
+          <van-field
+            readonly
+            clickable
+            label="所属银行"
+            placeholder="请选择"
+            v-model="item.bankTypeText"
+            @click="item.showbankType = true"
+            input-align="right"
+            right-icon="arrow-down"
+            required
+            :rules="[{ required: true , message:'请选择所属银行' }]"
+          />
+          <van-popup v-model="item.showbankType" position="bottom">
+            <van-picker
+              show-toolbar
+              :columns="bankTypeDictionaries"
+              @confirm="onConfirmBankType($event,index)"
+              @cancel="item.showbankType = false"
+            />
+          </van-popup>
+        </div>
+      </div>
+      <p class="main_title">上传附件</p>
+      <div class="main_box" style="padding: 5px 0 0 8px;">
+        <van-uploader v-model="fileList" :after-read="beforeRead" ></van-uploader>
+      </div>
+      <div style="padding: 16px 0;">
+        <van-row>
+          <van-col span="12" align="center">
+            <van-button type="info" native-type="submit" @click="buttonType='update'" class="submitButton">保<i style="margin-right: 1em;"></i>存</van-button>
+          </van-col>
+          <van-col span="12" align="center">
+            <van-button type="info" native-type="submit" @click="buttonType='add'" class="submitButton">保存并提交</van-button>
+          </van-col>
+        </van-row>
+        <div class="clear"></div>
+      </div>
+    </van-form>
+  </div>
+</template>
+
+<script>
+  import { getAccount , getTransfer , queryTransferDetail , listPayee , updateTransfer , getProjectto , listProject , addProjectto , customSubmit ,getQmyeFlow} from "@/api/onlineHome/bankAgriculture/paymentApproval";
+  import request from '@/utils/request';
+  import {attachmentList, commonAttach} from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
+  export default {
+    name: "approvalModify12",
+    data() {
+      return {
+        showcapital:false,
+        showpayee:false,
+        showlasj:false,
+        showbankType:false,
+        showproject:false,
+        showFundType:false,
+        showpayer:false,
+
+        minDate: new Date(),
+        maxDate: new Date(2025, 10, 1),
+        currentDate: new Date(),
+        form:{},
+
+        capitalExpenditureType:'',
+        payee:'',
+        bankType:'',
+
+        buttonType:'a',
+
+        wfydlxDictionaries:[],
+        jglxDictionaries:[],
+        sysDictionaries:[],
+        capitalExpenditureTypeOptions:[],
+        bankTypeDictionaries:[],
+        projectList:[],
+        projectFundTypeOptions:[],
+        projectFundTypeDictionaries:[],
+        projectListShow:[],
+        payerOptions:[],
+
+        chargeItme:[],
+        chargeItmeShow:[],
+
+        payeeList:[],
+        // 查询参数
+        queryParams: {
+          transferType:"",
+          orderByColumn: "id",
+          isAsc: "desc",
+        },
+        capitalExpenditureOpen:false,
+        projectForm:{
+          projectId:null,
+          projectName:null,
+          projectContractor:null,
+          projectAmount:null,
+          projectBillNum:null,
+          projectFundType:'1',
+          outId:null,
+          ynType:'1'
+        },
+        projectFundType:'',
+        fileList:[],
+      };
+    },
+    created() {
+      let queryParams={
+        pageNum: 1,
+        pageSize: 100,
+      }
+      listProject(queryParams).then(response => {
+        this.projectList = response.rows;
+        for (var i = 0; i < response.rows.length; i++) {
+          this.projectListShow.push({text: response.rows[i].projectName, value: response.rows[i].id});
+        }
+      });
+      this.getDicts("project_fund_type").then((response) => {
+        for (var i = 0; i < response.data.length; i++) {
+          this.projectFundTypeOptions.push({text: response.data[i].dictLabel, value: response.data[i].dictValue});
+        }
+        this.projectFundTypeDictionaries = response.data;
+      });
+      let params1={
+        accountType: "102",
+        status: "N",
+      }
+      getAccount(params1).then((response) => {
+        this.payerOptions = response.rows;
+        response.rows.map((res,index) => {
+          res['payerFrom'] = '1'
+          console.log(res)
+          this.payerOptions[index].text = res.accountName;
+          this.payerOptions[index].value = res.id;
+        })
+      });
+      this.getDictionaries();
+      this.getFileList();
+    },
+    methods: {
+      getDictionaries(){
+        getTransfer(this.$route.query.id).then((response) => {
+          this.getDicts("capital_expenditure_type").then((res) => {
+            for (var i = 0; i < res.data.length; i++) {
+              this.capitalExpenditureTypeOptions.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
+            }
+            this.capitalExpenditureType = this.selectDictLabel(res.data, response.data.capitalExpenditureType);
+          });
+          if(response.data.capitalExpenditureType==2){
+            this.capitalExpenditureOpen = true
+            let param={
+              'outId' : response.data.id,
+              'ynType' : '1'
+            }
+            getProjectto(param).then(res => {
+              console.log(this.selectDictLabel(this.projectFundTypeDictionaries, res.data.projectFundType))
+              this.projectFundType = this.selectDictLabel(this.projectFundTypeDictionaries, res.data.projectFundType);
+              this.projectForm = res.data
+              console.log(res.data)
+            })
+          }else{
+            this.showproject = false
+          }
+          this.form = response.data;
+        });
+        queryTransferDetail(this.$route.query.id).then((response) => {
+          this.getDicts("bank_type").then(res => {
+            for (var i = 0; i < res.data.length; i++) {
+              this.bankTypeDictionaries.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
+            }
+            for (var j = 0 ; j < response.rows.length ; j++){
+              // response.rows[j].payeeText = response.rows[j].payee;
+              response.rows[j].bankTypeText = this.selectDictLabel(res.data, response.rows[j].bankType);
+              response.rows[j].showPayee = false;
+            }
+            this.chargeItme = response.rows;
+          });
+          this.getPayeeList();
+        });
+      },
+      getChange(){
+        console.log(this.buttonType)
+        if(this.buttonType == 'update'){
+          console.log('update')
+          this.goUpdate();
+        }else if(this.buttonType == 'add'){
+          console.log('add')
+          this.goAdd();
+        }
+      },
+      getError(e){
+        console.log(e)
+        this.$notify({ type: 'danger', message: e.errors[0].message });
+      },
+      addChargeItme(index){
+        if(this.chargeItme.length>0&&this.chargeItme[this.chargeItme.length-1].payee == ''){
+          this.$notify({ type: 'danger', message: '请勿添加多个空列表信息' });
+          return;
+        }else if(this.chargeItme.length>0&&this.chargeItme[index-1].incomeAmount == ''){
+          this.$notify({ type: 'danger', message: '请输入收入金额！' });
+          return;
+        }else if(this.chargeItme.length>0&&this.chargeItme[index-1].payeeAccount == ''){
+          this.$notify({ type: 'danger', message: '请输入收款账户！' });
+          return;
+        }else if(this.chargeItme.length>0&&this.chargeItme[index-1].bankDeposit == ''){
+          this.$notify({ type: 'danger', message: '请输入开户银行！' });
+          return;
+        }else if(this.chargeItme.length>0&&this.chargeItme[index-1].bankType == ''){
+          this.$notify({ type: 'danger', message: '请选择所属银行！' });
+          return;
+        }
+        this.getDicts("bank_type").then(res => {
+          this.chargeItme.splice(index + 1, 0, {
+            payeeId: "", //收款方ID
+            payee: "", //收款方
+            payeeAccount: "", //收款账户
+            bankDeposit: "", //开户银行
+            incomeAmount: "", //收入金额
+            bankType: "1", //所属银行
+            bankTypeText:this.selectDictLabel(res.data, 1), //所属银行
+            showPayee:false,
+            showbankType:false
+          });
+        });
+      },
+      getPayeeList() {
+        //普通转账
+        this.queryParams.accountType = this.form.accountType
+        this.queryParams.status = "0"
+        listPayee(this.queryParams).then((response) => {
+          this.payeeList = response.rows;
+          response.rows.map((res,index) => {
+            this.payeeList[index].text = res.payee;
+            this.payeeList[index].value = res.id;
+          })
+        });
+      },
+      payeeDictLabel(datas, value) {
+        var actions = [];
+        Object.keys(datas).some((key) => {
+          if (datas[key].payeeId == ('' + value)) {
+            actions.push(datas[key].payee);
+            return true;
+          }
+        })
+        return actions.join('');
+      },
+      onConfirmCapital(data){
+        console.log(data)
+        if (data.value != 2){
+          this.capitalExpenditureOpen = false;
+          this.projectForm = [];
+        }else{
+          this.capitalExpenditureOpen = true;
+        }
+        this.capitalExpenditureType = data.text;
+        this.form.capitalExpenditureType = data.value;
+        this.showcapital = false;
+      },
+      onConfirmFundType(data){
+        console.log(data)
+        this.projectForm.projectFundType = data.value;
+        this.projectFundType = data.text;
+        this.showFundType = false;
+      },
+      onConfirmProject(data){
+        this.projectList.map(res => {
+          if(res.projectName==data.text){
+            this.projectForm.projectId = res.id
+            this.projectForm.projectName = res.projectName
+            this.projectForm.projectContractor = res.projectContractor
+            this.projectForm.projectAmount = res.projectAmount
+          }
+        })
+        this.showproject = false;
+      },
+      onConfirmPayee(data,index){
+        console.log(data)
+        for (var i = 0 ; i < this.chargeItme.length ; i++){
+          this.chargeItme[i].showPayee = false;
+        }
+        this.chargeItme[index].payee = data.text;
+        this.chargeItme[index].payeeId = data.value;
+        this.payeeSelectChange(data.value , index)
+      },
+      onConfirmBankType(data,index){
+        for (var i = 0 ; i < this.chargeItme.length ; i++){
+          this.chargeItme[i].showbankType = false;
+        }
+        this.chargeItme[index].bankTypeText = data.text;
+        this.chargeItme[index].bankType = data.value;
+        this.chargeItme[index].showbankType = false;
+      },
+      onConfirmPayer(data){
+        this.form.payer = data.text;
+        this.form.cashierId = data.value;
+        this.showpayer = false;
+        this.selectChange(data.value)
+      },
+      onConfirmLasj(data){
+        this.form.applyDate = this.getNowFormatDate(data).substr(0,10);
+        this.showlasj = false;
+      },
+      accountTypeChange(e){
+        this.payeeList = [];
+        this.queryParams.accountType = this.form.accountType
+        this.queryParams.status = "0"
+        listPayee(this.queryParams).then((response) => {
+          this.payeeList = response.rows;
+          response.rows.map((res,index) => {
+            this.payeeList[index].text = res.payee;
+            this.payeeList[index].value = res.id;
+          })
+        });
+      },
+      // 钱计算
+      moneyChange(input) {
+        console.log(input)
+        let obj = {};
+        obj = this.chargeItme.find((account) => {
+          //model就是上面的数据源
+          return parseFloat(account.incomeAmount).toFixed(2) === input; //筛选出匹配数据
+        });
+        let total = 0;
+        this.chargeItme.forEach((money) => {
+          total = (parseFloat(total) + parseFloat(money.incomeAmount)).toFixed(2)
+        });
+        this.$set(this.form, "expenditureAmount", total);
+      },
+      goAdd(){
+        if(this.chargeItme.length<1){
+          this.$notify({ type: 'danger', message: '请添加收款方信息' });
+          return;
+        }
+        if(this.form.remark != null && this.form.remark.indexOf("|")!=-1){
+          this.$notify({ type: 'danger', message: '付款事由禁止包含！' });
+          return;
+        }
+        if(this.form.capitalExpenditureType==2){
+          if(this.projectForm.projectName==""||this.projectForm.projectName==null){
+            this.$notify({ type: 'danger', message: '请选择项目名称！' });
+            return;
+          }
+          if(this.projectForm.projectBillNum==""||this.projectForm.projectBillNum==null){
+            this.$notify({ type: 'danger', message: '请输入工程发票号！' });
+            return;
+          }
+        }
+        this.$set(this.form, "payeeList", this.chargeItme);
+        this.$set(this.form, "bankTypeList", this.chargeItme);
+        this.$set(this.form, "accountTypeList", this.chargeItme);
+        this.$set(this.form, "transferStatusList", this.chargeItme);
+        console.log(this.form);
+        updateTransfer(this.form).then(response => {
+          console.log(response);
+          this.projectForm.outId = this.form.id
+          this.$set(this.projectForm, "ynType", '1');
+          console.log(this.projectForm)
+          if(this.form.capitalExpenditureType==2){
+            addProjectto(this.projectForm).then(res => {
+              customSubmit(this.form.id).then(res => {
+                this.$toast.success('提交成功');
+                setTimeout(function(){
+                  history.go(-1)
+                },2000)
+              })
+            })
+          }else{
+            customSubmit(this.form.id).then(res => {
+              this.$toast.success('提交成功');
+              setTimeout(function(){
+                history.go(-1)
+              },2000)
+            })
+          }
+        });
+      },
+      goUpdate(){
+        if(this.chargeItme.length<1){
+          this.$notify({ type: 'danger', message: '请添加收款方信息' });
+          return;
+        }
+        if(this.form.remark != null && this.form.remark.indexOf("|")!=-1){
+          this.$notify({ type: 'danger', message: '付款事由禁止包含！' });
+          return;
+        }
+        if(this.form.capitalExpenditureType==2){
+          if(this.projectForm.projectName==""||this.projectForm.projectName==null){
+            this.$notify({ type: 'danger', message: '请选择项目名称！' });
+            return;
+          }
+          if(this.projectForm.projectBillNum==""||this.projectForm.projectBillNum==null){
+            this.$notify({ type: 'danger', message: '请输入工程发票号！' });
+            return;
+          }
+        }
+        this.$set(this.form, "payeeList", this.chargeItme);
+        this.$set(this.form, "bankTypeList", this.chargeItme);
+        this.$set(this.form, "accountTypeList", this.chargeItme);
+        this.$set(this.form, "transferStatusList", this.chargeItme);
+        this.projectForm.outId = this.form.id
+        updateTransfer(this.form).then((response) => {
+          this.projectForm.outId = this.form.id
+          this.$set(this.projectForm, "ynType", '1');
+          if(this.form.capitalExpenditureType==2){
+            addProjectto(this.projectForm).then(res => {
+                this.$toast.success('修改成功');
+                setTimeout(function(){
+                  history.go(-1)
+                },2000)
+            })
+          }else{
+            this.$toast.success('修改成功');
+            setTimeout(function(){
+              history.go(-1)
+            },2000)
+          }
+        });
+      },
+      payeeSelectChange(select, i) {
+        let obj = {};
+        let fuzhitype = 0;
+        obj = this.payeeList.find((account) => {
+          //model就是上面的数据源
+          return account.id === select ; //筛选出匹配数据
+        });
+        if(this.chargeItme != [] && this.chargeItme.length>1){
+          this.chargeItme.some((value, index) => {
+            if(value.payeeAccount != undefined &&value.payeeAccount != '' && obj.payeeAccount == value.payeeAccount&&index!=i){
+              fuzhitype = 2;
+              return true;
+            }
+            if(value.accountType != undefined &&value.accountType != '' && obj.accountType != value.accountType&&index!=i){
+              fuzhitype = 1;
+              return true;
+            }
+          });
+        }
+        if(fuzhitype == 0){
+          this.$set(this.chargeItme[i], "payee",obj.payee)
+          this.$set(this.chargeItme[i], "bankType", obj.bankType)
+          this.$set(this.chargeItme[i], "payeeId", obj.id);
+          this.$set(this.chargeItme[i], "payeeAccount", obj.payeeAccount);
+          this.$set(this.chargeItme[i], "bankDeposit", obj.bankDeposit);
+          this.$set(this.chargeItme[i], "accountType", obj.accountType);
+        }else if(fuzhitype == 1){
+          this.$set(this.chargeItme[i], "payee",'')
+          this.$set(this.chargeItme[i], "bankType",'')
+          this.$set(this.chargeItme[i], "payeeId", '');
+          this.$set(this.chargeItme[i], "payeeAccount", '');
+          this.$set(this.chargeItme[i], "bankDeposit", '');
+          this.$set(this.chargeItme[i], "accountType", '');
+          this.$notify({ type: 'danger', message: '请选择账户类型相同的收款方！' });
+        }else if(fuzhitype == 2){
+          this.$set(this.chargeItme[i], "payee",'')
+          this.$set(this.chargeItme[i], "bankType",'')
+          this.$set(this.chargeItme[i], "payeeId", '');
+          this.$set(this.chargeItme[i], "payeeAccount", '');
+          this.$set(this.chargeItme[i], "bankDeposit", '');
+          this.$set(this.chargeItme[i], "accountType", '');
+          this.$notify({ type: 'danger', message: '收款方已存在！' });
+        }
+      },
+      selectChange(select) {
+        let obj = {};
+        obj = this.payerOptions.find((account) => {
+          //model就是上面的数据源
+          return account.id === select; //筛选出匹配数据
+        });
+        if(obj.payerFrom==1&&obj.operatorCode != null && obj.operatorCode != "" &&
+          obj.enterpriseCode != null && obj.enterpriseCode != "" &&
+          obj.accountPassword != null && obj.accountPassword != ""){
+          this.$set(this.form, "bookId", obj.bookId);
+          this.$set(this.form, "deptId", obj.deptId);
+          this.$set(this.form, "cashierId", obj.id);
+          this.$set(this.form, "payer", obj.accountName);
+          this.$set(this.form, "payerAccount", obj.bankAccountNumber);
+          this.$set(this.form, "operatorCode", obj.operatorCode);
+          this.$set(this.form, "enterpriseCode", obj.enterpriseCode);
+          this.$set(this.form, "payerFrom", '1');
+        }else{
+          if(obj.payerFrom==1){
+            this.diglogStatus = false;
+            this.$notify({ type: 'danger', message: "请完善付款方“操作员代码”、“企业编码”、“支付口令”等信息！" });
+            this.$set(this.form,"payer","")
+            this.$set(this.form,"payerAccount","")
+          }else{
+            this.$set(this.form, "payerFrom", obj.parerFrom);
+            if(obj.operatorCode!=null&&obj.operatorCode!=''){
+              this.$set(this.form, "operatorCode", obj.operatorCode);
+            }else{
+              this.$set(this.form, "operatorCode", '');
+            }
+            if(obj.enterpriseCode!=null&&obj.enterpriseCode!=''){
+              this.$set(this.form, "enterpriseCode", obj.enterpriseCode);
+            }else{
+              this.$set(this.form, "enterpriseCode", '');
+            }
+            if(obj.accountPassword!=null&&obj.accountPassword!=''){
+              this.$set(this.form, "accountPassword", obj.accountPassword);
+            }else{
+              this.$set(this.form, "accountPassword", '');
+            }
+            this.$set(this.form, "bookId",'');
+            this.$set(this.form, "deptId", '');
+            this.$set(this.form, "cashierId", obj.id);
+            this.$set(this.form, "payer", obj.accountName);
+            if(obj.payerFrom==6){
+              getQmyeFlow(obj.bankAccountNumber).then((response) => {
+                this.$set(this.form, "payerAccount", response.data);
+              });
+            }else {
+              this.$set(this.form, "payerAccount", obj.bankAccountNumber);
+            }
+          }
+        }
+      },
+      beforeRead(file) {
+        console.log(file)
+        console.log(this.fileList)
+        const params = new FormData();
+        params.append("tableId", this.$route.query.id);
+        params.append("tableName", "t_yinnong_cash");
+        params.append("bizPath", "upload");
+        params.append("fileType", "0");
+        params.append("file", file.file);
+        commonAttach(params).then((response) => {
+          console.log(response)
+        })
+      },
+      getFileList(){
+        let oData= {
+          tableId: this.$route.query.id,
+          tableName: "t_yinnong_cash",
+          bizPath: "upload",
+          fileType: "0",
+        }
+        attachmentList(oData).then(res => {
+          console.log(res)
+          console.log(location.protocol+"//"+location.host+request.defaults.baseURL)
+          res.rows.map(r => {
+
+            let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
+            this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{})})
+            console.log(r)
+          })
+        })
+      },
+      goBack(){
+        window.history.go(-1)
+      },
+      //删除家庭成员
+      deleteChargeItme(index){
+        this.chargeItme.splice(index,1)
+      },
+    },
+  }
+</script>
+
+<style scoped lang="scss">
+  .app-container {
+    padding: 2% 0;
+  }
+  .main_title{
+    font-size: 0.4rem;
+    color: #1D6FE9;
+    margin: 0.2rem 6%;
+    position: relative;
+  }
+  .main_box{
+    width: 96%;
+    margin: 0 auto;
+    border-radius: 6px;
+    box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);
+    overflow: hidden;
+    background-color: #FFF;
+  }
+  .submitButton{
+    width: 80%;
+    margin: 0 auto;
+    background-color: #1D6FE9;
+  }
+
+  .addFamily{
+    position: absolute;
+    top: -2px;
+    right: 0;
+    border-radius: 50%;
+  }
+  .deleteFamily{
+    position: absolute;
+    top: 0rem;
+    right: 6%;
+    z-index: 9;
+    border-radius: 50%;
+  }
+</style>
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify2.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify2.vue
new file mode 100644
index 00000000..0817cbd0
--- /dev/null
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify2.vue
@@ -0,0 +1,794 @@
+<template>
+  <div class="app-container">
+    <van-nav-bar
+      left-arrow
+      fixed
+      placeholder
+      @click-left="$router.back(-1)"
+    >
+      <template #title>
+        <p style="font-weight: bold;">修改付款申请</p>
+      </template>
+    </van-nav-bar>
+    <van-form @submit="getChange" @failed="getError" :show-error-message="false" scroll-to-error validate-first>
+      <p class="main_title">基础信息</p>
+      <div class="main_box">
+        <van-field
+          readonly
+          clickable
+          required
+          :rules="[{ required: true , message:'请选择申请时间' }]"
+          v-model="form.applyDate"
+          label="申请时间"
+          placeholder="请选择申请时间"
+          @click="showlasj = true"
+          input-align="right"
+          right-icon="arrow-down"
+        />
+        <van-popup v-model="showlasj" position="bottom">
+          <van-datetime-picker
+            v-model="currentDate"
+            type="date"
+            title="选择年月日"
+            :min-date="minDate"
+            :max-date="maxDate"
+            @confirm="onConfirmLasj"
+          />
+        </van-popup>
+        <van-field
+          readonly
+          clickable
+          required
+          :rules="[{ required: true , message:'请选择资金支出类别' }]"
+          label="资金支出类别"
+          placeholder="请选择"
+          v-model="capitalExpenditureType"
+          @click="showcapital = true"
+          input-align="right"
+          right-icon="arrow-down"
+          label-width="auto"
+        />
+        <van-popup v-model="showcapital" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="capitalExpenditureTypeOptions"
+            @confirm="onConfirmCapital"
+            @cancel="showcapital = false"
+          />
+        </van-popup>
+        <van-field
+          readonly
+          required
+          label="支出总金额"
+          v-model="form.expenditureAmount"
+          placeholder="根据下方收款金额自动核算"
+          input-align="right"
+          label-width="auto"
+        />
+
+      </div>
+
+      <div class="main_box" style="margin-top: 10px;">
+        <van-field
+          label="付款事由"
+          v-model="form.remark"
+          type="textarea"
+          placeholder="请输入付款事由"
+          input-align="right"
+          rows="3"
+          label-width="auto"
+          required
+          :rules="[{ required: true , message:'请输入付款事由' }]"
+        />
+      </div>
+
+      <div class="main_box" style="margin-top: 10px;">
+        <van-field label="说明情况" v-model="form.explainSituation" type="textarea" placeholder="请输入说明情况" input-align="right" rows="3" label-width="auto"/>
+      </div>
+
+      <p class="main_title" v-if="capitalExpenditureOpen">关联项目</p>
+      <div class="main_box" v-if="capitalExpenditureOpen" style="margin-bottom: 10px;margin-top: 10px;position:relative;">
+        <van-field
+          readonly
+          clickable
+          label="项目名称"
+          placeholder="请选择"
+          v-model="projectForm.projectName"
+          @click="showproject = true"
+          input-align="right"
+          right-icon="arrow-down"
+          required
+          :rules="[{ required: true , message:'请选择项目名称' }]"
+        />
+        <van-popup v-model="showproject" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="projectListShow"
+            @confirm="onConfirmProject"
+            @cancel="showproject = false"
+          />
+        </van-popup>
+        <van-field required :rules="[{ required: true , message:'请输入承建单位' }]" v-model="projectForm.projectContractor" label="承建单位" placeholder="请输入承建单位" input-align="right" label-width="auto"/>
+        <van-field required :rules="[{ required: true , message:'请输入合同价款（元）' }]" v-model="projectForm.projectAmount" label="合同价款（元）" placeholder="请输入合同价款（元）" input-align="right" label-width="auto"/>
+        <van-field
+          readonly
+          clickable
+          label="工程款类型"
+          placeholder="请选择"
+          v-model="projectFundType"
+          @click="showFundType = true"
+          input-align="right"
+          right-icon="arrow-down"
+          required
+          :rules="[{ required: true , message:'请选择工程款类型' }]"
+        />
+        <van-popup v-model="showFundType" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="projectFundTypeOptions"
+            @confirm="onConfirmFundType"
+            @cancel="showFundType = false"
+          />
+        </van-popup>
+        <van-field required :rules="[{ required: true , message:'请输入工程发票号' }]" v-model="projectForm.projectBillNum" label="工程发票号" placeholder="请输入工程发票号" input-align="right" label-width="auto"/>
+      </div>
+      <p class="main_title">付款方信息</p>
+      <div class="main_box">
+        <!--      <van-field label="付款方" v-model="form.payer" placeholder="请输入付款方" input-align="right" label-width="auto"/>-->
+        <van-field
+          readonly
+          clickable
+          label="付款方"
+          placeholder="请选择付款方"
+          v-model="form.payer"
+          @click="showpayer = true"
+          input-align="right"
+          right-icon="arrow-down"
+          label-width="auto"
+          required
+          :rules="[{ required: true , message:'请选择付款方' }]"
+        />
+        <van-popup v-model="showpayer" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="payerOptions"
+            @confirm="onConfirmPayer($event)"
+            @cancel="showpayer = false"
+          />
+        </van-popup>
+        <van-field :rules="[{ required: true , message:'请输入账户' }]" required label="付款方账户" v-model="form.payerAccount" placeholder="请输入账户" input-align="right" label-width="auto"/>
+      </div>
+
+      <p class="main_title">收款方信息<van-button icon="plus" @click="addChargeItme(chargeItme.length)" size="mini" type="info" native-type="button" class="addFamily"/></p>
+
+      <div class="main_box" style="margin-bottom: 15px;">
+        <van-cell title="收款账户类型">
+          <template #right-icon>
+            <van-radio-group direction="horizontal" v-model="form.accountType" @change="accountTypeChange">
+              <van-radio name="1">公户</van-radio>
+              <van-radio name="2">私户</van-radio>
+            </van-radio-group>
+          </template>
+        </van-cell>
+      </div>
+      <div :style="{position:'relative',padding: index == 0 ? '':'10px 0 0 0'}" v-for="(item, index) in chargeItme" :key="index">
+        <van-button icon="minus" size="mini" type="danger" class="deleteFamily" native-type="button" v-if="index!=0" @click="deleteChargeItme(index)" />
+        <div class="main_box" style="margin-bottom: 10px;position:relative;">
+          <van-field
+            readonly
+            clickable
+            label="收款方"
+            placeholder="请选择"
+            v-model="item.payee"
+            @click="item.showPayee = true"
+            input-align="right"
+            right-icon="arrow-down"
+            required
+            :rules="[{ required: true , message:'请选择收款方' }]"
+          />
+          <van-popup v-model="item.showPayee" position="bottom">
+            <van-picker
+              show-toolbar
+              :columns="payeeList"
+              @confirm="onConfirmPayee($event,index)"
+              @cancel="item.showPayee = false"
+            />
+          </van-popup>
+          <van-field required :rules="[{ required: true , message:'请输入账户' }]" v-model="item.payeeAccount" label="收款账户" placeholder="请输入账户" input-align="right" label-width="auto"/>
+          <van-field required :rules="[{ required: true , message:'请输入银行' }]" v-model="item.bankDeposit" label="开户银行" placeholder="请输入银行" input-align="right" label-width="auto"/>
+          <van-field required :rules="[{ required: true , message:'请输入金额' }]" v-model="item.incomeAmount" label="收入金额" placeholder="请输入金额" input-align="right" label-width="auto" @change="moneyChange"/>
+          <van-field
+            readonly
+            clickable
+            label="所属银行"
+            placeholder="请选择"
+            v-model="item.bankTypeText"
+            @click="item.showbankType = true"
+            input-align="right"
+            right-icon="arrow-down"
+            required
+            :rules="[{ required: true , message:'请选择所属银行' }]"
+          />
+          <van-popup v-model="item.showbankType" position="bottom">
+            <van-picker
+              show-toolbar
+              :columns="bankTypeDictionaries"
+              @confirm="onConfirmBankType($event,index)"
+              @cancel="item.showbankType = false"
+            />
+          </van-popup>
+        </div>
+      </div>
+      <p class="main_title">上传附件</p>
+      <div class="main_box" style="padding: 5px 0 0 8px;">
+        <van-uploader v-model="fileList" :after-read="beforeRead" ></van-uploader>
+      </div>
+      <div style="padding: 16px 0;">
+        <van-row>
+          <van-col span="12" align="center">
+            <van-button type="info" native-type="submit" @click="buttonType='update'" class="submitButton">保<i style="margin-right: 1em;"></i>存</van-button>
+          </van-col>
+          <van-col span="12" align="center">
+            <van-button type="info" native-type="submit" @click="buttonType='add'" class="submitButton">保存并提交</van-button>
+          </van-col>
+        </van-row>
+        <div class="clear"></div>
+      </div>
+    </van-form>
+  </div>
+</template>
+
+<script>
+  import { getAccount , getTransfer , queryTransferDetail , listPayee , updateTransfer , getProjectto , listProject , addProjectto , customSubmit ,getQmyeFlow} from "@/api/onlineHome/bankAgriculture/paymentApproval";
+  import {attachmentList, commonAttach} from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
+  import request from '@/utils/request';
+  export default {
+    name: "approvalModify2",
+    data() {
+      return {
+        showcapital:false,
+        showpayee:false,
+        showlasj:false,
+        showbankType:false,
+        showproject:false,
+        showFundType:false,
+        showpayer:false,
+
+        minDate: new Date(),
+        maxDate: new Date(2025, 10, 1),
+        currentDate: new Date(),
+        form:{},
+
+        capitalExpenditureType:'',
+        payee:'',
+        bankType:'',
+
+        buttonType:'a',
+
+        wfydlxDictionaries:[],
+        jglxDictionaries:[],
+        sysDictionaries:[],
+        capitalExpenditureTypeOptions:[],
+        bankTypeDictionaries:[],
+        projectList:[],
+        projectFundTypeOptions:[],
+        projectFundTypeDictionaries:[],
+        projectListShow:[],
+        payerOptions:[],
+
+        chargeItme:[],
+        chargeItmeShow:[],
+
+        payeeList:[],
+        // 查询参数
+        queryParams: {
+          transferType:"",
+          orderByColumn: "id",
+          isAsc: "desc",
+        },
+        capitalExpenditureOpen:false,
+        projectForm:{
+          projectId:null,
+          projectName:null,
+          projectContractor:null,
+          projectAmount:null,
+          projectBillNum:null,
+          projectFundType:'1',
+          outId:null,
+          ynType:'1'
+        },
+        projectFundType:'',
+        fileList:[],
+      };
+    },
+    created() {
+      let queryParams={
+        pageNum: 1,
+        pageSize: 100,
+      }
+      listProject(queryParams).then(response => {
+        this.projectList = response.rows;
+        for (var i = 0; i < response.rows.length; i++) {
+          this.projectListShow.push({text: response.rows[i].projectName, value: response.rows[i].id});
+        }
+      });
+      this.getDicts("project_fund_type").then((response) => {
+        for (var i = 0; i < response.data.length; i++) {
+          this.projectFundTypeOptions.push({text: response.data[i].dictLabel, value: response.data[i].dictValue});
+        }
+        this.projectFundTypeDictionaries = response.data;
+      });
+      let params1={
+        accountType: "102",
+        status: "N",
+      }
+      getAccount(params1).then((response) => {
+        this.payerOptions = response.rows;
+        response.rows.map((res,index) => {
+          res['payerFrom'] = '1'
+          console.log(res)
+          this.payerOptions[index].text = res.accountName;
+          this.payerOptions[index].value = res.id;
+        })
+      });
+      this.getDictionaries();
+      this.getFileList();
+    },
+    methods: {
+      getDictionaries(){
+        getTransfer(this.$route.query.id).then((response) => {
+          this.getDicts("capital_expenditure_type").then((res) => {
+            for (var i = 0; i < res.data.length; i++) {
+              this.capitalExpenditureTypeOptions.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
+            }
+            this.capitalExpenditureType = this.selectDictLabel(res.data, response.data.capitalExpenditureType);
+          });
+          if(response.data.capitalExpenditureType==2){
+            this.capitalExpenditureOpen = true
+            let param={
+              'outId' : response.data.id,
+              'ynType' : '1'
+            }
+            getProjectto(param).then(res => {
+              console.log(this.selectDictLabel(this.projectFundTypeDictionaries, res.data.projectFundType))
+              this.projectFundType = this.selectDictLabel(this.projectFundTypeDictionaries, res.data.projectFundType);
+              this.projectForm = res.data
+              console.log(res.data)
+            })
+          }else{
+            this.showproject = false
+          }
+          this.form = response.data;
+        });
+        queryTransferDetail(this.$route.query.id).then((response) => {
+          this.getDicts("bank_type").then(res => {
+            for (var i = 0; i < res.data.length; i++) {
+              this.bankTypeDictionaries.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
+            }
+            for (var j = 0 ; j < response.rows.length ; j++){
+              // response.rows[j].payeeText = response.rows[j].payee;
+              response.rows[j].bankTypeText = this.selectDictLabel(res.data, response.rows[j].bankType);
+              response.rows[j].showPayee = false;
+            }
+            this.chargeItme = response.rows;
+          });
+          this.getPayeeList();
+        });
+      },
+      getChange(){
+        console.log(this.buttonType)
+        if(this.buttonType == 'update'){
+          console.log('update')
+          this.goUpdate();
+        }else if(this.buttonType == 'add'){
+          console.log('add')
+          this.goAdd();
+        }
+      },
+      getError(e){
+        console.log(e)
+        this.$notify({ type: 'danger', message: e.errors[0].message });
+      },
+      addChargeItme(index){
+        if(this.chargeItme.length>0&&this.chargeItme[this.chargeItme.length-1].payee == ''){
+          this.$notify({ type: 'danger', message: '请勿添加多个空列表信息' });
+          return;
+        }else if(this.chargeItme.length>0&&this.chargeItme[index-1].incomeAmount == ''){
+          this.$notify({ type: 'danger', message: '请输入收入金额！' });
+          return;
+        }else if(this.chargeItme.length>0&&this.chargeItme[index-1].payeeAccount == ''){
+          this.$notify({ type: 'danger', message: '请输入收款账户！' });
+          return;
+        }else if(this.chargeItme.length>0&&this.chargeItme[index-1].bankDeposit == ''){
+          this.$notify({ type: 'danger', message: '请输入开户银行！' });
+          return;
+        }else if(this.chargeItme.length>0&&this.chargeItme[index-1].bankType == ''){
+          this.$notify({ type: 'danger', message: '请选择所属银行！' });
+          return;
+        }
+        this.getDicts("bank_type").then(res => {
+          this.chargeItme.splice(index + 1, 0, {
+            payeeId: "", //收款方ID
+            payee: "", //收款方
+            payeeAccount: "", //收款账户
+            bankDeposit: "", //开户银行
+            incomeAmount: "", //收入金额
+            bankType: "1", //所属银行
+            bankTypeText:this.selectDictLabel(res.data, 1), //所属银行
+            showPayee:false,
+            showbankType:false
+          });
+        });
+      },
+      getPayeeList() {
+        //普通转账
+        this.queryParams.accountType = this.form.accountType
+        this.queryParams.status = "0"
+        listPayee(this.queryParams).then((response) => {
+          this.payeeList = response.rows;
+          response.rows.map((res,index) => {
+            this.payeeList[index].text = res.payee;
+            this.payeeList[index].value = res.id;
+          })
+        });
+      },
+      payeeDictLabel(datas, value) {
+        var actions = [];
+        Object.keys(datas).some((key) => {
+          if (datas[key].payeeId == ('' + value)) {
+            actions.push(datas[key].payee);
+            return true;
+          }
+        })
+        return actions.join('');
+      },
+      onConfirmCapital(data){
+        console.log(data)
+        if (data.value != 2){
+          this.capitalExpenditureOpen = false;
+          this.projectForm = [];
+        }else{
+          this.capitalExpenditureOpen = true;
+        }
+        this.capitalExpenditureType = data.text;
+        this.form.capitalExpenditureType = data.value;
+        this.showcapital = false;
+      },
+      onConfirmFundType(data){
+        console.log(data)
+        this.projectForm.projectFundType = data.value;
+        this.projectFundType = data.text;
+        this.showFundType = false;
+      },
+      onConfirmProject(data){
+        this.projectList.map(res => {
+          if(res.projectName==data.text){
+            this.projectForm.projectId = res.id
+            this.projectForm.projectName = res.projectName
+            this.projectForm.projectContractor = res.projectContractor
+            this.projectForm.projectAmount = res.projectAmount
+          }
+        })
+        this.showproject = false;
+      },
+      onConfirmPayee(data,index){
+        console.log(data)
+        for (var i = 0 ; i < this.chargeItme.length ; i++){
+          this.chargeItme[i].showPayee = false;
+        }
+        this.chargeItme[index].payee = data.text;
+        this.chargeItme[index].payeeId = data.value;
+        this.payeeSelectChange(data.value , index)
+      },
+      onConfirmBankType(data,index){
+        for (var i = 0 ; i < this.chargeItme.length ; i++){
+          this.chargeItme[i].showbankType = false;
+        }
+        this.chargeItme[index].bankTypeText = data.text;
+        this.chargeItme[index].bankType = data.value;
+        this.chargeItme[index].showbankType = false;
+      },
+      onConfirmPayer(data){
+        this.form.payer = data.text;
+        this.form.cashierId = data.value;
+        this.showpayer = false;
+        this.selectChange(data.value)
+      },
+      onConfirmLasj(data){
+        this.form.applyDate = this.getNowFormatDate(data).substr(0,10);
+        this.showlasj = false;
+      },
+      accountTypeChange(e){
+        this.payeeList = [];
+        this.queryParams.accountType = this.form.accountType
+        this.queryParams.status = "0"
+        listPayee(this.queryParams).then((response) => {
+          this.payeeList = response.rows;
+          response.rows.map((res,index) => {
+            this.payeeList[index].text = res.payee;
+            this.payeeList[index].value = res.id;
+          })
+        });
+      },
+      // 钱计算
+      moneyChange(input) {
+        console.log(input)
+        let obj = {};
+        obj = this.chargeItme.find((account) => {
+          //model就是上面的数据源
+          return parseFloat(account.incomeAmount).toFixed(2) === input; //筛选出匹配数据
+        });
+        let total = 0;
+        this.chargeItme.forEach((money) => {
+          total = (parseFloat(total) + parseFloat(money.incomeAmount)).toFixed(2)
+        });
+        this.$set(this.form, "expenditureAmount", total);
+      },
+      goAdd(){
+        if(this.chargeItme.length<1){
+          this.$notify({ type: 'danger', message: '请添加收款方信息' });
+          return;
+        }
+        if(this.form.remark != null && this.form.remark.indexOf("|")!=-1){
+          this.$notify({ type: 'danger', message: '付款事由禁止包含！' });
+          return;
+        }
+        if(this.form.capitalExpenditureType==2){
+          if(this.projectForm.projectName==""||this.projectForm.projectName==null){
+            this.$notify({ type: 'danger', message: '请选择项目名称！' });
+            return;
+          }
+          if(this.projectForm.projectBillNum==""||this.projectForm.projectBillNum==null){
+            this.$notify({ type: 'danger', message: '请输入工程发票号！' });
+            return;
+          }
+        }
+        this.$set(this.form, "payeeList", this.chargeItme);
+        this.$set(this.form, "bankTypeList", this.chargeItme);
+        this.$set(this.form, "accountTypeList", this.chargeItme);
+        this.$set(this.form, "transferStatusList", this.chargeItme);
+        console.log(this.form);
+        updateTransfer(this.form).then(response => {
+          console.log(response);
+          this.projectForm.outId = this.form.id
+          this.$set(this.projectForm, "ynType", '1');
+          console.log(this.projectForm)
+          if(this.form.capitalExpenditureType==2){
+            addProjectto(this.projectForm).then(res => {
+              customSubmit(this.form.id).then(res => {
+                this.$toast.success('提交成功');
+                setTimeout(function(){
+                  history.go(-1)
+                },2000)
+              })
+            })
+          }else{
+            customSubmit(this.form.id).then(res => {
+              this.$toast.success('提交成功');
+              setTimeout(function(){
+                history.go(-1)
+              },2000)
+            })
+          }
+        });
+      },
+      goUpdate(){
+        if(this.chargeItme.length<1){
+          this.$notify({ type: 'danger', message: '请添加收款方信息' });
+          return;
+        }
+        if(this.form.remark != null && this.form.remark.indexOf("|")!=-1){
+          this.$notify({ type: 'danger', message: '付款事由禁止包含！' });
+          return;
+        }
+        if(this.form.capitalExpenditureType==2){
+          if(this.projectForm.projectName==""||this.projectForm.projectName==null){
+            this.$notify({ type: 'danger', message: '请选择项目名称！' });
+            return;
+          }
+          if(this.projectForm.projectBillNum==""||this.projectForm.projectBillNum==null){
+            this.$notify({ type: 'danger', message: '请输入工程发票号！' });
+            return;
+          }
+        }
+        this.$set(this.form, "payeeList", this.chargeItme);
+        this.$set(this.form, "bankTypeList", this.chargeItme);
+        this.$set(this.form, "accountTypeList", this.chargeItme);
+        this.$set(this.form, "transferStatusList", this.chargeItme);
+        this.projectForm.outId = this.form.id
+        updateTransfer(this.form).then((response) => {
+          this.projectForm.outId = this.form.id
+          this.$set(this.projectForm, "ynType", '1');
+          if(this.form.capitalExpenditureType==2){
+            addProjectto(this.projectForm).then(res => {
+                this.$toast.success('修改成功');
+                setTimeout(function(){
+                  history.go(-1)
+                },2000)
+            })
+          }else{
+            this.$toast.success('修改成功');
+            setTimeout(function(){
+              history.go(-1)
+            },2000)
+          }
+        });
+      },
+      payeeSelectChange(select, i) {
+        let obj = {};
+        let fuzhitype = 0;
+        obj = this.payeeList.find((account) => {
+          //model就是上面的数据源
+          return account.id === select ; //筛选出匹配数据
+        });
+        if(this.chargeItme != [] && this.chargeItme.length>1){
+          this.chargeItme.some((value, index) => {
+            if(value.payeeAccount != undefined &&value.payeeAccount != '' && obj.payeeAccount == value.payeeAccount&&index!=i){
+              fuzhitype = 2;
+              return true;
+            }
+            if(value.accountType != undefined &&value.accountType != '' && obj.accountType != value.accountType&&index!=i){
+              fuzhitype = 1;
+              return true;
+            }
+          });
+        }
+        if(fuzhitype == 0){
+          this.$set(this.chargeItme[i], "payee",obj.payee)
+          this.$set(this.chargeItme[i], "bankType", obj.bankType)
+          this.$set(this.chargeItme[i], "payeeId", obj.id);
+          this.$set(this.chargeItme[i], "payeeAccount", obj.payeeAccount);
+          this.$set(this.chargeItme[i], "bankDeposit", obj.bankDeposit);
+          this.$set(this.chargeItme[i], "accountType", obj.accountType);
+        }else if(fuzhitype == 1){
+          this.$set(this.chargeItme[i], "payee",'')
+          this.$set(this.chargeItme[i], "bankType",'')
+          this.$set(this.chargeItme[i], "payeeId", '');
+          this.$set(this.chargeItme[i], "payeeAccount", '');
+          this.$set(this.chargeItme[i], "bankDeposit", '');
+          this.$set(this.chargeItme[i], "accountType", '');
+          this.$notify({ type: 'danger', message: '请选择账户类型相同的收款方！' });
+        }else if(fuzhitype == 2){
+          this.$set(this.chargeItme[i], "payee",'')
+          this.$set(this.chargeItme[i], "bankType",'')
+          this.$set(this.chargeItme[i], "payeeId", '');
+          this.$set(this.chargeItme[i], "payeeAccount", '');
+          this.$set(this.chargeItme[i], "bankDeposit", '');
+          this.$set(this.chargeItme[i], "accountType", '');
+          this.$notify({ type: 'danger', message: '收款方已存在！' });
+        }
+      },
+      selectChange(select) {
+        let obj = {};
+        obj = this.payerOptions.find((account) => {
+          //model就是上面的数据源
+          return account.id === select; //筛选出匹配数据
+        });
+        if(obj.payerFrom==1&&obj.operatorCode != null && obj.operatorCode != "" &&
+          obj.enterpriseCode != null && obj.enterpriseCode != "" &&
+          obj.accountPassword != null && obj.accountPassword != ""){
+          this.$set(this.form, "bookId", obj.bookId);
+          this.$set(this.form, "deptId", obj.deptId);
+          this.$set(this.form, "cashierId", obj.id);
+          this.$set(this.form, "payer", obj.accountName);
+          this.$set(this.form, "payerAccount", obj.bankAccountNumber);
+          this.$set(this.form, "operatorCode", obj.operatorCode);
+          this.$set(this.form, "enterpriseCode", obj.enterpriseCode);
+          this.$set(this.form, "payerFrom", '1');
+        }else{
+          if(obj.payerFrom==1){
+            this.diglogStatus = false;
+            this.$notify({ type: 'danger', message: "请完善付款方“操作员代码”、“企业编码”、“支付口令”等信息！" });
+            this.$set(this.form,"payer","")
+            this.$set(this.form,"payerAccount","")
+          }else{
+            this.$set(this.form, "payerFrom", obj.parerFrom);
+            if(obj.operatorCode!=null&&obj.operatorCode!=''){
+              this.$set(this.form, "operatorCode", obj.operatorCode);
+            }else{
+              this.$set(this.form, "operatorCode", '');
+            }
+            if(obj.enterpriseCode!=null&&obj.enterpriseCode!=''){
+              this.$set(this.form, "enterpriseCode", obj.enterpriseCode);
+            }else{
+              this.$set(this.form, "enterpriseCode", '');
+            }
+            if(obj.accountPassword!=null&&obj.accountPassword!=''){
+              this.$set(this.form, "accountPassword", obj.accountPassword);
+            }else{
+              this.$set(this.form, "accountPassword", '');
+            }
+            this.$set(this.form, "bookId",'');
+            this.$set(this.form, "deptId", '');
+            this.$set(this.form, "cashierId", obj.id);
+            this.$set(this.form, "payer", obj.accountName);
+            if(obj.payerFrom==6){
+              getQmyeFlow(obj.bankAccountNumber).then((response) => {
+                this.$set(this.form, "payerAccount", response.data);
+              });
+            }else {
+              this.$set(this.form, "payerAccount", obj.bankAccountNumber);
+            }
+          }
+        }
+      },
+      beforeRead(file) {
+        console.log(file)
+        console.log(this.fileList)
+        const params = new FormData();
+        params.append("tableId", this.$route.query.id);
+        params.append("tableName", "t_yinnong_transfer");
+        params.append("bizPath", "upload");
+        params.append("fileType", "0");
+        params.append("file", file.file);
+        commonAttach(params).then((response) => {
+          console.log(response)
+        })
+      },
+      getFileList(){
+        let oData= {
+          tableId: this.$route.query.id,
+          tableName: "t_yinnong_transfer",
+          bizPath: "upload",
+          fileType: "0",
+        }
+        attachmentList(oData).then(res => {
+          console.log(res)
+          console.log(location.protocol+"//"+location.host+request.defaults.baseURL)
+          res.rows.map(r => {
+
+            let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
+            this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{})})
+            console.log(r)
+          })
+        })
+      },
+      goBack(){
+        window.history.go(-1)
+      },
+      //删除家庭成员
+      deleteChargeItme(index){
+        this.chargeItme.splice(index,1)
+      },
+    },
+  }
+</script>
+
+<style scoped lang="scss">
+  .app-container {
+    padding: 2% 0;
+  }
+  .main_title{
+    font-size: 0.4rem;
+    color: #1D6FE9;
+    margin: 0.2rem 6%;
+    position: relative;
+  }
+  .main_box{
+    width: 96%;
+    margin: 0 auto;
+    border-radius: 6px;
+    box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);
+    overflow: hidden;
+    background-color: #FFF;
+  }
+  .submitButton{
+    width: 80%;
+    margin: 0 auto;
+    background-color: #1D6FE9;
+  }
+
+  .addFamily{
+    position: absolute;
+    top: -2px;
+    right: 0;
+    border-radius: 50%;
+  }
+  .deleteFamily{
+    position: absolute;
+    top: 0rem;
+    right: 6%;
+    z-index: 9;
+    border-radius: 50%;
+  }
+</style>
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify3.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify3.vue
new file mode 100644
index 00000000..0c9d583e
--- /dev/null
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify3.vue
@@ -0,0 +1,800 @@
+<template>
+  <div class="app-container">
+    <van-nav-bar
+      left-arrow
+      fixed
+      placeholder
+      @click-left="$router.back(-1)"
+    >
+      <template #title>
+        <p style="font-weight: bold;">修改付款申请</p>
+      </template>
+    </van-nav-bar>
+    <van-form @submit="getChange" @failed="getError" :show-error-message="false" scroll-to-error validate-first>
+      <p class="main_title">基础信息</p>
+      <div class="main_box">
+        <van-field
+          readonly
+          clickable
+          required
+          :rules="[{ required: true , message:'请选择申请时间' }]"
+          v-model="form.applyDate"
+          label="申请时间"
+          placeholder="请选择申请时间"
+          @click="showlasj = true"
+          input-align="right"
+          right-icon="arrow-down"
+        />
+        <van-popup v-model="showlasj" position="bottom">
+          <van-datetime-picker
+            v-model="currentDate"
+            type="date"
+            title="选择年月日"
+            :min-date="minDate"
+            :max-date="maxDate"
+            @confirm="onConfirmLasj"
+          />
+        </van-popup>
+        <van-field
+          readonly
+          clickable
+          required
+          :rules="[{ required: true , message:'请选择资金支出类别' }]"
+          label="资金支出类别"
+          placeholder="请选择"
+          v-model="capitalExpenditureType"
+          @click="showcapital = true"
+          input-align="right"
+          right-icon="arrow-down"
+          label-width="auto"
+        />
+        <van-popup v-model="showcapital" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="capitalExpenditureTypeOptions"
+            @confirm="onConfirmCapital"
+            @cancel="showcapital = false"
+          />
+        </van-popup>
+        <van-field
+          readonly
+          required
+          label="支出总金额"
+          v-model="form.expenditureAmount"
+          placeholder="根据下方收款金额自动核算"
+          input-align="right"
+          label-width="auto"
+        />
+
+      </div>
+
+      <div class="main_box" style="margin-top: 10px;">
+        <van-field
+          label="付款事由"
+          v-model="form.remark"
+          type="textarea"
+          placeholder="请输入付款事由"
+          input-align="right"
+          rows="3"
+          label-width="auto"
+          required
+          :rules="[{ required: true , message:'请输入付款事由' }]"
+        />
+      </div>
+
+      <div class="main_box" style="margin-top: 10px;">
+        <van-field label="说明情况" v-model="form.explainSituation" type="textarea" placeholder="请输入说明情况" input-align="right" rows="3" label-width="auto"/>
+      </div>
+
+      <p class="main_title" v-if="capitalExpenditureOpen">关联项目</p>
+      <div class="main_box" v-if="capitalExpenditureOpen" style="margin-bottom: 10px;margin-top: 10px;position:relative;">
+        <van-field
+          readonly
+          clickable
+          label="项目名称"
+          placeholder="请选择"
+          v-model="projectForm.projectName"
+          @click="showproject = true"
+          input-align="right"
+          right-icon="arrow-down"
+          required
+          :rules="[{ required: true , message:'请选择项目名称' }]"
+        />
+        <van-popup v-model="showproject" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="projectListShow"
+            @confirm="onConfirmProject"
+            @cancel="showproject = false"
+          />
+        </van-popup>
+        <van-field required :rules="[{ required: true , message:'请输入承建单位' }]" v-model="projectForm.projectContractor" label="承建单位" placeholder="请输入承建单位" input-align="right" label-width="auto"/>
+        <van-field required :rules="[{ required: true , message:'请输入合同价款（元）' }]" v-model="projectForm.projectAmount" label="合同价款（元）" placeholder="请输入合同价款（元）" input-align="right" label-width="auto"/>
+        <van-field
+          readonly
+          clickable
+          label="工程款类型"
+          placeholder="请选择"
+          v-model="projectFundType"
+          @click="showFundType = true"
+          input-align="right"
+          right-icon="arrow-down"
+          required
+          :rules="[{ required: true , message:'请选择工程款类型' }]"
+        />
+        <van-popup v-model="showFundType" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="projectFundTypeOptions"
+            @confirm="onConfirmFundType"
+            @cancel="showFundType = false"
+          />
+        </van-popup>
+        <van-field required :rules="[{ required: true , message:'请输入工程发票号' }]" v-model="projectForm.projectBillNum" label="工程发票号" placeholder="请输入工程发票号" input-align="right" label-width="auto"/>
+      </div>
+      <p class="main_title">付款方信息</p>
+      <div class="main_box">
+        <!--      <van-field label="付款方" v-model="form.payer" placeholder="请输入付款方" input-align="right" label-width="auto"/>-->
+        <van-field
+          readonly
+          clickable
+          label="付款方"
+          placeholder="请选择付款方"
+          v-model="form.payer"
+          @click="showpayer = true"
+          input-align="right"
+          right-icon="arrow-down"
+          label-width="auto"
+          required
+          :rules="[{ required: true , message:'请选择付款方' }]"
+        />
+        <van-popup v-model="showpayer" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="payerOptions"
+            @confirm="onConfirmPayer($event)"
+            @cancel="showpayer = false"
+          />
+        </van-popup>
+        <van-field :rules="[{ required: true , message:'请输入账户' }]" required label="付款方账户" v-model="form.payerAccount" placeholder="请输入账户" input-align="right" label-width="auto"/>
+      </div>
+
+      <p class="main_title">收款方信息<van-button icon="plus" @click="addChargeItme(chargeItme.length)" size="mini" type="info" native-type="button" class="addFamily"/></p>
+
+      <div class="main_box" style="margin-bottom: 15px;">
+        <van-cell title="收款账户类型">
+          <template #right-icon>
+            <van-radio-group direction="horizontal" v-model="form.accountType" @change="accountTypeChange">
+              <van-radio name="1">公户</van-radio>
+              <van-radio name="2">私户</van-radio>
+            </van-radio-group>
+          </template>
+        </van-cell>
+      </div>
+      <div :style="{position:'relative',padding: index == 0 ? '':'10px 0 0 0'}" v-for="(item, index) in chargeItme" :key="index">
+        <van-button icon="minus" size="mini" type="danger" class="deleteFamily" native-type="button" v-if="index!=0" @click="deleteChargeItme(index)" />
+        <div class="main_box" style="margin-bottom: 10px;position:relative;">
+          <van-field
+            readonly
+            clickable
+            label="收款方"
+            placeholder="请选择"
+            v-model="item.payee"
+            @click="item.showPayee = true"
+            input-align="right"
+            right-icon="arrow-down"
+            required
+            :rules="[{ required: true , message:'请选择收款方' }]"
+          />
+          <van-popup v-model="item.showPayee" position="bottom">
+            <van-picker
+              show-toolbar
+              :columns="payeeList"
+              @confirm="onConfirmPayee($event,index)"
+              @cancel="item.showPayee = false"
+            />
+          </van-popup>
+          <van-field required readonly :rules="[{ required: true , message:'请输入账户' }]" v-model="item.payeeAccount" label="收款账户" placeholder="请输入账户" input-align="right" label-width="auto"/>
+          <van-field required readonly :rules="[{ required: true , message:'请输入银行' }]" v-model="item.bankDeposit" label="开户银行" placeholder="请输入银行" input-align="right" label-width="auto"/>
+          <van-field required :rules="[{ required: true , message:'请输入金额' }]" v-model="item.incomeAmount" label="收入金额" placeholder="请输入金额" input-align="right" label-width="auto" @change="moneyChange"/>
+          <van-field
+            readonly
+            label="所属银行"
+            placeholder="请选择"
+            v-model="item.bankTypeText"
+            @click="item.showbankType = true"
+            input-align="right"
+            required
+            :rules="[{ required: true , message:'请选择所属银行' }]"
+          />
+        </div>
+      </div>
+      <p class="main_title">上传附件</p>
+      <div class="main_box" style="padding: 5px 0 0 8px;">
+        <van-uploader v-model="fileList" :after-read="beforeRead" ></van-uploader>
+      </div>
+      <div style="padding: 16px 0;">
+        <van-row>
+          <van-col span="12" align="center">
+            <van-button type="info" native-type="submit" @click="buttonType='update'" class="submitButton">保<i style="margin-right: 1em;"></i>存</van-button>
+          </van-col>
+          <van-col span="12" align="center">
+            <van-button type="info" native-type="submit" @click="buttonType='add'" class="submitButton">保存并提交</van-button>
+          </van-col>
+        </van-row>
+        <div class="clear"></div>
+      </div>
+    </van-form>
+  </div>
+</template>
+
+<script>
+  import { getAccount , getTransfer , queryTransferDetail , listPayee , updateTransfer , getProjectto , listProject , addProjectto , customSubmit ,getQmyeFlow} from "@/api/onlineHome/bankAgriculture/paymentApproval";
+  import {
+    addCash, attachmentList,
+    commonAttach,
+    listTaccount,
+    listVaccount
+  } from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
+  import request from '@/utils/request';
+  export default {
+    name: "approvalModify3",
+    data() {
+      return {
+        showcapital:false,
+        showpayee:false,
+        showlasj:false,
+        showbankType:false,
+        showproject:false,
+        showFundType:false,
+        showpayer:false,
+
+        minDate: new Date(),
+        maxDate: new Date(2025, 10, 1),
+        currentDate: new Date(),
+        form:{},
+
+        capitalExpenditureType:'',
+        payee:'',
+        bankType:'',
+
+        buttonType:'a',
+
+        wfydlxDictionaries:[],
+        jglxDictionaries:[],
+        sysDictionaries:[],
+        capitalExpenditureTypeOptions:[],
+        bankTypeDictionaries:[],
+        projectList:[],
+        projectFundTypeOptions:[],
+        projectFundTypeDictionaries:[],
+        projectListShow:[],
+        payerOptions:[],
+
+        chargeItme:[],
+        chargeItmeShow:[],
+
+        payeeList:[],
+        // 查询参数
+        queryParams: {
+          transferType:"",
+          orderByColumn: "id",
+          isAsc: "desc",
+        },
+        capitalExpenditureOpen:false,
+        projectForm:{
+          projectId:null,
+          projectName:null,
+          projectContractor:null,
+          projectAmount:null,
+          projectBillNum:null,
+          projectFundType:'1',
+          outId:null,
+          ynType:'1'
+        },
+        projectFundType:'',
+        fileList:[],
+      };
+    },
+    created() {
+      let queryParams={
+        pageNum: 1,
+        pageSize: 100,
+      }
+      listProject(queryParams).then(response => {
+        this.projectList = response.rows;
+        for (var i = 0; i < response.rows.length; i++) {
+          this.projectListShow.push({text: response.rows[i].projectName, value: response.rows[i].id});
+        }
+      });
+      this.getDicts("project_fund_type").then((response) => {
+        for (var i = 0; i < response.data.length; i++) {
+          this.projectFundTypeOptions.push({text: response.data[i].dictLabel, value: response.data[i].dictValue});
+        }
+        this.projectFundTypeDictionaries = response.data;
+      });
+      let params1={
+        townAccountType:'3'
+      }
+      listTaccount(params1).then((response) => {
+        console.log(response)
+        response.rows.map((res,index) => {
+          if(res.townAccountType=='3'){
+            res['payerFrom'] = '3'
+            this.payerOptions.push(res);
+            this.payerOptions[index].text = res.payee;
+            this.payerOptions[index].value = res.id;
+          }
+        })
+      });
+      this.getDictionaries();
+      this.getFileList();
+    },
+    methods: {
+      getDictionaries(){
+        getTransfer(this.$route.query.id).then((response) => {
+          this.getDicts("capital_expenditure_type").then((res) => {
+            for (var i = 0; i < res.data.length; i++) {
+              this.capitalExpenditureTypeOptions.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
+            }
+            this.capitalExpenditureType = this.selectDictLabel(res.data, response.data.capitalExpenditureType);
+          });
+          if(response.data.capitalExpenditureType==2){
+            this.capitalExpenditureOpen = true
+            let param={
+              'outId' : response.data.id,
+              'ynType' : '1'
+            }
+            getProjectto(param).then(res => {
+              console.log(this.selectDictLabel(this.projectFundTypeDictionaries, res.data.projectFundType))
+              this.projectFundType = this.selectDictLabel(this.projectFundTypeDictionaries, res.data.projectFundType);
+              this.projectForm = res.data
+              console.log(res.data)
+            })
+          }else{
+            this.showproject = false
+          }
+          this.form = response.data;
+        });
+        queryTransferDetail(this.$route.query.id).then((response) => {
+          this.getDicts("bank_type").then(res => {
+            for (var i = 0; i < res.data.length; i++) {
+              this.bankTypeDictionaries.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
+            }
+            for (var j = 0 ; j < response.rows.length ; j++){
+              // response.rows[j].payeeText = response.rows[j].payee;
+              response.rows[j].bankTypeText = this.selectDictLabel(res.data, response.rows[j].bankType);
+              response.rows[j].showPayee = false;
+            }
+            this.chargeItme = response.rows;
+          });
+          this.getPayeeList();
+        });
+      },
+      getChange(){
+        console.log(this.buttonType)
+        if(this.buttonType == 'update'){
+          console.log('update')
+          this.goUpdate();
+        }else if(this.buttonType == 'add'){
+          console.log('add')
+          this.goAdd();
+        }
+      },
+      getError(e){
+        console.log(e)
+        this.$notify({ type: 'danger', message: e.errors[0].message });
+      },
+      addChargeItme(index){
+        if(this.chargeItme.length>0&&this.chargeItme[this.chargeItme.length-1].payee == ''){
+          this.$notify({ type: 'danger', message: '请勿添加多个空列表信息' });
+          return;
+        }else if(this.chargeItme.length>0&&this.chargeItme[index-1].incomeAmount == ''){
+          this.$notify({ type: 'danger', message: '请输入收入金额！' });
+          return;
+        }else if(this.chargeItme.length>0&&this.chargeItme[index-1].payeeAccount == ''){
+          this.$notify({ type: 'danger', message: '请输入收款账户！' });
+          return;
+        }else if(this.chargeItme.length>0&&this.chargeItme[index-1].bankDeposit == ''){
+          this.$notify({ type: 'danger', message: '请输入开户银行！' });
+          return;
+        }else if(this.chargeItme.length>0&&this.chargeItme[index-1].bankType == ''){
+          this.$notify({ type: 'danger', message: '请选择所属银行！' });
+          return;
+        }
+        this.getDicts("bank_type").then(res => {
+          this.chargeItme.splice(index + 1, 0, {
+            payeeId: "", //收款方ID
+            payee: "", //收款方
+            payeeAccount: "", //收款账户
+            bankDeposit: "", //开户银行
+            incomeAmount: "", //收入金额
+            bankType: "1", //所属银行
+            bankTypeText:this.selectDictLabel(res.data, 1), //所属银行
+            showPayee:false,
+            showbankType:false
+          });
+        });
+      },
+      getPayeeList() {
+        let params = {
+          villageAccountType : 1,
+          status:'0',
+          accountType : this.form.accountType
+        }
+        listVaccount(params).then(response => {
+          console.log(response)
+          if(response.rows.length>0){
+            this.payeeList = response.rows;
+            response.rows.map((res,index) => {
+              this.payeeList[index].text = res.payee;
+              this.payeeList[index].value = res.id;
+            })
+          }
+        });
+      },
+      payeeDictLabel(datas, value) {
+        var actions = [];
+        Object.keys(datas).some((key) => {
+          if (datas[key].payeeId == ('' + value)) {
+            actions.push(datas[key].payee);
+            return true;
+          }
+        })
+        return actions.join('');
+      },
+      onConfirmCapital(data){
+        console.log(data)
+        if (data.value != 2){
+          this.capitalExpenditureOpen = false;
+          this.projectForm = [];
+        }else{
+          this.capitalExpenditureOpen = true;
+        }
+        this.capitalExpenditureType = data.text;
+        this.form.capitalExpenditureType = data.value;
+        this.showcapital = false;
+      },
+      onConfirmFundType(data){
+        console.log(data)
+        this.projectForm.projectFundType = data.value;
+        this.projectFundType = data.text;
+        this.showFundType = false;
+      },
+      onConfirmProject(data){
+        this.projectList.map(res => {
+          if(res.projectName==data.text){
+            this.projectForm.projectId = res.id
+            this.projectForm.projectName = res.projectName
+            this.projectForm.projectContractor = res.projectContractor
+            this.projectForm.projectAmount = res.projectAmount
+          }
+        })
+        this.showproject = false;
+      },
+      onConfirmPayee(data,index){
+        console.log(data)
+        for (var i = 0 ; i < this.chargeItme.length ; i++){
+          this.chargeItme[i].showPayee = false;
+        }
+        this.chargeItme[index].payee = data.text;
+        this.chargeItme[index].payeeId = data.value;
+        this.payeeSelectChange(data.value , index)
+      },
+      onConfirmBankType(data,index){
+        for (var i = 0 ; i < this.chargeItme.length ; i++){
+          this.chargeItme[i].showbankType = false;
+        }
+        this.chargeItme[index].bankTypeText = data.text;
+        this.chargeItme[index].bankType = data.value;
+        this.chargeItme[index].showbankType = false;
+      },
+      onConfirmPayer(data){
+        this.form.payer = data.text;
+        this.form.cashierId = data.value;
+        this.showpayer = false;
+        this.selectChange(data.value)
+      },
+      onConfirmLasj(data){
+        this.form.applyDate = this.getNowFormatDate(data).substr(0,10);
+        this.showlasj = false;
+      },
+      accountTypeChange(e){
+        this.chargeItme = [];
+        this.payeeList = [];
+        let params = {
+          villageAccountType : 1,
+          status:'0',
+          accountType : this.form.accountType
+        }
+        listVaccount(params).then(response => {
+          console.log(response)
+          if(response.rows.length>0){
+            this.payeeList = response.rows;
+            response.rows.map((res,index) => {
+              this.payeeList[index].text = res.payee;
+              this.payeeList[index].value = res.id;
+            })
+          }
+        });
+      },
+      // 钱计算
+      moneyChange(input) {
+        console.log(input)
+        let obj = {};
+        obj = this.chargeItme.find((account) => {
+          //model就是上面的数据源
+          return parseFloat(account.incomeAmount).toFixed(2) === input; //筛选出匹配数据
+        });
+        let total = 0;
+        this.chargeItme.forEach((money) => {
+          total = (parseFloat(total) + parseFloat(money.incomeAmount)).toFixed(2)
+        });
+        this.$set(this.form, "expenditureAmount", total);
+      },
+      goAdd(){
+        if(this.chargeItme.length<1){
+          this.$notify({ type: 'danger', message: '请添加收款方信息' });
+          return;
+        }
+        if(this.form.remark != null && this.form.remark.indexOf("|")!=-1){
+          this.$notify({ type: 'danger', message: '付款事由禁止包含！' });
+          return;
+        }
+        if(this.form.capitalExpenditureType==2){
+          if(this.projectForm.projectName==""||this.projectForm.projectName==null){
+            this.$notify({ type: 'danger', message: '请选择项目名称！' });
+            return;
+          }
+          if(this.projectForm.projectBillNum==""||this.projectForm.projectBillNum==null){
+            this.$notify({ type: 'danger', message: '请输入工程发票号！' });
+            return;
+          }
+        }
+        this.$set(this.form, "payeeList", this.chargeItme);
+        this.$set(this.form, "bankTypeList", this.chargeItme);
+        this.$set(this.form, "accountTypeList", this.chargeItme);
+        this.$set(this.form, "transferStatusList", this.chargeItme);
+        console.log(this.form);
+        addCash(this.form).then(response => {
+          this.projectForm.outId = response.data.id
+          this.$set(this.projectForm, "ynType", '3');
+          if(this.form.capitalExpenditureType==2){
+            addProjectto(this.projectForm).then(res => {
+              customSubmit(response.data.id).then(res => {
+                this.$toast.success('提交成功');
+                setTimeout(function(){
+                  history.go(-1)
+                },2000)
+              })
+            })
+          }else{
+            customSubmit(response.data.id).then(res => {
+              this.$toast.success('提交成功');
+              setTimeout(function(){
+                history.go(-1)
+              },2000)
+            })
+          }
+        });
+      },
+      goUpdate(){
+        if(this.chargeItme.length<1){
+          this.$notify({ type: 'danger', message: '请添加收款方信息' });
+          return;
+        }
+        if(this.form.remark != null && this.form.remark.indexOf("|")!=-1){
+          this.$notify({ type: 'danger', message: '付款事由禁止包含！' });
+          return;
+        }
+        if(this.form.capitalExpenditureType==2){
+          if(this.projectForm.projectName==""||this.projectForm.projectName==null){
+            this.$notify({ type: 'danger', message: '请选择项目名称！' });
+            return;
+          }
+          if(this.projectForm.projectBillNum==""||this.projectForm.projectBillNum==null){
+            this.$notify({ type: 'danger', message: '请输入工程发票号！' });
+            return;
+          }
+        }
+        this.$set(this.form, "payeeList", this.chargeItme);
+        this.$set(this.form, "bankTypeList", this.chargeItme);
+        this.$set(this.form, "accountTypeList", this.chargeItme);
+        this.$set(this.form, "transferStatusList", this.chargeItme);
+        this.projectForm.outId = this.form.id
+        updateTransfer(this.form).then((response) => {
+          this.projectForm.outId = this.form.id
+          this.$set(this.projectForm, "ynType", '1');
+          if(this.form.capitalExpenditureType==2){
+            addProjectto(this.projectForm).then(res => {
+                this.$toast.success('修改成功');
+                setTimeout(function(){
+                  history.go(-1)
+                },2000)
+            })
+          }else{
+            this.$toast.success('修改成功');
+            setTimeout(function(){
+              history.go(-1)
+            },2000)
+          }
+        });
+      },
+      payeeSelectChange(select, i) {
+        let obj = {};
+        let fuzhitype = 0;
+        obj = this.payeeList.find((account) => {
+          //model就是上面的数据源
+          return account.id === select ; //筛选出匹配数据
+        });
+        if(this.chargeItme != [] && this.chargeItme.length>1){
+          this.chargeItme.some((value, index) => {
+            if(value.payeeAccount != undefined &&value.payeeAccount != '' && obj.payeeAccount == value.payeeAccount&&index!=i){
+              fuzhitype = 2;
+              return true;
+            }
+            if(value.accountType != undefined &&value.accountType != '' && obj.accountType != value.accountType&&index!=i){
+              fuzhitype = 1;
+              return true;
+            }
+          });
+        }
+        if(fuzhitype == 0){
+          this.$set(this.chargeItme[i], "payee",obj.payee)
+          this.$set(this.chargeItme[i], "bankType", obj.bankType)
+          this.$set(this.chargeItme[i], "payeeId", obj.id);
+          this.$set(this.chargeItme[i], "payeeAccount", obj.payeeAccount);
+          this.$set(this.chargeItme[i], "bankDeposit", obj.bankDeposit);
+          this.$set(this.chargeItme[i], "accountType", obj.accountType);
+        }else if(fuzhitype == 1){
+          this.$set(this.chargeItme[i], "payee",'')
+          this.$set(this.chargeItme[i], "bankType",'')
+          this.$set(this.chargeItme[i], "payeeId", '');
+          this.$set(this.chargeItme[i], "payeeAccount", '');
+          this.$set(this.chargeItme[i], "bankDeposit", '');
+          this.$set(this.chargeItme[i], "accountType", '');
+          this.$notify({ type: 'danger', message: '请选择账户类型相同的收款方！' });
+        }else if(fuzhitype == 2){
+          this.$set(this.chargeItme[i], "payee",'')
+          this.$set(this.chargeItme[i], "bankType",'')
+          this.$set(this.chargeItme[i], "payeeId", '');
+          this.$set(this.chargeItme[i], "payeeAccount", '');
+          this.$set(this.chargeItme[i], "bankDeposit", '');
+          this.$set(this.chargeItme[i], "accountType", '');
+          this.$notify({ type: 'danger', message: '收款方已存在！' });
+        }
+      },
+      selectChange(select) {
+        let obj = {};
+        obj = this.payerOptions.find((account) => {
+          //model就是上面的数据源
+          return account.id === select; //筛选出匹配数据
+        });
+        if(obj.payerFrom==1&&obj.operatorCode != null && obj.operatorCode != "" &&
+          obj.enterpriseCode != null && obj.enterpriseCode != "" &&
+          obj.accountPassword != null && obj.accountPassword != ""){
+          this.$set(this.form, "bookId", obj.bookId);
+          this.$set(this.form, "deptId", obj.deptId);
+          this.$set(this.form, "cashierId", obj.id);
+          this.$set(this.form, "payer", obj.accountName);
+          this.$set(this.form, "payerAccount", obj.bankAccountNumber);
+          this.$set(this.form, "operatorCode", obj.operatorCode);
+          this.$set(this.form, "enterpriseCode", obj.enterpriseCode);
+          this.$set(this.form, "payerFrom", '1');
+        }else{
+          if(obj.payerFrom==1){
+            this.diglogStatus = false;
+            this.$notify({ type: 'danger', message: "请完善付款方“操作员代码”、“企业编码”、“支付口令”等信息！" });
+            this.$set(this.form,"payer","")
+            this.$set(this.form,"payerAccount","")
+          }else{
+            this.$set(this.form, "payerFrom", obj.parerFrom);
+            if(obj.operatorCode!=null&&obj.operatorCode!=''){
+              this.$set(this.form, "operatorCode", obj.operatorCode);
+            }else{
+              this.$set(this.form, "operatorCode", '');
+            }
+            if(obj.enterpriseCode!=null&&obj.enterpriseCode!=''){
+              this.$set(this.form, "enterpriseCode", obj.enterpriseCode);
+            }else{
+              this.$set(this.form, "enterpriseCode", '');
+            }
+            if(obj.accountPassword!=null&&obj.accountPassword!=''){
+              this.$set(this.form, "accountPassword", obj.accountPassword);
+            }else{
+              this.$set(this.form, "accountPassword", '');
+            }
+            this.$set(this.form, "bookId",'');
+            this.$set(this.form, "deptId", '');
+            this.$set(this.form, "cashierId", obj.id);
+            this.$set(this.form, "payer", obj.accountName);
+            if(obj.payerFrom==6){
+              getQmyeFlow(obj.bankAccountNumber).then((response) => {
+                this.$set(this.form, "payerAccount", response.data);
+              });
+            }else {
+              this.$set(this.form, "payerAccount", obj.bankAccountNumber);
+            }
+          }
+        }
+      },
+      beforeRead(file) {
+        console.log(file)
+        console.log(this.fileList)
+        const params = new FormData();
+        params.append("tableId", this.$route.query.id);
+        params.append("tableName", "t_yinnong_transfer");
+        params.append("bizPath", "upload");
+        params.append("fileType", "0");
+        params.append("file", file.file);
+        commonAttach(params).then((response) => {
+          console.log(response)
+        })
+      },
+      getFileList(){
+        let oData= {
+          tableId: this.$route.query.id,
+          tableName: "t_yinnong_transfer",
+          bizPath: "upload",
+          fileType: "0",
+        }
+        attachmentList(oData).then(res => {
+          console.log(res)
+          console.log(location.protocol+"//"+location.host+request.defaults.baseURL)
+          res.rows.map(r => {
+
+            let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
+            this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{})})
+            console.log(r)
+          })
+        })
+      },
+      goBack(){
+        window.history.go(-1)
+      },
+      //删除家庭成员
+      deleteChargeItme(index){
+        this.chargeItme.splice(index,1)
+      },
+    },
+  }
+</script>
+
+<style scoped lang="scss">
+  .app-container {
+    padding: 2% 0;
+  }
+  .main_title{
+    font-size: 0.4rem;
+    color: #1D6FE9;
+    margin: 0.2rem 6%;
+    position: relative;
+  }
+  .main_box{
+    width: 96%;
+    margin: 0 auto;
+    border-radius: 6px;
+    box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);
+    overflow: hidden;
+    background-color: #FFF;
+  }
+  .submitButton{
+    width: 80%;
+    margin: 0 auto;
+    background-color: #1D6FE9;
+  }
+
+  .addFamily{
+    position: absolute;
+    top: -2px;
+    right: 0;
+    border-radius: 50%;
+  }
+  .deleteFamily{
+    position: absolute;
+    top: 0rem;
+    right: 6%;
+    z-index: 9;
+    border-radius: 50%;
+  }
+</style>
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify4.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify4.vue
new file mode 100644
index 00000000..9dc500fe
--- /dev/null
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify4.vue
@@ -0,0 +1,794 @@
+<template>
+  <div class="app-container">
+    <van-nav-bar
+      left-arrow
+      fixed
+      placeholder
+      @click-left="$router.back(-1)"
+    >
+      <template #title>
+        <p style="font-weight: bold;">修改付款申请</p>
+      </template>
+    </van-nav-bar>
+    <van-form @submit="getChange" @failed="getError" :show-error-message="false" scroll-to-error validate-first>
+      <p class="main_title">基础信息</p>
+      <div class="main_box">
+        <van-field
+          readonly
+          clickable
+          required
+          :rules="[{ required: true , message:'请选择申请时间' }]"
+          v-model="form.applyDate"
+          label="申请时间"
+          placeholder="请选择申请时间"
+          @click="showlasj = true"
+          input-align="right"
+          right-icon="arrow-down"
+        />
+        <van-popup v-model="showlasj" position="bottom">
+          <van-datetime-picker
+            v-model="currentDate"
+            type="date"
+            title="选择年月日"
+            :min-date="minDate"
+            :max-date="maxDate"
+            @confirm="onConfirmLasj"
+          />
+        </van-popup>
+        <van-field
+          readonly
+          clickable
+          required
+          :rules="[{ required: true , message:'请选择资金支出类别' }]"
+          label="资金支出类别"
+          placeholder="请选择"
+          v-model="capitalExpenditureType"
+          @click="showcapital = true"
+          input-align="right"
+          right-icon="arrow-down"
+          label-width="auto"
+        />
+        <van-popup v-model="showcapital" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="capitalExpenditureTypeOptions"
+            @confirm="onConfirmCapital"
+            @cancel="showcapital = false"
+          />
+        </van-popup>
+        <van-field
+          readonly
+          required
+          label="支出总金额"
+          v-model="form.expenditureAmount"
+          placeholder="根据下方收款金额自动核算"
+          input-align="right"
+          label-width="auto"
+        />
+
+      </div>
+
+      <div class="main_box" style="margin-top: 10px;">
+        <van-field
+          label="付款事由"
+          v-model="form.remark"
+          type="textarea"
+          placeholder="请输入付款事由"
+          input-align="right"
+          rows="3"
+          label-width="auto"
+          required
+          :rules="[{ required: true , message:'请输入付款事由' }]"
+        />
+      </div>
+
+      <div class="main_box" style="margin-top: 10px;">
+        <van-field label="说明情况" v-model="form.explainSituation" type="textarea" placeholder="请输入说明情况" input-align="right" rows="3" label-width="auto"/>
+      </div>
+
+      <p class="main_title" v-if="capitalExpenditureOpen">关联项目</p>
+      <div class="main_box" v-if="capitalExpenditureOpen" style="margin-bottom: 10px;margin-top: 10px;position:relative;">
+        <van-field
+          readonly
+          clickable
+          label="项目名称"
+          placeholder="请选择"
+          v-model="projectForm.projectName"
+          @click="showproject = true"
+          input-align="right"
+          right-icon="arrow-down"
+          required
+          :rules="[{ required: true , message:'请选择项目名称' }]"
+        />
+        <van-popup v-model="showproject" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="projectListShow"
+            @confirm="onConfirmProject"
+            @cancel="showproject = false"
+          />
+        </van-popup>
+        <van-field required :rules="[{ required: true , message:'请输入承建单位' }]" v-model="projectForm.projectContractor" label="承建单位" placeholder="请输入承建单位" input-align="right" label-width="auto"/>
+        <van-field required :rules="[{ required: true , message:'请输入合同价款（元）' }]" v-model="projectForm.projectAmount" label="合同价款（元）" placeholder="请输入合同价款（元）" input-align="right" label-width="auto"/>
+        <van-field
+          readonly
+          clickable
+          label="工程款类型"
+          placeholder="请选择"
+          v-model="projectFundType"
+          @click="showFundType = true"
+          input-align="right"
+          right-icon="arrow-down"
+          required
+          :rules="[{ required: true , message:'请选择工程款类型' }]"
+        />
+        <van-popup v-model="showFundType" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="projectFundTypeOptions"
+            @confirm="onConfirmFundType"
+            @cancel="showFundType = false"
+          />
+        </van-popup>
+        <van-field required :rules="[{ required: true , message:'请输入工程发票号' }]" v-model="projectForm.projectBillNum" label="工程发票号" placeholder="请输入工程发票号" input-align="right" label-width="auto"/>
+      </div>
+      <p class="main_title">付款方信息</p>
+      <div class="main_box">
+        <!--      <van-field label="付款方" v-model="form.payer" placeholder="请输入付款方" input-align="right" label-width="auto"/>-->
+        <van-field
+          readonly
+          clickable
+          label="付款方"
+          placeholder="请选择付款方"
+          v-model="form.payer"
+          @click="showpayer = true"
+          input-align="right"
+          right-icon="arrow-down"
+          label-width="auto"
+          required
+          :rules="[{ required: true , message:'请选择付款方' }]"
+        />
+        <van-popup v-model="showpayer" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="payerOptions"
+            @confirm="onConfirmPayer($event)"
+            @cancel="showpayer = false"
+          />
+        </van-popup>
+        <van-field :rules="[{ required: true , message:'请输入账户' }]" required label="付款方账户" v-model="form.payerAccount" placeholder="请输入账户" input-align="right" label-width="auto"/>
+      </div>
+
+      <p class="main_title">收款方信息<van-button icon="plus" @click="addChargeItme(chargeItme.length)" size="mini" type="info" native-type="button" class="addFamily"/></p>
+
+      <div class="main_box" style="margin-bottom: 15px;">
+        <van-cell title="收款账户类型">
+          <template #right-icon>
+            <van-radio-group direction="horizontal" v-model="form.accountType" @change="accountTypeChange">
+              <van-radio name="1">公户</van-radio>
+              <van-radio name="2">私户</van-radio>
+            </van-radio-group>
+          </template>
+        </van-cell>
+      </div>
+      <div :style="{position:'relative',padding: index == 0 ? '':'10px 0 0 0'}" v-for="(item, index) in chargeItme" :key="index">
+        <van-button icon="minus" size="mini" type="danger" class="deleteFamily" native-type="button" v-if="index!=0" @click="deleteChargeItme(index)" />
+        <div class="main_box" style="margin-bottom: 10px;position:relative;">
+          <van-field
+            readonly
+            clickable
+            label="收款方"
+            placeholder="请选择"
+            v-model="item.payee"
+            @click="item.showPayee = true"
+            input-align="right"
+            right-icon="arrow-down"
+            required
+            :rules="[{ required: true , message:'请选择收款方' }]"
+          />
+          <van-popup v-model="item.showPayee" position="bottom">
+            <van-picker
+              show-toolbar
+              :columns="payeeList"
+              @confirm="onConfirmPayee($event,index)"
+              @cancel="item.showPayee = false"
+            />
+          </van-popup>
+          <van-field required :rules="[{ required: true , message:'请输入账户' }]" v-model="item.payeeAccount" label="收款账户" placeholder="请输入账户" input-align="right" label-width="auto"/>
+          <van-field required :rules="[{ required: true , message:'请输入银行' }]" v-model="item.bankDeposit" label="开户银行" placeholder="请输入银行" input-align="right" label-width="auto"/>
+          <van-field required :rules="[{ required: true , message:'请输入金额' }]" v-model="item.incomeAmount" label="收入金额" placeholder="请输入金额" input-align="right" label-width="auto" @change="moneyChange"/>
+          <van-field
+            readonly
+            clickable
+            label="所属银行"
+            placeholder="请选择"
+            v-model="item.bankTypeText"
+            @click="item.showbankType = true"
+            input-align="right"
+            right-icon="arrow-down"
+            required
+            :rules="[{ required: true , message:'请选择所属银行' }]"
+          />
+          <van-popup v-model="item.showbankType" position="bottom">
+            <van-picker
+              show-toolbar
+              :columns="bankTypeDictionaries"
+              @confirm="onConfirmBankType($event,index)"
+              @cancel="item.showbankType = false"
+            />
+          </van-popup>
+        </div>
+      </div>
+      <p class="main_title">上传附件</p>
+      <div class="main_box" style="padding: 5px 0 0 8px;">
+        <van-uploader v-model="fileList" :after-read="beforeRead" ></van-uploader>
+      </div>
+      <div style="padding: 16px 0;">
+        <van-row>
+          <van-col span="12" align="center">
+            <van-button type="info" native-type="submit" @click="buttonType='update'" class="submitButton">保<i style="margin-right: 1em;"></i>存</van-button>
+          </van-col>
+          <van-col span="12" align="center">
+            <van-button type="info" native-type="submit" @click="buttonType='add'" class="submitButton">保存并提交</van-button>
+          </van-col>
+        </van-row>
+        <div class="clear"></div>
+      </div>
+    </van-form>
+  </div>
+</template>
+
+<script>
+  import { getAccount , getTransfer , queryTransferDetail , listPayee , updateTransfer , getProjectto , listProject , addProjectto , customSubmit ,getQmyeFlow} from "@/api/onlineHome/bankAgriculture/paymentApproval";
+  import {attachmentList, commonAttach} from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
+  import request from '@/utils/request';
+  export default {
+    name: "approvalModify4",
+    data() {
+      return {
+        showcapital:false,
+        showpayee:false,
+        showlasj:false,
+        showbankType:false,
+        showproject:false,
+        showFundType:false,
+        showpayer:false,
+
+        minDate: new Date(),
+        maxDate: new Date(2025, 10, 1),
+        currentDate: new Date(),
+        form:{},
+
+        capitalExpenditureType:'',
+        payee:'',
+        bankType:'',
+
+        buttonType:'a',
+
+        wfydlxDictionaries:[],
+        jglxDictionaries:[],
+        sysDictionaries:[],
+        capitalExpenditureTypeOptions:[],
+        bankTypeDictionaries:[],
+        projectList:[],
+        projectFundTypeOptions:[],
+        projectFundTypeDictionaries:[],
+        projectListShow:[],
+        payerOptions:[],
+
+        chargeItme:[],
+        chargeItmeShow:[],
+
+        payeeList:[],
+        // 查询参数
+        queryParams: {
+          transferType:"",
+          orderByColumn: "id",
+          isAsc: "desc",
+        },
+        capitalExpenditureOpen:false,
+        projectForm:{
+          projectId:null,
+          projectName:null,
+          projectContractor:null,
+          projectAmount:null,
+          projectBillNum:null,
+          projectFundType:'1',
+          outId:null,
+          ynType:'1'
+        },
+        projectFundType:'',
+        fileList:[],
+      };
+    },
+    created() {
+      let queryParams={
+        pageNum: 1,
+        pageSize: 100,
+      }
+      listProject(queryParams).then(response => {
+        this.projectList = response.rows;
+        for (var i = 0; i < response.rows.length; i++) {
+          this.projectListShow.push({text: response.rows[i].projectName, value: response.rows[i].id});
+        }
+      });
+      this.getDicts("project_fund_type").then((response) => {
+        for (var i = 0; i < response.data.length; i++) {
+          this.projectFundTypeOptions.push({text: response.data[i].dictLabel, value: response.data[i].dictValue});
+        }
+        this.projectFundTypeDictionaries = response.data;
+      });
+      let params1={
+        accountType: "102",
+        status: "N",
+      }
+      getAccount(params1).then((response) => {
+        this.payerOptions = response.rows;
+        response.rows.map((res,index) => {
+          res['payerFrom'] = '1'
+          console.log(res)
+          this.payerOptions[index].text = res.accountName;
+          this.payerOptions[index].value = res.id;
+        })
+      });
+      this.getDictionaries();
+      this.getFileList();
+    },
+    methods: {
+      getDictionaries(){
+        getTransfer(this.$route.query.id).then((response) => {
+          this.getDicts("capital_expenditure_type").then((res) => {
+            for (var i = 0; i < res.data.length; i++) {
+              this.capitalExpenditureTypeOptions.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
+            }
+            this.capitalExpenditureType = this.selectDictLabel(res.data, response.data.capitalExpenditureType);
+          });
+          if(response.data.capitalExpenditureType==2){
+            this.capitalExpenditureOpen = true
+            let param={
+              'outId' : response.data.id,
+              'ynType' : '1'
+            }
+            getProjectto(param).then(res => {
+              console.log(this.selectDictLabel(this.projectFundTypeDictionaries, res.data.projectFundType))
+              this.projectFundType = this.selectDictLabel(this.projectFundTypeDictionaries, res.data.projectFundType);
+              this.projectForm = res.data
+              console.log(res.data)
+            })
+          }else{
+            this.showproject = false
+          }
+          this.form = response.data;
+        });
+        queryTransferDetail(this.$route.query.id).then((response) => {
+          this.getDicts("bank_type").then(res => {
+            for (var i = 0; i < res.data.length; i++) {
+              this.bankTypeDictionaries.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
+            }
+            for (var j = 0 ; j < response.rows.length ; j++){
+              // response.rows[j].payeeText = response.rows[j].payee;
+              response.rows[j].bankTypeText = this.selectDictLabel(res.data, response.rows[j].bankType);
+              response.rows[j].showPayee = false;
+            }
+            this.chargeItme = response.rows;
+          });
+          this.getPayeeList();
+        });
+      },
+      getChange(){
+        console.log(this.buttonType)
+        if(this.buttonType == 'update'){
+          console.log('update')
+          this.goUpdate();
+        }else if(this.buttonType == 'add'){
+          console.log('add')
+          this.goAdd();
+        }
+      },
+      getError(e){
+        console.log(e)
+        this.$notify({ type: 'danger', message: e.errors[0].message });
+      },
+      addChargeItme(index){
+        if(this.chargeItme.length>0&&this.chargeItme[this.chargeItme.length-1].payee == ''){
+          this.$notify({ type: 'danger', message: '请勿添加多个空列表信息' });
+          return;
+        }else if(this.chargeItme.length>0&&this.chargeItme[index-1].incomeAmount == ''){
+          this.$notify({ type: 'danger', message: '请输入收入金额！' });
+          return;
+        }else if(this.chargeItme.length>0&&this.chargeItme[index-1].payeeAccount == ''){
+          this.$notify({ type: 'danger', message: '请输入收款账户！' });
+          return;
+        }else if(this.chargeItme.length>0&&this.chargeItme[index-1].bankDeposit == ''){
+          this.$notify({ type: 'danger', message: '请输入开户银行！' });
+          return;
+        }else if(this.chargeItme.length>0&&this.chargeItme[index-1].bankType == ''){
+          this.$notify({ type: 'danger', message: '请选择所属银行！' });
+          return;
+        }
+        this.getDicts("bank_type").then(res => {
+          this.chargeItme.splice(index + 1, 0, {
+            payeeId: "", //收款方ID
+            payee: "", //收款方
+            payeeAccount: "", //收款账户
+            bankDeposit: "", //开户银行
+            incomeAmount: "", //收入金额
+            bankType: "1", //所属银行
+            bankTypeText:this.selectDictLabel(res.data, 1), //所属银行
+            showPayee:false,
+            showbankType:false
+          });
+        });
+      },
+      getPayeeList() {
+        //普通转账
+        this.queryParams.accountType = this.form.accountType
+        this.queryParams.status = "0"
+        listPayee(this.queryParams).then((response) => {
+          this.payeeList = response.rows;
+          response.rows.map((res,index) => {
+            this.payeeList[index].text = res.payee;
+            this.payeeList[index].value = res.id;
+          })
+        });
+      },
+      payeeDictLabel(datas, value) {
+        var actions = [];
+        Object.keys(datas).some((key) => {
+          if (datas[key].payeeId == ('' + value)) {
+            actions.push(datas[key].payee);
+            return true;
+          }
+        })
+        return actions.join('');
+      },
+      onConfirmCapital(data){
+        console.log(data)
+        if (data.value != 2){
+          this.capitalExpenditureOpen = false;
+          this.projectForm = [];
+        }else{
+          this.capitalExpenditureOpen = true;
+        }
+        this.capitalExpenditureType = data.text;
+        this.form.capitalExpenditureType = data.value;
+        this.showcapital = false;
+      },
+      onConfirmFundType(data){
+        console.log(data)
+        this.projectForm.projectFundType = data.value;
+        this.projectFundType = data.text;
+        this.showFundType = false;
+      },
+      onConfirmProject(data){
+        this.projectList.map(res => {
+          if(res.projectName==data.text){
+            this.projectForm.projectId = res.id
+            this.projectForm.projectName = res.projectName
+            this.projectForm.projectContractor = res.projectContractor
+            this.projectForm.projectAmount = res.projectAmount
+          }
+        })
+        this.showproject = false;
+      },
+      onConfirmPayee(data,index){
+        console.log(data)
+        for (var i = 0 ; i < this.chargeItme.length ; i++){
+          this.chargeItme[i].showPayee = false;
+        }
+        this.chargeItme[index].payee = data.text;
+        this.chargeItme[index].payeeId = data.value;
+        this.payeeSelectChange(data.value , index)
+      },
+      onConfirmBankType(data,index){
+        for (var i = 0 ; i < this.chargeItme.length ; i++){
+          this.chargeItme[i].showbankType = false;
+        }
+        this.chargeItme[index].bankTypeText = data.text;
+        this.chargeItme[index].bankType = data.value;
+        this.chargeItme[index].showbankType = false;
+      },
+      onConfirmPayer(data){
+        this.form.payer = data.text;
+        this.form.cashierId = data.value;
+        this.showpayer = false;
+        this.selectChange(data.value)
+      },
+      onConfirmLasj(data){
+        this.form.applyDate = this.getNowFormatDate(data).substr(0,10);
+        this.showlasj = false;
+      },
+      accountTypeChange(e){
+        this.payeeList = [];
+        this.queryParams.accountType = this.form.accountType
+        this.queryParams.status = "0"
+        listPayee(this.queryParams).then((response) => {
+          this.payeeList = response.rows;
+          response.rows.map((res,index) => {
+            this.payeeList[index].text = res.payee;
+            this.payeeList[index].value = res.id;
+          })
+        });
+      },
+      // 钱计算
+      moneyChange(input) {
+        console.log(input)
+        let obj = {};
+        obj = this.chargeItme.find((account) => {
+          //model就是上面的数据源
+          return parseFloat(account.incomeAmount).toFixed(2) === input; //筛选出匹配数据
+        });
+        let total = 0;
+        this.chargeItme.forEach((money) => {
+          total = (parseFloat(total) + parseFloat(money.incomeAmount)).toFixed(2)
+        });
+        this.$set(this.form, "expenditureAmount", total);
+      },
+      goAdd(){
+        if(this.chargeItme.length<1){
+          this.$notify({ type: 'danger', message: '请添加收款方信息' });
+          return;
+        }
+        if(this.form.remark != null && this.form.remark.indexOf("|")!=-1){
+          this.$notify({ type: 'danger', message: '付款事由禁止包含！' });
+          return;
+        }
+        if(this.form.capitalExpenditureType==2){
+          if(this.projectForm.projectName==""||this.projectForm.projectName==null){
+            this.$notify({ type: 'danger', message: '请选择项目名称！' });
+            return;
+          }
+          if(this.projectForm.projectBillNum==""||this.projectForm.projectBillNum==null){
+            this.$notify({ type: 'danger', message: '请输入工程发票号！' });
+            return;
+          }
+        }
+        this.$set(this.form, "payeeList", this.chargeItme);
+        this.$set(this.form, "bankTypeList", this.chargeItme);
+        this.$set(this.form, "accountTypeList", this.chargeItme);
+        this.$set(this.form, "transferStatusList", this.chargeItme);
+        console.log(this.form);
+        updateTransfer(this.form).then(response => {
+          console.log(response);
+          this.projectForm.outId = this.form.id
+          this.$set(this.projectForm, "ynType", '1');
+          console.log(this.projectForm)
+          if(this.form.capitalExpenditureType==2){
+            addProjectto(this.projectForm).then(res => {
+              customSubmit(this.form.id).then(res => {
+                this.$toast.success('提交成功');
+                setTimeout(function(){
+                  history.go(-1)
+                },2000)
+              })
+            })
+          }else{
+            customSubmit(this.form.id).then(res => {
+              this.$toast.success('提交成功');
+              setTimeout(function(){
+                history.go(-1)
+              },2000)
+            })
+          }
+        });
+      },
+      goUpdate(){
+        if(this.chargeItme.length<1){
+          this.$notify({ type: 'danger', message: '请添加收款方信息' });
+          return;
+        }
+        if(this.form.remark != null && this.form.remark.indexOf("|")!=-1){
+          this.$notify({ type: 'danger', message: '付款事由禁止包含！' });
+          return;
+        }
+        if(this.form.capitalExpenditureType==2){
+          if(this.projectForm.projectName==""||this.projectForm.projectName==null){
+            this.$notify({ type: 'danger', message: '请选择项目名称！' });
+            return;
+          }
+          if(this.projectForm.projectBillNum==""||this.projectForm.projectBillNum==null){
+            this.$notify({ type: 'danger', message: '请输入工程发票号！' });
+            return;
+          }
+        }
+        this.$set(this.form, "payeeList", this.chargeItme);
+        this.$set(this.form, "bankTypeList", this.chargeItme);
+        this.$set(this.form, "accountTypeList", this.chargeItme);
+        this.$set(this.form, "transferStatusList", this.chargeItme);
+        this.projectForm.outId = this.form.id
+        updateTransfer(this.form).then((response) => {
+          this.projectForm.outId = this.form.id
+          this.$set(this.projectForm, "ynType", '1');
+          if(this.form.capitalExpenditureType==2){
+            addProjectto(this.projectForm).then(res => {
+                this.$toast.success('修改成功');
+                setTimeout(function(){
+                  history.go(-1)
+                },2000)
+            })
+          }else{
+            this.$toast.success('修改成功');
+            setTimeout(function(){
+              history.go(-1)
+            },2000)
+          }
+        });
+      },
+      payeeSelectChange(select, i) {
+        let obj = {};
+        let fuzhitype = 0;
+        obj = this.payeeList.find((account) => {
+          //model就是上面的数据源
+          return account.id === select ; //筛选出匹配数据
+        });
+        if(this.chargeItme != [] && this.chargeItme.length>1){
+          this.chargeItme.some((value, index) => {
+            if(value.payeeAccount != undefined &&value.payeeAccount != '' && obj.payeeAccount == value.payeeAccount&&index!=i){
+              fuzhitype = 2;
+              return true;
+            }
+            if(value.accountType != undefined &&value.accountType != '' && obj.accountType != value.accountType&&index!=i){
+              fuzhitype = 1;
+              return true;
+            }
+          });
+        }
+        if(fuzhitype == 0){
+          this.$set(this.chargeItme[i], "payee",obj.payee)
+          this.$set(this.chargeItme[i], "bankType", obj.bankType)
+          this.$set(this.chargeItme[i], "payeeId", obj.id);
+          this.$set(this.chargeItme[i], "payeeAccount", obj.payeeAccount);
+          this.$set(this.chargeItme[i], "bankDeposit", obj.bankDeposit);
+          this.$set(this.chargeItme[i], "accountType", obj.accountType);
+        }else if(fuzhitype == 1){
+          this.$set(this.chargeItme[i], "payee",'')
+          this.$set(this.chargeItme[i], "bankType",'')
+          this.$set(this.chargeItme[i], "payeeId", '');
+          this.$set(this.chargeItme[i], "payeeAccount", '');
+          this.$set(this.chargeItme[i], "bankDeposit", '');
+          this.$set(this.chargeItme[i], "accountType", '');
+          this.$notify({ type: 'danger', message: '请选择账户类型相同的收款方！' });
+        }else if(fuzhitype == 2){
+          this.$set(this.chargeItme[i], "payee",'')
+          this.$set(this.chargeItme[i], "bankType",'')
+          this.$set(this.chargeItme[i], "payeeId", '');
+          this.$set(this.chargeItme[i], "payeeAccount", '');
+          this.$set(this.chargeItme[i], "bankDeposit", '');
+          this.$set(this.chargeItme[i], "accountType", '');
+          this.$notify({ type: 'danger', message: '收款方已存在！' });
+        }
+      },
+      selectChange(select) {
+        let obj = {};
+        obj = this.payerOptions.find((account) => {
+          //model就是上面的数据源
+          return account.id === select; //筛选出匹配数据
+        });
+        if(obj.payerFrom==1&&obj.operatorCode != null && obj.operatorCode != "" &&
+          obj.enterpriseCode != null && obj.enterpriseCode != "" &&
+          obj.accountPassword != null && obj.accountPassword != ""){
+          this.$set(this.form, "bookId", obj.bookId);
+          this.$set(this.form, "deptId", obj.deptId);
+          this.$set(this.form, "cashierId", obj.id);
+          this.$set(this.form, "payer", obj.accountName);
+          this.$set(this.form, "payerAccount", obj.bankAccountNumber);
+          this.$set(this.form, "operatorCode", obj.operatorCode);
+          this.$set(this.form, "enterpriseCode", obj.enterpriseCode);
+          this.$set(this.form, "payerFrom", '1');
+        }else{
+          if(obj.payerFrom==1){
+            this.diglogStatus = false;
+            this.$notify({ type: 'danger', message: "请完善付款方“操作员代码”、“企业编码”、“支付口令”等信息！" });
+            this.$set(this.form,"payer","")
+            this.$set(this.form,"payerAccount","")
+          }else{
+            this.$set(this.form, "payerFrom", obj.parerFrom);
+            if(obj.operatorCode!=null&&obj.operatorCode!=''){
+              this.$set(this.form, "operatorCode", obj.operatorCode);
+            }else{
+              this.$set(this.form, "operatorCode", '');
+            }
+            if(obj.enterpriseCode!=null&&obj.enterpriseCode!=''){
+              this.$set(this.form, "enterpriseCode", obj.enterpriseCode);
+            }else{
+              this.$set(this.form, "enterpriseCode", '');
+            }
+            if(obj.accountPassword!=null&&obj.accountPassword!=''){
+              this.$set(this.form, "accountPassword", obj.accountPassword);
+            }else{
+              this.$set(this.form, "accountPassword", '');
+            }
+            this.$set(this.form, "bookId",'');
+            this.$set(this.form, "deptId", '');
+            this.$set(this.form, "cashierId", obj.id);
+            this.$set(this.form, "payer", obj.accountName);
+            if(obj.payerFrom==6){
+              getQmyeFlow(obj.bankAccountNumber).then((response) => {
+                this.$set(this.form, "payerAccount", response.data);
+              });
+            }else {
+              this.$set(this.form, "payerAccount", obj.bankAccountNumber);
+            }
+          }
+        }
+      },
+      beforeRead(file) {
+        console.log(file)
+        console.log(this.fileList)
+        const params = new FormData();
+        params.append("tableId", this.$route.query.id);
+        params.append("tableName", "t_yinnong_transfer");
+        params.append("bizPath", "upload");
+        params.append("fileType", "0");
+        params.append("file", file.file);
+        commonAttach(params).then((response) => {
+          console.log(response)
+        })
+      },
+      getFileList(){
+        let oData= {
+          tableId: this.$route.query.id,
+          tableName: "t_yinnong_transfer",
+          bizPath: "upload",
+          fileType: "0",
+        }
+        attachmentList(oData).then(res => {
+          console.log(res)
+          console.log(location.protocol+"//"+location.host+request.defaults.baseURL)
+          res.rows.map(r => {
+
+            let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
+            this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{})})
+            console.log(r)
+          })
+        })
+      },
+      goBack(){
+        window.history.go(-1)
+      },
+      //删除家庭成员
+      deleteChargeItme(index){
+        this.chargeItme.splice(index,1)
+      },
+    },
+  }
+</script>
+
+<style scoped lang="scss">
+  .app-container {
+    padding: 2% 0;
+  }
+  .main_title{
+    font-size: 0.4rem;
+    color: #1D6FE9;
+    margin: 0.2rem 6%;
+    position: relative;
+  }
+  .main_box{
+    width: 96%;
+    margin: 0 auto;
+    border-radius: 6px;
+    box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);
+    overflow: hidden;
+    background-color: #FFF;
+  }
+  .submitButton{
+    width: 80%;
+    margin: 0 auto;
+    background-color: #1D6FE9;
+  }
+
+  .addFamily{
+    position: absolute;
+    top: -2px;
+    right: 0;
+    border-radius: 50%;
+  }
+  .deleteFamily{
+    position: absolute;
+    top: 0rem;
+    right: 6%;
+    z-index: 9;
+    border-radius: 50%;
+  }
+</style>
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify5.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify5.vue
new file mode 100644
index 00000000..d15b8b88
--- /dev/null
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify5.vue
@@ -0,0 +1,794 @@
+<template>
+  <div class="app-container">
+    <van-nav-bar
+      left-arrow
+      fixed
+      placeholder
+      @click-left="$router.back(-1)"
+    >
+      <template #title>
+        <p style="font-weight: bold;">修改付款申请</p>
+      </template>
+    </van-nav-bar>
+    <van-form @submit="getChange" @failed="getError" :show-error-message="false" scroll-to-error validate-first>
+      <p class="main_title">基础信息</p>
+      <div class="main_box">
+        <van-field
+          readonly
+          clickable
+          required
+          :rules="[{ required: true , message:'请选择申请时间' }]"
+          v-model="form.applyDate"
+          label="申请时间"
+          placeholder="请选择申请时间"
+          @click="showlasj = true"
+          input-align="right"
+          right-icon="arrow-down"
+        />
+        <van-popup v-model="showlasj" position="bottom">
+          <van-datetime-picker
+            v-model="currentDate"
+            type="date"
+            title="选择年月日"
+            :min-date="minDate"
+            :max-date="maxDate"
+            @confirm="onConfirmLasj"
+          />
+        </van-popup>
+        <van-field
+          readonly
+          clickable
+          required
+          :rules="[{ required: true , message:'请选择资金支出类别' }]"
+          label="资金支出类别"
+          placeholder="请选择"
+          v-model="capitalExpenditureType"
+          @click="showcapital = true"
+          input-align="right"
+          right-icon="arrow-down"
+          label-width="auto"
+        />
+        <van-popup v-model="showcapital" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="capitalExpenditureTypeOptions"
+            @confirm="onConfirmCapital"
+            @cancel="showcapital = false"
+          />
+        </van-popup>
+        <van-field
+          readonly
+          required
+          label="支出总金额"
+          v-model="form.expenditureAmount"
+          placeholder="根据下方收款金额自动核算"
+          input-align="right"
+          label-width="auto"
+        />
+
+      </div>
+
+      <div class="main_box" style="margin-top: 10px;">
+        <van-field
+          label="付款事由"
+          v-model="form.remark"
+          type="textarea"
+          placeholder="请输入付款事由"
+          input-align="right"
+          rows="3"
+          label-width="auto"
+          required
+          :rules="[{ required: true , message:'请输入付款事由' }]"
+        />
+      </div>
+
+      <div class="main_box" style="margin-top: 10px;">
+        <van-field label="说明情况" v-model="form.explainSituation" type="textarea" placeholder="请输入说明情况" input-align="right" rows="3" label-width="auto"/>
+      </div>
+
+      <p class="main_title" v-if="capitalExpenditureOpen">关联项目</p>
+      <div class="main_box" v-if="capitalExpenditureOpen" style="margin-bottom: 10px;margin-top: 10px;position:relative;">
+        <van-field
+          readonly
+          clickable
+          label="项目名称"
+          placeholder="请选择"
+          v-model="projectForm.projectName"
+          @click="showproject = true"
+          input-align="right"
+          right-icon="arrow-down"
+          required
+          :rules="[{ required: true , message:'请选择项目名称' }]"
+        />
+        <van-popup v-model="showproject" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="projectListShow"
+            @confirm="onConfirmProject"
+            @cancel="showproject = false"
+          />
+        </van-popup>
+        <van-field required :rules="[{ required: true , message:'请输入承建单位' }]" v-model="projectForm.projectContractor" label="承建单位" placeholder="请输入承建单位" input-align="right" label-width="auto"/>
+        <van-field required :rules="[{ required: true , message:'请输入合同价款（元）' }]" v-model="projectForm.projectAmount" label="合同价款（元）" placeholder="请输入合同价款（元）" input-align="right" label-width="auto"/>
+        <van-field
+          readonly
+          clickable
+          label="工程款类型"
+          placeholder="请选择"
+          v-model="projectFundType"
+          @click="showFundType = true"
+          input-align="right"
+          right-icon="arrow-down"
+          required
+          :rules="[{ required: true , message:'请选择工程款类型' }]"
+        />
+        <van-popup v-model="showFundType" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="projectFundTypeOptions"
+            @confirm="onConfirmFundType"
+            @cancel="showFundType = false"
+          />
+        </van-popup>
+        <van-field required :rules="[{ required: true , message:'请输入工程发票号' }]" v-model="projectForm.projectBillNum" label="工程发票号" placeholder="请输入工程发票号" input-align="right" label-width="auto"/>
+      </div>
+      <p class="main_title">付款方信息</p>
+      <div class="main_box">
+        <!--      <van-field label="付款方" v-model="form.payer" placeholder="请输入付款方" input-align="right" label-width="auto"/>-->
+        <van-field
+          readonly
+          clickable
+          label="付款方"
+          placeholder="请选择付款方"
+          v-model="form.payer"
+          @click="showpayer = true"
+          input-align="right"
+          right-icon="arrow-down"
+          label-width="auto"
+          required
+          :rules="[{ required: true , message:'请选择付款方' }]"
+        />
+        <van-popup v-model="showpayer" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="payerOptions"
+            @confirm="onConfirmPayer($event)"
+            @cancel="showpayer = false"
+          />
+        </van-popup>
+        <van-field :rules="[{ required: true , message:'请输入账户' }]" required label="付款方账户" v-model="form.payerAccount" placeholder="请输入账户" input-align="right" label-width="auto"/>
+      </div>
+
+      <p class="main_title">收款方信息<van-button icon="plus" @click="addChargeItme(chargeItme.length)" size="mini" type="info" native-type="button" class="addFamily"/></p>
+
+      <div class="main_box" style="margin-bottom: 15px;">
+        <van-cell title="收款账户类型">
+          <template #right-icon>
+            <van-radio-group direction="horizontal" v-model="form.accountType" @change="accountTypeChange">
+              <van-radio name="1">公户</van-radio>
+              <van-radio name="2">私户</van-radio>
+            </van-radio-group>
+          </template>
+        </van-cell>
+      </div>
+      <div :style="{position:'relative',padding: index == 0 ? '':'10px 0 0 0'}" v-for="(item, index) in chargeItme" :key="index">
+        <van-button icon="minus" size="mini" type="danger" class="deleteFamily" native-type="button" v-if="index!=0" @click="deleteChargeItme(index)" />
+        <div class="main_box" style="margin-bottom: 10px;position:relative;">
+          <van-field
+            readonly
+            clickable
+            label="收款方"
+            placeholder="请选择"
+            v-model="item.payee"
+            @click="item.showPayee = true"
+            input-align="right"
+            right-icon="arrow-down"
+            required
+            :rules="[{ required: true , message:'请选择收款方' }]"
+          />
+          <van-popup v-model="item.showPayee" position="bottom">
+            <van-picker
+              show-toolbar
+              :columns="payeeList"
+              @confirm="onConfirmPayee($event,index)"
+              @cancel="item.showPayee = false"
+            />
+          </van-popup>
+          <van-field required :rules="[{ required: true , message:'请输入账户' }]" v-model="item.payeeAccount" label="收款账户" placeholder="请输入账户" input-align="right" label-width="auto"/>
+          <van-field required :rules="[{ required: true , message:'请输入银行' }]" v-model="item.bankDeposit" label="开户银行" placeholder="请输入银行" input-align="right" label-width="auto"/>
+          <van-field required :rules="[{ required: true , message:'请输入金额' }]" v-model="item.incomeAmount" label="收入金额" placeholder="请输入金额" input-align="right" label-width="auto" @change="moneyChange"/>
+          <van-field
+            readonly
+            clickable
+            label="所属银行"
+            placeholder="请选择"
+            v-model="item.bankTypeText"
+            @click="item.showbankType = true"
+            input-align="right"
+            right-icon="arrow-down"
+            required
+            :rules="[{ required: true , message:'请选择所属银行' }]"
+          />
+          <van-popup v-model="item.showbankType" position="bottom">
+            <van-picker
+              show-toolbar
+              :columns="bankTypeDictionaries"
+              @confirm="onConfirmBankType($event,index)"
+              @cancel="item.showbankType = false"
+            />
+          </van-popup>
+        </div>
+      </div>
+      <p class="main_title">上传附件</p>
+      <div class="main_box" style="padding: 5px 0 0 8px;">
+        <van-uploader v-model="fileList" :after-read="beforeRead" ></van-uploader>
+      </div>
+      <div style="padding: 16px 0;">
+        <van-row>
+          <van-col span="12" align="center">
+            <van-button type="info" native-type="submit" @click="buttonType='update'" class="submitButton">保<i style="margin-right: 1em;"></i>存</van-button>
+          </van-col>
+          <van-col span="12" align="center">
+            <van-button type="info" native-type="submit" @click="buttonType='add'" class="submitButton">保存并提交</van-button>
+          </van-col>
+        </van-row>
+        <div class="clear"></div>
+      </div>
+    </van-form>
+  </div>
+</template>
+
+<script>
+  import { getAccount , getTransfer , queryTransferDetail , listPayee , updateTransfer , getProjectto , listProject , addProjectto , customSubmit ,getQmyeFlow} from "@/api/onlineHome/bankAgriculture/paymentApproval";
+  import request from '@/utils/request';
+  import {attachmentList, commonAttach} from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
+  export default {
+    name: "approvalModify5",
+    data() {
+      return {
+        showcapital:false,
+        showpayee:false,
+        showlasj:false,
+        showbankType:false,
+        showproject:false,
+        showFundType:false,
+        showpayer:false,
+
+        minDate: new Date(),
+        maxDate: new Date(2025, 10, 1),
+        currentDate: new Date(),
+        form:{},
+
+        capitalExpenditureType:'',
+        payee:'',
+        bankType:'',
+
+        buttonType:'a',
+
+        wfydlxDictionaries:[],
+        jglxDictionaries:[],
+        sysDictionaries:[],
+        capitalExpenditureTypeOptions:[],
+        bankTypeDictionaries:[],
+        projectList:[],
+        projectFundTypeOptions:[],
+        projectFundTypeDictionaries:[],
+        projectListShow:[],
+        payerOptions:[],
+
+        chargeItme:[],
+        chargeItmeShow:[],
+
+        payeeList:[],
+        // 查询参数
+        queryParams: {
+          transferType:"",
+          orderByColumn: "id",
+          isAsc: "desc",
+        },
+        capitalExpenditureOpen:false,
+        projectForm:{
+          projectId:null,
+          projectName:null,
+          projectContractor:null,
+          projectAmount:null,
+          projectBillNum:null,
+          projectFundType:'1',
+          outId:null,
+          ynType:'1'
+        },
+        projectFundType:'',
+        fileList:[],
+      };
+    },
+    created() {
+      let queryParams={
+        pageNum: 1,
+        pageSize: 100,
+      }
+      listProject(queryParams).then(response => {
+        this.projectList = response.rows;
+        for (var i = 0; i < response.rows.length; i++) {
+          this.projectListShow.push({text: response.rows[i].projectName, value: response.rows[i].id});
+        }
+      });
+      this.getDicts("project_fund_type").then((response) => {
+        for (var i = 0; i < response.data.length; i++) {
+          this.projectFundTypeOptions.push({text: response.data[i].dictLabel, value: response.data[i].dictValue});
+        }
+        this.projectFundTypeDictionaries = response.data;
+      });
+      let params1={
+        accountType: "102",
+        status: "N",
+      }
+      getAccount(params1).then((response) => {
+        this.payerOptions = response.rows;
+        response.rows.map((res,index) => {
+          res['payerFrom'] = '1'
+          console.log(res)
+          this.payerOptions[index].text = res.accountName;
+          this.payerOptions[index].value = res.id;
+        })
+      });
+      this.getDictionaries();
+      this.getFileList();
+    },
+    methods: {
+      getDictionaries(){
+        getTransfer(this.$route.query.id).then((response) => {
+          this.getDicts("capital_expenditure_type").then((res) => {
+            for (var i = 0; i < res.data.length; i++) {
+              this.capitalExpenditureTypeOptions.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
+            }
+            this.capitalExpenditureType = this.selectDictLabel(res.data, response.data.capitalExpenditureType);
+          });
+          if(response.data.capitalExpenditureType==2){
+            this.capitalExpenditureOpen = true
+            let param={
+              'outId' : response.data.id,
+              'ynType' : '1'
+            }
+            getProjectto(param).then(res => {
+              console.log(this.selectDictLabel(this.projectFundTypeDictionaries, res.data.projectFundType))
+              this.projectFundType = this.selectDictLabel(this.projectFundTypeDictionaries, res.data.projectFundType);
+              this.projectForm = res.data
+              console.log(res.data)
+            })
+          }else{
+            this.showproject = false
+          }
+          this.form = response.data;
+        });
+        queryTransferDetail(this.$route.query.id).then((response) => {
+          this.getDicts("bank_type").then(res => {
+            for (var i = 0; i < res.data.length; i++) {
+              this.bankTypeDictionaries.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
+            }
+            for (var j = 0 ; j < response.rows.length ; j++){
+              // response.rows[j].payeeText = response.rows[j].payee;
+              response.rows[j].bankTypeText = this.selectDictLabel(res.data, response.rows[j].bankType);
+              response.rows[j].showPayee = false;
+            }
+            this.chargeItme = response.rows;
+          });
+          this.getPayeeList();
+        });
+      },
+      getChange(){
+        console.log(this.buttonType)
+        if(this.buttonType == 'update'){
+          console.log('update')
+          this.goUpdate();
+        }else if(this.buttonType == 'add'){
+          console.log('add')
+          this.goAdd();
+        }
+      },
+      getError(e){
+        console.log(e)
+        this.$notify({ type: 'danger', message: e.errors[0].message });
+      },
+      addChargeItme(index){
+        if(this.chargeItme.length>0&&this.chargeItme[this.chargeItme.length-1].payee == ''){
+          this.$notify({ type: 'danger', message: '请勿添加多个空列表信息' });
+          return;
+        }else if(this.chargeItme.length>0&&this.chargeItme[index-1].incomeAmount == ''){
+          this.$notify({ type: 'danger', message: '请输入收入金额！' });
+          return;
+        }else if(this.chargeItme.length>0&&this.chargeItme[index-1].payeeAccount == ''){
+          this.$notify({ type: 'danger', message: '请输入收款账户！' });
+          return;
+        }else if(this.chargeItme.length>0&&this.chargeItme[index-1].bankDeposit == ''){
+          this.$notify({ type: 'danger', message: '请输入开户银行！' });
+          return;
+        }else if(this.chargeItme.length>0&&this.chargeItme[index-1].bankType == ''){
+          this.$notify({ type: 'danger', message: '请选择所属银行！' });
+          return;
+        }
+        this.getDicts("bank_type").then(res => {
+          this.chargeItme.splice(index + 1, 0, {
+            payeeId: "", //收款方ID
+            payee: "", //收款方
+            payeeAccount: "", //收款账户
+            bankDeposit: "", //开户银行
+            incomeAmount: "", //收入金额
+            bankType: "1", //所属银行
+            bankTypeText:this.selectDictLabel(res.data, 1), //所属银行
+            showPayee:false,
+            showbankType:false
+          });
+        });
+      },
+      getPayeeList() {
+        //普通转账
+        this.queryParams.accountType = this.form.accountType
+        this.queryParams.status = "0"
+        listPayee(this.queryParams).then((response) => {
+          this.payeeList = response.rows;
+          response.rows.map((res,index) => {
+            this.payeeList[index].text = res.payee;
+            this.payeeList[index].value = res.id;
+          })
+        });
+      },
+      payeeDictLabel(datas, value) {
+        var actions = [];
+        Object.keys(datas).some((key) => {
+          if (datas[key].payeeId == ('' + value)) {
+            actions.push(datas[key].payee);
+            return true;
+          }
+        })
+        return actions.join('');
+      },
+      onConfirmCapital(data){
+        console.log(data)
+        if (data.value != 2){
+          this.capitalExpenditureOpen = false;
+          this.projectForm = [];
+        }else{
+          this.capitalExpenditureOpen = true;
+        }
+        this.capitalExpenditureType = data.text;
+        this.form.capitalExpenditureType = data.value;
+        this.showcapital = false;
+      },
+      onConfirmFundType(data){
+        console.log(data)
+        this.projectForm.projectFundType = data.value;
+        this.projectFundType = data.text;
+        this.showFundType = false;
+      },
+      onConfirmProject(data){
+        this.projectList.map(res => {
+          if(res.projectName==data.text){
+            this.projectForm.projectId = res.id
+            this.projectForm.projectName = res.projectName
+            this.projectForm.projectContractor = res.projectContractor
+            this.projectForm.projectAmount = res.projectAmount
+          }
+        })
+        this.showproject = false;
+      },
+      onConfirmPayee(data,index){
+        console.log(data)
+        for (var i = 0 ; i < this.chargeItme.length ; i++){
+          this.chargeItme[i].showPayee = false;
+        }
+        this.chargeItme[index].payee = data.text;
+        this.chargeItme[index].payeeId = data.value;
+        this.payeeSelectChange(data.value , index)
+      },
+      onConfirmBankType(data,index){
+        for (var i = 0 ; i < this.chargeItme.length ; i++){
+          this.chargeItme[i].showbankType = false;
+        }
+        this.chargeItme[index].bankTypeText = data.text;
+        this.chargeItme[index].bankType = data.value;
+        this.chargeItme[index].showbankType = false;
+      },
+      onConfirmPayer(data){
+        this.form.payer = data.text;
+        this.form.cashierId = data.value;
+        this.showpayer = false;
+        this.selectChange(data.value)
+      },
+      onConfirmLasj(data){
+        this.form.applyDate = this.getNowFormatDate(data).substr(0,10);
+        this.showlasj = false;
+      },
+      accountTypeChange(e){
+        this.payeeList = [];
+        this.queryParams.accountType = this.form.accountType
+        this.queryParams.status = "0"
+        listPayee(this.queryParams).then((response) => {
+          this.payeeList = response.rows;
+          response.rows.map((res,index) => {
+            this.payeeList[index].text = res.payee;
+            this.payeeList[index].value = res.id;
+          })
+        });
+      },
+      // 钱计算
+      moneyChange(input) {
+        console.log(input)
+        let obj = {};
+        obj = this.chargeItme.find((account) => {
+          //model就是上面的数据源
+          return parseFloat(account.incomeAmount).toFixed(2) === input; //筛选出匹配数据
+        });
+        let total = 0;
+        this.chargeItme.forEach((money) => {
+          total = (parseFloat(total) + parseFloat(money.incomeAmount)).toFixed(2)
+        });
+        this.$set(this.form, "expenditureAmount", total);
+      },
+      goAdd(){
+        if(this.chargeItme.length<1){
+          this.$notify({ type: 'danger', message: '请添加收款方信息' });
+          return;
+        }
+        if(this.form.remark != null && this.form.remark.indexOf("|")!=-1){
+          this.$notify({ type: 'danger', message: '付款事由禁止包含！' });
+          return;
+        }
+        if(this.form.capitalExpenditureType==2){
+          if(this.projectForm.projectName==""||this.projectForm.projectName==null){
+            this.$notify({ type: 'danger', message: '请选择项目名称！' });
+            return;
+          }
+          if(this.projectForm.projectBillNum==""||this.projectForm.projectBillNum==null){
+            this.$notify({ type: 'danger', message: '请输入工程发票号！' });
+            return;
+          }
+        }
+        this.$set(this.form, "payeeList", this.chargeItme);
+        this.$set(this.form, "bankTypeList", this.chargeItme);
+        this.$set(this.form, "accountTypeList", this.chargeItme);
+        this.$set(this.form, "transferStatusList", this.chargeItme);
+        console.log(this.form);
+        updateTransfer(this.form).then(response => {
+          console.log(response);
+          this.projectForm.outId = this.form.id
+          this.$set(this.projectForm, "ynType", '1');
+          console.log(this.projectForm)
+          if(this.form.capitalExpenditureType==2){
+            addProjectto(this.projectForm).then(res => {
+              customSubmit(this.form.id).then(res => {
+                this.$toast.success('提交成功');
+                setTimeout(function(){
+                  history.go(-1)
+                },2000)
+              })
+            })
+          }else{
+            customSubmit(this.form.id).then(res => {
+              this.$toast.success('提交成功');
+              setTimeout(function(){
+                history.go(-1)
+              },2000)
+            })
+          }
+        });
+      },
+      goUpdate(){
+        if(this.chargeItme.length<1){
+          this.$notify({ type: 'danger', message: '请添加收款方信息' });
+          return;
+        }
+        if(this.form.remark != null && this.form.remark.indexOf("|")!=-1){
+          this.$notify({ type: 'danger', message: '付款事由禁止包含！' });
+          return;
+        }
+        if(this.form.capitalExpenditureType==2){
+          if(this.projectForm.projectName==""||this.projectForm.projectName==null){
+            this.$notify({ type: 'danger', message: '请选择项目名称！' });
+            return;
+          }
+          if(this.projectForm.projectBillNum==""||this.projectForm.projectBillNum==null){
+            this.$notify({ type: 'danger', message: '请输入工程发票号！' });
+            return;
+          }
+        }
+        this.$set(this.form, "payeeList", this.chargeItme);
+        this.$set(this.form, "bankTypeList", this.chargeItme);
+        this.$set(this.form, "accountTypeList", this.chargeItme);
+        this.$set(this.form, "transferStatusList", this.chargeItme);
+        this.projectForm.outId = this.form.id
+        updateTransfer(this.form).then((response) => {
+          this.projectForm.outId = this.form.id
+          this.$set(this.projectForm, "ynType", '1');
+          if(this.form.capitalExpenditureType==2){
+            addProjectto(this.projectForm).then(res => {
+                this.$toast.success('修改成功');
+                setTimeout(function(){
+                  history.go(-1)
+                },2000)
+            })
+          }else{
+            this.$toast.success('修改成功');
+            setTimeout(function(){
+              history.go(-1)
+            },2000)
+          }
+        });
+      },
+      payeeSelectChange(select, i) {
+        let obj = {};
+        let fuzhitype = 0;
+        obj = this.payeeList.find((account) => {
+          //model就是上面的数据源
+          return account.id === select ; //筛选出匹配数据
+        });
+        if(this.chargeItme != [] && this.chargeItme.length>1){
+          this.chargeItme.some((value, index) => {
+            if(value.payeeAccount != undefined &&value.payeeAccount != '' && obj.payeeAccount == value.payeeAccount&&index!=i){
+              fuzhitype = 2;
+              return true;
+            }
+            if(value.accountType != undefined &&value.accountType != '' && obj.accountType != value.accountType&&index!=i){
+              fuzhitype = 1;
+              return true;
+            }
+          });
+        }
+        if(fuzhitype == 0){
+          this.$set(this.chargeItme[i], "payee",obj.payee)
+          this.$set(this.chargeItme[i], "bankType", obj.bankType)
+          this.$set(this.chargeItme[i], "payeeId", obj.id);
+          this.$set(this.chargeItme[i], "payeeAccount", obj.payeeAccount);
+          this.$set(this.chargeItme[i], "bankDeposit", obj.bankDeposit);
+          this.$set(this.chargeItme[i], "accountType", obj.accountType);
+        }else if(fuzhitype == 1){
+          this.$set(this.chargeItme[i], "payee",'')
+          this.$set(this.chargeItme[i], "bankType",'')
+          this.$set(this.chargeItme[i], "payeeId", '');
+          this.$set(this.chargeItme[i], "payeeAccount", '');
+          this.$set(this.chargeItme[i], "bankDeposit", '');
+          this.$set(this.chargeItme[i], "accountType", '');
+          this.$notify({ type: 'danger', message: '请选择账户类型相同的收款方！' });
+        }else if(fuzhitype == 2){
+          this.$set(this.chargeItme[i], "payee",'')
+          this.$set(this.chargeItme[i], "bankType",'')
+          this.$set(this.chargeItme[i], "payeeId", '');
+          this.$set(this.chargeItme[i], "payeeAccount", '');
+          this.$set(this.chargeItme[i], "bankDeposit", '');
+          this.$set(this.chargeItme[i], "accountType", '');
+          this.$notify({ type: 'danger', message: '收款方已存在！' });
+        }
+      },
+      selectChange(select) {
+        let obj = {};
+        obj = this.payerOptions.find((account) => {
+          //model就是上面的数据源
+          return account.id === select; //筛选出匹配数据
+        });
+        if(obj.payerFrom==1&&obj.operatorCode != null && obj.operatorCode != "" &&
+          obj.enterpriseCode != null && obj.enterpriseCode != "" &&
+          obj.accountPassword != null && obj.accountPassword != ""){
+          this.$set(this.form, "bookId", obj.bookId);
+          this.$set(this.form, "deptId", obj.deptId);
+          this.$set(this.form, "cashierId", obj.id);
+          this.$set(this.form, "payer", obj.accountName);
+          this.$set(this.form, "payerAccount", obj.bankAccountNumber);
+          this.$set(this.form, "operatorCode", obj.operatorCode);
+          this.$set(this.form, "enterpriseCode", obj.enterpriseCode);
+          this.$set(this.form, "payerFrom", '1');
+        }else{
+          if(obj.payerFrom==1){
+            this.diglogStatus = false;
+            this.$notify({ type: 'danger', message: "请完善付款方“操作员代码”、“企业编码”、“支付口令”等信息！" });
+            this.$set(this.form,"payer","")
+            this.$set(this.form,"payerAccount","")
+          }else{
+            this.$set(this.form, "payerFrom", obj.parerFrom);
+            if(obj.operatorCode!=null&&obj.operatorCode!=''){
+              this.$set(this.form, "operatorCode", obj.operatorCode);
+            }else{
+              this.$set(this.form, "operatorCode", '');
+            }
+            if(obj.enterpriseCode!=null&&obj.enterpriseCode!=''){
+              this.$set(this.form, "enterpriseCode", obj.enterpriseCode);
+            }else{
+              this.$set(this.form, "enterpriseCode", '');
+            }
+            if(obj.accountPassword!=null&&obj.accountPassword!=''){
+              this.$set(this.form, "accountPassword", obj.accountPassword);
+            }else{
+              this.$set(this.form, "accountPassword", '');
+            }
+            this.$set(this.form, "bookId",'');
+            this.$set(this.form, "deptId", '');
+            this.$set(this.form, "cashierId", obj.id);
+            this.$set(this.form, "payer", obj.accountName);
+            if(obj.payerFrom==6){
+              getQmyeFlow(obj.bankAccountNumber).then((response) => {
+                this.$set(this.form, "payerAccount", response.data);
+              });
+            }else {
+              this.$set(this.form, "payerAccount", obj.bankAccountNumber);
+            }
+          }
+        }
+      },
+      beforeRead(file) {
+        console.log(file)
+        console.log(this.fileList)
+        const params = new FormData();
+        params.append("tableId", this.$route.query.id);
+        params.append("tableName", "t_yinnong_transfer");
+        params.append("bizPath", "upload");
+        params.append("fileType", "0");
+        params.append("file", file.file);
+        commonAttach(params).then((response) => {
+          console.log(response)
+        })
+      },
+      getFileList(){
+        let oData= {
+          tableId: this.$route.query.id,
+          tableName: "t_yinnong_transfer",
+          bizPath: "upload",
+          fileType: "0",
+        }
+        attachmentList(oData).then(res => {
+          console.log(res)
+          console.log(location.protocol+"//"+location.host+request.defaults.baseURL)
+          res.rows.map(r => {
+
+            let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
+            this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{})})
+            console.log(r)
+          })
+        })
+      },
+      goBack(){
+        window.history.go(-1)
+      },
+      //删除家庭成员
+      deleteChargeItme(index){
+        this.chargeItme.splice(index,1)
+      },
+    },
+  }
+</script>
+
+<style scoped lang="scss">
+  .app-container {
+    padding: 2% 0;
+  }
+  .main_title{
+    font-size: 0.4rem;
+    color: #1D6FE9;
+    margin: 0.2rem 6%;
+    position: relative;
+  }
+  .main_box{
+    width: 96%;
+    margin: 0 auto;
+    border-radius: 6px;
+    box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);
+    overflow: hidden;
+    background-color: #FFF;
+  }
+  .submitButton{
+    width: 80%;
+    margin: 0 auto;
+    background-color: #1D6FE9;
+  }
+
+  .addFamily{
+    position: absolute;
+    top: -2px;
+    right: 0;
+    border-radius: 50%;
+  }
+  .deleteFamily{
+    position: absolute;
+    top: 0rem;
+    right: 6%;
+    z-index: 9;
+    border-radius: 50%;
+  }
+</style>
diff --git a/src/views/onlineHome/workbench.vue b/src/views/onlineHome/workbench.vue
index 6cfad1da..71fa692a 100644
--- a/src/views/onlineHome/workbench.vue
+++ b/src/views/onlineHome/workbench.vue
@@ -292,61 +292,61 @@
         <van-grid :border="false">
           <van-grid-item text="常用转账" :to="{name:'approvalList'}" >
             <div slot="default" style="background:#FF4646;padding: 10px;text-align:center;border-radius: 10px;box-sizing: border-box;width: 44px;height: 44px" >
-              <img src="../../../static/images/onlineHome/icon6.png" style="width: 25px;" alt />
+              <img src="../../../static/images/onlineHome/yinnongIcon1.png" style="width: 25px;" alt />
             </div>
             <p style="margin-top: 5px;color: #666666;">常用转账</p>
           </van-grid-item>
           <van-grid-item text="信用卡转账" :to="{name:'approvalList2'}" >
-            <div slot="default" style="background:#FF4646;padding: 10px;text-align:center;border-radius: 10px;box-sizing: border-box;width: 44px;height: 44px" >
-              <img src="../../../static/images/onlineHome/icon6.png" style="width: 25px;" alt />
+            <div slot="default" style="background:#3ac2db;padding: 10px;text-align:center;border-radius: 10px;box-sizing: border-box;width: 44px;height: 44px" >
+              <img src="../../../static/images/onlineHome/yinnongIcon8.png" style="width: 25px;" alt />
             </div>
             <p style="margin-top: 5px;color: #666666;">信用卡转账</p>
           </van-grid-item>
           <van-grid-item text="虚拟挂账" :to="{name:'approvalList3'}" >
-            <div slot="default" style="background:#FF4646;padding: 10px;text-align:center;border-radius: 10px;box-sizing: border-box;width: 44px;height: 44px" >
-              <img src="../../../static/images/onlineHome/icon6.png" style="width: 25px;" alt />
+            <div slot="default" style="background:#FFA63E;padding: 10px;text-align:center;border-radius: 10px;box-sizing: border-box;width: 44px;height: 44px" >
+              <img src="../../../static/images/onlineHome/yinnongIcon9.png" style="width: 25px;" alt />
             </div>
             <p style="margin-top: 5px;color: #666666;">虚拟挂账</p>
           </van-grid-item>
           <van-grid-item text="虚拟转账" :to="{name:'approvalList4'}" >
-            <div slot="default" style="background:#FF4646;padding: 10px;text-align:center;border-radius: 10px;box-sizing: border-box;width: 44px;height: 44px" >
-              <img src="../../../static/images/onlineHome/icon6.png" style="width: 25px;" alt />
+            <div slot="default" style="background:#c568f5;padding: 10px;text-align:center;border-radius: 10px;box-sizing: border-box;width: 44px;height: 44px" >
+              <img src="../../../static/images/onlineHome/yinnongIcon10.png" style="width: 25px;" alt />
             </div>
             <p style="margin-top: 5px;color: #666666;">虚拟转账</p>
           </van-grid-item>
           <van-grid-item text="母子转账" :to="{name:'approvalList5'}" >
-            <div slot="default" style="background:#FF4646;padding: 10px;text-align:center;border-radius: 10px;box-sizing: border-box;width: 44px;height: 44px" >
-              <img src="../../../static/images/onlineHome/icon6.png" style="width: 25px;" alt />
+            <div slot="default" style="background:#1D6FE9;padding: 10px;text-align:center;border-radius: 10px;box-sizing: border-box;width: 44px;height: 44px" >
+              <img src="../../../static/images/onlineHome/yinnongIcon4.png" style="width: 25px;" alt />
             </div>
             <p style="margin-top: 5px;color: #666666;">母子转账</p>
           </van-grid-item>
-          <van-grid-item text="资金提现" :to="{name:'approvalList10'}" >
-            <div slot="default" style="background:#FF4646;padding: 10px;text-align:center;border-radius: 10px;box-sizing: border-box;width: 44px;height: 44px" >
-              <img src="../../../static/images/onlineHome/icon6.png" style="width: 25px;" alt />
+          <van-grid-item text="现金提现" :to="{name:'approvalList10'}" >
+            <div slot="default" style="background:#FF6464;padding: 10px;text-align:center;border-radius: 10px;box-sizing: border-box;width: 44px;height: 44px" >
+              <img src="../../../static/images/onlineHome/yinnongIcon7.png" style="width: 25px;" alt />
             </div>
-            <p style="margin-top: 5px;color: #666666;">资金提现</p>
+            <p style="margin-top: 5px;color: #666666;">现金提现</p>
           </van-grid-item>
-          <van-grid-item text="资金使用" :to="{name:'approvalList11'}" >
-            <div slot="default" style="background:#FF4646;padding: 10px;text-align:center;border-radius: 10px;box-sizing: border-box;width: 44px;height: 44px" >
-              <img src="../../../static/images/onlineHome/icon6.png" style="width: 25px;" alt />
+          <van-grid-item text="现金使用" :to="{name:'approvalList11'}" >
+            <div slot="default" style="background:#7790FE;padding: 10px;text-align:center;border-radius: 10px;box-sizing: border-box;width: 44px;height: 44px" >
+              <img src="../../../static/images/onlineHome/yinnongIcon6.png" style="width: 25px;" alt />
             </div>
-            <p style="margin-top: 5px;color: #666666;">资金使用</p>
+            <p style="margin-top: 5px;color: #666666;">现金使用</p>
           </van-grid-item>
           <van-grid-item text="汇票支出" :to="{name:'approvalList12'}" >
-            <div slot="default" style="background:#FF4646;padding: 10px;text-align:center;border-radius: 10px;box-sizing: border-box;width: 44px;height: 44px" >
-              <img src="../../../static/images/onlineHome/icon6.png" style="width: 25px;" alt />
+            <div slot="default" style="background:#539ffd;padding: 10px;text-align:center;border-radius: 10px;box-sizing: border-box;width: 44px;height: 44px" >
+              <img src="../../../static/images/onlineHome/yinnongIcon3.png" style="width: 25px;" alt />
             </div>
             <p style="margin-top: 5px;color: #666666;">汇票支出</p>
           </van-grid-item>
           <van-grid-item text="收款账户" :to="{name:'collectionList'}" >
-            <div slot="default" style="background:#FF4646;padding: 10px;text-align:center;border-radius: 10px;box-sizing: border-box;width: 44px;height: 44px" >
-              <img src="../../../static/images/onlineHome/icon6.png" style="width: 25px;" alt />
+            <div slot="default" style="background:#7dda4f;padding: 10px;text-align:center;border-radius: 10px;box-sizing: border-box;width: 44px;height: 44px" >
+              <img src="../../../static/images/onlineHome/yinnongIcon5.png" style="width: 25px;" alt />
             </div>
             <p style="margin-top: 5px;color: #666666;">收款账户</p>
           </van-grid-item>
           <van-grid-item text="付款账户" :to="{name:'paymentAccountList'}" >
             <div slot="default" style="background:#FF4646;padding: 10px;text-align:center;border-radius: 10px;box-sizing: border-box;width: 44px;height: 44px" >
-              <img src="../../../static/images/onlineHome/icon6.png" style="width: 25px;" alt />
+              <img src="../../../static/images/onlineHome/yinnongIcon2.png" style="width: 25px;" alt />
             </div>
             <p style="margin-top: 5px;color: #666666;">付款账户</p>
           </van-grid-item>
diff --git a/static/images/onlineHome/yinnongIcon1.png b/static/images/onlineHome/yinnongIcon1.png
new file mode 100644
index 0000000000000000000000000000000000000000..09b42880588fb1a5652e432eeb7ab6b6a7935a91
GIT binary patch
literal 2066
zcmaJ?dsGv58VzLy3$h?oN^(HP018y{0zwi<Y+w@P5uhO=ilKyLNFpQ?lEK6Wir|Y@
zdWw~&2*EBAt+G;tMJftKT5$nEk@8ppi!7j2h2o;9xDzYv{;}+wGxK|#d+&F@$2pT7
z6%lM@fwRD1FjgU(K|Z=}G`=g%(C^wq+fC2~i*RC*XgCSciqsH>ErAmuAVeXOLVQRh
z*`3-31z<3yE^<LE63Yu`h+zdmWW*433Kh!6U;;MjR3dRQgaC<<RIX&=pZ;(i56C4<
z{8nEciKhyJWb(~>)KK)E2!VJ{vY0NxZ(;!fItD7BfDjR&Q=}+03>_2yPM3l1jn_mx
z@D73`Gx2|ziseNCL9iMEd<j%9G1-R(_|XYust?JVx)Gp|$aEr!MkITCk;n`ZmEr3L
zynpa$G_@p&!3VkTW1%M|UWOnl29c=MY6)6z0<4x2$#goZK_OBoUMRv#vs;OXbY4o0
z%c24ZX~b%|3X#J~z^Eungwqfv9(DRh3JTSdtWxv7OlZM~I+2P<CXkFNEdqJG{|{9t
zme3l65B<mQ{}k2;cB>#FAJV{SYBAclBo|{S6(dLui4a&VfZ>$IDn`j*1lGu46+l5P
z0q$GnN(rphc)TO<c#IIG1`#R6PzcDxqY?zUT*9D}KtEqUkV|1x*<>;&D3A-%xq&na
zoy27a(x{|GE(nX$6p#{G<Vu#f9MZB}<18ptXk-vl%XdK%t{PSV?{a3ym-hlLtM{HO
zS=I~4S(Zyg%@B>9{jW|hUZLY-+%C;6dRUr#NQsWS8lCHK3Hvby^QXfhAX}gt=qcJJ
z`-p9GMC)7H?Ha!tcGC^(GL8YC1(1%}?z3gvl!4$d=zKM5)rWYCdA*(ma&FiKOzXM~
z$6nw)4emqI6FGG1Dajklg}l0w{>h^L6<#mezw#Ce?+S&&dv?6_-{igx8Gu6I+0Usu
zS9f!5)5l#a2R{A8U|QD9yJY#%;U~Nucp$Dh*v53zH$(j3_>3|3E32I{Q!6XaJ9XI&
z`<^>Lub!}IR&+T(Jh!)2?=92E-Ar?wHA`o2?V9Q$m<?rINhu%~I9Lqyxcg>tqgL1-
zER_$;nN*CdlWr(SvY)IgQfF7sGNW%uBQu6fcAU2<QFqflFEl5nTr9u5X5S?zE9)Z%
z=X&Jx|1#*!=Ei0#z_V}jf9`q3LGJ67ckfxe!R^2d;X-eWcV?BW!ks$fL<<gzp6Tq6
z`MIspw?;j~AX=T0SovIE@iZnCxJ<q>a&2Z(9hYT(K1bg=rr6-H;4~W6fIVgY1j|Sk
z#vA(UuMhT)gx0Q%sdpd;D%RdhDF1tnbc_3|{3Lq`)w*w9MXbe??hdaBkIR|9`nvQ?
zX>RA^9BJ_#FVDeC`Nf@9fRfy>ey<>W&8XS4p<Qe2$L0!2U-|?d$cq@taPg${d7k%)
z_i0nb2KteOXK5*dY=`}QhO=`gDo(5goKJd`^;YrQRoiTON9O+AfAaYJ&Mz-qEM;M(
zrylv7gEDVhlx5CWzpiO2cfsb$*XERMXlZK&%)(kzv4V51Ri?V}+=<2{1{VB_?aQ6H
zovaUjUNAHkT8B-}I3S~Mf63||xp?$WV**|y^sX*7X~@E<h7Hqa99MZ%Quj_&nXR}C
zIngfs{ve&(IfzRXwR`Uf|FQ1{hVg~Kkdi>LZzB)MEDPIL`%B0de{0@P>KTha)G8}#
zNiXWikt2TJ-TJ|j_F>Y|?Cf89swRRTIsASfiHsIa&vEU~wmY{o2*+-2pUnH`0!^IH
z$0z?Pi&&W@Jvd%cbv=}G?f6EAN*3$j7CBO2z;t~u)5?1-=uqAX5{4ZzNX+@n+a`Z?
z#Aj^n3&ZX^a)1*VAK`j+qSODo+|F83*U8oZ-!D{>F^2@E`-;k%v^slkuVxom+{9X7
zo$hF9(&O*4+Ul=;d*9=9v+bq>8I}Q8+Ug!^{5~0}ojNg?5=nG>cwsEF__o!LF%9mG
zSMq=JZ2EL`o>8Bi{7fsJM)WODzn`ja9H>aNSJY)f+^Iay-+p@9zr8xtKRLE{a4Ivh
z(E0OfU0r)Qr3gD~I3KuWHMz8>ujHK7Og(Yj@ngrG*G`M9O|3mD6z%Ks58VvP=LZLN
zj4XsZ$qM{kU3^Pe^ygURwpVQrZc5FC6u_U7u4g*^L-S$;-^^?lPP*xC9nOE4ndd4G
zm}nVqz$)xOWK;G0z^He@*WZuP3LmM8mALLifrAoz+SRw9DRiOpQE*Xr`_Z`c{f`Y}
zFZ;KUXq$&cHML(Q*twh8(TY=JaG(A3GGb#)#Vs0!Fpum0n()Bw*Y$5EDpN;YI&L3N
huYNtuy1!tXfEj)8tswnL3eNbK4&g+ARe=ea{{}sbQn~;D

literal 0
HcmV?d00001

diff --git a/static/images/onlineHome/yinnongIcon10.png b/static/images/onlineHome/yinnongIcon10.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd91b1f9ada92cc4790ecea61d72aa9c0db588e0
GIT binary patch
literal 1858
zcmaJ?X;2eq7)}u6u#~D0>ji64s#J0kLI@<7upn521R{qA5RwH}NH!*mL>z3y3l)c2
zE&&e)4^U8B5sN@2v7*8l1@S5%rzk2Yj-r4^yHUXYDBYRe@0jO#-sgS4_nX}n7_ijZ
zYK|2ShqLzg1B0;9+4x#a#lH62R^hQ>HtG|G1|u<Ol0*gJ_%b9K0{rEYSSSdR$TqI8
zhdgn(DI{1NhK323bEJrzA~9kp8o3f<<8Yo{8l^-U51~Lb6bmc3#23}IL;#j?iJ`7S
zno#Kt#le2bDkwNPKrBs;m%7V{UOd24!@&gP5GnyQ@&tvNqu~-i>2k2Sahpm6K0(lU
zF7dOeFkv9zji?~NmBJ!R=}b1@=1!rrm^2rbGr*wH-KjJ-mF_~O(K$30$JGrOdx%&x
zl`Mu61p1D}!d6^j9EvJARBBRE5+%unf~aDtba!`5gF$65$QXjG-l#w&8nQx78dm@z
zwNwQwQ5aDGMny?9l8ADNnA6WG$dwba3iVi-u!2!F5+#*Rp&3&e2MUG%50%R&&}uXY
z`r`LLh1KGXN{AW+sgXpL6g#*Wk};H$<E?@uD54T0NWyp(1LF`BQO6-lfPq;87KOqJ
z8Iq)S`a}>4IsOVYDp5!we~?SWBq%T}<FIL<8;j3&WAIr5I^D-x0J^z=J`8WBK;RB~
zy9vg*AR<kaLke`9EBnG_Ps%m+f?SD31|b!^0h0Nu5IOKEXAV5M7uQMk#<;S{y|5<b
zQZX}B<H`Q(q{p|g_AyQ;`W9PEbUviO+Fgb9b$nGv33gp7{6W50({elSM?X7>?bXK-
zFYaVD>dbwJa9-2avqk2jeYSDuGF!kssYQfa#J>6DRj-Q@&sp|Ylx!CTeIFvoJ4&vJ
zP9-m^TeQg{zpLkX^WV4g*eNM4_l|q?4CpdEUOhk_y}S9At-k1jZ)RHWHQ*8f-8{3E
zJIV)4cj_u%zVMa%>K6u1qoi&gCCSu!4_f2}zH@=u?)2f-slPg8rKUNuXZPbrqP|@o
zOldLO&7U)Dp-8>A?4a$R9tB??(&pip?@E}*)LyEs<YyhO;b&!QRWyS67OCgxGd)qX
z`IfeGS@XffEx;*!25cv1H3pYWUop6SVe&7A;Nq>zc{itAC~O_PYo8Wz<144qsu^N!
z;UmGx->0mZ4%P2?O9)zVao4Nq3j$&zUH^DqQQu@Ax``2zacp*G0>8(r9JH(PnYVN1
z+QI3{+{geK_xxfSzMsjyes#5;@9ONw)E{gZ38&>>3+|qAzyIL{u|6h!Zay#VqD{kr
znr*fZ9C~6LnCnYtg&cYEBvKt#wO93Z`#^+YJJ0fbaz5DcE+t)9-VU83n87?S{#cR0
z!mezCQ{^S|-w06KqbTiL^qCGHsKb9VU{Bb+rLTLWprQ7j9y-jurcm;t$}J5KEAKO`
z7N2p{wk|HJa}9m9lznAH7H)2-=zgAa*F0xSZ<JYO&pxeL=el(31bl{KN3Y}5je^{f
z%Cxk)!rWGciGM!Fy|Ca}V>{)r6)Czmcl5iQy8+eRiTQR-;WbU!8(JIJ^o6cCW16z8
zRoMO0$^`TM#WVYh`%DJI;c9~Cy)?scS5t!NJ9lnepU3=&K*QP1jq=;J#RK8{KcraJ
z9uUWy&Gp$oTRdf0<oNNZPD;Ic;w9l-dL~^Izzb-)edMyi`)5N{%SwIm@YL9>vZJ#?
zoH+|`E+GBTYV*uQ(~{HH{YqNn^!iepZ11f*_BVPv<TZCrzws-puYZwXFUtIjlKk2(
z=|Hx)c;qANsQ-~wAp>2hr1g)Pz3Oe9OFJv2MTXebC-Vs9b@UW`*s=Fs%<$B$2SiB?
zcSPy!C0Ro!3mWMTJ~q{rG2qY)63=Qwrls&$$qCW*Y{Hw2h`Fbd8{V(58-eFMm{ycB
zx>+T7xDy_Ivy*KeWf@`8vV>bZ)a`mTGfZdQ<#=e_(;*8zqU-Vcum?WA72mw6G;awY
zUidWh$<xMp_PBWcri@~Jqv_L!X+6%>*KNWt50BWX9qwO73T;We!xFOF8<ojWghfYN
dQR(1XEgn}<afPkq>8p)@HGiJ~@U$Q*^&edX@!0?X

literal 0
HcmV?d00001

diff --git a/static/images/onlineHome/yinnongIcon2.png b/static/images/onlineHome/yinnongIcon2.png
new file mode 100644
index 0000000000000000000000000000000000000000..98b0ee250ffcebecd7a197ec4cf733869e20e4b8
GIT binary patch
literal 1935
zcmaJ?c~BE~7!7iR6hWcT7F}0`h$PuS2qq9g6EH!8F+@NPOO6#%Om>qj5U7AgPy-!B
ztB4AUMR5d0Jn;qujIBy5mrA8z1&d;ZDpH|hyHU~pQMxm`zhmBe-}{c4)eFKF+u3|(
zLm&|BcwCMUU%ia4l?DEto*iw1FRoZ{6c&!G#!|&<n6OZWNML}c5GTMwSS(9ZeGdl^
z2&S{-q9`nizmzFO6lAdxL)I!#oJ}AE1Zq*SGzrE437jBTvcQ3hH6S3DvA{@QKEy}a
zaH5=>u7<<Y!$i{bBq>7%1}*>sv`kz;0b^o7t5~DdFtsf3tu7Pa8?PxK@D_q4vA}nx
zqWA)Uji_P3mrN%~skHfkAA?M#(;y$Z7vK$185C$fh3Z3ss7#2?^z{SYKOi1WEnCeL
zazft6!cQzP5yMa>g_4?@N>245BkBYSmBGL@yeZz^BpgA~q$x46mZa3o8du=J8mU^2
zVsb<Y7!}15BpG9YxYKtjD9{hGO3nK+;RT~;#VCbJhKwnV1Nr>_hbj~w&>Bn#fAssG
z!WvN;3R8rz21!;+@y4y5WekNf*=ksfA!-qVtQoJOAQ8b3O(KE<-nb=z7%5lEkW|gw
zw*)?)$x~`Du~G{2I4lsCAj{=4=6pKjO$(ty-V5m*Dm9qR;4r9*I1q=yp!w2*gQ0OQ
z2azT#U?n!rm3`z=C*&GuL4o3tIj~xu0?R_whyr+<GgCgH7bti_z4u(%gkGSK3Aq&9
z48_>le|38N3LhWi_QTxbhYynvEAeqx<8%Gn@Lh8P!E6$bvrwe%XxP1kD_ZVi7>Hf$
z_F`p$EHBsD^;q;7u8nOr(Izyz)|uq#853M#<#|#EI6CT9>DIemxSl(mL%RA^xJV{m
zrU%qSH$&=^`)_8fjSSnQ>AJJqK2w{}Bz^Ourfa0>ytDzDe9L`LkXvEtA&+Zy=4fj<
zyH%`fE8#5pvS(dmiW|1cS{R*Pk2d%844%d=URh58{AaJHWjPV2m>t$x6};$&&doSk
zVW?GA7bn|KT|D1#b&Jy~X8&}Ltv7Yun|IV7fy{3>nA(*zALvR)EqW}+Qf{w%n6(ZR
z*mu;e%9%Oz#=<$qw7_ztw&atVN0-W?<80fxzgyP2D-ZwBEDdjJ2DKiA-ARtg%cBbK
z#jcRN9<{&gMw_Fv*|K4tj_vfc{PD9zSHg4|_XA6Hx0ri+`eU6VESjDt<%)lD2;o_K
z7MeNf+<>})Z55F@tz7hp*R9j>p*aqNTRMHJ`y~R>Q0booXbqLT!F6s@Oi%&(Nq(^(
zyYjNrZuPl42A6VT#;M0uaT)h*I%+3<f7y#J$z3MhpEK;&EhrO$P5y;0f7LPa4Tt?Z
zOk%DEXwC3|aRcXVUO$TIB(9k@atZqDT=6LDfhu#LytLb7FMV`yXRK4`O70ePG#AYw
zJ{*=TFmqE)d39s%oc2FVRts)lX?QR)uTLd}fnyuaID6C+t)KPqCg+7ks7${wdy)O8
z#XTPX?)JRwJJ>5m?;uQnUR=d>spq;r1FfI*C79?p2eDjw->~C%wN}pUgYFwjnqnSn
zKCSj{OqkRLQeCI+bLkt%Z>`MD+;xPLcUJh@^V4=~&A%0TI1X;xx^XKb<Edo#)`XzZ
z+XwT^Gpb)nT8e(|ydVgVTpyWRtPgEln;DHxO}jcA`|RYt7I3faFgn(LFu5x6QKDyW
zxU1IMJ?E0EiNblrLo;de;Dr)ZFWKPG7BE~>1oM5yM5eYYPtVjVRU>sPO4>^A-m*C{
zb~0*SU0KVIwb`>Tv~94ermf5V{6vaQ@6xyZhhK=h4n%P!%RGzt(fVY^r8{(C(43{*
z$}Y3?pcB4DrIMizee$eAq6ww85TeF)S)?s!q<a>*r8xFSKn}g3+qM^#4P755o{f0$
zG{#SI*^1us@JQ85;WuAT>pY0kA4D9DtaB#`i`{Qm2UXUeYq?a?&^HXWAMXYS^X>h<
z>$3#9BsbwB*z&I$FXz6T7llP1ZON*O696y$kE3Tdg)d!lIKI5`_w6mSN4Iqk&Ea|N
zG%U+3vSU~ADn!q@L#&^Uq6Os(Rrx>KvLOX<$LUx1Lq%g#8ty^ndudA^JA^hhmBm+>
zw>xb-<?gU4t8-MJ6z?DS>)$<pXEoICdA*-tN+`56T@Zf_Yc~EOdBI_v%0=<Ie*i0W
B4ZHvV

literal 0
HcmV?d00001

diff --git a/static/images/onlineHome/yinnongIcon3.png b/static/images/onlineHome/yinnongIcon3.png
new file mode 100644
index 0000000000000000000000000000000000000000..8e674375425896d2d6a131b73473b5a42cf8b388
GIT binary patch
literal 2022
zcmaJ?Yg7|w8jeJXAV_JoEFvXMDjF`iLN2o)5)vgqkOoxLh0Se%h)KrDK*B{VS4*Q<
z5L=X1Q9ug?xzu6-5n>j(lkF~w2uB5}(!vTAMX4+9#ERV?%g#A7-{m~d^FHtUz2BMK
zu+VL`*6XY>7>unTkS9V%5A(ay68(OVwPzVRI3oN=BwQVXXeBU+@t3QmAYP!9#DXGF
zB2PNd1^QqxSfU~#5{VRs05Y|bEHPuqIwgd%F&G~|9VC&(g9u&<#wt|4gz4s10$w5a
zCG7GRQiV_e7^etKhQaXU&<I&_yo@6!_-)4f=m1ne2_h1_PPt#D0d&5E*SY{YH*Zr2
z_}365-k0#ZsYqcMK0pnFcyBV(Q%3V*<5?Usjp;>YFg@^eDvd*-vMDr%CzS?JnSeJ7
z|K=f}(O`KDAmVL(6ANAW65<d90w@%%R!i10$Z9y2LgR2y4LXHR_e2q%nj{q>(Rr#g
z#6<-jsFA@62vMk2c(bBJs!l+B38>TGQ&2*0WmTFtWkL%^(Mcc*jZ8JCv<MUm|36fz
ze2dl~BJdBt|5I2KkpzJh5vWloz%umUVu<EY5D)-^5=0G0sMY%ys~8riM%0=(HH4?5
zmhhW)DO7T`RzrGC5DEc-N`pvLGEl(tC7=>yg+dO{c{B!_72r+xXYyz?egK!sVRLD8
zRsfg5<#HL!MJ`V*OHhI;WRWZXgUei!YwiUlghu9pup$wZZ-v!L{Og<n#nN6FOX|Jh
z%9r-ywIr8<nxU9a_P<VgaSLr9^Ym@sqKmhk53101hta-HKgQpH!7Se`;Q2@BZug!{
ziOc(VeaGFF6s>>JNbC`bJxm!d7<M7sdvb{ak|=~*7##R<L9qUmUrufQUK#ml--e?n
zgH=YU*WNGkhxX4s|KQ-=ubfRUu9(2-7mo&FQ|`<z^lQ>goYvWc{nJ+@r_MJP7TBCm
zzgptF68rQs;hI2feAHa`GAeFh(^D0Gy&KkK;6U~1*-%jkCi~R9Xw&!K2jyp{J<9y?
zPQx81kAF^`m}7n=tQ{J(_;It%Axm+Ii+lL-)u-WoUZFcYC#)NS6L*U%+o8^7_sdL#
zsv!U60o$|08>#Q~?zrvx*~b2zr{$;5*f*WM<x)>=`Z;L$yR@k<-R3Uvf3m9}n0ObQ
zw`9Ym>oak-IDMOQxzH+3d9D>FDyG}zG&XvT+l7QwtUO*<g3(2?@}@A)+JbMcDtBBl
zR+y5ClWi%_U9dL16U}ni9wyTyzh`iC(m!NR#GE}N6Ae>T&dy$Yqtl1*RwFFQA*Wu<
ztRZF9ORt%(`*1Wpw`lHkiQPo+bkKA03L9)kdxh~@SMEK>&I_5WgSYz6%fX!PQQeFM
zZ+14Omft~se>`Kk;QsM{CH|6l58B?fyT&-V#;LB!C8)ot46<r6UT(85S8Zf>PM$36
z%KOJNZJWn7|8F|?R32?HxH|vbR2KeajHVR17I<^2P?_p~<-{-JFZmlBM#jP_c@Dsb
zbM38dxa<4u+|nxtrQ)5nesx{*R-wOEJ3@z>H5&)7mA!;Mmrxny>CuR@2RlAOx}{ir
zq*iBJW3kFVI45f>kNw0l|5CLj|H^7&{*g&zNM^>n#+2OXB#Yl>fiunZTirwd+85sT
z5&0^RC;m&O&FJ0C-1eO->J2x-CT664X#(r))rSuJeJ*|zcg$x)PjT47gIBgCEtgtG
zjFXV-$-#tzJ0<PV=KP*_yGEs%?T%0Sj@1z2k#DbGO~S9w`*k$+c!I9x*re-OV>0N@
z?&d$I-CC`EU=>px+N=(m8_s`m#Es0PrL+{CNG+Fs(~$hEdi;^;rk*&w<=^_X!?TtR
zrZvMh*kMAc!{Ju@{;?RoZ^zLAj=uA}+r-cVw}e5qCb>b2{hF|1T`+O~jss(k#eI>x
z+N;j}K&r?J)QgI2JASL3Z>y5Ao(~iORl8FoKa|uMU~FuZ&q{~l1(vw<hHd$6Mb?wX
z>*K<6jT4p=sk^Ru7~SLRg8rP}Bg7Fy=5}~SZTqz3;uje}&)*22T5MlSa>J3te}dc(
z4-wmvXM_(s-oKo?@VJb*_S{%LT$+}q`n>X%!zT@{z$1%jl2SXbV2J8W@A-B2-kX*@
zHgu%z10BO%Sg-W6mwF1S0|_{qy?6K?m@*Po>13ilhFYgaof7GhBvRhww19NxqrR9*
z#z4-+Q1q5<p4S3~b$XWW;XQC>i0k)MoPD{v%E%?wd~!of{VpeN@Ri?i@{OM|u$-38
q(u;tL$UU#VyMotD`ub3h%Q8z$Fca*jM0FIK|GWZzDDNUyobex?1U-WQ

literal 0
HcmV?d00001

diff --git a/static/images/onlineHome/yinnongIcon4.png b/static/images/onlineHome/yinnongIcon4.png
new file mode 100644
index 0000000000000000000000000000000000000000..37bfa097d9437f42e1ea9ecdc66bf0f4c8dc8245
GIT binary patch
literal 1784
zcmaJ?X;2eq7!DvuP_X5&Rje#QTTpUBLK2CX3yBg$2$DhtLb5;_Hye`0gfIvMgo2_L
zZ7qtRp)jC>B30`RR4b@>6gm*OM5z=l0<Bn>;?WHX?T^x(+5L`rp67ku_j|wDg0Rqa
z4)#mzF&K=4Aea}9jy~qs&IbK1%Z;``hs6kAj6}eRh*qKoF>D!}00II?k_3i>5?NZx
z4KM(MvGSCQ#E4iJ!j!@gL1M-bbdU;VV=w`MI+aAK01+SoOp+^ExY3IZI6y9A;i9NQ
zl2FA3ljXsBH5j1}6-o69DMN+}TmuB?n5X~*A`(CcZB=TRIu>qPmx<2J+e92N4M7wv
z+*?y(VHm)L)gVA6(C|{SA06;#5Xdw?k}u5%ppeK6B8g5U`{GGtCW*$R`UCGC92!k6
zOJs)gg5JeKS1epIf~c58qE@RVXnhH=I*CYTFi;H&kwU?v2)rguiAZ#KrN(ncfd^`&
zYPkxL!%D!cC`o`*5f%=0`ZfhfH7l#syeku0FrrSPB9aLtb4oKnq458q5HyR{AmQLY
ze*aTgBT7?&#Bfjpr>dps!6kZ{L#dctH7G$~wFri{&Qvih8Af1DGOPk9s3pKFO0JZ_
zT8;NKK`3Mjlo~{$l!5{t3x`S&<Z>C4?aQE%gV;e7HjPUr^SKOvK9$R(P`OkZgG=}0
z&v1FLG!+7s$P8CD%jJ;f<eGZ{QlXJ~pjy5Slm)3_2$;^9DWBU5Z%(~;T-lsn*!(%U
zMAQt?e6s&K>6tCGeazF@zC{<aoewI}c2}c)eZks(7kXV30v=nW>l!ZE5-ei7H211|
zLxes;zwi|A>e!cneMKFy?m&o9|I}mH*_hvGs6J4r|04F7ZJgeY<B_{;{g4%of-^3}
z(kR#>(W0VVT`#1sOs_u)t@~``a(d$62`^oLb8osf@lNLGol=JHz|Q6YIVZ;chsK3n
z?D;0g4g-+caIdP5G-Ty5<``fLw<AUK=F1Dxlib%jw?vM;Sy(>iaMGf@XS@F-Hg9e2
z=y#K~&WjyiY|p;cf1wjTclDug$6BhFO$qHqTN5SBYIjb0ys7G=&jaI(eB9YJHy*^)
zOn#r3UD3a@@~}l%!b-Z^xF)9^xVfO->aP*3UG<;*K_h=WYOka%U(?7WVXB(kN6Mw~
zh1jvwa81vsHH4km*;E}NDd&hcR8q6_DmUbuYboCF<5>XOUBVkHUfi*-*7Mww9&1)W
z?Y5jlN0#$B6IuEFtEbWz-pSz?7Yyv*&{~we<)BAvLE;CQmyh(|9Y<XTE!lgnl{rru
zb)#CRo)s=VgV`p_9kM6mZ}bHjI;!U>2xzZ+(BZwm7xEt}bY0S7ot9^aeEGN=`?~5L
zrm{G2f%Syfeur*sl}(?Wn+}tZXK?pE{nJyIj$_tVS)6Y59wV=!F)pcoyxw9LQ#4`~
zxvcr&d_qE8_ELfVyk#lo%#p124bi&3M?beIj$7t8>B|mYY|Kz4-APhBq1|1nyB~_3
zqJPuRmt~b_BwiwQEi$!u5U#(jqUQsdo~2Q_&un@v#x~KPU&5Tp%b4)lc=5(or_+YE
zYiw<#CiCc~h^-g%PQG85AWAELSQWg(XmYc;V)PrbVK@zS`S#Tpi@k@ax5wr$uytI)
z*<ruxmrqYs#d!Nf`Nhn;D<(~>A3I&wlUw7t1Yuj}hjtKKFa4qOkLWCiw|j!Ib$RiH
zr#3d-a#4Q!A*k4_uv|Uqi$6+x9=dn;S1Ea4H+6=*9{v^DeBsS)V(?T;{BdxNyKS@I
zzA`5Jit65YOO|O=<%IACmJb#0G&RQ_#(fDrT(P0#aa!(_f9iqIzE-#OrrL>=m-t7O
zogb^(n%1SYJ#Ki^ee`+$DgZaBsQGQz?~w_&W6Rp_KfAW{(Xb-NHYf19Z@h>?J;bc2
zxojgcM3$a+jphu}PhKi`PwR2>YMf?2-Rgv(^p$HoW}P^C4`pA2%=|AB@I!egIPr$R
E0r^P6r~m)}

literal 0
HcmV?d00001

diff --git a/static/images/onlineHome/yinnongIcon5.png b/static/images/onlineHome/yinnongIcon5.png
new file mode 100644
index 0000000000000000000000000000000000000000..5a17310bbdd2d246f73dc90750319e895d52a245
GIT binary patch
literal 1873
zcmaJ?X;2eq7!CpfQDH<t6on;N0WmiO5)CmX0V75uWFQ=|37ZY1B-xOxCQzjVs3<62
z9G(a&V=aQvDwY5h6p9WA$dp#aBjQmHs0Go{ilrMA?2po&+5L`rp67ku_j|wDox-)@
zvmE9-U@(|j{8ijYbX;nA?Xl?Bb8DOxI?O|OVk8PyAO@KZ!m#CVA_VZ&vLq-HlF8Fj
zuR+T(7;7J;NQ{UDYZxG`Cde!pf>EtS*%-`nmQgDMQy>ILgp!mRChleZB^;oXGjTCN
z0+K+>fs&Q0(sfW&`dSf~o&wV4I94dI+{i!$)DR*AjB1re&oDA^<GKuVZrLW{fN=<t
z!o+<vB^C$)4y=QKAOZ~!k^@74U^;<J3nWo#O92XrOec~;h-50BL}rj^jG$oP(}P2!
z>EsGVBsc6+EOf=hB_oKIK_nUs27-Y~fOSbkGM$cUP>2)?9!22wX&OXk#B20E6AD~N
z59*X!L<wsEi=r$M-iR=9sMC)rsI`-_8vUm-p#>uvWm+PcK(eGX0Tc-SAF5VQqV-55
z^x5x!3hPB_T8J14>EVq!5Is1Bk0q3r!O=l71lEaQST#{aVKR)s`eaxOP*6*NUyM>C
zhYfoFae_d=;A`}VOanrEE)$1J5R^(eBbZI$&_aT!6gG`ZCi6HeDZyNN7@fopTgl;t
zaYH7!To~M_hBU|oSN@qBI3?H83u-MInG5NZn;?0Z4psx>IWv?~dm&G$_lYZ?+6!e$
zE)g|Dw4Cg}PI_VsZ6C{YvTxDFWamQ~wB2=RU%yvHw4v9fh0kS+jJG=u@ssDQcW?7m
z##KaDdiH0<%@yv=&8@Xtf5uN#<0s;Bt4~A<op3wC8()irPS1HYxj)K?Rh6DDcbcM^
zE^O|MqS~Szk^#lVma&+>v%69$$M}nhAI#y4;o-$&4ex4;r?(`MIX`S;&#`Zzk9n-I
zjcH!r{k|)9_5fAZ?U2qczy2<OY@pej*qIF0!7SI!wu)?i>4Jpnqp%&5P<3Fst|>|=
zb;L%Ro$=EA;h#Jb?7|CbmQ>H$x}pH|kxnBQ#JoDJk9zFPE4`xodKr6X`@1?b_UZa3
z?L%cZS_PTXvddxT8(1$M%<q*R)SomL?8+&C?$7+bFuq_{qm5IO4{0}8CuKdIc3P5f
z66=zEP3k@}Z^WBVodvXe_b&SCSIq38wkAq-%C5Q@u1xZ)IBzUR40^iVSSH!rxoK!o
zCDZQM;k>qDuJ3lgx0DbSpL)%7*(v&LLVF#%ns8&rk!=rcj>YTlbG^iv+wOC}3(8Id
z_MbHygT?}UMylF2Jiz<OFHi@4#e-~BM}^eCCT|7yrcJGB6!$JQt*FMH%2^cqrQZ2y
z($MQegmZQGhBvJKW7wtz+u-0S%s;8<-z2+OSSJ|>z-5#dm$qFsfRNcSpx2qzn(n%w
zt25L4&k`%&iuygFUa9sS(S*yqyIH^Ww8fAswo2st+}?Cxt>Y@pNvk;}R|@ld;}TBo
zV|AMwa!j_zZ2}5cv`aIqbBmS<yQV?8607_dZmMqAC-Jqx_|>@;kB%KYu|v|)OY8Bz
zxzurgMGBh*zh}Db&mQQJkJ`2_E?}+<Rrj6Cj79Ro$}{)>d|Ko`&D+$z<qf_E7<`Sp
z=hS?$DeUo<GES>=%q@^Uc96N9)-1R)FI>G9dx)OV>L1EJ*I46~1s#uW?(-_|o^1+e
zvV7D}=GT^3IXDgHZ0^B}2lPiP_s;vJ=S0TH!@N-kQ^cLXxXN|Peh*dWH`aEDoun{t
zL+ohCeZ}(QN;rFMvs&ddXsTEBv^5@;?CCq(_r;^4lBDvyINFik)!l`W4P`bZBMUb^
zvo{%9OyJHXA9#btXE_gV%~aUwFPz>}ymWR~DCsY7^Pv070M(mI_02s)=XvwnOHQS%
zJN^FI_0qcrEOV4t8n3N)2Cbs@9581*4vDxG_?+~tuzmNXE_#PuV18_W(9KSe|2C<~
z5enYtK=tYnM_d?PII2L-EG)sPt%7%tjS&Pny@x!keT%<+ppgRC6QSOSJ8t=uqTa*|
mTGWB7-op!B&J6zUWrf9f#HNT^urr@pesX-?T5i=!Y1TiGu;PdS

literal 0
HcmV?d00001

diff --git a/static/images/onlineHome/yinnongIcon6.png b/static/images/onlineHome/yinnongIcon6.png
new file mode 100644
index 0000000000000000000000000000000000000000..9dda5f6e778947218a2c917a2d5903dcb1663d81
GIT binary patch
literal 1817
zcmeAS@N?(olHy`uVBq!ia0vp^Iv~u!1|;QLq8NdcWQl7;NpOBzNqJ&XDuZK6ep0G}
zXKrG8YEWuoN@d~6R2v2cX64L~h>{3jAFJg2T)jk)8oi3#0-$aN1{?c|g2d$P)DnfH
z)bz|eTc!8A_bVx6rr0WloBA5~7C5J7WO`H;r3P2|g(O#HCtIc{+1n}DR9FEG$W1Lt
zRH(?!$t$+1uvG$^YXxM3g!Ppaz)DK8ZIvL7itr6kaLzAERWQ{v(@i!su~0C#)H5_Q
zF)%jMQ7|$vwA44S&^I*JH88X?Ftai>SAYT~plwAdX;wilZcw{`JX@uVl9B=|ef{$C
za=mh6z5JqdeM3u2pczK`Mn<|o6}rWhc_oPzx_QOQFcVx-i<65o3raHc^AtcPCMM;V
zme?u*T?+9+ZUNlbykclD0Rv3GBC$Z<P|pD5C742AU;IjQbK$CsOM+4n?!{_waY$uB
zs(w&vaeir0GBD!OltES%SUDG^CYIzEh2-bwz(O$~BfliSI3vG6!3gLi1&#2`yp;U%
zVok6HUtcTFyyB9?yyR3*7h5Hu5qg=KDOQF?mWGaw2F^x~W-f+?uFjT@2CkNl7G}oA
zj%MbL7H%-TF8Rr&xv6<2Fuf@Vy)HQQg3>~60nlcb)S}F?)D*X({9FaFpRF=+yTuWw
zc~HG6xZUD}Q?EYIG5VmGMT%*d5HR_GnDBH9<iJyYY927T7Xj0CR<SWVFuU}4x;TbZ
z+&VKe+9T9aq|NrWcLZlx8ME+~?!6&lAubcyR;s3k1zhN65!GVd>oLKW<!U!a;64$@
zuL>oNdTpI7ftPqEZ7|riN^xdt2TS0LqH{0fH<;-xv#jo`I#(uEvmyQbnR)YXX0MMl
zwie)P7v|Z<`-ZJD!N{OYVkzqZ`3rpO8q>~SQ?Xz=xxnzv{<}<`6H8ca(tfB$Of)dO
z#uoNkYm!ol#ahANVl`}?f25KVO`;ViFpG8nUVVV`*bAXdg%x|274cv16lI@c=<cxU
zmf!V_J})D(B{bS^i&SmVWGq#<{9#R1>KomQ9P2`?)_##Vz{uRTt#Z*maTc3-)7SUJ
zF5FgVQfIp8qw)F)A|g-Kd}pUE-8+3{RnsyytHzUZ%omuuT`Ku@sGJHv5EH0p=+j^o
zrXh83@z(1LqNaRrWc_n>diU?EcgkX>i7fsQ!v3t8OV2)7?J?7K$?Zpz+D`IrE1pvp
z|Io+4c~96XZPv@VGajB!*qj)2?$g)M4d&OHuJ%9bekl3-pw&C~kjCDa@_ze044+SY
zSYsF5a*6ZbvMJk}%;nx)R(A^TxO;f3oY>qGsa+D?N;d7k)){8}%zt=-%{Q^SXG@A}
z)XQ%T4>#1Bv6QWRnQEBfx#2dKgEpt%(W4CS)t1yUZFdy^q5H=m&TaKGkqrWGo=ge8
zr9Z*(a*fMpsjONLb>BG`U#wcx74|f(nKdakPvh3R$=)T&t2VnXGwY2#z_xhm#`u=|
z{C$%??cLy^b92EYgQXT;=PWZ4OI}Rx?%s82=??{k*}@BbK8W67y&I^W@!_H0!z;Rl
z|2nc9JU)Mw|Ni2#(ydY}yM4EuAB42zUh*usvA)Ja%A5VG(#e%9-Ul5&^3HwCk=pve
z_t7r4Iqb3zlq}R<b>#@!c*od>y_(nYnkSlNd-v<bUUPN!f65ll+Vp&jS7VIbzTBrX
z<M=<_4dt=f>S_=vxjstdwYkAM-ey@dSI$k}6F8TzssDLTV8`L__j^-?rMfo1=%4fY
zT-v^7`M@V91zFi^&+z{`zF{-J#i`1$b*(4+ZC;egd{e%jQN8J!(#Dc~6IHi+@~yYH
zw61xjScfk&@2S0fr`ozqZw8BN%w3Q>@o+t3mB}uyJGuL$kAyCsJUg!Niim%4|E_16
zc@J(epYn`3`0|a^%xUvHF9aSoy0vd7_i=x}@3VA7ZgWiAUG00f|EN=(+DrSpOE`r*
lCwAB6++*QSJ!;R$#_)b``NvALRb`;c%G1@)Wt~$(697LT!h-++

literal 0
HcmV?d00001

diff --git a/static/images/onlineHome/yinnongIcon7.png b/static/images/onlineHome/yinnongIcon7.png
new file mode 100644
index 0000000000000000000000000000000000000000..762940468fe8fb2ea730587958dbbe9a732025f9
GIT binary patch
literal 1660
zcmeAS@N?(olHy`uVBq!ia0vp^Iv~u!1|;QLq8NdcWQl7;NpOBzNqJ&XDuZK6ep0G}
zXKrG8YEWuoN@d~6R2v2cX64L~h>{3jAFJg2T)jk)8oi3#0-$aN1{?c|g2d$P)DnfH
z)bz|eTc!8A_bVx6rr0WloBA5~7C5J7WO`H;r3P2|g(O#HCtIc{+1n}DR9FEG$W1Lt
zRH(?!$t$+1uvG$^YXxM3g!Ppaz)DK8ZIvL7itr6kaLzAERWQ{v(@i!su~0C#)H5_Q
zF)%jMQ7|$vwA44S&^I*JH88X?Ftai>SAYT~plwAdX;wilZcw{`JX@uVl9B=|ef{$C
za=mh6z5JqdeM3u2pczK`Mn<|o6}rWhc_oPzx_QOQFcVx-i<65o3raHc^AtcPCMM;V
zme?u*T?+9+ZUNlbykclD0Rv3GBC$Z<P|pD5C742AU;IjQbK$CsOM+4n?!{_waY$uB
zs(w&vaeir0GBD!OltES%SUDG^CYIzEh2-bwz(O$~BfliSI3vG6!3gLi1&#2`yp;U%
zVok6HUtcTFyyB9?yyR3*7h5Hu5qg=KDORqIP6h^M7N$myX3mC&uFjU`7B0?4mS!#%
zmKH`vrbaNmF8Rr&xv6<2Fuf@Vy=FM|g3>~60nlcb)S}F?)D*X({9FaFpRF=+yTur%
zc~HG6xZPrcQ?EYIG5VmGMT%*d5HR_GnDBH9<iJyYY927T7Xj0?N|eBB1_q}0o-U3d
z6}R5ZJe@7#DA1mM$Cu}#%Mq5vhFW&~UB^4vY$^gBStiP;bj2NcB5-lSYz?k|yj*fB
z;*SrCcYIWsw3uB{+_9r;0n0V>9lP@;ot>3iuWGvF(z|nu%Qu}lAX4+@%NHNtQeXej
z()DYnY<i?}dd&>aq=KY^JG_3(qUQYnJ16el{N$nJg+uD666~CUTkq}T4Z5SZbSw9{
z=8YYadxU&GtY0eqhq0#bL5N0px6o?kj2v$N?hA*ajBmVqyvsMiSLD$L;SYRYcE>m~
z|Kg}?IA_3X)_L;npK5NIl^6DRu|M@_KG?1v<@NMR)0?G5#tOTyCS_j#b-!a@9P{5J
z`uptNdz%7&$jF!ncredRmz}&|;`#exyVgs-$Yl;cAoKb}^r}rU<^lKg-^sIzyHuZX
zxF0y-D(~Vx#t&<nE<WdxD-sehwN-A*_nAKZNp7^x#BUAm39Dy3ni9(;C(r8Iz`TIN
zC_!Y+Q@d5cY(Hz*)7Nmy%imJpFtLC6!OU%EFS&0EmcE)Oe{V+6!Ibv)eR6MqZQc~`
ze>VT1_Jy-=&E)S@aP<{720aUSSz*ClS1g~pTJytY=lL~<RX;?mZ!bOBoqW6fAajp$
z${iVLJC=7WJ-fGwHFxK+ZEuphc<x8d39CS^vX0NvF7hYMBTs}()PJ-?@D2N8qe6=%
z2Y1Y{HddOq>!Z?vKXX}M+kP?4ocPT4#iZgN0yo&tHJnW<5&wC$>SPzg`fAJSv!$Vo
zzYf&q<ugxypynzO9eVFqB|{bSl={1ieC1!+&XWs?w-Kpbf3SRhm437I|8TMHyZ=RF
zOwW85QuqCSb;WZ9bvgI@TjKuA;W&81?_-0v;)}^<&%S)xlyFr~GjN+(>lTNAtFInD
zGnn@1k%jam=A7+E0#^sDv1Q%XFmdUPpOIWUqu1}<x<=IY<Y~(_)jPVU|60lM)_sfD
z@mv3|d2&aGs-DXWG`z9We@@0^|LoN_*qTFgW6kwfFMa0mo}a%t)^MYFvU+{BDw{gn
d_3(dO1`K%}zprF>ed_?#2cE8eF6*2UngG$*enkKP

literal 0
HcmV?d00001

diff --git a/static/images/onlineHome/yinnongIcon8.png b/static/images/onlineHome/yinnongIcon8.png
new file mode 100644
index 0000000000000000000000000000000000000000..5b9bdaaf2713ee89aa08ae3cf37ed8a680161b3a
GIT binary patch
literal 1598
zcmaJ>drT8|96uFMsUQv~zL@8s4kEO@mX@|_F|`lvXbV;xo!c0tJ>V?u9oNGa<`616
z5vB{E8wQO-bTScND5z}E;54{EG%{xjBON3<CRjEnWdp~q2)IASF1h<X^7(wepYJ1A
zl%U=e;J@4-0Du6+W~qi+BfalDKkEBN;r3b7vW%2z$*ou#Y1I)3AU0sB2&gdW(h&`!
zGvs8oAwmF{6NV;gNv%pL&|@aL&WoYjOgO~`0O1B3uG1S45==$XQL_kg-)M$F)F6VA
zI4Y(JmmnGF=3D~VnyXIK=Nk2V1GFI)6xsxofC(XWpv{zNwg_w@XhK&&?Y-9w2%LbB
zMiKPVlvb4hN-zQeIdpE69**XLF?>4Ajb^gBksyl+^BGJY17=4tVF8mX;KYEF4@5;H
z3~2(5R6ZGtI*FhRlEeiJhSh4NTiJAsNN2!&KBd88uvk$PBFd6uCUv$bvn6awL5f)P
z1d5X=W(K{Ax>PKi6hV~JmnoR=X<4&nvP@LL7&aZwfay$cN>f0U>i?l8(=^&bYLHic
z|5MnKn1dq>4PwEv2|d-gv@mZdTp%G39f=W%7?wFz#e@uu#4H&Y4zegqV0aR0Hegmu
z!~{X55-7|TQfJm93aJR9B<Lt=5Qtgwm}r;_v&38(49g^9xp<>Q#*g7j#XN}wW=(OW
zm_FNtn8_)w;T4xPBiB0%CY*{aMF?~!VvrM<37p7TfX?WJBcD-kl53dR3v)&;gEGVL
zcJ^PLp1PvO$Ge@LTk0@9`G}bscY>Ph3S~qP0L;Fqkcty+&Vh=H#^9{Qx80@2`|Q*m
z5eMe&+##DAH*QaTOL4D8t+wwu{NR-9MBVjky!}!3#ZHIp02C@HxA%ev_vX{9c;QZG
z;mv67V~>Lto40Q)?^@3bdVz2Rzt+9h)Bcmk(=+;_*H7#sHPw}Y#dWU6);?2UH&9VX
zX4(U`I&QaweB0Gu=;O}chHtZ06-REl$?fus9}Q`oo!sx^zOXiYSlnK<Iq6|(@7l)d
z%Z2NQ&!)7Ma?SuH`B}ducie0(=sophiF+taHk5o8ZEqOpa^LxTZkhN^k@A*1sbd+i
z(80eO^5yOE{JxZgrUqIp?ZX?pzKM4Q+Rg{RAD`3D4QEvk7O98g@%m5wKe%Tk@QrQY
z>m5*?tYB8x$wMA?yN`#v^u*<qhgGgauB(lY^4N}T$nHay`oYEsw{88Ln##|xh85Yy
zbz*)l?GNqZxEi-o>*xfJ4RVK8udtP!8ET1x&i$$LDZ5+Y*H7;_q0A1c3=I1swy89q
z_DCffK>dqWmPla#VU_PH&6x9kOS6X`uetuwy0<e*>g3OY$7s2O^R9{m${nYPf!V9h
zZ}P1zs3m&DZN<iN%~3+h*|kUrl-;?=NqCKYBsummpSQAWP0-ghr-YERtzyX|a?S9P
zkn)m|d-b>QiWR@_ktZ99E;$!|{$A$lImZ``+<_Jx?)=fUtJ5w*PXD?o`us_EXkWx=
z@tL@1qT{GEl%Jfwzq_?Q)R*R}wsl@Qr{t$SF=wy;*f+${z!TPvwnUHoyp;anyP)x$
z#&?_gept3#`+W+1mZMp9<4QzF>+^DJK+~1((g)>7TAnW$3!nQ-pU=|^we!(qpU|@2
zITy6$uBc}by?HPw(RKW&p(r>dw6gbL`|w}z{A!tG`#@gb&hf9F_&>!RyM31eIgxDN
T;eDBE?;l+uQ%mbMrr7@hr=o7_

literal 0
HcmV?d00001

diff --git a/static/images/onlineHome/yinnongIcon9.png b/static/images/onlineHome/yinnongIcon9.png
new file mode 100644
index 0000000000000000000000000000000000000000..380e541155e6ddd28a64850d85f2b0005cf30c2d
GIT binary patch
literal 1900
zcmaJ?XHXMq7>-?|AQHtIT@yj1q>?}aK>{HJOdtk45j`O!OOgv)$Sx+}iC{aGCLSO;
z3kWu_9Ad-DAVE>_R8UbY;HcO}!5dG{GI|>oy&uQz%<fm_d7k%q-|ziq*C->y9LN*M
zBofIXTqaQwqnG_1I+*xQUJ=)i7{=qFv3N9+gqzhSkR;Y3i69UTsdb<VRBO{x&Vd0W
z(g3<4CKiuX$b}jNVyNvHh6O?iHi;B4(}JosMi2)QL7f2>(YlY<(Ex*1M4QV~uoP$r
zs5i*cO<;6-WQ-==s1aysGXsGDi;xh2KwJ%2pkx>mT12$Zx<X=Z-)7Q)&k)=wqJ1$H
zt55<VhzSIE48FI9?c)dd3K(p@4~xt90yr$TfXVV>vbo+Ywvfda@_d1>4~>Xs(k2O2
z66x1i#7acd<2Wj0GR<Z)!^~wMCLNP45D*$1CWqrqAiS|O7*|`oVT|6ZAOSIr$$;Vp
z1P1Ji>O>?J7tsi(Us8b3Z?Z7<wM<08m=-n4WHVUylzM>*#s5Pg=o=ctRp58O|0#^c
zq@f^F1!735Nkbf565SpO6^58VHIA5K5G1*`ib_3#BbXjR0S;jaaGz^{wTKy;@tL4d
z2*Y6vSHl`GTq2?o5)6YuD<q1`3g!s795Fwb%?=F_`-ZUnf;lWdK2Pc^mGFAG5=4^<
zfiT|7)qdyt^vSjN0)!HgC7{W$2-HeV2n2l2S!n3n3%gIfuUu{4UO0VnnS>dp{bc`j
z(!E<m``D-7`j%LH>wFL<+TBF-^}f8$BI3GqgiFLRmiA_=LKZW7^jY1RD>UwCF3*Du
zT{&AmGN<tIaxYshm`$#<(dcMvdDPIgWMlO388s`HcvXcStCEqM<p)NtSP=}3D$I?W
zSCCZs_Fab`{m3(`b#aIM5C5K!?&ELn2)a*kKVdJZN5FZEbIw7$rqs~3^m?vx5d5)~
zKB?IK@Fra<aI?E2EUjh@<Izoz%MnP&!#TnsMT;m7lcOlvB@QmKwifZl4&|KSa!DF>
ze&NTL+X{!}7j1Eh+BmsUSv&N6k<mYZp}Qs6I$X8*R4etxfSKDC<+M`s=Cn6Nnr~bT
zU!6RqaM6Y?+pKyBrOL0Lc;vHd&@K6vpvOG{)su2Ec@dumJB3BHlkT#xY3mlgk1s7T
zj{key1I(z0)z9>I-MsT1TD6W98`d=YO(_`_6yMFhj}6FC^k33aD{URuwXkDu^_-){
zgBLE7KTH?JUXryffkt-zwXW-_V`ih66Fn7+nkn1*ai@G~+UjKAq?L`0cy&Qw&k4>w
zuzJ|&%*qK*eDYJOC;_^CQ?8Zdr^dR)TMsr#9jfE*L(khbd1^=OoblYiKX@R|V=vP0
zU3R?{jX0X{@L^f~0`|15V2}8$L!Ae%GPM}9Hn?=+tose78`SbrZh<>Yn&SE!qovd1
z%vMp^#8;PV;g&aYN>MFY7&P(m?8N63{d5np7e#lLUhPoTma9fqUoDXj-8lU2vgq^U
z;s^e;>Wy3FP21oS<5+jEKTDkA20B0a)KO-AyYOHpz5SX~@msHtUCIwTmd#TwojyiV
zzB+^CI59B6`x^Q5I|nko&Na&nWZ?Ogw&o<)!x0U)H{2=cdI#Un;I9HVmK{t5!)#`k
zldjoL9DbN})-K!F^+8KzYa{kvfk!NcY=4t`WSRw&8vS)(+37q-bGv(IHm%GVbn`s1
z&XFP2AJTf3WggLwxn&hFvYscX#yOU<W)HiNkoYnv-}-FEHlM1^g^_4R)*X576>;T)
z`L6Okr+emS%sqC5>FjZj?T*^Ui?`p~UA()_vSWe|e^kSPdS}xD?d~P#Q)csWjXzW|
zsm6-rM^SYr3(y;3^YOY@O^&|G!!<_#O4G*vdE<+B#|bx`|Jizae+K1TO+|yI>XLiu
zhuEr-Tbw)tM}xl%DN?NTz3O5}Dx^lLoLkmC?V)V{F;UksM(n?959&Gnx_3m4r5~rf
z=hynFZYkhVYx5>*+3m%$xCsr^<<h2Al}%%}KgGL9`&pM;spt(P_4lj|?>9#V9=|gv
zL)fW&?*d*>FFoXvjFPDt50;N;FUa}uh+@u;Af>dV<-T5D@j5KCAL*@#eJZ@`y43#v
N3lEKy><dm<_74Xq>XiTh

literal 0
HcmV?d00001

diff --git a/static/images/onlineHome/yinnongList1.png b/static/images/onlineHome/yinnongList1.png
new file mode 100644
index 0000000000000000000000000000000000000000..112c13420148aafa6d33fd6a41171d78e9a60065
GIT binary patch
literal 2328
zcmaJ@dpMN&9v}BhsdYI{X?L3@Dl%7>nR(Z&=3-pds2$fSwZ_bgG0nVV=EWGPri4O~
z&;^|~35Co-D;3eRxipk6M8&~Lv}jRyqCKP1?jN0fpXYslm*?~Od_UjIAMfF9KJF&Q
zR>lYf!o<^q!Pczyi?5-+=KF2pb}h}a8g>hUeW5TomMaAjR6Z06B0WXiaF7jh`EgM#
zpbG+_vtHmA1P8Ia0Ujj6a2GKcxk#d6BM>gGatW6w1Yu+-7%mV~P!o0aD5QW-K?ORo
za4ZQOj1YJzq@b_D$B(BF^2mIY>-R_(IiL{`fiM>-7ws0y067KqK^M^M7q77><Oc{W
zq@X^U3Sw<T(jh5`biz2Jd3Z+>l1RqjogHxw&h|(G4o}A7NLaiB8ixmP&VUmU`RPGv
zqDlE-0Gq-56iaiWpdw&c0${PRv9Xv~2Mi<)$KuIkjRpZrAfPn}v@A{xbLD8UZ2gh~
z1C;Tk0tqaD#K=WOZYUHDQ&1YGA5#!XSgg;&V%eucX-bBbb0t_j28R`i7W4XmmceZB
zPa9uE%lzUbAeIfvplB&i(~q$AOJq&${yxwmP~!$*K)h%XD26>56qM!$!x!)YXGaHy
z8wp1uP>BwByc?bB=Iq48lV~&|!Hr6Ha$4egie)fY%mbIWf<L*$zvTjSDaeH(sUHOG
zUh3Yq2ndE`5s(B)&=dl>DNrEhL$Na3#oB(d3Q7erAfG9PM92@t0R&$#K*lkMPDBQi
zKy{`rnx`=tWG0P7Amf-+8p#=l`o!gbA@Pq~H{Ac_Vl`&4i=F*Tr<blY<FmN^Jhz&|
z=g9}fnsJwE=Grj!>MI07FV&Ml^^^BJ<Oovy!ByYK!jsQy2fJ~RJp_x+uo@0SC#Um7
zR|73|%Mq{5Dv7bRZ4YioM$){giNy&{O^VW#GlaLb|FzZG)}Eod>kQSZqhYwHmNJn)
z?1)`EocAst+&kOYboa^4sl1u^nKQPzZS9rTrzWRI=qgOeMWe3tDhbPYs9m=}3s9mY
zt6mzs*Yj!+_wzz*aqC9fk~Yd?j3gT~hLeXAPW-qvO%J2rGpm)VBo17!+OXk1y@3|;
zHLf%H@>%(iTU&<?C0N+JJE*G4lw=x#EB^+en$JKTJBB!~G~W;O7k9{ZHu&^=bxZNA
z#*5nDz4R`a?)15e*s6V2D_*BytxoU?7ejB|NE4Zb0mY;+wuoysjObg#uTx%C`tG;v
zU-(Le+NUFoxHI|t1i~P_SoO%(qTS0Ys9F5;7<u}=Yuw%yueUB=n^9J;MOry~PzX#P
zR6p`aHnr@1$9|GeYPr~8-LsQDx0;l@_kNRXprKDW-Cdk`%;2WB)MZ@f`^zNv*~jkL
zH-cr9gvN6T`^*_Y%IotD^5}WA#Qd-@&T{q}`7J_g3U7Sik6lIPS-)gXydJXd-@Bu6
zqt29)>yqPv%i{cy+T9<VM2`E9>MK=fz=U?LbYYCCu-tf)DX2}Is75_4H&bThxx3>p
zxVx>WywSV=l8#}8E`~t+nd56QhaVt91G8FZNKbX=f3-%cObn;Cm#iB{FiUhhjrWv|
zXI_q3mX+L;*g0Qs7HaAGJmz_6`{9_grIYihkV8jGX!GVh|7tdO%mu0+W$DD+J$>c+
zZ<r*z%C<o{3w2v)DfD1f=9F};s~xL)=ll=L8J&MC*B(#Iw$dL56yx^MqJ#gnN^f|U
zw#w#BWrc%_qDY!x6KqnDx^q{~OGge^w`;U4pc)<O*m5tk$|0ToM;oPla(>~dI`nIk
zzIMH;>B?fGEb`M+rjF<Lq`Vz1$umvl-_IR9eH+k+(bZ{|+{tBaEhKg*)x!Sxh_POa
zeDeZuG`{%0!hhWV71Ow?cWOj(Em?T(R7-opxq;}U){L0ZOuJXm;L&`o&NZg*bIwG~
zl0&rqITm;dQ`&ss(j38v=NnYeLp*n=QJ1bv=3pltZ{M^0mkg`;mIEjEY%_SZqh7d+
z+%qmqSe816Bu75%BinILZ@8Y^b0s_ay6YP0v52^&jyYTV@)!Cp#P*B#PA^yY<rS)-
za$3!HdXI%P;rKDnBU`VZE>zd29nGAo4R~<}HXu#>wEQBK;QIt3R->aRS&5QNPWgRO
zAG@SR->@yUNTqzF>S&Cja60PQeolq>xhLUBVFWNC+Zr@~BLKX8(<^=OT9<!oV3)d(
zN)mC3I~6ON$`b3H1nS3~Su|?Rf_8L~IU}|^Mm@IMtgBQJv#I4sK<*_4Lp3y5!-_C}
z5WU`4;+_~doEANm(}CutItD$zHojp;WBiG!hpL>Nk#hrFX3nVU-niL{KzOhYIf}gC
zpPg?~>QS+Qy>p>;w)WH^pH&?EjrjC-e&js~F737ZWzG+!$g_8*&ZC*Z;Scf-@U0hk
zH&wmmUJpjE<wu1JXSARaQFgBPAdVl99Uglq_>B6t16}ZT%Y|h4S@Llo?1l7wnadPT
zW!*EIy|oE%$j?+W@ja_gHdORmHD!l=x1|PMHg~1jreQdV9(U_TE@xz8zq{F{2i!B{
z=`~I7M$?sE5Gd+;7D-2qR(N!BDhBeduIn$@<!=>6vjd`9SK8UUXehSpMA~@WdeFN1
ziN57ao3ndy?kD+mvs8jnevlDp+6?&2|CGt^tq8q3kCW*2zO{G%ap9rZq;81*8-c(3
z&9~KS;xU<w!fcMW{C9=R*mR1+?0WUBDuVn)(7Tbhu3GvC#pQ?-7SEx>i~lN~Za$21
ITF8O_0d#NQb^rhX

literal 0
HcmV?d00001

diff --git a/static/images/onlineHome/yinnongList10.png b/static/images/onlineHome/yinnongList10.png
new file mode 100644
index 0000000000000000000000000000000000000000..fb8b7b942496bc4fd2610677482fe44f191f214e
GIT binary patch
literal 1896
zcmaJ?dstIt7@rO?DO1S^1odz*RAM{3vhB#wv5T899I)I}B*u2wCTwThIk2Hp2#O+t
zp;ADYq@w1OQY<cEf+UJ4N|=dCYGz<&lovq7=uAQT!#dA%&i8)b^ZUK;@4bA_$yG$n
zAMY{6gG3^Ymq|r2#2V~+UvVeC)7C5*MJztJSdGV`Nw{5OLr4N0nuq{0lSYrkAR1k|
zwFL<!k;nl?r5abuBVjFSqH0_is>5U<*d$WuT!%%YO-67a5z!mXe6aVMqaa|^@j(?^
zPLo@Nh`}gbVMAh9L@Bi^lC?Y?I5!Lkb-;uJ6M}01hbhI3!45w7)Gtifu44!Uo<i_s
zKKM+OTCM<us0{(w)DVi6&f)?b9+e)#qA^2)0S1lEgJ@ic&ZN-jFf9aTbAaIoB%;}L
zNpOrvG8~K8@j(NQTVM#X+wD|4lZx8(5S_;(d@vvegF+xESh^Y4I4EW;V8nw6!L&A`
z1vjE*z~xbsh^FFvkWl(81(QWCf9}|f4Ht?i8RXDdAUc%>nM|&{o}w{426-XlrD#l<
zZb6_J1VdA8TB09G0V8ChcK;v91tiqKB2=4dLd>{K#0QBJs?Ml`=^TkfLg%m;0uGB#
z7YhY!5mzFiF$kL}<VeCtxH2<_Ys^|?gll}kW&ST07TOREj@pzcnljQog#pD;%z#<|
z22luLmda?>p>}MxtG2^Z5t}g$(MfEm33yr@*!U6wT$+dzBH(fuf{<{R_;3-2DH1b;
ztnhH2NXQ|?KjZ3NlK3!}`=4Bh5Cge7`>#%q91-K=GM~>av3WlEh?y978!^{8G~PPm
zx?Glt1WL!H^Ce5A%IL{Cn{KFQFJC=d9Jsrryel{#4BBwad`@^i;=V$0Q79VI`JiH2
z-3{$|;kh&A)3Q7d^tdC)Vx4m9hltNI`fl3P6A?o@QkNg>?Dq5NE-Ud`#a+2QqiwLN
z|I+RKU*$U~$xK#=UmV$bI?dAfW%aw|e)qkfa2~Zy9B{A93IOK4HR#1z<u>LNxh&ZC
z7vI9_&IEGtgej4Y<c1|Q4?NTVl-wzpBpv-;Bk$a<jXs7NeN%&pmgTl5d&!4-tO;yB
z+%?#mES^qT=FwA-*<g-;vN*x7zrBhR)9pX@ARIv|st0$U{V4%7EnM3Z;~BavZm^|b
z8v2(rRxqWyYF?m2Uz4m_bB%TMkaJ<?gN8k|h0O=tW{R(pnlkP=^QrBxdsyM*j?;CQ
z16AM5-zMAR6T#S#5_V&5mHN$kb*_|7aroAJ2hBX>)jHLi{PkNYH_x^<c(Ez#*^OvX
z-}~o$TB+8_!H4tW_Fao#H@0sDQ0E@}Wu9jY-f&&>9xL7Ho3@zQ@j-?<C%>Yse(90Y
zd!e2wZLHkNMPrVR<z1mFJneIC|17%tYX9ErX(vxuA-~IR@26ku_?~Yw=JZ;3)R*Yt
zlRq@6t+C9<C^*C?7p(N=FRuY%Z+-Nd-PZV&DHTO~w7~B-w?u3_xOdj?m)Z}hW(<r{
z?~F5y*&?79kEYhmD4$qno0Wh$QpbK0oyBdI<<$D#N*%a(v$M2eZL<6H36UL>-S9hJ
z-s76H-)1#^@i3A7<KOY#$9t=S*Y9_`qS}}D*){(>c1@-8&)I()A1~Qh{@|{x-QKP`
zJ*oBZ{J5Ud3(}IZKk^sdDeQs0I)ff9xG4XPm1u;H96oiS-nJ>Q?`l#zXVdYLMQ636
zqi$7P{zFq2aQrcEgCTuAL$#|UjJ>*7d3RyyEk;{x0Hu!#tz3_77L;0X3)VG&l}YO2
z_h$9~N$$)2Hs#}_8fj$IN5_j(Za#hk9~WBmc6aTOozq(ix2(mMZ{62s2^?D1R*_be
zr#VpeG5nn=acyzC<WufF#kRpG*+JYHVXE4i>(VQu<U<Dk;;3-@Z$Sly&Kdbjf7x(W
zDUE!$vU+|5?aov<x_XZDlh5lPo(yw}4b|&*%sEywbFU<~d|g%(Z=C%8JL9CEbAxPi
z9)6~>9QvzwRq3LB+6g`5(NGJuu(9w$=JveMj@p@7`m*dai6yqVDszGVKtWPm-o!!o
zE9b?z9@KfUqBj*i$M*l~(U@V~qH}gVBA+I0k4ww$3)|SD@N_f<z0R?CR2O8tv+ef&
qPhZJ7*q!06f)ek&(Up01^lPLuy+<MY=IFbwf1gYoC8`Wh$odBg5BUZF

literal 0
HcmV?d00001

diff --git a/static/images/onlineHome/yinnongList2.png b/static/images/onlineHome/yinnongList2.png
new file mode 100644
index 0000000000000000000000000000000000000000..b8ca38ba926cadb3f917fa3d64b77ac616bbbae2
GIT binary patch
literal 2042
zcmaJ?c~lek8V$0PAWI{Q3#j9;K7ni`gp3KAkkF(ODiIMx(2xuevyu!DC}OQa%3`Gy
z541)45TR8lvb>@V;1UjX!#+{0RH-&#6(tl<EO;#XCKhb}@O93a`7P((``vFjXNopO
zzvJYv!U2Q9IPrNLA-V=xUVA(AyGp;!3SE{X+<0WODiz5VX<!UXqDp}QzCx4+3t^EY
zC*vZ_z+kMsrLplyydVk^s}y*V1%uZq)F>N+VXW7wMPeC@04Z>qRLKM<I?sTBRKf(e
zQUyeTIs#6Y@^Urs=G^F5ajr~Emw@ZT0fr7j1r#tM0(1(wQVZ#r;457S-CM2+An*!;
z$e7@trs4&gfC!Za2B`SZU@?gj2GHnuQYeKO5*h@Mi6lCK7)Bt41QSURF%+WGfcXbR
zqiH0mkdPBO9}7J(!E^*sLj*#0b~Zjc1h3Mh5lD18szD}@$-yWhSev6nM7m(5)_XyL
z18c<^sTz^0lz>H1l%mQ+m>}x(&lD7Df#9{UQafKLv}6RGNKGK&i3EkhlGiJ=77@aK
z*?1#b8=Iqs2|`$_%G8L_ex!OYkkQ)xb07;4bpvr!;!FjsMED#gh~D5OQVB$(MUXj>
zG!B_X3n7uX5n*gDg+=9t5ZP=tkxgPRaQR9tB2tRs1+MfjZp1%wp$H8uLR6Yql}f(Q
zy-n#VM5RqvsR1%t2q0jqR4GwqYyV}b?Yvc3Bh7*(ks6f(cvT!o`UV4Gp+qtzl0+o4
zLOB-mbPk=w<`6k_I)zH%a*5zPSMr9$=eeZ+%O#*@2$s(Nt<wuv==fN+ujdv$yq<hm
ziH^Gloof@}OgRQ)qu_H`vASD*35h(nm}PfXsu~+)2|{Kpr{U>9gqu&X`)5ddd4K^-
z8U?xin{Dk9SOC_RRaxj@kXAgqy78%`n}fI;cG#~y8I%<KP2BiPljkhG&)jD&?VOu5
znXB8|?>>95?&Ytes{;a`a9c<8Tl9`Q@|r5ur7i!Jv)g*D8*rMusrFc7Rk|ys<gMxF
z!!ql*>L$j}S6$5~^*8ly2kjp}*@%s>G3C?rTXv884NVU=QuT9L{xauP=ECp0I@tc7
zQVU&XTo#GW95Lk+u#FzTz>?yi`&WFt{3M2?q_)cwdwe9W9k><tUpRUhXVUh{eMLvU
zSdEOC3a?VnKZ5nkFU`go8KqiD&MM#P-h#<pM%DI^W3DOU2H?2O<adW#&VA!Ew8R+~
zz1YS5Y@;Fjona_yu=E+$x9NO8vHALjpo40gFMl#%4<zf|PU=6~<RP-HwVoMlOw&^!
z;BZEfU!QQ6uXC7q_z>b%dEcL!OYIwDEsNsCC-QhpGCz2f^Yg%9Vp)L8nG(}Fub5kQ
z*L(VhM?j;m(Z2V6zM5lmV=$2P;-i+pm~#6y`}nunUwa>|GmJRuez<JxIp7n9d<#0{
z^)xmwEdpIV+nq)j6V9iXjwOEU^N07PWiMwXoPzCd^WAS$uEv2bBP=)8`$6{kt>ql7
zLsj&?saB7<%G;W27xs3!6bsh&Nc@KMg^pEG<n|K%E+aAHglo-oQAKrdxOPf=HHGx6
z&b1-XVG-TVK0q6CsG_>$IrKY7AAP7RB!^%8cMUJ5t43)osFm{SXXIU%^2>;~e4t#;
z`LlaED>A&FD>uK}B`u*e>98gz(+P4Bwrhh_=lQrObwoUB_3Y|VTYY#{P?O88{Dz_`
zs9^Fe5R&orijS4&KCUmBW?V{TJP?FdwBV+0e`Vg+Z>W&OkK9bMx`vCXxVfh8CuW*`
z&qka)s`Go>>+Y>P56e#vbf>m#yHk6xx7*PT$|A=(-RoUky<t}VsX4FgN{nX1X#;=G
zuW+xI`2?=PVdaYt_ixP|x_=X7*txeAM6N9M;BIZl&h+~2e2)-0?m799*=oSETwb|6
zp>benv4B<*(t%tUX?p8t2i5R+vE!YHcWdKiSm(5{UmhlZQvTh4x|-#0`^OzL@={s9
zB{w8ek7soa>}|R3bMIVv)yA+1ZGQR12TQjUr+o?RPt3ZJwL@mJO@=#G$?V3|UdBtq
z`_~`Sb-1p%@+0m8*OeW0Z8EnE$mytOMfeXFoN+&{tx@#$9~ysB93L7@-DOg;3|{4=
zb>?*i`wj)g?8)PvA0AcvdKg8cl_S%uS)cFuqm8w6cSXx~Y!X4R_9RR3$?Va``zI-5
zryLjeGq2<(5g3iMdf&3DCy(w9-%ZXkFS^!R6Lo61vmm)ySaze1Rm9JBr5RT&;TN#+
zpy9C<;#seBvFQ$TyvN?{WI8VV#Xs=#;1@fh37L)T-yaEoyPH{;KyVS3%KeX=6UvS6
hopR23YW>n?8Rh_gc0BXmi+ao7n9q&oG_!Yp_&@nUI6(ja

literal 0
HcmV?d00001

diff --git a/static/images/onlineHome/yinnongList3.png b/static/images/onlineHome/yinnongList3.png
new file mode 100644
index 0000000000000000000000000000000000000000..a7709fa1ff28aa9fc3aee561cbb93df0e54ae096
GIT binary patch
literal 2119
zcmaJ@eK=J49-l=cmZJ6r>6#rPZRX9qnAsV{%qZktNXWb#49%P|b1>3kBl1?PmncI?
z>uw}$Ohgfh>~*7Uy(AI$5x4BPtHlcUOiO$J=<a!*bAI37@A-Vb-_Q5uJm;jjyB^Th
zHqu5Q5W0>BS)TB^S9Nbj!q2}Y`+o#4h7j8i@&ZGk7>)!$*zrLwfN~UaLIF>J!;g*Z
z2IvTcx~ah15At(4MB{-%3`d2*$b@2;jX==%$;2F91OTD9K&U{(K>u?4E*d4^Gtj;y
z7o3Zj34{p_o{#`uCtSUGCn9)MK6;-miY}wU4uk;2LCJ*2MN*oKfqv(g2HUD*EE@F=
z0!1*;e~9vPaYr#h34kJD$W}Z&(FR4KV(?@l&YHXzMZn>ySey+OZ*7Ic({N-OiGo_c
z&~P*fKZNGVa#)WA?-=MX2olq<*qE3YOpG-Kl!RjOR4VL)fF%&DV1$)4Rs?ZmRwAkC
zh6ffP<w*o$NC1jZDvum47zHuVu+l$L5Q<$~-a8ga*9!%g3@hV^v3Lv)D-^2odWV)m
zp1_|nK8Tij$BF^0Cm;o*Bs{nuA*LH-xORUXNCkw|&{!ZZN(hJ`M-~GOpJ4a`KF!*J
zg12GXPzZJuA|B6%EtUh7NMW<dWCD>zByVsXMN)_(;sG06!Jl06Uvg<o3BZ9si8lxy
z-{_uu7zlyVFi?ylz=c5V_7#ZuV2spKRoiu`fJ6`t@Es(e5cRG&G{FZ1P)RDeOnX>>
zwMsnIfsD7q+u)gG8v?<egh#J)`5#Dpoy+{cTr4aGtLp6kbb8|m9v_wYes1B-`^g7H
z@VHChx&HRnmt_cqMw27U&RaJ8W07u{5Aex@UzTSl<mue8fr3)&`<JbEI0?#s+}d^H
zUQyA*etkO+L!WdO%Q8MO-7`M<w3i;sBP>5GKA9|MhCa3pDe4>!$vk|MT38(dt|hH~
z9O|}k=k`L&)6t!abEC^6zm87P7fPn+Q*;XPuCfF;Xj`aTx8FohZOw?L@4ngR$Xxdp
z<=!yza63wSrj_Kbu_gR;HbJ&$P`mTQtNEi!aWV2aqMb1lqy{ERe>=kpQmgpdAi_fd
z8h3{Lj`QKG?M6CJni=ww0#o|qm5gI9dFsoWI%@yU8@0vtRJ6rqN+T=%v+W1Ae{S5W
zP&}%cE;DGpf2)lvMmeNDw!@qYmDFJ4h(0uVS?|707r8Hcjy}KMJJ6FG7eFco+x>E;
zT93^Hj7;nJO_r5v6r9?&T<<CR1`y7_!7n<<-Eu5O0!abCDf2p9%#$QddG{;Kt2D2U
zSu{A87il1k7Q!^#5|LY10yk0VvzVQ$x}HPXGjmVU6V4%bw9%i~=5=g~O{%oZe{csq
zbBp>)PqXD=RJLYGPWPDIv60u7y*YbKR&Lf=4ryZ!bnQ>6^gzi6!fk3KO?JUr;WY+S
z-M5H`VPi)=e@0KKGEF1MHZSUz&%I?R?<55w)f2wc7B0<28*K?zih(MjGMs6V%CYpS
zzp5E~&rWC6=p^^15b;&)TVgvuA*!Y0%pQ5T_+y!VbHvS_YcYA1g#|4E<wo0q8moxL
z{cp>Lq4>U5E#K^}-E*j{Gve{@zq_%8XNH@orx*GTm6}mwTED2iuv4UTuZ9>W%TrT%
z%|*j!qtoJTGqZNJw5iMIk^#e@k4iKd)7w1IvpD;InZ+Cl^lSd?MLjZvJ3#A6Rp?tR
zZOI&uH2k41I`@+EuZPU%^-~(NbDYk4tLJwAtl^rNn})m9dU+)BKMMm{4T@H^^J#;Z
zBNzXPSiA1lv3)i3i=OJfS1YF!he?4~!aL1AE2?N@XX}|@O#Or0k-nXU#ac%%xb)$h
zeB+)so9fKI=AJxHl3nbHJb$L$wJzoRNyaP#y4L2obAFthzjXJh!<(n2k&3ijm(fvX
zmD7wN{!n1WG8wm=(GxuM)x~kiYhT`0dr49wrs>m>2Q}=5qf@tEj!y2MAS@c>ekwJg
zJmFwpXk0m!E2`~_P6vA(7wq-U4>~n>MZaL%qP64@r(pHP#b<**cU&v0`;x6?nK8;I
z6_1yB{evHBy?C85A^vG9cvtd@PEZ=BstaYlLbyCSC*b|`ipZ8z;+h?eECL(a>y3O2
zqy2hts}}Vm#>&D6cV@3m<l&r+<zmGyeRKNo;J(5s*Gnc-gp3_J=7glj%lhXetwBEi
zLNDjSWnKea(BW*c)cUBA`|Nq`$h~h~y7B9V^Cbs%XUtxyoYoc2llsC}PG7ROjq5HE
z=G4yB%4_S+UUe(HTUQz#FzuvI?Ugy#mRm?UEn}1YS>I9z`PDUb!B)Qd2ly9O<gT{c
zFd4l5vx?@gLmm<G9h;9Wxg+&_-V8aFQvRL^zgag<&MqFzlV!QxK5SfIuyi$Qt#ZP&
z%Ba6;Euo=)Z6P*M{QD+FlYfBy_2a-wZ(8G#<<$f=9r%A>kx@5UJgEA#JF;C_)%L-s
F{tHc&do2I}

literal 0
HcmV?d00001

diff --git a/static/images/onlineHome/yinnongList4.png b/static/images/onlineHome/yinnongList4.png
new file mode 100644
index 0000000000000000000000000000000000000000..69e7dbf3cf4fbc2707a9d6f10ed0cd8f7ff36ecf
GIT binary patch
literal 1893
zcmaJ?X;c&E8V*HV5NKsdl!_e(WGl&J60(*kAxjCD1dL%*>m?);lE!30GC~9jhEfY!
zkG6;kdT|45uU>`gT0O`TQfgZeut!pA73w9>QWfh_FRg`65Nv<g&N(yR_r2$N-uHQz
z?@VQ?>`h<qU~d9};44WK%JDVE{m!3@f0vc7^}v@Um?#rlgKDq>r5Pdc)o2a^NDRtc
zM2;xcoAa(BaRh>As7{fIWlEE|D%3zxx-k^1!GyC3gt%2!lTxKeFdzrX)fsu<{mU&N
zpi}d}42F~{H3<-{F0s&ztSOW!RE2sKM-8r83B*~sxB~-%DFLftqtU{(^1x}oTzu~~
zLm)5>!Sp=vnW#)@Dj-132*98)$tpOO4X`*Am>El@Gh+Z673M%xHU!hjRG3R;av3aO
z<^l0&X0?VZ7m8<M;U^xb#V`{Wf(i->C<Sy1YR-jV4hQ!^gJ?7|jv!k$8!@GoY_x>V
zdJrNOm04%Pbf^(<dsOD2n=l@TD}9!N!6cPFcWkuG6bdgHWL26Vm_mgN26tZ5XbUDs
z{*duPv_-Mmgg|n{f^IUa@P24QXUTZ&{yvZ!h^yfWQPm~`V#Fju9*A2gYMq+P7bVbO
zIxM2`S#%f{3D_JOED%y-g<_Z?h=m!mT#3<wDUB**maF@NEBsq7S71hz7;09a=*HRZ
zrD{<OwP;ZjK*I|GL}uuWYP7%-<*x0FRK%>yN7Q07Y5=B-!_~b=0G-2x#e6Z1&lI@D
zb66sVKuBW<7)*|U9V-H7xat=rKFv*_{v{W}#X#=P{;AWmCVYI{+vjtOAD&M>V#LSY
zjL-F{+TeElx;Q05zQQ{2b<MiOpw)p}N3<c3BrEVpgP3$VzV|%<Tpqo=a5Oxq`TuIn
z_A~!d_9DKxVu^xCoB%|8QsHP4FER-EsQSaziIobCZtWgd!`af_(!p2gcW%+E>WIY$
zESkqZ{dVoE0sZN7J0W=N=wWSWyys${Q?@hNi}rbc_OSTk)lKBVkmGZ!5BbE=me!^S
z8t1RiwW?CSxh)xg^w0TqFKuuhxbM|<Xi@RV{pH0!mfimT5(JO}k9#kxciyXa<b7J{
zGj2OQ`MzYz-Wo;?iJ7AV_KXZa1TsC+%Z^<sFORBt%g?p$K)}>pk4ND-j*_x#gDWFn
z(zh;d^!R$txvI&7wy+Cjs@4aG`ftgCCln&>vWgy)oq44xun`)y#zmgXdu_$uaU14c
z6)~}+{f$=0zbz%={5*wi`%_*w*cZ8wXd8a#><`!ym|{!AnsXNR_tjxj1C#*!b_q#-
z476%jjaBA>Rwmo??N3i8&FB8xKYwX$$IyvEa%YiG{=13Q)yCJ^8+-Fu5uLs-JBTo4
ze^v--KPx?j-6cNR)-l4Z3V~ue#V0dq7d!K$UZiNh-6J;V>g<+;H?mUC?^_^S9vyx<
z>WhZK6~TtRH49`tqw)T=Llm#E4_JN4rhkd&bw$^ty_SBW_k3G&BbIvD*%s6@EFYKd
zSlOK=z0~DR`iJ)0AKL2mX-iLU<81w8Few}iA(C3=S=u6Ywy%Zh%-4$u^0cJ--t2(P
z*6}sh+Rya3G&h|wyB4@ix)O)_c!zXRu)k){hVH?n8}{`V_NT?q+1VVnA(Q=9j4hzC
z$`K#dsn6Zen;mW?JH3uY`CxmmWVjN3^4sO8{;K<bb19}H{a)+8-(s&hxFqgfMzYH;
z@6y-%OR6KA21NU~B2r&ds9#5Lve&(eK^5h<#`vQKvkAP@dc?l?{LOt~33=NL*MB`K
zls5?-`40|*7g@Wvr3Q_y-q?TF(GK%f@%He})TZLC{EzQU2*<}t)@QBze9PtX2Q3q(
z#07g67wsR;?~7lU{*BMgxx|M>UI9M_zkg>3veh+`8`$#Y6+vw2g`Yh*#F)yY{GRJ2
z-QOJ!@SBs8?qqyn8uM>R=6SkC9`^+_)~#rf4b|u^lSKC28!I}x>6Mfry>Hkr|9w<i
zF-g7$mgZj7)IDu@#rdBnc`t|7HDsLZV!zrvKD6aKc=GA1XZKRz@=n#o?GK;GWEs2g
z&Q3)r9!F#L+KSJI*4*-2HgMK=cUp;~<V^E6f6a{!gn97M?Ko;cvf4#_(r+JC50e$w
n-&3DBbbu9B)MkkGoFZluI(A<#a3w^gx_^8UkxY0hA-n8%h865O

literal 0
HcmV?d00001

diff --git a/static/images/onlineHome/yinnongList5.png b/static/images/onlineHome/yinnongList5.png
new file mode 100644
index 0000000000000000000000000000000000000000..c2788cbe398b83ddb59cb7344d30409eeaf67a94
GIT binary patch
literal 1904
zcmaJ?dstIt7$5gGB!NbNiXIP5DaWp`vB3sxXG5H`i3=xQ$97-~wllT^n_RjeAqF_$
z0S(0q6k<Lmilm5wWJVa6&I|-IGkg#<Np2;D*%^ZMhjpIkobUVI=l6Tx-+TF<vqQEj
z#)B}AfWzTDVwXd4*h;p)FS%mhg?R}M*y4|h6zCcx2{kK?FfLk+B*H+fPMHkH!AkYk
zv`cUV4(Al8l`Bw%bR}1X=qO4%hGNkfFg6Ys5os|fRVgqEB*MvBJrDf#?0FE-s(Ikr
zP$^An5W*Vm@=PPVCUccsm6@XAsKH1+5MkkB4s<Z81T4B#y@_k#fzy7u*xqiYg1|Hc
zP2qvhL@A^)K!_M&Ae6!iR?$Pk05*q0XNAz1EHc2L(K%FF7?sWprqQ`H7B`d)%se0#
z&8SY|#zEqlSlEdNYEaa`rBcmiGsVoLAjV`Wox{O=FsKYhFop;=ZPlYnOR(M)IO_p|
zO)8_-fNBvvVE3p@MAA_nh$(%Rg3ch7K6k7)%@hhN8P%dRQ0WvJRj0G(HH|i*aqvGf
zUWhiyw;Et-9Be|;jVi1kNrAIutakq&$PUERa3MsMu7mYxEW`sb3q`F}bA{1N2A#nQ
zWkj=?bh=0=fP~RP29qJAg|Y-RcE~I@R&PR;dKEm&)&9c``Cl$qXoQt0Vw59D>TLI9
z8U#g58pHrFutESqYqfecVm7^QukDOf*r?5b)nX%}1E!0^)xJOgJDMS6g@rO1(JW|M
zJcA8!#2i|*SRfRMp)hcUtA0V^Gh9ske{iXo7^=Oq|LXLt2^$~#_W9gmhv$<I>#=b+
zVsrhI%x5unUHW68Xt|}YYu)<g#MOTLH?Hkjd6`gN)8Outw|e!Yr;j)nDpf+nQl+PS
zu8#=u8TWJ+OvqaOh%IuWD8rT+H0TQZmH>^p0x4@WUi<d&Z%@WOs$M=hTofLD){UPr
z&{bJ^<>}P!Ul--X?CJEd#_%7xJQAJxYkr3d#WBlzrFBx$GWe!vbw<=Cxi0O=Yo5-G
z8esQ>Q;q>K>se%J$ep^j*8uk$E>+(hGdo7=B9;bpxGp^Wi4z{Es$Fmochhoi`+2wb
zceEw6Ms`gq6ZjpbG4le0(?{UaR_DhC{N|Fnu8ESzx*U4;_<56pX+7Jp(63XQR{un?
ze(y`WEzZ|*x4x-T40#*4-IsyyJqn((uHGLwChgu>L+p^B3fe!C*L_aX;2PYzt(%|J
z?>`ac|Jjt=AQLZ<v+05y%KGq{eeRPvZ4q166lEm`WrG7J9p~g{&mB8n@}owzuXbc=
z{EXgO`1N+%kAA?Nu{M41<%<spw-wH#jVasOMs55XUEbRVe<=I2z3IK7xLQBo`x=)+
zj@1@?%(4@U{HuEw>>BWmIuQ@GIu!<#6o-+>q>Lpcu18(FZ)BHFrG3!1p`daxvA(_-
zYLbmjIPSf&p?aTW^gtw`fnS&BR^ETSvPoC8?3)(eQQ6|t*9vbd@80yUXnQOE2uEL*
zF4?r-A^*LeIbkP;Gycd9%1_!E^~-gO)Z(9$?R9cRYcctn_;M=kAdfU9^SayHxFO`)
z&)@-~jr9Aikv)%;TdKV^TCyis+xxy))KBPjDJgS1w<Ptd&mrwY>E5!RkDPghL+D-C
zc&c>Hg`~8ggO7&qow}X4xHq<9$(S{kReqFQdWHDgtB0MMi4LR-bpo#_hh|AYk7V1>
z^1fzU-X_=h*YAB5C?}^?1ous3UH9AXwaW@dlGUGD!-Fb6X0I3-3ID!b@41Wr(D^iP
zWzCme^NKeFGEDf|I_t#`QmG9Wv+D7knw{4Om2}X1V&8l!p^1ooo;q*BR#)(NN#TP7
zUg%rLjUAE;zNs2`q#rDt1P`@TZ1NsHSkxG2u7nn4ah4U|y#KjG?vT80=t9EDtsC*p
zgfez{TgvwEb1TJHTfp(1q@#m{`EuKrwsz+vx9|G;*N`O8eB`h%IQ4Kvy8GTg%uE`)
zBH<H7|2qwt%>{QJ`ZZ?O-TuPtP>(miK_6gF7C}v$Ip50mwCBw&Pnm3A`t&OPjfRl$
z_+6HysXrsPeUbMrA!uzg{&dIC<{i1O)+X@XBCVpPeD;xBf=^4UY`Gua@a!br@Aa7D
zcPSuoB0a-BhSd4Cf6t*T$XM{0P=0uHtRCltd-JQiqD!=kY4(3$tY{T<Ot2;QZxVy?
A`~Uy|

literal 0
HcmV?d00001

diff --git a/static/images/onlineHome/yinnongList6.png b/static/images/onlineHome/yinnongList6.png
new file mode 100644
index 0000000000000000000000000000000000000000..3e6cc31f59359568a6e047988acfb70c2d7c1c9d
GIT binary patch
literal 1852
zcmaJ?X;c$e6b^zwQ7TGP(4bD^hDwr2LRJYHm;_Kl5u#8w4Ve)VNG4<k31S5S71>03
z#04uYdH^Zlf{H6b6_9`nD4<d;h$2>xTivRnogip`Sm&IX_uf6<ckg$XcV?r%pO>x8
zBpVWmWb5M%1rV!?>9w{bzEjde%!p+oE(yj1(G_@tLXVKdFdB&fJ{m<75`ZY+#JFa}
zjYKk^rjiHa!7^W=64lTZCJf!6(GhGC$!)$tr%=WqI1q_Msk9>MqZ6m8fC?5-gE%r!
zrt?IiRo<)gNZ=|zxpGyEQUFuuy8~_pA>lxS;0nN?iPd64gNQohS4iwlW(E})g5WVC
z>IYH5GJn7m)gu6h&ZQ}tu6%$epfkCyAe-v~ut27O0rDA4HVtG7L9UR)1BM?e5ls)T
z5C%Zf;aJ2;M2*IAoshvuNJyY3u<58iiop~J2p=p4i$x<4G%QhzD-1L(Hf_WMgkVa&
zN{6dZEnxDfh(zOY5tUH-Aq9<2Cj01EiwzfwC>g_`&@q^FkfG6-@)|;8cmVQA#%Ix(
zJW+=*0uT(1*DHyBte7@JCTjQPKqereMhKzGcnzY(eIOB)u+U)@EQG|aVh$e?u*5tz
zlPU2ONIdv_P%7Z^q<k&}d5my<v>2|?Dv=Sc>Jyj$MXu0Ok0@|dFGtbXk?#3Nqd1C1
zqdI^^6asJ#QfXl{0h?{A?XXltuUd(~Qa!2xhKeIpeMSJ2C18rhpeIYrg@(k7L5V=j
z=d#&iE>FytQir+lXA&RgLjTKU5Mmgn&i<#<BPL>eOxurhOB_B<KB6VYT~Ew)(vjN$
zab5QLKw`P!dh2$T_mahSO^;5{+bn5E@-sCrel5<<@D6dNxf~vClUi2SUh#`HI}<2#
zKeXWf2H)tl#nkR4&KcQ859={4#<J+@2Wg|*c3n?a)5l(ZezUap&bwZ#M=p<Q;~wr5
zV7aw#Z{)1cYOfCiN8u!ybom|gW#Sq9uNMA1(@U5wSxe1Rq)R>PN9l4WKkL@!-+P=g
z?>pC}>TjLVy&Gy$r*{O|Mx<D;$ysZ+&Y=NL2BBx0EDIfj(&nYbm!sqPli-VVGb>4w
z`Blr>W9!bs9jDJU1V6p7GVc~R%l3iApi}=hse{Jt_JbRH-OGP8_IeGxAp_&W%y!52
z`>&jB7GntKuM6C)ZhE79%qZkz3w>;h!(-W{^7FhfC!nKeQ@xCPuTs!v9w<4%<4?ct
zb%nABi%WS|*;ufLlN?{<`FndLm=`qY(N@%ib?-Sxs?>$}n=kmfrezD;#^6^-wjLMg
z2<vwpiBOEY6n?T(eKY-dV*Qy7^{x)34|*@os(ZVDQsK}Lvo#7{8~0X3b@07)U_yk!
zy`=Td4~MlAjTd?n%0=dGI_sj4&BrGR++0q<yQe|9Q~zki22Lo$V*k0=W3fN%Ir&hp
zZ9l7$eC?^-$%CQz-*xujjmNp?3MPSG6t^u|cb(59shdJySj?S%J*}E+U!-Raj$J)I
z&e5f<>e~3RqpFXU<sY|*Jl7NJ{@StJBa|ZD*IspWOho{K7BrJ<uRH-MF)9wf^7V@R
z`UB+wEie4v_Lo(M@7%kv)+RS-Us(j%x2>dHa9^}-#$UJli+Q;Nc8+;<>+B|Py_uTT
zbL{l!5IEzM#H!`|oUyYhu@<3DejGCzW3a=9Ykas3N<M4!?>O_WY|PbJnLCl?{NOpA
zmm)58%(eV}u_BHnf6}(*l;fi3nf0QEyA<_<l2=ZB<g~dBcUN;}cE9w9w~oK8p@-Y&
zBzM(xUAx@8l-$@?b29SrpTd*`n(=wx#6|Np>K*&nTijzhHqN*|?%|uSFJSL?cRG1c
z(qeJjuH&b+z3fSw8n3Um<fZR-FN<ktz8O`nTwH9GH8rtKv%|@&V8FoY^lWS&l<tg9
z<|a06E`HPFHw7%ng_`8cwlsI|mb;V|WrGvddYe5hg|+I6yiu=N=%(h#6u%0GSN;7t
zN7XhZ6~9#llPwFXQdu#hOR(sH_u{h@Zr2NiT{s6e=JeTbO=_6ZI^kJ~S4fm>d!PHk
t(m+F@@2$|Sx(rrVxXv={C-Y<rN0LwdAt$Sab)BaFnUBN|s`6N#`Y(+l-v0mq

literal 0
HcmV?d00001

diff --git a/static/images/onlineHome/yinnongList7.png b/static/images/onlineHome/yinnongList7.png
new file mode 100644
index 0000000000000000000000000000000000000000..6001b7071bc73299a9cd206e8543e2a621246763
GIT binary patch
literal 1744
zcmaJ?X;2eq7>)+zw16U125?!V%9RVqRRV+@5F|iDsPRrr76_1RNH!*c%1BUY=`gmI
zRspNXpf-XcQVJ-dRD?<^m4b>XmaFKXQM`s?72A!1_J?(6cE9g?=Xu`ud5>@Qv*g6s
zMGl@07z}0+FODrh*I?^ww-EjM>{vGsU6vsn5t0I@Av%c~!Z2m<76{-eB<YX<lE@4>
zm!Jp?2J0smiVzV$fi8s=IEfX5(<@Xc8-t06(yJuWEC>O%K<RQN1Drf_4g};f2Dm1i
zPvEOqP=-7%R}H1)CJLpwSyGw|jEV#z^mNpL0zxE!UXiWT(De-PrC&O_x0>-F@DhS#
zF~C=%MEqoc1*;(-97hh362qtfg@z-N!w8||V1Ps*((nW-o){WJAkqnBdN>7`eLyst
zT9!r^u(`9b&=Uj9KoAujkJssRI9(_XR;S~MG#cuIgeQ?gP(+BvphP745T(X%&I23L
zNY!!`B8QcL)uUt!tVI|gs`OO~3KgIK+ObkITPU<-c)di0C*lZrg~FQGOSA?NKyPHc
z6|E5(R1jVOX<)5diuNPTZ;p)C?%jc`KvWH#4NJ8ONQv;+3=p;8WO5muLuH21xLhiU
zNeLwqIV>iNK;e?ZI5AWjix3vdnd9=58bqR$LUUaC8!qLYTslh)Nf1~qgyHPD?j>iy
z2&~C~RR9Ss1h8t2Tq%QfngDBUXQe`F`Bq5ARl^G4WpU{8w+Udz5C~*yIEhJSS;f;R
zR5pu5BeSVADv1<M0%y6hw<Z3HOa5Oj9u<SPcJ@D=o-?82W8J=<TlDaH@*yQU?rL<d
zs|l6a=yhT7*i50`Y$+Sc>PvR(>Z`tb>Ug*6PCx%*z>)>aXTqN_uK>lvg~p!E&hA>Q
z>qEZV(HB_bIom4dz-ejmIa`uT`)0!O4%?+ROi`DxI$KjyQ8KhX=}(oSyt>4<z-M|z
zQ_I9X%F5gO^CsPiPAvPcOz}U}1~&&&Ek?i2o>cBYM1&`J_QFSAyP}OaS$iF3XR-d7
zYh~~4FTX=B;8am!V@)*W+ofwC#D4K8RgiadhQVWGrTQPkdNlGFOv%XFwKW)x*B}L(
zU>D=vhK<~QbHROA=O^}`Ea+=>+mOIN5O+INtUd7J;gjSe7mMQ}R<|=acFMGSww8Gb
zc?)j|^85^DzTmy&mYE=t^k&!j+`Yyj<HhVNN5xK!zZM$$mDuYWKiIH{$~Nq&C`+AU
z4#Zz!7M`i!TluxQWEdO>%HLyn@#*UNEYmMOkVNQj)3m+lw|hl5cGDUg#G%vn<boy0
z%wo})zyf+r8gndnG>3xXFM*=yKNRA+#}4m*zig9m`#8X&J@8IA5?P;Un0KvUU3vX!
z@3^*3bJY2dJJdxHeP?}>TBX;&DTpN(>I&$eNA~#+dYYWp8Jg_7CM@wa0py|n=RU3T
z9Vav;Sa{ISIkQwB_*muXlzedC@yJ4$JQjX(%C6ZzFZzf4woO|By|bj8n-jca($-_}
zMDJnG{Q)aPHii^et-)cv!?ja)wY5p2<#i_aYd@Q-B5;RKK1&~U8HEd*TSQ07Gt+lZ
zv<r~@%bg18wt)Cb6M2krh$1u7I<yQAQ=z~3!+n>OgDbc7b_Z^3y<eX#s4u^<%lBj%
zpVXk)378JLFYU}s(qXeztHAa>{R#awZa!5pgQbDJ9<g^vs`FjC#-5T7Et~2GI}>{?
zg5t8@YeR<By^hn>ZS%VnE%fK<t-h(<Ke{`2JQ^RXUaa%mD7LL=<&Ix9R|-zcgC|CP
zEY!g1#VMB?@>Uswdd%|OUM>M)Ii;D~+|D#)T)kzQac(bGR2iB%@j=Xnsh)hF3#W?i
z%4_PLHkaW0D-MqvGyO%i1xbGg4%|3+Y;=Pv!Q9(fI$VA%R}eJQ5I-`473as<{KfA6
iXDZMU=Qwpe-;sccg&M`1yr-J1{}>)8k$oaYZ2T8;@~SNW

literal 0
HcmV?d00001

diff --git a/static/images/onlineHome/yinnongList8.png b/static/images/onlineHome/yinnongList8.png
new file mode 100644
index 0000000000000000000000000000000000000000..4fadd9acc86123f9e21976e11521eef2b54dff96
GIT binary patch
literal 1612
zcmaJ>drT8|9Irep4+mO6)S2^&j~UwQwWYL23zW7%2SvmN3h}|&9&N?DtL<S6IK!~x
z5wj>hX5zpoy3L?LMmJ#tN2d-{924Usuwj^+ikpJnR5Z%m6+!oh^OC#YBcIRb`}sa{
zwb@x|p+WP47z{?JI$fDVud&{j89;v*ItymdOEjg@QLD%z%8ptwhTK4|#{e~s8nGM<
zHI!~Tk4YH}U$$ARqjZ`~L{H*e)QjOda0|_5Fr-Ni3#u>1C}2HiG!rs#tfLDA%mx{l
z7pLKAEDFqIPA{`!tID#p`m$oZ!~iBG0#XM;3*Z=q0uFp5VM81;a8ehc_ugv=1STO=
zu?&1^N~g&N6r>dc;<zG?9u|s$cnKF433&ohEWqc%5{M^;U;&2*BRmlj7Y|H5ARWzW
zC_-|SsZ+7&lMFOblm&qxyWP&U3%I1!2*DBwt-*)*d=8D^*h&csb#Mq9ds;z>+4NSk
zg))-_;8jG|lO>c4q@BJ@0k>#0uY?KPRH5jSK@QXc!CW4M<KDa`(Kadvdu`*5Xq&dw
zf<ZZ$jV!V1>3$Tkr^$5f-X6#cq}?D&QeT2&1f^EWK>CJjFdL9mkwmBxi3NOlya0w(
ziWH$TMafqR#9~35SRxiobJc{6LJ2)K%{9N~^54ou6jltSNUN44H%@mi+eA{N%|u!N
zK3xc4S)Q3NkapX9-r7!C#jNJdm?70l;=p8a5c3-h$oZ-9LRbXz<sy~WygXH&qEJcV
zMM}9?p@8||6xZ;E#HYBl`TyZUv>C|T+5dEU`idSO@AlQ)(uY@*j}i2^Tj{yZDBe2A
zVEA;Ym2$0P@Lqm`iM5h7bpD^#C5CN&96vnsEUU61rY0tL(XxOm-S0D>$Z@~mudntk
zQKdHmA07!)-;CPMT2xoKC^E7#EL_>25>p)XV~;_aH+uRO+*j_p*x43b{%cF;P`t}H
zR$o5akpI*8gqEXHG<7#-iSM4Hx}GPWPz{4S?Pv8{Jr8b3*r(mIhJ%d>_iHROYs>vE
z8#OVW@N-B^Mt@L91=XdldQtOeNefnYv}eJER%xL0didkBWxjLU_TU>B@4CZ1Yx`r)
zwA%Jm{2eKf9uHf)V?(ij@8Cr9@qJ&-`=da&yf(wLJ2<&}b0JgA5OyEk)YQ<B{HcTV
ze-caG_l$qwL%3BpMwt6J&>DYDRr^q{Np#BCd#vio9T0VvM+D~Uqdc*@9_BCnxU;W1
zyw9ICviRT-i0+@?ynXDK5O(LG<JSic>qA*NBX>r&<{7#Vvo4cqgKKi<SDSaHb#3op
zmKKD#zMI%PoA5#Y^xbl0M&jukaa?KC$=st(Uihi7Lc2OZa#d5fZn5+3usZPM=BwH>
z(HeH$5A938kB!QlNv?XhKlIWV{#f1G5!m<<vZ*#YQiew8va2Q%uTh`4wp8vgx2kn`
z&y_Ph6$$Q@w_H(f$iudF8t0j^E?<-03arl^y?guVBdyz`4ZGfc=y%D_GB;~%ow~B+
z1oJuJcjA%nXmYD`e`3*JU(Vq!cLu`^<A7y>V|H5=>A9aa+s<6E`y8)iSG9XtOUCLA
zl3dY|iw8RPe)cdz{CWM-Yxy@hmXW0LET5!`Z?qB4=D4ogUkJ3iIc_X)L7ryjxa*y^
z2W4T7i1GBM=;5|Kb?)A|BP%0EYPN;+9@sgH{XBD^-X$#vxS+6?CbUoFDlW}wdiHJO
zvw%x(B>3KKZqc)+a6Vfmlx`a+?LYQnMc&fYzd2t7@fdjFj++Pf6%2U)?`l<+vN@%&
F@?R9!WfA}Y

literal 0
HcmV?d00001

diff --git a/static/images/onlineHome/yinnongList9.png b/static/images/onlineHome/yinnongList9.png
new file mode 100644
index 0000000000000000000000000000000000000000..38cb967541f403a787c87f8d888ddb81f01148ee
GIT binary patch
literal 1930
zcmaJ?Yg7|w8cr6=p>9FL&4q#vp&}Z|{W>PF36qeZK?oSIR_!DiAckZ@GMYfWl$#qa
zuEwK+io1&kMfV^9tw_r%$ce>OL5r!alvW@;)?$mMN>^Rw?8JiY54Us9%=dlod7k%u
z-phBUIx{0Jcy9Du0)Y^$kV7hbUG9H_0`c#{%6EzQ5`{_guxvCRv%waGAl9K81W*{^
z0z`$tx{~65BSHcpAYPx7hvg|(fm+l^h5Z<+-Dt+y1cETdZicl61Oqfkf!-t{Kj`iu
z1A3i^oXb(tmF85WP%kgFAlaoEIoeW#R-hxNBm+V_h&wPM7!25rMJ6j~7m;831@XP#
zOd|s?A(%l#{zX)tG80HeEeOD&a+9<SHXq;#s0=Qf&f+cym~@7KM(5KQtRy-Eq;o+I
z514t#cr=SHA5=lInOOKqL@vZIGf1P^Y&NQmMMW(IG=@Nc`(V<T%p@F<WGyjausz9S
zji2=ZAy%zLZ^rbf3GjP_HRxtcM8=i=l7i8!RK9X-vd$C=FB#1an`sOxon|!p^LmN4
zVk+cU8LvfKb4ttzO@&y|%@!@*kNo&qGG4pi599~pYCs6pZZ;w&OaY0=xP_|I>p(ih
z;xJjMe5RPkW-z3w0wzZyW^lz~37yLq$ON-og~^J+CM`0{)&I)n{Vo?wwIDEtT5?dd
zXtsNqg(!wv3sEz`#0vo==ITv4)Mj1kukDOf#G>DV=wueu2)rx~sDF(BywP+CQ@~=1
zxe~v4F)x+DmoVvkE=R_bK^*c7SNEF4XSnSD%cbFBX#URrrqi<~e0==dS96OWUQIq?
z!pGf$&o!gt+z5VMUML`Oj(zyr!L{-=S>Zdc#||a#T4mal8Gbu8tP*B7kOt0&&#8g}
zB9H^~riLIW{?<y8I4mw|pXdYxAyV~$gY$wV>?iY^PwrR$Be?WYC-?ahZtb?~qW{__
zMiwPw^K9Ld0)y-Pty>E|ZZOEx6RuR>-g$1*k_m@q{IqbiAgtb9)*-2Ilt4?fq|Gu`
zmy5LHkl5q>@oh2p%S*$YhUY1Z7mkN(T0QmR9LKpub-ppLJ!wN>Kymt}>txFdM)JO~
zCQ4&MP2QblJ)}FJ3~K(l!OrWdctSlJ;4_&Q-3saNzL>lw$T?MZc3lxw=<JfcN8Ves
z{VqLA(R$-)Ah~r{LPD6xy^4FGLEg(dl@J|ncqe|tVb|(bPW2O=&qitQyb;s7PW#1Z
zeWZ6~*-5=Sp1Y)XtC8<3znl;qVff~qyQeQqgDo|G&2c@TIQyRs!C1om9v59*+4dC}
z_!r~g3q@l!Q(fa$sOS0`gPLAcHnctTCVi4Dd~5r6smD9BqElACcd5QqzO^%NW%IE=
zI_|4Bri@2@R<~=ZVP3~-UeTP6ysF3HNCiqlqVIp*`{{YgR50;$Cn>ElUpDd|UGSFn
z{0QbLH0#sc6&y8U&aLa*|A(Nm{BKFO*BoY3`|^n+*LGjtdt+V2wveOpQ0{tG$e~F0
zsHRH%6r%V@kKQHSVHp=~%elE9fF~~whA6zo6RvBy=d17K8yvgNbl0an3~=6G_N+?u
z;23{>SY0vuc>0tlaXhxzF`(ZPS5WAw4h5ez-CObIxdxZH=}q^apHCk?vF3-`7B@Av
zo}Zr5(zoO0{CXuPE-qB@I9AhgcR?%E26#?7|Frg#%B@4owVaXd`<7)a{`*l9?<eJC
zXmzWR_d}iJw6_8#6^)aMl1Pg$0CNuQ=n*?JZ*%$gdi$;ISG7xt(`~A_;yy);$+D-H
zW*bv3m=KN?t6~OWZ|&$qlJF9*hBFvSao*#9PCSy>bSBEO=WKD+e0^6)I*;Gun5v2K
zo|2N9>O#RQwVHN*jVtllqs0|ccVe-3;Z;-lP1xC+mJL!WhQ1Cm91Xl$J~sZ*@RhdO
zD-72GWaE~{(Je<xo_BV`W>z}JdVD!B*ZYy>pJ&bWME8aP>~nQYMt0HhZ%$+{(S4l7
zNqY;87~?+C3Vo*C!IK)Pl&-F3d$bkVUzT|Wg128AHZ*$HQ#Y;npl@nqG`A~l5AR6V
zqv-F;I#xIaS|2n{G*jOHenX_H_XEc<qO@b;K%e}lGZD6^@yX`F{^^dyjaYb;FWz^z
z|Lw>H!{dX7SX24G)KM8%+Yg>vs|>j)jqKYU=G-|=IT%qZC%Tp2z2VurV=C=KB4Kp$
Viwl2yiuL;cjtXf8)Fyeq{C`$A0muLV

literal 0
HcmV?d00001


From 9a4ae6e750b7a4b1cf0768ed075722f2e8dc6026 Mon Sep 17 00:00:00 2001
From: yujk <990961482@qq.com>
Date: Tue, 12 Oct 2021 16:16:58 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E9=93=B6=E5=86=9C=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A8=A1=E5=9D=97=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bankAgriculture/paymentApproval.js        |  25 ++
 src/router/index.js                           |   9 +
 .../paymentApproval/approvalAdd10.vue         | 204 +++++++--
 .../paymentApproval/approvalAdd11.vue         | 342 +++++++++------
 .../paymentApproval/approvalAdd12.vue         |  27 +-
 .../paymentApproval/approvalAdd2.vue          |   4 +-
 .../paymentApproval/approvalAdd4.vue          |  44 +-
 .../paymentApproval/approvalAdd5.vue          | 262 +++++++++---
 .../paymentApproval/approvalDetail.vue        |   2 +-
 .../paymentApproval/approvalDetail10.vue      |  32 +-
 .../paymentApproval/approvalDetail11.vue      |  29 +-
 .../paymentApproval/approvalDetail12.vue      |  43 +-
 .../paymentApproval/approvalDetail5.vue       |  23 +-
 .../paymentApproval/approvalList4.vue         |   2 +-
 .../paymentApproval/approvalList5.vue         |   2 +-
 .../paymentApproval/approvalModify10.vue      | 194 ++++++---
 .../paymentApproval/approvalModify11.vue      | 332 +++++++++------
 .../paymentApproval/approvalModify12.vue      | 397 +++++++++++-------
 .../paymentApproval/approvalModify5.vue       | 329 ++++++++++-----
 .../paymentApproval/approvalProcess2.vue      | 244 +++++++++++
 20 files changed, 1732 insertions(+), 814 deletions(-)
 create mode 100644 src/views/onlineHome/bankAgriculture/paymentApproval/approvalProcess2.vue

diff --git a/src/api/onlineHome/bankAgriculture/paymentApproval.js b/src/api/onlineHome/bankAgriculture/paymentApproval.js
index 9a788742..b7ed1f2b 100644
--- a/src/api/onlineHome/bankAgriculture/paymentApproval.js
+++ b/src/api/onlineHome/bankAgriculture/paymentApproval.js
@@ -249,3 +249,28 @@ export const attachmentList = (data) => {
     params: data
   })
 }
+//删除已上传附件
+export function systemAttachment(ids) {
+  if (ids != undefined) {
+    return request({
+      url: '/system/attachment/remove/' + ids,
+      method: 'get'
+    })
+  }
+}
+// 查询转账账户详情详细
+export function getTransferProcess1(id) {
+  return request({
+    url: '/yinnong/cash/getProcessSchedule/' + id,
+    method: 'get'
+  })
+}
+
+// 查询出纳账户设置列表
+export function listAccount(query) {
+  return request({
+    url: '/cashier/account/list',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/router/index.js b/src/router/index.js
index 1d5018de..38f2e4a6 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1329,6 +1329,15 @@ export const constantRoutes = [
     },
     component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalProcess'], resolve)
   },
+  {
+    path: '/onlineHome/approvalProcess2',
+    name: 'approvalProcess2',
+    meta: {
+      title: '付款申请流程',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalProcess2'], resolve)
+  },
   {
     path: '/onlineHome/collectionList',
     name: 'collectionList',
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd10.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd10.vue
index ae3d0bd9..2ecdd123 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd10.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd10.vue
@@ -161,16 +161,6 @@
       </div>
 
       <p class="main_title">收款方信息<van-button icon="plus" @click="addChargeItme(chargeItme.length)" size="mini" type="info" native-type="button" class="addFamily"/></p>
-      <div class="main_box" style="margin-bottom: 15px;">
-        <van-cell title="收款账户类型">
-          <template #right-icon>
-            <van-radio-group direction="horizontal" v-model="form.accountType" @change="accountTypeChange">
-              <van-radio name="1">公户</van-radio>
-              <van-radio name="2">私户</van-radio>
-            </van-radio-group>
-          </template>
-        </van-cell>
-      </div>
       <div :style="{position:'relative',padding: index == 0 ? '':'10px 0 0 0'}" v-for="(item, index) in chargeItme" :key="index">
         <van-button icon="minus" size="mini" type="danger" class="deleteFamily" native-type="button" v-if="index!=0" @click="deleteChargeItme(index)" />
         <div class="main_box" style="margin-bottom: 10px;position:relative;">
@@ -182,7 +172,7 @@
       </div>
       <p class="main_title">上传附件</p>
       <div class="main_box" style="padding: 5px 0 0 8px;">
-        <van-uploader v-model="fileList" :after-read="beforeRead" ></van-uploader>
+        <van-uploader v-model="fileList" :after-read="beforeRead" @delete="deleteFile"></van-uploader>
       </div>
       <div style="padding: 16px 0;">
         <van-row>
@@ -210,6 +200,7 @@
     commonAttach,
     updateCash
   } from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
+  import Dialog from "vant/lib/dialog";
   export default {
     name: "approvalAdd10",
     data() {
@@ -265,7 +256,8 @@
           outId:null,
           ynType:'2'
         },
-        projectFundType:''
+        projectFundType:'',
+        uploadFiles:[],
       };
     },
     created() {
@@ -300,7 +292,7 @@
         })
       });
       this.getDictionaries();
-      this.getFileList();
+      this.addChargeItme();
     },
     methods: {
       // 表单重置
@@ -488,7 +480,7 @@
         });
         this.$set(this.form, "expenditureAmount", total);
       },
-      goAdd(){
+      /*goAdd(){
         if(this.chargeItme.length<1){
           this.$notify({ type: 'danger', message: '请添加收款方信息' });
           return;
@@ -532,6 +524,99 @@
             })
           }
         });
+      },*/
+      goAdd(){
+        if(this.chargeItme.length<1){
+          this.$notify({ type: 'danger', message: '请添加收款方信息' });
+          return;
+        }
+        if(this.form.remark != null && this.form.remark.indexOf("|")!=-1){
+          this.$notify({ type: 'danger', message: '付款事由禁止包含！' });
+          return;
+        }
+        if(this.form.capitalExpenditureType==2){
+          if(this.projectForm.projectName==""||this.projectForm.projectName==null){
+            this.$notify({ type: 'danger', message: '请选择项目名称！' });
+            return;
+          }
+          if(this.projectForm.projectBillNum==""||this.projectForm.projectBillNum==null){
+            this.$notify({ type: 'danger', message: '请输入工程发票号！' });
+            return;
+          }
+        }
+        if(this.uploadFiles==null||this.uploadFiles.length==0){
+          Dialog.confirm({
+            title: '提示',
+            message: '此申请单中未上传任何附件，是否确认提交？',
+          })
+            .then(() => {
+              addCash(this.form).then((response) => {
+                this.chargeItme.map(res => {
+                  res.cashId = response.data.id
+                  addCashdetail(res).then(r => {
+                    if(this.form.capitalExpenditureType==2){
+                      this.projectForm.outId = response.data.id
+                      this.$set(this.projectForm, "ynType", '2');
+                      addProjectto(this.projectForm).then(res => {
+                        customSubmit(response.data.id).then(res => {
+                          this.$toast.success('提交成功');
+                          setTimeout(function(){
+                            history.go(-1)
+                          },2000)
+                        })
+                      })
+                    }else{
+                      customSubmit(response.data.id).then(res => {
+                        this.$toast.success('提交成功');
+                        setTimeout(function(){
+                          history.go(-1)
+                        },2000)
+                      })
+                    }
+                  })
+                })
+              });
+            })
+
+        }else{
+          addCash(this.form).then((response) => {
+            console.log(this.uploadFiles)
+            this.uploadFiles.map(rr => {
+              const params = new FormData();
+              params.append("tableId", response.data.id);
+              params.append("tableName", "t_yinnong_cash");
+              params.append("bizPath", "upload");
+              params.append("fileType", "0");
+              params.append("file", rr);
+              commonAttach(params).then((r) => {
+              })
+            })
+            this.chargeItme.map(res => {
+              res.cashId = response.data.id
+              addCashdetail(res).then(r => {
+                if(this.form.capitalExpenditureType==2){
+                  this.projectForm.outId = response.data.id
+                  this.$set(this.projectForm, "ynType", '2');
+                  addProjectto(this.projectForm).then(res => {
+                    customSubmit(response.data.id).then(res => {
+                      this.$toast.success('提交成功');
+                      setTimeout(function(){
+                        history.go(-1)
+                      },2000)
+                    })
+                  })
+                }else{
+                  customSubmit(response.data.id).then(res => {
+                    this.$toast.success('提交成功');
+                    setTimeout(function(){
+                      history.go(-1)
+                    },2000)
+                  })
+                }
+              })
+            })
+          });
+        }
       },
       goUpdate(){
         if(this.chargeItme.length<1){
@@ -552,29 +637,64 @@
             return;
           }
         }
-        this.projectForm.outId = this.form.id
-        addCash(this.form).then((response) => {
-          this.chargeItme.map(res => {
-            res.cashId = response.data.id
-            addCashdetail(res).then(r => {
-              if(this.form.capitalExpenditureType==2){
-                this.projectForm.outId = response.data.id
-                this.$set(this.projectForm, "ynType", '2');
-                addProjectto(this.projectForm).then(res => {
+        if(this.uploadFiles==null||this.uploadFiles.length==0){
+          addCash(this.form).then((response) => {
+            this.chargeItme.map(res => {
+              res.cashId = response.data.id
+              addCashdetail(res).then(r => {
+                if(this.form.capitalExpenditureType==2){
+                  this.projectForm.outId = response.data.id
+                  this.$set(this.projectForm, "ynType", '2');
+                  addProjectto(this.projectForm).then(res => {
+                    this.$toast.success('保存成功');
+                    setTimeout(function(){
+                      history.go(-1)
+                    },2000)
+                  })
+                }else{
                   this.$toast.success('保存成功');
                   setTimeout(function(){
                     history.go(-1)
                   },2000)
-                })
-              }else{
-                this.$toast.success('保存成功');
-                setTimeout(function(){
-                  history.go(-1)
-                },2000)
-              }
+                }
+              })
             })
-          })
-        });
+          });
+        }else{
+          addCash(this.form).then((response) => {
+            console.log(this.uploadFiles)
+            this.uploadFiles.map(rr => {
+              const params = new FormData();
+              params.append("tableId", response.data.id);
+              params.append("tableName", "t_yinnong_cash");
+              params.append("bizPath", "upload");
+              params.append("fileType", "0");
+              params.append("file", rr);
+              commonAttach(params).then((r) => {
+              })
+            })
+            this.chargeItme.map(res => {
+              res.cashId = response.data.id
+              addCashdetail(res).then(r => {
+                if(this.form.capitalExpenditureType==2){
+                  this.projectForm.outId = response.data.id
+                  this.$set(this.projectForm, "ynType", '2');
+                  addProjectto(this.projectForm).then(res => {
+                    this.$toast.success('保存成功');
+                    setTimeout(function(){
+                      history.go(-1)
+                    },2000)
+                  })
+                }else{
+                  this.$toast.success('保存成功');
+                  setTimeout(function(){
+                    history.go(-1)
+                  },2000)
+                }
+              })
+            })
+          });
+        }
       },
       payeeSelectChange(select, i) {
         let obj = {};
@@ -675,22 +795,19 @@
         }
       },
       beforeRead(file) {
-        console.log(file)
-        console.log(this.fileList)
-        const params = new FormData();
-        params.append("tableId", this.$route.query.id);
-        params.append("tableName", "t_yinnong_cash");
-        params.append("bizPath", "upload");
-        params.append("fileType", "0");
-        params.append("file", file.file);
-        commonAttach(params).then((response) => {
-          console.log(response)
+        this.uploadFiles.push(file.file);
+      },
+      deleteFile(file){
+        this.uploadFiles.map((response,index) => {
+          if(file.file == response){
+            this.uploadFiles.splice(index,1)
+          }
         })
       },
       getFileList(){
         let oData= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_transfer",
+          tableName: "t_yinnong_cash",
           bizPath: "upload",
           fileType: "0",
         }
@@ -698,7 +815,6 @@
           console.log(res)
           console.log(location.protocol+"//"+location.host+request.defaults.baseURL)
           res.rows.map(r => {
-
             let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
             this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{})})
             console.log(r)
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd11.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd11.vue
index c01e692d..91d076c5 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd11.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd11.vue
@@ -7,7 +7,7 @@
       @click-left="$router.back(-1)"
     >
       <template #title>
-        <p style="font-weight: bold;">添加资金使用申请</p>
+        <p style="font-weight: bold;">添加资金提现申请</p>
       </template>
     </van-nav-bar>
     <van-form @submit="getChange" @failed="getError" :show-error-message="false" scroll-to-error validate-first>
@@ -59,7 +59,7 @@
         <van-field
           readonly
           required
-          label="使用总金额"
+          label="提现总金额"
           v-model="form.expenditureAmount"
           placeholder="根据下方收款金额自动核算"
           input-align="right"
@@ -157,39 +157,31 @@
             @cancel="showpayer = false"
           />
         </van-popup>
-        <van-field :rules="[{ required: true , message:'请输入付款方账户' }]" required label="可用余额（元）" v-model="form.payerAccount" placeholder="请输入账户" input-align="right" label-width="auto"/>
+        <van-field :rules="[{ required: true , message:'可用余额不能为空' }]" required label="可用余额（元）" v-model="form.payerAccount" placeholder="请输入可用余额" input-align="right" label-width="auto"/>
       </div>
 
       <p class="main_title">收款方信息<van-button icon="plus" @click="addChargeItme(chargeItme.length)" size="mini" type="info" native-type="button" class="addFamily"/></p>
-      <div class="main_box" style="margin-bottom: 15px;">
-        <van-cell title="收款账户类型">
-          <template #right-icon>
-            <van-radio-group direction="horizontal" v-model="form.accountType" @change="accountTypeChange">
-              <van-radio name="1">公户</van-radio>
-              <van-radio name="2">私户</van-radio>
-            </van-radio-group>
-          </template>
-        </van-cell>
-      </div>
       <div :style="{position:'relative',padding: index == 0 ? '':'10px 0 0 0'}" v-for="(item, index) in chargeItme" :key="index">
         <van-button icon="minus" size="mini" type="danger" class="deleteFamily" native-type="button" v-if="index!=0" @click="deleteChargeItme(index)" />
         <div class="main_box" style="margin-bottom: 10px;position:relative;">
-          <van-field label="收款方" placeholder="请选择" v-model="item.payee" input-align="right" required :rules="[{ required: true , message:'请选择收款方' }]" />
-          <van-field required :rules="[{ required: true , message:'联系方式不能为空' }]" v-model="item.phone" label="联系方式" placeholder="请输入联系方式" input-align="right" label-width="auto"/>
-          <van-field required :rules="[{ required: true , message:'申请使用金额不能为空' }]" v-model="item.incomeAmount"  label="申请使用金额（元）" placeholder="请输入申请使用金额" type="number" input-align="right" label-width="auto"/>
-          <van-field required :rules="[{ required: true , message:'请输入资金用途' }]" v-model="item.remark" label="资金用途" placeholder="请输入资金用途" input-align="right" label-width="auto"/>
+          <van-field required :rules="[{ required: true , message:'请输入收款方全称' }]" v-model="item.payee" label="收款方" placeholder="请输入收款方全称" input-align="right" label-width="auto"/>
+          <van-field required :rules="[{ required: true , message:'请输入提款人' }]" v-model="item.drawer" label="提款人" placeholder="请输入提款人" input-align="right" label-width="auto"/>
+          <van-field required :rules="[{ required: true , message:'请输入提款金额' }]" v-model="item.incomeAmount" type="number"  label="提款金额（元）" placeholder="请输入提款金额" input-align="right" label-width="auto" @change="moneyChange"/>
+          <van-field required :rules="[{ required: true , message:'请输入资金用途' }]" v-model="item.remark" label="资金用途" placeholder="请输入资金用途" input-align="right" label-width="auto" />
         </div>
       </div>
       <p class="main_title">上传附件</p>
       <div class="main_box" style="padding: 5px 0 0 8px;">
-        <van-uploader v-model="fileList" :after-read="beforeRead" ></van-uploader>
+        <van-uploader v-model="fileList" :after-read="beforeRead" @delete="deleteFile"></van-uploader>
       </div>
       <div style="padding: 16px 0;">
         <van-row>
           <van-col span="12" align="center">
+            <!--            @click="goUpdate"-->
             <van-button type="info" native-type="submit" @click="buttonType='update'" class="submitButton">保<i style="margin-right: 1em;"></i>存</van-button>
           </van-col>
           <van-col span="12" align="center">
+            <!--            @click="goAdd"-->
             <van-button type="info" native-type="submit" @click="buttonType='add'" class="submitButton">保存并提交</van-button>
           </van-col>
         </van-row>
@@ -200,9 +192,15 @@
 </template>
 
 <script>
-  import { addTransfer , listPayee , updateTransfer , getProjectto , listProject , addProjectto , customSubmit , getAccount ,getQmyeFlow} from "@/api/onlineHome/bankAgriculture/paymentApproval";
+  import { addTransfer , listPayee , updateTransfer , getProjectto , listProject , addProjectto , cashSubmit , getAccount ,getQmyeFlow} from "@/api/onlineHome/bankAgriculture/paymentApproval";
   import request from '@/utils/request'
-  import {attachmentList, commonAttach} from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
+  import {
+    addCash,
+    addCashdetail, attachmentList,
+    commonAttach, listAccount,
+    updateCash
+  } from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
+  import Dialog from "vant/lib/dialog";
   export default {
     name: "approvalAdd11",
     data() {
@@ -256,9 +254,10 @@
           projectBillNum:null,
           projectFundType:'1',
           outId:null,
-          ynType:'1'
+          ynType:'2'
         },
-        projectFundType:''
+        projectFundType:'',
+        uploadFiles:[],
       };
     },
     created() {
@@ -279,11 +278,13 @@
         }
         this.projectFundTypeDictionaries = response.data;
       });
-      let params1={
-        accountType: "102",
+      let queryParamsOld={
+        pageNum: 1,
+        pageSize: 10,
+        accountType: "101",
         status: "N",
       }
-      getAccount(params1).then((response) => {
+      listAccount(queryParamsOld).then((response) => {
         this.payerOptions = response.rows;
         response.rows.map((res,index) => {
           res['payerFrom'] = '1'
@@ -293,7 +294,7 @@
         })
       });
       this.getDictionaries();
-      this.getFileList();
+      this.addChargeItme();
     },
     methods: {
       // 表单重置
@@ -304,7 +305,7 @@
           downId: null,
           orderId: null,
           cashierId: null,
-          transferType: '1',
+          cashType: '11',
           accountType: '2',
           explainSituation: null,
           succeedAmount: null,
@@ -330,34 +331,25 @@
           projectBillNum:null,
           projectFundType:'1',
           outId:null,
-          ynType:'1'
+          ynType:'2'
         }
       },
       getChange(){
-        console.log(this.buttonType)
         if(this.buttonType == 'update'){
-          console.log('update')
           this.goUpdate();
         }else if(this.buttonType == 'add'){
-          console.log('add')
           this.goAdd();
         }
       },
       getDictionaries(){
         this.getDicts("capital_expenditure_type").then((res) => {
-          for (var i = 0; i < res.data.length; i++) {
+          for (let i = 0; i < res.data.length; i++) {
             this.capitalExpenditureTypeOptions.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
           }
         });
-        this.getDicts("bank_type").then(res => {
-          for (var i = 0; i < res.data.length; i++) {
-            this.bankTypeDictionaries.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
-          }
-        });
         this.getPayeeList();
       },
       getError(e){
-        console.log(e)
         this.$notify({ type: 'danger', message: e.errors[0].message });
       },
       addChargeItme(index){
@@ -365,27 +357,23 @@
           this.$notify({ type: 'danger', message: '请勿添加多个空列表信息' });
           return;
         }else if(this.chargeItme.length>0&&this.chargeItme[index-1].incomeAmount == ''){
-          this.$notify({ type: 'danger', message: '请输入收入金额！' });
-          return;
-        }else if(this.chargeItme.length>0&&this.chargeItme[index-1].payeeAccount == ''){
-          this.$notify({ type: 'danger', message: '请输入收款账户！' });
+          this.$notify({ type: 'danger', message: '请输入提款金额！' });
           return;
-        }else if(this.chargeItme.length>0&&this.chargeItme[index-1].bankDeposit == ''){
-          this.$notify({ type: 'danger', message: '请输入开户银行！' });
+        }else if(this.chargeItme.length>0&&this.chargeItme[index-1].drawer == ''){
+          this.$notify({ type: 'danger', message: '请输入提款人！' });
           return;
-        }else if(this.chargeItme.length>0&&this.chargeItme[index-1].bankType == ''){
-          this.$notify({ type: 'danger', message: '请选择所属银行！' });
+        }else if(this.chargeItme.length>0&&this.chargeItme[index-1].remark == ''){
+          this.$notify({ type: 'danger', message: '请输入资金用途！' });
           return;
         }
         this.getDicts("bank_type").then(res => {
           this.chargeItme.splice(index + 1, 0, {
             payeeId: "", //收款方ID
-            payee: "", //收款方
+            payee: "", //收款方全称
             payeeAccount: "", //收款账户
-            bankDeposit: "", //开户银行
-            incomeAmount: "", //收入金额
-            bankType: "1", //所属银行
-            bankTypeText:this.selectDictLabel(res.data, 1), //所属银行
+            drawer: "", //提款人
+            incomeAmount: "", //提款金额
+            bankType: "", //资金用途
             showPayee:false,
             showbankType:false
           });
@@ -404,7 +392,7 @@
         });
       },
       payeeDictLabel(datas, value) {
-        var actions = [];
+        let actions = [];
         Object.keys(datas).some((key) => {
           if (datas[key].payeeId == ('' + value)) {
             actions.push(datas[key].payee);
@@ -482,17 +470,44 @@
       },
       // 钱计算
       moneyChange(input) {
-        console.log(input)
-        let obj = {};
-        obj = this.chargeItme.find((account) => {
-          //model就是上面的数据源
-          return parseFloat(account.incomeAmount).toFixed(2) === input; //筛选出匹配数据
-        });
-        let total = 0;
-        this.chargeItme.forEach((money) => {
-          total = (parseFloat(total) + parseFloat(money.incomeAmount)).toFixed(2)
-        });
-        this.$set(this.form, "expenditureAmount", total);
+        if(this.form.cashType=='11'){
+          console.log(input)
+          if(this.form.payerAccount==0){
+            this.$notify({ type: 'danger', message: '申请使用金额不能等于0！' });
+            this.chargeItme = []
+            this.addChargeItme();
+            return false;
+          }else {
+            let obj = {};
+            obj = this.chargeItme.find((account) => {
+              //model就是上面的数据源
+              return parseFloat(account.incomeAmount).toFixed(2) === input; //筛选出匹配数据
+            });
+            let total = 0;
+            this.chargeItme.forEach((money) => {
+              total = (parseFloat(total) + parseFloat(money.incomeAmount)).toFixed(2)
+            });
+            this.$set(this.form, "expenditureAmount", total);
+            if(this.form.payerAccount<this.form.expenditureAmount){
+              this.$notify({ type: 'danger', message: '申请使用金额不能大于可用余额！' });
+              this.form.expenditureAmount=""
+              this.chargeItme = []
+              this.addChargeItme();
+              return false;
+            }
+          }
+        }else{
+          let obj = {};
+          obj = this.chargeItme.find((account) => {
+            //model就是上面的数据源
+            return parseFloat(account.incomeAmount).toFixed(2) === input; //筛选出匹配数据
+          });
+          let total = 0;
+          this.chargeItme.forEach((money) => {
+            total = (parseFloat(total) + parseFloat(money.incomeAmount)).toFixed(2)
+          });
+          this.$set(this.form, "expenditureAmount", total);
+        }
       },
       goAdd(){
         if(this.chargeItme.length<1){
@@ -513,31 +528,79 @@
             return;
           }
         }
-        this.$set(this.form, "payeeList", this.chargeItme);
-        this.$set(this.form, "bankTypeList", this.chargeItme);
-        this.$set(this.form, "accountTypeList", this.chargeItme);
-        this.$set(this.form, "transferStatusList", this.chargeItme);
-        addTransfer(this.form).then(response => {
-          this.projectForm.outId = response.data.id
-          this.$set(this.projectForm, "ynType", '1');
-          if(this.form.capitalExpenditureType==2){
-            addProjectto(this.projectForm).then(res => {
-              customSubmit(response.data.id).then(res => {
-                this.$toast.success('提交成功');
-                setTimeout(function(){
-                  history.go(-1)
-                },2000)
+        if(this.uploadFiles==null||this.uploadFiles.length==0){
+          Dialog.confirm({
+            title: '提示',
+            message: '此申请单中未上传任何附件，是否确认提交？',
+          })
+            .then(() => {
+              addCash(this.form).then((response) => {
+                this.chargeItme.map(res => {
+                  res.cashId = response.data.id
+                  addCashdetail(res).then(r => {
+                    if(this.form.capitalExpenditureType==2){
+                      this.projectForm.outId = response.data.id
+                      this.$set(this.projectForm, "ynType", '2');
+                      addProjectto(this.projectForm).then(res => {
+                        cashSubmit(response.data.id).then(res => {
+                          this.$toast.success('提交成功');
+                          setTimeout(function(){
+                            history.go(-1)
+                          },2000)
+                        })
+                      })
+                    }else{
+                      cashSubmit(response.data.id).then(res => {
+                        this.$toast.success('提交成功');
+                        setTimeout(function(){
+                          history.go(-1)
+                        },2000)
+                      })
+                    }
+                  })
+                })
+              });
+            })
+
+        }else{
+          addCash(this.form).then((response) => {
+            console.log(this.uploadFiles)
+            this.uploadFiles.map(rr => {
+              const params = new FormData();
+              params.append("tableId", response.data.id);
+              params.append("tableName", "t_yinnong_cash");
+              params.append("bizPath", "upload");
+              params.append("fileType", "0");
+              params.append("file", rr);
+              commonAttach(params).then((r) => {
               })
             })
-          }else{
-            customSubmit(response.data.id).then(res => {
-              this.$toast.success('提交成功');
-              setTimeout(function(){
-                history.go(-1)
-              },2000)
+            this.chargeItme.map(res => {
+              res.cashId = response.data.id
+              addCashdetail(res).then(r => {
+                if(this.form.capitalExpenditureType==2){
+                  this.projectForm.outId = response.data.id
+                  this.$set(this.projectForm, "ynType", '2');
+                  addProjectto(this.projectForm).then(res => {
+                    cashSubmit(response.data.id).then(res => {
+                      this.$toast.success('提交成功');
+                      setTimeout(function(){
+                        history.go(-1)
+                      },2000)
+                    })
+                  })
+                }else{
+                  cashSubmit(response.data.id).then(res => {
+                    this.$toast.success('提交成功');
+                    setTimeout(function(){
+                      history.go(-1)
+                    },2000)
+                  })
+                }
+              })
             })
-          }
-        });
+          });
+        }
       },
       goUpdate(){
         if(this.chargeItme.length<1){
@@ -558,28 +621,64 @@
             return;
           }
         }
-        this.$set(this.form, "payeeList", this.chargeItme);
-        this.$set(this.form, "bankTypeList", this.chargeItme);
-        this.$set(this.form, "accountTypeList", this.chargeItme);
-        this.$set(this.form, "transferStatusList", this.chargeItme);
-        this.projectForm.outId = this.form.id
-        addTransfer(this.form).then((response) => {
-          this.projectForm.outId = response.data.id
-          this.$set(this.projectForm, "ynType", '1');
-          if(this.form.capitalExpenditureType==2){
-            addProjectto(this.projectForm).then(res => {
-              this.$toast.success('保存成功');
-              setTimeout(function(){
-                history.go(-1)
-              },2000)
+        if(this.uploadFiles==null||this.uploadFiles.length==0){
+          addCash(this.form).then((response) => {
+            this.chargeItme.map(res => {
+              res.cashId = response.data.id
+              addCashdetail(res).then(r => {
+                if(this.form.capitalExpenditureType==2){
+                  this.projectForm.outId = response.data.id
+                  this.$set(this.projectForm, "ynType", '2');
+                  addProjectto(this.projectForm).then(res => {
+                    this.$toast.success('保存成功');
+                    setTimeout(function(){
+                      history.go(-1)
+                    },2000)
+                  })
+                }else{
+                  this.$toast.success('保存成功');
+                  setTimeout(function(){
+                    history.go(-1)
+                  },2000)
+                }
+              })
             })
-          }else{
-            this.$toast.success('保存成功');
-            setTimeout(function(){
-              history.go(-1)
-            },2000)
-          }
-        });
+          });
+        }else{
+          addCash(this.form).then((response) => {
+            console.log(this.uploadFiles)
+            this.uploadFiles.map(rr => {
+              const params = new FormData();
+              params.append("tableId", response.data.id);
+              params.append("tableName", "t_yinnong_cash");
+              params.append("bizPath", "upload");
+              params.append("fileType", "0");
+              params.append("file", rr);
+              commonAttach(params).then((r) => {
+              })
+            })
+            this.chargeItme.map(res => {
+              res.cashId = response.data.id
+              addCashdetail(res).then(r => {
+                if(this.form.capitalExpenditureType==2){
+                  this.projectForm.outId = response.data.id
+                  this.$set(this.projectForm, "ynType", '2');
+                  addProjectto(this.projectForm).then(res => {
+                    this.$toast.success('保存成功');
+                    setTimeout(function(){
+                      history.go(-1)
+                    },2000)
+                  })
+                }else{
+                  this.$toast.success('保存成功');
+                  setTimeout(function(){
+                    history.go(-1)
+                  },2000)
+                }
+              })
+            })
+          });
+        }
       },
       payeeSelectChange(select, i) {
         let obj = {};
@@ -638,7 +737,7 @@
           this.$set(this.form, "deptId", obj.deptId);
           this.$set(this.form, "cashierId", obj.id);
           this.$set(this.form, "payer", obj.accountName);
-          this.$set(this.form, "payerAccount", obj.bankAccountNumber);
+          this.$set(this.form, "payerAccount", obj.balance);
           this.$set(this.form, "operatorCode", obj.operatorCode);
           this.$set(this.form, "enterpriseCode", obj.enterpriseCode);
           this.$set(this.form, "payerFrom", '1');
@@ -669,33 +768,25 @@
             this.$set(this.form, "deptId", '');
             this.$set(this.form, "cashierId", obj.id);
             this.$set(this.form, "payer", obj.accountName);
-            if(obj.payerFrom==6){
-              getQmyeFlow(obj.bankAccountNumber).then((response) => {
-                this.$set(this.form, "payerAccount", response.data);
-              });
-            }else {
-              this.$set(this.form, "payerAccount", obj.bankAccountNumber);
-            }
+            this.$set(this.form, "payerAccount", obj.balance);
+
           }
         }
       },
       beforeRead(file) {
-        console.log(file)
-        console.log(this.fileList)
-        const params = new FormData();
-        params.append("tableId", this.$route.query.id);
-        params.append("tableName", "t_yinnong_transfer");
-        params.append("bizPath", "upload");
-        params.append("fileType", "0");
-        params.append("file", file.file);
-        commonAttach(params).then((response) => {
-          console.log(response)
+        this.uploadFiles.push(file.file);
+      },
+      deleteFile(file){
+        this.uploadFiles.map((response,index) => {
+          if(file.file == response){
+            this.uploadFiles.splice(index,1)
+          }
         })
       },
       getFileList(){
         let oData= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_transfer",
+          tableName: "t_yinnong_cash",
           bizPath: "upload",
           fileType: "0",
         }
@@ -703,7 +794,6 @@
           console.log(res)
           console.log(location.protocol+"//"+location.host+request.defaults.baseURL)
           res.rows.map(r => {
-
             let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
             this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{})})
             console.log(r)
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd12.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd12.vue
index c16c8cab..c4b07227 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd12.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd12.vue
@@ -217,7 +217,7 @@
       </div>
       <p class="main_title">上传附件</p>
       <div class="main_box" style="padding: 5px 0 0 8px;">
-        <van-uploader v-model="fileList" :after-read="beforeRead" ></van-uploader>
+        <van-uploader v-model="fileList" :after-read="beforeRead" @delete="deleteFile"></van-uploader>
       </div>
       <div style="padding: 16px 0;">
         <van-row>
@@ -341,7 +341,6 @@
         })
       });
       this.getDictionaries();
-      this.getFileList();
     },
     methods: {
       // 表单重置
@@ -408,18 +407,16 @@
           this.$notify({ type: 'danger', message: '请勿添加多个空列表信息' });
           return;
         }
-        this.getDicts("bank_type").then(res => {
-          this.chargeItme.splice(index + 1, 0, {
-            payeeId: "", //收款方ID
-            payee: "", //收款方
-            payeeAccount: "", //收款账户
-            bankDeposit: "", //开户银行
-            incomeAmount: "", //收入金额
-            bankType: "", //所属银行
-            bankTypeText:"", //所属银行
-            showPayee:false,
-            showbankType:false
-          });
+        this.chargeItme.splice(index + 1, 0, {
+          payeeId: "", //收款方ID
+          payee: "", //收款方
+          payeeAccount: "", //收款账户
+          bankDeposit: "", //开户银行
+          incomeAmount: "", //收入金额
+          bankType: "", //所属银行
+          bankTypeText:"", //所属银行
+          showPayee:false,
+          showbankType:false
         });
       },
       getPayeeList() {
@@ -770,7 +767,7 @@
       getFileList(){
         let oData= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_transfer",
+          tableName: "t_yinnong_cash",
           bizPath: "upload",
           fileType: "0",
         }
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd2.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd2.vue
index cc40afbf..461ade08 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd2.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd2.vue
@@ -194,8 +194,8 @@
               @cancel="item.showPayee = false"
             />
           </van-popup>
-          <van-field required :rules="[{ required: true , message:'收款账户不能为空' }]" v-model="item.payeeAccount" label="收款账户" placeholder="请选择收款方" input-align="right" label-width="auto"/>
-          <van-field required :rules="[{ required: true , message:'开户银行不能为空' }]" v-model="item.bankDeposit" label="开户银行" placeholder="请选择收款方" input-align="right" label-width="auto"/>
+          <van-field required readonly :rules="[{ required: true , message:'收款账户不能为空' }]" v-model="item.payeeAccount" label="收款账户" placeholder="请选择收款方" input-align="right" label-width="auto"/>
+          <van-field required readonly :rules="[{ required: true , message:'开户银行不能为空' }]" v-model="item.bankDeposit" label="开户银行" placeholder="请选择收款方" input-align="right" label-width="auto"/>
           <van-field required :rules="[{ required: true , message:'请输入金额' }]" v-model="item.incomeAmount" type="number"  label="收入金额" placeholder="请输入金额" input-align="right" label-width="auto" @change="moneyChange"/>
           <van-field
             readonly
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd4.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd4.vue
index f3586fe1..dd8625a0 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd4.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd4.vue
@@ -325,7 +325,6 @@
         })
       });
       this.getDictionaries();
-      this.getFileList();
     },
     methods: {
       // 表单重置
@@ -666,53 +665,14 @@
           return account.id === select; //筛选出匹配数据
         });
         console.log(obj)
-        if(obj.payerFrom==1&&obj.operatorCode != null && obj.operatorCode != "" &&
-          obj.enterpriseCode != null && obj.enterpriseCode != "" &&
-          obj.accountPassword != null && obj.accountPassword != ""){
           this.$set(this.form, "bookId", obj.bookId);
           this.$set(this.form, "deptId", obj.deptId);
           this.$set(this.form, "cashierId", obj.id);
-          this.$set(this.form, "payer", obj.accountName);
-          this.$set(this.form, "payerAccount", obj.bankAccountNumber);
+          this.$set(this.form, "payer", obj.payee);
+          this.$set(this.form, "payerAccount", obj.payeeAccount);
           this.$set(this.form, "operatorCode", obj.operatorCode);
           this.$set(this.form, "enterpriseCode", obj.enterpriseCode);
           this.$set(this.form, "payerFrom", '1');
-        }else{
-          if(obj.payerFrom==1){
-            this.diglogStatus = false;
-            this.$notify({ type: 'danger', message: "请完善付款方“支付口令”等信息！" });
-            this.$set(this.form,"payer","")
-            this.$set(this.form,"payerAccount","")
-          }else{
-            this.$set(this.form, "payerFrom", obj.parerFrom);
-            if(obj.operatorCode!=null&&obj.operatorCode!=''){
-              this.$set(this.form, "operatorCode", obj.operatorCode);
-            }else{
-              this.$set(this.form, "operatorCode", '');
-            }
-            if(obj.enterpriseCode!=null&&obj.enterpriseCode!=''){
-              this.$set(this.form, "enterpriseCode", obj.enterpriseCode);
-            }else{
-              this.$set(this.form, "enterpriseCode", '');
-            }
-            if(obj.accountPassword!=null&&obj.accountPassword!=''){
-              this.$set(this.form, "accountPassword", obj.accountPassword);
-            }else{
-              this.$set(this.form, "accountPassword", '');
-            }
-            this.$set(this.form, "bookId",'');
-            this.$set(this.form, "deptId", '');
-            this.$set(this.form, "cashierId", obj.id);
-            this.$set(this.form, "payer", obj.accountName);
-            if(obj.payerFrom==6){
-              getQmyeFlow(obj.bankAccountNumber).then((response) => {
-                this.$set(this.form, "payerAccount", response.data);
-              });
-            }else {
-              this.$set(this.form, "payerAccount", obj.bankAccountNumber);
-            }
-          }
-        }
       },
       beforeRead(file) {
         console.log(file)
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd5.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd5.vue
index 6daf0524..3a179ae2 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd5.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd5.vue
@@ -212,7 +212,7 @@
       </div>
       <p class="main_title">上传附件</p>
       <div class="main_box" style="padding: 5px 0 0 8px;">
-        <van-uploader v-model="fileList" :after-read="beforeRead" ></van-uploader>
+        <van-uploader v-model="fileList" :after-read="beforeRead" @delete="deleteFile"></van-uploader>
       </div>
       <div style="padding: 16px 0;">
         <van-row>
@@ -240,6 +240,7 @@
     listVaccount
   } from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
   import request from '@/utils/request'
+  import Dialog from "vant/lib/dialog";
   export default {
     name: "approvalAdd5",
     data() {
@@ -295,7 +296,8 @@
           outId:null,
           ynType:'1'
         },
-        projectFundType:''
+        projectFundType:'',
+        uploadFiles:[],
       };
     },
     created() {
@@ -332,7 +334,6 @@
         })
       });
       this.getDictionaries();
-      this.getFileList();
     },
     methods: {
       // 表单重置
@@ -393,7 +394,7 @@
             this.bankTypeDictionaries.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
           }
         });
-        this.getPayeeList();
+
       },
       getError(e){
         console.log(e)
@@ -429,18 +430,25 @@
             showbankType:false
           });
         });
+        this.getPayeeList();
       },
       getPayeeList() {
         //普通转账
         this.queryParams.accountType = this.form.accountType
         this.queryParams.status = "0"
-        listVaccount(this.queryParams).then((response) => {
-          this.payeeList = response.rows;
-          response.rows.map((res,index) => {
-            this.payeeList[index].text = res.payee;
-            this.payeeList[index].value = res.id;
-          })
-        });
+        if(this.form.cashierId==null||this.form.cashierId==""){
+          this.$notify({ type: 'danger', message: '请先选择付款方！' });
+          return;
+        }else {
+          this.queryParams.taccountId = parseInt(this.form.cashierId)
+          listVaccount(this.queryParams).then((response) => {
+            this.payeeList = response.rows;
+            response.rows.map((res,index) => {
+              this.payeeList[index].text = res.payee;
+              this.payeeList[index].value = res.id;
+            })
+          });
+        }
       },
       payeeDictLabel(datas, value) {
         let actions = [];
@@ -513,15 +521,22 @@
       },
       accountTypeChange(e){
         this.payeeList = [];
+        this.chargeItme = [];
         this.queryParams.accountType = this.form.accountType
-        this.queryParams.status = "0"
-        listPayee(this.queryParams).then((response ) => {
-          this.payeeList = response.rows;
-          response.rows.map((res,index) => {
-            this.payeeList[index].text = res.payee;
-            this.payeeList[index].value = res.id;
-          })
-        });
+        if(this.form.cashierId==null||this.form.cashierId==""){
+          this.$notify({ type: 'danger', message: '请先选择付款方！' });
+          return;
+        }else {
+          this.queryParams.taccountId = parseInt(this.form.cashierId)
+          console.log(this.queryParams)
+          listVaccount(this.queryParams).then((response) => {
+            this.payeeList = response.rows;
+            response.rows.map((res,index) => {
+              this.payeeList[index].text = res.payee;
+              this.payeeList[index].value = res.id;
+            })
+          });
+        }
       },
       // 钱计算
       moneyChange(input) {
@@ -556,31 +571,130 @@
             return;
           }
         }
-        this.$set(this.form, "payeeList", this.chargeItme);
-        this.$set(this.form, "bankTypeList", this.chargeItme);
-        this.$set(this.form, "accountTypeList", this.chargeItme);
-        this.$set(this.form, "transferStatusList", this.chargeItme);
-        addTransfer(this.form).then(response => {
-          this.projectForm.outId = response.data.id
-          this.$set(this.projectForm, "ynType", '1');
-          if(this.form.capitalExpenditureType==2){
-            addProjectto(this.projectForm).then(res => {
-              customSubmit(response.data.id).then(res => {
-                this.$toast.success('提交成功');
-                setTimeout(function(){
-                  history.go(-1)
-                },2000)
-              })
-            })
-          }else{
-            customSubmit(response.data.id).then(res => {
-              this.$toast.success('提交成功');
-              setTimeout(function(){
-                history.go(-1)
-              },2000)
+        if(this.uploadFiles==null||this.uploadFiles.length==0){
+          Dialog.confirm({
+            title: '提示',
+            message: '此申请单中未上传任何附件，是否确认提交？',
+          })
+            .then(() => {
+              this.$set(this.form, "payeeList", this.chargeItme);
+              this.$set(this.form, "bankTypeList", this.chargeItme);
+              this.$set(this.form, "accountTypeList", this.chargeItme);
+              this.$set(this.form, "transferStatusList", this.chargeItme);
+              addTransfer(this.form).then(response => {
+                this.projectForm.outId = response.data.id
+                this.$set(this.projectForm, "ynType", '1');
+                if(this.uploadFiles!=null&&this.uploadFiles.length>0){
+                  this.uploadFiles.map(rr => {
+                    const params = new FormData();
+                    params.append("tableId", response.data.id);
+                    params.append("tableName", "t_yinnong_transfer");
+                    params.append("bizPath", "upload");
+                    params.append("fileType", "0");
+                    params.append("file", rr);
+                    commonAttach(params).then((r) => {
+                    })
+                  })
+                  if(this.form.capitalExpenditureType==2){
+                    addProjectto(this.projectForm).then(res => {
+                      customSubmit(response.data.id).then(res => {
+                        this.$toast.success('提交成功');
+                        setTimeout(function(){
+                          history.go(-1)
+                        },2000)
+                      })
+                    })
+                  }else{
+                    customSubmit(response.data.id).then(res => {
+                      this.$toast.success('提交成功');
+                      setTimeout(function(){
+                        history.go(-1)
+                      },2000)
+                    })
+                  }
+                }else{
+                  if(this.form.capitalExpenditureType==2){
+                    addProjectto(this.projectForm).then(res => {
+                      customSubmit(response.data.id).then(res => {
+                        this.$toast.success('提交成功');
+                        setTimeout(function(){
+                          history.go(-1)
+                        },2000)
+                      })
+                    })
+                  }else{
+                    customSubmit(response.data.id).then(res => {
+                      this.$toast.success('提交成功');
+                      setTimeout(function(){
+                        history.go(-1)
+                      },2000)
+                    })
+                  }
+                }
+              });
             })
-          }
-        });
+            .catch(() => {
+              return false;
+            });
+        }else{
+          this.$set(this.form, "payeeList", this.chargeItme);
+          this.$set(this.form, "bankTypeList", this.chargeItme);
+          this.$set(this.form, "accountTypeList", this.chargeItme);
+          this.$set(this.form, "transferStatusList", this.chargeItme);
+          addTransfer(this.form).then(response => {
+            this.projectForm.outId = response.data.id
+            this.$set(this.projectForm, "ynType", '1');
+            if(this.uploadFiles!=null&&this.uploadFiles.length>0){
+              this.uploadFiles.map(rr => {
+                const params = new FormData();
+                params.append("tableId", response.data.id);
+                params.append("tableName", "t_yinnong_transfer");
+                params.append("bizPath", "upload");
+                params.append("fileType", "0");
+                params.append("file", rr);
+                commonAttach(params).then((r) => {
+                })
+              })
+              if(this.form.capitalExpenditureType==2){
+                addProjectto(this.projectForm).then(res => {
+                  customSubmit(response.data.id).then(res => {
+                    this.$toast.success('提交成功');
+                    setTimeout(function(){
+                      history.go(-1)
+                    },2000)
+                  })
+                })
+              }else{
+                customSubmit(response.data.id).then(res => {
+                  this.$toast.success('提交成功');
+                  setTimeout(function(){
+                    history.go(-1)
+                  },2000)
+                })
+              }
+            }else{
+              if(this.form.capitalExpenditureType==2){
+                addProjectto(this.projectForm).then(res => {
+                  customSubmit(response.data.id).then(res => {
+                    this.$toast.success('提交成功');
+                    setTimeout(function(){
+                      history.go(-1)
+                    },2000)
+                  })
+                })
+              }else{
+                customSubmit(response.data.id).then(res => {
+                  this.$toast.success('提交成功');
+                  setTimeout(function(){
+                    history.go(-1)
+                  },2000)
+                })
+              }
+            }
+          });
+        }
+
+
       },
       goUpdate(){
         if(this.chargeItme.length<1){
@@ -605,23 +719,51 @@
         this.$set(this.form, "bankTypeList", this.chargeItme);
         this.$set(this.form, "accountTypeList", this.chargeItme);
         this.$set(this.form, "transferStatusList", this.chargeItme);
-        this.projectForm.outId = this.form.id
+        console.log(this.form)
         addTransfer(this.form).then((response) => {
           this.projectForm.outId = response.data.id
           this.$set(this.projectForm, "ynType", '1');
-          if(this.form.capitalExpenditureType==2){
-            addProjectto(this.projectForm).then(res => {
+          if(this.uploadFiles!=null&&this.uploadFiles.length>0){
+            console.log(this.uploadFiles)
+            this.uploadFiles.map(rr => {
+              const params = new FormData();
+              params.append("tableId", response.data.id);
+              params.append("tableName", "t_yinnong_transfer");
+              params.append("bizPath", "upload");
+              params.append("fileType", "0");
+              params.append("file", rr);
+              commonAttach(params).then((r) => {
+              })
+            })
+            if(this.form.capitalExpenditureType==2){
+              addProjectto(this.projectForm).then(res => {
+                this.$toast.success('保存成功');
+                setTimeout(function(){
+                  history.go(-1)
+                },2000)
+              })
+            }else{
               this.$toast.success('保存成功');
               setTimeout(function(){
                 history.go(-1)
               },2000)
-            })
+            }
           }else{
-            this.$toast.success('保存成功');
-            setTimeout(function(){
-              history.go(-1)
-            },2000)
+            if(this.form.capitalExpenditureType==2){
+              addProjectto(this.projectForm).then(res => {
+                this.$toast.success('保存成功');
+                setTimeout(function(){
+                  history.go(-1)
+                },2000)
+              })
+            }else{
+              this.$toast.success('保存成功');
+              setTimeout(function(){
+                history.go(-1)
+              },2000)
+            }
           }
+
         });
       },
       payeeSelectChange(select, i) {
@@ -723,16 +865,13 @@
         }
       },
       beforeRead(file) {
-        console.log(file)
-        console.log(this.fileList)
-        const params = new FormData();
-        params.append("tableId", this.$route.query.id);
-        params.append("tableName", "t_yinnong_transfer");
-        params.append("bizPath", "upload");
-        params.append("fileType", "0");
-        params.append("file", file.file);
-        commonAttach(params).then((response) => {
-          console.log(response)
+        this.uploadFiles.push(file.file);
+      },
+      deleteFile(file){
+        this.uploadFiles.map((response,index) => {
+          if(file.file == response){
+            this.uploadFiles.splice(index,1)
+          }
         })
       },
       getFileList(){
@@ -746,7 +885,6 @@
           console.log(res)
           console.log(location.protocol+"//"+location.host+request.defaults.baseURL)
           res.rows.map(r => {
-
             let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
             this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{})})
             console.log(r)
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail.vue
index e14147e4..8a1329b3 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail.vue
@@ -7,7 +7,7 @@
       @click-left="$router.back(-1)"
     >
       <template #title>
-        <p style="font-weight: bold;">查看付款申请</p>
+        <p style="font-weight: bold;">查看常用转账申请</p>
       </template>
       <template #right>
         <van-icon name="../../../static/images/icon/icon_flow.png" size="20" @click="goFlow"/>
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail10.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail10.vue
index b1bac363..989cec01 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail10.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail10.vue
@@ -43,11 +43,6 @@
     </div>
 
     <p class="main_title">收款方信息</p>
-
-    <div class="main_box" style="margin-bottom: 15px;">
-      <van-field readonly label="收款账户类型" v-model="form.accountType == 1 ? '公户':'私户'" input-align="right" label-width="auto" />
-    </div>
-
     <div :style="{position:'relative',padding: index == 0 ? '':'10px 0 0 0'}" v-for="(item, index) in chargeItme" :key="index">
       <div class="main_box" style="margin-bottom: 10px;position:relative;">
         <van-field readonly label="收款方" v-model="item.payee" input-align="right" />
@@ -116,9 +111,10 @@
           projectBillNum:null,
           projectFundType:'1',
           outId:null,
-          ynType:'1'
+          ynType:'2'
         },
-        projectFundType:''
+        projectFundType:'',
+        uploadFiles:[],
       };
     },
     created() {
@@ -144,7 +140,7 @@
     },
     methods: {
       goFlow(){
-        window.location='approvalProcess?id='+this.$route.query.id;
+        window.location='approvalProcess2?id='+this.$route.query.id;
       },
       getDictionaries(){
         getCash(this.$route.query.id).then((response) => {
@@ -349,22 +345,19 @@
         });
       },
       beforeRead(file) {
-        console.log(file)
-        console.log(this.fileList)
-        const params = new FormData();
-        params.append("tableId", this.$route.query.id);
-        params.append("tableName", "t_yinnong_cash");
-        params.append("bizPath", "upload");
-        params.append("fileType", "0");
-        params.append("file", file.file);
-        commonAttach(params).then((response) => {
-          console.log(response)
+        this.uploadFiles.push(file.file);
+      },
+      deleteFile(file){
+        this.uploadFiles.map((response,index) => {
+          if(file.file == response){
+            this.uploadFiles.splice(index,1)
+          }
         })
       },
       getFileList(){
         let oData= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_transfer",
+          tableName: "t_yinnong_cash",
           bizPath: "upload",
           fileType: "0",
         }
@@ -372,7 +365,6 @@
           console.log(res)
           console.log(location.protocol+"//"+location.host+request.defaults.baseURL)
           res.rows.map(r => {
-
             let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
             this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{})})
             console.log(r)
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail11.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail11.vue
index 84fa0a0f..1ea635b8 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail11.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail11.vue
@@ -47,10 +47,9 @@
     <div :style="{position:'relative',padding: index == 0 ? '':'10px 0 0 0'}" v-for="(item, index) in chargeItme" :key="index">
       <div class="main_box" style="margin-bottom: 10px;position:relative;">
         <van-field readonly label="收款方" v-model="item.payee" input-align="right" />
-        <van-field readonly label="收款账户" v-model="item.payeeAccount" input-align="right" label-width="auto"/>
-        <van-field readonly label="开户银行" v-model="item.bankDeposit" input-align="right" label-width="auto"/>
-        <van-field readonly label="收入金额" v-model="item.incomeAmount" input-align="right" label-width="auto"/>
-        <van-field readonly label="所属银行" v-model="item.bankTypeText" input-align="right" />
+        <van-field readonly label="提款人" v-model="item.drawer" input-align="right" label-width="auto"/>
+        <van-field readonly label="提款金额" v-model="item.incomeAmount" input-align="right" label-width="auto"/>
+        <van-field readonly label="资金用途" v-model="item.remark" input-align="right" label-width="auto"/>
       </div>
     </div>
     <p class="main_title">上传附件</p>
@@ -145,7 +144,7 @@
     },
     methods: {
       goFlow(){
-        window.location='approvalProcess?id='+this.$route.query.id;
+        window.location='approvalProcess2?id='+this.$route.query.id;
       },
       getDictionaries(){
         getCash(this.$route.query.id).then((response) => {
@@ -350,22 +349,19 @@
         });
       },
       beforeRead(file) {
-        console.log(file)
-        console.log(this.fileList)
-        const params = new FormData();
-        params.append("tableId", this.$route.query.id);
-        params.append("tableName", "t_yinnong_cash");
-        params.append("bizPath", "upload");
-        params.append("fileType", "0");
-        params.append("file", file.file);
-        commonAttach(params).then((response) => {
-          console.log(response)
+        this.uploadFiles.push(file.file);
+      },
+      deleteFile(file){
+        this.uploadFiles.map((response,index) => {
+          if(file.file == response){
+            this.uploadFiles.splice(index,1)
+          }
         })
       },
       getFileList(){
         let oData= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_transfer",
+          tableName: "t_yinnong_cash",
           bizPath: "upload",
           fileType: "0",
         }
@@ -373,7 +369,6 @@
           console.log(res)
           console.log(location.protocol+"//"+location.host+request.defaults.baseURL)
           res.rows.map(r => {
-
             let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
             this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{})})
             console.log(r)
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail12.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail12.vue
index e6cc3bbe..42ce3766 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail12.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail12.vue
@@ -97,10 +97,10 @@
     <div :style="{position:'relative',padding: index == 0 ? '':'10px 0 0 0'}" v-for="(item, index) in chargeItme" :key="index">
       <div class="main_box" style="margin-bottom: 10px;position:relative;">
         <van-field readonly label="收款方" v-model="item.payee" input-align="right" />
-        <van-field readonly label="收款账户" v-model="item.payeeAccount" input-align="right" label-width="auto"/>
-        <van-field readonly label="开户银行" v-model="item.bankDeposit" input-align="right" label-width="auto"/>
-        <van-field readonly label="收入金额" v-model="item.incomeAmount" input-align="right" label-width="auto"/>
-        <van-field readonly label="所属银行" v-model="item.bankTypeText" input-align="right" />
+        <van-field readonly label="联系方式" v-model="item.phone" input-align="right" label-width="auto"/>
+        <van-field readonly label="所属单位" v-model="item.unit" input-align="right" label-width="auto"/>
+        <van-field readonly label="负责人全称" v-model="item.leader" input-align="right" label-width="auto"/>
+        <van-field readonly label="资金用途" v-model="item.remark" input-align="right" />
       </div>
     </div>
     <p class="main_title">上传附件</p>
@@ -170,7 +170,9 @@
           outId:null,
           ynType:'1'
         },
-        projectFundType:''
+        projectFundType:'',
+        orderTypeName:'',
+        orderTypeOptions:[]
       };
     },
     created() {
@@ -191,12 +193,15 @@
         }
         this.projectFundTypeDictionaries = response.data;
       });
+      this.getDicts("order_type").then(response => {
+        this.orderTypeOptions = response.data;
+      });
       this.getDictionaries();
       this.getFileList();
     },
     methods: {
       goFlow(){
-        window.location='approvalProcess?id='+this.$route.query.id;
+        window.location='approvalProcess2?id='+this.$route.query.id;
       },
       getDictionaries(){
         getCash(this.$route.query.id).then((response) => {
@@ -220,6 +225,12 @@
             this.showproject = false
           }
           this.form = response.data;
+          this.orderTypeOptions.map(res => {
+            console.log(this.orderTypeOptions)
+            if(res.dictValue==this.form.orderType){
+              this.orderTypeName = res.dictLabel
+            }
+          })
         });
         console.log(this.$route.query.id)
         listCashdetailByCashId(this.$route.query.id).then((response) => {
@@ -401,22 +412,19 @@
         });
       },
       beforeRead(file) {
-        console.log(file)
-        console.log(this.fileList)
-        const params = new FormData();
-        params.append("tableId", this.$route.query.id);
-        params.append("tableName", "t_yinnong_cash");
-        params.append("bizPath", "upload");
-        params.append("fileType", "0");
-        params.append("file", file.file);
-        commonAttach(params).then((response) => {
-          console.log(response)
+        this.uploadFiles.push(file.file);
+      },
+      deleteFile(file){
+        this.uploadFiles.map((response,index) => {
+          if(file.file == response){
+            this.uploadFiles.splice(index,1)
+          }
         })
       },
       getFileList(){
         let oData= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_transfer",
+          tableName: "t_yinnong_cash",
           bizPath: "upload",
           fileType: "0",
         }
@@ -424,7 +432,6 @@
           console.log(res)
           console.log(location.protocol+"//"+location.host+request.defaults.baseURL)
           res.rows.map(r => {
-
             let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
             this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{})})
             console.log(r)
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail5.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail5.vue
index abbeba21..59e13215 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail5.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail5.vue
@@ -7,7 +7,7 @@
       @click-left="$router.back(-1)"
     >
       <template #title>
-        <p style="font-weight: bold;">查看付款申请</p>
+        <p style="font-weight: bold;">查看母子转站申请</p>
       </template>
       <template #right>
         <van-icon name="../../../static/images/icon/icon_flow.png" size="20" @click="goFlow"/>
@@ -292,12 +292,9 @@
         this.$set(this.form, "bankTypeList", this.chargeItme);
         this.$set(this.form, "accountTypeList", this.chargeItme);
         this.$set(this.form, "transferStatusList", this.chargeItme);
-        console.log(this.form);
         updateTransfer(this.form).then(response => {
-          console.log(response);
           this.projectForm.outId = this.form.id
           this.$set(this.projectForm, "ynType", '1');
-          console.log(this.projectForm)
           if(this.form.capitalExpenditureType==2){
             addProjectto(this.projectForm).then(res => {
               customSubmit(this.form.id).then(res => {
@@ -356,16 +353,13 @@
         });
       },
       beforeRead(file) {
-        console.log(file)
-        console.log(this.fileList)
-        const params = new FormData();
-        params.append("tableId", this.$route.query.id);
-        params.append("tableName", "t_yinnong_transfer");
-        params.append("bizPath", "upload");
-        params.append("fileType", "0");
-        params.append("file", file.file);
-        commonAttach(params).then((response) => {
-          console.log(response)
+        this.uploadFiles.push(file.file);
+      },
+      deleteFile(file){
+        this.uploadFiles.map((response,index) => {
+          if(file.file == response){
+            this.uploadFiles.splice(index,1)
+          }
         })
       },
       getFileList(){
@@ -379,7 +373,6 @@
           console.log(res)
           console.log(location.protocol+"//"+location.host+request.defaults.baseURL)
           res.rows.map(r => {
-
             let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
             this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{})})
             console.log(r)
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalList4.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalList4.vue
index 1b1cbd74..aa693035 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalList4.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalList4.vue
@@ -8,7 +8,7 @@
         @click-right="goAdd()"
       >
         <template #title>
-          <p style="font-weight: bold;">虚拟专账申请列表</p>
+          <p style="font-weight: bold;">虚拟转账申请列表</p>
         </template>
         <template #right>
           <van-icon name="add" size="18"/>
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalList5.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalList5.vue
index 20c9ac6a..542bffdf 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalList5.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalList5.vue
@@ -22,7 +22,7 @@
         @load="getList"
       >
         <van-swipe-cell v-for="(item,index) in applicationList" :key="index">
-          <van-cell :title="item.payer" :value="item.auditStatus" center :to="{name:'approvalDetail', query: {id:item.id}}">
+          <van-cell :title="item.payer" :value="item.auditStatus" center :to="{name:'approvalDetail5', query: {id:item.id}}">
             <template #icon>
               <van-icon name="../../../../../static/images/onlineHome/yinnongList4.png" size="22" color="#539FFD" style="margin-right: 10px;" />
             </template>
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify10.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify10.vue
index e7370db1..6c25c644 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify10.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify10.vue
@@ -172,7 +172,7 @@
       </div>
       <p class="main_title">上传附件</p>
       <div class="main_box" style="padding: 5px 0 0 8px;">
-        <van-uploader v-model="fileList" :after-read="beforeRead" ></van-uploader>
+        <van-uploader v-model="fileList" :after-read="beforeRead" @delete="deleteFile"></van-uploader>
       </div>
       <div style="padding: 16px 0;">
         <van-row>
@@ -194,10 +194,11 @@
   import request from '@/utils/request';
   import {
     addCash,
-    addCashdetail, attachmentList, commonAttach,
+    addCashdetail, attachmentList, cashSubmit, commonAttach,
     getCash,
-    listCashdetailByCashId, updateCash
+    listCashdetailByCashId, systemAttachment, updateCash
   } from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
+  import Dialog from "vant/lib/dialog";
   export default {
     name: "approvalModify10",
     data() {
@@ -211,7 +212,7 @@
         showpayer:false,
 
         minDate: new Date(),
-        maxDate: new Date(2025, 10, 1),
+        maxDate: new Date(2050, 10, 1),
         currentDate: new Date(),
         form:{},
 
@@ -255,6 +256,7 @@
         },
         projectFundType:'',
         fileList:[],
+        uploadFiles:[],
       };
     },
     created() {
@@ -320,12 +322,9 @@
         });
       },
       getChange(){
-        console.log(this.buttonType)
         if(this.buttonType == 'update'){
-          console.log('update')
           this.goUpdate();
         }else if(this.buttonType == 'add'){
-          console.log('add')
           this.goAdd();
         }
       },
@@ -487,27 +486,78 @@
         this.$set(this.form, "bankTypeList", this.chargeItme);
         this.$set(this.form, "accountTypeList", this.chargeItme);
         this.$set(this.form, "transferStatusList", this.chargeItme);
-        addCash(this.form).then(response => {
-          this.projectForm.outId = response.data.id
-          this.$set(this.projectForm, "ynType", '2');
-          if(this.form.capitalExpenditureType==2){
-            addProjectto(this.projectForm).then(res => {
-              customSubmit(response.data.id).then(res => {
-                this.$toast.success('提交成功');
-                setTimeout(function(){
-                  history.go(-1)
-                },2000)
+        if((this.uploadFiles==null||this.uploadFiles.length==0)&&(this.fileList==null||this.fileList.length==0)){
+          Dialog.confirm({
+            title: '提示',
+            message: '此申请单中未上传任何附件，是否确认提交？',
+          })
+          .then(() => {
+            updateCash(this.form).then((response) => {
+              this.chargeItme.map(res => {
+                res.cashId = this.form.id
+                addCashdetail(res).then(r => {
+                  if(this.form.capitalExpenditureType==2){
+                    this.projectForm.outId = this.form.id
+                    this.$set(this.projectForm, "ynType", '2');
+                    addProjectto(this.projectForm).then(res => {
+                      cashSubmit(this.form.id).then(res => {
+                        this.$toast.success('提交成功');
+                        setTimeout(function(){
+                          history.go(-1)
+                        },2000)
+                      })
+                    })
+                  }else{
+                    cashSubmit(this.form.id).then(res => {
+                      this.$toast.success('提交成功');
+                      setTimeout(function(){
+                        history.go(-1)
+                      },2000)
+                    })
+                  }
+                })
+              })
+            });
+          })
+        }else {
+          updateCash(this.form).then((response) => {
+            console.log(this.uploadFiles)
+            this.uploadFiles.map(rr => {
+              const params = new FormData();
+              params.append("tableId", this.form.id);
+              params.append("tableName", "t_yinnong_cash");
+              params.append("bizPath", "upload");
+              params.append("fileType", "0");
+              params.append("file", rr);
+              commonAttach(params).then((r) => {
               })
             })
-          }else{
-            customSubmit(response.data.id).then(res => {
-              this.$toast.success('提交成功');
-              setTimeout(function(){
-                history.go(-1)
-              },2000)
+            this.chargeItme.map(res => {
+              res.cashId = this.form.id
+              addCashdetail(res).then(r => {
+                if(this.form.capitalExpenditureType==2){
+                  this.projectForm.outId = this.form.id
+                  this.$set(this.projectForm, "ynType", '2');
+                  addProjectto(this.projectForm).then(res => {
+                    cashSubmit(this.form.id).then(res => {
+                      this.$toast.success('提交成功');
+                      setTimeout(function(){
+                        history.go(-1)
+                      },2000)
+                    })
+                  })
+                }else{
+                  cashSubmit(this.form.id).then(res => {
+                    this.$toast.success('提交成功');
+                    setTimeout(function(){
+                      history.go(-1)
+                    },2000)
+                  })
+                }
+              })
             })
-          }
-        });
+          });
+        }
       },
       goUpdate(){
         if(this.chargeItme.length<1){
@@ -529,28 +579,65 @@
           }
         }
         this.projectForm.outId = this.form.id
-        updateCash(this.form).then((response) => {
-          this.chargeItme.map(res => {
-            res.cashId = this.form.id
-            addCashdetail(res).then(r => {
-              if(this.form.capitalExpenditureType==2){
-                this.projectForm.outId = this.form.id
-                this.$set(this.projectForm, "ynType", '2');
-                addProjectto(this.projectForm).then(res => {
+        if(this.uploadFiles==null||this.uploadFiles.length==0){
+          updateCash(this.form).then((response) => {
+            this.chargeItme.map(res => {
+              res.cashId = this.form.id
+              addCashdetail(res).then(r => {
+                if(this.form.capitalExpenditureType==2){
+                  this.projectForm.outId = this.form.id
+                  this.$set(this.projectForm, "ynType", '2');
+                  addProjectto(this.projectForm).then(res => {
+                    this.$toast.success('保存成功');
+                    setTimeout(function(){
+                      history.go(-1)
+                    },2000)
+                  })
+                }else{
                   this.$toast.success('保存成功');
                   setTimeout(function(){
                     history.go(-1)
                   },2000)
-                })
-              }else{
-                this.$toast.success('保存成功');
-                setTimeout(function(){
-                  history.go(-1)
-                },2000)
-              }
+                }
+              })
             })
-          })
-        });
+          });
+        }else {
+          updateCash(this.form).then((response) => {
+            console.log(this.uploadFiles)
+            this.uploadFiles.map(rr => {
+              const params = new FormData();
+              params.append("tableId", this.form.id);
+              params.append("tableName", "t_yinnong_cash");
+              params.append("bizPath", "upload");
+              params.append("fileType", "0");
+              params.append("file", rr);
+              commonAttach(params).then((r) => {
+              })
+            })
+            this.chargeItme.map(res => {
+              res.cashId = this.form.id
+              addCashdetail(res).then(r => {
+                if(this.form.capitalExpenditureType==2){
+                  this.projectForm.outId = this.form.id
+                  this.$set(this.projectForm, "ynType", '2');
+                  addProjectto(this.projectForm).then(res => {
+                    this.$toast.success('保存成功');
+                    setTimeout(function(){
+                      history.go(-1)
+                    },2000)
+                  })
+                }else{
+                  this.$toast.success('保存成功');
+                  setTimeout(function(){
+                    history.go(-1)
+                  },2000)
+                }
+              })
+            })
+          });
+        }
+
       },
       payeeSelectChange(select, i) {
         let obj = {};
@@ -651,17 +738,19 @@
         }
       },
       beforeRead(file) {
+        this.uploadFiles.push(file.file);
+      },
+      deleteFile(file){
         console.log(file)
-        console.log(this.fileList)
-        const params = new FormData();
-        params.append("tableId", this.$route.query.id);
-        params.append("tableName", "t_yinnong_cash");
-        params.append("bizPath", "upload");
-        params.append("fileType", "0");
-        params.append("file", file.file);
-        commonAttach(params).then((response) => {
-          console.log(response)
+        this.uploadFiles.map((response,index) => {
+          if(file.file == response){
+            this.uploadFiles.splice(index,1)
+          }
         })
+        if(file.id){
+          systemAttachment(file.id).then((res) => {
+          });
+        }
       },
       getFileList(){
         let oData= {
@@ -674,9 +763,8 @@
           console.log(res)
           console.log(location.protocol+"//"+location.host+request.defaults.baseURL)
           res.rows.map(r => {
-
             let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
-            this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{})})
+            this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{}),"id":r.id})
             console.log(r)
           })
         })
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify11.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify11.vue
index cffbace9..9b45f7af 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify11.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify11.vue
@@ -161,67 +161,20 @@
 
       <p class="main_title">收款方信息<van-button icon="plus" @click="addChargeItme(chargeItme.length)" size="mini" type="info" native-type="button" class="addFamily"/></p>
 
-      <div class="main_box" style="margin-bottom: 15px;">
-        <van-cell title="收款账户类型">
-          <template #right-icon>
-            <van-radio-group direction="horizontal" v-model="form.accountType" @change="accountTypeChange">
-              <van-radio name="1">公户</van-radio>
-              <van-radio name="2">私户</van-radio>
-            </van-radio-group>
-          </template>
-        </van-cell>
-      </div>
       <div :style="{position:'relative',padding: index == 0 ? '':'10px 0 0 0'}" v-for="(item, index) in chargeItme" :key="index">
         <van-button icon="minus" size="mini" type="danger" class="deleteFamily" native-type="button" v-if="index!=0" @click="deleteChargeItme(index)" />
         <div class="main_box" style="margin-bottom: 10px;position:relative;">
-          <van-field
-            readonly
-            clickable
-            label="收款方"
-            placeholder="请选择"
-            v-model="item.payee"
-            @click="item.showPayee = true"
-            input-align="right"
-            right-icon="arrow-down"
-            required
-            :rules="[{ required: true , message:'请选择收款方' }]"
-          />
-          <van-popup v-model="item.showPayee" position="bottom">
-            <van-picker
-              show-toolbar
-              :columns="payeeList"
-              @confirm="onConfirmPayee($event,index)"
-              @cancel="item.showPayee = false"
-            />
-          </van-popup>
-          <van-field required :rules="[{ required: true , message:'请输入账户' }]" v-model="item.payeeAccount" label="收款账户" placeholder="请输入账户" input-align="right" label-width="auto"/>
-          <van-field required :rules="[{ required: true , message:'请输入银行' }]" v-model="item.bankDeposit" label="开户银行" placeholder="请输入银行" input-align="right" label-width="auto"/>
-          <van-field required :rules="[{ required: true , message:'请输入金额' }]" v-model="item.incomeAmount" label="收入金额" placeholder="请输入金额" input-align="right" label-width="auto" @change="moneyChange"/>
-          <van-field
-            readonly
-            clickable
-            label="所属银行"
-            placeholder="请选择"
-            v-model="item.bankTypeText"
-            @click="item.showbankType = true"
-            input-align="right"
-            right-icon="arrow-down"
-            required
-            :rules="[{ required: true , message:'请选择所属银行' }]"
-          />
-          <van-popup v-model="item.showbankType" position="bottom">
-            <van-picker
-              show-toolbar
-              :columns="bankTypeDictionaries"
-              @confirm="onConfirmBankType($event,index)"
-              @cancel="item.showbankType = false"
-            />
-          </van-popup>
+          <div class="main_box" style="margin-bottom: 10px;position:relative;">
+            <van-field required :rules="[{ required: true , message:'请输入收款方全称' }]" v-model="item.payee" label="收款方" placeholder="请输入收款方全称" input-align="right" label-width="auto"/>
+            <van-field required :rules="[{ required: true , message:'请输入提款人' }]" v-model="item.drawer" label="提款人" placeholder="请输入提款人" input-align="right" label-width="auto"/>
+            <van-field required :rules="[{ required: true , message:'请输入提款金额' }]" v-model="item.incomeAmount" type="number"  label="提款金额（元）" placeholder="请输入提款金额" input-align="right" label-width="auto" @change="moneyChange"/>
+            <van-field required :rules="[{ required: true , message:'请输入资金用途' }]" v-model="item.remark" label="资金用途" placeholder="请输入资金用途" input-align="right" label-width="auto" />
+          </div>
         </div>
       </div>
       <p class="main_title">上传附件</p>
       <div class="main_box" style="padding: 5px 0 0 8px;">
-        <van-uploader v-model="fileList" :after-read="beforeRead" ></van-uploader>
+        <van-uploader v-model="fileList" :after-read="beforeRead" @delete="deleteFile"></van-uploader>
       </div>
       <div style="padding: 16px 0;">
         <van-row>
@@ -239,8 +192,15 @@
 </template>
 
 <script>
-  import { getAccount , getTransfer , queryTransferDetail , listPayee , updateTransfer , getProjectto , listProject , addProjectto , customSubmit ,getQmyeFlow} from "@/api/onlineHome/bankAgriculture/paymentApproval";
-  import {attachmentList, commonAttach} from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
+  import { getAccount , getTransfer , queryTransferDetail , listPayee , updateTransfer , getProjectto , listProject , addProjectto , cashSubmit ,getQmyeFlow} from "@/api/onlineHome/bankAgriculture/paymentApproval";
+  import {
+    addCash, addCashdetail,
+    attachmentList,
+    commonAttach, getCash,
+    listCashdetailByCashId, updateCash
+  } from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
+  import Dialog from "vant/lib/dialog";
+  import request from '@/utils/request'
   export default {
     name: "approvalModify11",
     data() {
@@ -298,6 +258,7 @@
         },
         projectFundType:'',
         fileList:[],
+        uploadFiles:[],
       };
     },
     created() {
@@ -335,7 +296,7 @@
     },
     methods: {
       getDictionaries(){
-        getTransfer(this.$route.query.id).then((response) => {
+        getCash(this.$route.query.id).then((response) => {
           this.getDicts("capital_expenditure_type").then((res) => {
             for (var i = 0; i < res.data.length; i++) {
               this.capitalExpenditureTypeOptions.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
@@ -346,7 +307,7 @@
             this.capitalExpenditureOpen = true
             let param={
               'outId' : response.data.id,
-              'ynType' : '1'
+              'ynType' : '2'
             }
             getProjectto(param).then(res => {
               console.log(this.selectDictLabel(this.projectFundTypeDictionaries, res.data.projectFundType))
@@ -359,18 +320,9 @@
           }
           this.form = response.data;
         });
-        queryTransferDetail(this.$route.query.id).then((response) => {
-          this.getDicts("bank_type").then(res => {
-            for (var i = 0; i < res.data.length; i++) {
-              this.bankTypeDictionaries.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
-            }
-            for (var j = 0 ; j < response.rows.length ; j++){
-              // response.rows[j].payeeText = response.rows[j].payee;
-              response.rows[j].bankTypeText = this.selectDictLabel(res.data, response.rows[j].bankType);
-              response.rows[j].showPayee = false;
-            }
-            this.chargeItme = response.rows;
-          });
+        listCashdetailByCashId(this.$route.query.id).then((response) => {
+          this.chargeItme = response.data;
+          console.log(response)
           this.getPayeeList();
         });
       },
@@ -511,17 +463,44 @@
       },
       // 钱计算
       moneyChange(input) {
-        console.log(input)
-        let obj = {};
-        obj = this.chargeItme.find((account) => {
-          //model就是上面的数据源
-          return parseFloat(account.incomeAmount).toFixed(2) === input; //筛选出匹配数据
-        });
-        let total = 0;
-        this.chargeItme.forEach((money) => {
-          total = (parseFloat(total) + parseFloat(money.incomeAmount)).toFixed(2)
-        });
-        this.$set(this.form, "expenditureAmount", total);
+        if(this.form.cashType=='11'){
+          console.log(input)
+          if(this.form.payerAccount==0){
+            this.$notify({ type: 'danger', message: '申请使用金额不能等于0！' });
+            this.chargeItme = []
+            this.addChargeItme();
+            return false;
+          }else {
+            let obj = {};
+            obj = this.chargeItme.find((account) => {
+              //model就是上面的数据源
+              return parseFloat(account.incomeAmount).toFixed(2) === input; //筛选出匹配数据
+            });
+            let total = 0;
+            this.chargeItme.forEach((money) => {
+              total = (parseFloat(total) + parseFloat(money.incomeAmount)).toFixed(2)
+            });
+            this.$set(this.form, "expenditureAmount", total);
+            if(this.form.payerAccount<this.form.expenditureAmount){
+              this.$notify({ type: 'danger', message: '申请使用金额不能大于可用余额！' });
+              this.form.expenditureAmount=""
+              this.chargeItme = []
+              this.addChargeItme();
+              return false;
+            }
+          }
+        }else{
+          let obj = {};
+          obj = this.chargeItme.find((account) => {
+            //model就是上面的数据源
+            return parseFloat(account.incomeAmount).toFixed(2) === input; //筛选出匹配数据
+          });
+          let total = 0;
+          this.chargeItme.forEach((money) => {
+            total = (parseFloat(total) + parseFloat(money.incomeAmount)).toFixed(2)
+          });
+          this.$set(this.form, "expenditureAmount", total);
+        }
       },
       goAdd(){
         if(this.chargeItme.length<1){
@@ -542,34 +521,79 @@
             return;
           }
         }
-        this.$set(this.form, "payeeList", this.chargeItme);
-        this.$set(this.form, "bankTypeList", this.chargeItme);
-        this.$set(this.form, "accountTypeList", this.chargeItme);
-        this.$set(this.form, "transferStatusList", this.chargeItme);
-        console.log(this.form);
-        updateTransfer(this.form).then(response => {
-          console.log(response);
-          this.projectForm.outId = this.form.id
-          this.$set(this.projectForm, "ynType", '1');
-          console.log(this.projectForm)
-          if(this.form.capitalExpenditureType==2){
-            addProjectto(this.projectForm).then(res => {
-              customSubmit(this.form.id).then(res => {
-                this.$toast.success('提交成功');
-                setTimeout(function(){
-                  history.go(-1)
-                },2000)
+        if((this.uploadFiles==null||this.uploadFiles.length==0)&&(this.fileList==null||this.fileList.length==0)){
+          Dialog.confirm({
+            title: '提示',
+            message: '此申请单中未上传任何附件，是否确认提交？',
+          })
+            .then(() => {
+              updateCash(this.form).then((response) => {
+                this.chargeItme.map(res => {
+                  res.cashId = this.form.id
+                  addCashdetail(res).then(r => {
+                    if(this.form.capitalExpenditureType==2){
+                      this.projectForm.outId = this.form.id
+                      this.$set(this.projectForm, "ynType", '2');
+                      addProjectto(this.projectForm).then(res => {
+                        cashSubmit(this.form.id).then(res => {
+                          this.$toast.success('提交成功');
+                          setTimeout(function(){
+                            history.go(-1)
+                          },2000)
+                        })
+                      })
+                    }else{
+                      cashSubmit(this.form.id).then(res => {
+                        this.$toast.success('提交成功');
+                        setTimeout(function(){
+                          history.go(-1)
+                        },2000)
+                      })
+                    }
+                  })
+                })
+              });
+            })
+
+        }else{
+          updateCash(this.form).then((response) => {
+            console.log(this.uploadFiles)
+            this.uploadFiles.map(rr => {
+              const params = new FormData();
+              params.append("tableId", this.form.id);
+              params.append("tableName", "t_yinnong_cash");
+              params.append("bizPath", "upload");
+              params.append("fileType", "0");
+              params.append("file", rr);
+              commonAttach(params).then((r) => {
               })
             })
-          }else{
-            customSubmit(this.form.id).then(res => {
-              this.$toast.success('提交成功');
-              setTimeout(function(){
-                history.go(-1)
-              },2000)
+            this.chargeItme.map(res => {
+              res.cashId = this.form.id
+              addCashdetail(res).then(r => {
+                if(this.form.capitalExpenditureType==2){
+                  this.projectForm.outId = this.form.id
+                  this.$set(this.projectForm, "ynType", '2');
+                  addProjectto(this.projectForm).then(res => {
+                    cashSubmit(this.form.id).then(res => {
+                      this.$toast.success('提交成功');
+                      setTimeout(function(){
+                        history.go(-1)
+                      },2000)
+                    })
+                  })
+                }else{
+                  cashSubmit(this.form.id).then(res => {
+                    this.$toast.success('提交成功');
+                    setTimeout(function(){
+                      history.go(-1)
+                    },2000)
+                  })
+                }
+              })
             })
-          }
-        });
+          });
+        }
       },
       goUpdate(){
         if(this.chargeItme.length<1){
@@ -590,28 +614,64 @@
             return;
           }
         }
-        this.$set(this.form, "payeeList", this.chargeItme);
-        this.$set(this.form, "bankTypeList", this.chargeItme);
-        this.$set(this.form, "accountTypeList", this.chargeItme);
-        this.$set(this.form, "transferStatusList", this.chargeItme);
-        this.projectForm.outId = this.form.id
-        updateTransfer(this.form).then((response) => {
-          this.projectForm.outId = this.form.id
-          this.$set(this.projectForm, "ynType", '1');
-          if(this.form.capitalExpenditureType==2){
-            addProjectto(this.projectForm).then(res => {
-                this.$toast.success('修改成功');
-                setTimeout(function(){
-                  history.go(-1)
-                },2000)
+        if(this.uploadFiles==null||this.uploadFiles.length==0){
+          updateCash(this.form).then((response) => {
+            this.chargeItme.map(res => {
+              res.cashId = this.form.id
+              addCashdetail(res).then(r => {
+                if(this.form.capitalExpenditureType==2){
+                  this.projectForm.outId = this.form.id
+                  this.$set(this.projectForm, "ynType", '2');
+                  addProjectto(this.projectForm).then(res => {
+                    this.$toast.success('保存成功');
+                    setTimeout(function(){
+                      history.go(-1)
+                    },2000)
+                  })
+                }else{
+                  this.$toast.success('保存成功');
+                  setTimeout(function(){
+                    history.go(-1)
+                  },2000)
+                }
+              })
             })
-          }else{
-            this.$toast.success('修改成功');
-            setTimeout(function(){
-              history.go(-1)
-            },2000)
-          }
-        });
+          });
+        }else{
+          updateCash(this.form).then((response) => {
+            console.log(this.uploadFiles)
+            this.uploadFiles.map(rr => {
+              const params = new FormData();
+              params.append("tableId", this.form.id);
+              params.append("tableName", "t_yinnong_cash");
+              params.append("bizPath", "upload");
+              params.append("fileType", "0");
+              params.append("file", rr);
+              commonAttach(params).then((r) => {
+              })
+            })
+            this.chargeItme.map(res => {
+              res.cashId = this.form.id
+              addCashdetail(res).then(r => {
+                if(this.form.capitalExpenditureType==2){
+                  this.projectForm.outId = this.form.id
+                  this.$set(this.projectForm, "ynType", '2');
+                  addProjectto(this.projectForm).then(res => {
+                    this.$toast.success('保存成功');
+                    setTimeout(function(){
+                      history.go(-1)
+                    },2000)
+                  })
+                }else{
+                  this.$toast.success('保存成功');
+                  setTimeout(function(){
+                    history.go(-1)
+                  },2000)
+                }
+              })
+            })
+          });
+        }
       },
       payeeSelectChange(select, i) {
         let obj = {};
@@ -712,16 +772,13 @@
         }
       },
       beforeRead(file) {
-        console.log(file)
-        console.log(this.fileList)
-        const params = new FormData();
-        params.append("tableId", this.$route.query.id);
-        params.append("tableName", "t_yinnong_cash");
-        params.append("bizPath", "upload");
-        params.append("fileType", "0");
-        params.append("file", file.file);
-        commonAttach(params).then((response) => {
-          console.log(response)
+        this.uploadFiles.push(file.file);
+      },
+      deleteFile(file){
+        this.uploadFiles.map((response,index) => {
+          if(file.file == response){
+            this.uploadFiles.splice(index,1)
+          }
         })
       },
       getFileList(){
@@ -735,7 +792,6 @@
           console.log(res)
           console.log(location.protocol+"//"+location.host+request.defaults.baseURL)
           res.rows.map(r => {
-
             let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
             this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{})})
             console.log(r)
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify12.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify12.vue
index d005ab55..a4e4e9d6 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify12.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify12.vue
@@ -132,21 +132,21 @@
         </van-popup>
         <van-field required :rules="[{ required: true , message:'请输入工程发票号' }]" v-model="projectForm.projectBillNum" label="工程发票号" placeholder="请输入工程发票号" input-align="right" label-width="auto"/>
       </div>
-      <p class="main_title">付款方信息</p>
+      <p class="main_title">出票方信息</p>
       <div class="main_box">
         <!--      <van-field label="付款方" v-model="form.payer" placeholder="请输入付款方" input-align="right" label-width="auto"/>-->
         <van-field
           readonly
           clickable
-          label="付款方"
-          placeholder="请选择付款方"
+          label="出票方"
+          placeholder="请选择出票方"
           v-model="form.payer"
           @click="showpayer = true"
           input-align="right"
           right-icon="arrow-down"
           label-width="auto"
           required
-          :rules="[{ required: true , message:'请选择付款方' }]"
+          :rules="[{ required: true , message:'请选择出票方' }]"
         />
         <van-popup v-model="showpayer" position="bottom">
           <van-picker
@@ -156,72 +156,75 @@
             @cancel="showpayer = false"
           />
         </van-popup>
-        <van-field :rules="[{ required: true , message:'请输入账户' }]" required label="付款方账户" v-model="form.payerAccount" placeholder="请输入账户" input-align="right" label-width="auto"/>
+        <van-field :rules="[{ required: true , message:'请输入汇票号码' }]" required label="汇票号码" v-model="form.payerAccount" placeholder="请输入汇票号码" input-align="right" label-width="auto"/>
+        <van-field
+          readonly
+          label="出票金额（元）"
+          v-model="form.expenditureAmount"
+          placeholder=""
+          input-align="right"
+          label-width="auto"
+          required
+          :rules="[{ required: true , message:'出票金额不能为空！' }]"
+        />
+        <van-field
+          readonly
+          label="汇票类型"
+          v-model="orderTypeName"
+          placeholder=""
+          input-align="right"
+          label-width="auto"
+          required
+          :rules="[{ required: true , message:'汇票类型不能为空！' }]"
+        />
+
+        <van-field
+          readonly
+          label="汇票类型"
+          v-model="form.orderType"
+          placeholder=""
+          input-align="right"
+          label-width="auto"
+          style="display: none"
+          required
+          :rules="[{ required: true , message:'汇票类型不能为空！' }]"
+        />
+        <van-field
+          readonly
+          label="开票日"
+          v-model="form.startTime"
+          placeholder=""
+          input-align="right"
+          label-width="auto"
+          required
+          :rules="[{ required: true , message:'开票日不能为空！' }]"
+        />
+        <van-field
+          readonly
+          label="到期日"
+          v-model="form.endTime"
+          placeholder=""
+          input-align="right"
+          label-width="auto"
+          required
+          :rules="[{ required: true , message:'到期日不能为空！' }]"
+        />
       </div>
 
       <p class="main_title">收款方信息<van-button icon="plus" @click="addChargeItme(chargeItme.length)" size="mini" type="info" native-type="button" class="addFamily"/></p>
-
-      <div class="main_box" style="margin-bottom: 15px;">
-        <van-cell title="收款账户类型">
-          <template #right-icon>
-            <van-radio-group direction="horizontal" v-model="form.accountType" @change="accountTypeChange">
-              <van-radio name="1">公户</van-radio>
-              <van-radio name="2">私户</van-radio>
-            </van-radio-group>
-          </template>
-        </van-cell>
-      </div>
       <div :style="{position:'relative',padding: index == 0 ? '':'10px 0 0 0'}" v-for="(item, index) in chargeItme" :key="index">
         <van-button icon="minus" size="mini" type="danger" class="deleteFamily" native-type="button" v-if="index!=0" @click="deleteChargeItme(index)" />
         <div class="main_box" style="margin-bottom: 10px;position:relative;">
-          <van-field
-            readonly
-            clickable
-            label="收款方"
-            placeholder="请选择"
-            v-model="item.payee"
-            @click="item.showPayee = true"
-            input-align="right"
-            right-icon="arrow-down"
-            required
-            :rules="[{ required: true , message:'请选择收款方' }]"
-          />
-          <van-popup v-model="item.showPayee" position="bottom">
-            <van-picker
-              show-toolbar
-              :columns="payeeList"
-              @confirm="onConfirmPayee($event,index)"
-              @cancel="item.showPayee = false"
-            />
-          </van-popup>
-          <van-field required :rules="[{ required: true , message:'请输入账户' }]" v-model="item.payeeAccount" label="收款账户" placeholder="请输入账户" input-align="right" label-width="auto"/>
-          <van-field required :rules="[{ required: true , message:'请输入银行' }]" v-model="item.bankDeposit" label="开户银行" placeholder="请输入银行" input-align="right" label-width="auto"/>
-          <van-field required :rules="[{ required: true , message:'请输入金额' }]" v-model="item.incomeAmount" label="收入金额" placeholder="请输入金额" input-align="right" label-width="auto" @change="moneyChange"/>
-          <van-field
-            readonly
-            clickable
-            label="所属银行"
-            placeholder="请选择"
-            v-model="item.bankTypeText"
-            @click="item.showbankType = true"
-            input-align="right"
-            right-icon="arrow-down"
-            required
-            :rules="[{ required: true , message:'请选择所属银行' }]"
-          />
-          <van-popup v-model="item.showbankType" position="bottom">
-            <van-picker
-              show-toolbar
-              :columns="bankTypeDictionaries"
-              @confirm="onConfirmBankType($event,index)"
-              @cancel="item.showbankType = false"
-            />
-          </van-popup>
+          <van-field required :rules="[{ required: true , message:'收款方不能为空' }]" v-model="item.payee" label="收款方" placeholder="请输入收款方全称" input-align="right" label-width="auto"/>
+          <van-field required :rules="[{ required: true , message:'联系方式不能为空' }]" v-model="item.phone" label="联系方式" placeholder="请输入联系方式" input-align="right" label-width="auto"/>
+          <van-field required :rules="[{ required: true , message:'所属单位补鞥你为空' }]" v-model="item.unit" label="所属单位" placeholder="请输入所属单位" input-align="right" label-width="auto"/>
+          <van-field required :rules="[{ required: true , message:'负责人全称不能为空' }]" v-model="item.leader"  label="负责人全称" placeholder="请输入负责人全称" input-align="right" label-width="auto"/>
+          <van-field required :rules="[{ required: true , message:'资金用途不能为空' }]" v-model="item.remark" label="资金用途" placeholder="请输入资金用途" input-align="right" label-width="auto"/>
         </div>
       </div>
       <p class="main_title">上传附件</p>
       <div class="main_box" style="padding: 5px 0 0 8px;">
-        <van-uploader v-model="fileList" :after-read="beforeRead" ></van-uploader>
+        <van-uploader v-model="fileList" :after-read="beforeRead" @delete="deleteFile"></van-uploader>
       </div>
       <div style="padding: 16px 0;">
         <van-row>
@@ -241,7 +244,13 @@
 <script>
   import { getAccount , getTransfer , queryTransferDetail , listPayee , updateTransfer , getProjectto , listProject , addProjectto , customSubmit ,getQmyeFlow} from "@/api/onlineHome/bankAgriculture/paymentApproval";
   import request from '@/utils/request';
-  import {attachmentList, commonAttach} from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
+  import {
+    addCash, addCashdetail,
+    attachmentList, cashSubmit,
+    commonAttach, getCash,
+    listCashdetailByCashId, listMoneyorder, updateCash
+  } from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
+  import Dialog from "vant/lib/dialog";
   export default {
     name: "approvalModify12",
     data() {
@@ -299,6 +308,9 @@
         },
         projectFundType:'',
         fileList:[],
+        uploadFiles:[],
+        orderTypeName:'',
+        orderTypeOptions:[]
       };
     },
     created() {
@@ -318,16 +330,20 @@
         }
         this.projectFundTypeDictionaries = response.data;
       });
+      this.getDicts("order_type").then(response => {
+        this.orderTypeOptions = response.data;
+      });
       let params1={
-        accountType: "102",
-        status: "N",
+        pageNum: 1,
+        pageSize: 1000,
       }
-      getAccount(params1).then((response) => {
+      listMoneyorder(params1).then((response) => {
+        console.log(response)
         this.payerOptions = response.rows;
         response.rows.map((res,index) => {
-          res['payerFrom'] = '1'
+          res['payerFrom'] = '12'
           console.log(res)
-          this.payerOptions[index].text = res.accountName;
+          this.payerOptions[index].text = res.billReceiveUnit;
           this.payerOptions[index].value = res.id;
         })
       });
@@ -336,7 +352,7 @@
     },
     methods: {
       getDictionaries(){
-        getTransfer(this.$route.query.id).then((response) => {
+        getCash(this.$route.query.id).then((response) => {
           this.getDicts("capital_expenditure_type").then((res) => {
             for (var i = 0; i < res.data.length; i++) {
               this.capitalExpenditureTypeOptions.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
@@ -347,7 +363,7 @@
             this.capitalExpenditureOpen = true
             let param={
               'outId' : response.data.id,
-              'ynType' : '1'
+              'ynType' : '2'
             }
             getProjectto(param).then(res => {
               console.log(this.selectDictLabel(this.projectFundTypeDictionaries, res.data.projectFundType))
@@ -359,19 +375,15 @@
             this.showproject = false
           }
           this.form = response.data;
-        });
-        queryTransferDetail(this.$route.query.id).then((response) => {
-          this.getDicts("bank_type").then(res => {
-            for (var i = 0; i < res.data.length; i++) {
-              this.bankTypeDictionaries.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
-            }
-            for (var j = 0 ; j < response.rows.length ; j++){
-              // response.rows[j].payeeText = response.rows[j].payee;
-              response.rows[j].bankTypeText = this.selectDictLabel(res.data, response.rows[j].bankType);
-              response.rows[j].showPayee = false;
+          this.orderTypeOptions.map(res => {
+            console.log(this.orderTypeOptions)
+            if(res.dictValue==this.form.orderType){
+              this.orderTypeName = res.dictLabel
             }
-            this.chargeItme = response.rows;
-          });
+          })
+        });
+        listCashdetailByCashId(this.$route.query.id).then((response) => {
+          this.chargeItme = response.data;
           this.getPayeeList();
         });
       },
@@ -393,31 +405,17 @@
         if(this.chargeItme.length>0&&this.chargeItme[this.chargeItme.length-1].payee == ''){
           this.$notify({ type: 'danger', message: '请勿添加多个空列表信息' });
           return;
-        }else if(this.chargeItme.length>0&&this.chargeItme[index-1].incomeAmount == ''){
-          this.$notify({ type: 'danger', message: '请输入收入金额！' });
-          return;
-        }else if(this.chargeItme.length>0&&this.chargeItme[index-1].payeeAccount == ''){
-          this.$notify({ type: 'danger', message: '请输入收款账户！' });
-          return;
-        }else if(this.chargeItme.length>0&&this.chargeItme[index-1].bankDeposit == ''){
-          this.$notify({ type: 'danger', message: '请输入开户银行！' });
-          return;
-        }else if(this.chargeItme.length>0&&this.chargeItme[index-1].bankType == ''){
-          this.$notify({ type: 'danger', message: '请选择所属银行！' });
-          return;
         }
-        this.getDicts("bank_type").then(res => {
-          this.chargeItme.splice(index + 1, 0, {
-            payeeId: "", //收款方ID
-            payee: "", //收款方
-            payeeAccount: "", //收款账户
-            bankDeposit: "", //开户银行
-            incomeAmount: "", //收入金额
-            bankType: "1", //所属银行
-            bankTypeText:this.selectDictLabel(res.data, 1), //所属银行
-            showPayee:false,
-            showbankType:false
-          });
+        this.chargeItme.splice(index + 1, 0, {
+          payeeId: "", //收款方ID
+          payee: "", //收款方
+          payeeAccount: "", //收款账户
+          bankDeposit: "", //开户银行
+          incomeAmount: "", //收入金额
+          bankType: "", //所属银行
+          bankTypeText:"", //所属银行
+          showPayee:false,
+          showbankType:false
         });
       },
       getPayeeList() {
@@ -543,34 +541,79 @@
             return;
           }
         }
-        this.$set(this.form, "payeeList", this.chargeItme);
-        this.$set(this.form, "bankTypeList", this.chargeItme);
-        this.$set(this.form, "accountTypeList", this.chargeItme);
-        this.$set(this.form, "transferStatusList", this.chargeItme);
-        console.log(this.form);
-        updateTransfer(this.form).then(response => {
-          console.log(response);
-          this.projectForm.outId = this.form.id
-          this.$set(this.projectForm, "ynType", '1');
-          console.log(this.projectForm)
-          if(this.form.capitalExpenditureType==2){
-            addProjectto(this.projectForm).then(res => {
-              customSubmit(this.form.id).then(res => {
-                this.$toast.success('提交成功');
-                setTimeout(function(){
-                  history.go(-1)
-                },2000)
+        if((this.uploadFiles==null||this.uploadFiles.length==0)&&(this.fileList==null||this.fileList.length==0)){
+          Dialog.confirm({
+            title: '提示',
+            message: '此申请单中未上传任何附件，是否确认提交？',
+          })
+            .then(() => {
+              updateCash(this.form).then((response) => {
+                this.chargeItme.map(res => {
+                  res.cashId = this.form.id
+                  addCashdetail(res).then(r => {
+                    if(this.form.capitalExpenditureType==2){
+                      this.projectForm.outId = this.form.id
+                      this.$set(this.projectForm, "ynType", '2');
+                      addProjectto(this.projectForm).then(res => {
+                        cashSubmit(this.form.id).then(res => {
+                          this.$toast.success('提交成功');
+                          setTimeout(function(){
+                            history.go(-1)
+                          },2000)
+                        })
+                      })
+                    }else{
+                      cashSubmit(this.form.id).then(res => {
+                        this.$toast.success('提交成功');
+                        setTimeout(function(){
+                          history.go(-1)
+                        },2000)
+                      })
+                    }
+                  })
+                })
+              });
+            })
+
+        }else{
+          updateCash(this.form).then((response) => {
+            console.log(this.uploadFiles)
+            this.uploadFiles.map(rr => {
+              const params = new FormData();
+              params.append("tableId", this.form.id);
+              params.append("tableName", "t_yinnong_cash");
+              params.append("bizPath", "upload");
+              params.append("fileType", "0");
+              params.append("file", rr);
+              commonAttach(params).then((r) => {
               })
             })
-          }else{
-            customSubmit(this.form.id).then(res => {
-              this.$toast.success('提交成功');
-              setTimeout(function(){
-                history.go(-1)
-              },2000)
+            this.chargeItme.map(res => {
+              res.cashId = this.form.id
+              addCashdetail(res).then(r => {
+                if(this.form.capitalExpenditureType==2){
+                  this.projectForm.outId = this.form.id
+                  this.$set(this.projectForm, "ynType", '2');
+                  addProjectto(this.projectForm).then(res => {
+                    cashSubmit(this.form.id).then(res => {
+                      this.$toast.success('提交成功');
+                      setTimeout(function(){
+                        history.go(-1)
+                      },2000)
+                    })
+                  })
+                }else{
+                  cashSubmit(this.form.id).then(res => {
+                    this.$toast.success('提交成功');
+                    setTimeout(function(){
+                      history.go(-1)
+                    },2000)
+                  })
+                }
+              })
             })
-          }
-        });
+          });
+        }
       },
       goUpdate(){
         if(this.chargeItme.length<1){
@@ -591,28 +634,64 @@
             return;
           }
         }
-        this.$set(this.form, "payeeList", this.chargeItme);
-        this.$set(this.form, "bankTypeList", this.chargeItme);
-        this.$set(this.form, "accountTypeList", this.chargeItme);
-        this.$set(this.form, "transferStatusList", this.chargeItme);
-        this.projectForm.outId = this.form.id
-        updateTransfer(this.form).then((response) => {
-          this.projectForm.outId = this.form.id
-          this.$set(this.projectForm, "ynType", '1');
-          if(this.form.capitalExpenditureType==2){
-            addProjectto(this.projectForm).then(res => {
-                this.$toast.success('修改成功');
-                setTimeout(function(){
-                  history.go(-1)
-                },2000)
+        if(this.uploadFiles==null||this.uploadFiles.length==0){
+          updateCash(this.form).then((response) => {
+            this.chargeItme.map(res => {
+              res.cashId = this.form.id
+              addCashdetail(res).then(r => {
+                if(this.form.capitalExpenditureType==2){
+                  this.projectForm.outId = this.form.id
+                  this.$set(this.projectForm, "ynType", '2');
+                  addProjectto(this.projectForm).then(res => {
+                    this.$toast.success('保存成功');
+                    setTimeout(function(){
+                      history.go(-1)
+                    },2000)
+                  })
+                }else{
+                  this.$toast.success('保存成功');
+                  setTimeout(function(){
+                    history.go(-1)
+                  },2000)
+                }
+              })
             })
-          }else{
-            this.$toast.success('修改成功');
-            setTimeout(function(){
-              history.go(-1)
-            },2000)
-          }
-        });
+          });
+        }else{
+          updateCash(this.form).then((response) => {
+            console.log(this.uploadFiles)
+            this.uploadFiles.map(rr => {
+              const params = new FormData();
+              params.append("tableId", this.form.id);
+              params.append("tableName", "t_yinnong_cash");
+              params.append("bizPath", "upload");
+              params.append("fileType", "0");
+              params.append("file", rr);
+              commonAttach(params).then((r) => {
+              })
+            })
+            this.chargeItme.map(res => {
+              res.cashId = this.form.id
+              addCashdetail(res).then(r => {
+                if(this.form.capitalExpenditureType==2){
+                  this.projectForm.outId = this.form.id
+                  this.$set(this.projectForm, "ynType", '2');
+                  addProjectto(this.projectForm).then(res => {
+                    this.$toast.success('保存成功');
+                    setTimeout(function(){
+                      history.go(-1)
+                    },2000)
+                  })
+                }else{
+                  this.$toast.success('保存成功');
+                  setTimeout(function(){
+                    history.go(-1)
+                  },2000)
+                }
+              })
+            })
+          });
+        }
       },
       payeeSelectChange(select, i) {
         let obj = {};
@@ -713,16 +792,13 @@
         }
       },
       beforeRead(file) {
-        console.log(file)
-        console.log(this.fileList)
-        const params = new FormData();
-        params.append("tableId", this.$route.query.id);
-        params.append("tableName", "t_yinnong_cash");
-        params.append("bizPath", "upload");
-        params.append("fileType", "0");
-        params.append("file", file.file);
-        commonAttach(params).then((response) => {
-          console.log(response)
+        this.uploadFiles.push(file.file);
+      },
+      deleteFile(file){
+        this.uploadFiles.map((response,index) => {
+          if(file.file == response){
+            this.uploadFiles.splice(index,1)
+          }
         })
       },
       getFileList(){
@@ -736,7 +812,6 @@
           console.log(res)
           console.log(location.protocol+"//"+location.host+request.defaults.baseURL)
           res.rows.map(r => {
-
             let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
             this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{})})
             console.log(r)
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify5.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify5.vue
index d15b8b88..fabbd54d 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify5.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify5.vue
@@ -7,7 +7,7 @@
       @click-left="$router.back(-1)"
     >
       <template #title>
-        <p style="font-weight: bold;">修改付款申请</p>
+        <p style="font-weight: bold;">修改母子转账申请</p>
       </template>
     </van-nav-bar>
     <van-form @submit="getChange" @failed="getError" :show-error-message="false" scroll-to-error validate-first>
@@ -194,8 +194,8 @@
               @cancel="item.showPayee = false"
             />
           </van-popup>
-          <van-field required :rules="[{ required: true , message:'请输入账户' }]" v-model="item.payeeAccount" label="收款账户" placeholder="请输入账户" input-align="right" label-width="auto"/>
-          <van-field required :rules="[{ required: true , message:'请输入银行' }]" v-model="item.bankDeposit" label="开户银行" placeholder="请输入银行" input-align="right" label-width="auto"/>
+          <van-field required readonly :rules="[{ required: true , message:'请输入账户' }]" v-model="item.payeeAccount" label="收款账户" placeholder="请输入账户" input-align="right" label-width="auto"/>
+          <van-field required readonly :rules="[{ required: true , message:'请输入银行' }]" v-model="item.bankDeposit" label="开户银行" placeholder="请输入银行" input-align="right" label-width="auto"/>
           <van-field required :rules="[{ required: true , message:'请输入金额' }]" v-model="item.incomeAmount" label="收入金额" placeholder="请输入金额" input-align="right" label-width="auto" @change="moneyChange"/>
           <van-field
             readonly
@@ -205,23 +205,14 @@
             v-model="item.bankTypeText"
             @click="item.showbankType = true"
             input-align="right"
-            right-icon="arrow-down"
             required
             :rules="[{ required: true , message:'请选择所属银行' }]"
           />
-          <van-popup v-model="item.showbankType" position="bottom">
-            <van-picker
-              show-toolbar
-              :columns="bankTypeDictionaries"
-              @confirm="onConfirmBankType($event,index)"
-              @cancel="item.showbankType = false"
-            />
-          </van-popup>
         </div>
       </div>
       <p class="main_title">上传附件</p>
       <div class="main_box" style="padding: 5px 0 0 8px;">
-        <van-uploader v-model="fileList" :after-read="beforeRead" ></van-uploader>
+        <van-uploader v-model="fileList" :after-read="beforeRead" @delete="deleteFile"></van-uploader>
       </div>
       <div style="padding: 16px 0;">
         <van-row>
@@ -241,7 +232,13 @@
 <script>
   import { getAccount , getTransfer , queryTransferDetail , listPayee , updateTransfer , getProjectto , listProject , addProjectto , customSubmit ,getQmyeFlow} from "@/api/onlineHome/bankAgriculture/paymentApproval";
   import request from '@/utils/request';
-  import {attachmentList, commonAttach} from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
+  import {
+    addTransfer,
+    attachmentList,
+    commonAttach, listTaccount,
+    listVaccount, systemAttachment
+  } from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
+  import Dialog from "vant/lib/dialog";
   export default {
     name: "approvalModify5",
     data() {
@@ -299,6 +296,7 @@
         },
         projectFundType:'',
         fileList:[],
+        uploadFiles:[],
       };
     },
     created() {
@@ -319,16 +317,16 @@
         this.projectFundTypeDictionaries = response.data;
       });
       let params1={
-        accountType: "102",
-        status: "N",
+        townAccountType:'2'
       }
-      getAccount(params1).then((response) => {
-        this.payerOptions = response.rows;
+      listTaccount(params1).then((response) => {
         response.rows.map((res,index) => {
-          res['payerFrom'] = '1'
-          console.log(res)
-          this.payerOptions[index].text = res.accountName;
-          this.payerOptions[index].value = res.id;
+          if(res.townAccountType=='2'){
+            res['payerFrom'] = '2'
+            this.payerOptions.push(res);
+            this.payerOptions[index].text = res.payee;
+            this.payerOptions[index].value = res.id;
+          }
         })
       });
       this.getDictionaries();
@@ -359,6 +357,7 @@
             this.showproject = false
           }
           this.form = response.data;
+          this.getPayeeList();
         });
         queryTransferDetail(this.$route.query.id).then((response) => {
           this.getDicts("bank_type").then(res => {
@@ -372,21 +371,16 @@
             }
             this.chargeItme = response.rows;
           });
-          this.getPayeeList();
         });
       },
       getChange(){
-        console.log(this.buttonType)
         if(this.buttonType == 'update'){
-          console.log('update')
           this.goUpdate();
         }else if(this.buttonType == 'add'){
-          console.log('add')
           this.goAdd();
         }
       },
       getError(e){
-        console.log(e)
         this.$notify({ type: 'danger', message: e.errors[0].message });
       },
       addChargeItme(index){
@@ -413,8 +407,8 @@
             payeeAccount: "", //收款账户
             bankDeposit: "", //开户银行
             incomeAmount: "", //收入金额
-            bankType: "1", //所属银行
-            bankTypeText:this.selectDictLabel(res.data, 1), //所属银行
+            bankType: "", //所属银行
+            bankTypeText: "", //所属银行
             showPayee:false,
             showbankType:false
           });
@@ -424,13 +418,19 @@
         //普通转账
         this.queryParams.accountType = this.form.accountType
         this.queryParams.status = "0"
-        listPayee(this.queryParams).then((response) => {
-          this.payeeList = response.rows;
-          response.rows.map((res,index) => {
-            this.payeeList[index].text = res.payee;
-            this.payeeList[index].value = res.id;
-          })
-        });
+        if(this.form.cashierId==null||this.form.cashierId==""){
+          this.$notify({ type: 'danger', message: '请先选择付款方！' });
+          return;
+        }else {
+          this.queryParams.taccountId = parseInt(this.form.cashierId)
+          listVaccount(this.queryParams).then((response) => {
+            this.payeeList = response.rows;
+            response.rows.map((res,index) => {
+              this.payeeList[index].text = res.payee;
+              this.payeeList[index].value = res.id;
+            })
+          });
+        }
       },
       payeeDictLabel(datas, value) {
         var actions = [];
@@ -443,7 +443,6 @@
         return actions.join('');
       },
       onConfirmCapital(data){
-        console.log(data)
         if (data.value != 2){
           this.capitalExpenditureOpen = false;
           this.projectForm = [];
@@ -479,14 +478,17 @@
         this.chargeItme[index].payee = data.text;
         this.chargeItme[index].payeeId = data.value;
         this.payeeSelectChange(data.value , index)
+        this.onConfirmBankType(data,index)
       },
       onConfirmBankType(data,index){
-        for (var i = 0 ; i < this.chargeItme.length ; i++){
-          this.chargeItme[i].showbankType = false;
-        }
-        this.chargeItme[index].bankTypeText = data.text;
-        this.chargeItme[index].bankType = data.value;
-        this.chargeItme[index].showbankType = false;
+        console.log(this.bankTypeDictionaries)
+        this.bankTypeDictionaries.map(res => {
+          if(res.value==data.bankType){
+            this.chargeItme[index].bankTypeText = res.text;
+            this.chargeItme[index].bankType = res.value;
+          }
+        })
+
       },
       onConfirmPayer(data){
         this.form.payer = data.text;
@@ -500,15 +502,22 @@
       },
       accountTypeChange(e){
         this.payeeList = [];
+        this.chargeItme = [];
         this.queryParams.accountType = this.form.accountType
-        this.queryParams.status = "0"
-        listPayee(this.queryParams).then((response) => {
-          this.payeeList = response.rows;
-          response.rows.map((res,index) => {
-            this.payeeList[index].text = res.payee;
-            this.payeeList[index].value = res.id;
-          })
-        });
+        if(this.form.cashierId==null||this.form.cashierId==""){
+          this.$notify({ type: 'danger', message: '请先选择付款方！' });
+          return;
+        }else {
+          this.queryParams.taccountId = parseInt(this.form.cashierId)
+          console.log(this.queryParams)
+          listVaccount(this.queryParams).then((response) => {
+            this.payeeList = response.rows;
+            response.rows.map((res,index) => {
+              this.payeeList[index].text = res.payee;
+              this.payeeList[index].value = res.id;
+            })
+          });
+        }
       },
       // 钱计算
       moneyChange(input) {
@@ -543,34 +552,130 @@
             return;
           }
         }
-        this.$set(this.form, "payeeList", this.chargeItme);
-        this.$set(this.form, "bankTypeList", this.chargeItme);
-        this.$set(this.form, "accountTypeList", this.chargeItme);
-        this.$set(this.form, "transferStatusList", this.chargeItme);
-        console.log(this.form);
-        updateTransfer(this.form).then(response => {
-          console.log(response);
-          this.projectForm.outId = this.form.id
-          this.$set(this.projectForm, "ynType", '1');
-          console.log(this.projectForm)
-          if(this.form.capitalExpenditureType==2){
-            addProjectto(this.projectForm).then(res => {
-              customSubmit(this.form.id).then(res => {
-                this.$toast.success('提交成功');
-                setTimeout(function(){
-                  history.go(-1)
-                },2000)
-              })
-            })
-          }else{
-            customSubmit(this.form.id).then(res => {
-              this.$toast.success('提交成功');
-              setTimeout(function(){
-                history.go(-1)
-              },2000)
+        if(this.uploadFiles==null||this.uploadFiles.length==0){
+          Dialog.confirm({
+            title: '提示',
+            message: '此申请单中未上传任何附件，是否确认提交？',
+          })
+            .then(() => {
+              this.$set(this.form, "payeeList", this.chargeItme);
+              this.$set(this.form, "bankTypeList", this.chargeItme);
+              this.$set(this.form, "accountTypeList", this.chargeItme);
+              this.$set(this.form, "transferStatusList", this.chargeItme);
+              updateTransfer(this.form).then(response => {
+                this.projectForm.outId = this.form.id
+                this.$set(this.projectForm, "ynType", '1');
+                if(this.uploadFiles!=null&&this.uploadFiles.length>0){
+                  this.uploadFiles.map(rr => {
+                    const params = new FormData();
+                    params.append("tableId", this.form.id);
+                    params.append("tableName", "t_yinnong_transfer");
+                    params.append("bizPath", "upload");
+                    params.append("fileType", "0");
+                    params.append("file", rr);
+                    commonAttach(params).then((r) => {
+                    })
+                  })
+                  if(this.form.capitalExpenditureType==2){
+                    addProjectto(this.projectForm).then(res => {
+                      customSubmit(response.data.id).then(res => {
+                        this.$toast.success('提交成功');
+                        setTimeout(function(){
+                          history.go(-1)
+                        },2000)
+                      })
+                    })
+                  }else{
+                    customSubmit(response.data.id).then(res => {
+                      this.$toast.success('提交成功');
+                      setTimeout(function(){
+                        history.go(-1)
+                      },2000)
+                    })
+                  }
+                }else{
+                  if(this.form.capitalExpenditureType==2){
+                    addProjectto(this.projectForm).then(res => {
+                      customSubmit(response.data.id).then(res => {
+                        this.$toast.success('提交成功');
+                        setTimeout(function(){
+                          history.go(-1)
+                        },2000)
+                      })
+                    })
+                  }else{
+                    customSubmit(response.data.id).then(res => {
+                      this.$toast.success('提交成功');
+                      setTimeout(function(){
+                        history.go(-1)
+                      },2000)
+                    })
+                  }
+                }
+              });
             })
-          }
-        });
+            .catch(() => {
+              return false;
+            });
+        }else{
+          this.$set(this.form, "payeeList", this.chargeItme);
+          this.$set(this.form, "bankTypeList", this.chargeItme);
+          this.$set(this.form, "accountTypeList", this.chargeItme);
+          this.$set(this.form, "transferStatusList", this.chargeItme);
+          updateTransfer(this.form).then(response => {
+            this.projectForm.outId = response.data.id
+            this.$set(this.projectForm, "ynType", '1');
+            if(this.uploadFiles!=null&&this.uploadFiles.length>0){
+              this.uploadFiles.map(rr => {
+                const params = new FormData();
+                params.append("tableId", response.data.id);
+                params.append("tableName", "t_yinnong_transfer");
+                params.append("bizPath", "upload");
+                params.append("fileType", "0");
+                params.append("file", rr);
+                commonAttach(params).then((r) => {
+                })
+              })
+              if(this.form.capitalExpenditureType==2){
+                addProjectto(this.projectForm).then(res => {
+                  customSubmit(response.data.id).then(res => {
+                    this.$toast.success('提交成功');
+                    setTimeout(function(){
+                      history.go(-1)
+                    },2000)
+                  })
+                })
+              }else{
+                customSubmit(response.data.id).then(res => {
+                  this.$toast.success('提交成功');
+                  setTimeout(function(){
+                    history.go(-1)
+                  },2000)
+                })
+              }
+            }else{
+              if(this.form.capitalExpenditureType==2){
+                addProjectto(this.projectForm).then(res => {
+                  customSubmit(response.data.id).then(res => {
+                    this.$toast.success('提交成功');
+                    setTimeout(function(){
+                      history.go(-1)
+                    },2000)
+                  })
+                })
+              }else{
+                customSubmit(response.data.id).then(res => {
+                  this.$toast.success('提交成功');
+                  setTimeout(function(){
+                    history.go(-1)
+                  },2000)
+                })
+              }
+            }
+          });
+        }
+
+
       },
       goUpdate(){
         if(this.chargeItme.length<1){
@@ -595,23 +700,50 @@
         this.$set(this.form, "bankTypeList", this.chargeItme);
         this.$set(this.form, "accountTypeList", this.chargeItme);
         this.$set(this.form, "transferStatusList", this.chargeItme);
-        this.projectForm.outId = this.form.id
         updateTransfer(this.form).then((response) => {
           this.projectForm.outId = this.form.id
           this.$set(this.projectForm, "ynType", '1');
-          if(this.form.capitalExpenditureType==2){
-            addProjectto(this.projectForm).then(res => {
-                this.$toast.success('修改成功');
+          if(this.uploadFiles!=null&&this.uploadFiles.length>0){
+            console.log(this.uploadFiles)
+            this.uploadFiles.map(rr => {
+              const params = new FormData();
+              params.append("tableId", this.form.id);
+              params.append("tableName", "t_yinnong_transfer");
+              params.append("bizPath", "upload");
+              params.append("fileType", "0");
+              params.append("file", rr);
+              commonAttach(params).then((r) => {
+              })
+            })
+            if(this.form.capitalExpenditureType==2){
+              addProjectto(this.projectForm).then(res => {
+                this.$toast.success('保存成功');
                 setTimeout(function(){
                   history.go(-1)
                 },2000)
-            })
+              })
+            }else{
+              this.$toast.success('保存成功');
+              setTimeout(function(){
+                history.go(-1)
+              },2000)
+            }
           }else{
-            this.$toast.success('修改成功');
-            setTimeout(function(){
-              history.go(-1)
-            },2000)
+            if(this.form.capitalExpenditureType==2){
+              addProjectto(this.projectForm).then(res => {
+                this.$toast.success('保存成功');
+                setTimeout(function(){
+                  history.go(-1)
+                },2000)
+              })
+            }else{
+              this.$toast.success('保存成功');
+              setTimeout(function(){
+                history.go(-1)
+              },2000)
+            }
           }
+
         });
       },
       payeeSelectChange(select, i) {
@@ -713,17 +845,19 @@
         }
       },
       beforeRead(file) {
+        this.uploadFiles.push(file.file);
+      },
+      deleteFile(file){
         console.log(file)
-        console.log(this.fileList)
-        const params = new FormData();
-        params.append("tableId", this.$route.query.id);
-        params.append("tableName", "t_yinnong_transfer");
-        params.append("bizPath", "upload");
-        params.append("fileType", "0");
-        params.append("file", file.file);
-        commonAttach(params).then((response) => {
-          console.log(response)
+        this.uploadFiles.map((response,index) => {
+          if(file.file == response){
+            this.uploadFiles.splice(index,1)
+          }
         })
+        if(file.id){
+          systemAttachment(file.id).then((res) => {
+          });
+        }
       },
       getFileList(){
         let oData= {
@@ -736,9 +870,8 @@
           console.log(res)
           console.log(location.protocol+"//"+location.host+request.defaults.baseURL)
           res.rows.map(r => {
-
             let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
-            this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{})})
+            this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{}),"id":r.id})
             console.log(r)
           })
         })
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalProcess2.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalProcess2.vue
new file mode 100644
index 00000000..58a73f68
--- /dev/null
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalProcess2.vue
@@ -0,0 +1,244 @@
+<template>
+    <div class="app-container">
+      <van-nav-bar
+        left-arrow
+        fixed
+        placeholder
+        @click-left="$router.back(-1)"
+      >
+        <template #title>
+          <p style="font-weight: bold;">付款申请流程</p>
+        </template>
+      </van-nav-bar>
+      <div class="main_box">
+        <van-row v-if="processList.待申请!=2">
+          <van-col span="6" align="right"><p class="icon_jian blue"><van-icon name="success" size="14" /></p></van-col>
+          <van-col span="18" class="textBlue">草稿</van-col>
+        </van-row>
+        <van-row v-if="processList.待申请==2">
+          <van-col span="6" align="right"><p class="icon_jian blue"><van-icon name="success" size="14" /></p></van-col>
+          <van-col span="18" class="textBlue">已申请
+            <van-row>
+              <van-col span="24" style="padding: 0;" class="textBlue" v-show="processList.待申请==2">申请人：{{processList.申请人}}</van-col>
+            </van-row>
+            <van-row>
+              <van-col span="24" style="padding: 0;" class="textBlue" v-show="processList.待申请==2">申请时间：{{processList.申请时间}}</van-col>
+            </van-row>
+          </van-col>
+        </van-row>
+        <van-row>
+          <van-col span="6" align="right">
+            <p class="icon_jian" v-show="processList.乡镇审批==1"><van-icon name="minus" size="14" /></p>
+            <p class="icon_jian blue" v-show="processList.乡镇审批==2"><van-icon name="success" size="14" /></p>
+            <p class="icon_jian red" v-show="processList.乡镇审批==3"><van-icon name="cross" size="14" /></p>
+          </van-col>
+          <van-col span="18">
+            <p v-show="processList.乡镇审批==1">乡镇审批</p>
+            <p v-show="processList.乡镇审批==2" class="textBlue">乡镇审批</p>
+            <p v-show="processList.乡镇审批==3" class="textRed">乡镇审批</p>
+            <van-row>
+              <van-col span="24" style="padding: 0;" v-if="processList.乡镇审批人!=null&&processList.乡镇审批人!=''">
+                <p v-show="processList.乡镇审批==1">审批人：{{processList.乡镇审批人}}</p>
+                <p v-show="processList.乡镇审批==2" class="textBlue">审批人：{{processList.乡镇审批人}}</p>
+                <p v-show="processList.乡镇审批==3" class="textRed">审批人：{{processList.乡镇审批人}}</p>
+              </van-col>
+            </van-row>
+            <van-row>
+              <van-col span="24" style="padding: 0;" v-if="processList.乡镇审批时间!=null&&processList.乡镇审批时间!=''">
+                <p v-show="processList.乡镇审批==1">审批时间：{{processList.乡镇审批时间}}</p>
+                <p v-show="processList.乡镇审批==2" class="textBlue">审批时间：{{processList.乡镇审批时间}}</p>
+                <p v-show="processList.乡镇审批==3" class="textRed">审批时间：{{processList.乡镇审批时间}}</p>
+              </van-col>
+            </van-row>
+          </van-col>
+        </van-row>
+        <van-row v-if="form.approveLevel==2">
+          <van-col span="6" align="right">
+            <p class="icon_jian" v-show="processList.区县审批==1"><van-icon name="minus" size="14" /></p>
+            <p class="icon_jian blue" v-show="processList.区县审批==2"><van-icon name="success" size="14" /></p>
+            <p class="icon_jian red" v-show="processList.区县审批==3"><van-icon name="cross" size="14" /></p>
+          </van-col>
+          <van-col span="18">
+            <p v-show="processList.区县审批==1">区县审批</p>
+            <p v-show="processList.区县审批==2" class="textBlue">区县审批</p>
+            <p v-show="processList.区县审批==3" class="textRed">区县审批</p>
+            <van-row>
+              <van-col span="24" style="padding: 0;">
+                <p v-show="processList.区县审批==1">审批人：{{processList.区县审批人}}</p>
+                <p v-show="processList.区县审批==2" class="textBlue">审批人：{{processList.区县审批人}}</p>
+                <p v-show="processList.区县审批==3" class="textRed">审批人：{{processList.区县审批人}}</p>
+              </van-col>
+            </van-row>
+            <van-row>
+
+              <van-col span="24" style="padding: 0;">
+                <p v-show="processList.区县审批==1">审批时间：{{processList.区县审批时间}}</p>
+                <p v-show="processList.区县审批==2" class="textBlue">审批时间：{{processList.区县审批时间}}</p>
+                <p v-show="processList.区县审批==3" class="textRed">审批时间：{{processList.区县审批时间}}</p>
+              </van-col>
+            </van-row>
+          </van-col>
+        </van-row>
+        <van-row v-show="form.transferType==1||form.transferType=='常用转账'">
+          <van-col span="6" align="right">
+            <p class="icon_jian" v-show="processList.支付状态==1"><van-icon name="minus" size="14" /></p>
+            <p class="icon_jian blue" v-show="processList.支付状态==2"><van-icon name="success" size="14" /></p>
+            <p class="icon_jian red" v-show="processList.支付状态==3"><van-icon name="cross" size="14" /></p>
+          </van-col>
+          <van-col span="18">
+            <p v-show="processList.支付状态==1">待支付</p>
+            <p v-show="processList.支付状态==2" class="textBlue">支付成功</p>
+            <p v-show="processList.支付状态==3" class="textRed">支付异常</p>
+            <van-row>
+              <van-col span="24" style="padding: 0;">
+                <p v-show="processList.支付状态==2||processList.支付状态==3">支付时间：{{processList.支付时间}}</p>
+              </van-col>
+            </van-row>
+          </van-col>
+        </van-row>
+        <van-row v-show="form.transferType==1||form.transferType=='常用转账'">
+          <van-col span="6" align="right">
+            <p class="icon_jian" v-show="processList.入账状态==1"><van-icon name="minus" size="14" /></p>
+            <p class="icon_jian blue" v-show="processList.入账状态==2"><van-icon name="success" size="14" /></p>
+            <p class="icon_jian red" v-show="processList.入账状态==3"><van-icon name="cross" size="14" /></p>
+          </van-col>
+          <van-col span="18">
+            <p v-show="processList.入账状态==1">未入账</p>
+            <p v-show="processList.入账状态==2" class="textBlue">入账成功</p>
+            <p v-show="processList.入账状态==3" class="textRed">入账异常</p>
+            <van-row>
+              <van-col span="24" style="padding: 0;">
+                <p v-show="processList.入账状态==2||processList.入账状态==3">入账时间：{{processList.入账时间}}</p>
+              </van-col>
+            </van-row>
+          </van-col>
+        </van-row>
+      </div>
+    </div>
+</template>
+
+<script>
+import {
+  getTransferProcess,
+  getTransfer,
+  getProjectto,
+  queryTransferDetail
+} from "@/api/onlineHome/bankAgriculture/paymentApproval";
+import {
+  getCash,
+  getTransferProcess1,
+  listCashdetailByCashId
+} from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
+export default {
+  name: "approvalProcess",
+  data() {
+    return {
+      processList:{},
+      form:{}
+    };
+  },
+  created() {
+    this.handleUpdate(this.$route.query.id);
+  },
+  methods: {
+    //查询审批进程
+    getTransferProcess1(id){
+      getTransferProcess1(id).then(res => {
+        this.processList = res.data.processSchedule
+        console.log(res.data.processSchedule)
+        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"):""
+      })
+    },
+    handleUpdate(id) {
+      getCash(id).then((response) => {
+        this.form = response.data;
+        this.processList = {}
+        this.getTransferProcess1(this.$route.query.id);
+        if(this.form.capitalExpenditureType==2){
+          this.capitalExpenditureOpen = true
+          let param={
+            'outId' : this.form.id,
+            'ynType' : '2'
+          }
+          getProjectto(param).then(res => {
+            this.projectForm = res.data
+            this.projectForm.projectFundType+=""
+            listCashdetailByCashId(id).then((r) => {
+              this.chargeItme = r.rows;
+              this.length = this.chargeItme.length;
+              this.detailTotal = r.total;
+              this.loading = false;
+            });
+          })
+        }else{
+          this.capitalExpenditureOpen = false
+          listCashdetailByCashId(id).then((r) => {
+            this.chargeItme = r.rows;
+            this.length = this.chargeItme.length;
+            this.detailTotal = r.total;
+            this.loading = false;
+          });
+        }
+
+      });
+
+    },
+  },
+}
+</script>
+
+<style scoped lang="scss">
+  .app-container {
+    padding: 0.2rem 0;
+  }
+  .main_box{
+    width: 96%;
+    margin: 0 auto;
+    border-radius: 6px;
+    box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);
+    overflow: hidden;
+    background-color: #FFF;
+    padding: 20Px 0;
+  }
+  .icon_jian{
+    background-color: #C9C9C9;
+    display: inline-block;
+    width: 20Px;
+    height: 20Px;
+    line-height: 24Px;
+    text-align: center;
+    border-radius: 50%;
+    color: #FFF;
+  }
+  .blue{
+    background-color: #1D6FE9;
+  }
+  .red{
+    background-color: rgb(245, 108, 108);
+  }
+  .textBlue{
+    color: #1D6FE9!important;
+  }
+  .textRed{
+    color: rgb(245, 108, 108)!important;
+  }
+  .van-col{
+    padding: 20Px 10Px;
+  }
+  .van-col:nth-child(2){
+    font-size: 16Px;
+    color: #878787;
+    line-height: 22Px;
+  }
+  .van-row{
+    .van-row{
+      .van-col{
+        padding: 5Px 0 0 0!important;
+        color: #878787;
+      }
+    }
+  }
+</style>

From 3b1bc57e5d129c0401ef827ea4993199ff46ff17 Mon Sep 17 00:00:00 2001
From: yujk <990961482@qq.com>
Date: Wed, 13 Oct 2021 17:55:43 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E9=93=B6=E5=86=9C=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js                           |  91 ++-
 .../paymentApproval/approvalAdd.vue           |  12 +-
 .../paymentApproval/approvalAdd10.vue         |   7 +-
 .../paymentApproval/approvalAdd11.vue         |  11 +-
 .../paymentApproval/approvalAdd12.vue         | 181 ++++--
 .../paymentApproval/approvalAdd2.vue          |   7 +-
 .../paymentApproval/approvalAdd3.vue          |  11 +-
 .../paymentApproval/approvalAdd4.vue          | 221 +++++--
 .../paymentApproval/approvalAdd5.vue          |   8 +-
 .../paymentApproval/approvalApproval.vue      |  60 +-
 .../paymentApproval/approvalApproval10.vue    | 501 +++++++++++++++
 .../paymentApproval/approvalApproval11.vue    | 506 ++++++++++++++++
 .../paymentApproval/approvalApproval12.vue    | 569 ++++++++++++++++++
 .../paymentApproval/approvalDetail.vue        |  29 +-
 .../paymentApproval/approvalDetail10.vue      |   2 +-
 .../paymentApproval/approvalDetail11.vue      |   2 +-
 .../paymentApproval/approvalDetail2.vue       |  31 +-
 .../paymentApproval/approvalDetail3.vue       |  31 +-
 .../paymentApproval/approvalDetail4.vue       |  31 +-
 .../paymentApproval/approvalDetail5.vue       |   2 +-
 .../paymentApproval/approvalList2.vue         |   4 +-
 .../paymentApproval/approvalList3.vue         |   2 +-
 .../paymentApproval/approvalList4.vue         |   2 +-
 .../paymentApproval/approvalModify.vue        | 244 ++++++--
 .../paymentApproval/approvalModify10.vue      |   5 +-
 .../paymentApproval/approvalModify11.vue      |   5 +-
 .../paymentApproval/approvalModify12.vue      |   5 +-
 .../paymentApproval/approvalModify2.vue       | 234 +++++--
 .../paymentApproval/approvalModify3.vue       | 237 ++++++--
 .../paymentApproval/approvalModify4.vue       | 310 ++++++----
 .../paymentApproval/approvalModify5.vue       |  27 +-
 .../paymentApproval/approvalProcess.vue       |   5 +-
 .../paymentApproval/approvalProcess2.vue      |   5 +-
 src/views/onlineHome/done.vue                 |  29 +-
 34 files changed, 2918 insertions(+), 509 deletions(-)
 create mode 100644 src/views/onlineHome/bankAgriculture/paymentApproval/approvalApproval10.vue
 create mode 100644 src/views/onlineHome/bankAgriculture/paymentApproval/approvalApproval11.vue
 create mode 100644 src/views/onlineHome/bankAgriculture/paymentApproval/approvalApproval12.vue

diff --git a/src/router/index.js b/src/router/index.js
index 38f2e4a6..4a2bb654 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1027,7 +1027,7 @@ export const constantRoutes = [
     path: '/onlineHome/approvalList',
     name: 'approvalList',
     meta: {
-      title: '银农支付付款申请',
+      title: '常用转账列表',
       hidden: true,
     },
     component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalList'], resolve)
@@ -1036,7 +1036,7 @@ export const constantRoutes = [
     path: '/onlineHome/approvalList2',
     name: 'approvalList2',
     meta: {
-      title: '信用卡转账',
+      title: '信用卡转账列表',
       hidden: true,
     },
     component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalList2'], resolve)
@@ -1045,7 +1045,7 @@ export const constantRoutes = [
     path: '/onlineHome/approvalList3',
     name: 'approvalList3',
     meta: {
-      title: '虚拟挂账',
+      title: '虚拟挂账列表',
       hidden: true,
     },
     component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalList3'], resolve)
@@ -1054,7 +1054,7 @@ export const constantRoutes = [
     path: '/onlineHome/approvalList4',
     name: 'approvalList4',
     meta: {
-      title: '虚拟转账',
+      title: '虚拟转账列表',
       hidden: true,
     },
     component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalList4'], resolve)
@@ -1063,7 +1063,7 @@ export const constantRoutes = [
     path: '/onlineHome/approvalList5',
     name: 'approvalList5',
     meta: {
-      title: '母子转张',
+      title: '母子转账列表',
       hidden: true,
     },
     component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalList5'], resolve)
@@ -1072,7 +1072,7 @@ export const constantRoutes = [
     path: '/onlineHome/approvalList10',
     name: 'approvalList10',
     meta: {
-      title: '资金提现',
+      title: '现金提现列表',
       hidden: true,
     },
     component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalList10'], resolve)
@@ -1081,7 +1081,7 @@ export const constantRoutes = [
     path: '/onlineHome/approvalList11',
     name: 'approvalList11',
     meta: {
-      title: '资金使用',
+      title: '现金使用列表',
       hidden: true,
     },
     component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalList11'], resolve)
@@ -1090,7 +1090,7 @@ export const constantRoutes = [
     path: '/onlineHome/approvalList12',
     name: 'approvalList12',
     meta: {
-      title: '汇票支出',
+      title: '汇票支出列表',
       hidden: true,
     },
     component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalList12'], resolve)
@@ -1099,7 +1099,7 @@ export const constantRoutes = [
     path: '/onlineHome/approvalDetail',
     name: 'approvalDetail',
     meta: {
-      title: '银农支付付款申请',
+      title: '银农常用转账申请',
       hidden: true,
     },
     component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail'], resolve)
@@ -1108,7 +1108,7 @@ export const constantRoutes = [
     path: '/onlineHome/approvalDetail2',
     name: 'approvalDetail2',
     meta: {
-      title: '银农支付付款申请',
+      title: '银农信用卡转账申请',
       hidden: true,
     },
     component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail2'], resolve)
@@ -1117,7 +1117,7 @@ export const constantRoutes = [
     path: '/onlineHome/approvalDetail3',
     name: 'approvalDetail3',
     meta: {
-      title: '银农支付付款申请',
+      title: '银农虚拟挂账申请',
       hidden: true,
     },
     component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail3'], resolve)
@@ -1126,7 +1126,7 @@ export const constantRoutes = [
     path: '/onlineHome/approvalDetail4',
     name: 'approvalDetail4',
     meta: {
-      title: '银农支付付款申请',
+      title: '银农虚拟转账申请',
       hidden: true,
     },
     component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail4'], resolve)
@@ -1135,7 +1135,7 @@ export const constantRoutes = [
     path: '/onlineHome/approvalDetail5',
     name: 'approvalDetail5',
     meta: {
-      title: '银农支付付款申请',
+      title: '银农母子转账申请',
       hidden: true,
     },
     component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail5'], resolve)
@@ -1144,7 +1144,7 @@ export const constantRoutes = [
     path: '/onlineHome/approvalDetail10',
     name: 'approvalDetail10',
     meta: {
-      title: '银农支付付款申请',
+      title: '银农现金提现申请',
       hidden: true,
     },
     component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail10'], resolve)
@@ -1153,7 +1153,7 @@ export const constantRoutes = [
     path: '/onlineHome/approvalDetail11',
     name: 'approvalDetail11',
     meta: {
-      title: '银农支付付款申请',
+      title: '银农现金使用申请',
       hidden: true,
     },
     component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail11'], resolve)
@@ -1162,7 +1162,7 @@ export const constantRoutes = [
     path: '/onlineHome/approvalDetail12',
     name: 'approvalDetail12',
     meta: {
-      title: '银农支付付款申请',
+      title: '银农汇票支出申请',
       hidden: true,
     },
     component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail12'], resolve)
@@ -1171,7 +1171,7 @@ export const constantRoutes = [
     path: '/onlineHome/approvalAdd',
     name: 'approvalAdd',
     meta: {
-      title: '添加常用转账付款申请',
+      title: '添加常用转账申请',
       hidden: true,
     },
     component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd'], resolve)
@@ -1180,7 +1180,7 @@ export const constantRoutes = [
     path: '/onlineHome/approvalAdd2',
     name: 'approvalAdd2',
     meta: {
-      title: '添加信用卡转账付款申请',
+      title: '添加信用卡转账申请',
       hidden: true,
     },
     component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd2'], resolve)
@@ -1189,7 +1189,7 @@ export const constantRoutes = [
     path: '/onlineHome/approvalAdd3',
     name: 'approvalAdd3',
     meta: {
-      title: '添加虚拟挂账付款申请',
+      title: '添加虚拟挂账申请',
       hidden: true,
     },
     component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd3'], resolve)
@@ -1198,7 +1198,7 @@ export const constantRoutes = [
     path: '/onlineHome/approvalAdd4',
     name: 'approvalAdd4',
     meta: {
-      title: '添加虚拟转账付款申请',
+      title: '添加虚拟转账申请',
       hidden: true,
     },
     component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd4'], resolve)
@@ -1207,7 +1207,7 @@ export const constantRoutes = [
     path: '/onlineHome/approvalAdd5',
     name: 'approvalAdd5',
     meta: {
-      title: '添加母子转账付款申请',
+      title: '添加母子转账申请',
       hidden: true,
     },
     component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd5'], resolve)
@@ -1216,7 +1216,7 @@ export const constantRoutes = [
     path: '/onlineHome/approvalAdd10',
     name: 'approvalAdd10',
     meta: {
-      title: '添加资金提现付款申请',
+      title: '添加现金提现申请',
       hidden: true,
     },
     component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd10'], resolve)
@@ -1225,7 +1225,7 @@ export const constantRoutes = [
     path: '/onlineHome/approvalAdd11',
     name: 'approvalAdd11',
     meta: {
-      title: '添加资金使用付款申请',
+      title: '添加现金使用申请',
       hidden: true,
     },
     component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd11'], resolve)
@@ -1234,7 +1234,7 @@ export const constantRoutes = [
     path: '/onlineHome/approvalAdd12',
     name: 'approvalAdd12',
     meta: {
-      title: '添加汇票支出付款申请',
+      title: '添加汇票支出申请',
       hidden: true,
     },
     component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd12'], resolve)
@@ -1248,11 +1248,38 @@ export const constantRoutes = [
     },
     component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalApproval'], resolve)
   },
+  {
+    path: '/onlineHome/approvalApproval10',
+    name: 'approvalApproval10',
+    meta: {
+      title: '付款审批',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalApproval10'], resolve)
+  },{
+    path: '/onlineHome/approvalApproval11',
+    name: 'approvalApproval11',
+    meta: {
+      title: '付款审批',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalApproval11'], resolve)
+  },
+  {
+    path: '/onlineHome/approvalApproval12',
+    name: 'approvalApproval12',
+    meta: {
+      title: '付款审批',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalApproval12'], resolve)
+  },
+
   {
     path: '/onlineHome/approvalModify',
     name: 'approvalModify',
     meta: {
-      title: '修改银农支付付款申请',
+      title: '修改常用转账申请',
       hidden: true,
     },
     component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalModify'], resolve)
@@ -1261,7 +1288,7 @@ export const constantRoutes = [
     path: '/onlineHome/approvalModify2',
     name: 'approvalModify2',
     meta: {
-      title: '修改银农支付付款申请',
+      title: '修改信用卡转账申请',
       hidden: true,
     },
     component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalModify2'], resolve)
@@ -1270,7 +1297,7 @@ export const constantRoutes = [
     path: '/onlineHome/approvalModify3',
     name: 'approvalModify3',
     meta: {
-      title: '修改银农支付付款申请',
+      title: '修改虚拟挂账申请',
       hidden: true,
     },
     component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalModify3'], resolve)
@@ -1279,7 +1306,7 @@ export const constantRoutes = [
     path: '/onlineHome/approvalModify4',
     name: 'approvalModify4',
     meta: {
-      title: '修改银农支付付款申请',
+      title: '修改虚拟转账申请',
       hidden: true,
     },
     component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalModify4'], resolve)
@@ -1288,7 +1315,7 @@ export const constantRoutes = [
     path: '/onlineHome/approvalModify5',
     name: 'approvalModify5',
     meta: {
-      title: '修改银农支付付款申请',
+      title: '修改母子转账申请',
       hidden: true,
     },
     component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalModify5'], resolve)
@@ -1297,7 +1324,7 @@ export const constantRoutes = [
     path: '/onlineHome/approvalModify10',
     name: 'approvalModify10',
     meta: {
-      title: '修改银农支付付款申请',
+      title: '修改现金提现申请',
       hidden: true,
     },
     component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalModify10'], resolve)
@@ -1306,7 +1333,7 @@ export const constantRoutes = [
     path: '/onlineHome/approvalModify11',
     name: 'approvalModify11',
     meta: {
-      title: '修改银农支付付款申请',
+      title: '修改现金使用申请',
       hidden: true,
     },
     component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalModify11'], resolve)
@@ -1315,7 +1342,7 @@ export const constantRoutes = [
     path: '/onlineHome/approvalModify12',
     name: 'approvalModify12',
     meta: {
-      title: '修改银农支付付款申请',
+      title: '修改汇票支出申请',
       hidden: true,
     },
     component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalModify12'], resolve)
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd.vue
index 8b29bff8..91179ff5 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd.vue
@@ -33,6 +33,7 @@
             :min-date="minDate"
             :max-date="maxDate"
             @confirm="onConfirmLasj"
+            @cancel="showlasj = false"
           />
         </van-popup>
         <van-field
@@ -259,8 +260,8 @@
 
         buttonType:'a',
 
-        minDate: new Date(),
-        maxDate: new Date(2050, 10, 1),
+        minDate: new Date(2000, 1, 1),
+        maxDate: new Date(2050, 12, 31),
         currentDate: new Date(),
         form:{},
         fileList:[],
@@ -328,6 +329,7 @@
         status: "N",
       }
       getAccount(params1).then((response) => {
+        console.log(response)
         this.payerOptions = response.rows;
         response.rows.map((res,index) => {
           res['payerFrom'] = '1'
@@ -436,12 +438,11 @@
         this.queryParams.accountType = this.form.accountType
         this.queryParams.status = "0"
         listPayee(this.queryParams).then((response) => {
+          console.log(response)
           this.payeeList = response.rows;
           response.rows.map((res,index) => {
-            if(res.payeeType==1||res.payeeType==2){
               this.payeeList[index].text = res.payee;
               this.payeeList[index].value = res.id;
-            }
           })
         });
       },
@@ -512,6 +513,7 @@
       },
       accountTypeChange(e){
         this.payeeList = [];
+        this.chargeItme = [];
         this.queryParams.accountType = this.form.accountType
         this.queryParams.status = "0"
         listPayee(this.queryParams).then((response) => {
@@ -555,7 +557,7 @@
             return;
           }
         }
-        if(this.uploadFiles==null||this.uploadFiles.length==0){
+        if((this.uploadFiles==null||this.uploadFiles.length==0)&&(this.fileList==null||this.fileList.length==0)){
           Dialog.confirm({
             title: '提示',
             message: '此申请单中未上传任何附件，是否确认提交？',
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd10.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd10.vue
index 2ecdd123..1ac0d145 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd10.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd10.vue
@@ -7,7 +7,7 @@
       @click-left="$router.back(-1)"
     >
       <template #title>
-        <p style="font-weight: bold;">添加资金提现申请</p>
+        <p style="font-weight: bold;">添加现金提现申请</p>
       </template>
     </van-nav-bar>
     <van-form @submit="getChange" @failed="getError" :show-error-message="false" scroll-to-error validate-first>
@@ -33,6 +33,7 @@
             :min-date="minDate"
             :max-date="maxDate"
             @confirm="onConfirmLasj"
+            @cancel="showlasj = false"
           />
         </van-popup>
         <van-field
@@ -215,8 +216,8 @@
 
         buttonType:'a',
 
-        minDate: new Date(),
-        maxDate: new Date(2050, 10, 1),
+        minDate: new Date(2000, 1, 1),
+        maxDate: new Date(2050, 12, 31),
         currentDate: new Date(),
         form:{},
         fileList:[],
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd11.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd11.vue
index 91d076c5..f381dc9b 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd11.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd11.vue
@@ -7,7 +7,7 @@
       @click-left="$router.back(-1)"
     >
       <template #title>
-        <p style="font-weight: bold;">添加资金提现申请</p>
+        <p style="font-weight: bold;">添加现金使用申请</p>
       </template>
     </van-nav-bar>
     <van-form @submit="getChange" @failed="getError" :show-error-message="false" scroll-to-error validate-first>
@@ -33,6 +33,7 @@
             :min-date="minDate"
             :max-date="maxDate"
             @confirm="onConfirmLasj"
+            @cancel="showlasj = false"
           />
         </van-popup>
         <van-field
@@ -59,7 +60,7 @@
         <van-field
           readonly
           required
-          label="提现总金额"
+          label="使用总金额"
           v-model="form.expenditureAmount"
           placeholder="根据下方收款金额自动核算"
           input-align="right"
@@ -215,8 +216,8 @@
 
         buttonType:'a',
 
-        minDate: new Date(),
-        maxDate: new Date(2050, 10, 1),
+        minDate: new Date(2000, 1, 1),
+        maxDate: new Date(2050, 12, 31),
         currentDate: new Date(),
         form:{},
         fileList:[],
@@ -488,7 +489,7 @@
               total = (parseFloat(total) + parseFloat(money.incomeAmount)).toFixed(2)
             });
             this.$set(this.form, "expenditureAmount", total);
-            if(this.form.payerAccount<this.form.expenditureAmount){
+            if(parseFloat(this.form.payerAccount)<parseFloat(this.form.expenditureAmount)){
               this.$notify({ type: 'danger', message: '申请使用金额不能大于可用余额！' });
               this.form.expenditureAmount=""
               this.chargeItme = []
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd12.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd12.vue
index c4b07227..4d138834 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd12.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd12.vue
@@ -33,6 +33,7 @@
             :min-date="minDate"
             :max-date="maxDate"
             @confirm="onConfirmLasj"
+            @cancel="showlasj = false"
           />
         </van-popup>
         <van-field
@@ -245,6 +246,7 @@
     listMoneyorder,
     updateCash
   } from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
+  import Dialog from "vant/lib/dialog";
   export default {
     name: "approvalAdd12",
     data() {
@@ -580,36 +582,79 @@
             return;
           }
         }
-        this.$set(this.form, "payeeList", this.chargeItme);
-        this.$set(this.form, "bankTypeList", this.chargeItme);
-        this.$set(this.form, "accountTypeList", this.chargeItme);
-        this.$set(this.form, "transferStatusList", this.chargeItme);
-        addCash(this.form).then((response) => {
-          this.chargeItme.map(res => {
-            res.cashId = response.data.id
-            addCashdetail(res).then(r => {
-              if(this.form.capitalExpenditureType==2){
-                this.projectForm.outId = response.data.id
-                this.$set(this.projectForm, "ynType", '3');
-                addProjectto(this.projectForm).then(res => {
-                  customSubmit(response.data.id).then(res => {
+        if(this.uploadFiles==null||this.uploadFiles.length==0){
+          Dialog.confirm({
+            title: '提示',
+            message: '此申请单中未上传任何附件，是否确认提交？',
+          })
+            .then(() => {
+              addCash(this.form).then((response) => {
+                this.chargeItme.map(res => {
+                  res.cashId = response.data.id
+                  addCashdetail(res).then(r => {
+                    if(this.form.capitalExpenditureType==2){
+                      this.projectForm.outId = response.data.id
+                      this.$set(this.projectForm, "ynType", '2');
+                      addProjectto(this.projectForm).then(res => {
+                        cashSubmit(response.data.id).then(res => {
+                          this.$toast.success('提交成功');
+                          setTimeout(function(){
+                            history.go(-1)
+                          },2000)
+                        })
+                      })
+                    }else{
+                      cashSubmit(response.data.id).then(res => {
+                        this.$toast.success('提交成功');
+                        setTimeout(function(){
+                          history.go(-1)
+                        },2000)
+                      })
+                    }
+                  })
+                })
+              });
+            })
+
+        }else{
+          addCash(this.form).then((response) => {
+            console.log(this.uploadFiles)
+            this.uploadFiles.map(rr => {
+              const params = new FormData();
+              params.append("tableId", response.data.id);
+              params.append("tableName", "t_yinnong_cash");
+              params.append("bizPath", "upload");
+              params.append("fileType", "0");
+              params.append("file", rr);
+              commonAttach(params).then((r) => {
+              })
+            })
+            this.chargeItme.map(res => {
+              res.cashId = response.data.id
+              addCashdetail(res).then(r => {
+                if(this.form.capitalExpenditureType==2){
+                  this.projectForm.outId = response.data.id
+                  this.$set(this.projectForm, "ynType", '2');
+                  addProjectto(this.projectForm).then(res => {
+                    cashSubmit(response.data.id).then(res => {
+                      this.$toast.success('提交成功');
+                      setTimeout(function(){
+                        history.go(-1)
+                      },2000)
+                    })
+                  })
+                }else{
+                  cashSubmit(response.data.id).then(res => {
                     this.$toast.success('提交成功');
                     setTimeout(function(){
                       history.go(-1)
                     },2000)
                   })
-                })
-              }else{
-                customSubmit(response.data.id).then(res => {
-                  this.$toast.success('提交成功');
-                  setTimeout(function(){
-                    history.go(-1)
-                  },2000)
-                })
-              }
+                }
+              })
             })
-          })
-        });
+          });
+        }
       },
       goUpdate(){
         if(this.chargeItme.length<1){
@@ -630,28 +675,64 @@
             return;
           }
         }
-        addCash(this.form).then((response) => {
-          this.chargeItme.map(res => {
-            res.cashId = response.data.id
-            addCashdetail(res).then(r => {
-              if(this.form.capitalExpenditureType==2){
-                this.projectForm.outId = response.data.id
-                this.$set(this.projectForm, "ynType", '3');
-                addProjectto(this.projectForm).then(res => {
+        if(this.uploadFiles==null||this.uploadFiles.length==0){
+          addCash(this.form).then((response) => {
+            this.chargeItme.map(res => {
+              res.cashId = response.data.id
+              addCashdetail(res).then(r => {
+                if(this.form.capitalExpenditureType==2){
+                  this.projectForm.outId = response.data.id
+                  this.$set(this.projectForm, "ynType", '2');
+                  addProjectto(this.projectForm).then(res => {
+                    this.$toast.success('保存成功');
+                    setTimeout(function(){
+                      history.go(-1)
+                    },2000)
+                  })
+                }else{
                   this.$toast.success('保存成功');
                   setTimeout(function(){
                     history.go(-1)
                   },2000)
-                })
-              }else{
-                this.$toast.success('保存成功');
-                setTimeout(function(){
-                  history.go(-1)
-                },2000)
-              }
+                }
+              })
             })
-          })
-        });
+          });
+        }else{
+          addCash(this.form).then((response) => {
+            console.log(this.uploadFiles)
+            this.uploadFiles.map(rr => {
+              const params = new FormData();
+              params.append("tableId", response.data.id);
+              params.append("tableName", "t_yinnong_cash");
+              params.append("bizPath", "upload");
+              params.append("fileType", "0");
+              params.append("file", rr);
+              commonAttach(params).then((r) => {
+              })
+            })
+            this.chargeItme.map(res => {
+              res.cashId = response.data.id
+              addCashdetail(res).then(r => {
+                if(this.form.capitalExpenditureType==2){
+                  this.projectForm.outId = response.data.id
+                  this.$set(this.projectForm, "ynType", '2');
+                  addProjectto(this.projectForm).then(res => {
+                    this.$toast.success('保存成功');
+                    setTimeout(function(){
+                      history.go(-1)
+                    },2000)
+                  })
+                }else{
+                  this.$toast.success('保存成功');
+                  setTimeout(function(){
+                    history.go(-1)
+                  },2000)
+                }
+              })
+            })
+          });
+        }
       },
       payeeSelectChange(select, i) {
         let obj = {};
@@ -752,16 +833,13 @@
         }
       },
       beforeRead(file) {
-        console.log(file)
-        console.log(this.fileList)
-        const params = new FormData();
-        params.append("tableId", this.$route.query.id);
-        params.append("tableName", "t_yinnong_transfer");
-        params.append("bizPath", "upload");
-        params.append("fileType", "0");
-        params.append("file", file.file);
-        commonAttach(params).then((response) => {
-          console.log(response)
+        this.uploadFiles.push(file.file);
+      },
+      deleteFile(file){
+        this.uploadFiles.map((response,index) => {
+          if(file.file == response){
+            this.uploadFiles.splice(index,1)
+          }
         })
       },
       getFileList(){
@@ -775,7 +853,6 @@
           console.log(res)
           console.log(location.protocol+"//"+location.host+request.defaults.baseURL)
           res.rows.map(r => {
-
             let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
             this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{})})
             console.log(r)
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd2.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd2.vue
index 461ade08..90a2552a 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd2.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd2.vue
@@ -33,6 +33,7 @@
             :min-date="minDate"
             :max-date="maxDate"
             @confirm="onConfirmLasj"
+            @cancel="showlasj = false"
           />
         </van-popup>
         <van-field
@@ -250,8 +251,8 @@
 
         buttonType:'a',
 
-        minDate: new Date(),
-        maxDate: new Date(2050, 10, 1),
+        minDate: new Date(2000, 1, 1),
+        maxDate: new Date(2050, 12, 31),
         currentDate: new Date(),
         form:{},
         fileList:[],
@@ -548,7 +549,7 @@
             return;
           }
         }
-        if(this.uploadFiles==null||this.uploadFiles.length==0){
+        if((this.uploadFiles==null||this.uploadFiles.length==0)&&(this.fileList==null||this.fileList.length==0)){
           Dialog.confirm({
             title: '提示',
             message: '此申请单中未上传任何附件，是否确认提交？',
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd3.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd3.vue
index 2c60c066..889b2ce1 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd3.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd3.vue
@@ -33,6 +33,7 @@
             :min-date="minDate"
             :max-date="maxDate"
             @confirm="onConfirmLasj"
+            @cancel="showlasj = false"
           />
         </van-popup>
         <van-field
@@ -254,8 +255,8 @@
 
         buttonType:'a',
 
-        minDate: new Date(),
-        maxDate: new Date(2050, 10, 1),
+        minDate: new Date(2000, 1, 1),
+        maxDate: new Date(2050, 12, 31),
         currentDate: new Date(),
         form:{},
         fileList:[],
@@ -511,6 +512,7 @@
         this.form.cashierId = data.value;
         this.form.payerAccount = data.payeeAccount;
         this.showpayer = false;
+        this.accountTypeChange();
       },
       onConfirmLasj(data){
         this.form.applyDate = this.getNowFormatDate(data).substr(0,10);
@@ -522,7 +524,8 @@
         let params = {
           villageAccountType : 1,
           status:'0',
-          accountType : this.form.accountType
+          accountType : this.form.accountType,
+          taccountId:this.form.cashierId
         }
         listVaccount(params).then(response => {
           console.log(response)
@@ -568,7 +571,7 @@
             return;
           }
         }
-        if(this.uploadFiles==null||this.uploadFiles.length==0){
+        if((this.uploadFiles==null||this.uploadFiles.length==0)&&(this.fileList==null||this.fileList.length==0)){
           Dialog.confirm({
             title: '提示',
             message: '此申请单中未上传任何附件，是否确认提交？',
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd4.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd4.vue
index dd8625a0..e33885de 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd4.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd4.vue
@@ -33,6 +33,7 @@
             :min-date="minDate"
             :max-date="maxDate"
             @confirm="onConfirmLasj"
+            @cancel="showlasj = false"
           />
         </van-popup>
         <van-field
@@ -213,7 +214,7 @@
       </div>
       <p class="main_title">上传附件</p>
       <div class="main_box" style="padding: 5px 0 0 8px;">
-        <van-uploader v-model="fileList" :after-read="beforeRead" ></van-uploader>
+        <van-uploader v-model="fileList" :after-read="beforeRead" @delete="deleteFile"></van-uploader>
       </div>
       <div style="padding: 16px 0;">
         <van-row>
@@ -236,6 +237,7 @@
   import { addTransfer , listPayee , updateTransfer , getProjectto , listProject , addProjectto , customSubmit , getAccount ,getQmyeFlow} from "@/api/onlineHome/bankAgriculture/paymentApproval";
   import {attachmentList, commonAttach, listVaccount} from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
   import request from '@/utils/request'
+  import Dialog from "vant/lib/dialog";
   export default {
     name: "approvalAdd4",
     data() {
@@ -250,8 +252,8 @@
 
         buttonType:'a',
 
-        minDate: new Date(),
-        maxDate: new Date(2050, 10, 1),
+        minDate: new Date(2000, 1, 1),
+        maxDate: new Date(2050, 12, 31),
         currentDate: new Date(),
         form:{},
         fileList:[],
@@ -291,7 +293,8 @@
           outId:null,
           ynType:'1'
         },
-        projectFundType:''
+        projectFundType:'',
+        uploadFiles:[],
       };
     },
     created() {
@@ -503,6 +506,7 @@
       },
       accountTypeChange(e){
         this.payeeList = [];
+        this.chargeItme = [];
         this.queryParams.accountType = this.form.accountType
         this.queryParams.status = "0"
         listPayee(this.queryParams).then((response) => {
@@ -546,31 +550,130 @@
             return;
           }
         }
-        this.$set(this.form, "payeeList", this.chargeItme);
-        this.$set(this.form, "bankTypeList", this.chargeItme);
-        this.$set(this.form, "accountTypeList", this.chargeItme);
-        this.$set(this.form, "transferStatusList", this.chargeItme);
-        addTransfer(this.form).then(response => {
-          this.projectForm.outId = response.data.id
-          this.$set(this.projectForm, "ynType", '1');
-          if(this.form.capitalExpenditureType==2){
-            addProjectto(this.projectForm).then(res => {
-              customSubmit(response.data.id).then(res => {
-                this.$toast.success('提交成功');
-                setTimeout(function(){
-                  history.go(-1)
-                },2000)
-              })
-            })
-          }else{
-            customSubmit(response.data.id).then(res => {
-              this.$toast.success('提交成功');
-              setTimeout(function(){
-                history.go(-1)
-              },2000)
+        if((this.uploadFiles==null||this.uploadFiles.length==0)&&(this.fileList==null||this.fileList.length==0)){
+          Dialog.confirm({
+            title: '提示',
+            message: '此申请单中未上传任何附件，是否确认提交？',
+          })
+            .then(() => {
+              this.$set(this.form, "payeeList", this.chargeItme);
+              this.$set(this.form, "bankTypeList", this.chargeItme);
+              this.$set(this.form, "accountTypeList", this.chargeItme);
+              this.$set(this.form, "transferStatusList", this.chargeItme);
+              addTransfer(this.form).then(response => {
+                this.projectForm.outId = response.data.id
+                this.$set(this.projectForm, "ynType", '1');
+                if(this.uploadFiles!=null&&this.uploadFiles.length>0){
+                  this.uploadFiles.map(rr => {
+                    const params = new FormData();
+                    params.append("tableId", response.data.id);
+                    params.append("tableName", "t_yinnong_transfer");
+                    params.append("bizPath", "upload");
+                    params.append("fileType", "0");
+                    params.append("file", rr);
+                    commonAttach(params).then((r) => {
+                    })
+                  })
+                  if(this.form.capitalExpenditureType==2){
+                    addProjectto(this.projectForm).then(res => {
+                      customSubmit(response.data.id).then(res => {
+                        this.$toast.success('提交成功');
+                        setTimeout(function(){
+                          history.go(-1)
+                        },2000)
+                      })
+                    })
+                  }else{
+                    customSubmit(response.data.id).then(res => {
+                      this.$toast.success('提交成功');
+                      setTimeout(function(){
+                        history.go(-1)
+                      },2000)
+                    })
+                  }
+                }else{
+                  if(this.form.capitalExpenditureType==2){
+                    addProjectto(this.projectForm).then(res => {
+                      customSubmit(response.data.id).then(res => {
+                        this.$toast.success('提交成功');
+                        setTimeout(function(){
+                          history.go(-1)
+                        },2000)
+                      })
+                    })
+                  }else{
+                    customSubmit(response.data.id).then(res => {
+                      this.$toast.success('提交成功');
+                      setTimeout(function(){
+                        history.go(-1)
+                      },2000)
+                    })
+                  }
+                }
+              });
             })
-          }
-        });
+            .catch(() => {
+              return false;
+            });
+        }else{
+          this.$set(this.form, "payeeList", this.chargeItme);
+          this.$set(this.form, "bankTypeList", this.chargeItme);
+          this.$set(this.form, "accountTypeList", this.chargeItme);
+          this.$set(this.form, "transferStatusList", this.chargeItme);
+          addTransfer(this.form).then(response => {
+            this.projectForm.outId = response.data.id
+            this.$set(this.projectForm, "ynType", '1');
+            if(this.uploadFiles!=null&&this.uploadFiles.length>0){
+              this.uploadFiles.map(rr => {
+                const params = new FormData();
+                params.append("tableId", response.data.id);
+                params.append("tableName", "t_yinnong_transfer");
+                params.append("bizPath", "upload");
+                params.append("fileType", "0");
+                params.append("file", rr);
+                commonAttach(params).then((r) => {
+                })
+              })
+              if(this.form.capitalExpenditureType==2){
+                addProjectto(this.projectForm).then(res => {
+                  customSubmit(response.data.id).then(res => {
+                    this.$toast.success('提交成功');
+                    setTimeout(function(){
+                      history.go(-1)
+                    },2000)
+                  })
+                })
+              }else{
+                customSubmit(response.data.id).then(res => {
+                  this.$toast.success('提交成功');
+                  setTimeout(function(){
+                    history.go(-1)
+                  },2000)
+                })
+              }
+            }else{
+              if(this.form.capitalExpenditureType==2){
+                addProjectto(this.projectForm).then(res => {
+                  customSubmit(response.data.id).then(res => {
+                    this.$toast.success('提交成功');
+                    setTimeout(function(){
+                      history.go(-1)
+                    },2000)
+                  })
+                })
+              }else{
+                customSubmit(response.data.id).then(res => {
+                  this.$toast.success('提交成功');
+                  setTimeout(function(){
+                    history.go(-1)
+                  },2000)
+                })
+              }
+            }
+          });
+        }
+
+
       },
       goUpdate(){
         if(this.chargeItme.length<1){
@@ -595,23 +698,51 @@
         this.$set(this.form, "bankTypeList", this.chargeItme);
         this.$set(this.form, "accountTypeList", this.chargeItme);
         this.$set(this.form, "transferStatusList", this.chargeItme);
-        this.projectForm.outId = this.form.id
+        console.log(this.form)
         addTransfer(this.form).then((response) => {
           this.projectForm.outId = response.data.id
           this.$set(this.projectForm, "ynType", '1');
-          if(this.form.capitalExpenditureType==2){
-            addProjectto(this.projectForm).then(res => {
+          if(this.uploadFiles!=null&&this.uploadFiles.length>0){
+            console.log(this.uploadFiles)
+            this.uploadFiles.map(rr => {
+              const params = new FormData();
+              params.append("tableId", response.data.id);
+              params.append("tableName", "t_yinnong_transfer");
+              params.append("bizPath", "upload");
+              params.append("fileType", "0");
+              params.append("file", rr);
+              commonAttach(params).then((r) => {
+              })
+            })
+            if(this.form.capitalExpenditureType==2){
+              addProjectto(this.projectForm).then(res => {
+                this.$toast.success('保存成功');
+                setTimeout(function(){
+                  history.go(-1)
+                },2000)
+              })
+            }else{
               this.$toast.success('保存成功');
               setTimeout(function(){
                 history.go(-1)
               },2000)
-            })
+            }
           }else{
-            this.$toast.success('保存成功');
-            setTimeout(function(){
-              history.go(-1)
-            },2000)
+            if(this.form.capitalExpenditureType==2){
+              addProjectto(this.projectForm).then(res => {
+                this.$toast.success('保存成功');
+                setTimeout(function(){
+                  history.go(-1)
+                },2000)
+              })
+            }else{
+              this.$toast.success('保存成功');
+              setTimeout(function(){
+                history.go(-1)
+              },2000)
+            }
           }
+
         });
       },
       payeeSelectChange(select, i) {
@@ -675,16 +806,13 @@
           this.$set(this.form, "payerFrom", '1');
       },
       beforeRead(file) {
-        console.log(file)
-        console.log(this.fileList)
-        const params = new FormData();
-        params.append("tableId", this.$route.query.id);
-        params.append("tableName", "t_yinnong_transfer");
-        params.append("bizPath", "upload");
-        params.append("fileType", "0");
-        params.append("file", file.file);
-        commonAttach(params).then((response) => {
-          console.log(response)
+        this.uploadFiles.push(file.file);
+      },
+      deleteFile(file){
+        this.uploadFiles.map((response,index) => {
+          if(file.file == response){
+            this.uploadFiles.splice(index,1)
+          }
         })
       },
       getFileList(){
@@ -698,7 +826,6 @@
           console.log(res)
           console.log(location.protocol+"//"+location.host+request.defaults.baseURL)
           res.rows.map(r => {
-
             let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
             this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{})})
             console.log(r)
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd5.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd5.vue
index 3a179ae2..91efce42 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd5.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd5.vue
@@ -33,6 +33,7 @@
             :min-date="minDate"
             :max-date="maxDate"
             @confirm="onConfirmLasj"
+            @cancel="showlasj = false"
           />
         </van-popup>
         <van-field
@@ -255,8 +256,8 @@
 
         buttonType:'a',
 
-        minDate: new Date(),
-        maxDate: new Date(2050, 10, 1),
+        minDate: new Date(2000, 1, 1),
+        maxDate: new Date(2050, 12, 31),
         currentDate: new Date(),
         form:{},
         fileList:[],
@@ -514,6 +515,7 @@
         this.form.payerAccount = data.payeeAccount;
         this.showpayer = false;
         // this.selectChange(data.value)
+        this.accountTypeChange();
       },
       onConfirmLasj(data){
         this.form.applyDate = this.getNowFormatDate(data).substr(0,10);
@@ -571,7 +573,7 @@
             return;
           }
         }
-        if(this.uploadFiles==null||this.uploadFiles.length==0){
+        if((this.uploadFiles==null||this.uploadFiles.length==0)&&(this.fileList==null||this.fileList.length==0)){
           Dialog.confirm({
             title: '提示',
             message: '此申请单中未上传任何附件，是否确认提交？',
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalApproval.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalApproval.vue
index 96f504b3..7c4fbcb5 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalApproval.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalApproval.vue
@@ -4,7 +4,7 @@
       left-arrow
       fixed
       placeholder
-      @click-left="$router.back(-1)"
+      @click-left="backDone"
     >
       <template #title>
         <p style="font-weight: bold;">付款审批</p>
@@ -57,7 +57,15 @@
         <van-field readonly label="所属银行" v-model="item.bankTypeText" input-align="right" />
       </div>
     </div>
-
+    <p class="main_title">上传附件</p>
+    <div class="main_box" style="padding: 5px 0 0 8px;">
+      <van-uploader v-model="fileList" v-if="fileList==null||fileList.length==0" :deletable="false"  disabled  :upload-text="'未上传附件'"></van-uploader>
+      <van-uploader v-model="fileList" v-if="fileList!=null&&fileList.length>0" :deletable="false" :max-count="fileList.length"  ></van-uploader>
+    </div>
+    <p style="margin-top:20px;padding: 0 10px">附件下载{{fileList&&fileList.length==0?':暂无可下载文件':''}}</p>
+    <van-cell v-for="(item,index) in fileList" :key="index">
+      <a :href="item.url">{{index+1}}.{{item.fileName}}</a>
+    </van-cell>
     <div class="main_box examine_box" v-if="this.$route.query.type != 'done'">
       <van-row type="flex" justify="space-between" align="center">
         <van-col span="5">审批<br/>意见</van-col>
@@ -85,6 +93,8 @@
 
 <script>
   import { getTransfer , queryTransferDetail , listPayee , getProjectto , listProject , approval } from "@/api/onlineHome/bankAgriculture/paymentApproval";
+  import {attachmentList, systemAttachment} from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
+  import request from '@/utils/request'
   export default {
     name: "approvalApproval",
     data() {
@@ -96,8 +106,8 @@
         showproject:false,
         showFundType:false,
 
-        minDate: new Date(),
-        maxDate: new Date(2025, 10, 1),
+        minDate: new Date(2000, 1, 1),
+        maxDate: new Date(2050, 12, 31),
         currentDate: new Date(),
         form:{},
 
@@ -137,6 +147,8 @@
           ynType:'1'
         },
         projectFundType:'',
+        fileList:[],
+        uploadFiles:[],
         // 审核意见默认值
         pass: "true",
         comment: "同意",
@@ -161,8 +173,16 @@
         this.projectFundTypeDictionaries = response.data;
       });
       this.getDictionaries();
+      this.getFileList();
     },
     methods: {
+      backDone(){
+        if(this.$route.query.type != 'done'){
+          this.$router.push({name:'onlineHomeDone',query: {activeName:'1'}})
+        }else{
+          this.$router.push({name:'onlineHomeDone',query: {activeName:'2'}})
+        }
+      },
       goFlow(){
         window.location='approvalProcess?id='+this.$route.query.id;
       },
@@ -212,6 +232,38 @@
           }
         });
       },
+      beforeRead(file) {
+        this.uploadFiles.push(file.file);
+      },
+      deleteFile(file){
+        console.log(file)
+        this.uploadFiles.map((response,index) => {
+          if(file.file == response){
+            this.uploadFiles.splice(index,1)
+          }
+        })
+        if(file.id){
+          systemAttachment(file.id).then((res) => {
+          });
+        }
+      },
+      getFileList(){
+        let oData= {
+          tableId: this.$route.query.id,
+          tableName: "t_yinnong_transfer",
+          bizPath: "upload",
+          fileType: "0",
+        }
+        attachmentList(oData).then(res => {
+          console.log(res)
+          console.log(location.protocol+"//"+location.host+request.defaults.baseURL)
+          res.rows.map(r => {
+            let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
+            this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{}),"id":r.id,"fileName":r.fileName})
+            console.log(r)
+          })
+        })
+      },
       /** 提交按钮 */
       submitForm() {
         const data = {
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalApproval10.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalApproval10.vue
new file mode 100644
index 00000000..7eaccc41
--- /dev/null
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalApproval10.vue
@@ -0,0 +1,501 @@
+<template>
+  <div class="app-container">
+    <van-nav-bar
+      left-arrow
+      fixed
+      placeholder
+      @click-left="$router.back(-1)"
+    >
+      <template #title>
+        <p style="font-weight: bold;">现金提现申请审批</p>
+      </template>
+      <template #right>
+        <van-icon name="../../../static/images/icon/icon_flow.png" size="20" @click="goFlow"/>
+      </template>
+    </van-nav-bar>
+    <p class="main_title">基础信息</p>
+    <div class="main_box">
+      <van-field readonly label="申请时间" v-model="form.applyDate" input-align="right" />
+      <van-field readonly label="资金支出类别" v-model="capitalExpenditureType" input-align="right" label-width="auto" />
+      <van-field readonly label="提现总金额" v-model="form.expenditureAmount" input-align="right" label-width="auto"/>
+    </div>
+
+    <div class="main_box" style="margin-top: 10px;">
+      <van-field readonly label="付款事由" v-model="form.remark" type="textarea" input-align="right" rows="3" label-width="auto"/>
+    </div>
+
+    <div class="main_box" style="margin-top: 10px;">
+      <van-field readonly label="说明情况" v-model="form.explainSituation" type="textarea" input-align="right" rows="3" label-width="auto"/>
+    </div>
+
+    <p class="main_title">付款方信息</p>
+    <div class="main_box">
+      <van-field readonly label="付款方" v-model="form.payer" input-align="right" label-width="auto"/>
+      <van-field readonly label="付款方账户" v-model="form.payerAccount" input-align="right" label-width="auto"/>
+    </div>
+
+    <div class="main_box" v-if="capitalExpenditureOpen" style="margin-bottom: 10px;margin-top: 10px;position:relative;">
+      <van-field readonly label="项目名称" v-model="projectForm.projectName" input-align="right" />
+      <van-field readonly label="承建单位" v-model="projectForm.projectContractor" input-align="right" label-width="auto"/>
+      <van-field readonly label="合同价款（元）" v-model="projectForm.projectAmount" input-align="right" label-width="auto"/>
+      <van-field readonly label="工程款类型" v-model="projectFundType" input-align="right" />
+      <van-field readonly label="工程发票号" v-model="projectForm.projectBillNum" input-align="right" label-width="auto"/>
+    </div>
+
+    <p class="main_title">收款方信息</p>
+    <div :style="{position:'relative',padding: index == 0 ? '':'10px 0 0 0'}" v-for="(item, index) in chargeItme" :key="index">
+      <div class="main_box" style="margin-bottom: 10px;position:relative;">
+        <van-field readonly label="收款方" v-model="item.payee" input-align="right" />
+        <van-field readonly label="提款人" v-model="item.drawer" input-align="right" label-width="auto"/>
+        <van-field readonly label="提款金额（元）" v-model="item.incomeAmount" input-align="right" label-width="auto"/>
+        <van-field readonly label="资金用途" v-model="item.remark" input-align="right" />
+      </div>
+    </div>
+    <p class="main_title">上传附件</p>
+    <div class="main_box" style="padding: 5px 0 0 8px;">
+      <van-uploader v-model="fileList" v-if="fileList==null||fileList.length==0" :deletable="false"  disabled  :upload-text="'未上传附件'"></van-uploader>
+      <van-uploader v-model="fileList" v-if="fileList!=null&&fileList.length>0" :deletable="false" :max-count="fileList.length"  ></van-uploader>
+    </div>
+    <p style="margin-top:20px;padding: 0 10px">附件下载{{fileList&&fileList.length==0?':暂无可下载文件':''}}</p>
+    <van-cell v-for="(item,index) in fileList" :key="index">
+      <a :href="item.url">{{index+1}}.{{item.fileName}}</a>
+    </van-cell>
+    <div class="main_box examine_box" v-if="this.$route.query.type != 'done'">
+      <van-row type="flex" justify="space-between" align="center">
+        <van-col span="5">审批<br/>意见</van-col>
+        <van-col span="19">
+          <van-radio-group v-model="pass" direction="horizontal">
+            <van-radio name="true">同意</van-radio>
+            <van-radio name="false">驳回</van-radio>
+          </van-radio-group>
+          <van-field rows="2" autosize v-model="comment" type="textarea" placeholder="同意申请宅基地"/>
+        </van-col>
+      </van-row>
+    </div>
+
+    <div style="margin: 16px 2%;" v-if="this.$route.query.type != 'done'">
+      <van-row>
+        <van-col span="24" align="center">
+          <van-button type="info" native-type="submit" @click="submitForm" class="submitButton">提交</van-button>
+        </van-col>
+      </van-row>
+      <div class="clear"></div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { getCash , listCashdetailByCashId , listPayee , getProjectto , listProject , addProjectto , customSubmit} from "@/api/onlineHome/bankAgriculture/paymentApproval";
+  import request from '@/utils/request'
+  import {approval, attachmentList, commonAttach} from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
+  export default {
+    name: "approvalDetail10",
+    data() {
+      return {
+        showcapital:false,
+        showpayee:false,
+        showlasj:false,
+        showbankType:false,
+        showproject:false,
+        showFundType:false,
+
+        minDate: new Date(),
+        maxDate: new Date(2050, 10, 1),
+        currentDate: new Date(),
+        form:{},
+        fileList:[],
+        capitalExpenditureType:'',
+        payee:'',
+        bankType:'',
+
+        wfydlxDictionaries:[],
+        jglxDictionaries:[],
+        sysDictionaries:[],
+        capitalExpenditureTypeOptions:[],
+        bankTypeDictionaries:[],
+        projectList:[],
+        projectFundTypeOptions:[],
+        projectFundTypeDictionaries:[],
+        projectListShow:[],
+
+        chargeItme:[],
+        chargeItmeShow:[],
+
+        payeeList:[],
+        // 查询参数
+        queryParams: {
+          transferType:"",
+          orderByColumn: "id",
+          isAsc: "desc",
+        },
+        capitalExpenditureOpen:false,
+        projectForm:{
+          projectId:null,
+          projectName:null,
+          projectContractor:null,
+          projectAmount:null,
+          projectBillNum:null,
+          projectFundType:'1',
+          outId:null,
+          ynType:'2'
+        },
+        projectFundType:'',
+        uploadFiles:[],
+        // 审核意见默认值
+        pass: "true",
+        comment: "同意",
+      };
+    },
+    created() {
+      let queryParams={
+        pageNum: 1,
+        pageSize: 100,
+      }
+      listProject(queryParams).then(response => {
+        console.log(response)
+        this.projectList = response.rows;
+        for (var i = 0; i < response.rows.length; i++) {
+          this.projectListShow.push({text: response.rows[i].projectName, value: response.rows[i].id});
+        }
+      });
+      this.getDicts("project_fund_type").then((response) => {
+        for (var i = 0; i < response.data.length; i++) {
+          this.projectFundTypeOptions.push({text: response.data[i].dictLabel, value: response.data[i].dictValue});
+        }
+        this.projectFundTypeDictionaries = response.data;
+      });
+      this.getDictionaries();
+      this.getFileList();
+    },
+    methods: {
+      goFlow(){
+        window.location='approvalProcess2?id='+this.$route.query.id;
+      },
+      getDictionaries(){
+        getCash(this.$route.query.id).then((response) => {
+          this.getDicts("capital_expenditure_type").then((res) => {
+            for (var i = 0; i < res.data.length; i++) {
+              this.capitalExpenditureTypeOptions.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
+            }
+            this.capitalExpenditureType = this.selectDictLabel(res.data, response.data.capitalExpenditureType);
+          });
+          if(response.data.capitalExpenditureType==2){
+            this.capitalExpenditureOpen = true
+            let param={
+              'outId' : response.data.id,
+              'ynType' : '2'
+            }
+            getProjectto(param).then(res => {
+              this.projectFundType = this.selectDictLabel(this.projectFundTypeDictionaries, res.data.projectFundType);
+              this.projectForm = res.data
+            })
+          }else{
+            this.showproject = false
+          }
+          this.form = response.data;
+        });
+        console.log(this.$route.query.id)
+        listCashdetailByCashId(this.$route.query.id).then((response) => {
+          this.chargeItme = response.data;
+          console.log(response.data)
+          this.getPayeeList();
+        });
+      },
+      addChargeItme(index){
+        this.chargeItme.splice(index + 1, 0, {
+          payeeId: "", //收款方ID
+          payee: "", //收款方
+          payeeAccount: "", //收款账户
+          bankDeposit: "", //开户银行
+          incomeAmount: "", //收入金额
+          bankType: "", //所属银行
+        });
+      },
+      getPayeeList() {
+        //普通转账
+        this.queryParams.accountType = this.form.accountType
+        this.queryParams.status = "0"
+        listPayee(this.queryParams).then((response) => {
+          for (var i = 0; i < response.rows.length; i++) {
+            this.payeeList.push({text: response.rows[i].payee, value: response.rows[i].id});
+          }
+        });
+      },
+      payeeDictLabel(datas, value) {
+        var actions = [];
+        Object.keys(datas).some((key) => {
+          if (datas[key].payeeId == ('' + value)) {
+            actions.push(datas[key].payee);
+            return true;
+          }
+        })
+        return actions.join('');
+      },
+      onConfirmCapital(data){
+        console.log(data)
+        if (data.value != 2){
+          this.capitalExpenditureOpen = false;
+          this.projectForm = [];
+        }else{
+          this.capitalExpenditureOpen = true;
+        }
+        this.capitalExpenditureType = data.text;
+        this.form.capitalExpenditureType = data.value;
+        this.showcapital = false;
+      },
+      onConfirmFundType(data){
+        console.log(data)
+        this.projectForm.projectFundType = data.value;
+        this.projectFundType = data.text;
+        this.showFundType = false;
+      },
+      onConfirmProject(data){
+        console.log(data)
+        this.projectList.map(res => {
+          console.log(res)
+          if(res.projectName==data.text){
+            this.projectForm.projectId = res.id
+            this.projectForm.projectName = res.projectName
+            this.projectForm.projectContractor = res.projectContractor
+            this.projectForm.projectAmount = res.projectAmount
+            console.log(this.projectForm)
+          }
+        })
+        this.showproject = false;
+      },
+      onConfirmPayee(data){
+        // this.chargeItme[this.chargeItme.length-1].payeeText = data.text;
+        this.chargeItme[this.chargeItme.length-1].payee = data.text;
+        this.chargeItme[this.chargeItme.length-1].payeeId = data.value;
+        console.log(this.chargeItme)
+        this.showpayee = false;
+      },
+      onConfirmBankType(data){
+        console.log(this.chargeItme)
+        this.chargeItme[this.chargeItme.length-1].bankTypeText = data.text;
+        this.chargeItme[this.chargeItme.length-1].bankType = data.value;
+        this.showbankType = false;
+      },
+      onConfirmLasj(data){
+        this.form.applyDate = this.getNowFormatDate(data).substr(0,10);
+        this.showlasj = false;
+      },
+      accountTypeChange(e){
+        console.log(e)
+        this.payeeList = [];
+        this.queryParams.accountType = this.form.accountType
+        this.queryParams.status = "0"
+        listPayee(this.queryParams).then((response) => {
+          for (var i = 0; i < response.rows.length; i++) {
+            this.payeeList.push({text: response.rows[i].payee, value: response.rows[i].id});
+          }
+        });
+      },
+      goAdd(){
+        if(this.form.remark != null && this.form.remark.indexOf("|")!=-1){
+          this.$toast.error("付款事由禁止包含|。");
+          return;
+        }
+        if(this.form.capitalExpenditureType==2){
+          if(this.projectForm.projectName==""||this.projectForm.projectName==null){
+            this.$toast.error('请选择项目名称！');
+            return;
+          }
+          if(this.projectForm.projectBillNum==""||this.projectForm.projectBillNum==null){
+            this.$toast.error('请输入工程发票号！');
+            return;
+          }
+        }
+        this.$set(this.form, "payeeList", this.chargeItme);
+        this.$set(this.form, "bankTypeList", this.chargeItme);
+        this.$set(this.form, "accountTypeList", this.chargeItme);
+        this.$set(this.form, "transferStatusList", this.chargeItme);
+        console.log(this.form);
+        updateTransfer(this.form).then(response => {
+          console.log(response);
+          this.projectForm.outId = this.form.id
+          this.$set(this.projectForm, "ynType", '1');
+          console.log(this.projectForm)
+          if(this.form.capitalExpenditureType==2){
+            addProjectto(this.projectForm).then(res => {
+              customSubmit(this.form.id).then(res => {
+                this.$toast.success('提交成功');
+                setTimeout(function(){
+                  history.go(-1)
+                },2000)
+              })
+            })
+          }else{
+            customSubmit(this.form.id).then(res => {
+              this.$toast.success('提交成功');
+              setTimeout(function(){
+                history.go(-1)
+              },2000)
+            })
+          }
+        });
+      },
+      goUpdate(){
+        if(this.form.remark != null && this.form.remark.indexOf("|")!=-1){
+          this.$toast.error("付款事由禁止包含|。");
+          return;
+        }
+        if(this.form.capitalExpenditureType==2){
+          if(this.projectForm.projectName==""||this.projectForm.projectName==null){
+            this.$toast.error('请选择项目名称！');
+            return;
+          }
+          if(this.projectForm.projectBillNum==""||this.projectForm.projectBillNum==null){
+            this.$toast.error('请输入工程发票号！');
+            return;
+          }
+        }
+        this.$set(this.form, "payeeList", this.chargeItme);
+        this.$set(this.form, "bankTypeList", this.chargeItme);
+        this.$set(this.form, "accountTypeList", this.chargeItme);
+        this.$set(this.form, "transferStatusList", this.chargeItme);
+        this.projectForm.outId = this.form.id
+        updateTransfer(this.form).then((response) => {
+          this.projectForm.outId = this.form.id
+          this.$set(this.projectForm, "ynType", '1');
+          if(this.form.capitalExpenditureType==2){
+            addProjectto(this.projectForm).then(res => {
+              this.$toast.success('修改成功');
+              setTimeout(function(){
+                history.go(-1)
+              },2000)
+            })
+          }else{
+            this.$toast.success('修改成功');
+            setTimeout(function(){
+              history.go(-1)
+            },2000)
+          }
+        });
+      },
+      beforeRead(file) {
+        this.uploadFiles.push(file.file);
+      },
+      deleteFile(file){
+        this.uploadFiles.map((response,index) => {
+          if(file.file == response){
+            this.uploadFiles.splice(index,1)
+          }
+        })
+      },
+      getFileList(){
+        let oData= {
+          tableId: this.$route.query.id,
+          tableName: "t_yinnong_cash",
+          bizPath: "upload",
+          fileType: "0",
+        }
+        attachmentList(oData).then(res => {
+          console.log(res)
+          console.log(location.protocol+"//"+location.host+request.defaults.baseURL)
+          res.rows.map(r => {
+            let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
+            this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{}),"id":r.id,"fileName":r.fileName})
+            console.log(r)
+          })
+        })
+      },
+      goBack(){
+        window.history.go(-1)
+      },
+      //删除家庭成员
+      deleteChargeItme(index){
+        this.chargeItme.splice(index,1)
+      },
+      /** 提交按钮 */
+      submitForm() {
+        const data = {
+          taskId: this.$route.query.taskId,
+          instanceId: this.form.instanceId,
+          variables: JSON.stringify({
+            comment: this.comment,
+            pass: this.pass,
+          }),
+        };
+        console.log(data);
+        approval(data).then((response) => {
+          if(response.code==200 && response.msg=="操作成功"){
+            this.$toast.success("操作成功");
+            setTimeout(function(){
+              history.go(-1)
+            },2000)
+          } else{
+            this.$toast.success("操作失败");
+          }
+        });
+      },
+    },watch: {
+      pass: function (val) {
+        this.comment = val === "true" ? "同意" : "驳回";
+      },
+    },
+  }
+</script>
+
+<style scoped lang="scss">
+  .app-container {
+    padding: 2% 0;
+  }
+  .main_title{
+    font-size: 0.4rem;
+    color: #1D6FE9;
+    margin: 0.2rem 6%;
+    position: relative;
+  }
+  .main_box{
+    width: 96%;
+    margin: 0 auto;
+    border-radius: 6px;
+    box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);
+    overflow: hidden;
+    background-color: #FFF;
+  }
+  .submitButton{
+    width: 96%;
+    margin: 0 auto;
+  }
+
+  .addFamily{
+    position: absolute;
+    top: -2px;
+    right: 0;
+    border-radius: 50%;
+  }
+  .deleteFamily{
+    position: absolute;
+    top: 0rem;
+    right: 6%;
+    z-index: 9;
+    border-radius: 50%;
+  }
+  .examine_box{
+    background-color: #1D6FE9!important;
+    padding: 0.18rem!important;
+    padding-left: 0!important;
+    border-radius: 0.15rem!important;
+    margin-top: 0.3rem!important;
+  }
+  .examine_box .van-col:first-child{
+    color: #FFF!important;
+    font-size: 0.45rem!important;
+    text-align: center!important;
+  }
+  .examine_box .van-col:last-child{
+    background-color: #FFF!important;
+    border-radius: 0.15rem!important;
+    overflow: hidden!important;
+    .van-radio-group--horizontal{
+      padding: 0.2rem 0;
+      border-bottom: 1px solid #eee;
+    }
+  }
+  /deep/.van-radio--horizontal{
+    margin-left: 20px;
+    margin-right: 0;
+  }
+</style>
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalApproval11.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalApproval11.vue
new file mode 100644
index 00000000..b7b7becb
--- /dev/null
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalApproval11.vue
@@ -0,0 +1,506 @@
+<template>
+  <div class="app-container">
+    <van-nav-bar
+      left-arrow
+      fixed
+      placeholder
+      @click-left="$router.back(-1)"
+    >
+      <template #title>
+        <p style="font-weight: bold;">现金使用申请审批</p>
+      </template>
+      <template #right>
+        <van-icon name="../../../static/images/icon/icon_flow.png" size="20" @click="goFlow"/>
+      </template>
+    </van-nav-bar>
+    <p class="main_title">基础信息</p>
+    <div class="main_box">
+      <van-field readonly label="申请时间" v-model="form.applyDate" input-align="right" />
+      <van-field readonly label="资金支出类别" v-model="capitalExpenditureType" input-align="right" label-width="auto" />
+      <van-field readonly label="支出总金额" v-model="form.expenditureAmount" input-align="right" label-width="auto"/>
+    </div>
+
+    <div class="main_box" style="margin-top: 10px;">
+      <van-field readonly label="付款事由" v-model="form.remark" type="textarea" input-align="right" rows="3" label-width="auto"/>
+    </div>
+
+    <div class="main_box" style="margin-top: 10px;">
+      <van-field readonly label="说明情况" v-model="form.explainSituation" type="textarea" input-align="right" rows="3" label-width="auto"/>
+    </div>
+
+    <p class="main_title">付款方信息</p>
+    <div class="main_box">
+      <van-field readonly label="付款方" v-model="form.payer" input-align="right" label-width="auto"/>
+      <van-field readonly label="付款方账户" v-model="form.payerAccount" input-align="right" label-width="auto"/>
+    </div>
+
+    <div class="main_box" v-if="capitalExpenditureOpen" style="margin-bottom: 10px;margin-top: 10px;position:relative;">
+      <van-field readonly label="项目名称" v-model="projectForm.projectName" input-align="right" />
+      <van-field readonly label="承建单位" v-model="projectForm.projectContractor" input-align="right" label-width="auto"/>
+      <van-field readonly label="合同价款（元）" v-model="projectForm.projectAmount" input-align="right" label-width="auto"/>
+      <van-field readonly label="工程款类型" v-model="projectFundType" input-align="right" />
+      <van-field readonly label="工程发票号" v-model="projectForm.projectBillNum" input-align="right" label-width="auto"/>
+    </div>
+
+    <p class="main_title">收款方信息</p>
+
+    <div :style="{position:'relative',padding: index == 0 ? '':'10px 0 0 0'}" v-for="(item, index) in chargeItme" :key="index">
+      <div class="main_box" style="margin-bottom: 10px;position:relative;">
+        <van-field readonly label="收款方" v-model="item.payee" input-align="right" />
+        <van-field readonly label="提款人" v-model="item.drawer" input-align="right" label-width="auto"/>
+        <van-field readonly label="提款金额" v-model="item.incomeAmount" input-align="right" label-width="auto"/>
+        <van-field readonly label="资金用途" v-model="item.remark" input-align="right" label-width="auto"/>
+      </div>
+    </div>
+    <p class="main_title">上传附件</p>
+    <div class="main_box" style="padding: 5px 0 0 8px;">
+      <van-uploader v-model="fileList" v-if="fileList==null||fileList.length==0" :deletable="false"  disabled  :upload-text="'未上传附件'"></van-uploader>
+      <van-uploader v-model="fileList" v-if="fileList!=null&&fileList.length>0" :deletable="false" :max-count="fileList.length"  ></van-uploader>
+    </div>
+    <p style="margin-top:20px;padding: 0 10px">附件下载{{fileList&&fileList.length==0?':暂无可下载文件':''}}</p>
+    <van-cell v-for="(item,index) in fileList" :key="index">
+      <a :href="item.url">{{index+1}}.{{item.fileName}}</a>
+    </van-cell>
+    <div class="main_box examine_box" v-if="this.$route.query.type != 'done'">
+      <van-row type="flex" justify="space-between" align="center">
+        <van-col span="5">审批<br/>意见</van-col>
+        <van-col span="19">
+          <van-radio-group v-model="pass" direction="horizontal">
+            <van-radio name="true">同意</van-radio>
+            <van-radio name="false">驳回</van-radio>
+          </van-radio-group>
+          <van-field rows="2" autosize v-model="comment" type="textarea" placeholder="同意申请宅基地"/>
+        </van-col>
+      </van-row>
+    </div>
+
+    <div style="margin: 16px 2%;" v-if="this.$route.query.type != 'done'">
+      <van-row>
+        <van-col span="24" align="center">
+          <van-button type="info" native-type="submit" @click="submitForm" class="submitButton">提交</van-button>
+        </van-col>
+      </van-row>
+      <div class="clear"></div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { getTransfer , queryTransferDetail , listPayee , updateTransfer , getProjectto , listProject , addProjectto , customSubmit} from "@/api/onlineHome/bankAgriculture/paymentApproval";
+  import request from '@/utils/request'
+  import {
+    approval,
+    attachmentList,
+    commonAttach,
+    getCash,
+    listCashdetailByCashId
+  } from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
+  export default {
+    name: "approvalDetail11",
+    data() {
+      return {
+        showcapital:false,
+        showpayee:false,
+        showlasj:false,
+        showbankType:false,
+        showproject:false,
+        showFundType:false,
+
+        minDate: new Date(),
+        maxDate: new Date(2025, 10, 1),
+        currentDate: new Date(),
+        form:{},
+        fileList:[],
+        capitalExpenditureType:'',
+        payee:'',
+        bankType:'',
+
+        wfydlxDictionaries:[],
+        jglxDictionaries:[],
+        sysDictionaries:[],
+        capitalExpenditureTypeOptions:[],
+        bankTypeDictionaries:[],
+        projectList:[],
+        projectFundTypeOptions:[],
+        projectFundTypeDictionaries:[],
+        projectListShow:[],
+
+        chargeItme:[],
+        chargeItmeShow:[],
+
+        payeeList:[],
+        // 查询参数
+        queryParams: {
+          transferType:"",
+          orderByColumn: "id",
+          isAsc: "desc",
+        },
+        capitalExpenditureOpen:false,
+        projectForm:{
+          projectId:null,
+          projectName:null,
+          projectContractor:null,
+          projectAmount:null,
+          projectBillNum:null,
+          projectFundType:'1',
+          outId:null,
+          ynType:'1'
+        },
+        projectFundType:'',
+        // 审核意见默认值
+        pass: "true",
+        comment: "同意",
+      };
+    },
+    created() {
+      let queryParams={
+        pageNum: 1,
+        pageSize: 100,
+      }
+      listProject(queryParams).then(response => {
+        this.projectList = response.rows;
+        for (var i = 0; i < response.rows.length; i++) {
+          this.projectListShow.push({text: response.rows[i].projectName, value: response.rows[i].id});
+        }
+      });
+      this.getDicts("project_fund_type").then((response) => {
+        for (var i = 0; i < response.data.length; i++) {
+          this.projectFundTypeOptions.push({text: response.data[i].dictLabel, value: response.data[i].dictValue});
+        }
+        this.projectFundTypeDictionaries = response.data;
+      });
+      this.getDictionaries();
+      this.getFileList();
+    },
+    methods: {
+      goFlow(){
+        window.location='approvalProcess2?id='+this.$route.query.id;
+      },
+      getDictionaries(){
+        getCash(this.$route.query.id).then((response) => {
+          this.getDicts("capital_expenditure_type").then((res) => {
+            for (var i = 0; i < res.data.length; i++) {
+              this.capitalExpenditureTypeOptions.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
+            }
+            this.capitalExpenditureType = this.selectDictLabel(res.data, response.data.capitalExpenditureType);
+          });
+          if(response.data.capitalExpenditureType==2){
+            this.capitalExpenditureOpen = true
+            let param={
+              'outId' : response.data.id,
+              'ynType' : '2'
+            }
+            getProjectto(param).then(res => {
+              this.projectFundType = this.selectDictLabel(this.projectFundTypeDictionaries, res.data.projectFundType);
+              this.projectForm = res.data
+            })
+          }else{
+            this.showproject = false
+          }
+          this.form = response.data;
+        });
+        console.log(this.$route.query.id)
+        listCashdetailByCashId(this.$route.query.id).then((response) => {
+          this.chargeItme = response.data;
+          console.log(response)
+          this.getPayeeList();
+        });
+      },
+      addChargeItme(index){
+        this.chargeItme.splice(index + 1, 0, {
+          payeeId: "", //收款方ID
+          payee: "", //收款方
+          payeeAccount: "", //收款账户
+          bankDeposit: "", //开户银行
+          incomeAmount: "", //收入金额
+          bankType: "", //所属银行
+        });
+      },
+      getPayeeList() {
+        //普通转账
+        this.queryParams.accountType = this.form.accountType
+        this.queryParams.status = "0"
+        listPayee(this.queryParams).then((response) => {
+          for (var i = 0; i < response.rows.length; i++) {
+            this.payeeList.push({text: response.rows[i].payee, value: response.rows[i].id});
+          }
+        });
+      },
+      payeeDictLabel(datas, value) {
+        var actions = [];
+        Object.keys(datas).some((key) => {
+          if (datas[key].payeeId == ('' + value)) {
+            actions.push(datas[key].payee);
+            return true;
+          }
+        })
+        return actions.join('');
+      },
+      onConfirmCapital(data){
+        console.log(data)
+        if (data.value != 2){
+          this.capitalExpenditureOpen = false;
+          this.projectForm = [];
+        }else{
+          this.capitalExpenditureOpen = true;
+        }
+        this.capitalExpenditureType = data.text;
+        this.form.capitalExpenditureType = data.value;
+        this.showcapital = false;
+      },
+      onConfirmFundType(data){
+        console.log(data)
+        this.projectForm.projectFundType = data.value;
+        this.projectFundType = data.text;
+        this.showFundType = false;
+      },
+      onConfirmProject(data){
+        console.log(data)
+        this.projectList.map(res => {
+          console.log(res)
+          if(res.projectName==data.text){
+            this.projectForm.projectId = res.id
+            this.projectForm.projectName = res.projectName
+            this.projectForm.projectContractor = res.projectContractor
+            this.projectForm.projectAmount = res.projectAmount
+            console.log(this.projectForm)
+          }
+        })
+        this.showproject = false;
+      },
+      onConfirmPayee(data){
+        // this.chargeItme[this.chargeItme.length-1].payeeText = data.text;
+        this.chargeItme[this.chargeItme.length-1].payee = data.text;
+        this.chargeItme[this.chargeItme.length-1].payeeId = data.value;
+        console.log(this.chargeItme)
+        this.showpayee = false;
+      },
+      onConfirmBankType(data){
+        console.log(this.chargeItme)
+        this.chargeItme[this.chargeItme.length-1].bankTypeText = data.text;
+        this.chargeItme[this.chargeItme.length-1].bankType = data.value;
+        this.showbankType = false;
+      },
+      onConfirmLasj(data){
+        this.form.applyDate = this.getNowFormatDate(data).substr(0,10);
+        this.showlasj = false;
+      },
+      accountTypeChange(e){
+        console.log(e)
+        this.payeeList = [];
+        this.queryParams.accountType = this.form.accountType
+        this.queryParams.status = "0"
+        listPayee(this.queryParams).then((response) => {
+          for (var i = 0; i < response.rows.length; i++) {
+            this.payeeList.push({text: response.rows[i].payee, value: response.rows[i].id});
+          }
+        });
+      },
+      goAdd(){
+        if(this.form.remark != null && this.form.remark.indexOf("|")!=-1){
+          this.$toast.error("付款事由禁止包含|。");
+          return;
+        }
+        if(this.form.capitalExpenditureType==2){
+          if(this.projectForm.projectName==""||this.projectForm.projectName==null){
+            this.$toast.error('请选择项目名称！');
+            return;
+          }
+          if(this.projectForm.projectBillNum==""||this.projectForm.projectBillNum==null){
+            this.$toast.error('请输入工程发票号！');
+            return;
+          }
+        }
+        this.$set(this.form, "payeeList", this.chargeItme);
+        this.$set(this.form, "bankTypeList", this.chargeItme);
+        this.$set(this.form, "accountTypeList", this.chargeItme);
+        this.$set(this.form, "transferStatusList", this.chargeItme);
+        console.log(this.form);
+        updateTransfer(this.form).then(response => {
+          console.log(response);
+          this.projectForm.outId = this.form.id
+          this.$set(this.projectForm, "ynType", '1');
+          console.log(this.projectForm)
+          if(this.form.capitalExpenditureType==2){
+            addProjectto(this.projectForm).then(res => {
+              customSubmit(this.form.id).then(res => {
+                this.$toast.success('提交成功');
+                setTimeout(function(){
+                  history.go(-1)
+                },2000)
+              })
+            })
+          }else{
+            customSubmit(this.form.id).then(res => {
+              this.$toast.success('提交成功');
+              setTimeout(function(){
+                history.go(-1)
+              },2000)
+            })
+          }
+        });
+      },
+      goUpdate(){
+        if(this.form.remark != null && this.form.remark.indexOf("|")!=-1){
+          this.$toast.error("付款事由禁止包含|。");
+          return;
+        }
+        if(this.form.capitalExpenditureType==2){
+          if(this.projectForm.projectName==""||this.projectForm.projectName==null){
+            this.$toast.error('请选择项目名称！');
+            return;
+          }
+          if(this.projectForm.projectBillNum==""||this.projectForm.projectBillNum==null){
+            this.$toast.error('请输入工程发票号！');
+            return;
+          }
+        }
+        this.$set(this.form, "payeeList", this.chargeItme);
+        this.$set(this.form, "bankTypeList", this.chargeItme);
+        this.$set(this.form, "accountTypeList", this.chargeItme);
+        this.$set(this.form, "transferStatusList", this.chargeItme);
+        this.projectForm.outId = this.form.id
+        updateTransfer(this.form).then((response) => {
+          this.projectForm.outId = this.form.id
+          this.$set(this.projectForm, "ynType", '1');
+          if(this.form.capitalExpenditureType==2){
+            addProjectto(this.projectForm).then(res => {
+              this.$toast.success('修改成功');
+              setTimeout(function(){
+                history.go(-1)
+              },2000)
+            })
+          }else{
+            this.$toast.success('修改成功');
+            setTimeout(function(){
+              history.go(-1)
+            },2000)
+          }
+        });
+      },
+      beforeRead(file) {
+        this.uploadFiles.push(file.file);
+      },
+      deleteFile(file){
+        this.uploadFiles.map((response,index) => {
+          if(file.file == response){
+            this.uploadFiles.splice(index,1)
+          }
+        })
+      },
+      getFileList(){
+        let oData= {
+          tableId: this.$route.query.id,
+          tableName: "t_yinnong_cash",
+          bizPath: "upload",
+          fileType: "0",
+        }
+        attachmentList(oData).then(res => {
+          console.log(res)
+          console.log(location.protocol+"//"+location.host+request.defaults.baseURL)
+          res.rows.map(r => {
+            let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
+            this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{}),"id":r.id,"fileName":r.fileName})
+            console.log(r)
+          })
+        })
+      },
+      goBack(){
+        window.history.go(-1)
+      },
+      //删除家庭成员
+      deleteChargeItme(index){
+        this.chargeItme.splice(index,1)
+      },
+      /** 提交按钮 */
+      submitForm() {
+        const data = {
+          taskId: this.$route.query.taskId,
+          instanceId: this.form.instanceId,
+          variables: JSON.stringify({
+            comment: this.comment,
+            pass: this.pass,
+          }),
+        };
+        console.log(data);
+        approval(data).then((response) => {
+          if(response.code==200 && response.msg=="操作成功"){
+            this.$toast.success("操作成功");
+            setTimeout(function(){
+              history.go(-1)
+            },2000)
+          } else{
+            this.$toast.success("操作失败");
+          }
+        });
+      },
+    },watch: {
+      pass: function (val) {
+        this.comment = val === "true" ? "同意" : "驳回";
+      },
+    },
+  }
+</script>
+
+<style scoped lang="scss">
+  .app-container {
+    padding: 2% 0;
+  }
+  .main_title{
+    font-size: 0.4rem;
+    color: #1D6FE9;
+    margin: 0.2rem 6%;
+    position: relative;
+  }
+  .main_box{
+    width: 96%;
+    margin: 0 auto;
+    border-radius: 6px;
+    box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);
+    overflow: hidden;
+    background-color: #FFF;
+  }
+  .submitButton{
+    width: 96%;
+    margin: 0 auto;
+  }
+
+  .addFamily{
+    position: absolute;
+    top: -2px;
+    right: 0;
+    border-radius: 50%;
+  }
+  .deleteFamily{
+    position: absolute;
+    top: 0rem;
+    right: 6%;
+    z-index: 9;
+    border-radius: 50%;
+  }
+  .examine_box{
+    background-color: #1D6FE9!important;
+    padding: 0.18rem!important;
+    padding-left: 0!important;
+    border-radius: 0.15rem!important;
+    margin-top: 0.3rem!important;
+  }
+  .examine_box .van-col:first-child{
+    color: #FFF!important;
+    font-size: 0.45rem!important;
+    text-align: center!important;
+  }
+  .examine_box .van-col:last-child{
+    background-color: #FFF!important;
+    border-radius: 0.15rem!important;
+    overflow: hidden!important;
+    .van-radio-group--horizontal{
+      padding: 0.2rem 0;
+      border-bottom: 1px solid #eee;
+    }
+  }
+  /deep/.van-radio--horizontal{
+    margin-left: 20px;
+    margin-right: 0;
+  }
+</style>
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalApproval12.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalApproval12.vue
new file mode 100644
index 00000000..a6c8f30e
--- /dev/null
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalApproval12.vue
@@ -0,0 +1,569 @@
+<template>
+  <div class="app-container">
+    <van-nav-bar
+      left-arrow
+      fixed
+      placeholder
+      @click-left="$router.back(-1)"
+    >
+      <template #title>
+        <p style="font-weight: bold;">汇票支出申请审批</p>
+      </template>
+      <template #right>
+        <van-icon name="../../../static/images/icon/icon_flow.png" size="20" @click="goFlow"/>
+      </template>
+    </van-nav-bar>
+    <p class="main_title">基础信息</p>
+    <div class="main_box">
+      <van-field readonly label="申请时间" v-model="form.applyDate" input-align="right" />
+      <van-field readonly label="资金支出类别" v-model="capitalExpenditureType" input-align="right" label-width="auto" />
+    </div>
+
+    <div class="main_box" style="margin-top: 10px;">
+      <van-field readonly label="付款事由" v-model="form.remark" type="textarea" input-align="right" rows="3" label-width="auto"/>
+    </div>
+
+    <div class="main_box" style="margin-top: 10px;">
+      <van-field readonly label="说明情况" v-model="form.explainSituation" type="textarea" input-align="right" rows="3" label-width="auto"/>
+    </div>
+
+    <div class="main_box" v-if="capitalExpenditureOpen" style="margin-bottom: 10px;margin-top: 10px;position:relative;">
+      <van-field readonly label="项目名称" v-model="projectForm.projectName" input-align="right" />
+      <van-field readonly label="承建单位" v-model="projectForm.projectContractor" input-align="right" label-width="auto"/>
+      <van-field readonly label="合同价款（元）" v-model="projectForm.projectAmount" input-align="right" label-width="auto"/>
+      <van-field readonly label="工程款类型" v-model="projectFundType" input-align="right" />
+      <van-field readonly label="工程发票号" v-model="projectForm.projectBillNum" input-align="right" label-width="auto"/>
+    </div>
+
+    <p class="main_title">出票方信息</p>
+    <div class="main_box">
+      <van-field readonly label="付款方" v-model="form.payer" input-align="right" label-width="auto"/>
+      <van-field :rules="[{ required: true , message:'请输入汇票号码' }]" required label="汇票号码" v-model="form.payerAccount" placeholder="请输入汇票号码" input-align="right" label-width="auto"/>
+      <van-field
+        readonly
+        label="出票金额（元）"
+        v-model="form.expenditureAmount"
+        placeholder=""
+        input-align="right"
+        label-width="auto"
+        required
+        :rules="[{ required: true , message:'出票金额不能为空！' }]"
+      />
+      <van-field
+        readonly
+        label="汇票类型"
+        v-model="orderTypeName"
+        placeholder=""
+        input-align="right"
+        label-width="auto"
+        required
+        :rules="[{ required: true , message:'汇票类型不能为空！' }]"
+      />
+      <van-field
+        readonly
+        label="汇票类型"
+        v-model="form.orderType"
+        placeholder=""
+        input-align="right"
+        label-width="auto"
+        style="display: none"
+        required
+        :rules="[{ required: true , message:'汇票类型不能为空！' }]"
+      />
+      <van-field
+        readonly
+        label="开票日"
+        v-model="form.startTime"
+        placeholder=""
+        input-align="right"
+        label-width="auto"
+        required
+        :rules="[{ required: true , message:'开票日不能为空！' }]"
+      />
+      <van-field
+        readonly
+        label="到期日"
+        v-model="form.endTime"
+        placeholder=""
+        input-align="right"
+        label-width="auto"
+        required
+        :rules="[{ required: true , message:'到期日不能为空！' }]"
+      />
+    </div>
+
+    <p class="main_title">收票方信息</p>
+
+    <div :style="{position:'relative',padding: index == 0 ? '':'10px 0 0 0'}" v-for="(item, index) in chargeItme" :key="index">
+      <div class="main_box" style="margin-bottom: 10px;position:relative;">
+        <van-field readonly label="收款方" v-model="item.payee" input-align="right" />
+        <van-field readonly label="联系方式" v-model="item.phone" input-align="right" label-width="auto"/>
+        <van-field readonly label="所属单位" v-model="item.unit" input-align="right" label-width="auto"/>
+        <van-field readonly label="负责人全称" v-model="item.leader" input-align="right" label-width="auto"/>
+        <van-field readonly label="资金用途" v-model="item.remark" input-align="right" />
+      </div>
+    </div>
+    <p class="main_title">上传附件</p>
+    <div class="main_box" style="padding: 5px 0 0 8px;">
+      <van-uploader v-model="fileList" v-if="fileList==null||fileList.length==0" :deletable="false"  disabled  :upload-text="'未上传附件'"></van-uploader>
+      <van-uploader v-model="fileList" v-if="fileList!=null&&fileList.length>0" :deletable="false" :max-count="fileList.length"  ></van-uploader>
+    </div>
+    <p style="margin-top:20px;padding: 0 10px">附件下载{{fileList&&fileList.length==0?':暂无可下载文件':''}}</p>
+    <van-cell v-for="(item,index) in fileList" :key="index">
+      <a :href="item.url">{{index+1}}.{{item.fileName}}</a>
+    </van-cell>
+    <div class="main_box examine_box" v-if="this.$route.query.type != 'done'">
+      <van-row type="flex" justify="space-between" align="center">
+        <van-col span="5">审批<br/>意见</van-col>
+        <van-col span="19">
+          <van-radio-group v-model="pass" direction="horizontal">
+            <van-radio name="true">同意</van-radio>
+            <van-radio name="false">驳回</van-radio>
+          </van-radio-group>
+          <van-field rows="2" autosize v-model="comment" type="textarea" placeholder="同意申请宅基地"/>
+        </van-col>
+      </van-row>
+    </div>
+
+    <div style="margin: 16px 2%;" v-if="this.$route.query.type != 'done'">
+      <van-row>
+        <van-col span="24" align="center">
+          <van-button type="info" native-type="submit" @click="submitForm" class="submitButton">提交</van-button>
+        </van-col>
+      </van-row>
+      <div class="clear"></div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { getTransfer , queryTransferDetail , listPayee , updateTransfer , getProjectto , listProject , addProjectto , customSubmit} from "@/api/onlineHome/bankAgriculture/paymentApproval";
+  import request from '@/utils/request'
+  import {
+    approval,
+    attachmentList,
+    commonAttach,
+    getCash,
+    listCashdetailByCashId
+  } from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
+  export default {
+    name: "approvalDetail12",
+    data() {
+      return {
+        showcapital:false,
+        showpayee:false,
+        showlasj:false,
+        showbankType:false,
+        showproject:false,
+        showFundType:false,
+
+        minDate: new Date(),
+        maxDate: new Date(2025, 10, 1),
+        currentDate: new Date(),
+        form:{},
+        fileList:[],
+        capitalExpenditureType:'',
+        payee:'',
+        bankType:'',
+
+        wfydlxDictionaries:[],
+        jglxDictionaries:[],
+        sysDictionaries:[],
+        capitalExpenditureTypeOptions:[],
+        bankTypeDictionaries:[],
+        projectList:[],
+        projectFundTypeOptions:[],
+        projectFundTypeDictionaries:[],
+        projectListShow:[],
+
+        chargeItme:[],
+        chargeItmeShow:[],
+
+        payeeList:[],
+        // 查询参数
+        queryParams: {
+          transferType:"",
+          orderByColumn: "id",
+          isAsc: "desc",
+        },
+        capitalExpenditureOpen:false,
+        projectForm:{
+          projectId:null,
+          projectName:null,
+          projectContractor:null,
+          projectAmount:null,
+          projectBillNum:null,
+          projectFundType:'1',
+          outId:null,
+          ynType:'1'
+        },
+        projectFundType:'',
+        orderTypeName:'',
+        orderTypeOptions:[],
+        // 审核意见默认值
+        pass: "true",
+        comment: "同意",
+      };
+    },
+    created() {
+      let queryParams={
+        pageNum: 1,
+        pageSize: 100,
+      }
+      listProject(queryParams).then(response => {
+        console.log(response)
+        this.projectList = response.rows;
+        for (var i = 0; i < response.rows.length; i++) {
+          this.projectListShow.push({text: response.rows[i].projectName, value: response.rows[i].id});
+        }
+      });
+      this.getDicts("project_fund_type").then((response) => {
+        for (var i = 0; i < response.data.length; i++) {
+          this.projectFundTypeOptions.push({text: response.data[i].dictLabel, value: response.data[i].dictValue});
+        }
+        this.projectFundTypeDictionaries = response.data;
+      });
+      this.getDicts("order_type").then(response => {
+        this.orderTypeOptions = response.data;
+      });
+      this.getDictionaries();
+      this.getFileList();
+    },
+    methods: {
+      goFlow(){
+        window.location='approvalProcess2?id='+this.$route.query.id;
+      },
+      getDictionaries(){
+        getCash(this.$route.query.id).then((response) => {
+          this.getDicts("capital_expenditure_type").then((res) => {
+            for (var i = 0; i < res.data.length; i++) {
+              this.capitalExpenditureTypeOptions.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
+            }
+            this.capitalExpenditureType = this.selectDictLabel(res.data, response.data.capitalExpenditureType);
+          });
+          if(response.data.capitalExpenditureType==2){
+            this.capitalExpenditureOpen = true
+            let param={
+              'outId' : response.data.id,
+              'ynType' : '2'
+            }
+            getProjectto(param).then(res => {
+              this.projectFundType = this.selectDictLabel(this.projectFundTypeDictionaries, res.data.projectFundType);
+              this.projectForm = res.data
+            })
+          }else{
+            this.showproject = false
+          }
+          this.form = response.data;
+          this.orderTypeOptions.map(res => {
+            console.log(this.orderTypeOptions)
+            if(res.dictValue==this.form.orderType){
+              this.orderTypeName = res.dictLabel
+            }
+          })
+        });
+        console.log(this.$route.query.id)
+        listCashdetailByCashId(this.$route.query.id).then((response) => {
+          this.chargeItme = response.data;
+          console.log(response.data)
+          this.getPayeeList();
+        });
+      },
+      addChargeItme(index){
+        this.chargeItme.splice(index + 1, 0, {
+          payeeId: "", //收款方ID
+          payee: "", //收款方
+          payeeAccount: "", //收款账户
+          bankDeposit: "", //开户银行
+          incomeAmount: "", //收入金额
+          bankType: "", //所属银行
+        });
+      },
+      getPayeeList() {
+        //普通转账
+        this.queryParams.accountType = this.form.accountType
+        this.queryParams.status = "0"
+        listPayee(this.queryParams).then((response) => {
+          for (var i = 0; i < response.rows.length; i++) {
+            this.payeeList.push({text: response.rows[i].payee, value: response.rows[i].id});
+          }
+        });
+      },
+      payeeDictLabel(datas, value) {
+        var actions = [];
+        Object.keys(datas).some((key) => {
+          if (datas[key].payeeId == ('' + value)) {
+            actions.push(datas[key].payee);
+            return true;
+          }
+        })
+        return actions.join('');
+      },
+      onConfirmCapital(data){
+        console.log(data)
+        if (data.value != 2){
+          this.capitalExpenditureOpen = false;
+          this.projectForm = [];
+        }else{
+          this.capitalExpenditureOpen = true;
+        }
+        this.capitalExpenditureType = data.text;
+        this.form.capitalExpenditureType = data.value;
+        this.showcapital = false;
+      },
+      onConfirmFundType(data){
+        console.log(data)
+        this.projectForm.projectFundType = data.value;
+        this.projectFundType = data.text;
+        this.showFundType = false;
+      },
+      onConfirmProject(data){
+        console.log(data)
+        this.projectList.map(res => {
+          console.log(res)
+          if(res.projectName==data.text){
+            this.projectForm.projectId = res.id
+            this.projectForm.projectName = res.projectName
+            this.projectForm.projectContractor = res.projectContractor
+            this.projectForm.projectAmount = res.projectAmount
+            console.log(this.projectForm)
+          }
+        })
+        this.showproject = false;
+      },
+      onConfirmPayee(data){
+        // this.chargeItme[this.chargeItme.length-1].payeeText = data.text;
+        this.chargeItme[this.chargeItme.length-1].payee = data.text;
+        this.chargeItme[this.chargeItme.length-1].payeeId = data.value;
+        console.log(this.chargeItme)
+        this.showpayee = false;
+      },
+      onConfirmBankType(data){
+        console.log(this.chargeItme)
+        this.chargeItme[this.chargeItme.length-1].bankTypeText = data.text;
+        this.chargeItme[this.chargeItme.length-1].bankType = data.value;
+        this.showbankType = false;
+      },
+      onConfirmLasj(data){
+        this.form.applyDate = this.getNowFormatDate(data).substr(0,10);
+        this.showlasj = false;
+      },
+      accountTypeChange(e){
+        console.log(e)
+        this.payeeList = [];
+        this.queryParams.accountType = this.form.accountType
+        this.queryParams.status = "0"
+        listPayee(this.queryParams).then((response) => {
+          for (var i = 0; i < response.rows.length; i++) {
+            this.payeeList.push({text: response.rows[i].payee, value: response.rows[i].id});
+          }
+        });
+      },
+      goAdd(){
+        if(this.form.remark != null && this.form.remark.indexOf("|")!=-1){
+          this.$toast.error("付款事由禁止包含|。");
+          return;
+        }
+        if(this.form.capitalExpenditureType==2){
+          if(this.projectForm.projectName==""||this.projectForm.projectName==null){
+            this.$toast.error('请选择项目名称！');
+            return;
+          }
+          if(this.projectForm.projectBillNum==""||this.projectForm.projectBillNum==null){
+            this.$toast.error('请输入工程发票号！');
+            return;
+          }
+        }
+        this.$set(this.form, "payeeList", this.chargeItme);
+        this.$set(this.form, "bankTypeList", this.chargeItme);
+        this.$set(this.form, "accountTypeList", this.chargeItme);
+        this.$set(this.form, "transferStatusList", this.chargeItme);
+        console.log(this.form);
+        updateTransfer(this.form).then(response => {
+          console.log(response);
+          this.projectForm.outId = this.form.id
+          this.$set(this.projectForm, "ynType", '1');
+          console.log(this.projectForm)
+          if(this.form.capitalExpenditureType==2){
+            addProjectto(this.projectForm).then(res => {
+              customSubmit(this.form.id).then(res => {
+                this.$toast.success('提交成功');
+                setTimeout(function(){
+                  history.go(-1)
+                },2000)
+              })
+            })
+          }else{
+            customSubmit(this.form.id).then(res => {
+              this.$toast.success('提交成功');
+              setTimeout(function(){
+                history.go(-1)
+              },2000)
+            })
+          }
+        });
+      },
+      goUpdate(){
+        if(this.form.remark != null && this.form.remark.indexOf("|")!=-1){
+          this.$toast.error("付款事由禁止包含|。");
+          return;
+        }
+        if(this.form.capitalExpenditureType==2){
+          if(this.projectForm.projectName==""||this.projectForm.projectName==null){
+            this.$toast.error('请选择项目名称！');
+            return;
+          }
+          if(this.projectForm.projectBillNum==""||this.projectForm.projectBillNum==null){
+            this.$toast.error('请输入工程发票号！');
+            return;
+          }
+        }
+        this.$set(this.form, "payeeList", this.chargeItme);
+        this.$set(this.form, "bankTypeList", this.chargeItme);
+        this.$set(this.form, "accountTypeList", this.chargeItme);
+        this.$set(this.form, "transferStatusList", this.chargeItme);
+        this.projectForm.outId = this.form.id
+        updateTransfer(this.form).then((response) => {
+          this.projectForm.outId = this.form.id
+          this.$set(this.projectForm, "ynType", '1');
+          if(this.form.capitalExpenditureType==2){
+            addProjectto(this.projectForm).then(res => {
+              this.$toast.success('修改成功');
+              setTimeout(function(){
+                history.go(-1)
+              },2000)
+            })
+          }else{
+            this.$toast.success('修改成功');
+            setTimeout(function(){
+              history.go(-1)
+            },2000)
+          }
+        });
+      },
+      beforeRead(file) {
+        this.uploadFiles.push(file.file);
+      },
+      deleteFile(file){
+        this.uploadFiles.map((response,index) => {
+          if(file.file == response){
+            this.uploadFiles.splice(index,1)
+          }
+        })
+      },
+      getFileList(){
+        let oData= {
+          tableId: this.$route.query.id,
+          tableName: "t_yinnong_cash",
+          bizPath: "upload",
+          fileType: "0",
+        }
+        attachmentList(oData).then(res => {
+          console.log(res)
+          console.log(location.protocol+"//"+location.host+request.defaults.baseURL)
+          res.rows.map(r => {
+            let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
+            this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{}),"id":r.id,"fileName":r.fileName})
+            console.log(r)
+          })
+        })
+      },
+      goBack(){
+        window.history.go(-1)
+      },
+      //删除家庭成员
+      deleteChargeItme(index){
+        this.chargeItme.splice(index,1)
+      },
+      /** 提交按钮 */
+      submitForm() {
+        const data = {
+          taskId: this.$route.query.taskId,
+          instanceId: this.form.instanceId,
+          variables: JSON.stringify({
+            comment: this.comment,
+            pass: this.pass,
+          }),
+        };
+        console.log(data);
+        approval(data).then((response) => {
+          if(response.code==200 && response.msg=="操作成功"){
+            this.$toast.success("操作成功");
+            setTimeout(function(){
+              history.go(-1)
+            },2000)
+          } else{
+            this.$toast.success("操作失败");
+          }
+        });
+      },
+    },watch: {
+      pass: function (val) {
+        this.comment = val === "true" ? "同意" : "驳回";
+      },
+    },
+  }
+</script>
+
+<style scoped lang="scss">
+  .app-container {
+    padding: 2% 0;
+  }
+  .main_title{
+    font-size: 0.4rem;
+    color: #1D6FE9;
+    margin: 0.2rem 6%;
+    position: relative;
+  }
+  .main_box{
+    width: 96%;
+    margin: 0 auto;
+    border-radius: 6px;
+    box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);
+    overflow: hidden;
+    background-color: #FFF;
+  }
+  .submitButton{
+    width: 96%;
+    margin: 0 auto;
+  }
+
+  .addFamily{
+    position: absolute;
+    top: -2px;
+    right: 0;
+    border-radius: 50%;
+  }
+  .deleteFamily{
+    position: absolute;
+    top: 0rem;
+    right: 6%;
+    z-index: 9;
+    border-radius: 50%;
+  }
+  .examine_box{
+    background-color: #1D6FE9!important;
+    padding: 0.18rem!important;
+    padding-left: 0!important;
+    border-radius: 0.15rem!important;
+    margin-top: 0.3rem!important;
+  }
+  .examine_box .van-col:first-child{
+    color: #FFF!important;
+    font-size: 0.45rem!important;
+    text-align: center!important;
+  }
+  .examine_box .van-col:last-child{
+    background-color: #FFF!important;
+    border-radius: 0.15rem!important;
+    overflow: hidden!important;
+    .van-radio-group--horizontal{
+      padding: 0.2rem 0;
+      border-bottom: 1px solid #eee;
+    }
+  }
+  /deep/.van-radio--horizontal{
+    margin-left: 20px;
+    margin-right: 0;
+  }
+</style>
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail.vue
index 8a1329b3..49a357e5 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail.vue
@@ -68,7 +68,11 @@
 <script>
   import { getTransfer , queryTransferDetail , listPayee , updateTransfer , getProjectto , listProject , addProjectto , customSubmit} from "@/api/onlineHome/bankAgriculture/paymentApproval";
   import request from '@/utils/request'
-  import {attachmentList, commonAttach} from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
+  import {
+    attachmentList,
+    commonAttach,
+    systemAttachment
+  } from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
   export default {
     name: "approvalDetail",
     data() {
@@ -357,17 +361,19 @@
         });
       },
       beforeRead(file) {
+        this.uploadFiles.push(file.file);
+      },
+      deleteFile(file){
         console.log(file)
-        console.log(this.fileList)
-        const params = new FormData();
-        params.append("tableId", this.$route.query.id);
-        params.append("tableName", "t_yinnong_transfer");
-        params.append("bizPath", "upload");
-        params.append("fileType", "0");
-        params.append("file", file.file);
-        commonAttach(params).then((response) => {
-          console.log(response)
+        this.uploadFiles.map((response,index) => {
+          if(file.file == response){
+            this.uploadFiles.splice(index,1)
+          }
         })
+        if(file.id){
+          systemAttachment(file.id).then((res) => {
+          });
+        }
       },
       getFileList(){
         let oData= {
@@ -380,9 +386,8 @@
           console.log(res)
           console.log(location.protocol+"//"+location.host+request.defaults.baseURL)
           res.rows.map(r => {
-
             let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
-            this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{})})
+            this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{}),"id":r.id})
             console.log(r)
           })
         })
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail10.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail10.vue
index 989cec01..e76af797 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail10.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail10.vue
@@ -7,7 +7,7 @@
       @click-left="$router.back(-1)"
     >
       <template #title>
-        <p style="font-weight: bold;">查看现金提现申请详情</p>
+        <p style="font-weight: bold;">查看现金提现申请</p>
       </template>
       <template #right>
         <van-icon name="../../../static/images/icon/icon_flow.png" size="20" @click="goFlow"/>
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail11.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail11.vue
index 1ea635b8..569cdaf7 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail11.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail11.vue
@@ -7,7 +7,7 @@
       @click-left="$router.back(-1)"
     >
       <template #title>
-        <p style="font-weight: bold;">查看付款申请</p>
+        <p style="font-weight: bold;">查看现金使用申请</p>
       </template>
       <template #right>
         <van-icon name="../../../static/images/icon/icon_flow.png" size="20" @click="goFlow"/>
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail2.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail2.vue
index c295f76e..90d48785 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail2.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail2.vue
@@ -7,7 +7,7 @@
       @click-left="$router.back(-1)"
     >
       <template #title>
-        <p style="font-weight: bold;">查看付款申请</p>
+        <p style="font-weight: bold;">查看信用卡转账申请</p>
       </template>
       <template #right>
         <van-icon name="../../../static/images/icon/icon_flow.png" size="20" @click="goFlow"/>
@@ -67,7 +67,11 @@
 <script>
   import { getTransfer , queryTransferDetail , listPayee , updateTransfer , getProjectto , listProject , addProjectto , customSubmit} from "@/api/onlineHome/bankAgriculture/paymentApproval";
   import request from '@/utils/request'
-  import {attachmentList, commonAttach} from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
+  import {
+    attachmentList,
+    commonAttach,
+    systemAttachment
+  } from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
   export default {
     name: "approvalDetail",
     data() {
@@ -356,17 +360,19 @@
         });
       },
       beforeRead(file) {
+        this.uploadFiles.push(file.file);
+      },
+      deleteFile(file){
         console.log(file)
-        console.log(this.fileList)
-        const params = new FormData();
-        params.append("tableId", this.$route.query.id);
-        params.append("tableName", "t_yinnong_transfer");
-        params.append("bizPath", "upload");
-        params.append("fileType", "0");
-        params.append("file", file.file);
-        commonAttach(params).then((response) => {
-          console.log(response)
+        this.uploadFiles.map((response,index) => {
+          if(file.file == response){
+            this.uploadFiles.splice(index,1)
+          }
         })
+        if(file.id){
+          systemAttachment(file.id).then((res) => {
+          });
+        }
       },
       getFileList(){
         let oData= {
@@ -379,9 +385,8 @@
           console.log(res)
           console.log(location.protocol+"//"+location.host+request.defaults.baseURL)
           res.rows.map(r => {
-
             let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
-            this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{})})
+            this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{}),"id":r.id})
             console.log(r)
           })
         })
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail3.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail3.vue
index abbeba21..6c2db76a 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail3.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail3.vue
@@ -7,7 +7,7 @@
       @click-left="$router.back(-1)"
     >
       <template #title>
-        <p style="font-weight: bold;">查看付款申请</p>
+        <p style="font-weight: bold;">查看虚拟挂账申请</p>
       </template>
       <template #right>
         <van-icon name="../../../static/images/icon/icon_flow.png" size="20" @click="goFlow"/>
@@ -67,7 +67,11 @@
 <script>
   import { getTransfer , queryTransferDetail , listPayee , updateTransfer , getProjectto , listProject , addProjectto , customSubmit} from "@/api/onlineHome/bankAgriculture/paymentApproval";
   import request from '@/utils/request'
-  import {attachmentList, commonAttach} from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
+  import {
+    attachmentList,
+    commonAttach,
+    systemAttachment
+  } from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
   export default {
     name: "approvalDetail",
     data() {
@@ -356,17 +360,19 @@
         });
       },
       beforeRead(file) {
+        this.uploadFiles.push(file.file);
+      },
+      deleteFile(file){
         console.log(file)
-        console.log(this.fileList)
-        const params = new FormData();
-        params.append("tableId", this.$route.query.id);
-        params.append("tableName", "t_yinnong_transfer");
-        params.append("bizPath", "upload");
-        params.append("fileType", "0");
-        params.append("file", file.file);
-        commonAttach(params).then((response) => {
-          console.log(response)
+        this.uploadFiles.map((response,index) => {
+          if(file.file == response){
+            this.uploadFiles.splice(index,1)
+          }
         })
+        if(file.id){
+          systemAttachment(file.id).then((res) => {
+          });
+        }
       },
       getFileList(){
         let oData= {
@@ -379,9 +385,8 @@
           console.log(res)
           console.log(location.protocol+"//"+location.host+request.defaults.baseURL)
           res.rows.map(r => {
-
             let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
-            this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{})})
+            this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{}),"id":r.id})
             console.log(r)
           })
         })
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail4.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail4.vue
index abbeba21..4b3425bc 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail4.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail4.vue
@@ -7,7 +7,7 @@
       @click-left="$router.back(-1)"
     >
       <template #title>
-        <p style="font-weight: bold;">查看付款申请</p>
+        <p style="font-weight: bold;">查看虚拟转账申请</p>
       </template>
       <template #right>
         <van-icon name="../../../static/images/icon/icon_flow.png" size="20" @click="goFlow"/>
@@ -67,7 +67,11 @@
 <script>
   import { getTransfer , queryTransferDetail , listPayee , updateTransfer , getProjectto , listProject , addProjectto , customSubmit} from "@/api/onlineHome/bankAgriculture/paymentApproval";
   import request from '@/utils/request'
-  import {attachmentList, commonAttach} from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
+  import {
+    attachmentList,
+    commonAttach,
+    systemAttachment
+  } from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
   export default {
     name: "approvalDetail",
     data() {
@@ -356,17 +360,19 @@
         });
       },
       beforeRead(file) {
+        this.uploadFiles.push(file.file);
+      },
+      deleteFile(file){
         console.log(file)
-        console.log(this.fileList)
-        const params = new FormData();
-        params.append("tableId", this.$route.query.id);
-        params.append("tableName", "t_yinnong_transfer");
-        params.append("bizPath", "upload");
-        params.append("fileType", "0");
-        params.append("file", file.file);
-        commonAttach(params).then((response) => {
-          console.log(response)
+        this.uploadFiles.map((response,index) => {
+          if(file.file == response){
+            this.uploadFiles.splice(index,1)
+          }
         })
+        if(file.id){
+          systemAttachment(file.id).then((res) => {
+          });
+        }
       },
       getFileList(){
         let oData= {
@@ -379,9 +385,8 @@
           console.log(res)
           console.log(location.protocol+"//"+location.host+request.defaults.baseURL)
           res.rows.map(r => {
-
             let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
-            this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{})})
+            this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{}),"id":r.id})
             console.log(r)
           })
         })
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail5.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail5.vue
index 59e13215..aa5501ee 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail5.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail5.vue
@@ -7,7 +7,7 @@
       @click-left="$router.back(-1)"
     >
       <template #title>
-        <p style="font-weight: bold;">查看母子转站申请</p>
+        <p style="font-weight: bold;">查看母子转账申请</p>
       </template>
       <template #right>
         <van-icon name="../../../static/images/icon/icon_flow.png" size="20" @click="goFlow"/>
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalList2.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalList2.vue
index 037d3468..d7203051 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalList2.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalList2.vue
@@ -8,7 +8,7 @@
         @click-right="goAdd()"
       >
         <template #title>
-          <p style="font-weight: bold;">信用开转账申请列表</p>
+          <p style="font-weight: bold;">信用卡转账申请列表</p>
         </template>
         <template #right>
           <van-icon name="add" size="18"/>
@@ -22,7 +22,7 @@
         @load="getList"
       >
         <van-swipe-cell v-for="(item,index) in applicationList" :key="index">
-          <van-cell :title="item.payer" :value="item.auditStatus" center :to="{name:'approvalDetail', query: {id:item.id}}">
+          <van-cell :title="item.payer" :value="item.auditStatus" center :to="{name:'approvalDetail2', query: {id:item.id}}">
             <template #icon>
               <van-icon name="../../../../../static/images/onlineHome/yinnongList8.png" size="22" color="#539FFD" style="margin-right: 10px;" />
             </template>
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalList3.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalList3.vue
index 17595a77..b54bcbe7 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalList3.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalList3.vue
@@ -22,7 +22,7 @@
         @load="getList"
       >
         <van-swipe-cell v-for="(item,index) in applicationList" :key="index">
-          <van-cell :title="item.payer" :value="item.auditStatus" center :to="{name:'approvalDetail', query: {id:item.id}}">
+          <van-cell :title="item.payer" :value="item.auditStatus" center :to="{name:'approvalDetail3', query: {id:item.id}}">
             <template #icon>
               <van-icon name="../../../../../static/images/onlineHome/yinnongList9.png" size="22" color="#539FFD" style="margin-right: 10px;" />
             </template>
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalList4.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalList4.vue
index aa693035..20968af9 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalList4.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalList4.vue
@@ -22,7 +22,7 @@
         @load="getList"
       >
         <van-swipe-cell v-for="(item,index) in applicationList" :key="index">
-          <van-cell :title="item.payer" :value="item.auditStatus" center :to="{name:'approvalDetail', query: {id:item.id}}">
+          <van-cell :title="item.payer" :value="item.auditStatus" center :to="{name:'approvalDetail4', query: {id:item.id}}">
             <template #icon>
               <van-icon name="../../../../../static/images/onlineHome/yinnongList10.png" size="22" color="#539FFD" style="margin-right: 10px;" />
             </template>
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify.vue
index 501573d0..8d503234 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify.vue
@@ -7,7 +7,7 @@
       @click-left="$router.back(-1)"
     >
       <template #title>
-        <p style="font-weight: bold;">修改付款申请</p>
+        <p style="font-weight: bold;">修改常用转账申请</p>
       </template>
     </van-nav-bar>
     <van-form @submit="getChange" @failed="getError" :show-error-message="false" scroll-to-error validate-first>
@@ -33,6 +33,7 @@
             :min-date="minDate"
             :max-date="maxDate"
             @confirm="onConfirmLasj"
+            @cancel="showlasj = false"
           />
         </van-popup>
         <van-field
@@ -221,7 +222,7 @@
       </div>
       <p class="main_title">上传附件</p>
       <div class="main_box" style="padding: 5px 0 0 8px;">
-        <van-uploader v-model="fileList" :after-read="beforeRead" ></van-uploader>
+        <van-uploader v-model="fileList" :after-read="beforeRead" @delete="deleteFile"></van-uploader>
       </div>
       <div style="padding: 16px 0;">
         <van-row>
@@ -240,8 +241,13 @@
 
 <script>
   import { getAccount , getTransfer , queryTransferDetail , listPayee , updateTransfer , getProjectto , listProject , addProjectto , customSubmit ,getQmyeFlow} from "@/api/onlineHome/bankAgriculture/paymentApproval";
-  import {attachmentList, commonAttach} from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
+  import {
+    attachmentList,
+    commonAttach,
+    systemAttachment
+  } from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
   import request from '@/utils/request';
+  import Dialog from "vant/lib/dialog";
   export default {
     name: "approvalModify",
     data() {
@@ -254,8 +260,8 @@
         showFundType:false,
         showpayer:false,
 
-        minDate: new Date(),
-        maxDate: new Date(2025, 10, 1),
+        minDate: new Date(2000, 1, 1),
+        maxDate: new Date(2050, 12, 31),
         currentDate: new Date(),
         form:{},
 
@@ -299,6 +305,7 @@
         },
         projectFundType:'',
         fileList:[],
+        uploadFiles:[],
       };
     },
     created() {
@@ -499,6 +506,7 @@
       },
       accountTypeChange(e){
         this.payeeList = [];
+        this.chargeItme = [];
         this.queryParams.accountType = this.form.accountType
         this.queryParams.status = "0"
         listPayee(this.queryParams).then((response) => {
@@ -542,34 +550,130 @@
             return;
           }
         }
-        this.$set(this.form, "payeeList", this.chargeItme);
-        this.$set(this.form, "bankTypeList", this.chargeItme);
-        this.$set(this.form, "accountTypeList", this.chargeItme);
-        this.$set(this.form, "transferStatusList", this.chargeItme);
-        console.log(this.form);
-        updateTransfer(this.form).then(response => {
-          console.log(response);
-          this.projectForm.outId = this.form.id
-          this.$set(this.projectForm, "ynType", '1');
-          console.log(this.projectForm)
-          if(this.form.capitalExpenditureType==2){
-            addProjectto(this.projectForm).then(res => {
-              customSubmit(this.form.id).then(res => {
-                this.$toast.success('提交成功');
-                setTimeout(function(){
-                  history.go(-1)
-                },2000)
-              })
-            })
-          }else{
-            customSubmit(this.form.id).then(res => {
-              this.$toast.success('提交成功');
-              setTimeout(function(){
-                history.go(-1)
-              },2000)
+        if((this.uploadFiles==null||this.uploadFiles.length==0)&&(this.fileList==null||this.fileList.length==0)){
+          Dialog.confirm({
+            title: '提示',
+            message: '此申请单中未上传任何附件，是否确认提交？',
+          })
+            .then(() => {
+              this.$set(this.form, "payeeList", this.chargeItme);
+              this.$set(this.form, "bankTypeList", this.chargeItme);
+              this.$set(this.form, "accountTypeList", this.chargeItme);
+              this.$set(this.form, "transferStatusList", this.chargeItme);
+              updateTransfer(this.form).then(response => {
+                this.projectForm.outId = this.form.id
+                this.$set(this.projectForm, "ynType", '1');
+                if(this.uploadFiles!=null&&this.uploadFiles.length>0){
+                  this.uploadFiles.map(rr => {
+                    const params = new FormData();
+                    params.append("tableId", this.form.id);
+                    params.append("tableName", "t_yinnong_transfer");
+                    params.append("bizPath", "upload");
+                    params.append("fileType", "0");
+                    params.append("file", rr);
+                    commonAttach(params).then((r) => {
+                    })
+                  })
+                  if(this.form.capitalExpenditureType==2){
+                    addProjectto(this.projectForm).then(res => {
+                      customSubmit(this.form.id).then(res => {
+                        this.$toast.success('提交成功');
+                        setTimeout(function(){
+                          history.go(-1)
+                        },2000)
+                      })
+                    })
+                  }else{
+                    customSubmit(this.form.id).then(res => {
+                      this.$toast.success('提交成功');
+                      setTimeout(function(){
+                        history.go(-1)
+                      },2000)
+                    })
+                  }
+                }else{
+                  if(this.form.capitalExpenditureType==2){
+                    addProjectto(this.projectForm).then(res => {
+                      customSubmit(this.form.id).then(res => {
+                        this.$toast.success('提交成功');
+                        setTimeout(function(){
+                          history.go(-1)
+                        },2000)
+                      })
+                    })
+                  }else{
+                    customSubmit(this.form.id).then(res => {
+                      this.$toast.success('提交成功');
+                      setTimeout(function(){
+                        history.go(-1)
+                      },2000)
+                    })
+                  }
+                }
+              });
             })
-          }
-        });
+            .catch(() => {
+              return false;
+            });
+        }else{
+          this.$set(this.form, "payeeList", this.chargeItme);
+          this.$set(this.form, "bankTypeList", this.chargeItme);
+          this.$set(this.form, "accountTypeList", this.chargeItme);
+          this.$set(this.form, "transferStatusList", this.chargeItme);
+          updateTransfer(this.form).then(response => {
+            this.projectForm.outId = this.form.id
+            this.$set(this.projectForm, "ynType", '1');
+            if(this.uploadFiles!=null&&this.uploadFiles.length>0){
+              this.uploadFiles.map(rr => {
+                const params = new FormData();
+                params.append("tableId", this.form.id);
+                params.append("tableName", "t_yinnong_transfer");
+                params.append("bizPath", "upload");
+                params.append("fileType", "0");
+                params.append("file", rr);
+                commonAttach(params).then((r) => {
+                })
+              })
+              if(this.form.capitalExpenditureType==2){
+                addProjectto(this.projectForm).then(res => {
+                  customSubmit(this.form.id).then(res => {
+                    this.$toast.success('提交成功');
+                    setTimeout(function(){
+                      history.go(-1)
+                    },2000)
+                  })
+                })
+              }else{
+                customSubmit(this.form.id).then(res => {
+                  this.$toast.success('提交成功');
+                  setTimeout(function(){
+                    history.go(-1)
+                  },2000)
+                })
+              }
+            }else{
+              if(this.form.capitalExpenditureType==2){
+                addProjectto(this.projectForm).then(res => {
+                  customSubmit(this.form.id).then(res => {
+                    this.$toast.success('提交成功');
+                    setTimeout(function(){
+                      history.go(-1)
+                    },2000)
+                  })
+                })
+              }else{
+                customSubmit(this.form.id).then(res => {
+                  this.$toast.success('提交成功');
+                  setTimeout(function(){
+                    history.go(-1)
+                  },2000)
+                })
+              }
+            }
+          });
+        }
+
+
       },
       goUpdate(){
         if(this.chargeItme.length<1){
@@ -594,23 +698,50 @@
         this.$set(this.form, "bankTypeList", this.chargeItme);
         this.$set(this.form, "accountTypeList", this.chargeItme);
         this.$set(this.form, "transferStatusList", this.chargeItme);
-        this.projectForm.outId = this.form.id
         updateTransfer(this.form).then((response) => {
           this.projectForm.outId = this.form.id
           this.$set(this.projectForm, "ynType", '1');
-          if(this.form.capitalExpenditureType==2){
-            addProjectto(this.projectForm).then(res => {
-                this.$toast.success('修改成功');
+          if(this.uploadFiles!=null&&this.uploadFiles.length>0){
+            console.log(this.uploadFiles)
+            this.uploadFiles.map(rr => {
+              const params = new FormData();
+              params.append("tableId", this.form.id);
+              params.append("tableName", "t_yinnong_transfer");
+              params.append("bizPath", "upload");
+              params.append("fileType", "0");
+              params.append("file", rr);
+              commonAttach(params).then((r) => {
+              })
+            })
+            if(this.form.capitalExpenditureType==2){
+              addProjectto(this.projectForm).then(res => {
+                this.$toast.success('保存成功');
                 setTimeout(function(){
                   history.go(-1)
                 },2000)
-            })
+              })
+            }else{
+              this.$toast.success('保存成功');
+              setTimeout(function(){
+                history.go(-1)
+              },2000)
+            }
           }else{
-            this.$toast.success('修改成功');
-            setTimeout(function(){
-              history.go(-1)
-            },2000)
+            if(this.form.capitalExpenditureType==2){
+              addProjectto(this.projectForm).then(res => {
+                this.$toast.success('保存成功');
+                setTimeout(function(){
+                  history.go(-1)
+                },2000)
+              })
+            }else{
+              this.$toast.success('保存成功');
+              setTimeout(function(){
+                history.go(-1)
+              },2000)
+            }
           }
+
         });
       },
       payeeSelectChange(select, i) {
@@ -712,32 +843,33 @@
         }
       },
       beforeRead(file) {
+        this.uploadFiles.push(file.file);
+      },
+      deleteFile(file){
         console.log(file)
-        console.log(this.fileList)
-        const params = new FormData();
-        params.append("tableId", this.$route.query.id);
-        params.append("tableName", "t_yinnong_transfer");
-        params.append("bizPath", "upload");
-        params.append("fileType", "0");
-        params.append("file", file.file);
-        commonAttach(params).then((response) => {
-          console.log(response)
+        this.uploadFiles.map((response,index) => {
+          if(file.file == response){
+            this.uploadFiles.splice(index,1)
+          }
         })
+        if(file.id){
+          systemAttachment(file.id).then((res) => {
+          });
+        }
       },
       getFileList(){
         let oData= {
-            tableId: this.$route.query.id,
-            tableName: "t_yinnong_transfer",
-            bizPath: "upload",
-            fileType: "0",
+          tableId: this.$route.query.id,
+          tableName: "t_yinnong_transfer",
+          bizPath: "upload",
+          fileType: "0",
         }
         attachmentList(oData).then(res => {
           console.log(res)
           console.log(location.protocol+"//"+location.host+request.defaults.baseURL)
           res.rows.map(r => {
-
             let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
-            this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{})})
+            this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{}),"id":r.id})
             console.log(r)
           })
         })
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify10.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify10.vue
index 6c25c644..532b38ce 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify10.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify10.vue
@@ -33,6 +33,7 @@
             :min-date="minDate"
             :max-date="maxDate"
             @confirm="onConfirmLasj"
+            @cancel="showlasj = false"
           />
         </van-popup>
         <van-field
@@ -211,8 +212,8 @@
         showFundType:false,
         showpayer:false,
 
-        minDate: new Date(),
-        maxDate: new Date(2050, 10, 1),
+        minDate: new Date(2000, 1, 1),
+        maxDate: new Date(2050, 12, 31),
         currentDate: new Date(),
         form:{},
 
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify11.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify11.vue
index 9b45f7af..27e9427b 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify11.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify11.vue
@@ -33,6 +33,7 @@
             :min-date="minDate"
             :max-date="maxDate"
             @confirm="onConfirmLasj"
+            @cancel="showlasj = false"
           />
         </van-popup>
         <van-field
@@ -213,8 +214,8 @@
         showFundType:false,
         showpayer:false,
 
-        minDate: new Date(),
-        maxDate: new Date(2025, 10, 1),
+        minDate: new Date(2000, 1, 1),
+        maxDate: new Date(2050, 12, 31),
         currentDate: new Date(),
         form:{},
 
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify12.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify12.vue
index a4e4e9d6..a948d870 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify12.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify12.vue
@@ -33,6 +33,7 @@
             :min-date="minDate"
             :max-date="maxDate"
             @confirm="onConfirmLasj"
+            @cancel="showlasj = false"
           />
         </van-popup>
         <van-field
@@ -263,8 +264,8 @@
         showFundType:false,
         showpayer:false,
 
-        minDate: new Date(),
-        maxDate: new Date(2025, 10, 1),
+        minDate: new Date(2000, 1, 1),
+        maxDate: new Date(2050, 12, 31),
         currentDate: new Date(),
         form:{},
 
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify2.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify2.vue
index 0817cbd0..bd4d257b 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify2.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify2.vue
@@ -33,6 +33,7 @@
             :min-date="minDate"
             :max-date="maxDate"
             @confirm="onConfirmLasj"
+            @cancel="showlasj = false"
           />
         </van-popup>
         <van-field
@@ -221,7 +222,7 @@
       </div>
       <p class="main_title">上传附件</p>
       <div class="main_box" style="padding: 5px 0 0 8px;">
-        <van-uploader v-model="fileList" :after-read="beforeRead" ></van-uploader>
+        <van-uploader v-model="fileList" :after-read="beforeRead" @delete="deleteFile"></van-uploader>
       </div>
       <div style="padding: 16px 0;">
         <van-row>
@@ -240,8 +241,13 @@
 
 <script>
   import { getAccount , getTransfer , queryTransferDetail , listPayee , updateTransfer , getProjectto , listProject , addProjectto , customSubmit ,getQmyeFlow} from "@/api/onlineHome/bankAgriculture/paymentApproval";
-  import {attachmentList, commonAttach} from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
+  import {
+    attachmentList,
+    commonAttach,
+    systemAttachment
+  } from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
   import request from '@/utils/request';
+  import Dialog from "vant/lib/dialog";
   export default {
     name: "approvalModify2",
     data() {
@@ -254,8 +260,8 @@
         showFundType:false,
         showpayer:false,
 
-        minDate: new Date(),
-        maxDate: new Date(2025, 10, 1),
+        minDate: new Date(2000, 1, 1),
+        maxDate: new Date(2050, 12, 31),
         currentDate: new Date(),
         form:{},
 
@@ -299,6 +305,7 @@
         },
         projectFundType:'',
         fileList:[],
+        uploadFiles:[],
       };
     },
     created() {
@@ -500,6 +507,7 @@
       },
       accountTypeChange(e){
         this.payeeList = [];
+        this.chargeItme = [];
         this.queryParams.accountType = this.form.accountType
         this.queryParams.status = "0"
         listPayee(this.queryParams).then((response) => {
@@ -543,34 +551,130 @@
             return;
           }
         }
-        this.$set(this.form, "payeeList", this.chargeItme);
-        this.$set(this.form, "bankTypeList", this.chargeItme);
-        this.$set(this.form, "accountTypeList", this.chargeItme);
-        this.$set(this.form, "transferStatusList", this.chargeItme);
-        console.log(this.form);
-        updateTransfer(this.form).then(response => {
-          console.log(response);
-          this.projectForm.outId = this.form.id
-          this.$set(this.projectForm, "ynType", '1');
-          console.log(this.projectForm)
-          if(this.form.capitalExpenditureType==2){
-            addProjectto(this.projectForm).then(res => {
-              customSubmit(this.form.id).then(res => {
-                this.$toast.success('提交成功');
-                setTimeout(function(){
-                  history.go(-1)
-                },2000)
-              })
-            })
-          }else{
-            customSubmit(this.form.id).then(res => {
-              this.$toast.success('提交成功');
-              setTimeout(function(){
-                history.go(-1)
-              },2000)
+        if((this.uploadFiles==null||this.uploadFiles.length==0)&&(this.fileList==null||this.fileList.length==0)){
+          Dialog.confirm({
+            title: '提示',
+            message: '此申请单中未上传任何附件，是否确认提交？',
+          })
+            .then(() => {
+              this.$set(this.form, "payeeList", this.chargeItme);
+              this.$set(this.form, "bankTypeList", this.chargeItme);
+              this.$set(this.form, "accountTypeList", this.chargeItme);
+              this.$set(this.form, "transferStatusList", this.chargeItme);
+              updateTransfer(this.form).then(response => {
+                this.projectForm.outId = this.form.id
+                this.$set(this.projectForm, "ynType", '1');
+                if(this.uploadFiles!=null&&this.uploadFiles.length>0){
+                  this.uploadFiles.map(rr => {
+                    const params = new FormData();
+                    params.append("tableId", this.form.id);
+                    params.append("tableName", "t_yinnong_transfer");
+                    params.append("bizPath", "upload");
+                    params.append("fileType", "0");
+                    params.append("file", rr);
+                    commonAttach(params).then((r) => {
+                    })
+                  })
+                  if(this.form.capitalExpenditureType==2){
+                    addProjectto(this.projectForm).then(res => {
+                      customSubmit(this.form.id).then(res => {
+                        this.$toast.success('提交成功');
+                        setTimeout(function(){
+                          history.go(-1)
+                        },2000)
+                      })
+                    })
+                  }else{
+                    customSubmit(this.form.id).then(res => {
+                      this.$toast.success('提交成功');
+                      setTimeout(function(){
+                        history.go(-1)
+                      },2000)
+                    })
+                  }
+                }else{
+                  if(this.form.capitalExpenditureType==2){
+                    addProjectto(this.projectForm).then(res => {
+                      customSubmit(this.form.id).then(res => {
+                        this.$toast.success('提交成功');
+                        setTimeout(function(){
+                          history.go(-1)
+                        },2000)
+                      })
+                    })
+                  }else{
+                    customSubmit(this.form.id).then(res => {
+                      this.$toast.success('提交成功');
+                      setTimeout(function(){
+                        history.go(-1)
+                      },2000)
+                    })
+                  }
+                }
+              });
             })
-          }
-        });
+            .catch(() => {
+              return false;
+            });
+        }else{
+          this.$set(this.form, "payeeList", this.chargeItme);
+          this.$set(this.form, "bankTypeList", this.chargeItme);
+          this.$set(this.form, "accountTypeList", this.chargeItme);
+          this.$set(this.form, "transferStatusList", this.chargeItme);
+          updateTransfer(this.form).then(response => {
+            this.projectForm.outId = this.form.id
+            this.$set(this.projectForm, "ynType", '1');
+            if(this.uploadFiles!=null&&this.uploadFiles.length>0){
+              this.uploadFiles.map(rr => {
+                const params = new FormData();
+                params.append("tableId", this.form.id);
+                params.append("tableName", "t_yinnong_transfer");
+                params.append("bizPath", "upload");
+                params.append("fileType", "0");
+                params.append("file", rr);
+                commonAttach(params).then((r) => {
+                })
+              })
+              if(this.form.capitalExpenditureType==2){
+                addProjectto(this.projectForm).then(res => {
+                  customSubmit(this.form.id).then(res => {
+                    this.$toast.success('提交成功');
+                    setTimeout(function(){
+                      history.go(-1)
+                    },2000)
+                  })
+                })
+              }else{
+                customSubmit(this.form.id).then(res => {
+                  this.$toast.success('提交成功');
+                  setTimeout(function(){
+                    history.go(-1)
+                  },2000)
+                })
+              }
+            }else{
+              if(this.form.capitalExpenditureType==2){
+                addProjectto(this.projectForm).then(res => {
+                  customSubmit(this.form.id).then(res => {
+                    this.$toast.success('提交成功');
+                    setTimeout(function(){
+                      history.go(-1)
+                    },2000)
+                  })
+                })
+              }else{
+                customSubmit(this.form.id).then(res => {
+                  this.$toast.success('提交成功');
+                  setTimeout(function(){
+                    history.go(-1)
+                  },2000)
+                })
+              }
+            }
+          });
+        }
+
+
       },
       goUpdate(){
         if(this.chargeItme.length<1){
@@ -595,23 +699,50 @@
         this.$set(this.form, "bankTypeList", this.chargeItme);
         this.$set(this.form, "accountTypeList", this.chargeItme);
         this.$set(this.form, "transferStatusList", this.chargeItme);
-        this.projectForm.outId = this.form.id
         updateTransfer(this.form).then((response) => {
           this.projectForm.outId = this.form.id
           this.$set(this.projectForm, "ynType", '1');
-          if(this.form.capitalExpenditureType==2){
-            addProjectto(this.projectForm).then(res => {
-                this.$toast.success('修改成功');
+          if(this.uploadFiles!=null&&this.uploadFiles.length>0){
+            console.log(this.uploadFiles)
+            this.uploadFiles.map(rr => {
+              const params = new FormData();
+              params.append("tableId", this.form.id);
+              params.append("tableName", "t_yinnong_transfer");
+              params.append("bizPath", "upload");
+              params.append("fileType", "0");
+              params.append("file", rr);
+              commonAttach(params).then((r) => {
+              })
+            })
+            if(this.form.capitalExpenditureType==2){
+              addProjectto(this.projectForm).then(res => {
+                this.$toast.success('保存成功');
                 setTimeout(function(){
                   history.go(-1)
                 },2000)
-            })
+              })
+            }else{
+              this.$toast.success('保存成功');
+              setTimeout(function(){
+                history.go(-1)
+              },2000)
+            }
           }else{
-            this.$toast.success('修改成功');
-            setTimeout(function(){
-              history.go(-1)
-            },2000)
+            if(this.form.capitalExpenditureType==2){
+              addProjectto(this.projectForm).then(res => {
+                this.$toast.success('保存成功');
+                setTimeout(function(){
+                  history.go(-1)
+                },2000)
+              })
+            }else{
+              this.$toast.success('保存成功');
+              setTimeout(function(){
+                history.go(-1)
+              },2000)
+            }
           }
+
         });
       },
       payeeSelectChange(select, i) {
@@ -713,17 +844,19 @@
         }
       },
       beforeRead(file) {
+        this.uploadFiles.push(file.file);
+      },
+      deleteFile(file){
         console.log(file)
-        console.log(this.fileList)
-        const params = new FormData();
-        params.append("tableId", this.$route.query.id);
-        params.append("tableName", "t_yinnong_transfer");
-        params.append("bizPath", "upload");
-        params.append("fileType", "0");
-        params.append("file", file.file);
-        commonAttach(params).then((response) => {
-          console.log(response)
+        this.uploadFiles.map((response,index) => {
+          if(file.file == response){
+            this.uploadFiles.splice(index,1)
+          }
         })
+        if(file.id){
+          systemAttachment(file.id).then((res) => {
+          });
+        }
       },
       getFileList(){
         let oData= {
@@ -736,9 +869,8 @@
           console.log(res)
           console.log(location.protocol+"//"+location.host+request.defaults.baseURL)
           res.rows.map(r => {
-
             let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
-            this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{})})
+            this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{}),"id":r.id})
             console.log(r)
           })
         })
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify3.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify3.vue
index 0c9d583e..769a5017 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify3.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify3.vue
@@ -7,7 +7,7 @@
       @click-left="$router.back(-1)"
     >
       <template #title>
-        <p style="font-weight: bold;">修改付款申请</p>
+        <p style="font-weight: bold;">修改虚拟挂账申请</p>
       </template>
     </van-nav-bar>
     <van-form @submit="getChange" @failed="getError" :show-error-message="false" scroll-to-error validate-first>
@@ -33,6 +33,7 @@
             :min-date="minDate"
             :max-date="maxDate"
             @confirm="onConfirmLasj"
+            @cancel="showlasj = false"
           />
         </van-popup>
         <van-field
@@ -211,7 +212,7 @@
       </div>
       <p class="main_title">上传附件</p>
       <div class="main_box" style="padding: 5px 0 0 8px;">
-        <van-uploader v-model="fileList" :after-read="beforeRead" ></van-uploader>
+        <van-uploader v-model="fileList" :after-read="beforeRead" @delete="deleteFile"></van-uploader>
       </div>
       <div style="padding: 16px 0;">
         <van-row>
@@ -234,9 +235,10 @@
     addCash, attachmentList,
     commonAttach,
     listTaccount,
-    listVaccount
+    listVaccount, systemAttachment
   } from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
   import request from '@/utils/request';
+  import Dialog from "vant/lib/dialog";
   export default {
     name: "approvalModify3",
     data() {
@@ -249,8 +251,8 @@
         showFundType:false,
         showpayer:false,
 
-        minDate: new Date(),
-        maxDate: new Date(2025, 10, 1),
+        minDate: new Date(2000, 1, 1),
+        maxDate: new Date(2050, 12, 31),
         currentDate: new Date(),
         form:{},
 
@@ -294,6 +296,7 @@
         },
         projectFundType:'',
         fileList:[],
+        uploadFiles:[],
       };
     },
     created() {
@@ -490,10 +493,13 @@
         this.chargeItme[index].showbankType = false;
       },
       onConfirmPayer(data){
+        console.log(data)
         this.form.payer = data.text;
         this.form.cashierId = data.value;
+        this.form.payerAccount = data.payeeAccount
         this.showpayer = false;
-        this.selectChange(data.value)
+        //this.selectChange(data.value);
+        this.accountTypeChange();
       },
       onConfirmLasj(data){
         this.form.applyDate = this.getNowFormatDate(data).substr(0,10);
@@ -505,7 +511,8 @@
         let params = {
           villageAccountType : 1,
           status:'0',
-          accountType : this.form.accountType
+          accountType : this.form.accountType,
+          taccountId:this.form.cashierId
         }
         listVaccount(params).then(response => {
           console.log(response)
@@ -551,32 +558,130 @@
             return;
           }
         }
-        this.$set(this.form, "payeeList", this.chargeItme);
-        this.$set(this.form, "bankTypeList", this.chargeItme);
-        this.$set(this.form, "accountTypeList", this.chargeItme);
-        this.$set(this.form, "transferStatusList", this.chargeItme);
-        console.log(this.form);
-        addCash(this.form).then(response => {
-          this.projectForm.outId = response.data.id
-          this.$set(this.projectForm, "ynType", '3');
-          if(this.form.capitalExpenditureType==2){
-            addProjectto(this.projectForm).then(res => {
-              customSubmit(response.data.id).then(res => {
-                this.$toast.success('提交成功');
-                setTimeout(function(){
-                  history.go(-1)
-                },2000)
-              })
-            })
-          }else{
-            customSubmit(response.data.id).then(res => {
-              this.$toast.success('提交成功');
-              setTimeout(function(){
-                history.go(-1)
-              },2000)
+        if((this.uploadFiles==null||this.uploadFiles.length==0)&&(this.fileList==null||this.fileList.length==0)){
+          Dialog.confirm({
+            title: '提示',
+            message: '此申请单中未上传任何附件，是否确认提交？',
+          })
+            .then(() => {
+              this.$set(this.form, "payeeList", this.chargeItme);
+              this.$set(this.form, "bankTypeList", this.chargeItme);
+              this.$set(this.form, "accountTypeList", this.chargeItme);
+              this.$set(this.form, "transferStatusList", this.chargeItme);
+              updateTransfer(this.form).then(response => {
+                this.projectForm.outId = this.form.id
+                this.$set(this.projectForm, "ynType", '1');
+                if(this.uploadFiles!=null&&this.uploadFiles.length>0){
+                  this.uploadFiles.map(rr => {
+                    const params = new FormData();
+                    params.append("tableId", this.form.id);
+                    params.append("tableName", "t_yinnong_transfer");
+                    params.append("bizPath", "upload");
+                    params.append("fileType", "0");
+                    params.append("file", rr);
+                    commonAttach(params).then((r) => {
+                    })
+                  })
+                  if(this.form.capitalExpenditureType==2){
+                    addProjectto(this.projectForm).then(res => {
+                      customSubmit(this.form.id).then(res => {
+                        this.$toast.success('提交成功');
+                        setTimeout(function(){
+                          history.go(-1)
+                        },2000)
+                      })
+                    })
+                  }else{
+                    customSubmit(this.form.id).then(res => {
+                      this.$toast.success('提交成功');
+                      setTimeout(function(){
+                        history.go(-1)
+                      },2000)
+                    })
+                  }
+                }else{
+                  if(this.form.capitalExpenditureType==2){
+                    addProjectto(this.projectForm).then(res => {
+                      customSubmit(this.form.id).then(res => {
+                        this.$toast.success('提交成功');
+                        setTimeout(function(){
+                          history.go(-1)
+                        },2000)
+                      })
+                    })
+                  }else{
+                    customSubmit(this.form.id).then(res => {
+                      this.$toast.success('提交成功');
+                      setTimeout(function(){
+                        history.go(-1)
+                      },2000)
+                    })
+                  }
+                }
+              });
             })
-          }
-        });
+            .catch(() => {
+              return false;
+            });
+        }else{
+          this.$set(this.form, "payeeList", this.chargeItme);
+          this.$set(this.form, "bankTypeList", this.chargeItme);
+          this.$set(this.form, "accountTypeList", this.chargeItme);
+          this.$set(this.form, "transferStatusList", this.chargeItme);
+          updateTransfer(this.form).then(response => {
+            this.projectForm.outId = this.form.id
+            this.$set(this.projectForm, "ynType", '1');
+            if(this.uploadFiles!=null&&this.uploadFiles.length>0){
+              this.uploadFiles.map(rr => {
+                const params = new FormData();
+                params.append("tableId", this.form.id);
+                params.append("tableName", "t_yinnong_transfer");
+                params.append("bizPath", "upload");
+                params.append("fileType", "0");
+                params.append("file", rr);
+                commonAttach(params).then((r) => {
+                })
+              })
+              if(this.form.capitalExpenditureType==2){
+                addProjectto(this.projectForm).then(res => {
+                  customSubmit(this.form.id).then(res => {
+                    this.$toast.success('提交成功');
+                    setTimeout(function(){
+                      history.go(-1)
+                    },2000)
+                  })
+                })
+              }else{
+                customSubmit(this.form.id).then(res => {
+                  this.$toast.success('提交成功');
+                  setTimeout(function(){
+                    history.go(-1)
+                  },2000)
+                })
+              }
+            }else{
+              if(this.form.capitalExpenditureType==2){
+                addProjectto(this.projectForm).then(res => {
+                  customSubmit(this.form.id).then(res => {
+                    this.$toast.success('提交成功');
+                    setTimeout(function(){
+                      history.go(-1)
+                    },2000)
+                  })
+                })
+              }else{
+                customSubmit(this.form.id).then(res => {
+                  this.$toast.success('提交成功');
+                  setTimeout(function(){
+                    history.go(-1)
+                  },2000)
+                })
+              }
+            }
+          });
+        }
+
+
       },
       goUpdate(){
         if(this.chargeItme.length<1){
@@ -601,23 +706,50 @@
         this.$set(this.form, "bankTypeList", this.chargeItme);
         this.$set(this.form, "accountTypeList", this.chargeItme);
         this.$set(this.form, "transferStatusList", this.chargeItme);
-        this.projectForm.outId = this.form.id
         updateTransfer(this.form).then((response) => {
           this.projectForm.outId = this.form.id
           this.$set(this.projectForm, "ynType", '1');
-          if(this.form.capitalExpenditureType==2){
-            addProjectto(this.projectForm).then(res => {
-                this.$toast.success('修改成功');
+          if(this.uploadFiles!=null&&this.uploadFiles.length>0){
+            console.log(this.uploadFiles)
+            this.uploadFiles.map(rr => {
+              const params = new FormData();
+              params.append("tableId", this.form.id);
+              params.append("tableName", "t_yinnong_transfer");
+              params.append("bizPath", "upload");
+              params.append("fileType", "0");
+              params.append("file", rr);
+              commonAttach(params).then((r) => {
+              })
+            })
+            if(this.form.capitalExpenditureType==2){
+              addProjectto(this.projectForm).then(res => {
+                this.$toast.success('保存成功');
                 setTimeout(function(){
                   history.go(-1)
                 },2000)
-            })
+              })
+            }else{
+              this.$toast.success('保存成功');
+              setTimeout(function(){
+                history.go(-1)
+              },2000)
+            }
           }else{
-            this.$toast.success('修改成功');
-            setTimeout(function(){
-              history.go(-1)
-            },2000)
+            if(this.form.capitalExpenditureType==2){
+              addProjectto(this.projectForm).then(res => {
+                this.$toast.success('保存成功');
+                setTimeout(function(){
+                  history.go(-1)
+                },2000)
+              })
+            }else{
+              this.$toast.success('保存成功');
+              setTimeout(function(){
+                history.go(-1)
+              },2000)
+            }
           }
+
         });
       },
       payeeSelectChange(select, i) {
@@ -719,17 +851,19 @@
         }
       },
       beforeRead(file) {
+        this.uploadFiles.push(file.file);
+      },
+      deleteFile(file){
         console.log(file)
-        console.log(this.fileList)
-        const params = new FormData();
-        params.append("tableId", this.$route.query.id);
-        params.append("tableName", "t_yinnong_transfer");
-        params.append("bizPath", "upload");
-        params.append("fileType", "0");
-        params.append("file", file.file);
-        commonAttach(params).then((response) => {
-          console.log(response)
+        this.uploadFiles.map((response,index) => {
+          if(file.file == response){
+            this.uploadFiles.splice(index,1)
+          }
         })
+        if(file.id){
+          systemAttachment(file.id).then((res) => {
+          });
+        }
       },
       getFileList(){
         let oData= {
@@ -742,9 +876,8 @@
           console.log(res)
           console.log(location.protocol+"//"+location.host+request.defaults.baseURL)
           res.rows.map(r => {
-
             let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
-            this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{})})
+            this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{}),"id":r.id})
             console.log(r)
           })
         })
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify4.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify4.vue
index 9dc500fe..1fbd37b6 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify4.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify4.vue
@@ -7,7 +7,7 @@
       @click-left="$router.back(-1)"
     >
       <template #title>
-        <p style="font-weight: bold;">修改付款申请</p>
+        <p style="font-weight: bold;">修改虚拟转账申请</p>
       </template>
     </van-nav-bar>
     <van-form @submit="getChange" @failed="getError" :show-error-message="false" scroll-to-error validate-first>
@@ -33,6 +33,7 @@
             :min-date="minDate"
             :max-date="maxDate"
             @confirm="onConfirmLasj"
+            @cancel="showlasj = false"
           />
         </van-popup>
         <van-field
@@ -221,7 +222,7 @@
       </div>
       <p class="main_title">上传附件</p>
       <div class="main_box" style="padding: 5px 0 0 8px;">
-        <van-uploader v-model="fileList" :after-read="beforeRead" ></van-uploader>
+        <van-uploader v-model="fileList" :after-read="beforeRead" @delete="deleteFile"></van-uploader>
       </div>
       <div style="padding: 16px 0;">
         <van-row>
@@ -240,8 +241,13 @@
 
 <script>
   import { getAccount , getTransfer , queryTransferDetail , listPayee , updateTransfer , getProjectto , listProject , addProjectto , customSubmit ,getQmyeFlow} from "@/api/onlineHome/bankAgriculture/paymentApproval";
-  import {attachmentList, commonAttach} from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
+  import {
+    attachmentList,
+    commonAttach,
+    systemAttachment
+  } from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
   import request from '@/utils/request';
+  import Dialog from "vant/lib/dialog";
   export default {
     name: "approvalModify4",
     data() {
@@ -254,8 +260,8 @@
         showFundType:false,
         showpayer:false,
 
-        minDate: new Date(),
-        maxDate: new Date(2025, 10, 1),
+        minDate: new Date(2000, 1, 1),
+        maxDate: new Date(2050, 12, 31),
         currentDate: new Date(),
         form:{},
 
@@ -299,6 +305,7 @@
         },
         projectFundType:'',
         fileList:[],
+        uploadFiles:[],
       };
     },
     created() {
@@ -472,21 +479,23 @@
         this.showproject = false;
       },
       onConfirmPayee(data,index){
-        console.log(data)
-        for (var i = 0 ; i < this.chargeItme.length ; i++){
+        for (let i = 0 ; i < this.chargeItme.length ; i++){
           this.chargeItme[i].showPayee = false;
         }
         this.chargeItme[index].payee = data.text;
         this.chargeItme[index].payeeId = data.value;
+        this.chargeItme[index].showpayee = false;
         this.payeeSelectChange(data.value , index)
+        this.onConfirmBankType(data,index)
       },
       onConfirmBankType(data,index){
-        for (var i = 0 ; i < this.chargeItme.length ; i++){
-          this.chargeItme[i].showbankType = false;
-        }
-        this.chargeItme[index].bankTypeText = data.text;
-        this.chargeItme[index].bankType = data.value;
-        this.chargeItme[index].showbankType = false;
+        console.log(this.bankTypeDictionaries)
+        this.bankTypeDictionaries.map(res => {
+          if(res.value==data.bankType){
+            this.chargeItme[index].bankTypeText = res.text;
+            this.chargeItme[index].bankType = res.value;
+          }
+        })
       },
       onConfirmPayer(data){
         this.form.payer = data.text;
@@ -500,6 +509,7 @@
       },
       accountTypeChange(e){
         this.payeeList = [];
+        this.chargeItme = [];
         this.queryParams.accountType = this.form.accountType
         this.queryParams.status = "0"
         listPayee(this.queryParams).then((response) => {
@@ -543,34 +553,130 @@
             return;
           }
         }
-        this.$set(this.form, "payeeList", this.chargeItme);
-        this.$set(this.form, "bankTypeList", this.chargeItme);
-        this.$set(this.form, "accountTypeList", this.chargeItme);
-        this.$set(this.form, "transferStatusList", this.chargeItme);
-        console.log(this.form);
-        updateTransfer(this.form).then(response => {
-          console.log(response);
-          this.projectForm.outId = this.form.id
-          this.$set(this.projectForm, "ynType", '1');
-          console.log(this.projectForm)
-          if(this.form.capitalExpenditureType==2){
-            addProjectto(this.projectForm).then(res => {
-              customSubmit(this.form.id).then(res => {
-                this.$toast.success('提交成功');
-                setTimeout(function(){
-                  history.go(-1)
-                },2000)
-              })
-            })
-          }else{
-            customSubmit(this.form.id).then(res => {
-              this.$toast.success('提交成功');
-              setTimeout(function(){
-                history.go(-1)
-              },2000)
+        if((this.uploadFiles==null||this.uploadFiles.length==0)&&(this.fileList==null||this.fileList.length==0)){
+          Dialog.confirm({
+            title: '提示',
+            message: '此申请单中未上传任何附件，是否确认提交？',
+          })
+            .then(() => {
+              this.$set(this.form, "payeeList", this.chargeItme);
+              this.$set(this.form, "bankTypeList", this.chargeItme);
+              this.$set(this.form, "accountTypeList", this.chargeItme);
+              this.$set(this.form, "transferStatusList", this.chargeItme);
+              updateTransfer(this.form).then(response => {
+                this.projectForm.outId = this.form.id
+                this.$set(this.projectForm, "ynType", '1');
+                if(this.uploadFiles!=null&&this.uploadFiles.length>0){
+                  this.uploadFiles.map(rr => {
+                    const params = new FormData();
+                    params.append("tableId", this.form.id);
+                    params.append("tableName", "t_yinnong_transfer");
+                    params.append("bizPath", "upload");
+                    params.append("fileType", "0");
+                    params.append("file", rr);
+                    commonAttach(params).then((r) => {
+                    })
+                  })
+                  if(this.form.capitalExpenditureType==2){
+                    addProjectto(this.projectForm).then(res => {
+                      customSubmit(this.form.id).then(res => {
+                        this.$toast.success('提交成功');
+                        setTimeout(function(){
+                          history.go(-1)
+                        },2000)
+                      })
+                    })
+                  }else{
+                    customSubmit(this.form.id).then(res => {
+                      this.$toast.success('提交成功');
+                      setTimeout(function(){
+                        history.go(-1)
+                      },2000)
+                    })
+                  }
+                }else{
+                  if(this.form.capitalExpenditureType==2){
+                    addProjectto(this.projectForm).then(res => {
+                      customSubmit(this.form.id).then(res => {
+                        this.$toast.success('提交成功');
+                        setTimeout(function(){
+                          history.go(-1)
+                        },2000)
+                      })
+                    })
+                  }else{
+                    customSubmit(this.form.id).then(res => {
+                      this.$toast.success('提交成功');
+                      setTimeout(function(){
+                        history.go(-1)
+                      },2000)
+                    })
+                  }
+                }
+              });
             })
-          }
-        });
+            .catch(() => {
+              return false;
+            });
+        }else{
+          this.$set(this.form, "payeeList", this.chargeItme);
+          this.$set(this.form, "bankTypeList", this.chargeItme);
+          this.$set(this.form, "accountTypeList", this.chargeItme);
+          this.$set(this.form, "transferStatusList", this.chargeItme);
+          updateTransfer(this.form).then(response => {
+            this.projectForm.outId = this.form.id
+            this.$set(this.projectForm, "ynType", '1');
+            if(this.uploadFiles!=null&&this.uploadFiles.length>0){
+              this.uploadFiles.map(rr => {
+                const params = new FormData();
+                params.append("tableId", this.form.id);
+                params.append("tableName", "t_yinnong_transfer");
+                params.append("bizPath", "upload");
+                params.append("fileType", "0");
+                params.append("file", rr);
+                commonAttach(params).then((r) => {
+                })
+              })
+              if(this.form.capitalExpenditureType==2){
+                addProjectto(this.projectForm).then(res => {
+                  customSubmit(this.form.id).then(res => {
+                    this.$toast.success('提交成功');
+                    setTimeout(function(){
+                      history.go(-1)
+                    },2000)
+                  })
+                })
+              }else{
+                customSubmit(this.form.id).then(res => {
+                  this.$toast.success('提交成功');
+                  setTimeout(function(){
+                    history.go(-1)
+                  },2000)
+                })
+              }
+            }else{
+              if(this.form.capitalExpenditureType==2){
+                addProjectto(this.projectForm).then(res => {
+                  customSubmit(this.form.id).then(res => {
+                    this.$toast.success('提交成功');
+                    setTimeout(function(){
+                      history.go(-1)
+                    },2000)
+                  })
+                })
+              }else{
+                customSubmit(this.form.id).then(res => {
+                  this.$toast.success('提交成功');
+                  setTimeout(function(){
+                    history.go(-1)
+                  },2000)
+                })
+              }
+            }
+          });
+        }
+
+
       },
       goUpdate(){
         if(this.chargeItme.length<1){
@@ -595,23 +701,50 @@
         this.$set(this.form, "bankTypeList", this.chargeItme);
         this.$set(this.form, "accountTypeList", this.chargeItme);
         this.$set(this.form, "transferStatusList", this.chargeItme);
-        this.projectForm.outId = this.form.id
         updateTransfer(this.form).then((response) => {
           this.projectForm.outId = this.form.id
           this.$set(this.projectForm, "ynType", '1');
-          if(this.form.capitalExpenditureType==2){
-            addProjectto(this.projectForm).then(res => {
-                this.$toast.success('修改成功');
+          if(this.uploadFiles!=null&&this.uploadFiles.length>0){
+            console.log(this.uploadFiles)
+            this.uploadFiles.map(rr => {
+              const params = new FormData();
+              params.append("tableId", this.form.id);
+              params.append("tableName", "t_yinnong_transfer");
+              params.append("bizPath", "upload");
+              params.append("fileType", "0");
+              params.append("file", rr);
+              commonAttach(params).then((r) => {
+              })
+            })
+            if(this.form.capitalExpenditureType==2){
+              addProjectto(this.projectForm).then(res => {
+                this.$toast.success('保存成功');
                 setTimeout(function(){
                   history.go(-1)
                 },2000)
-            })
+              })
+            }else{
+              this.$toast.success('保存成功');
+              setTimeout(function(){
+                history.go(-1)
+              },2000)
+            }
           }else{
-            this.$toast.success('修改成功');
-            setTimeout(function(){
-              history.go(-1)
-            },2000)
+            if(this.form.capitalExpenditureType==2){
+              addProjectto(this.projectForm).then(res => {
+                this.$toast.success('保存成功');
+                setTimeout(function(){
+                  history.go(-1)
+                },2000)
+              })
+            }else{
+              this.$toast.success('保存成功');
+              setTimeout(function(){
+                history.go(-1)
+              },2000)
+            }
           }
+
         });
       },
       payeeSelectChange(select, i) {
@@ -664,66 +797,30 @@
           //model就是上面的数据源
           return account.id === select; //筛选出匹配数据
         });
-        if(obj.payerFrom==1&&obj.operatorCode != null && obj.operatorCode != "" &&
-          obj.enterpriseCode != null && obj.enterpriseCode != "" &&
-          obj.accountPassword != null && obj.accountPassword != ""){
-          this.$set(this.form, "bookId", obj.bookId);
-          this.$set(this.form, "deptId", obj.deptId);
-          this.$set(this.form, "cashierId", obj.id);
-          this.$set(this.form, "payer", obj.accountName);
-          this.$set(this.form, "payerAccount", obj.bankAccountNumber);
-          this.$set(this.form, "operatorCode", obj.operatorCode);
-          this.$set(this.form, "enterpriseCode", obj.enterpriseCode);
-          this.$set(this.form, "payerFrom", '1');
-        }else{
-          if(obj.payerFrom==1){
-            this.diglogStatus = false;
-            this.$notify({ type: 'danger', message: "请完善付款方“操作员代码”、“企业编码”、“支付口令”等信息！" });
-            this.$set(this.form,"payer","")
-            this.$set(this.form,"payerAccount","")
-          }else{
-            this.$set(this.form, "payerFrom", obj.parerFrom);
-            if(obj.operatorCode!=null&&obj.operatorCode!=''){
-              this.$set(this.form, "operatorCode", obj.operatorCode);
-            }else{
-              this.$set(this.form, "operatorCode", '');
-            }
-            if(obj.enterpriseCode!=null&&obj.enterpriseCode!=''){
-              this.$set(this.form, "enterpriseCode", obj.enterpriseCode);
-            }else{
-              this.$set(this.form, "enterpriseCode", '');
-            }
-            if(obj.accountPassword!=null&&obj.accountPassword!=''){
-              this.$set(this.form, "accountPassword", obj.accountPassword);
-            }else{
-              this.$set(this.form, "accountPassword", '');
-            }
-            this.$set(this.form, "bookId",'');
-            this.$set(this.form, "deptId", '');
-            this.$set(this.form, "cashierId", obj.id);
-            this.$set(this.form, "payer", obj.accountName);
-            if(obj.payerFrom==6){
-              getQmyeFlow(obj.bankAccountNumber).then((response) => {
-                this.$set(this.form, "payerAccount", response.data);
-              });
-            }else {
-              this.$set(this.form, "payerAccount", obj.bankAccountNumber);
-            }
-          }
-        }
+        console.log(obj)
+        this.$set(this.form, "bookId", obj.bookId);
+        this.$set(this.form, "deptId", obj.deptId);
+        this.$set(this.form, "cashierId", obj.id);
+        this.$set(this.form, "payer", obj.payee);
+        this.$set(this.form, "payerAccount", obj.payeeAccount);
+        this.$set(this.form, "operatorCode", obj.operatorCode);
+        this.$set(this.form, "enterpriseCode", obj.enterpriseCode);
+        this.$set(this.form, "payerFrom", '1');
       },
       beforeRead(file) {
+        this.uploadFiles.push(file.file);
+      },
+      deleteFile(file){
         console.log(file)
-        console.log(this.fileList)
-        const params = new FormData();
-        params.append("tableId", this.$route.query.id);
-        params.append("tableName", "t_yinnong_transfer");
-        params.append("bizPath", "upload");
-        params.append("fileType", "0");
-        params.append("file", file.file);
-        commonAttach(params).then((response) => {
-          console.log(response)
+        this.uploadFiles.map((response,index) => {
+          if(file.file == response){
+            this.uploadFiles.splice(index,1)
+          }
         })
+        if(file.id){
+          systemAttachment(file.id).then((res) => {
+          });
+        }
       },
       getFileList(){
         let oData= {
@@ -736,9 +833,8 @@
           console.log(res)
           console.log(location.protocol+"//"+location.host+request.defaults.baseURL)
           res.rows.map(r => {
-
             let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
-            this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{})})
+            this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{}),"id":r.id})
             console.log(r)
           })
         })
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify5.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify5.vue
index fabbd54d..330f20ef 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify5.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify5.vue
@@ -33,6 +33,7 @@
             :min-date="minDate"
             :max-date="maxDate"
             @confirm="onConfirmLasj"
+            @cancel="showlasj = false"
           />
         </van-popup>
         <van-field
@@ -251,8 +252,8 @@
         showFundType:false,
         showpayer:false,
 
-        minDate: new Date(),
-        maxDate: new Date(2025, 10, 1),
+        minDate: new Date(2000, 1, 1),
+        maxDate: new Date(2050, 12, 31),
         currentDate: new Date(),
         form:{},
 
@@ -552,7 +553,7 @@
             return;
           }
         }
-        if(this.uploadFiles==null||this.uploadFiles.length==0){
+        if((this.uploadFiles==null||this.uploadFiles.length==0)&&(this.fileList==null||this.fileList.length==0)){
           Dialog.confirm({
             title: '提示',
             message: '此申请单中未上传任何附件，是否确认提交？',
@@ -578,7 +579,7 @@
                   })
                   if(this.form.capitalExpenditureType==2){
                     addProjectto(this.projectForm).then(res => {
-                      customSubmit(response.data.id).then(res => {
+                      customSubmit(this.form.id).then(res => {
                         this.$toast.success('提交成功');
                         setTimeout(function(){
                           history.go(-1)
@@ -586,7 +587,7 @@
                       })
                     })
                   }else{
-                    customSubmit(response.data.id).then(res => {
+                    customSubmit(this.form.id).then(res => {
                       this.$toast.success('提交成功');
                       setTimeout(function(){
                         history.go(-1)
@@ -596,7 +597,7 @@
                 }else{
                   if(this.form.capitalExpenditureType==2){
                     addProjectto(this.projectForm).then(res => {
-                      customSubmit(response.data.id).then(res => {
+                      customSubmit(this.form.id).then(res => {
                         this.$toast.success('提交成功');
                         setTimeout(function(){
                           history.go(-1)
@@ -604,7 +605,7 @@
                       })
                     })
                   }else{
-                    customSubmit(response.data.id).then(res => {
+                    customSubmit(this.form.id).then(res => {
                       this.$toast.success('提交成功');
                       setTimeout(function(){
                         history.go(-1)
@@ -623,12 +624,12 @@
           this.$set(this.form, "accountTypeList", this.chargeItme);
           this.$set(this.form, "transferStatusList", this.chargeItme);
           updateTransfer(this.form).then(response => {
-            this.projectForm.outId = response.data.id
+            this.projectForm.outId = this.form.id
             this.$set(this.projectForm, "ynType", '1');
             if(this.uploadFiles!=null&&this.uploadFiles.length>0){
               this.uploadFiles.map(rr => {
                 const params = new FormData();
-                params.append("tableId", response.data.id);
+                params.append("tableId", this.form.id);
                 params.append("tableName", "t_yinnong_transfer");
                 params.append("bizPath", "upload");
                 params.append("fileType", "0");
@@ -638,7 +639,7 @@
               })
               if(this.form.capitalExpenditureType==2){
                 addProjectto(this.projectForm).then(res => {
-                  customSubmit(response.data.id).then(res => {
+                  customSubmit(this.form.id).then(res => {
                     this.$toast.success('提交成功');
                     setTimeout(function(){
                       history.go(-1)
@@ -646,7 +647,7 @@
                   })
                 })
               }else{
-                customSubmit(response.data.id).then(res => {
+                customSubmit(this.form.id).then(res => {
                   this.$toast.success('提交成功');
                   setTimeout(function(){
                     history.go(-1)
@@ -656,7 +657,7 @@
             }else{
               if(this.form.capitalExpenditureType==2){
                 addProjectto(this.projectForm).then(res => {
-                  customSubmit(response.data.id).then(res => {
+                  customSubmit(this.form.id).then(res => {
                     this.$toast.success('提交成功');
                     setTimeout(function(){
                       history.go(-1)
@@ -664,7 +665,7 @@
                   })
                 })
               }else{
-                customSubmit(response.data.id).then(res => {
+                customSubmit(this.form.id).then(res => {
                   this.$toast.success('提交成功');
                   setTimeout(function(){
                     history.go(-1)
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalProcess.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalProcess.vue
index a0e177a5..fdccd4ba 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalProcess.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalProcess.vue
@@ -62,8 +62,9 @@
             <p v-show="processList.区县审批==1">区县审批</p>
             <p v-show="processList.区县审批==2" class="textBlue">区县审批</p>
             <p v-show="processList.区县审批==3" class="textRed">区县审批</p>
+
             <van-row>
-              <van-col span="24" style="padding: 0;">
+              <van-col span="24" style="padding: 0;" v-if="processList.区县审批人!=null&&processList.区县审批人!=''">
                 <p v-show="processList.区县审批==1">审批人：{{processList.区县审批人}}</p>
                 <p v-show="processList.区县审批==2" class="textBlue">审批人：{{processList.区县审批人}}</p>
                 <p v-show="processList.区县审批==3" class="textRed">审批人：{{processList.区县审批人}}</p>
@@ -71,7 +72,7 @@
             </van-row>
             <van-row>
 
-              <van-col span="24" style="padding: 0;">
+              <van-col span="24" style="padding: 0;" v-if="processList.区县审批时间!=null&&processList.区县审批时间!=''">
                 <p v-show="processList.区县审批==1">审批时间：{{processList.区县审批时间}}</p>
                 <p v-show="processList.区县审批==2" class="textBlue">审批时间：{{processList.区县审批时间}}</p>
                 <p v-show="processList.区县审批==3" class="textRed">审批时间：{{processList.区县审批时间}}</p>
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalProcess2.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalProcess2.vue
index 58a73f68..8a181203 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalProcess2.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalProcess2.vue
@@ -62,8 +62,9 @@
             <p v-show="processList.区县审批==1">区县审批</p>
             <p v-show="processList.区县审批==2" class="textBlue">区县审批</p>
             <p v-show="processList.区县审批==3" class="textRed">区县审批</p>
+
             <van-row>
-              <van-col span="24" style="padding: 0;">
+              <van-col span="24" style="padding: 0;" v-if="processList.区县审批人!=null&&processList.区县审批人!=''">
                 <p v-show="processList.区县审批==1">审批人：{{processList.区县审批人}}</p>
                 <p v-show="processList.区县审批==2" class="textBlue">审批人：{{processList.区县审批人}}</p>
                 <p v-show="processList.区县审批==3" class="textRed">审批人：{{processList.区县审批人}}</p>
@@ -71,7 +72,7 @@
             </van-row>
             <van-row>
 
-              <van-col span="24" style="padding: 0;">
+              <van-col span="24" style="padding: 0;" v-if="processList.区县审批时间!=null&&processList.区县审批时间!=''">
                 <p v-show="processList.区县审批==1">审批时间：{{processList.区县审批时间}}</p>
                 <p v-show="processList.区县审批==2" class="textBlue">审批时间：{{processList.区县审批时间}}</p>
                 <p v-show="processList.区县审批==3" class="textRed">审批时间：{{processList.区县审批时间}}</p>
diff --git a/src/views/onlineHome/done.vue b/src/views/onlineHome/done.vue
index c9cf88f2..c67fc373 100644
--- a/src/views/onlineHome/done.vue
+++ b/src/views/onlineHome/done.vue
@@ -3,7 +3,7 @@
     <van-nav-bar
       title="我的事项"
       left-arrow
-      @click-left="$router.back(-1)"
+      @click-left="goOnlineHomeIndex"
     />
     <van-tabs v-model="activeName" title-active-color="#1D6FE9" color="#1D6FE9" line-width="20px" swipeable @click="getList">
       <van-tab title="待办" name="1" >
@@ -58,7 +58,7 @@
       data(){
         return{
           taskList:[],
-          activeName:'1',
+          activeName:this.$route.query.activeName?this.$route.query.activeName:'1',
           total:0,
           queryParams: {
             pageNum: 1,
@@ -70,16 +70,23 @@
       created() {
         this.getDicts("activity_business_type").then((response) => {
           this.activityBusinessTypeOptions = response.data;
+          if(this.$route.query.activeName){
+            this.activeName = this.$route.query.activeName
+          }
           this.getList();
         });
 
       },
       methods: {
+        goOnlineHomeIndex(){
+          this.$router.push({name:'onlineHomeWorkbench'})
+        },
         getList() {
           this.taskList = []
-          this.$set(this.queryParams, "systemType", '');
+          this.$set(this.queryParams, "systemType", '4');
           if(this.activeName=='1'){
             ListTodo(this.queryParams).then((response) => {
+              console.log(response)
               response.rows.map(res => {
                 if(res.tableName?res.tableName.indexOf('house')>0:""){
                   res.tableName = '来自农村宅基地管理系统'
@@ -100,6 +107,7 @@
             })
           }else{
             ListDone(this.queryParams).then((response) => {
+              console.log(response)
               response.rows.map(res => {
                 if(res.tableName?res.tableName.indexOf('house')>0:""){
                   res.tableName = '来自农村宅基地管理系统'
@@ -122,7 +130,7 @@
         },
         goDetail(item){
           console.log(item)
-          var type = item.formData.processKey;
+          let type = item.formData.processKey;
           switch (type) {
             case 'baseApply':
             case 'landscope':
@@ -132,6 +140,19 @@
             case 'yinnong_transfer':
               this.$router.push({name:'approvalApproval',query: {id:item.formData.id,taskId:item.taskId,type:item.type}})
               break;
+            case 'yinnong_cash':
+              if(item.formData.cashType == '10'){
+                this.$router.push({name:'approvalApproval10',query: {id:item.formData.id,taskId:item.taskId,type:item.type}})
+                break;
+              }
+              if(item.formData.cashType == '11'){
+                this.$router.push({name:'approvalApproval11',query: {id:item.formData.id,taskId:item.taskId,type:item.type}})
+                break;
+              }
+              if(item.formData.cashType == '12'){
+                this.$router.push({name:'approvalApproval12',query: {id:item.formData.id,taskId:item.taskId,type:item.type}})
+                break;
+              }
           }
         }
       },

From c45b58136cefea9308791ff0d5f9a51308c97dbe Mon Sep 17 00:00:00 2001
From: yujk <990961482@qq.com>
Date: Thu, 14 Oct 2021 10:32:56 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E9=93=B6=E5=86=9C=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../onlineHome/bankAgriculture/paymentApproval.js    |  8 ++++++++
 .../bankAgriculture/paymentApproval/approvalAdd4.vue | 12 +++++++++---
 .../paymentApproval/approvalModify4.vue              | 10 +++++-----
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/api/onlineHome/bankAgriculture/paymentApproval.js b/src/api/onlineHome/bankAgriculture/paymentApproval.js
index b7ed1f2b..9a9c9325 100644
--- a/src/api/onlineHome/bankAgriculture/paymentApproval.js
+++ b/src/api/onlineHome/bankAgriculture/paymentApproval.js
@@ -213,6 +213,14 @@ export function listVaccount(query) {
     params: query
   })
 }
+// 查询村级账户列表
+export function listVaccount1(query) {
+  return request({
+    url: '/yinnong/vaccount/list1',
+    method: 'get',
+    params: query
+  })
+}
 // 查询乡镇账户列表
 export function listTaccount(query) {
   return request({
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd4.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd4.vue
index e33885de..e3e5f291 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd4.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd4.vue
@@ -235,7 +235,12 @@
 
 <script>
   import { addTransfer , listPayee , updateTransfer , getProjectto , listProject , addProjectto , customSubmit , getAccount ,getQmyeFlow} from "@/api/onlineHome/bankAgriculture/paymentApproval";
-  import {attachmentList, commonAttach, listVaccount} from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
+  import {
+    attachmentList,
+    commonAttach,
+    listVaccount,
+    listVaccount1
+  } from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
   import request from '@/utils/request'
   import Dialog from "vant/lib/dialog";
   export default {
@@ -316,9 +321,10 @@
         this.projectFundTypeDictionaries = response.data;
       });
       let params1={
-        villageAccountType:'1'
+        villageAccountType:'1',
+        "params":{townAccountType:'1'}
       }
-      listVaccount(params1).then((response) => {
+      listVaccount1(params1).then((response) => {
         this.payerOptions = response.rows;
         response.rows.map((res,index) => {
           res['payerFrom'] = '1'
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify4.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify4.vue
index 1fbd37b6..1d39045f 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify4.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify4.vue
@@ -243,7 +243,7 @@
   import { getAccount , getTransfer , queryTransferDetail , listPayee , updateTransfer , getProjectto , listProject , addProjectto , customSubmit ,getQmyeFlow} from "@/api/onlineHome/bankAgriculture/paymentApproval";
   import {
     attachmentList,
-    commonAttach,
+    commonAttach, listVaccount, listVaccount1,
     systemAttachment
   } from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
   import request from '@/utils/request';
@@ -326,15 +326,15 @@
         this.projectFundTypeDictionaries = response.data;
       });
       let params1={
-        accountType: "102",
-        status: "N",
+        villageAccountType:'1',
+        "params":{townAccountType:'1'}
       }
-      getAccount(params1).then((response) => {
+      listVaccount1(params1).then((response) => {
         this.payerOptions = response.rows;
         response.rows.map((res,index) => {
           res['payerFrom'] = '1'
           console.log(res)
-          this.payerOptions[index].text = res.accountName;
+          this.payerOptions[index].text = res.payee;
           this.payerOptions[index].value = res.id;
         })
       });

From e43c7e94b902a85cde485778ce2beb6d55316ff1 Mon Sep 17 00:00:00 2001
From: yujk <990961482@qq.com>
Date: Thu, 14 Oct 2021 13:52:20 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E9=93=B6=E5=86=9Capp=20=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/onlineHome/done.js         | 19 +++++++
 src/views/onlineHome/workbench.vue | 80 +++++++++++++++++++++++++++---
 2 files changed, 92 insertions(+), 7 deletions(-)

diff --git a/src/api/onlineHome/done.js b/src/api/onlineHome/done.js
index 86022960..049aec0a 100644
--- a/src/api/onlineHome/done.js
+++ b/src/api/onlineHome/done.js
@@ -17,3 +17,22 @@ export function ListDone(query) {
     params: query,
   })
 }
+
+
+//获取区、镇、村地区
+export function treeselectByUser(query) {
+  return request({
+    url: '/system/dept/treeselectByUser',
+    method: 'get',
+    params: query
+  })
+}
+
+// 切换部门
+export function changeDept(query) {
+  return request({
+    url: '/system/user/changeDept',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/views/onlineHome/workbench.vue b/src/views/onlineHome/workbench.vue
index 71fa692a..042a7304 100644
--- a/src/views/onlineHome/workbench.vue
+++ b/src/views/onlineHome/workbench.vue
@@ -6,7 +6,18 @@
       >
         <template #left>
             <van-icon name="location" color="3A80FB" size="16"/>
-          <p  style="color: #878787;margin-left: 5px">{{deptName}}</p>
+            <p  style="color: #878787;margin-left: 5px" @click="selectDept">{{deptName}}</p>
+          <van-popup v-model="villageVisbile" round position="bottom">
+            <van-cascader
+              v-model="villageValue"
+              title="请选择所在村"
+              :options="hcAreaInfoOption"
+              @close="hcAreaInfoClose"
+              @finish="hcAreaInfoFinish"
+              active-color="#1989fa"
+              :field-names="hcAreaInfoFieldName"
+            />
+          </van-popup>
         </template>
         <template #right>
           <van-icon name="wap-nav" color="#000" size="18"/>
@@ -462,7 +473,8 @@
 <script>
   import onlineHomeIndex from "../onlineHomeIndex";
   import {getInfo} from "../../api/login";
-  import {ListTodo} from "../../api/onlineHome/done";
+  import {changeDept, ListTodo} from "../../api/onlineHome/done";
+  import {treeselectByUser} from "../../api/homestead";
     export default {
       components: {
         onlineHomeIndex
@@ -478,18 +490,72 @@
             pageSize: 100,
           },
           taskList:[],
+          //省市区区级list
+          hcAreaInfoOption: [],
+          //省市区区级显示
+          villageVisbile: false,
+          //选中的值
+          villageValue: "",
+          //选中村相关信息
+          villageDataObj: {
+            deptName: "　　", //村名
+          },
+          hcAreaInfoFieldName: {
+            text: "label",
+            value: "value",
+            children: "children",
+          },
         };
       },
       created() {
-        getInfo().then(response => {
-          console.log(response)
-          this.deptName = response.user.deptName
-        });
+        // getInfo().then(response => {
+        //   console.log(response)
+        //   this.deptName = response.user.deptName
+        // });
+        treeselectByUser().then((res) => {
+          if (res.code == 200) {
+            let content = res.data;
+            this.hcAreaInfoOption = content;
+            if (
+              this.deptName == "" ||
+              this.deptName == undefined
+            ) {
+              this.deptName = this.$store.state.user.deptName;
+            } else {
+              this.deptName = this.$store.state.user.allDeptName;
+            }
+          }
+        }),
         ListTodo(this.queryParams).then((response) => {
           this.taskList = response.rows
         })
       },
-
+      methods:{
+        villageVisbileFun() {
+          this.villageVisbile = true;
+        },
+        selectDept(){
+          this.villageVisbile = true;
+        },
+        //关闭选择地址弹窗
+        hcAreaInfoClose() {
+          this.villageVisbile = false;
+        },
+        hcAreaInfoFinish({ value, selectedOptions, tabIndex }) {
+          // 切换部门
+          let Depquery={"loginDeptID":value}
+            changeDept(Depquery).then((response) => {
+              console.log(response)
+              if (response.code === 200) {
+                this.$store.dispatch("GetInfo").then(() => {
+                  // this.$router.go(0);
+                  window.location.href = "/onlineHome/workbench";
+                });
+              }
+            });
+          this.villageVisbile = false;
+        },
+      }
     }
 </script>
 

From 1100a06fdf4e596b7b60c8bc3a61f7fc365a4805 Mon Sep 17 00:00:00 2001
From: yujk <990961482@qq.com>
Date: Thu, 14 Oct 2021 14:01:32 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E9=93=B6=E5=86=9Capp=20=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/onlineHome/workbench.vue | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/src/views/onlineHome/workbench.vue b/src/views/onlineHome/workbench.vue
index 042a7304..027c62c9 100644
--- a/src/views/onlineHome/workbench.vue
+++ b/src/views/onlineHome/workbench.vue
@@ -484,7 +484,7 @@
         return {
           list1: [],
           images:['../../../static/images/onlineHome/tab.jpg'],
-          deptName:"",
+          deptName:this.$store.state.user.deptName,
           queryParams: {
             pageNum: 1,
             pageSize: 100,
@@ -508,22 +508,10 @@
         };
       },
       created() {
-        // getInfo().then(response => {
-        //   console.log(response)
-        //   this.deptName = response.user.deptName
-        // });
         treeselectByUser().then((res) => {
           if (res.code == 200) {
             let content = res.data;
             this.hcAreaInfoOption = content;
-            if (
-              this.deptName == "" ||
-              this.deptName == undefined
-            ) {
-              this.deptName = this.$store.state.user.deptName;
-            } else {
-              this.deptName = this.$store.state.user.allDeptName;
-            }
           }
         }),
         ListTodo(this.queryParams).then((response) => {
@@ -531,9 +519,6 @@
         })
       },
       methods:{
-        villageVisbileFun() {
-          this.villageVisbile = true;
-        },
         selectDept(){
           this.villageVisbile = true;
         },

From 534cc30dd2244d585a171b76b694906ed6692326 Mon Sep 17 00:00:00 2001
From: yujk <990961482@qq.com>
Date: Fri, 15 Oct 2021 10:02:15 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E9=93=B6=E5=86=9Capp=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=85=AC=E7=A4=BA=E5=85=AC=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/onlineHome/publicity.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/onlineHome/publicity.vue b/src/views/onlineHome/publicity.vue
index 3e6ae232..df920468 100644
--- a/src/views/onlineHome/publicity.vue
+++ b/src/views/onlineHome/publicity.vue
@@ -18,7 +18,7 @@
             <p style="display:inline-block;background: #EC4B2C;height:20px;width: 20px;border-radius: 2px;margin-right: 10px;float: left"></p><p style="font-weight: bold;font-size: 18px;">{{item}}</p>
           </template>
           <template #label>
-            <p style="font-size: 16px">内容</p>
+            <p style="font-size: 16px"></p>
           </template>
         </van-cell>
       </van-list>
@@ -45,15 +45,15 @@
           // 异步更新数据
           // setTimeout 仅做示例，真实场景中一般为 ajax 请求
           setTimeout(() => {
-            for (let i = 0; i < 10; i++) {
-              this.list.push(this.list.length + 1+"标题");
+            for (let i = 0; i < 1; i++) {
+              this.list.push("暂无公示公告");
             }
 
             // 加载状态结束
             this.loading = false;
 
             // 数据全部加载完成
-            if (this.list.length >= 40) {
+            if (this.list.length >= 1) {
               this.finished = true;
             }
           }, 1000);

From a12e2c8380fefcba83b2b0c0f118a3269aad18d3 Mon Sep 17 00:00:00 2001
From: yujk <990961482@qq.com>
Date: Fri, 15 Oct 2021 18:05:31 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E9=93=B6=E5=86=9Capp=20=E5=B1=8F=E8=94=BD?=
 =?UTF-8?q?=E5=85=B6=E4=BB=96=E7=B3=BB=E7=BB=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/onlineHome/workbench.vue | 36 +++++++++++++++---------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/views/onlineHome/workbench.vue b/src/views/onlineHome/workbench.vue
index 027c62c9..e9c82f34 100644
--- a/src/views/onlineHome/workbench.vue
+++ b/src/views/onlineHome/workbench.vue
@@ -42,7 +42,7 @@
           </template>
         </van-cell>
       </van-row>
-      <van-row style="margin:2%;width:96%;padding:20px 0;border-radius: 6px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);background: #fff">
+      <!--<van-row style="margin:2%;width:96%;padding:20px 0;border-radius: 6px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);background: #fff">
         <van-cell style="border-radius: 6px;">
           <template #title>
             <p style="display:inline-block;background: #FFA63E;height:20px;width: 20px;border-radius: 2px;margin-right: 10px;float: left"></p>
@@ -254,8 +254,8 @@
             <p style="margin-top: 5px;color: #666666;">盘活利用</p>
           </van-grid-item>
         </van-grid>
-      </van-row>
-      <van-row  style="margin:2%;width:96%;padding:20px 0;padding:20px 0;border-radius: 6px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);background: #fff">
+      </van-row>-->
+     <!-- <van-row  style="margin:2%;width:96%;padding:20px 0;padding:20px 0;border-radius: 6px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);background: #fff">
         <van-cell style="border-radius: 6px;">
           <template #title>
             <p style="font-weight: bold;font-size: 18px;display: inline-block">农村产权制度改革管理</p>
@@ -293,7 +293,7 @@
             <p style="margin-top: 5px;color: #666666;">股权管理</p>
           </van-grid-item>
         </van-grid>
-      </van-row>
+      </van-row>-->
       <van-row  style="margin:2%;width:96%;padding:20px 0;padding:20px 0;border-radius: 6px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);background: #fff">
         <van-cell style="border-radius: 6px;">
           <template #title>
@@ -349,21 +349,21 @@
             </div>
             <p style="margin-top: 5px;color: #666666;">汇票支出</p>
           </van-grid-item>
-          <van-grid-item text="收款账户" :to="{name:'collectionList'}" >
-            <div slot="default" style="background:#7dda4f;padding: 10px;text-align:center;border-radius: 10px;box-sizing: border-box;width: 44px;height: 44px" >
-              <img src="../../../static/images/onlineHome/yinnongIcon5.png" style="width: 25px;" alt />
-            </div>
-            <p style="margin-top: 5px;color: #666666;">收款账户</p>
-          </van-grid-item>
-          <van-grid-item text="付款账户" :to="{name:'paymentAccountList'}" >
-            <div slot="default" style="background:#FF4646;padding: 10px;text-align:center;border-radius: 10px;box-sizing: border-box;width: 44px;height: 44px" >
-              <img src="../../../static/images/onlineHome/yinnongIcon2.png" style="width: 25px;" alt />
-            </div>
-            <p style="margin-top: 5px;color: #666666;">付款账户</p>
-          </van-grid-item>
+<!--          <van-grid-item text="收款账户" :to="{name:'collectionList'}" >-->
+<!--            <div slot="default" style="background:#7dda4f;padding: 10px;text-align:center;border-radius: 10px;box-sizing: border-box;width: 44px;height: 44px" >-->
+<!--              <img src="../../../static/images/onlineHome/yinnongIcon5.png" style="width: 25px;" alt />-->
+<!--            </div>-->
+<!--            <p style="margin-top: 5px;color: #666666;">收款账户</p>-->
+<!--          </van-grid-item>-->
+<!--          <van-grid-item text="付款账户" :to="{name:'paymentAccountList'}" >-->
+<!--            <div slot="default" style="background:#FF4646;padding: 10px;text-align:center;border-radius: 10px;box-sizing: border-box;width: 44px;height: 44px" >-->
+<!--              <img src="../../../static/images/onlineHome/yinnongIcon2.png" style="width: 25px;" alt />-->
+<!--            </div>-->
+<!--            <p style="margin-top: 5px;color: #666666;">付款账户</p>-->
+<!--          </van-grid-item>-->
         </van-grid>
       </van-row>
-      <van-row  style="margin:2%;width:96%;padding:20px 0;padding:20px 0;border-radius: 6px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);background: #fff">
+      <!--<van-row  style="margin:2%;width:96%;padding:20px 0;padding:20px 0;border-radius: 6px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);background: #fff">
         <van-cell style="border-radius: 6px;">
           <template #title>
             <p style="font-weight: bold;font-size: 18px;display: inline-block">农村宅基地审批管理</p>
@@ -465,7 +465,7 @@
             <p style="margin-top: 5px;color: #666666;">违法监管</p>
           </van-grid-item>
         </van-grid>
-      </van-row>
+      </van-row>-->
       <onlineHomeIndex></onlineHomeIndex>
     </div>
 </template>