From 2ded33f4d694ecadf2c1702c158637da378f9d95 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 29 Dec 2021 17:20:00 +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 --- .../vehicle-detail.component.html | 8 +- .../vehicle-detail.component.less | 4 + .../vehicle-detail.component.ts | 6 +- .../components/vehicle/vehicle.component.html | 11 ++- .../components/vehicle/vehicle.component.ts | 89 +++++++++++++++--- .../freight-people.component.html | 14 +++ .../freight-people.component.less | 7 ++ .../freight-people.component.ts | 81 ++++++++++++++++ .../modify-rate/modify-rate.component.html | 14 +++ .../modify-rate/modify-rate.component.less | 7 ++ .../modify-rate/modify-rate.component.ts | 92 +++++++++++++++++++ .../update-freight.component.html | 8 ++ .../order-management.module.ts | 8 +- .../onecar-publish.component.ts | 13 ++- .../vehicle-detail.component.html | 3 +- .../components/vehicle/vehicle.component.ts | 2 +- .../crm-management.component.ts | 26 +----- .../sys-setting/services/system.service.ts | 30 +++--- .../invoice-requested-detail.component.ts | 4 +- .../invoice-requested.component.html | 30 ++++-- .../invoice-requested.component.ts | 71 ++++++++++---- .../requested-detail.component.ts | 1 + .../services/ticket.service.ts | 8 ++ 23 files changed, 443 insertions(+), 94 deletions(-) create mode 100644 src/app/routes/order-management/modal/vehicle/freight-people/freight-people.component.html create mode 100644 src/app/routes/order-management/modal/vehicle/freight-people/freight-people.component.less create mode 100644 src/app/routes/order-management/modal/vehicle/freight-people/freight-people.component.ts create mode 100644 src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.html create mode 100644 src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.less create mode 100644 src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.ts diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html index 01d835f0..70d0a013 100644 --- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html +++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html @@ -1,12 +1,11 @@ - + + diff --git a/src/app/routes/order-management/modal/vehicle/freight-people/freight-people.component.less b/src/app/routes/order-management/modal/vehicle/freight-people/freight-people.component.less new file mode 100644 index 00000000..30444d6b --- /dev/null +++ b/src/app/routes/order-management/modal/vehicle/freight-people/freight-people.component.less @@ -0,0 +1,7 @@ + .left_btn { + width: 50px; + height: 32px; + padding-left: 8px; + line-height:32px; + background-color: #d7d7d7; + } \ No newline at end of file diff --git a/src/app/routes/order-management/modal/vehicle/freight-people/freight-people.component.ts b/src/app/routes/order-management/modal/vehicle/freight-people/freight-people.component.ts new file mode 100644 index 00000000..6adcf7cd --- /dev/null +++ b/src/app/routes/order-management/modal/vehicle/freight-people/freight-people.component.ts @@ -0,0 +1,81 @@ +/* + * @Author: your name + * @Date: 2021-12-14 14:03:07 + * @LastEditTime: 2021-12-29 17:02:54 + * @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 + */ +import { Component, Input, OnInit, ViewChild } from '@angular/core'; +import { + SFComponent, SFSchema, SFUISchema +} from '@delon/form'; +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'; + +@Component({ + selector: 'app-order-management-vehicle-freight-people', + templateUrl: './freight-people.component.html', + styleUrls: ['./freight-people.component.less'] +}) +export class VehicleFreightPeopleComponent implements OnInit { + @ViewChild('sf', { static: false }) sf!: SFComponent; + schema: SFSchema = {}; + ui: SFUISchema = {}; + + aggreechecked = false; + + @Input() + data: any; + + constructor(private modal: NzModalRef, private msgSrv: NzMessageService, public service: OrderManagementService, private service2: ShipperBaseService) {} + + ngOnInit(): void { + console.log(this.data) + this.initSF(this.data); + } + initSF(data: any) { + this.schema = { + enterpriseInfoName: { + type: 'string', + title: '网络货运人', + ui: { + widget: 'select', + placeholder: '请选择', + visibleIf: { + _$expand: (value: boolean) => value, + }, + allowClear: true, + asyncData: () => this.service2.getNetworkFreightForwarder(), + }, + }, + required: ['enterpriseInfoName'] + }; + this.ui = { + '*': { + spanLabelFixed: 100, + grid: { span: 16 } + } + }; + } + + save(value: any): void { + + const params = { + }; + + this.service.request(this.service.$api_get_insertFreightChangeWhole, params).subscribe((res: any) => { + if (res) { + this.modal.destroy(); + this.service.msgSrv.success('变更运费成功'); + } + }); + } + + close(): void { + this.modal.destroy(); + } + +} diff --git a/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.html b/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.html new file mode 100644 index 00000000..71ed039e --- /dev/null +++ b/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.html @@ -0,0 +1,14 @@ + + + +
+ + +
diff --git a/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.less b/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.less new file mode 100644 index 00000000..30444d6b --- /dev/null +++ b/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.less @@ -0,0 +1,7 @@ + .left_btn { + width: 50px; + height: 32px; + padding-left: 8px; + line-height:32px; + background-color: #d7d7d7; + } \ No newline at end of file diff --git a/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.ts b/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.ts new file mode 100644 index 00000000..3d54098f --- /dev/null +++ b/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.ts @@ -0,0 +1,92 @@ +import { preloaderFinished } from '@delon/theme'; +/* + * @Author: your name + * @Date: 2021-12-14 14:03:07 + * @LastEditTime: 2021-12-29 15:02:47 + * @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 + */ +import { Component, Input, OnInit, ViewChild } from '@angular/core'; +import { + SFComponent, + SFCustomWidgetSchema, + SFNumberWidgetSchema, + SFRadioWidgetSchema, + SFSchema, + SFSelectWidgetSchema, + SFTextareaWidgetSchema, + SFUISchema +} from '@delon/form'; +import { _HttpClient } from '@delon/theme'; +import { NzMessageService } from 'ng-zorro-antd/message'; +import { NzModalRef } from 'ng-zorro-antd/modal'; +import { OrderManagementService } from '../../../services/order-management.service'; + +@Component({ + selector: 'app-order-management-vehicle-modify-rate', + templateUrl: './modify-rate.component.html', + styleUrls: ['./modify-rate.component.less'] +}) +export class VehicleModifyRateComponent implements OnInit { + @ViewChild('sf', { static: false }) sf!: SFComponent; + schema: SFSchema = {}; + ui: SFUISchema = {}; + + aggreechecked = false; + + @Input() + data: any; + + constructor(private modal: NzModalRef, private msgSrv: NzMessageService, public service: OrderManagementService) {} + + ngOnInit(): void { + console.log(this.data) + this.initSF(this.data); + } + initSF(data: any) { + const info = { + prePay: data.list?.filter((item: any) => item.costCode === 'PRE')[0], + toPay: data.list?.filter((item: any) => item.costCode === 'RECE')[0], + receiptPay: data.list?.filter((item: any) => item.costCode === 'BACK')[0] + }; + this.schema = { + properties: { + prePay: { + type: 'number', + title: '附加费率', + ui: { + unit: '%', + widgetWidth: 200, + precision: 2, + } as SFNumberWidgetSchema + }, + }, + required: ['prePay'] + }; + this.ui = { + '*': { + spanLabelFixed: 100, + grid: { span: 16 } + } + }; + } + + save(value: any): void { + + const params = { + }; + + this.service.request(this.service.$api_get_insertFreightChangeWhole, params).subscribe((res: any) => { + if (res) { + this.modal.destroy(); + this.service.msgSrv.success('变更运费成功'); + } + }); + } + + close(): void { + this.modal.destroy(); + } + +} diff --git a/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.html b/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.html index e6625551..f0f950f6 100644 --- a/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.html +++ b/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.html @@ -1,3 +1,11 @@ +
diff --git a/src/app/routes/order-management/order-management.module.ts b/src/app/routes/order-management/order-management.module.ts index eb621f0b..ee3975f3 100644 --- a/src/app/routes/order-management/order-management.module.ts +++ b/src/app/routes/order-management/order-management.module.ts @@ -1,7 +1,7 @@ /* * @Author: your name * @Date: 2021-12-03 15:31:52 - * @LastEditTime: 2021-12-23 17:13:28 + * @LastEditTime: 2021-12-29 16:49:32 * @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\order-management.module.ts @@ -27,6 +27,8 @@ import { SureDepartComponent } from './modal/bulk/sure-depart/sure-depart.compon import { UpdateFreightComponent } from './modal/bulk/update-freight/update-freight.component'; import { OneCarOrderCancelComponent } from './modal/vehicle/cancel/cancel.component'; import { VehicleConfirReceiptComponent } from './modal/vehicle/confir-receipt/confir-receipt.component'; +import { VehicleFreightPeopleComponent } from './modal/vehicle/freight-people/freight-people.component'; +import { VehicleModifyRateComponent } from './modal/vehicle/modify-rate/modify-rate.component'; import { VehicleSureArriveComponent } from './modal/vehicle/sure-arrive/sure-arrive.component'; import { VehicleSureDepartComponent } from './modal/vehicle/sure-depart/sure-depart.component'; import { VehicleUpdateFreightComponent } from './modal/vehicle/update-freight/update-freight.component'; @@ -53,7 +55,9 @@ const COMPONENTS: Type[] = [ OrderManagementRiskDetailComponent, OneCarOrderCancelComponent, OrderManagementVehicleDetailChangeComponent, - OrderManagementBulkDetailChangeComponent + OrderManagementBulkDetailChangeComponent, + VehicleModifyRateComponent, + VehicleFreightPeopleComponent ]; @NgModule({ 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 b828a4b5..1be3be20 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 @@ -122,11 +122,13 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { title: '货主', type: 'string', maxLength: 30, + enum: [], ui: { widget: 'select', serverSearch: true, searchDebounceTime: 300, searchLoadingText: '搜索中...', + onSearch: (q: any) => { if (!!q) { return this.service @@ -757,8 +759,17 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { // 初始化信息 dataR (res: any) { // this.dataList = res; + if(res?.shipperAppUserName) { + const List: any = [] + this.service.request(this.service.$api_enterpriceList, { enterpriseName: res?.shipperAppUserName}).subscribe((res) => { + console.log(res) + res?.forEach((element: any) => { + List.push({ label: element.enterpriseName, value: element.id } ) + }); + }) + this.schema1.shipperAppUserId.enum = List + } this.sf1data = { - // shipperAppUserName: res?.shipperAppUserName , enterpriseProjectId: res?.enterpriseProjectId , enterpriseInfoName: res?.enterpriseInfoName , externalResourceCode: res?.externalResourceCode , diff --git a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html index ee4a79d5..1df08eff 100644 --- a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html +++ b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html @@ -27,8 +27,7 @@
- {{ i?.externalResourceCode }} + {{ i?.externalResourceCode }} {{i?.enterpriseProjectId}} {{i?.createUserId}} {{i?.dispatchName}} 18100000000 diff --git a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts index 3251f184..d65d6237 100644 --- a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts @@ -343,7 +343,7 @@ export class SupplyManagementVehicleComponent implements OnInit { // type: 'enum', // enum: { '1': '抢单', '2': '指派' } // }, - { title: '货主', index: 'shipperAppUserNmae', width: '120px' }, + { title: '货主', index: 'shipperAppUserName', width: '120px' }, { title: '项目名称', index: 'enterpriseProjectName', diff --git a/src/app/routes/sys-setting/components/crm-management/crm-management.component.ts b/src/app/routes/sys-setting/components/crm-management/crm-management.component.ts index b64cc8b8..6b2969a3 100644 --- a/src/app/routes/sys-setting/components/crm-management/crm-management.component.ts +++ b/src/app/routes/sys-setting/components/crm-management/crm-management.component.ts @@ -29,7 +29,6 @@ export class CrmManagementComponent implements OnInit { { title: '客户名称', index: 'customerName' }, { title: '客户简称', index: 'customerShortName' }, { title: '客户编码', index: 'customerCode' }, - { title: '客户类型', render: 'customerType' }, { title: '操作', buttons: [ @@ -92,17 +91,6 @@ export class CrmManagementComponent implements OnInit { title: '客户简称', ui: { placeholder: '请输入' } }, - customerType: { - type: 'string', - title: '客户类型', - enum: [ - { label: '客户', value: 1 }, - { label: '供应商', value: 2 }, - ], - ui: { - widget: 'select' - } - }, customerCode: { type: 'string', title: '客户编码', @@ -134,20 +122,8 @@ export class CrmManagementComponent implements OnInit { title: '客户编码', ui: { placeholder: '请输入' } }, - customerType: { - type: 'string', - title: '客户类型', - enum: [ - { label: '客户', value: 1 }, - { label: '供应商', value: 2 }, - ], - ui: { - widget: 'radio', - } as SFRadioWidgetSchema, - default: 1, - }, }, - required: ['customerName', 'customerShortName', 'customerType', 'customerCode'] + required: ['customerName', 'customerShortName', 'customerCode'] }; this.ui2 = { '*': { spanLabelFixed: 120, grid: { span: 24 } } }; } diff --git a/src/app/routes/sys-setting/services/system.service.ts b/src/app/routes/sys-setting/services/system.service.ts index 0a12e736..1012fd28 100644 --- a/src/app/routes/sys-setting/services/system.service.ts +++ b/src/app/routes/sys-setting/services/system.service.ts @@ -1,7 +1,7 @@ /* * @Author: your name * @Date: 2021-12-20 17:18:43 - * @LastEditTime: 2021-12-27 14:09:14 + * @LastEditTime: 2021-12-29 16:53:47 * @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\sys-setting\services\system.service.ts @@ -45,38 +45,38 @@ export class SystemService extends BaseService { $api_update_dict = '/api/mdc/pbc/dictItems/update'; // 获取CRM客户信息表 - $api_get_crmCustomer = '/api/mdc/crmCustomer/get'; + $api_get_crmCustomer = '/api/mdc/cuc/crmCustomer/get'; // 查询CRM客户信息表 - $api_get_crmCustomer_page = '/api/mdc/crmCustomer/list/page'; + $api_get_crmCustomer_page = '/api/mdc/cuc/crmCustomer/list/page'; // 保存CRM客户信息表 - $api_save_crmCustomer = '/api/mdc/crmCustomer/save'; + $api_save_crmCustomer = '/api/mdc/cuc/crmCustomer/save'; // 删除CRM客户信息表 - $api_deletebatch_crmCustomer = '/api/mdc/crmCustomer/deletebatch'; + $api_deletebatch_crmCustomer = '/api/mdc/cuc/crmCustomer/deletebatch'; // 获取某个应用的所有菜单 $api_getAllFunctionInfoByAppId: string = '/api/mdc/cuc/functionInfo/getAllFunctionInfoByAppId'; // 查询网络货运信息表 - $api_networkTransporter_page = '/api/mdc/networkTransporter/list/page'; + $api_networkTransporter_page = '/api/mdc/cuc/networkTransporter/list/page'; // 获取网络货运信息表(id) - $api_get_networkTransporter = '/api/mdc/networkTransporter/get'; + $api_get_networkTransporter = '/api/mdc/cuc/networkTransporter/get'; // 批量获取网络货运信息 - $api_findNetworkTransporterByIds = '/api/mdc/networkTransporter/findNetworkTransporterByIds'; + $api_findNetworkTransporterByIds = '/api/mdc/cuc/networkTransporter/findNetworkTransporterByIds'; // 查找所有网络货运信息(下拉) - $api_networkTransporter_findAll = '/api/mdc/networkTransporter/findAll'; + $api_networkTransporter_findAll = '/api/mdc/cuc/networkTransporter/findAll'; // 删除网络货运信息表 - $api_networkTransporter_deletebatch = '/api/mdc/networkTransporter/deletebatch'; + $api_networkTransporter_deletebatch = '/api/mdc/cuc/networkTransporter/deletebatch'; // 保存网络货运信息表 - $api_networkTransporter_save = '/api/mdc/networkTransporter/save'; + $api_networkTransporter_save = '/api/mdc/cuc/networkTransporter/save'; // 查询结算客户表 - $api_settlementCustomer_page = '/api/mdc/settlementCustomer/list/page'; + $api_settlementCustomer_page = '/api/mdc/cuc/settlementCustomer/list/page'; // 获取结算客户表 - $api_settlementCustomer_get = '/api/mdc/settlementCustomer/get'; + $api_settlementCustomer_get = '/api/mdc/cuc/settlementCustomer/get'; // 保存结算客户表 - $api_settlementCustomer_save = '/api/mdc/settlementCustomer/save'; + $api_settlementCustomer_save = '/api/mdc/cuc/settlementCustomer/save'; // 删除结算客户表 - $api_settlementCustomer_deletebatch = '/api/mdc/settlementCustomer/deletebatch'; + $api_settlementCustomer_deletebatch = '/api/mdc/cuc/settlementCustomer/deletebatch'; // 获取货主企业列表 public $api_enterpriceList = '/api/mdc/cuc/enterpriseInfo/operate/enterpriceList'; 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 78fd70bb..b46c136a 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 @@ -38,7 +38,9 @@ export class InvoiceRequestedDetailComponent implements OnInit { this.loadHeadInfo(); } - ngOnInit(): void {} + ngOnInit(): void { + console.log(this.route.snapshot) + } loadHeadInfo() { this.service.request(this.service.$api_get_invoice_requested_header_detail, { vatappHId: this.vatappHId }).subscribe(res => { diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html index 61add36b..3f050e34 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html @@ -1,3 +1,11 @@ + @@ -21,8 +29,8 @@
- - + + @@ -42,12 +50,20 @@ + - {{ item.vatappcode }}
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 678fa10e..17407fbd 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 @@ -1,3 +1,4 @@ +import { query } from '@angular/animations'; import { Component, OnInit, ViewChild } from '@angular/core'; import { Router } from '@angular/router'; import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st'; @@ -19,38 +20,52 @@ export class InvoiceRequestedComponent implements OnInit { sf!: SFComponent; @ViewChild('rejectModal', { static: false }) rejectModal!: any; + resourceStatus!: any; columns: STColumn[] = this.initST(); searchSchema: SFSchema = this.initSF(); _$expand = false; - selectedRows: any[] = []; totalCallNo = 0; constructor(public service: TicketService, private nzModalService: NzModalService, private router: Router) {} ngOnInit(): void {} - beforeReq = (requestOptions: STRequestOptions) => { - if (this.sf) { - Object.assign(requestOptions.body, { - ...this.sf.value, - createTime: { - start: this.sf.value.createTime?.[0] || null, - end: this.sf.value.createTime?.[1] || null - } - }); + get reqParams() { + // if (this.sf) { + // Object.assign(requestOptions.body, { + // ...this.sf.value, + // sts: this?.resourceStatus, + // createTime: { + // start: this.sf.value.createTime?.[0] || null, + // end: this.sf.value.createTime?.[1] || null + // } + // }); + // } + const a:any = {}; + if(this.resourceStatus) { + a.sts = this.resourceStatus } - return requestOptions; + return { + ...a, + ...this.sf?.value, + createTime: { + start: this.sf?.value?.createTime?.[0] || null, + end: this.sf?.value?.createTime?.[1] || null + } + }; }; - - stChange(e: STChange): void { - switch (e.type) { - case 'checkbox': - this.selectedRows = e.checkbox!; - this.totalCallNo = this.selectedRows.reduce((total, cv) => total + cv.callNo, 0); - break; - } + get selectedRows() { + return this.st?.list.filter((item) => item.checked) || []; } + // stChange(e: STChange): void { + // switch (e.type) { + // case 'checkbox': + // this.selectedRows = e.checkbox!; + // this.totalCallNo = this.selectedRows.reduce((total, cv) => total + cv.callNo, 0); + // break; + // } + // } rejectAction(item: any[]) { const modal = this.nzModalService.create({ @@ -330,7 +345,7 @@ export class InvoiceRequestedComponent implements OnInit { }, { text: '订单明细', - click: item => this.router.navigate(['/ticket/invoice-requested/detail/' + item.vatappcode]) + click: item => this.orderDetail(item) }, { text: '下载对账单' @@ -340,4 +355,20 @@ export class InvoiceRequestedComponent implements OnInit { } ]; } + orderDetail(item: any){ + console.log(item) + this.router.navigate(['/ticket/invoice-requested/detail/' + item?.id, + { + queryParams: { vatappHId : item?.id } + } + ]) + } + selectChange(e: any) { + console.log(e) + this.resourceStatus = e; + this.initST(); + setTimeout(() => { + this.st.load(); + }, 500); + } } diff --git a/src/app/routes/ticket-management/components/invoice-requested/requested-detail/requested-detail.component.ts b/src/app/routes/ticket-management/components/invoice-requested/requested-detail/requested-detail.component.ts index ef28f8f4..cf3cea57 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/requested-detail/requested-detail.component.ts +++ b/src/app/routes/ticket-management/components/invoice-requested/requested-detail/requested-detail.component.ts @@ -10,6 +10,7 @@ export class RequestedDetailComponent implements OnInit { constructor() { } ngOnInit(): void { + } } diff --git a/src/app/routes/ticket-management/services/ticket.service.ts b/src/app/routes/ticket-management/services/ticket.service.ts index ddf55291..fd4a5c53 100644 --- a/src/app/routes/ticket-management/services/ticket.service.ts +++ b/src/app/routes/ticket-management/services/ticket.service.ts @@ -1,3 +1,11 @@ +/* + * @Author: your name + * @Date: 2021-12-29 13:12:35 + * @LastEditTime: 2021-12-29 15:44:27 + * @LastEditors: your name + * @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 + */ import { Injectable, Injector } from '@angular/core'; import { ShipperBaseService } from '@shared';