diff --git a/src/app/routes/financial-management/components/cost-management/cost-management-detail/cost-management-detail.component.ts b/src/app/routes/financial-management/components/cost-management/cost-management-detail/cost-management-detail.component.ts index 74df541d..c3fec627 100644 --- a/src/app/routes/financial-management/components/cost-management/cost-management-detail/cost-management-detail.component.ts +++ b/src/app/routes/financial-management/components/cost-management/cost-management-detail/cost-management-detail.component.ts @@ -36,14 +36,6 @@ export class CostManagementDetailComponent implements OnInit { }); } - loadAHXL(id: any) { - this.service.request(this.service.$api_get_cost_ahxl_detail, { id }).subscribe(res => { - if (res) { - this.costInfo = res; - } - }); - } - goBack() { history.go(-1); } diff --git a/src/app/routes/financial-management/components/recharge-record/recharge-record.component.less b/src/app/routes/financial-management/components/recharge-record/recharge-record.component.less deleted file mode 100644 index 0fed18b6..00000000 --- a/src/app/routes/financial-management/components/recharge-record/recharge-record.component.less +++ /dev/null @@ -1,36 +0,0 @@ -:host::ng-deep { - .search-box { - .ant-card-body { - padding-bottom: 18px; - } - } - - .content-box { - .ant-card-body { - padding-top: 16px; - } - } - - nz-range-picker { - width: 100%; - } - - .text-truncate { - white-space: normal; - } -} - -.expend-options { - margin-top: 0px; -} - - -@media (min-width: 1200px) { - .expend-options { - max-width : 400px; - position : absolute; - right : 0; - bottom : 25px; - } - -} \ No newline at end of file diff --git a/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts b/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts index dc4c59f5..5a6c5475 100644 --- a/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts +++ b/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts @@ -6,7 +6,7 @@ import { FreightAccountService } from '../../services/freight-account.service'; @Component({ selector: 'app-recharge-record', templateUrl: './recharge-record.component.html', - styleUrls: ['./recharge-record.component.less'] + styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less'] }) export class RechargeRecordComponent implements OnInit { @ViewChild('st', { static: true }) diff --git a/src/app/routes/menu-manager/components/api-auth/auth-drawer/auth-drawer.component.ts b/src/app/routes/menu-manager/components/api-auth/auth-drawer/auth-drawer.component.ts index 4dfa13f6..902238b2 100644 --- a/src/app/routes/menu-manager/components/api-auth/auth-drawer/auth-drawer.component.ts +++ b/src/app/routes/menu-manager/components/api-auth/auth-drawer/auth-drawer.component.ts @@ -126,7 +126,7 @@ export class AuthDrawerComponent implements OnInit { private initST(): STColumn[] { return [ - { title: '权限名称', index: 'name' }, + { title: '权限名称', index: 'name', width: 120 }, { title: '权限编码', index: 'permissionsCode' }, { title: '权限路径', index: 'permissionsUrl' }, { diff --git a/src/app/routes/menu-manager/components/index/index.component.html b/src/app/routes/menu-manager/components/index/index.component.html index d969cacd..5bb4a5e1 100644 --- a/src/app/routes/menu-manager/components/index/index.component.html +++ b/src/app/routes/menu-manager/components/index/index.component.html @@ -58,9 +58,9 @@ 菜单名称 菜单编号 路由地址 - 菜单图标 - 菜单排序 - 操作 + 菜单图标 + 菜单排序 + 操作 @@ -74,11 +74,11 @@ {{ item.keyCode }} {{ item.link }} - + - {{ item.sorted }} - + {{ item.sorted }} + 查看 编辑 diff --git a/src/app/routes/menu-manager/components/index/index.component.ts b/src/app/routes/menu-manager/components/index/index.component.ts index 00f03d03..f1f9573d 100644 --- a/src/app/routes/menu-manager/components/index/index.component.ts +++ b/src/app/routes/menu-manager/components/index/index.component.ts @@ -76,7 +76,7 @@ export class MenuManagerComponentsIndexComponent implements OnInit { }); modal.afterClose.subscribe(res => { if (res) { - this.loadMemu(this.selectedPlatform.appId); + // this.loadMemu(this.selectedPlatform.appId); } }); } diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html index 1f7bb47e..ce133242 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html @@ -30,7 +30,7 @@ - + @@ -47,8 +47,8 @@ + --> + diff --git a/src/assets/mocks/app-data.json b/src/assets/mocks/app-data.json index aab4e21d..cbfae3d0 100644 --- a/src/assets/mocks/app-data.json +++ b/src/assets/mocks/app-data.json @@ -1,6 +1,6 @@ { "app": { - "name": "运多星网络货运管理平台", + "name": "网络货运管理平台", "description": "运多星网络货运管理平台" } } diff --git a/src/assets/mocks/menu-data.json b/src/assets/mocks/menu-data.json index a059ea46..77c36754 100644 --- a/src/assets/mocks/menu-data.json +++ b/src/assets/mocks/menu-data.json @@ -174,12 +174,6 @@ "icon": "anticon anticon-dashboard", "link": "/order-management/bulk-detail/:id", "hide": true - }, - { - "text": "整车订单详情", - "icon": "anticon anticon-dashboard", - "link": "/order-management/vehicle-detail", - "hide": true } ] }, diff --git a/src/assets/mocks/platform/tms-obc-web.json b/src/assets/mocks/platform/tms-obc-web.json index 1716b49f..384eca53 100644 --- a/src/assets/mocks/platform/tms-obc-web.json +++ b/src/assets/mocks/platform/tms-obc-web.json @@ -177,12 +177,6 @@ "icon": "anticon anticon-dashboard", "link": "/order-management/bulk-detail/:id", "hide": true - }, - { - "text": "整车订单详情", - "icon": "anticon anticon-dashboard", - "link": "/order-management/vehicle-detail", - "hide": true } ] },