Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/LeaderManagement/leaderReimbursement.vue

@@ -295,7 +295,7 @@
                 {{subItem.PayStyle === 1||subItem.PayStyle === 11 ? moneyFormat(childItem.UnitPrice*(childItem.BookNum-childItem.HotelDiscount)) : 0}}
               </span>
               <span v-else>
-                {{(subItem.PayStyle === 1||subItem.PayStyle === 11) && (subItem.DMCPayType === 1||subItem.DMCPayType === 11) ? moneyFormat(childItem.UnitPrice*(childItem.BookNum-childItem.HotelDiscount)) : 0}}
+                {{(subItem.DMCPayType === 1||subItem.DMCPayType === 11) ? moneyFormat(childItem.UnitPrice*(childItem.BookNum-childItem.HotelDiscount)) : 0}}
               </span>
             </td>
             <td v-if="childIndex==0" :rowspan="6">

src/router/config.js

@@ -3439,6 +3439,13 @@ export default {
                             meta: {
                                 title: '简易报表'
                             },
+                        },{ //财务 报表 简易报表跨年统计
+                            path: '/EasyReportAcrossYears',
+                            name: 'EasyReportAcrossYears',
+                            component: resolve => require(['@/components/FinancialModule/ReportForm/EasyReportAcrossYears'], resolve),
+                            meta: {
+                                title: '简易报表跨年统计'
+                            },
                         },
                         { //RevenueFileMan
                             path: '/RevenueFileMan',