From 4c544cbcd0eb17101f08d4b17e1a4cc90ba70bce Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 12 Jan 2022 13:35:52 +0800 Subject: [PATCH 1/2] =?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/bulk/bulk.component.ts | 7 ++++- .../components/vehicle/vehicle.component.html | 9 +++---- .../vehicle-detail.component.ts | 15 ++++++----- .../components/vehicle/vehicle.component.ts | 2 +- .../vehicle/vehicle.component.spec.ts | 20 +++++++++----- .../components/vehicle/vehicle.component.ts | 26 ++++++++++++++++--- 6 files changed, 55 insertions(+), 24 deletions(-) diff --git a/src/app/routes/order-management/components/bulk/bulk.component.ts b/src/app/routes/order-management/components/bulk/bulk.component.ts index ede06660..c0ef5cb5 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.ts +++ b/src/app/routes/order-management/components/bulk/bulk.component.ts @@ -658,6 +658,9 @@ tabs = { }, nzFooter: null }); + modalRef.afterClose.subscribe((result: any) => { + this.st.load(1); + }); } userAction() { let params: any[] = []; @@ -668,6 +671,7 @@ tabs = { console.log(params) this.service.request(this.service.$api_get_batchSignBulkOrder, params).subscribe(res => { if (res) { + this.st.load(1); console.log(res); } else { this.service.msgSrv.error(res.msg); @@ -684,7 +688,7 @@ tabs = { this.service.request(this.service.$api_get_cancelAnOrder, {id: item.id}).subscribe((res) => { if (res === true) { this.service.msgSrv.success('操作成功！'); - this.st?.reload(); + this.st?.reload(1); this.initST(); } }), @@ -699,6 +703,7 @@ tabs = { if(res) { this.service.msgSrv.success('撤销成功！') this.stFloat.reload() + this.st?.reload(1); } else { this.service.msgSrv.error(res.msg) } 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 41fb6da9..c660c9f0 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.html +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.html @@ -1,7 +1,7 @@ - -
{{item.no}}
- - + diff --git a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts index a1529c26..f8230b5b 100644 --- a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts +++ b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts @@ -102,13 +102,14 @@ export class SupplyManagementVehicleDetailComponent implements OnInit { nzTitle: '确定取消货源吗?', nzContent: `取消后不可恢复，谨慎操作`, nzOnOk: () => - this.service.msgSrv.success('操作成功！') - // this.service.request(this.service.$api_cancle_goods_source, { id: this.i.id }).subscribe((res) => { - // if (res === true) { - // this.service.msgSrv.success('操作成功！'); - // this.getGoodsSourceDetail(); - // } - // }), + console.log('1') + // this.service.request(this.service.$api_cancle_goods_source, {id: record.id}).subscribe(res => { + // if (res === true) { + // this.service.msgSrv.success('操作成功！'); + // this.st?.reload(); + // this.getGoodsSourceStatistical(); + // } + // }) }) } diff --git a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts index bcbd8c05..8a11cd6e 100644 --- a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts @@ -236,7 +236,7 @@ export class SupplyManagementVehicleComponent implements OnInit { nzTitle: '确定取消货源吗?', nzContent: `取消后不可恢复，谨慎操作`, nzOnOk: () => - this.service.request(this.service.$api_cancle_goods_source, [record.id]).subscribe(res => { + this.service.request(this.service.$api_cancle_goods_source, {id: record.id}).subscribe(res => { if (res === true) { this.service.msgSrv.success('操作成功！'); this.st?.reload(); diff --git a/src/app/routes/waybill-management/components/vehicle/vehicle.component.spec.ts b/src/app/routes/waybill-management/components/vehicle/vehicle.component.spec.ts index e231763d..c8fb27ed 100644 --- a/src/app/routes/waybill-management/components/vehicle/vehicle.component.spec.ts +++ b/src/app/routes/waybill-management/components/vehicle/vehicle.component.spec.ts @@ -1,19 +1,27 @@ +/* + * @Author: your name + * @Date: 2021-12-07 14:52:29 + * @LastEditTime: 2022-01-12 13:14:49 + * @LastEditors: your name + * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE + * @FilePath: \tms-obc-web\src\app\routes\waybill-management\components\vehicle\vehicle.component.spec.ts + */ import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; -import { SupplyManagementVehicleComponent } from './vehicle.component'; +import { WaybillManagementVehicleComponent } from './vehicle.component'; -describe('SupplyManagementVehicleComponent', () => { - let component: SupplyManagementVehicleComponent; - let fixture: ComponentFixture; +describe('WaybillManagementVehicleComponent', () => { + let component: WaybillManagementVehicleComponent; + let fixture: ComponentFixture; beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - declarations: [ SupplyManagementVehicleComponent ] + declarations: [ WaybillManagementVehicleComponent ] }) .compileComponents(); })); beforeEach(() => { - fixture = TestBed.createComponent(SupplyManagementVehicleComponent); + fixture = TestBed.createComponent(WaybillManagementVehicleComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts b/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts index 3a6ec4b7..0ae544d0 100644 --- a/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts @@ -86,7 +86,7 @@ export class WaybillManagementVehicleComponent implements OnInit { this.schema = { properties: { _$expand: { type: 'boolean', ui: { hidden: true } }, - wayBillCodeno: { + wayBillCode: { type: 'string', title: '运单号' }, @@ -94,9 +94,29 @@ export class WaybillManagementVehicleComponent implements OnInit { type: 'string', title: '货源编号' }, - no1: { + shipperAppUserId: { type: 'string', - title: '货主' + title: '货主', + ui: { + widget: 'select', + serverSearch: true, + searchDebounceTime: 300, + searchLoadingText: '搜索中...', + visibleIf: { + _$expand: (value: boolean) => value + }, + onSearch: (q: any) => { + console.log(q) + if (!!q) { + return this.service + .request(this.service.$api_enterpriceList, { enterpriseName: q}) + .pipe(map((res: any) => (res as any[]).map((i) => ({ label: i.enterpriseName, value: i.id } as SFSchemaEnum)))) + .toPromise(); + } else { + return of([]); + } + }, + } as SFSelectWidgetSchema, }, loadingPlace: { type: 'string', From 9dd5d07c15ae8d1208cae52b1ffde72f9a18cccd Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 12 Jan 2022 13:56:55 +0800 Subject: [PATCH 2/2] =?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 --- .../complaint-detail.component.ts | 18 +++++++++++++ .../confir-receipt.component.ts | 26 +++++++++---------- .../components/list/list.component.html | 15 ++++++----- src/app/shared/shared-zorro.module.ts | 4 +-- src/style-icons-auto.ts | 6 +++-- src/style-icons.ts | 4 +-- 6 files changed, 47 insertions(+), 26 deletions(-) diff --git a/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.ts b/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.ts index e85ca1ca..3267706f 100644 --- a/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.ts +++ b/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.ts @@ -67,6 +67,24 @@ export class OrderManagementComplaintDetailComponent implements OnInit { change: (value, orgData) => console.log(value, orgData), } as SFSelectWidgetSchema, }, + complainantName: { + title: '投诉人', + type: 'string', + maxLength: 30, + ui: { + widget: 'text', + change: (value, orgData) => console.log(value, orgData), + } as SFSelectWidgetSchema, + }, + complainantPartyLabel: { + title: '被投诉人', + type: 'string', + maxLength: 30, + ui: { + widget: 'text', + change: (value, orgData) => console.log(value, orgData), + } as SFSelectWidgetSchema, + }, complaintDetails: { title: '投诉详情', type: 'string', diff --git a/src/app/routes/order-management/modal/vehicle/confir-receipt/confir-receipt.component.ts b/src/app/routes/order-management/modal/vehicle/confir-receipt/confir-receipt.component.ts index 243b2a48..cc8a3e4c 100644 --- a/src/app/routes/order-management/modal/vehicle/confir-receipt/confir-receipt.component.ts +++ b/src/app/routes/order-management/modal/vehicle/confir-receipt/confir-receipt.component.ts @@ -1,7 +1,7 @@ /* * @Author: your name * @Date: 2021-12-15 13:17:42 - * @LastEditTime: 2021-12-22 19:19:25 + * @LastEditTime: 2022-01-12 13:37:05 * @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\vehicle\confir-receipt\confir-receipt.component.ts @@ -143,18 +143,18 @@ export class VehicleConfirReceiptComponent implements OnInit { }) }); this.listImagUrls = arr; - this.service.request(this.service.$api_getUserDetailByAppUserId, {id: this.dataInfo?.payeeId}).subscribe((res: any) => { - console.log(res) - this.payeeList = res; - }) - this.service.request(this.service.$api_getUserDetailByAppUserId, {id: this.dataInfo?.driverId}).subscribe((res: any) => { - console.log(res) - this.driverList = res; - }) - this.service.request(this.service.$api_getCarLicenseByIds, {id: this.dataInfo?.carId}).subscribe((res: any) => { - console.log(res) - this.carList = res; - }) + // this.service.request(this.service.$api_getUserDetailByAppUserId, {id: this.dataInfo?.payeeId}).subscribe((res: any) => { + // console.log(res) + // this.payeeList = res; + // }) + // this.service.request(this.service.$api_getUserDetailByAppUserId, {id: this.dataInfo?.driverId}).subscribe((res: any) => { + // console.log(res) + // this.driverList = res; + // }) + // this.service.request(this.service.$api_getCarLicenseByIds, {id: this.dataInfo?.carId}).subscribe((res: any) => { + // console.log(res) + // this.carList = res; + // }) console.log(cost) this.costDetail = [cost]; }) diff --git a/src/app/routes/vehicle/components/list/list.component.html b/src/app/routes/vehicle/components/list/list.component.html index b9256dc1..6517b5d5 100644 --- a/src/app/routes/vehicle/components/list/list.component.html +++ b/src/app/routes/vehicle/components/list/list.component.html @@ -1,7 +1,7 @@