From 64096c02a1569c4579e573e71137611eb29c023b Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 30 Dec 2021 14:26:28 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/vehicle/vehicle.component.html | 2 +- .../components/vehicle/vehicle.component.ts | 33 ++++++++++++- .../freight-people.component.ts | 33 +++++++------ ...ent.less => freight-people.component.less} | 0 .../modify-captain.component.html | 6 ++- .../modify-captain.component.ts | 12 +++-- .../services/order-management.service.ts | 27 ++++++++++- .../onecar-publish.component.ts | 16 ++++--- .../cancellation-invoice.component.html | 17 +++++-- .../cancellation-invoice.component.ts | 46 +++++++++---------- .../invoice-requested-detail.component.ts | 6 +-- .../invoice-requested.component.ts | 2 +- .../services/ticket.service.ts | 6 ++- .../services/business/shipper-base.service.ts | 9 ++++ 14 files changed, 153 insertions(+), 62 deletions(-) rename src/app/routes/order-management/modal/vehicle/modify-captain/{modify-captain.component.less => freight-people.component.less} (100%) 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 2ab307ce..c1b72eb2 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.html +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.html @@ -218,7 +218,7 @@ - +
diff --git a/src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.ts b/src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.ts index 130bd16e..33e8abc7 100644 --- a/src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.ts +++ b/src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.ts @@ -1,7 +1,7 @@ /* * @Author: your name * @Date: 2021-12-14 14:03:07 - * @LastEditTime: 2021-12-29 20:07:40 + * @LastEditTime: 2021-12-30 11:13:09 * @LastEditors: Please set LastEditors * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @FilePath: \tms-obc-web\src\app\routes\order-management\modal\bulk\update-freight\update-freight.component.ts @@ -13,7 +13,7 @@ import { import { NzMessageService } from 'ng-zorro-antd/message'; import { NzModalRef } from 'ng-zorro-antd/modal'; import { OrderManagementService } from '../../../services/order-management.service'; -import { ShipperBaseService } from '../../../../../shared/services/business/shipper-base.service'; +import { ShipperBaseService } from '@shared'; @Component({ selector: 'app-order-management-vehicle-modify-captain', @@ -34,9 +34,9 @@ export class VehicleModifyCaptainComponent implements OnInit { ngOnInit(): void { console.log(this.data) - this.initSF(this.data); + this.initSF(); } - initSF(data: any) { + initSF() { this.schema = { enterpriseInfoName: { type: 'string', @@ -77,5 +77,7 @@ export class VehicleModifyCaptainComponent implements OnInit { close(): void { this.modal.destroy(); } - + search(value: any) { + console.log(value) + } } 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 49eaf6f6..6bb760c0 100644 --- a/src/app/routes/order-management/services/order-management.service.ts +++ b/src/app/routes/order-management/services/order-management.service.ts @@ -1,12 +1,13 @@ /* * @Author: your name * @Date: 2021-12-03 15:31:52 - * @LastEditTime: 2021-12-24 14:43:00 + * @LastEditTime: 2021-12-29 20:44:48 * @LastEditors: Please set LastEditors * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @FilePath: \tms-obc-web\src\app\routes\order-management\services\order-management.service.ts */ import { Injectable, Injector } from '@angular/core'; +import { map } from 'rxjs/operators'; import { BaseService } from 'src/app/shared/services'; @Injectable({ @@ -14,6 +15,7 @@ import { BaseService } from 'src/app/shared/services'; }) export class OrderManagementService extends BaseService { + $api_get_getEnterpriseNetTransHis = `/api/mdc/enterpriseNetTransHis/getEnterpriseNetTransHis`; $api_get_catalogue_member = `/user?_allow_anonymous=true`; $api_get_bulkPage_list = `/api/sdc/goodsResourceOperate/listBulkPage`; // 据 手机号/姓名 查询 车队长/司机 @@ -99,6 +101,29 @@ export class OrderManagementService extends BaseService { $api_set_getWholeOrderDetail = `/api/sdc/billOperate/getWholeOrderDetail`; // 修改--大宗订单详情 $api_set_getBulkOrderDetail = `/api/sdc/billOperate/getBulkOrderDetail`; + + + + + + /** + * 根据企业ID，获取企业历史网络货运人 + * @returns + */ + getNetworkFreightForwarderHistory(params: any) { + return this.request(this.$api_get_getEnterpriseNetTransHis, params).pipe( + map((res: any) => { + if (!res) { + return []; + } + const list = res.map((item: any) => ({ + label: item.enterpriseName, + value: item.id + })); + return [{ value: '', label: '全部' }, ...list]; + }) + ); + } constructor(public injector: Injector) { super(injector) } diff --git a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts index 4e67e565..7492698f 100644 --- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts +++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts @@ -52,6 +52,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { endInfo: any = []; PageStatus = ''; dataList: any; + enterpriseProjectIds: any; constructor( private http: _HttpClient, fb: FormBuilder, @@ -140,9 +141,6 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { change: (q: any) => { this.getRegionCode(q); }, - visibleIf: { - _$expand: (value: boolean) => value - } } as SFSelectWidgetSchema }, enterpriseProjectId: { @@ -151,7 +149,6 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { ui: { widget: 'select', placeholder: '请选择', - allowClear: true } as SFSelectWidgetSchema }, enterpriseInfoName: { @@ -349,6 +346,12 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { .subscribe(res => { this.sf1.getProperty('/enterpriseProjectId')!.schema.enum = res; this.sf1.getProperty('/enterpriseProjectId')!.widget.reset(res); + console.log('12345645454545454=============') + console.log(this.enterpriseProjectIds) + console.log(res) + if(this.enterpriseProjectIds) { + this.sf1.setValue('/enterpriseProjectId', this.enterpriseProjectIds); + } }); } initSF5() { @@ -800,9 +803,10 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { } }); } - + if(res?.enterpriseProjectId) { + this.enterpriseProjectIds = res.enterpriseProjectId + } this.sf1data = { - // enterpriseProjectId: res?.enterpriseProjectId, enterpriseInfoName: res?.enterpriseInfoName, externalResourceCode: res?.externalResourceCode, dispatchId: res?.dispatchId diff --git a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html index 348d429f..cb762d0f 100644 --- a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html +++ b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html @@ -1,3 +1,11 @@ + @@ -42,13 +50,16 @@ - - - {{ item.no }}
+ + {{ item.vatinvcode }}
+ + + 起运地: 广东省深圳市南山区
diff --git a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts index 09f2633d..43f549e6 100644 --- a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts +++ b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts @@ -186,16 +186,16 @@ export class CancellationInvoiceComponent implements OnInit { } } }, - or2derSn: { - type: 'string', - title: '订单号', - ui: { - placeholder: '请输入', - visibleIf: { - expand: (value: boolean) => value - } - } - }, + // or2derSn: { + // type: 'string', + // title: '订单号', + // ui: { + // placeholder: '请输入', + // visibleIf: { + // expand: (value: boolean) => value + // } + // } + // }, createTime: { title: '申请时间', type: 'string', @@ -215,20 +215,20 @@ export class CancellationInvoiceComponent implements OnInit { private initST(): STColumn[] { return [ { title: '', index: 'key', type: 'checkbox' }, - { title: '分票编号', render: 'no', width: 150 }, + { title: '分票编号', render: 'vatinvcode', width: 150 }, { title: '申请编号', index: 'callNo', width: 120 }, - { title: '申请时间', index: 'updatedAt', type: 'date', width: 150 }, - { title: '网络货运人', index: 'callNo', width: 120 }, - { title: '购买方', index: 'callNo', width: 90 }, - { title: '订单数', index: 'callNo', width: 90 }, - { title: '价税合计', index: 'callNo', width: 90 }, - { title: '金额', index: 'callNo', width: 100 }, - { title: '税率', index: 'callNo', width: 90 }, - { title: '税额', index: 'callNo', width: 90 }, - { title: '服务名称', index: 'callNo', width: 100 }, - { title: '销货清单', index: 'callNo', width: 90 }, - { title: '票面备注', render: 'description', width: 250 }, - { title: '其他要求', index: 'callNo', width: 100 }, + { title: '申请时间', index: 'createTime', type: 'date', width: 150 }, + { title: '网络货运人', index: 'ltdName', width: 120 }, + { title: '购买人', index: 'artoName', width: 90 }, + { title: '订单数', index: 'ordlines', width: 90 }, + { title: '价税合计', index: 'disvatmoney', width: 90 }, + { title: '金额', index: 'vatnotax', width: 100 }, + { title: '税率', index: 'billvatrate', width: 90 }, + { title: '税额', index: 'disvattax', width: 90 }, + { title: '服务名称', index: 'vatname', width: 100 }, + { title: '销货清单', index: 'isdetail', width: 90 }, + { title: '票面备注', render: 'vatremarks', width: 250 }, + { title: '其他要求', index: 'otherremarks', width: 100 }, { title: '操作', width: 150, diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts index b46c136a..58c09e6f 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts @@ -26,7 +26,7 @@ export class InvoiceRequestedDetailComponent implements OnInit { totalCallNo = 0; _$expand = false; - vatappHId = null; + id = null; headerInfo: any = {}; constructor( public service: TicketService, @@ -34,7 +34,7 @@ export class InvoiceRequestedDetailComponent implements OnInit { private route: ActivatedRoute, private router: Router ) { - this.vatappHId = route.snapshot.params.id; + this.id = route.snapshot.params.id; this.loadHeadInfo(); } @@ -43,7 +43,7 @@ export class InvoiceRequestedDetailComponent implements OnInit { } loadHeadInfo() { - this.service.request(this.service.$api_get_invoice_requested_header_detail, { vatappHId: this.vatappHId }).subscribe(res => { + this.service.request(this.service.$api_get_invoice_requested_header_detail, { id: this.id }).subscribe(res => { console.log(res); if (res) { this.headerInfo = res; diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts index 17407fbd..5afe6bb3 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts @@ -359,7 +359,7 @@ export class InvoiceRequestedComponent implements OnInit { console.log(item) this.router.navigate(['/ticket/invoice-requested/detail/' + item?.id, { - queryParams: { vatappHId : item?.id } + queryParams: { id : item?.id } } ]) } diff --git a/src/app/routes/ticket-management/services/ticket.service.ts b/src/app/routes/ticket-management/services/ticket.service.ts index fd4a5c53..6755076a 100644 --- a/src/app/routes/ticket-management/services/ticket.service.ts +++ b/src/app/routes/ticket-management/services/ticket.service.ts @@ -1,8 +1,8 @@ /* * @Author: your name * @Date: 2021-12-29 13:12:35 - * @LastEditTime: 2021-12-29 15:44:27 - * @LastEditors: your name + * @LastEditTime: 2021-12-30 13:57:19 + * @LastEditors: Please set LastEditors * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @FilePath: \tms-obc-web\src\app\routes\ticket-management\services\ticket.service.ts */ @@ -23,6 +23,8 @@ export class TicketService extends ShipperBaseService { $api_get_invoice_requested_order_detail = '/api/fcc/ficoVatappBill/getDetailByVatapp'; // 删除开票申请订单明细 $api_remove_bill = '/api/fcc/ficoVatappBill/deletebatch'; + // 删除开票申请订单明细 + $api_ficoVatinvHList = '/api/fcc/ficoVatinvH/ficoVatinvHList'; constructor(public injector: Injector) { super(injector); diff --git a/src/app/shared/services/business/shipper-base.service.ts b/src/app/shared/services/business/shipper-base.service.ts index c28b335d..57fc6625 100644 --- a/src/app/shared/services/business/shipper-base.service.ts +++ b/src/app/shared/services/business/shipper-base.service.ts @@ -1,3 +1,11 @@ +/* + * @Author: your name + * @Date: 2021-12-29 17:20:03 + * @LastEditTime: 2021-12-29 20:43:13 + * @LastEditors: Please set LastEditors + * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE + * @FilePath: \tms-obc-web\src\app\shared\services\business\shipper-base.service.ts + */ import { Injectable, Injector } from '@angular/core'; import { BaseService } from '../core/base.service'; import { map } from 'rxjs/operators'; @@ -89,4 +97,5 @@ export class ShipperBaseService extends BaseService { }) ); } + }