diff --git a/src/app/routes/order-management/components/additionalc/additionalc.component.html b/src/app/routes/order-management/components/additionalc/additionalc.component.html new file mode 100644 index 00000000..3e81d6c0 --- /dev/null +++ b/src/app/routes/order-management/components/additionalc/additionalc.component.html @@ -0,0 +1,103 @@ + + + + + + +
+ +
+ +
+ + + +
+ +
+
+ + + + +
+ +
+ + + + + + + +
+ + + + {{item.no}} + + +
+ + + + + + + {{ infoData1?.enterpriseName }} + {{ infoData1?.unifiedSocialCreditCode }} + {{ infoData1?.enterpriseType }} + {{ infoData1?.registrationCapital }} 万元 + {{ infoData1?.enterpriseRegistrationTime }} + + + + {{ infoData1?.enterpriseAddress }} + + + + {{ infoData1?.businessScope }} + + + + + + + + + + + + + + + + + + + + diff --git a/src/app/routes/order-management/components/additionalc/additionalc.component.less b/src/app/routes/order-management/components/additionalc/additionalc.component.less new file mode 100644 index 00000000..30444d6b --- /dev/null +++ b/src/app/routes/order-management/components/additionalc/additionalc.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/additionalc/additionalc.component.spec.ts b/src/app/routes/order-management/components/additionalc/additionalc.component.spec.ts new file mode 100644 index 00000000..09643337 --- /dev/null +++ b/src/app/routes/order-management/components/additionalc/additionalc.component.spec.ts @@ -0,0 +1,40 @@ +/* + * @Author: your name + * @Date: 2021-12-06 20:03:28 + * @LastEditTime: 2021-12-07 11:21:42 + * @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 { OrderManagementAdditionalcComponent } from './additionalc.component'; + +describe('OrderManagementAdditionalcComponent', () => { + let component: OrderManagementAdditionalcComponent; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ OrderManagementAdditionalcComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(OrderManagementAdditionalcComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/routes/order-management/components/additionalc/additionalc.component.ts b/src/app/routes/order-management/components/additionalc/additionalc.component.ts new file mode 100644 index 00000000..1fdcb236 --- /dev/null +++ b/src/app/routes/order-management/components/additionalc/additionalc.component.ts @@ -0,0 +1,289 @@ +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-additionalc', + templateUrl: './additionalc.component.html', + styleUrls: ['./additionalc.component.less'] +}) +export class OrderManagementAdditionalcComponent 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: '车牌号' + }, + }, + }; + 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: '车长(m)', 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: '操作', + 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/bulk-detail/bulk-detail.component.html b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html index 8c2e348d..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 @@ -1,7 +1,7 @@ + +
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..3e81d6c0 --- /dev/null +++ b/src/app/routes/order-management/components/car-manage/car-manage.component.html @@ -0,0 +1,103 @@ + + + + + + +
+ +
+ +
+ + + +
+ +
+
+ + + + +
+ +
+ + + + + + + +
+ + + + {{item.no}} + + +
+ + + + + + + {{ infoData1?.enterpriseName }} + {{ infoData1?.unifiedSocialCreditCode }} + {{ infoData1?.enterpriseType }} + {{ infoData1?.registrationCapital }} 万元 + {{ infoData1?.enterpriseRegistrationTime }} + + + + {{ infoData1?.enterpriseAddress }} + + + + {{ 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..565e151b --- /dev/null +++ b/src/app/routes/order-management/components/car-manage/car-manage.component.ts @@ -0,0 +1,292 @@ +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, + }, + { + 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: '托运公司' + }, + no3: { + 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', + }, + { + title: '操作', + fixed: 'right', + width: '200px', + className: 'text-left', + buttons: [ + { + text: '审核', + click: (_record) => this.viewAudit(_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() { + + } + viewAudit(item: any) { + console.log(item) + this.isVisibleRE = true; + } + Reject() { + + } +} 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 new file mode 100644 index 00000000..d7abb76d --- /dev/null +++ b/src/app/routes/order-management/components/driver-manage/driver-manage.component.html @@ -0,0 +1,114 @@ + + + + + +
+ +
+ +
+ + + +
+ +
+
+ + + + +
+ +
+ + + + + + + +
+ + + + {{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/driver-manage/driver-manage.component.less b/src/app/routes/order-management/components/driver-manage/driver-manage.component.less new file mode 100644 index 00000000..30444d6b --- /dev/null +++ b/src/app/routes/order-management/components/driver-manage/driver-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/driver-manage/driver-manage.component.spec.ts b/src/app/routes/order-management/components/driver-manage/driver-manage.component.spec.ts new file mode 100644 index 00000000..bd6e2009 --- /dev/null +++ b/src/app/routes/order-management/components/driver-manage/driver-manage.component.spec.ts @@ -0,0 +1,40 @@ +/* + * @Author: your name + * @Date: 2021-12-06 20:03:28 + * @LastEditTime: 2021-12-06 20:03:29 + * @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 { OrderManagementDriverManageComponent } from './driver-manage.component'; + +describe('OrderManagementDriverManageComponent', () => { + let component: OrderManagementDriverManageComponent; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ OrderManagementDriverManageComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(OrderManagementDriverManageComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); 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 new file mode 100644 index 00000000..39f2b8ea --- /dev/null +++ b/src/app/routes/order-management/components/driver-manage/driver-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-driver-manage', + templateUrl: './driver-manage.component.html', + styleUrls: ['./driver-manage.component.less'] +}) +export class OrderManagementDriverManageComponent 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/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 33b595da..28961a94 100644 --- a/src/app/routes/order-management/order-management-routing.module.ts +++ b/src/app/routes/order-management/order-management-routing.module.ts @@ -1,14 +1,18 @@ /* * @Author: your name * @Date: 2021-12-03 15:31:52 - * @LastEditTime: 2021-12-06 20:21:41 + * @LastEditTime: 2021-12-07 09:59:57 * @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\order-management-routing.module.ts */ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; +import { OrderManagementAdditionalcComponent } from './components/additionalc/additionalc.component'; +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'; @@ -16,7 +20,10 @@ const routes: Routes = [ { path: 'vehicle', component: OrderManagementVehicleComponent }, { path: 'vehicle-detail/:id', component: OrderManagementVehicleDetailComponent }, { path: 'bulk', component: OrderManagementBulkComponent }, - { path: 'bulk-detail/:id', component: OrderManagementVehicleDetailComponent }, + { path: 'bulk-detail/:id', component: OrderManagementBulkeDetailComponent }, + { path: 'driver-manage', component: OrderManagementDriverManageComponent }, + { path: 'car-manage', component: OrderManagementCarManageComponent }, + { path: 'additionalc', component: OrderManagementAdditionalcComponent }, ] @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 d64cc239..c437d7a0 100644 --- a/src/app/routes/order-management/order-management.module.ts +++ b/src/app/routes/order-management/order-management.module.ts @@ -1,7 +1,10 @@ import { NgModule, Type } from '@angular/core'; import { SharedModule } from '@shared'; +import { OrderManagementAdditionalcComponent } from './components/additionalc/additionalc.component'; 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'; @@ -11,7 +14,10 @@ const COMPONENTS: Type[] = [ OrderManagementVehicleComponent, OrderManagementVehicleDetailComponent, OrderManagementBulkComponent, - OrderManagementBulkeDetailComponent + OrderManagementBulkeDetailComponent, + OrderManagementDriverManageComponent, + OrderManagementCarManageComponent, + OrderManagementAdditionalcComponent ]; @NgModule({ diff --git a/src/assets/images/user/logo.png b/src/assets/images/user/logo.png index e2d680a3..dc204228 100644 Binary files a/src/assets/images/user/logo.png and b/src/assets/images/user/logo.png differ diff --git a/src/assets/mocks/menu-data.json b/src/assets/mocks/menu-data.json index 7fbdce04..dd98cd3e 100644 --- a/src/assets/mocks/menu-data.json +++ b/src/assets/mocks/menu-data.json @@ -183,6 +183,31 @@ "icon": "anticon anticon-dashboard", "link": "/order-management/bulk" }, + { + "text": "结算单", + "children": [ + { + "text": "司机管理", + "icon": "anticon anticon-dashboard", + "link": "/order-management/driver-manage" + }, + { + "text": "车辆管理", + "icon": "anticon anticon-dashboard", + "link": "/order-management/car-manage" + } + ] + }, + { + "text": "补录单", + "children": [ + { + "text": "补录运单", + "icon": "anticon anticon-dashboard", + "link": "/order-management/additionalc" + } + ] + }, { "text": "整车订单详情", "icon": "anticon anticon-dashboard", diff --git a/src/favicon.ico b/src/favicon.ico index 5fdadf51..0ae55bcd 100644 Binary files a/src/favicon.ico and b/src/favicon.ico differ diff --git a/src/index.html b/src/index.html index a8e1e9bc..6e93e6f5 100644 --- a/src/index.html +++ b/src/index.html @@ -1,8 +1,8 @@ @@ -15,7 +15,7 @@ - +