diff --git a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts index 12bcadef..df351650 100644 --- a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts +++ b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts @@ -10,7 +10,6 @@ import { ConfirReceiptComponent } from '../../modal/bulk/confir-receipt/confir-r import { of } from 'rxjs'; import { ShipperBaseService } from '@shared'; import { Router } from '@angular/router'; -import { orderManagementVoucherViewComponent } from '../../modal/audit/voucher-view/voucher-view.component'; @Component({ selector: 'app-order-management-compliance-audit', diff --git a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts index b2caf424..102f9147 100644 --- a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts +++ b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts @@ -414,8 +414,12 @@ export class OrderManagementReceiptsAuditComponent implements OnInit { } // 生成电子单据 generate(item: any, sts?: number) { + let text = '查看凭证'; + if(sts == 2) { + text = '生成电子单据'; + } const modalRef = this.modal.create({ - nzTitle: '查看凭证', + nzTitle: text, nzWidth: '50%', nzContent: orderManagementVoucherViewComponent, nzComponentParams: { diff --git a/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts b/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts index 0ee4bd77..5352885d 100644 --- a/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts +++ b/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts @@ -48,7 +48,8 @@ export class orderManagementVoucherViewComponent implements OnInit { this.initSF(); } initSF() { - if(this.Status === 1) { + console.log(this.Status) + if(this.Status == 1) { this.schema = { properties: { @@ -216,6 +217,7 @@ export class orderManagementVoucherViewComponent implements OnInit { required: ['loadingLadingBillFilePath', 'loadingPeopleVehiclesGoodsFilePath','unloadingLadingBillFilePath','unloadingPeopleVehiclesGoodsFilePath' ] }; }else { + console.log('只读') this.schema = { properties: { loadingLadingBillFilePath: { @@ -383,6 +385,7 @@ export class orderManagementVoucherViewComponent implements OnInit { } as SFUploadWidgetSchema, } }, + required: ['loadingLadingBillFilePath', 'loadingPeopleVehiclesGoodsFilePath','unloadingLadingBillFilePath','unloadingPeopleVehiclesGoodsFilePath' ] }; } this.ui = { @@ -418,10 +421,7 @@ export class orderManagementVoucherViewComponent implements OnInit { }) } sure() { - const params = { - id: this.i.id, - } - console.log(params) + const params = [this.i.id]; this.service.request(this.service.$api_get_billAuditPass, params).subscribe((res) => { if(res) { this.service.msgSrv.success('审核成功!') diff --git a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html index f66658bd..a5491976 100644 --- a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html @@ -1,7 +1,7 @@