Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

src/app/routes/menu-manager/components/api-auth/auth-drawer/auth-drawer.component.html

@@ -30,7 +30,7 @@
         <se label="权限编码" required>
             {{functionInfo.permissionsCode || '-'}}
         </se>
-        <se label="权限路径" required>
+        <se label="api地址" required>
             <input nz-input [(ngModel)]="functionInfo.permissionsUrl" placeholder="请输入权限路径" [disabled]="isDisabled" />
         </se>
     </div>

src/app/routes/menu-manager/components/api-auth/auth-drawer/auth-drawer.component.ts

@@ -52,7 +52,7 @@ export class AuthDrawerComponent implements OnInit {
 
   functionAction(item?: any, isDisabled = false) {
     if (item) {
-      this.functionInfo = { ...item, buttonId: item.id };
+      this.functionInfo = { ...item, buttonId: item.id, id: item.functionButtonId };
     } else {
       this.functionInfo = {};
     }
@@ -76,6 +76,24 @@ export class AuthDrawerComponent implements OnInit {
     });
   }
 
+  deleteAuth(item: any) {
+    const modal = this.modal.warning({
+      nzTitle: '是否确定删除该权限',
+      nzOnOk: () => {
+        this.service.request(this.service.$api_delete_menu_function, [item.functionButtonId]).subscribe(res => {
+          if (res) {
+            this.service.msgSrv.success('删除成功');
+            this.st.load(1);
+            modal.destroy();
+          } else {
+            this.service.msgSrv.error('删除失败');
+          }
+        });
+        return false;
+      }
+    });
+  }
+
   /**
    * 重置表单
    */
@@ -125,7 +143,8 @@ export class AuthDrawerComponent implements OnInit {
             click: item => this.functionAction(item)
           },
           {
-            text: '删除'
+            text: '删除',
+            click: item => this.deleteAuth(item)
           }
         ]
       }

src/app/routes/menu-manager/components/index/index.component.html

@@ -10,10 +10,10 @@
       <button nz-button nzType="primary" [nzLoading]="service.http.loading"
         (click)="loadMemu(selectedPlatform.appId)">查询</button>
       <button nz-button (click)="resetSF()">重置</button>
-      <!-- <button nz-button (click)="delMenu(0)" [nzLoading]="service.http.loading">
+      <button nz-button (click)="delMenu(0)" [nzLoading]="service.http.loading">
         清空货主菜单
       </button>
-      <button nz-button (click)="delMenu(1)" [nzLoading]="service.http.loading">
+      <!--  <button nz-button (click)="delMenu(1)" [nzLoading]="service.http.loading">
         清空运营后台菜单
       </button> -->
     </div>

src/app/routes/menu-manager/services/menu-manager.service.ts

@@ -23,6 +23,8 @@ export class MenuManagerService extends BaseService {
   $api_get_functions= `/api/mdc/cuc/buttonInfo/getButtonInfoList`;
   // 保存菜单按钮关联
   $api_save_menu_function= `/api/mdc/cuc/functionButton/saveFunctionButton`;
+  // 删除菜单按钮关联表
+  $api_delete_menu_function= `/api/mdc/cuc/functionButton/deletebatch`;
 
   constructor(public injector: Injector) {
     super(injector);

src/assets/mocks/platform/tms-obc-web.json

@@ -150,8 +150,7 @@
             {
               "text": "整车订单",
               "icon": "anticon anticon-dashboard",
-              "link": "/order-management/vehicle",
+              "link": "/order-management/vehicle"
-              "reuse": true
             },
             {
               "text": "大宗订单",
@@ -174,6 +173,11 @@
               "link": "/order-management/vehicle-detail/:id",
               "hide": true
             },
+            {
+              "text": "单据审核",
+              "icon": "anticon anticon-dashboard",
+              "link": "/order-management/receipts-audit"
+            },
             {
               "text": "大宗订单详情",
               "icon": "anticon anticon-dashboard",
@@ -181,7 +185,7 @@
               "hide": true
             },
             {
-              "text": "货源详情",
+              "text": "整车订单详情",
               "icon": "anticon anticon-dashboard",
               "link": "/order-management/vehicle-detail",
               "hide": true
@@ -257,6 +261,24 @@
               "text": "收款单",
               "link": "/financial-management/receipt-order"
             },
+            {
+              "text": "应收核销",
+              "link": "/financial-management/receivable-order"
+            },
+            {
+              "text": "应收核销详情",
+              "hide": true,
+              "link": "/financial-management/receivable-order/detail/:id"
+            },
+            {
+              "text": "应付核销",
+              "link": "/financial-management/payable-order"
+            },
+            {
+              "text": "应收核销详情",
+              "hide": true,
+              "link": "/financial-management/payable-order/detail/:id"
+            },
             {
               "text": "货主账户",
               "link": "/financial-management/freight-account"
@@ -336,6 +358,10 @@
                   "text": "已开订单明细",
                   "link": "/ticket/invoice-list/detail/:id",
                   "hide": true
+                },
+                {
+                  "text": "快递信息",
+                  "link": "/ticket/express-info"
                 }
               ]
             },
