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 5db9b5ff..b29ce305 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.ts +++ b/src/app/routes/order-management/components/bulk/bulk.component.ts @@ -552,6 +552,11 @@ export class OrderManagementBulkComponent extends BasicTableComponent implements click: _record => this.changeOrder(_record), iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3', acl: { ability: ['ORDER-BULK-BulkBillDetail'] } + },{ + text: '订单上报推送', + click: _record => this.orderReportPush(_record), + iif: item => item.overallPaymentStatus === '2' && (item.billStatus === '4' || item.billStatus === '5') + // acl: { ability: ['VEHICLE-LIST-view'] }, } ] } @@ -659,6 +664,15 @@ export class OrderManagementBulkComponent extends BasicTableComponent implements this.changeId = item.id; this.isVisible = true; } + + orderReportPush(item: any) { + this.service.request(this.service.$api_manualOrderSubmission,{id: item.id}).subscribe( res=> { + if(res) { + this.st.reload(this.st.pi) + this.service.msgSrv.success('推送成功'); + } + }) + } /** * 浮动费用查看 */ 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 542019b6..c6c12082 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.html +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.html @@ -50,7 +50,7 @@ + [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" [loading]="service.http.loading"> {{ item.billCode }}
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 ef242949..19b0ddd9 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts @@ -469,6 +469,12 @@ export class OrderManagementVehicleComponent extends BasicTableComponent impleme click: _record => this.viewTrack(_record), iif: item => item.billStatus !== '1' && item.billStatus !== '6' // acl: { ability: ['VEHICLE-LIST-view'] }, + }, + { + text: '订单上报推送', + click: _record => this.orderReportPush(_record), + iif: item => item.overallPaymentStatus === '2' && (item.billStatus === '4' || item.billStatus === '5') + // acl: { ability: ['VEHICLE-LIST-view'] }, } ] } @@ -738,6 +744,16 @@ export class OrderManagementVehicleComponent extends BasicTableComponent impleme }); } + // 订单上报推送 + orderReportPush(item: any) { + this.service.request(this.service.$api_manualOrderSubmission,{id: item.id}).subscribe( res=> { + if(res) { + this.st.reload(this.st.pi) + this.service.msgSrv.success('推送成功'); + } + }) + } + // *确认签收 confirmReceipt(item: any) { 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 087d7a70..f68ed55c 100644 --- a/src/app/routes/order-management/services/order-management.service.ts +++ b/src/app/routes/order-management/services/order-management.service.ts @@ -219,6 +219,8 @@ export class OrderManagementService extends ShipperBaseService { public $api_getBillTakeGoods = `/api/sdc/billOperate/getBillTakeGoods`; // 生成提/卸货单 public $api_createBillEsignGoods = `/api/sdc/billOperate/createBillEsignGoods`; + // 订单上报推送 + $api_manualOrderSubmission = '/api/sdc/billOperate/manualOrderSubmission'; // // 生成卸货单 // public $api_createBillDischargeGoods = `/api/sdc/billOperate/createBillDischargeGoods`; diff --git a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts index fc07ab75..67b57200 100644 --- a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts +++ b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts @@ -440,12 +440,15 @@ export class TaxManagementOrderReportingComponent implements OnInit { if (item?.putStatus != '0') { status = true } - }); if(status) { this.service.msgSrv.warning('选择了已上传,请重新勾选!'); return; } + if(this.selectedRows.find(item => item.checkStatus !== '1')) { + this.service.msgSrv.warning('选择了未通过校验的订单,请重新勾选!'); + return; + } let params: any[] = []; this.selectedRows.forEach(item => { params.push(item.id);