From e699a6b8a02fc08f6fcdd304635f71b93150bbac Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 21 Feb 2022 16:26:51 +0800 Subject: [PATCH 01/13] fix bug --- .../components/vehicle/vehicle.component.html | 8 +++++++- .../components/vehicle/vehicle.component.ts | 8 ++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/app/routes/waybill-management/components/vehicle/vehicle.component.html b/src/app/routes/waybill-management/components/vehicle/vehicle.component.html index 862c0c01..b9f61349 100644 --- a/src/app/routes/waybill-management/components/vehicle/vehicle.component.html +++ b/src/app/routes/waybill-management/components/vehicle/vehicle.component.html @@ -1,7 +1,7 @@ - - +
- +
@@ -23,9 +30,8 @@
- - + + + - + + - + +
- \ No newline at end of file + 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 cf8a24d4..b2caf424 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 @@ -329,33 +329,33 @@ export class OrderManagementReceiptsAuditComponent implements OnInit { { title: '操作', fixed: 'right', - width: '120px', + width: '136px', className: 'text-left', buttons: [ { - text: '通过', + text: '生成电子单据', + click: _record => this.generate(_record, 2), + iif: item => item.auditStatus == '1', + acl: { ability: ['ORDER-RECEIPTS-electronicBillingOne'] }, + }, + { + text: '通过　　　　', click: _record => this.sign(_record), iif: item => item.auditStatus == '1', acl: { ability: ['ORDER-RECEIPTS-billAuditPassBatch'] }, }, { - text: '生成电子单据', - click: _record => this.generate(_record, 2), - iif: item => item.auditStatus == '1', - acl: { ability: ['ORDER-RECEIPTS-generate'] }, - }, - { - text: '查看凭证', - click: _record => this.generate(_record, 3), - iif: item => item.auditStatus == '2', - acl: { ability: ['ORDER-RECEIPTS-view'] }, - }, - { - text: '修改', + text: '修改　　　　', click: _record => this.modification(_record), iif: item => item.auditStatus == '1' , acl: { ability: ['ORDER-RECEIPTS-updateBillExamine'] }, }, + { + text: '查看凭证　', + click: _record => this.generate(_record, 3), + iif: item => item.auditStatus == '2', + acl: { ability: ['ORDER-RECEIPTS-view'] }, + }, ] } ]; From 9e01d52198d0176d8afda9a6e8bfcc82bfbc1fe9 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 21 Feb 2022 19:31:05 +0800 Subject: [PATCH 05/13] fix bug --- .../compliance-audit.component.ts | 1 - .../receipts-audit.component.ts | 6 ++++- .../voucher-view/voucher-view.component.ts | 10 ++++----- .../bulk-detail/bulk-detail.component.html | 6 ++--- .../bulk-detail/bulk-detail.component.ts | 8 +++---- .../components/bulk/bulk.component.html | 22 +++++++++---------- .../vehicle-detail.component.html | 15 +++---------- .../components/vehicle/vehicle.component.html | 12 +++++----- 8 files changed, 35 insertions(+), 45 deletions(-) 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 @@ @@ -90,10 +90,10 @@ {{ item.billCode }}
- {{ item?.serviceTypeName }} + {{item?.billStatusLabel}}
- {{ item?.auditStatusLabel }} + {{item?.billTypeLabel}}{{item?.serviceTypeLabel}}
From 5a3ea6ca503c9f28492b3ec38fb2b5045eb0ce97 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 21 Feb 2022 20:27:12 +0800 Subject: [PATCH 13/13] fix bug --- .../receipts-audit.component.html | 4 +- .../receipts-audit.component.ts | 4 +- .../voucher-view/voucher-view.component.html | 5 +- .../voucher-view/voucher-view.component.less | 113 ++++++++++++++++-- 4 files changed, 113 insertions(+), 13 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 27bb781f..8402a5ee 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-02-21 20:13:21 + * @LastEditTime : 2022-02-21 20:16:13 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\receipts-audit\\receipts-audit.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -101,7 +101,7 @@
{{ item?.weight ? item?.weight + '吨/' : '' }} {{ item?.volume ? item?.volume + '方/' : '' }} - {{ item?.goodsNumber ? item?.goodsNumber + '吨' : '' }} + {{ item?.goodsNumber ? item?.goodsNumber + '件' : '' }}
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 102f9147..27389f1a 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 @@ -81,9 +81,9 @@ export class OrderManagementReceiptsAuditComponent implements OnInit { if (res) { let totalCount = 0; res.forEach((element: any) => { - if (element.billStatusLabel === '待审核') { + if (element.auditStatus == '1') { this.tabs.receivedQuantity = element.quantity; - } else if (element.billStatusLabel === '已审核') { + } else if (element.auditStatus == '2') { this.tabs.stayQuantity = element.quantity; } totalCount += element.quantity; 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 79c0788c..95f1d062 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 @@ -4,11 +4,11 @@ * @Author : Shiming * @Date : 2021-12-15 13:17:42 * @LastEditors : Shiming - * @LastEditTime : 2022-02-15 15:12:02 + * @LastEditTime : 2022-02-21 20:25:47 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\audit\\voucher-view\\voucher-view.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> - +
@@ -23,6 +23,7 @@
+
diff --git a/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.less b/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.less index 30444d6b..2502ed97 100644 --- a/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.less +++ b/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.less @@ -1,7 +1,106 @@ - .left_btn { - width: 50px; - height: 32px; - padding-left: 8px; - line-height:32px; - background-color: #d7d7d7; - } \ No newline at end of file +:host{ + ::ng-deep { + .ant-input-borderless{ + padding: 0; + padding-top: 4px; + color: black; + resize:none; + } + .hideBtn .ant-upload-list-item-actions button{ + &:last-child{ + display: none; + } + } + } + } + .sfBox { + position: relative; + .example { + position: absolute; + top: 215px; + right: 265px; + color: #1890ff; + cursor: pointer; + .popBox { + position: absolute; + top: -170px; + left: -125px; + width: 300px; + padding: 20px; + text-align: center; + background: #fff; + border: solid 1px #eee; + border-radius: 6px; + box-shadow: 0 1px 5px 1px #ececec; + &::before { + position: absolute; + bottom: -5px; + left: 50%; + width: 10px; + height: 10px; + margin-left: -5px; + background: #fff; + box-shadow: 0 1px 5px 1px #ececec; + transform: rotate(45deg); + content: ''; + } + &::after { + position: absolute; + bottom: 0; + left: 0; + z-index: 10; + width: 100%; + height: 10px; + background: #fff; + content: ''; + } + img { + max-width: 100%; + max-height: 200px; + } + } + } + .pr { + position: relative; + } + + .pa { + position: absolute; + top: 35px; + left: 150px; + } + + .tips { + display: flex; + margin-bottom: 0; + color: #333; + + dt { + width: 150px; + } + + dd { + width: 190px; + margin-bottom: 0; + text-align: center; + } + } + .positionSet{ + top: 356px; + right: 235px; + } + .positionSet01{ + top: 500px; + right: 200px; + } + .positionSet02{ + top: 664px; + right: 265px; + } + .positionSet03{ + top: 808px; + right: 205px; + + } + } + \ No newline at end of file