From 17b457cd0db45a4a353f882fe06527cb39c88219 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 24 Jan 2022 11:11:47 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E6=8E=A5=E5=8F=A3=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../receipts-audit.component.html | 10 ++-- .../voucher-view/voucher-view.component.html | 2 +- .../voucher-view/voucher-view.component.ts | 56 ++++++++----------- .../services/order-management.service.ts | 4 ++ 4 files changed, 32 insertions(+), 40 deletions(-) diff --git a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html index 5cacce22..ecf5601f 100644 --- a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html +++ b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-12 10:52:50 * @LastEditors : Shiming - * @LastEditTime : 2022-01-21 16:57:10 + * @LastEditTime : 2022-01-24 11:06:06 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\receipts-audit\\receipts-audit.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -63,13 +63,13 @@
- - + +
- - + +
装 | {{item?.loadingTime}}
diff --git a/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.html b/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.html index 6ad44af6..24e884c1 100644 --- a/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.html +++ b/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.html @@ -27,5 +27,5 @@
- +
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 2be1787b..48c2640f 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 @@ -398,49 +398,37 @@ export class orderManagementVoucherViewComponent implements OnInit { }; } save(value: any): void { - if(this.Status === 1) { - if(!value.time) { + if(!value) { 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, - time: value.time, } - // params.time = this.datePipe.transform(value.time, 'yyyy-MM-dd HH:mm:ss ') - // this.service.request(this.service.$api_get_insertWholeUnloadCarInfo, params).subscribe((res) => { - // if(res) { - // this.service.msgSrv.success('确认到车成功！') - // this.modal.destroy(true); - // } - // }) - } else { - if(!value.time || !this.data.weight) { - this.service.msgSrv.warning('必填项为空！') - return; - } - console.log(value) - console.log(this.i) - const params = { - id: this.i?.id, - unloadingLadingBillFilePath: value.unloadingLadingBillFilePath.data.fullFilePath, - unloadingPeopleVehiclesGoodsFilePath: value.unloadingPeopleVehiclesGoodsFilePath.data.fullFilePath, - time: value.time, - volume: this.data.volume, - weight: this.data.weight + console.log(params) + this.service.request(this.service.$api_get_updateBillExamine, params).subscribe((res) => { + if(res) { + this.service.msgSrv.success('修改成功！') + this.modal.destroy(true); } - // params.time = this.datePipe.transform(value.time, 'yyyy-MM-dd HH:mm:ss ') - // console.log(params) - // this.service.request(this.service.$api_get_insertBulkUnloadCarInfo, params).subscribe((res) => { - // if(res) { - // this.service.msgSrv.success('确认到车成功！') - // this.modal.destroy(true); - // } - // }) - } - + }) + } + sure() { + const params = { + id: this.i.id, + } + console.log(params) + this.service.request(this.service.$api_get_billAuditPass, params).subscribe((res) => { + if(res) { + this.service.msgSrv.success('审核成功！') + this.modal.destroy(true); + } + }) } // 确认到车界面信息(两个只能看的图片) initData() { 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 7deb33b5..53ae803d 100644 --- a/src/app/routes/order-management/services/order-management.service.ts +++ b/src/app/routes/order-management/services/order-management.service.ts @@ -135,6 +135,10 @@ export class OrderManagementService extends ShipperBaseService { public $api_get_billAudit = '/api/sdc/billExamine/billAudit'; // 统计单据审核状态数量 public $api_get_getAuditStatistical = '/api/sdc/billExamine/getAuditStatistical'; + // 修改单据审核 + public $api_get_updateBillExamine = '/api/sdc/billExamine/updateBillExamine'; + // 单据审核通过 + public $api_get_billAuditPass = '/api/sdc/billExamine/billAuditPass'; // 查询规则抽查列表