diff --git a/src/router/index.js b/src/router/index.js index bad1cca9..4e344a0a 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1090,7 +1090,7 @@ export const constantRoutes = [ // path: '/onlineHome/approvalList2', // name: 'approvalList2', // meta: { - // title: '信用卡转账列表', + // title: '公务卡转账列表', // hidden: true, // }, // component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalList2'], resolve) @@ -1162,7 +1162,7 @@ export const constantRoutes = [ // path: '/onlineHome/approvalDetail2', // name: 'approvalDetail2', // meta: { - // title: '银农信用卡转账申请', + // title: '银农公务卡转账申请', // hidden: true, // }, // component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail2'], resolve) @@ -1234,7 +1234,7 @@ export const constantRoutes = [ // path: '/onlineHome/approvalAdd2', // name: 'approvalAdd2', // meta: { - // title: '添加信用卡转账申请', + // title: '添加公务卡转账申请', // hidden: true, // }, // component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd2'], resolve) @@ -1342,7 +1342,7 @@ export const constantRoutes = [ // path: '/onlineHome/approvalModify2', // name: 'approvalModify2', // meta: { - // title: '修改信用卡转账申请', + // title: '修改公务卡转账申请', // hidden: true, // }, // component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalModify2'], resolve) @@ -1730,7 +1730,7 @@ export const constantRoutes = [ path: '/yinnong/approvalDetail2', name: 'approvalDetail2', meta: { - title: '银农信用卡转账申请', + title: '银农公务卡转账申请', hidden: true, }, component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalDetail2'], resolve) @@ -1802,7 +1802,7 @@ export const constantRoutes = [ path: '/yinnong/approvalAdd2', name: 'approvalAdd2', meta: { - title: '添加信用卡转账申请', + title: '添加公务卡转账申请', hidden: true, }, component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalAdd2'], resolve) @@ -1910,7 +1910,7 @@ export const constantRoutes = [ path: '/yinnong/approvalModify2', name: 'approvalModify2', meta: { - title: '修改信用卡转账申请', + title: '修改公务卡转账申请', hidden: true, }, component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalModify2'], resolve) @@ -1991,7 +1991,7 @@ export const constantRoutes = [ path: '/yinnong/collectionList', name: 'collectionList', meta: { - title: '银农支付收款账户', + title: '银农收款账户列表', hidden: true, }, component: (resolve) => require(['@/views/yinnong/bankAgriculture/collectionAccount/collectionList'], resolve) @@ -2000,7 +2000,7 @@ export const constantRoutes = [ path: '/yinnong/collectionAdd', name: 'collectionAdd', meta: { - title: '添加支付收款账户', + title: '添加收款账户信息', hidden: true, }, component: (resolve) => require(['@/views/yinnong/bankAgriculture/collectionAccount/collectionAdd'], resolve) @@ -2009,7 +2009,7 @@ export const constantRoutes = [ path: '/yinnong/collectionModify', name: 'collectionModify', meta: { - title: '修改支付收款账户', + title: '修改收款账户信息', hidden: true, }, component: (resolve) => require(['@/views/yinnong/bankAgriculture/collectionAccount/collectionModify'], resolve) @@ -2018,7 +2018,7 @@ export const constantRoutes = [ path: '/yinnong/collectionDetail', name: 'collectionDetail', meta: { - title: '查看支付收款账户', + title: '查看收款账户详情', hidden: true, }, component: (resolve) => require(['@/views/yinnong/bankAgriculture/collectionAccount/collectionDetail'], resolve) @@ -2027,7 +2027,7 @@ export const constantRoutes = [ path: '/yinnong/paymentAccountList', name: 'paymentAccountList', meta: { - title: '查看支付收款账户', + title: '查看付款账户列表', hidden: true, }, component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentAccount/paymentAccountList'], resolve) @@ -2036,7 +2036,7 @@ export const constantRoutes = [ path: '/yinnong/paymentAccountAdd', name: 'paymentAccountAdd', meta: { - title: '添加出纳账户设置', + title: '添加付款账户信息', hidden: true, }, component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentAccount/paymentAccountAdd'], resolve) @@ -2045,7 +2045,7 @@ export const constantRoutes = [ path: '/yinnong/paymentAccountModify', name: 'paymentAccountModify', meta: { - title: '修改出纳账户设置', + title: '修改付款账户信息', hidden: true, }, component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentAccount/paymentAccountModify'], resolve) @@ -2054,7 +2054,7 @@ export const constantRoutes = [ path: '/yinnong/paymentAccountDetail', name: 'paymentAccountDetail', meta: { - title: '付款账户详情', + title: '查看付款账户详情', hidden: true, }, component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentAccount/paymentAccountDetail'], resolve) @@ -2374,6 +2374,7 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/homesteadSurvey/settle'], resolve) }, + ]; diff --git a/src/views/onlineHome/workbench.vue b/src/views/onlineHome/workbench.vue index cb117b17..88eb7e46 100644 --- a/src/views/onlineHome/workbench.vue +++ b/src/views/onlineHome/workbench.vue @@ -19,20 +19,20 @@ /> - + + + + + + + + + + + + + + @@ -53,7 +53,6 @@ - - - - - - - -
- -
-

村户转账

-
- -
- -
-

代管转账

-
- -
- -
-

公务卡转账

-
- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - -
- -
-

母子转账

-
- --> - -
- -
-

现金提现

-
- -
- -
-

现金使用

-
- -
- -
-

汇票支出

-
- -
- -
-

收款账户

-
- -
- -
-

付款账户

-
-
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval.vue index af1f083b..039d2bab 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval.vue @@ -164,17 +164,7 @@ }; }, 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}); - } - }); + console.log(this.$store.state.user); 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}); diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail10.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail10.vue index af478032..dc8ae838 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail10.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail10.vue @@ -155,7 +155,7 @@ }, methods: { goFlow(){ - window.location='approvalProcess2?id='+this.$route.query.id; + window.location='approvalProcess?id='+this.$route.query.id; }, getDictionaries(){ getCash(this.$route.query.id).then((response) => { diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail11.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail11.vue index 8c0479b0..71a3083e 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail11.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail11.vue @@ -155,7 +155,7 @@ }, methods: { goFlow(){ - window.location='approvalProcess2?id='+this.$route.query.id; + window.location='approvalProcess?id='+this.$route.query.id; }, getDictionaries(){ getCash(this.$route.query.id).then((response) => { diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail12.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail12.vue index 4e940b84..bc158504 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail12.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail12.vue @@ -212,7 +212,7 @@ }, methods: { goFlow(){ - window.location='approvalProcess2?id='+this.$route.query.id; + window.location='approvalProcess?id='+this.$route.query.id; }, getDictionaries(){ getCash(this.$route.query.id).then((response) => { diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalProcess.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalProcess.vue index fdccd4ba..2b759f33 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalProcess.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalProcess.vue @@ -80,40 +80,6 @@ - - -

-

-

-
- -

待支付

-

支付成功

-

支付异常

- - -

支付时间:{{processList.支付时间}}

-
-
-
-
- - -

-

-

-
- -

未入账

-

入账成功

-

入账异常

- - -

入账时间:{{processList.入账时间}}

-
-
-
-
@@ -151,6 +117,7 @@ export default { handleUpdate(id) { getTransfer(id).then((response) => { this.form = response.data; + console.log(this.form) this.processList = {} this.getTransferProcess(this.$route.query.id); if(this.form.capitalExpenditureType==2){ diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalProcess2.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalProcess2.vue index 359da375..73cc77d4 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalProcess2.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalProcess2.vue @@ -80,40 +80,6 @@ - - -

-

-

-
- -

待支付

-

支付成功

-

支付异常

- - -

支付时间:{{processList.支付时间}}

-
-
-
-
- - -

-

-

-
- -

未入账

-

入账成功

-

入账异常

- - -

入账时间:{{processList.入账时间}}

-
-
-
-
@@ -144,7 +110,7 @@ export default { methods: { //查询审批进程 getTransferProcess1(id){ - getTransferProcess1(id).then(res => { + getTransferProcess(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"):""