Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

车辆接口更新

Browse Source
This commit is contained in:
wangshiming
2022-01-25 14:32:30 +08:00
parent bc8304e930
commit 7d4875707b
7 changed files with 36 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/routes/order-management/components/compliance-audit/compliance-audit.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-01-12 10:52:50
* @LastEditors : Shiming
* @LastEditTime : 2022-01-24 14:33:59
* @LastEditTime : 2022-01-25 14:02:24
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\compliance-audit\\compliance-audit.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@ -108,13 +108,13 @@
<ng-template #extraTemplate>
<div>
<button nz-button nzType="primary" (click)="audit()">
批量签收
批量抽查
</button>
</div>
</ng-template>
<nz-modal [(nzVisible)]="isVisibleRE" [nzWidth]="600" [nzFooter]="nzModalFooterview2" (nzOnOk)="handleOK()" nzTitle="审核" (nzOnCancel)="handleCancel('1')">
<nz-modal [(nzVisible)]="isVisibleRE" [nzWidth]="600" [nzFooter]="nzModalFooterview2" (nzOnOk)="handleOK()" nzTitle="抽查" (nzOnCancel)="handleCancel('1')">
<ng-container *nzModalContent>
<sf #sfView [schema]="schemaView" [ui]="uiView" [compact]="true" [button]="'none'">
</sf>

22
src/app/routes/order-management/components/vehicle/vehicle.component.spec.ts
View File

@ -1,19 +1,29 @@
/*
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-03 15:31:52
* @LastEditors : Shiming
* @LastEditTime : 2022-01-25 13:28:47
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle\\vehicle.component.spec.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
import { SupplyManagementVehicleComponent } from './vehicle.component';
import { OrderManagementVehicleComponent } from './vehicle.component';
describe('SupplyManagementVehicleComponent', () => {
let component: SupplyManagementVehicleComponent;
let fixture: ComponentFixture<SupplyManagementVehicleComponent>;
describe('OrderManagementVehicleComponent', () => {
let component: OrderManagementVehicleComponent;
let fixture: ComponentFixture<OrderManagementVehicleComponent>;
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [ SupplyManagementVehicleComponent ]
declarations: [ OrderManagementVehicleComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(SupplyManagementVehicleComponent);
fixture = TestBed.createComponent(OrderManagementVehicleComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});

15
src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts
View File

@ -213,7 +213,7 @@ export class orderManagementVoucherViewComponent implements OnInit {
} as SFUploadWidgetSchema,
}
},
required: ['time']
required: ['loadingLadingBillFilePath', 'loadingPeopleVehiclesGoodsFilePath','unloadingLadingBillFilePath','unloadingPeopleVehiclesGoodsFilePath' ]
};
}else {
this.schema = {
@ -383,7 +383,6 @@ export class orderManagementVoucherViewComponent implements OnInit {
} as SFUploadWidgetSchema,
}
},
required: ['time', 'weight' ]
};
}
this.ui = {
@ -398,17 +397,17 @@ export class orderManagementVoucherViewComponent implements OnInit {
};
}
save(value: any): void {
if(!value) {
if(!this.sf.valid) {
this.service.msgSrv.warning('必填项为空！')
return;
}
console.log(value)
const params = {
id: this.i.id,
loadingLadingBillFilePath: value.loadingLadingBillFilePath.data.fullFilePath,
loadingPeopleVehiclesGoodsFilePath: value.loadingPeopleVehiclesGoodsFilePath.data.fullFilePath,
unloadingLadingBillFilePath: value.unloadingLadingBillFilePath.data.fullFilePath,
unloadingPeopleVehiclesGoodsFilePath: value.unloadingPeopleVehiclesGoodsFilePath.data.fullFilePath,
id: this.i?.id,
loadingLadingBillFilePath: value?.loadingLadingBillFilePath?.data?.fullFilePath,
loadingPeopleVehiclesGoodsFilePath: value?.loadingPeopleVehiclesGoodsFilePath?.data?.fullFilePath,
unloadingLadingBillFilePath: value?.unloadingLadingBillFilePath?.data?.fullFilePath,
unloadingPeopleVehiclesGoodsFilePath: value?.unloadingPeopleVehiclesGoodsFilePath?.data?.fullFilePath,
}
console.log(params)
this.service.request(this.service.$api_get_updateBillExamine, params).subscribe((res) => {