From f490075fddb6c5ac0dd295a1f4e0fbbb532d277c Mon Sep 17 00:00:00 2001 From: wangshiming Date: Tue, 7 Dec 2021 11:13:32 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bulk-detail/bulk-detail.component.html | 4 +- .../components/bulk/bulk.component.html | 4 +- .../car-manage/car-manage.component.html | 115 +++++++ .../car-manage/car-manage.component.less | 7 + .../car-manage/car-manage.component.spec.ts | 40 +++ .../car-manage/car-manage.component.ts | 299 ++++++++++++++++++ .../driver-manage.component.html | 21 +- .../driver-manage/driver-manage.component.ts | 44 ++- .../components/vehicle/vehicle.component.html | 4 +- .../order-management-routing.module.ts | 2 + .../order-management.module.ts | 4 +- src/assets/mocks/menu-data.json | 5 + 12 files changed, 529 insertions(+), 20 deletions(-) create mode 100644 src/app/routes/order-management/components/car-manage/car-manage.component.html create mode 100644 src/app/routes/order-management/components/car-manage/car-manage.component.less create mode 100644 src/app/routes/order-management/components/car-manage/car-manage.component.spec.ts create mode 100644 src/app/routes/order-management/components/car-manage/car-manage.component.ts diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html index 7ddb2876..3ebd51ca 100644 --- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html @@ -146,4 +146,6 @@ - \ No newline at end of file + + + diff --git a/src/app/routes/order-management/components/bulk/bulk.component.html b/src/app/routes/order-management/components/bulk/bulk.component.html index b31e9422..4a05bdfb 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.html +++ b/src/app/routes/order-management/components/bulk/bulk.component.html @@ -1,12 +1,14 @@ + +
diff --git a/src/app/routes/order-management/components/car-manage/car-manage.component.html b/src/app/routes/order-management/components/car-manage/car-manage.component.html new file mode 100644 index 00000000..0eff15ed --- /dev/null +++ b/src/app/routes/order-management/components/car-manage/car-manage.component.html @@ -0,0 +1,115 @@ + + + + + + +
+ +
+ +
+ + + +
+ +
+
+ + + + +
+ +
+ + + + + + + +
+ + + + {{item.no}} + + +
+ + + + + + + {{ infoData1?.enterpriseName }} + {{ infoData1?.unifiedSocialCreditCode }} + {{ infoData1?.enterpriseType }} + {{ infoData1?.registrationCapital }} 万元 + {{ infoData1?.enterpriseRegistrationTime }} + + {{ infoData1?.enterpriseRegistrationTime }} + + + + + {{ infoData1?.enterpriseAddress }} + + + + {{ infoData1?.businessScope }} + + + + {{ infoData1?.businessScope }} + 已临期 + + + + + + + + + + + + + + + + + + + + diff --git a/src/app/routes/order-management/components/car-manage/car-manage.component.less b/src/app/routes/order-management/components/car-manage/car-manage.component.less new file mode 100644 index 00000000..30444d6b --- /dev/null +++ b/src/app/routes/order-management/components/car-manage/car-manage.component.less @@ -0,0 +1,7 @@ + .left_btn { + width: 50px; + height: 32px; + padding-left: 8px; + line-height:32px; + background-color: #d7d7d7; + } \ No newline at end of file diff --git a/src/app/routes/order-management/components/car-manage/car-manage.component.spec.ts b/src/app/routes/order-management/components/car-manage/car-manage.component.spec.ts new file mode 100644 index 00000000..2d81888c --- /dev/null +++ b/src/app/routes/order-management/components/car-manage/car-manage.component.spec.ts @@ -0,0 +1,40 @@ +/* + * @Author: your name + * @Date: 2021-12-06 20:03:28 + * @LastEditTime: 2021-12-07 11:08:28 + * @LastEditors: Please set LastEditors + * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE + * @FilePath: \tms-obc-web\src\app\routes\order-management\components\bulk\bulk.component.spec.ts + */ +/* + * @Author: your name + * @Date: 2021-12-06 19:39:49 + * @LastEditTime: 2021-12-06 19:41:08 + * @LastEditors: your name + * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE + * @FilePath: \tms-obc-web\src\app\routes\order-management\components\bulk\bulk.component.spec.ts + */ +import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; +import { OrderManagementCarManageComponent } from './car-manage.component'; + +describe('OrderManagementCarManageComponent', () => { + let component: OrderManagementCarManageComponent; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ OrderManagementCarManageComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(OrderManagementCarManageComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/routes/order-management/components/car-manage/car-manage.component.ts b/src/app/routes/order-management/components/car-manage/car-manage.component.ts new file mode 100644 index 00000000..596c5d3c --- /dev/null +++ b/src/app/routes/order-management/components/car-manage/car-manage.component.ts @@ -0,0 +1,299 @@ +import { Component, OnInit, ViewChild } from '@angular/core'; +import { STColumn, STComponent } from '@delon/abc/st'; +import { SFComponent, SFDateWidgetSchema, SFSchema, SFSelectWidgetSchema, SFUISchema } from '@delon/form'; +import { ModalHelper, _HttpClient } from '@delon/theme'; +import { NzModalService } from 'ng-zorro-antd/modal'; +import { map } from 'rxjs/operators'; +import { SupplyManagementService } from '../../services/order-management.service'; + + +@Component({ + selector: 'app-supply-management-car-manage', + templateUrl: './car-manage.component.html', + styleUrls: ['./car-manage.component.less'] +}) +export class OrderManagementCarManageComponent implements OnInit { + url = `/user?_allow_anonymous=true`; + ui: SFUISchema = {}; + uiView: SFUISchema = {}; + schema: SFSchema = {}; + schemaView: SFSchema = {}; + auditMany = false; + auditstatus = false; + isVisibleView = false; + isVisibleRE = false; + _$expand = false; + infoData1: any; + @ViewChild('st') private readonly st!: STComponent; + @ViewChild('sf', { static: false }) sf!: SFComponent; + @ViewChild('sfView', { static: false }) sfView!: SFComponent; + columns: STColumn[] = []; + demoValue: any; + datass: any = [ + { + one: '1', + two: '1', + three: '1', + id: 1 + }, + { + one: '2', + two: '2', + three: '2', + id: 2 + }, +]; + tabs = [ { + name: '全部', + type: 5, + count: 0, + }, + { + name: '待审核', + type: 5, + count: 0, + }, + { + name: '已审核', + type: 5, + count: 0, + }, + { + name: '驳回', + type: 5, + count: 0, + } + ]; + constructor(public service: SupplyManagementService, private modal: NzModalService) { } + + /** + * 查询参数 + */ + get reqParams() { + return { + ...this.sf?.value, + }; + } + get selectedRows() { + return this.st?.list.filter((item) => item.checked) || []; + } + ngOnInit(): void { + this.initSF(); + this.initST(); + this.initSFReject(); + } + + + + /** + * 初始化查询表单 + */ + initSF() { + this.schema = { + properties: { + no: { + type: 'string', + title: '公司名称', + }, + no2: { + type: 'string', + title: '姓名' + }, + no1: { + type: 'string', + title: '手机号' + }, + }, + }; + this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } }; + } + initSFReject() { + this.schemaView = { + properties: { + roleDescription: { + title: '驳回原因', + type: 'string', + maxLength: 50, + ui: { + placeholder: '请输入驳回原因，最多不超过50字', + widget: 'textarea', + autosize: { minRows: 2, maxRows: 6 } + }, + }, + }, + }; + this.uiView = { '*': { spanLabelFixed: 110, grid: { span: 12 } } }; + } + + /** + * 初始化数据列表 + */ + initST() { + this.columns = [ + { + title: '公司名称', + width: '100px', + className: 'text-center', + render: 'goodsId' + }, + { + title: '姓名', + width: '100px', + className: 'text-center', + }, + { title: '身份证号', index: 'externalSn', width: '120px', className: 'text-center' }, + { title: '手机号', index: 'linkUrl', width: '120px', className: 'text-center' }, + { + title: '身份证', + className: 'text-center', + width: '120px', + }, + { + title: '驾驶证', + className: 'text-center', + width: '120px', + }, + { + title: '从业资格证', + className: 'text-center', + width: '120px', + }, + { + title: '平台认证状态', + className: 'text-center', + width: '120px', + }, + { + title: '银行卡', + className: 'text-center', + width: '120px', + }, + { + title: '审核状态', + className: 'text-center', + width: '120px', + }, + { + title: '驳回原因', + className: 'text-center', + width: '120px', + render: 'feiong' + }, + { + title: '添加时间', + className: 'text-center', + width: '120px', + }, + { + title: '添加人', + className: 'text-center', + width: '120px', + render: 'enStatusStr27878' + }, + { + title: '操作', + fixed: 'right', + width: '200px', + className: 'text-left', + buttons: [ + { + text: '审核', + click: (_record) => this.viewAudit(_record), + }, + { + text: '查看详情', + click: (_record) => this.viewDetail(_record), + }, + ], + }, + ]; + } + + /** + * 查询字段个数 + */ + get queryFieldCount(): number { + return Object.keys(this.schema?.properties || {}).length; + } + /** + * 伸缩查询条件 + */ + expandToggle(): void { + this._$expand = !this._$expand; + this.sf?.setValue('/_$expand', this._$expand); + } + tabChange(item: any) { + console.log(item) + } + /** + * 重置表单 + */ + resetSF(): void { + this.sf.reset(); + this._$expand = false; + } + + + + // 获取录单员 + getCatalogueMember() { + const params = { + }; + return this.service.request(this.service.$api_get_catalogue_member, params, 'GET').pipe( + map((res) => { + if (res) { + console.log(res) + } + }), + ); + } + + selectChange(e: number) { + console.log(e); + } + /** + * 导入货源 + */ + importGoodsSource() { + + } + audit(item: any) { + console.log(item) + } + + /* + * 审核关闭弹窗 + */ + handleCancel(item: string) { + if(item === '0') { + this.isVisibleView = false + } else{ + this.isVisibleRE = false + } + } + /** + * 审核通过按钮 + */ + handleOK() { + + } + /** + *查看评价 + */ + viewDetail(item: any) { + console.log(item) + this.auditstatus = true; + this.isVisibleView = true + } + viewAudit(item: any) { + console.log(item) + this.auditstatus = false; + this.isVisibleView = true + } + /** + *驳回 + */ + Reject() { + this.isVisibleRE = true; + } +} diff --git a/src/app/routes/order-management/components/driver-manage/driver-manage.component.html b/src/app/routes/order-management/components/driver-manage/driver-manage.component.html index 1d1547c6..d7abb76d 100644 --- a/src/app/routes/order-management/components/driver-manage/driver-manage.component.html +++ b/src/app/routes/order-management/components/driver-manage/driver-manage.component.html @@ -1,12 +1,14 @@ + +
@@ -54,7 +56,7 @@ - + {{ infoData1?.enterpriseName }} @@ -93,9 +95,20 @@ - + - + + + + + + + + + + + + diff --git a/src/app/routes/order-management/components/driver-manage/driver-manage.component.ts b/src/app/routes/order-management/components/driver-manage/driver-manage.component.ts index 5e67f6b8..39f2b8ea 100644 --- a/src/app/routes/order-management/components/driver-manage/driver-manage.component.ts +++ b/src/app/routes/order-management/components/driver-manage/driver-manage.component.ts @@ -17,14 +17,16 @@ export class OrderManagementDriverManageComponent implements OnInit { ui: SFUISchema = {}; uiView: SFUISchema = {}; schema: SFSchema = {}; + schemaView: SFSchema = {}; auditMany = false; auditstatus = false; isVisibleView = false; - isVisible = false; + isVisibleRE = false; _$expand = false; infoData1: any; @ViewChild('st') private readonly st!: STComponent; @ViewChild('sf', { static: false }) sf!: SFComponent; + @ViewChild('sfView', { static: false }) sfView!: SFComponent; columns: STColumn[] = []; demoValue: any; datass: any = [ @@ -78,6 +80,7 @@ export class OrderManagementDriverManageComponent implements OnInit { ngOnInit(): void { this.initSF(); this.initST(); + this.initSFReject(); } @@ -104,6 +107,23 @@ export class OrderManagementDriverManageComponent implements OnInit { }; this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } }; } + initSFReject() { + this.schemaView = { + properties: { + roleDescription: { + title: '驳回原因', + type: 'string', + maxLength: 50, + ui: { + placeholder: '请输入驳回原因，最多不超过50字', + widget: 'textarea', + autosize: { minRows: 2, maxRows: 6 } + }, + }, + }, + }; + this.uiView = { '*': { spanLabelFixed: 110, grid: { span: 12 } } }; + } /** * 初始化数据列表 @@ -244,24 +264,18 @@ export class OrderManagementDriverManageComponent implements OnInit { /* * 审核关闭弹窗 */ - handleCancel() { + handleCancel(item: string) { + if(item === '0') { this.isVisibleView = false + } else{ + this.isVisibleRE = false + } } /** * 审核通过按钮 */ handleOK() { - } - OpenPrice() { - this.isVisible = true - } - /** - * 浮动费用查看 - */ - FloatView(item: any) { - console.log(item) - this.isVisibleView = true } /** *查看评价 @@ -276,4 +290,10 @@ export class OrderManagementDriverManageComponent implements OnInit { this.auditstatus = false; this.isVisibleView = true } + /** + *驳回 + */ + Reject() { + this.isVisibleRE = true; + } } diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.html b/src/app/routes/order-management/components/vehicle/vehicle.component.html index 4d9b4ffe..c3fd33ee 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.html +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.html @@ -1,12 +1,14 @@ + +
diff --git a/src/app/routes/order-management/order-management-routing.module.ts b/src/app/routes/order-management/order-management-routing.module.ts index 0872de19..995f406d 100644 --- a/src/app/routes/order-management/order-management-routing.module.ts +++ b/src/app/routes/order-management/order-management-routing.module.ts @@ -10,6 +10,7 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import { OrderManagementBulkeDetailComponent } from './components/bulk-detail/bulk-detail.component'; import { OrderManagementBulkComponent } from './components/bulk/bulk.component'; +import { OrderManagementCarManageComponent } from './components/car-manage/car-manage.component'; import { OrderManagementDriverManageComponent } from './components/driver-manage/driver-manage.component'; import { OrderManagementVehicleDetailComponent } from './components/vehicle-detail/vehicle-detail.component'; import { OrderManagementVehicleComponent } from './components/vehicle/vehicle.component'; @@ -20,6 +21,7 @@ const routes: Routes = [ { path: 'bulk', component: OrderManagementBulkComponent }, { path: 'bulk-detail/:id', component: OrderManagementBulkeDetailComponent }, { path: 'driver-manage', component: OrderManagementDriverManageComponent }, + { path: 'car-manage', component: OrderManagementCarManageComponent }, ] @NgModule({ imports: [RouterModule.forChild(routes)], diff --git a/src/app/routes/order-management/order-management.module.ts b/src/app/routes/order-management/order-management.module.ts index be0aa3db..faefe1db 100644 --- a/src/app/routes/order-management/order-management.module.ts +++ b/src/app/routes/order-management/order-management.module.ts @@ -2,6 +2,7 @@ import { NgModule, Type } from '@angular/core'; import { SharedModule } from '@shared'; import { OrderManagementBulkeDetailComponent } from './components/bulk-detail/bulk-detail.component'; import { OrderManagementBulkComponent } from './components/bulk/bulk.component'; +import { OrderManagementCarManageComponent } from './components/car-manage/car-manage.component'; import { OrderManagementDriverManageComponent } from './components/driver-manage/driver-manage.component'; import { OrderManagementVehicleDetailComponent } from './components/vehicle-detail/vehicle-detail.component'; @@ -13,7 +14,8 @@ const COMPONENTS: Type[] = [ OrderManagementVehicleDetailComponent, OrderManagementBulkComponent, OrderManagementBulkeDetailComponent, - OrderManagementDriverManageComponent + OrderManagementDriverManageComponent, + OrderManagementCarManageComponent ]; @NgModule({ diff --git a/src/assets/mocks/menu-data.json b/src/assets/mocks/menu-data.json index e53590c3..5350802c 100644 --- a/src/assets/mocks/menu-data.json +++ b/src/assets/mocks/menu-data.json @@ -190,6 +190,11 @@ "text": "司机管理", "icon": "anticon anticon-dashboard", "link": "/order-management/driver-manage" + }, + { + "text": "车辆管理", + "icon": "anticon anticon-dashboard", + "link": "/order-management/car-manage" } ] },