导航拦更改

app/base/base_controller.js

@@ -42,8 +42,9 @@ class BaseController extends Controller {
             menuList.financial.display = ctx.subProject.page_show.openFinancial || false;
             menuList.budget.display = ctx.subProject.page_show.openBudget || false;
             menuList.payment.display = ctx.subProject.page_show.openPayment || false;
-            menuList.quality.display = ctx.subProject.page_show.quality || false;
-            menuList.inspection.display = ctx.subProject.page_show.qualityInspection || false;
+            menuList.quality.display = ctx.subProject.page_show.quality || ctx.subProject.page_show.qualityInspection || false;
+            menuList.quality.children.find(item => item.msg === 'quality').display = ctx.subProject.page_show.quality || false;
+            menuList.quality.children.find(item => item.msg === 'inspection').display = ctx.subProject.page_show.qualityInspection || false;
             menuList.safe.display = ctx.subProject.page_show.safePayment || ctx.subProject.page_show.safeInspection || false;
             menuList.safe.children.find(item => item.msg === 'payment').display = ctx.subProject.page_show.safePayment || false;
             menuList.safe.children.find(item => item.msg === 'inspection').display = ctx.subProject.page_show.safeInspection || false;
@@ -60,6 +61,14 @@ class BaseController extends Controller {
                                 child.url = `/sp/${ctx.subProject.id}/contract/tender`;
                             }
                         }
+                    } else if (index === 'quality') {
+                        for (const child of im.children) {
+                            if (child.msg === 'quality') {
+                                child.url = `/sp/${ctx.subProject.id}/quality`;
+                            } else if (child.msg === 'inspection') {
+                                child.url = `/sp/${ctx.subProject.id}/quality/inspection`;
+                            }
+                        }
                     } else if (index === 'safe') {
                         for (const child of im.children) {
                             if (child.msg === 'payment') {
@@ -70,8 +79,6 @@ class BaseController extends Controller {
                         }
                     } else if (index === 'financial') {
                         im.url = `/sp/${ctx.subProject.id}/${im.controller}/${ctx.subProject.financialToUrl}`;
-                    } else if (index === 'inspection') {
-                        im.url = `/sp/${ctx.subProject.id}/quality/inspection`;
                     } else {
                         im.url = `/sp/${ctx.subProject.id}/${im.controller}`;
                     }

app/service/tender_permission.js

@@ -43,7 +43,7 @@ module.exports = app => {
                 }
             };
             this.PermissionBlock = [
-                { key: 'quality', name: '质量管理', field: 'quality' },
+                { key: 'quality', name: '工程资料', field: 'quality' },
                 { key: 'inspection', name: '质量巡检', field: 'inspection' },
                 { key: 'safe_inspection', name: '安全巡检', field: 'safe_inspection' },
                 { key: 'safe_payment', name: '安全计量', field: 'safe_payment' },

config/menu.js

@@ -129,20 +129,37 @@ const menu = {
         name: '质量管理',
         icon: 'fa-balance-scale',
         display: true,
-        children: null,
         caption: '质量管理',
-        controller: 'quality',
-        notIncludedUrl: ['/inspection'],
-    },
-    inspection: {
-        name: '质量巡检',
-        icon: 'fa-newspaper-o',
-        display: true,
-        children: null,
-        caption: '质量巡检',
-        controllers: ['quality'],
-        includedUrl: { quality: ['/inspection'] },
+        // controller: 'quality',
+        // notIncludedUrl: ['/inspection'],
+        children: [
+            {
+                msg: 'quality',
+                name: '工程资料',
+                caption: '工程资料',
+                controller: 'quality',
+                display: true,
+                notIncludedUrl: ['/inspection'],
+            },
+            {
+                msg: 'inspection',
+                name: '质量巡检',
+                caption: '质量巡检',
+                display: true,
+                controllers: ['quality'],
+                includedUrl: { quality: ['/inspection'] },
+            },
+        ],
     },
+    // inspection: {
+    //     name: '质量巡检',
+    //     icon: 'fa-newspaper-o',
+    //     display: true,
+    //     children: null,
+    //     caption: '质量巡检',
+    //     controllers: ['quality'],
+    //     includedUrl: { quality: ['/inspection'] },
+    // },
     safe: {
         name: '安全管理',
         icon: 'fa-shield',