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',