From 331219c6a042d4414e075261275cad18dbb19e86 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 30 Dec 2021 19:36:20 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/vehicle/vehicle.component.ts | 2 +- .../modify-captain.component.html | 32 ++++++-- .../modify-captain.component.ts | 76 +++++++++++-------- .../services/order-management.service.ts | 6 +- 4 files changed, 77 insertions(+), 39 deletions(-) diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.ts b/src/app/routes/order-management/components/vehicle/vehicle.component.ts index 440c6c41..32faa29f 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts @@ -683,7 +683,7 @@ resourceStatus: any; } const modal = this.modal.create({ nzTitle: '修改车队长', - nzWidth: 600, + nzWidth: 900, nzContent: VehicleModifyCaptainComponent, nzComponentParams: { data: { ids: params, } }, nzFooter: null, diff --git a/src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.html b/src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.html index 1a948334..d1235fec 100644 --- a/src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.html +++ b/src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.html @@ -1,15 +1,37 @@ - - - - + +
+
+ + +
+ +
+ +
+
+ + + + + + + + +
diff --git a/src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.ts b/src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.ts index f28e008d..4527dbec 100644 --- a/src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.ts +++ b/src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.ts @@ -1,17 +1,17 @@ /* * @Author: your name * @Date: 2021-12-14 14:03:07 - * @LastEditTime: 2021-12-30 11:13:09 + * @LastEditTime: 2021-12-30 16:57:01 * @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\modal\bulk\update-freight\update-freight.component.ts */ import { Component, Input, OnInit, ViewChild } from '@angular/core'; -import { SFComponent, SFSchema, SFUISchema } from '@delon/form'; +import { STColumn, STComponent } from '@delon/abc/st'; +import {SFComponent, SFNumberWidgetSchema, SFSchema, SFUISchema} from '@delon/form'; import { NzMessageService } from 'ng-zorro-antd/message'; import { NzModalRef } from 'ng-zorro-antd/modal'; import { OrderManagementService } from '../../../services/order-management.service'; -import { ShipperBaseService } from '@shared'; @Component({ selector: 'app-order-management-vehicle-modify-captain', @@ -20,52 +20,70 @@ import { ShipperBaseService } from '@shared'; }) export class VehicleModifyCaptainComponent implements OnInit { @ViewChild('sf', { static: false }) sf!: SFComponent; + @ViewChild('st', { static: false }) st!: STComponent; schema: SFSchema = {}; ui: SFUISchema = {}; - + Columns: STColumn[] =[] aggreechecked = false; - @Input() data: any; - constructor( - private modal: NzModalRef, - private msgSrv: NzMessageService, - public service: OrderManagementService, - private service2: ShipperBaseService - ) {} + constructor(private modal: NzModalRef, private msgSrv: NzMessageService, public service: OrderManagementService, ) {} ngOnInit(): void { - console.log(this.data); + console.log(this.data) this.initSF(); + this.initST(); } initSF() { this.schema = { - enterpriseInfoName: { - type: 'string', - title: '网络货运人', - ui: { - widget: 'select', - placeholder: '请选择', - visibleIf: { - _$expand: (value: boolean) => value - }, - allowClear: true, - asyncData: () => this.service2.getNetworkFreightForwarder() - } + properties: { + enterpriseInfoName: { + type: 'string', + title: '车队长手机号', + maxLength: 11 + }, }, required: ['enterpriseInfoName'] }; this.ui = { '*': { - spanLabelFixed: 100, + spanLabelFixed: 130, grid: { span: 16 } } }; } - + get reParams() { + return { + ...this.sf?.value, + }; + } + initST() { + this.Columns = [ + { title: '司机头像', index: 'auditStatusLabel',width: '120px', }, + { title: '司机姓名', index: 'auditStatusLabel' ,width: '120px',}, + { + title: '实名认证状态', + className: 'text-center', + index: 'settlementBasis', + type: 'badge', + width: '120px', + badge: { + '1': { text: '待申请', color: 'warning' }, + '2': { text: '已支付', color: 'success' }, + '3': { text: '已拒绝', color: 'warning' }, + '4': { text: '申请中', color: 'warning' }, + }, + }, + { title: '收款账户',width: '200px', render: 'shipperAppUserId' }, + { title: '操作', width: '120px',}, + + ]; + } save(value: any): void { - const params = {}; + console.log(this.st?._data) + const params = { + }; this.service.request(this.service.$api_get_insertFreightChangeWhole, params).subscribe((res: any) => { if (res) { @@ -78,7 +96,5 @@ export class VehicleModifyCaptainComponent implements OnInit { close(): void { this.modal.destroy(); } - search(value: any) { - console.log(value); - } + } diff --git a/src/app/routes/order-management/services/order-management.service.ts b/src/app/routes/order-management/services/order-management.service.ts index 6bb760c0..5f997365 100644 --- a/src/app/routes/order-management/services/order-management.service.ts +++ b/src/app/routes/order-management/services/order-management.service.ts @@ -1,19 +1,19 @@ /* * @Author: your name * @Date: 2021-12-03 15:31:52 - * @LastEditTime: 2021-12-29 20:44:48 + * @LastEditTime: 2021-12-30 16:09:00 * @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\services\order-management.service.ts */ import { Injectable, Injector } from '@angular/core'; import { map } from 'rxjs/operators'; -import { BaseService } from 'src/app/shared/services'; +import { ShipperBaseService } from '@shared'; @Injectable({ providedIn: 'root' }) -export class OrderManagementService extends BaseService { +export class OrderManagementService extends ShipperBaseService { $api_get_getEnterpriseNetTransHis = `/api/mdc/enterpriseNetTransHis/getEnterpriseNetTransHis`; $api_get_catalogue_member = `/user?_allow_anonymous=true`;