diff --git a/src/permission.js b/src/permission.js index 8b9f0733..c07c4cdf 100644 --- a/src/permission.js +++ b/src/permission.js @@ -61,6 +61,7 @@ const whiteList = [ '/lawEnforcement/waitingProcessing', '/lawEnforcement/complaintAdd', '/homesteadLogin', + '/yinnongLogin', '/lawEnforcement/userRegister', '/lawEnforcement/companyRegister', @@ -97,7 +98,9 @@ router.beforeEach((to, from, next) => { next({ path: '/homestead/login' }) } else if (to.path.indexOf('/onlineHome') !== -1) { next(`/onlineHomeLogin`) - } else if (to.path.indexOf('/homesteadSurvey') !== -1) { + } else if (to.path.indexOf('/yinnong') !== -1) { + next(`/yinnongLogin`) + }else if (to.path.indexOf('/homesteadSurvey') !== -1) { next(`/homesteadLogin`) }else if (to.path.indexOf('/lawEnforcement') !== -1) { next(`//lawEnforcement/login`) @@ -123,6 +126,8 @@ router.beforeEach((to, from, next) => { next(`/homestead/login?redirect=${to.fullPath}`) } else if (to.path.indexOf('/onlineHome') !== -1) { next(`/onlineHomeLogin`) + }else if (to.path.indexOf('/yinnong') !== -1) { + next(`/yinnongLogin`) } else if (to.path.indexOf('/homesteadSurvey') !== -1) { next(`/homesteadLogin`) }else if (to.path.indexOf('/lawEnforcement') !== -1) { diff --git a/src/router/index.js b/src/router/index.js index f89c8f54..8cf0a437 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -382,6 +382,60 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/authenticRight/login'], resolve) }, + { + path: '/yinnongLogin', + name: 'yinnongLogin', + meta: { + title: '登录页', + hidden: true, + }, + component: (resolve) => require(['@/views/yinnongLogin'], resolve) + }, + { + path: '/yinnongIndex', + name: 'yinnongIndex', + meta: { + title: '银农', + hidden: true, + }, + component: (resolve) => require(['@/views/yinnongIndex'], resolve) + }, + { + path: '/yinnong/publicity', + name: 'yinnongPublicity', + meta: { + title: '公示', + hidden: true, + }, + component: (resolve) => require(['@/views/yinnong/publicity'], resolve) + }, + { + path: '/yinnong/workbench', + name: 'yinnongWorkbench', + meta: { + title: '公示', + hidden: true, + }, + component: (resolve) => require(['@/views/yinnong/workbench'], resolve) + }, + { + path: '/yinnong/home', + name: 'yinnongHome', + meta: { + title: '公示', + hidden: true, + }, + component: (resolve) => require(['@/views/yinnong/home'], resolve) + }, + { + path: '/yinnong/my', + name: 'yinnongMy', + meta: { + title: '公示', + hidden: true, + }, + component: (resolve) => require(['@/views/yinnong/my'], resolve) + }, { path: '/onlineHomeLogin', name: 'onlineHomeLogin', @@ -413,7 +467,7 @@ export const constantRoutes = [ path: '/onlineHome/workbench', name: 'onlineHomeWorkbench', meta: { - title: '公示', + title: '工作台', hidden: true, }, component: (resolve) => require(['@/views/onlineHome/workbench'], resolve) @@ -1023,437 +1077,1005 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/onlineHome/homestead/homeApproval/approvalForm'], resolve) }, + // { + // path: '/onlineHome/approvalList', + // name: 'approvalList', + // meta: { + // title: '常用转账列表', + // hidden: true, + // }, + // component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalList'], resolve) + // }, + // { + // path: '/onlineHome/approvalList2', + // name: 'approvalList2', + // meta: { + // title: '信用卡转账列表', + // hidden: true, + // }, + // component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalList2'], resolve) + // }, + // { + // path: '/onlineHome/approvalList3', + // name: 'approvalList3', + // meta: { + // title: '虚拟挂账列表', + // hidden: true, + // }, + // component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalList3'], resolve) + // }, + // { + // path: '/onlineHome/approvalList4', + // name: 'approvalList4', + // meta: { + // title: '虚拟转账列表', + // hidden: true, + // }, + // component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalList4'], resolve) + // }, + // { + // path: '/onlineHome/approvalList5', + // name: 'approvalList5', + // meta: { + // title: '母子转账列表', + // hidden: true, + // }, + // component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalList5'], resolve) + // }, + // { + // path: '/onlineHome/approvalList10', + // name: 'approvalList10', + // meta: { + // title: '现金提现列表', + // hidden: true, + // }, + // component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalList10'], resolve) + // }, + // { + // path: '/onlineHome/approvalList11', + // name: 'approvalList11', + // meta: { + // title: '现金使用列表', + // hidden: true, + // }, + // component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalList11'], resolve) + // }, + // { + // path: '/onlineHome/approvalList12', + // name: 'approvalList12', + // meta: { + // title: '汇票支出列表', + // hidden: true, + // }, + // component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalList12'], resolve) + // }, + // { + // path: '/onlineHome/approvalDetail', + // name: 'approvalDetail', + // meta: { + // title: '银农常用转账申请', + // hidden: true, + // }, + // component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail'], resolve) + // }, + // { + // 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: '添加常用转账申请', + // hidden: true, + // }, + // component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd'], resolve) + // }, + // { + // path: '/onlineHome/approvalAdd2', + // name: 'approvalAdd2', + // meta: { + // title: '添加信用卡转账申请', + // hidden: true, + // }, + // component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd2'], resolve) + // }, + // { + // path: '/onlineHome/approvalAdd3', + // name: 'approvalAdd3', + // meta: { + // title: '添加虚拟挂账申请', + // hidden: true, + // }, + // component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd3'], resolve) + // }, + // { + // path: '/onlineHome/approvalAdd4', + // name: 'approvalAdd4', + // meta: { + // title: '添加虚拟转账申请', + // hidden: true, + // }, + // component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd4'], resolve) + // }, + // { + // path: '/onlineHome/approvalAdd5', + // name: 'approvalAdd5', + // meta: { + // title: '添加母子转账申请', + // hidden: true, + // }, + // component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd5'], resolve) + // }, + // { + // path: '/onlineHome/approvalAdd10', + // name: 'approvalAdd10', + // meta: { + // title: '添加现金提现申请', + // hidden: true, + // }, + // component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd10'], resolve) + // }, + // { + // path: '/onlineHome/approvalAdd11', + // name: 'approvalAdd11', + // meta: { + // title: '添加现金使用申请', + // hidden: true, + // }, + // component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd11'], resolve) + // }, + // { + // path: '/onlineHome/approvalAdd12', + // name: 'approvalAdd12', + // meta: { + // title: '添加汇票支出申请', + // hidden: true, + // }, + // component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd12'], resolve) + // }, + // { + // path: '/onlineHome/approvalApproval', + // name: 'approvalApproval', + // meta: { + // title: '付款审批', + // hidden: true, + // }, + // 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: '修改常用转账申请', + // hidden: true, + // }, + // component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalModify'], resolve) + // }, + // { + // 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: '付款申请流程', + // hidden: true, + // }, + // 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', + // meta: { + // title: '银农支付收款账户', + // hidden: true, + // }, + // component: (resolve) => require(['@/views/onlineHome/bankAgriculture/collectionAccount/collectionList'], resolve) + // }, + // { + // path: '/onlineHome/collectionAdd', + // name: 'collectionAdd', + // meta: { + // title: '添加支付收款账户', + // hidden: true, + // }, + // component: (resolve) => require(['@/views/onlineHome/bankAgriculture/collectionAccount/collectionAdd'], resolve) + // }, + // { + // path: '/onlineHome/collectionModify', + // name: 'collectionModify', + // meta: { + // title: '修改支付收款账户', + // hidden: true, + // }, + // component: (resolve) => require(['@/views/onlineHome/bankAgriculture/collectionAccount/collectionModify'], resolve) + // }, + // { + // path: '/onlineHome/collectionDetail', + // name: 'collectionDetail', + // meta: { + // title: '查看支付收款账户', + // hidden: true, + // }, + // component: (resolve) => require(['@/views/onlineHome/bankAgriculture/collectionAccount/collectionDetail'], resolve) + // }, + // { + // path: '/onlineHome/paymentAccountList', + // name: 'paymentAccountList', + // meta: { + // title: '查看支付收款账户', + // hidden: true, + // }, + // component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentAccount/paymentAccountList'], resolve) + // }, + // { + // path: '/onlineHome/paymentAccountAdd', + // name: 'paymentAccountAdd', + // meta: { + // title: '添加出纳账户设置', + // hidden: true, + // }, + // component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentAccount/paymentAccountAdd'], resolve) + // }, + // { + // path: '/onlineHome/paymentAccountModify', + // name: 'paymentAccountModify', + // meta: { + // title: '修改出纳账户设置', + // hidden: true, + // }, + // component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentAccount/paymentAccountModify'], resolve) + // }, + // { + // path: '/onlineHome/paymentAccountDetail', + // name: 'paymentAccountDetail', + // meta: { + // title: '付款账户详情', + // hidden: true, + // }, + // component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentAccount/paymentAccountDetail'], resolve) + // }, + // { + // path: '/onlineHome/villagePortrait', + // name: 'villagePortrait', + // meta: { + // title: '村画像', + // hidden: true, + // }, + // component: (resolve) => require(['@/views/onlineHome/villagePortrait'], resolve) + // }, + // { + // path: '/onlineHome/farmerPortrait', + // name: 'farmerPortrait', + // meta: { + // title: '村民信息', + // hidden: true, + // }, + // component: (resolve) => require(['@/views/onlineHome/farmerPortrait'], resolve) + // }, + { + path: '/yinnong/threeAffairs', + name: 'yinnongThreeAffairs', + meta: { + title: '三务公开', + hidden: true, + }, + component: (resolve) => require(['@/views/onlineHome/threeAffairs'], resolve) + }, + { + path: '/yinnong/threeAffairsDetail', + name: 'yinnongThreeAffairsDetail', + meta: { + title: '三务公开详情', + hidden: true, + }, + component: (resolve) => require(['@/views/yinnong/threeAffairsDetail'], resolve) + }, + { + path: '/yinnong/villageAffairsDetail', + name: 'yinnongVillageAffairsDetail', + meta: { + title: '村规民约详情', + hidden: true, + }, + component: (resolve) => require(['@/views/yinnong/villageAffairsDetail'], resolve) + }, + { + path: '/yinnong/zcfg', + name: 'yinnongzcfg', + meta: { + title: '政策法规', + hidden: true, + }, + component: (resolve) => require(['@/views/yinnong/zcfg'], resolve) + }, + { + path: '/yinnong/hnzc', + name: 'yinnonghnzc', + meta: { + title: '惠农政策', + hidden: true, + }, + component: (resolve) => require(['@/views/yinnong/hnzc'], resolve) + }, + { + path: '/yinnong/gzdt', + name: 'yinnonggzdt', + meta: { + title: '工作动态', + hidden: true, + }, + component: (resolve) => require(['@/views/yinnong/gzdt'], resolve) + }, + { + path: '/yinnong/zdjs', + name: 'yinnongzdjs', + meta: { + title: '制度建设', + hidden: true, + }, + component: (resolve) => require(['@/views/yinnong/zdjs'], resolve) + }, + { + path: '/yinnong/homePoll', + name: 'yinnongHomePoll', + meta: { + title: '投票', + hidden: true, + }, + component: (resolve) => require(['@/views/yinnong/homePoll'], resolve) + }, + { + path: '/yinnong/homePollDetail', + name: 'yinnongPollDetail', + meta: { + title: '投票详情', + hidden: true, + }, + component: (resolve) => require(['@/views/yinnong/homePollDetail'], resolve) + }, + { + path: '/yinnong/mailList', + name: 'yinnongMailList', + meta: { + title: '通讯录', + hidden: true, + }, + component: (resolve) => require(['@/views/yinnong/mailList'], resolve) + } + , + { + path: '/yinnong/password', + name: 'yinnongPassword', + meta: { + title: '密码修改', + hidden: true, + }, + component: (resolve) => require(['@/views/yinnong/password'], resolve) + }, + { + path: '/yinnong/livePay', + name: 'yinnongLivePay', + meta: { + title: '生活缴费', + hidden: true, + }, + component: (resolve) => require(['@/views/yinnong/livePay'], resolve) + }, + { + path: '/yinnong/personalPicture', + name: 'yinnongPersonalPicture', + meta: { + title: '画像', + hidden: true, + }, + component: (resolve) => require(['@/views/yinnong/personalPicture'], resolve) + }, + { + path: '/yinnong/done', + name: 'yinnongDone', + meta: { + title: '我的已办', + hidden: true, + }, + component: (resolve) => require(['@/views/yinnong/done'], resolve) + }, + { + path: '/yinnong/advice', + name: 'yinnongAdvice', + meta: { + title: '投诉建议', + hidden: true, + }, + component: (resolve) => require(['@/views/yinnong/advice'], resolve) + }, { - path: '/onlineHome/approvalList', + path: '/yinnong/approvalList', name: 'approvalList', meta: { title: '常用转账列表', hidden: true, }, - component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalList'], resolve) + component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalList'], resolve) }, { - path: '/onlineHome/approvalList2', + path: '/yinnong/approvalList2', name: 'approvalList2', meta: { title: '信用卡转账列表', hidden: true, }, - component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalList2'], resolve) + component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalList2'], resolve) }, { - path: '/onlineHome/approvalList3', + path: '/yinnong/approvalList3', name: 'approvalList3', meta: { title: '虚拟挂账列表', hidden: true, }, - component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalList3'], resolve) + component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalList3'], resolve) }, { - path: '/onlineHome/approvalList4', + path: '/yinnong/approvalList4', name: 'approvalList4', meta: { title: '虚拟转账列表', hidden: true, }, - component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalList4'], resolve) + component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalList4'], resolve) }, { - path: '/onlineHome/approvalList5', + path: '/yinnong/approvalList5', name: 'approvalList5', meta: { title: '母子转账列表', hidden: true, }, - component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalList5'], resolve) + component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalList5'], resolve) }, { - path: '/onlineHome/approvalList10', + path: '/yinnong/approvalList10', name: 'approvalList10', meta: { title: '现金提现列表', hidden: true, }, - component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalList10'], resolve) + component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalList10'], resolve) }, { - path: '/onlineHome/approvalList11', + path: '/yinnong/approvalList11', name: 'approvalList11', meta: { title: '现金使用列表', hidden: true, }, - component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalList11'], resolve) + component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalList11'], resolve) }, { - path: '/onlineHome/approvalList12', + path: '/yinnong/approvalList12', name: 'approvalList12', meta: { title: '汇票支出列表', hidden: true, }, - component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalList12'], resolve) + component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalList12'], resolve) }, { - path: '/onlineHome/approvalDetail', + path: '/yinnong/approvalDetail', name: 'approvalDetail', meta: { title: '银农常用转账申请', hidden: true, }, - component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail'], resolve) + component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalDetail'], resolve) }, { - path: '/onlineHome/approvalDetail2', + path: '/yinnong/approvalDetail2', name: 'approvalDetail2', meta: { title: '银农信用卡转账申请', hidden: true, }, - component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail2'], resolve) + component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalDetail2'], resolve) }, { - path: '/onlineHome/approvalDetail3', + path: '/yinnong/approvalDetail3', name: 'approvalDetail3', meta: { title: '银农虚拟挂账申请', hidden: true, }, - component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail3'], resolve) + component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalDetail3'], resolve) }, { - path: '/onlineHome/approvalDetail4', + path: '/yinnong/approvalDetail4', name: 'approvalDetail4', meta: { title: '银农虚拟转账申请', hidden: true, }, - component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail4'], resolve) + component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalDetail4'], resolve) }, { - path: '/onlineHome/approvalDetail5', + path: '/yinnong/approvalDetail5', name: 'approvalDetail5', meta: { title: '银农母子转账申请', hidden: true, }, - component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail5'], resolve) + component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalDetail5'], resolve) }, { - path: '/onlineHome/approvalDetail10', + path: '/yinnong/approvalDetail10', name: 'approvalDetail10', meta: { title: '银农现金提现申请', hidden: true, }, - component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail10'], resolve) + component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalDetail10'], resolve) }, { - path: '/onlineHome/approvalDetail11', + path: '/yinnong/approvalDetail11', name: 'approvalDetail11', meta: { title: '银农现金使用申请', hidden: true, }, - component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail11'], resolve) + component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalDetail11'], resolve) }, { - path: '/onlineHome/approvalDetail12', + path: '/yinnong/approvalDetail12', name: 'approvalDetail12', meta: { title: '银农汇票支出申请', hidden: true, }, - component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail12'], resolve) + component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalDetail12'], resolve) }, { - path: '/onlineHome/approvalAdd', + path: '/yinnong/approvalAdd', name: 'approvalAdd', meta: { title: '添加常用转账申请', hidden: true, }, - component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd'], resolve) + component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalAdd'], resolve) }, { - path: '/onlineHome/approvalAdd2', + path: '/yinnong/approvalAdd2', name: 'approvalAdd2', meta: { title: '添加信用卡转账申请', hidden: true, }, - component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd2'], resolve) + component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalAdd2'], resolve) }, { - path: '/onlineHome/approvalAdd3', + path: '/yinnong/approvalAdd3', name: 'approvalAdd3', meta: { title: '添加虚拟挂账申请', hidden: true, }, - component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd3'], resolve) + component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalAdd3'], resolve) }, { - path: '/onlineHome/approvalAdd4', + path: '/yinnong/approvalAdd4', name: 'approvalAdd4', meta: { title: '添加虚拟转账申请', hidden: true, }, - component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd4'], resolve) + component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalAdd4'], resolve) }, { - path: '/onlineHome/approvalAdd5', + path: '/yinnong/approvalAdd5', name: 'approvalAdd5', meta: { title: '添加母子转账申请', hidden: true, }, - component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd5'], resolve) + component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalAdd5'], resolve) }, { - path: '/onlineHome/approvalAdd10', + path: '/yinnong/approvalAdd10', name: 'approvalAdd10', meta: { title: '添加现金提现申请', hidden: true, }, - component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd10'], resolve) + component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalAdd10'], resolve) }, { - path: '/onlineHome/approvalAdd11', + path: '/yinnong/approvalAdd11', name: 'approvalAdd11', meta: { title: '添加现金使用申请', hidden: true, }, - component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd11'], resolve) + component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalAdd11'], resolve) }, { - path: '/onlineHome/approvalAdd12', + path: '/yinnong/approvalAdd12', name: 'approvalAdd12', meta: { title: '添加汇票支出申请', hidden: true, }, - component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd12'], resolve) + component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalAdd12'], resolve) }, { - path: '/onlineHome/approvalApproval', + path: '/yinnong/approvalApproval', name: 'approvalApproval', meta: { title: '付款审批', hidden: true, }, - component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalApproval'], resolve) + component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalApproval'], resolve) }, { - path: '/onlineHome/approvalApproval10', + path: '/yinnong/approvalApproval10', name: 'approvalApproval10', meta: { title: '付款审批', hidden: true, }, - component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalApproval10'], resolve) + component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalApproval10'], resolve) },{ - path: '/onlineHome/approvalApproval11', + path: '/yinnong/approvalApproval11', name: 'approvalApproval11', meta: { title: '付款审批', hidden: true, }, - component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalApproval11'], resolve) + component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalApproval11'], resolve) }, { - path: '/onlineHome/approvalApproval12', + path: '/yinnong/approvalApproval12', name: 'approvalApproval12', meta: { title: '付款审批', hidden: true, }, - component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalApproval12'], resolve) + component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalApproval12'], resolve) }, { - path: '/onlineHome/approvalModify', + path: '/yinnong/approvalModify', name: 'approvalModify', meta: { title: '修改常用转账申请', hidden: true, }, - component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalModify'], resolve) + component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalModify'], resolve) }, { - path: '/onlineHome/approvalModify2', + path: '/yinnong/approvalModify2', name: 'approvalModify2', meta: { title: '修改信用卡转账申请', hidden: true, }, - component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalModify2'], resolve) + component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalModify2'], resolve) }, { - path: '/onlineHome/approvalModify3', + path: '/yinnong/approvalModify3', name: 'approvalModify3', meta: { title: '修改虚拟挂账申请', hidden: true, }, - component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalModify3'], resolve) + component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalModify3'], resolve) }, { - path: '/onlineHome/approvalModify4', + path: '/yinnong/approvalModify4', name: 'approvalModify4', meta: { title: '修改虚拟转账申请', hidden: true, }, - component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalModify4'], resolve) + component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalModify4'], resolve) }, { - path: '/onlineHome/approvalModify5', + path: '/yinnong/approvalModify5', name: 'approvalModify5', meta: { title: '修改母子转账申请', hidden: true, }, - component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalModify5'], resolve) + component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalModify5'], resolve) }, { - path: '/onlineHome/approvalModify10', + path: '/yinnong/approvalModify10', name: 'approvalModify10', meta: { title: '修改现金提现申请', hidden: true, }, - component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalModify10'], resolve) + component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalModify10'], resolve) }, { - path: '/onlineHome/approvalModify11', + path: '/yinnong/approvalModify11', name: 'approvalModify11', meta: { title: '修改现金使用申请', hidden: true, }, - component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalModify11'], resolve) + component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalModify11'], resolve) }, { - path: '/onlineHome/approvalModify12', + path: '/yinnong/approvalModify12', name: 'approvalModify12', meta: { title: '修改汇票支出申请', hidden: true, }, - component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalModify12'], resolve) + component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalModify12'], resolve) }, { - path: '/onlineHome/approvalProcess', + path: '/yinnong/approvalProcess', name: 'approvalProcess', meta: { title: '付款申请流程', hidden: true, }, - component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalProcess'], resolve) + component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalProcess'], resolve) }, { - path: '/onlineHome/approvalProcess2', + path: '/yinnong/approvalProcess2', name: 'approvalProcess2', meta: { title: '付款申请流程', hidden: true, }, - component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalProcess2'], resolve) + component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalProcess2'], resolve) }, { - path: '/onlineHome/collectionList', + path: '/yinnong/collectionList', name: 'collectionList', meta: { title: '银农支付收款账户', hidden: true, }, - component: (resolve) => require(['@/views/onlineHome/bankAgriculture/collectionAccount/collectionList'], resolve) + component: (resolve) => require(['@/views/yinnong/bankAgriculture/collectionAccount/collectionList'], resolve) }, { - path: '/onlineHome/collectionAdd', + path: '/yinnong/collectionAdd', name: 'collectionAdd', meta: { title: '添加支付收款账户', hidden: true, }, - component: (resolve) => require(['@/views/onlineHome/bankAgriculture/collectionAccount/collectionAdd'], resolve) + component: (resolve) => require(['@/views/yinnong/bankAgriculture/collectionAccount/collectionAdd'], resolve) }, { - path: '/onlineHome/collectionModify', + path: '/yinnong/collectionModify', name: 'collectionModify', meta: { title: '修改支付收款账户', hidden: true, }, - component: (resolve) => require(['@/views/onlineHome/bankAgriculture/collectionAccount/collectionModify'], resolve) + component: (resolve) => require(['@/views/yinnong/bankAgriculture/collectionAccount/collectionModify'], resolve) }, { - path: '/onlineHome/collectionDetail', + path: '/yinnong/collectionDetail', name: 'collectionDetail', meta: { title: '查看支付收款账户', hidden: true, }, - component: (resolve) => require(['@/views/onlineHome/bankAgriculture/collectionAccount/collectionDetail'], resolve) + component: (resolve) => require(['@/views/yinnong/bankAgriculture/collectionAccount/collectionDetail'], resolve) }, { - path: '/onlineHome/paymentAccountList', + path: '/yinnong/paymentAccountList', name: 'paymentAccountList', meta: { title: '查看支付收款账户', hidden: true, }, - component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentAccount/paymentAccountList'], resolve) + component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentAccount/paymentAccountList'], resolve) }, { - path: '/onlineHome/paymentAccountAdd', + path: '/yinnong/paymentAccountAdd', name: 'paymentAccountAdd', meta: { title: '添加出纳账户设置', hidden: true, }, - component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentAccount/paymentAccountAdd'], resolve) + component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentAccount/paymentAccountAdd'], resolve) }, { - path: '/onlineHome/paymentAccountModify', + path: '/yinnong/paymentAccountModify', name: 'paymentAccountModify', meta: { title: '修改出纳账户设置', hidden: true, }, - component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentAccount/paymentAccountModify'], resolve) + component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentAccount/paymentAccountModify'], resolve) }, { - path: '/onlineHome/paymentAccountDetail', + path: '/yinnong/paymentAccountDetail', name: 'paymentAccountDetail', meta: { title: '付款账户详情', hidden: true, }, - component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentAccount/paymentAccountDetail'], resolve) + component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentAccount/paymentAccountDetail'], resolve) }, { - path: '/onlineHome/villagePortrait', - name: 'villagePortrait', + path: '/yinnong/villagePortrait', + name: 'yinnongvillagePortrait', meta: { title: '村画像', hidden: true, }, - component: (resolve) => require(['@/views/onlineHome/villagePortrait'], resolve) + component: (resolve) => require(['@/views/yinnong/villagePortrait'], resolve) }, { - path: '/onlineHome/farmerPortrait', - name: 'farmerPortrait', + path: '/yinnong/farmerPortrait', + name: 'yinnongfarmerPortrait', meta: { title: '村民信息', hidden: true, }, - component: (resolve) => require(['@/views/onlineHome/farmerPortrait'], resolve) + component: (resolve) => require(['@/views/yinnong/farmerPortrait'], resolve) }, { path: '/lawEnforcement', diff --git a/src/utils/request.js b/src/utils/request.js index 2aae44a6..a11a7cd5 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -78,6 +78,8 @@ service.interceptors.response.use(res => { window.location.href = '/homesteadLogin'; } else if (window.location.href.indexOf('onlineHome')!= -1) { window.location.href = '/onlineHomeLogin'; + }else if (window.location.href.indexOf('yinnong')!= -1) { + window.location.href = '/yinnongLogin'; }else { // 农村宅基地调查 window.location.href = '/homesteadLogin'; diff --git a/src/views/onlineHome/bankAgriculture/paymentAccount/paymentAccountAdd.vue b/src/views/onlineHome/bankAgriculture/paymentAccount/paymentAccountAdd.vue index a85b7712..1ad9235b 100644 --- a/src/views/onlineHome/bankAgriculture/paymentAccount/paymentAccountAdd.vue +++ b/src/views/onlineHome/bankAgriculture/paymentAccount/paymentAccountAdd.vue @@ -88,7 +88,7 @@ label-width="auto" required :rules="[{ required: true , message:'请选择所属镇账户' }]" - v-if="accountType=='银行存款'&&villageAccountType!='村虚拟账户'" + v-if="accountType=='银行存款'&&(form.bankType=='1'||form.bankType=='2')&&form.villageAccountType!=1" /> - + +