@@ -414,6 +440,28 @@
                 }
               ]
             },
+            {
+              "text": "操作日志",
+              "group": true,
+              "children": [
+                {
+                  "text": "系统操作日志",
+                  "link": "/system/system-logs"
+                },
+                {
+                  "text": "货源操作日志",
+                  "link": "/system/system-supply-logs"
+                },
+                {
+                  "text": "订单操作日志",
+                  "link": "/system/system-waybill-logs"
+                },
+                {
+                  "text": "用户登录日志",
+                  "link": "/system/user-logs"
+                }
+              ]
+            },
             {
               "text": "CRM客户管理",
               "link": "/system/crm-management"
@@ -430,6 +478,14 @@
               "text": "基础设置",
               "link": "/system/basic-setting"
             },
+            {
+              "text": "按钮管理设置",
+              "link": "/system/btn-management"
+            },
+            {
+              "text": "公告信息管理",
+              "link": "/system/announcement-message"
+            },
             {
               "text": "车型车长配置",
               "link": "/system/cart-config"
@@ -438,22 +494,6 @@
               "text": "基础配置",
               "link": "/system/basic-config"
             },
-            {
-              "text": "系统操作日志",
-              "link": "/system/system-logs"
-            },
-            {
-              "text": "货源操作日志",
-              "link": "/system/system-supply-logs"
-            },
-            {
-              "text": "订单操作日志",
-              "link": "/system/system-waybill-logs"
-            },
-            {
-              "text": "用户登录日志",
-              "link": "/system/user-logs"
-            },
             {
               "text": "版本发布记录",
               "link": "/system/version-logs"
@@ -466,6 +506,14 @@
               "text": "审核驳回理由配置",
               "link": "/system/audit-reason-config"
             },
+            {
+              "text": "菜单管理",
+              "link": "/menu-management/index"
+            },
+            {
+              "text": "接口权限",
+              "link": "/menu-management/auth"
+            },
             {
               "text": "系统配置",
               "link": "/system/system-config"

src/assets/mocks/platform/tms-smc-web.json

@@ -42,8 +42,7 @@
             {
               "text": "货源管理",
               "icon": "anticon anticon-dashboard",
-              "link": "/supply-management/index",
+              "link": "/supply-management/index"
-              "reuse": true
             },
             {
               "text": "货源详情",
@@ -195,7 +194,7 @@
           ]
         },
         {
-          "title": "票务管理",
+          "text": "票务管理",
           "i18n": "menu.ticket.management",
           "icon": "anticon anticon-dashboard",
           "children": [
@@ -234,7 +233,7 @@
           ]
         },
         {
-          "title": "财务管理",
+          "text": "财务管理",
           "i18n": "menu.financial.management",
           "icon": "anticon anticon-dashboard",
           "children": [