diff --git a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html
index bf3e2dd5..a7c6a286 100644
--- a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html
+++ b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html
@@ -186,10 +186,10 @@
-
计划装货时间:{{i?.goodsResource?.[0]?.loadingTime}}
+ 计划装货时间:{{i?.goodsResource?.[0]?.loadTime}}
+
diff --git a/src/app/routes/sys-setting/components/network-freight/network-freight.component.html b/src/app/routes/sys-setting/components/network-freight/network-freight.component.html
new file mode 100644
index 00000000..f262ec00
--- /dev/null
+++ b/src/app/routes/sys-setting/components/network-freight/network-freight.component.html
@@ -0,0 +1,37 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/app/routes/sys-setting/components/network-freight/network-freight.component.less b/src/app/routes/sys-setting/components/network-freight/network-freight.component.less
new file mode 100644
index 00000000..04fd4ba3
--- /dev/null
+++ b/src/app/routes/sys-setting/components/network-freight/network-freight.component.less
@@ -0,0 +1,13 @@
+:host::ng-deep{
+ .search-box{
+ .ant-card-body{
+ padding-bottom: 18px;
+ }
+ }
+
+ .content-box{
+ .ant-card-body{
+ padding-top: 14px;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/app/routes/sys-setting/components/network-freight/network-freight.component.ts b/src/app/routes/sys-setting/components/network-freight/network-freight.component.ts
new file mode 100644
index 00000000..ff673d4e
--- /dev/null
+++ b/src/app/routes/sys-setting/components/network-freight/network-freight.component.ts
@@ -0,0 +1,100 @@
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { STComponent, STColumn, STChange } from '@delon/abc/st';
+import { SFComponent, SFSchema } from '@delon/form';
+import { NzModalService } from 'ng-zorro-antd/modal';
+import { SystemService } from '../../services/system.service';
+
+@Component({
+ selector: 'app-network-freight-component',
+ templateUrl: './network-freight.component.html',
+ styleUrls: ['./network-freight.component.less']
+})
+export class NetworkFreightComponent implements OnInit {
+ @ViewChild('st', { static: true })
+ st!: STComponent;
+ @ViewChild('sf', { static: false })
+ sf!: SFComponent;
+
+ url = `/rule?_allow_anonymous=true`;
+
+ searchSchema: SFSchema = {
+ properties: {
+ receiveName: {
+ type: 'string',
+ title: '角色名称',
+ ui: { placeholder: '请输入' }
+ }
+ }
+ };
+
+ columns: STColumn[] = [
+ { title: '角色名称', index: 'no' },
+ { title: '角色描述', index: 'description' },
+ { title: '创建人手机号', index: 'description' },
+ {
+ title: '创建时间',
+ index: 'updatedAt',
+ type: 'date'
+ },
+ {
+ title: '操作',
+ buttons: [
+ {
+ text: '编辑',
+ click: item => this.roleAction(item)
+ },
+ {
+ text: '删除',
+ click: item => this.deleteAction(item)
+ }
+ ]
+ }
+ ];
+
+ selectedRows: any[] = [];
+
+ reqParams = { pageIndex: 1, pageSize: 10 };
+
+ constructor(public service: SystemService, private nzModalService: NzModalService) {}
+
+ ngOnInit(): void {}
+
+ stChange(e: STChange): void {
+ switch (e.type) {
+ case 'checkbox':
+ this.selectedRows = e.checkbox!;
+ break;
+ case 'filter':
+ this.st.load();
+ break;
+ }
+ }
+
+ roleAction(item?: any) {
+ const modal = this.nzModalService.create({
+ // nzContent: SettingRoleEditComponent,
+ nzWidth: 900,
+ nzComponentParams: item ? { i: { ...item } } : { i: { id: 0 } },
+ nzFooter: null
+ });
+ modal.afterClose.subscribe(res => {
+ this.st.load();
+ });
+ }
+
+ deleteAction(item?: any) {
+ this.nzModalService.error({
+ nzTitle: '确认删除?',
+ nzClosable: false,
+ nzCancelText: '取消',
+ nzOnOk: () => {}
+ });
+ }
+
+ /**
+ * 重置表单
+ */
+ resetSF() {
+ this.sf.reset();
+ }
+}
diff --git a/src/app/routes/sys-setting/sys-setting-routing.module.ts b/src/app/routes/sys-setting/sys-setting-routing.module.ts
index c511d5f7..79edd1a9 100644
--- a/src/app/routes/sys-setting/sys-setting-routing.module.ts
+++ b/src/app/routes/sys-setting/sys-setting-routing.module.ts
@@ -1,3 +1,11 @@
+/*
+ * @Author: your name
+ * @Date: 2021-12-03 15:23:05
+ * @LastEditTime: 2021-12-24 15:57:37
+ * @LastEditors: your name
+ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ * @FilePath: \tms-obc-web\src\app\routes\sys-setting\sys-setting-routing.module.ts
+ */
import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router';
import { AgreementConfigComponentsBaseComponent } from './components/agreement-config/agreement-config.component';
@@ -7,6 +15,7 @@ import { BasicSettingComponent } from './components/basic-setting/basic-setting.
import { CartConfigComponent } from './components/cart-config/cart-config.component';
import { CrmManagementComponent } from './components/crm-management/crm-management.component';
import { GoodsNameConfigComponent } from './components/goods-name-config/goods-name-config.component';
+import { NetworkFreightComponent } from './components/network-freight/network-freight.component';
import { RoleManagementComponent } from './components/role-management/role-management.component';
import { StaffManagementComponent } from './components/staff-management/staff-management.component';
import { SystemConfigComponent } from './components/system-config/system-config.component';
@@ -28,6 +37,7 @@ const routes: Routes = [
{ path: 'system-config', component: SystemConfigComponent },
{ path: 'goods-name-config', component: GoodsNameConfigComponent },
{ path: 'crm-management', component: CrmManagementComponent },
+ { path: 'network-freight', component: NetworkFreightComponent },
];
@NgModule({
diff --git a/src/app/routes/sys-setting/sys-setting.module.ts b/src/app/routes/sys-setting/sys-setting.module.ts
index db87db6a..df0ce016 100644
--- a/src/app/routes/sys-setting/sys-setting.module.ts
+++ b/src/app/routes/sys-setting/sys-setting.module.ts
@@ -22,6 +22,7 @@ import { SettingRoleEditComponent } from './components/role-management/edit/edit
import { SettingMenuComponent } from './components/role-management/menu/menu.component';
import { GoodsNameConfigComponent } from './components/goods-name-config/goods-name-config.component';
import { CrmManagementComponent } from './components/crm-management/crm-management.component';
+import { NetworkFreightComponent } from './components/network-freight/network-freight.component';
const COMPONENTS = [
StaffManagementComponent,
@@ -36,7 +37,8 @@ const COMPONENTS = [
BasicSettingComponent,
SystemConfigComponent,
GoodsNameConfigComponent,
- CrmManagementComponent
+ CrmManagementComponent,
+ NetworkFreightComponent
];
const NOTROUTECOMPONENTS = [
BuyerTranspowerComponent,
diff --git a/src/assets/mocks/menu-data.json b/src/assets/mocks/menu-data.json
index 04d3bd4e..a28df412 100644
--- a/src/assets/mocks/menu-data.json
+++ b/src/assets/mocks/menu-data.json
@@ -384,6 +384,10 @@
"text": "CRM客户管理",
"link": "/system/crm-management"
},
+ {
+ "text": "网络货运人",
+ "link": "/system/network-freight"
+ },
{
"text": "角色管理",
"link": "/system/role-management"