瀏覽代碼

bug 修复

lilei 2 年之前
父節點
當前提交
5a2d82f8e1

+ 1 - 1
public/version.json

@@ -1,4 +1,4 @@
 {
-    "version": "2.1.39",
+    "version": "2.1.45",
     "message": "发现有新版本发布,确定更新系统?"
 }

+ 8 - 8
src/config/router.config.js

@@ -2061,8 +2061,8 @@ export const asyncRouterMap = [
             component: BlankLayout,
             meta: {
               title: '费用汇总报表(按承担方)',
-              icon: 'profile'
-              // permission: 'M_expenseAccountBearerReportList'
+              icon: 'profile',
+              permission: 'M_expenseAccountBearerReportList'
             },
             hideChildrenInMenu: true,
             children: [
@@ -2073,8 +2073,8 @@ export const asyncRouterMap = [
                 meta: {
                   title: '费用汇总报表(按承担方)',
                   icon: 'profile',
-                  hidden: true
-                  // permission: 'M_expenseAccountBearerReportList'
+                  hidden: true,
+                  permission: 'M_expenseAccountBearerReportList'
                 }
               }
             ]
@@ -2086,8 +2086,8 @@ export const asyncRouterMap = [
             component: BlankLayout,
             meta: {
               title: '费用汇总报表(按品类)',
-              icon: 'profile'
-              // permission: 'M_expenseAccountCategoryReportList'
+              icon: 'profile',
+              permission: 'M_expenseAccountCategoryReportList'
             },
             hideChildrenInMenu: true,
             children: [
@@ -2098,8 +2098,8 @@ export const asyncRouterMap = [
                 meta: {
                   title: '费用汇总报表(按品类)',
                   icon: 'profile',
-                  hidden: true
-                  // permission: 'M_expenseAccountCategoryReportList'
+                  hidden: true,
+                  permission: 'M_expenseAccountCategoryReportList'
                 }
               }
             ]

+ 1 - 0
src/views/reportData/expenseAccountReport/bearerList.vue

@@ -49,6 +49,7 @@
                 class="button-warning"
                 @click="handleExport"
                 :disabled="disabled"
+                v-if="$hasPermissions('B_expenseCollectExportByTarget')"
                 :loading="exportLoading"
                 id="returnGoodsPresentationList-export">导出</a-button>
             </a-col>

+ 1 - 0
src/views/reportData/expenseAccountReport/categoryList.vue

@@ -31,6 +31,7 @@
                 @click="handleExport"
                 :disabled="disabled"
                 :loading="exportLoading"
+                v-if="$hasPermissions('B_expenseCollectExportByPtype')"
                 id="returnGoodsPresentationList-export">导出</a-button>
             </a-col>
           </a-row>

+ 2 - 2
vue.config.js

@@ -107,9 +107,9 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        target: 'http://192.168.0.215/ocs-admin',
+        // target: 'http://192.168.0.215/ocs-admin',
         // target: 'https://t.ocs.360arrow.com/ocs-admin', //  Á·Ï°
-        // target: 'http://p.ocs.360arrow.com/ocs-admin', //  Ô¤·¢²¼
+        target: 'http://p.ocs.360arrow.com/ocs-admin', //  Ô¤·¢²¼
         ws: false,
         changeOrigin: true,
         pathRewrite: {