diff --git a/proxy.conf.js b/proxy.conf.js index 3ec9b0fd..3639702c 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-18 09:51:21 * @LastEditors : Shiming - * @LastEditTime : 2022-04-18 16:40:52 + * @LastEditTime : 2022-04-19 14:20:28 * @FilePath : \\tms-obc-web\\proxy.conf.js * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -30,7 +30,7 @@ module.exports = { // }, '//api': { target: { - host: 'tms-api-dev.eascs.com', + host: 'tms-api-test.eascs.com', protocol: 'https:', port: 443 }, diff --git a/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.ts b/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.ts index a5cc2092..4501e8fd 100644 --- a/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.ts +++ b/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.ts @@ -88,8 +88,8 @@ export class DatatableBusiindexComponent implements OnInit { if (res) { this.chartData = res if(flag) { - // this.pillar.reRender() - // this.curve.reRender() + this.pillar.reRender() + this.curve.reRender() } } }) diff --git a/src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.ts b/src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.ts index e81c0f4b..33d0efd4 100644 --- a/src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.ts +++ b/src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.ts @@ -12,7 +12,6 @@ import { DataService } from '../../../services/data.service'; providers: [DatePipe] }) export class DatatableMancustomtableComponent implements OnInit { - url = `/user`; @ViewChild('st', { static: false }) st!: STComponent; @ViewChild('sf', { static: false }) sf!: SFComponent; _$expand = false; @@ -20,6 +19,8 @@ export class DatatableMancustomtableComponent implements OnInit { mode = 'year'; date: any = null; defineDate = []; + columns: STColumn[] =[]; + resourceStatus: number = 1; time: any = ['2022-01-01 00:00:00']; dateFormat = 'yyyy'; today = new Date(); @@ -60,33 +61,41 @@ export class DatatableMancustomtableComponent implements OnInit { } } }; - columns: STColumn[] = [ - { title: '部门', index: 'enterpriseName', className: 'text-center', width: '200px' }, - { title: '业务员', index: 'registerTime', className: 'text-center', width: '200px' }, - { title: '已认证货主数', index: 'customerType', className: 'text-center', width: '100px' }, - { title: '新增合伙人', index: 'customerType', className: 'text-center', width: '100px' }, - { title: '合伙人活跃率', index: 'customerType', className: 'text-center', width: '100px' }, - { title: '主动合伙人', index: 'customerType', className: 'text-center', width: '100px' }, - { title: '纪念合伙人', index: 'customerType', className: 'text-center', width: '100px' }, - { title: '流失合伙人', index: 'customerType', className: 'text-center', width: '100px' }, - { title: '未搭档合伙人', index: 'customerType', className: 'text-center', width: '100px' }, - { title: '新增货主数', index: 'salesmanName', className: 'text-center', width: '100px' }, - { title: '货主活跃率', index: 'partnerName', className: 'text-center', width: '100px' }, + initST() { + this.columns =[ + { title: '部门', index: 'department', className: 'text-center', width: '200px' }, + { title: '业务员', index: 'salesmen', className: 'text-center', width: '200px' }, + { title: '已认证货主数', index: 'certifiedCount', className: 'text-center', width: '100px', iif: ()=> { + console.log(this.resourceStatus); + return this.resourceStatus !== 1 + + } }, + { title: '已认证合伙人', index: 'certifiedCount', className: 'text-center', width: '100px' }, + { title: '新增合伙人数', index: 'addCount', className: 'text-center', width: '100px' }, + { title: '合伙人活跃率', index: 'alivePer', className: 'text-center', width: '100px' }, + { title: '活跃合伙人数', index: 'aliveCount', className: 'text-center', width: '100px' }, + { title: '沉默合伙人数', index: 'silentCount', className: 'text-center', width: '100px' }, + { title: '流失合伙人数', index: 'drainCount', className: 'text-center', width: '100px' }, + { title: '未激活合伙人数', index: 'notActiveCount', className: 'text-center', width: '100px' }, + + { title: '新增货主数', index: 'addCount', className: 'text-center', width: '100px' }, + { title: '货主活跃率', index: 'alivePer', className: 'text-center', width: '100px' }, { title: '活跃货主数', - index: 'customerStatus', + index: 'aliveCount', className: 'text-center', width: '100px' }, - { title: '纪念货主数', index: 'zsl', className: 'text-center', width: '100px' }, + { title: '沉默货主数', index: 'silentCount', className: 'text-center', width: '100px' }, { - title: '货货主数', - index: 'ddje', + title: '流失货主数', + index: 'drainCount', className: 'text-right', width: '100px', }, - { title: '未激活货主数', index: 'ysdds', className: 'text-center', width: '120px' } + { title: '未激活货主数', index: 'notActiveCount', className: 'text-center', width: '120px' } ]; + } /** * 查询参数 */ @@ -103,15 +112,18 @@ export class DatatableMancustomtableComponent implements OnInit { let params: any = { time: this.time, type: this.type, + parType: this.resourceStatus, ...this.sf?.value }; delete params._$expand; + delete params.sort; return { ...params }; } constructor(public service: DataService, private datePipe: DatePipe) {} ngOnInit(): void { this.initSF(); + this.initST(); } /** * 初始化查询表单 @@ -225,10 +237,13 @@ export class DatatableMancustomtableComponent implements OnInit { this.isLoading = true; } selectChange(e: number) { - // this.resourceStatus = e; + console.log(e); + + this.resourceStatus = e + 1; // this.initST(); setTimeout(() => { - this.st.load(); + this.initST(); + // this.st.load(1); }, 500); } } diff --git a/src/app/routes/datatable/components/customtable/owner/owner.component.ts b/src/app/routes/datatable/components/customtable/owner/owner.component.ts index f3a81454..54549d42 100644 --- a/src/app/routes/datatable/components/customtable/owner/owner.component.ts +++ b/src/app/routes/datatable/components/customtable/owner/owner.component.ts @@ -39,9 +39,9 @@ export class DatatableOwnerComponent implements OnInit { { title: '合伙人', index: 'partnerName', className: 'text-center', width: '100px' }, { title: '客户状态', index: 'customerStatus', className: 'text-center', width: '100px', type: 'enum', enum: { 1: '未激活', - 2: '沉默', - 3: '流失', - 4: '活跃' + 2: '流失', + 3: '活跃', + 4: '沉默' } }, { title: '订单数', index: 'zsl', className: 'text-center', width: '100px' }, { title: '订单金额', index: 'ddje', className: 'text-right', width: '100px', type: 'widget', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.ddje }) } }, @@ -117,9 +117,9 @@ export class DatatableOwnerComponent implements OnInit { }, enum: [ {label: '未激活', value: 1}, - {label: '沉默', value: 2}, - {label: '流失', value: 3}, - {label: '活跃', value: 4}, + {label: '流失', value: 2}, + {label: '活跃', value: 3}, + {label: '沉默', value: 4}, ] }, registerTime: { @@ -156,7 +156,7 @@ export class DatatableOwnerComponent implements OnInit { } else if(this.mode === 'date') { this.time = [this.datePipe.transform(this.date, 'yyyy-MM-dd') + ' 00:00:00'] } else{ - this.time = [this.datePipe.transform(this.defineDate[0], 'yyyy-MM-dd') + '00:00:00', this.datePipe.transform(this.defineDate[1], 'yyyy-MM-dd') + ' 00:00:00'] + this.time = [this.datePipe.transform(this.defineDate[0], 'yyyy-MM-dd') + ' 00:00:00', this.datePipe.transform(this.defineDate[1], 'yyyy-MM-dd') + ' 00:00:00'] } this.st.reload({ ...this.reqParams }); } diff --git a/src/app/routes/datatable/components/datascreen/datascreen.component.html b/src/app/routes/datatable/components/datascreen/datascreen.component.html index 27fec9ba..e66a7862 100644 --- a/src/app/routes/datatable/components/datascreen/datascreen.component.html +++ b/src/app/routes/datatable/components/datascreen/datascreen.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-04-06 10:57:56 * @LastEditors : Shiming - * @LastEditTime : 2022-04-14 15:48:32 + * @LastEditTime : 2022-04-19 14:01:38 * @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\datascreen.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> diff --git a/src/app/routes/datatable/components/financetable/financetable.component.ts b/src/app/routes/datatable/components/financetable/financetable.component.ts index ef318c6b..5201e4cb 100644 --- a/src/app/routes/datatable/components/financetable/financetable.component.ts +++ b/src/app/routes/datatable/components/financetable/financetable.component.ts @@ -59,6 +59,7 @@ export class DatatableFinancetableComponent implements OnInit { } else { this.type = 4 } + let params: any = { time: this.time, type: this.type @@ -76,11 +77,11 @@ export class DatatableFinancetableComponent implements OnInit { initPillarData(){ let type = 1 - if(this.mode === 'year') { - type = 1 - } else if(this.mode === 'month') { - type = 2 - } + if (this.modeNext === 'year') { + this.type = 1 + } else if (this.modeNext === 'month') { + this.type = 2 + } const params: any = { time: this.timeNext, type, @@ -121,7 +122,7 @@ export class DatatableFinancetableComponent implements OnInit { } else if (this.mode === 'date') { this.time = [this.datePipe.transform(this.date, 'yyyy-MM-dd') + ' 00:00:00'] } else { - this.time = [this.datePipe.transform(this.defineDate[0], 'yyyy-MM-dd') + '00:00:00', this.datePipe.transform(this.defineDate[1], 'yyyy-MM-dd') + ' 00:00:00'] + this.time = [this.datePipe.transform(this.defineDate[0], 'yyyy-MM-dd') + ' 00:00:00', this.datePipe.transform(this.defineDate[1], 'yyyy-MM-dd') + ' 00:00:00'] } this.st.reload({ ...this.reqParams }); } @@ -138,9 +139,9 @@ export class DatatableFinancetableComponent implements OnInit { } changeDataNext() { - if(this.mode === 'year') { + if(this.modeNext === 'year') { this.dateFormat = 'yyyy' - } else if(this.mode === 'month') { + } else if(this.modeNext === 'month') { this.dateFormat = 'yyyy-MM' } } @@ -148,9 +149,9 @@ export class DatatableFinancetableComponent implements OnInit { if(result === null) { return } - if(this.mode === 'year') { + if(this.modeNext === 'year') { this.timeNext = [this.datePipe.transform(this.dateNext, 'yyyy') + '-01-01 00:00:00'] - } else if(this.mode === 'month') { + } else if(this.modeNext === 'month') { this.timeNext = [this.datePipe.transform(this.dateNext, 'yyyy-MM') + '-01 00:00:00'] } this.initPillarData(); diff --git a/src/app/routes/datatable/components/invoicetable/invoicetable.component.html b/src/app/routes/datatable/components/invoicetable/invoicetable.component.html index e45122f6..fd37f657 100644 --- a/src/app/routes/datatable/components/invoicetable/invoicetable.component.html +++ b/src/app/routes/datatable/components/invoicetable/invoicetable.component.html @@ -1,32 +1,26 @@ - - - {{item.totalInvoicedAmount | currency}} - - - {{item.invAmountMonth | currency}} - - - {{item.applyWaitInvAmount | currency}} - - - {{item.unInvoicedAmountHistory | currency}} - - - {{item.unInvoicedAmountCurMonth | currency}} - - - {{item.invoicedAmount | currency}} - + + + {{item.totalInvoicedAmount | currency}} + + + {{item.invAmountMonth | currency}} + + + {{item.applyWaitInvAmount | currency}} + + + {{item.unInvoicedAmountHistory | currency}} + + + {{item.unInvoicedAmountCurMonth | currency}} + + + {{item.invoicedAmount | currency}} + - + \ No newline at end of file diff --git a/src/app/routes/datatable/components/invoicetable/invoicetable.component.ts b/src/app/routes/datatable/components/invoicetable/invoicetable.component.ts index 40aac5d4..fc71aab6 100644 --- a/src/app/routes/datatable/components/invoicetable/invoicetable.component.ts +++ b/src/app/routes/datatable/components/invoicetable/invoicetable.component.ts @@ -6,71 +6,98 @@ import { DataService } from '../../services/data.service'; @Component({ selector: 'app-datatable-invoicetable', - templateUrl: './invoicetable.component.html', + templateUrl: './invoicetable.component.html' }) export class DatatableInvoicetableComponent implements OnInit { @ViewChild('st', { static: false }) st!: STComponent; columns!: STColumn[]; - data=[{name1:1111}] - constructor(private http: _HttpClient, private modal: ModalHelper,public service :DataService) { } + data = [{ name1: 1111 }]; + constructor(private http: _HttpClient, private modal: ModalHelper, public service: DataService) {} /** * 查询参数 */ - get reqParams() { - return { }; + get reqParams() { + return {}; } - ngOnInit(): void { + ngOnInit(): void { this.initST(); - } initST() { this.columns = [ { title: '运营主体', - index: 'operationName' + index: 'operationName', + width: 220 }, { title: '已开票总金额', index: 'totalInvoicedAmount', render: 'totalInvoicedAmount', + className: 'text-right', + width: 150 }, { title: '当月已开票金额', index: 'invAmountMonth', render: 'invAmountMonth', + className: 'text-right', + width: 150 }, { title: '当月已开票张数', index: 'numInvAmountMonth', + className: 'text-right', + width: 150 }, { title: '已申请待开金额', index: 'applyWaitInvAmount', render: 'applyWaitInvAmount', + className: 'text-right', + width: 150 }, { title: '申请待开客户', index: 'applyWaitCustomer', + className: 'text-right', + width: 150 }, { title: '已开票金额', index: 'invoicedAmount', render: 'invoicedAmount', + className: 'text-right', + width: 150 }, { title: '未申请开票金额（历史）', index: 'unInvoicedAmountHistory', render: 'unInvoicedAmountHistory', + className: 'text-right', + width: 200 }, { title: '未申请开票金额（当月）', index: 'unInvoicedAmountCurMonth', render: 'unInvoicedAmountCurMonth', + className: 'text-right', + width: 200 }, + { + title: '当月发票张数', + index: 'unInvoicedAmountHistory1', + className: 'text-right', + width: 150 + }, + { + title: '剩余发票张数', + index: 'unInvoicedAmountCurMonth1', + className: 'text-right', + width: 150 + } ]; } - } diff --git a/src/app/routes/datatable/components/operationtable/operationtable.component.ts b/src/app/routes/datatable/components/operationtable/operationtable.component.ts index 891ee8e1..15a0571c 100644 --- a/src/app/routes/datatable/components/operationtable/operationtable.component.ts +++ b/src/app/routes/datatable/components/operationtable/operationtable.component.ts @@ -118,7 +118,7 @@ export class DatatableOperationtableComponent implements OnInit { } else if (this.mode === 'date') { this.time = [this.datePipe.transform(this.date, 'yyyy-MM-dd') + ' 00:00:00'] } else { - this.time = [this.datePipe.transform(this.defineDate[0], 'yyyy-MM-dd') + '00:00:00', this.datePipe.transform(this.defineDate[1], 'yyyy-MM-dd') + ' 00:00:00'] + this.time = [this.datePipe.transform(this.defineDate[0], 'yyyy-MM-dd') + ' 00:00:00', this.datePipe.transform(this.defineDate[1], 'yyyy-MM-dd') + ' 00:00:00'] } this.st.reload({ ...this.reqParams }); } diff --git a/src/app/routes/datatable/components/operationtable/pie/pie.component.ts b/src/app/routes/datatable/components/operationtable/pie/pie.component.ts index fa58fbd1..cc358bd7 100644 --- a/src/app/routes/datatable/components/operationtable/pie/pie.component.ts +++ b/src/app/routes/datatable/components/operationtable/pie/pie.component.ts @@ -13,9 +13,10 @@ export class OperationtablePieComponent implements OnInit { @ViewChild('pie', { static: false }) pie!: G2PieComponent; chartData: any = []; el: any; + chart: any; enterpriseInfoIdPie = '' interManlist: any = [] - + innerView: any =[]; constructor(private service: DataService, private ngZone: NgZone) { } @@ -27,7 +28,11 @@ export class OperationtablePieComponent implements OnInit { this.service.request(this.service.$api_operationalReportWaybillStatusDistribution, {id: this.enterpriseInfoIdPie}).subscribe(res => { if (res) { this.chartData = res - this.ngZone.runOutsideAngular(() => this.init(this.el)); + // this.ngZone.runOutsideAngular(() => this.init(this.el)); + setTimeout(() => { + this.chart?.data(this.chartData); + this.chart?.render(); + }, 1000) } }) } @@ -39,21 +44,26 @@ export class OperationtablePieComponent implements OnInit { } render(el: ElementRef): void { this.el = el.nativeElement + setTimeout(() => { + this.ngZone.runOutsideAngular(() => this.init(this.el)); + }, 500) } private init(el: HTMLElement): void { - const chart = new Chart({ + this.chart = new Chart({ container: el, autoFit: true, height: 400, }); // 新建一个 view 用来单独渲染Annotation - const innerView = chart.createView(); - chart.coordinate('theta', { + // const innerView = chart.createView(); + + this.innerView = this.chart.createView(); + this.chart.coordinate('theta', { radius: 0.6, innerRadius: 0.7, }); - chart.data(this.chartData); + // this.chart.data(this.chartData); // chart.scale('percent', { // formatter: val => { @@ -62,10 +72,10 @@ export class OperationtablePieComponent implements OnInit { // }, // }); - chart.tooltip(false); + this.chart.tooltip(false); // 声明需要进行自定义图例字段： 'item' - chart.legend('item', { + this.chart.legend('item', { position: 'right', // 配置图例显示位置 custom: true, // 关键字段，告诉 G2，要使用自定义的图例 items: this.chartData.map((obj: any, index: any) => { @@ -77,7 +87,7 @@ export class OperationtablePieComponent implements OnInit { symbol: 'square', // marker 的形状 style: { r: 5, // marker 图形半径 - fill: chart.getTheme().colors10[index], // marker 颜色，使用默认颜色，同图形对应 + fill: this.chart.getTheme().colors10[index], // marker 颜色，使用默认颜色，同图形对应 }, }, // marker 配置 }; @@ -90,7 +100,7 @@ export class OperationtablePieComponent implements OnInit { }, }); - const interval = chart + const interval = this.chart .interval() .adjust('stack') .position('percent') @@ -102,7 +112,7 @@ export class OperationtablePieComponent implements OnInit { }) .state({ active: { - style: element => { + style: (element: any) => { const shape = element.shape; return { lineWidth: 1, @@ -114,17 +124,17 @@ export class OperationtablePieComponent implements OnInit { }); // 移除图例点击过滤交互 - chart.removeInteraction('legend-filter'); - chart.interaction('element-active'); + this.chart.removeInteraction('legend-filter'); + this.chart.interaction('element-active'); - chart.render(true); + this.chart.render(true); // 默认选择 interval.elements[0].setState('selected', true); const ele = interval.elements[0].getData(); // 监听 element 上状态的变化来动态更新 Annotation 信息 - chart.on('element:statechange', (ev: any) => { + this.chart.on('element:statechange', (ev: any) => { const { state, stateStatus, element } = ev.gEvent.originalEvent; // 本示例只需要监听 active 的状态变化 @@ -142,10 +152,10 @@ export class OperationtablePieComponent implements OnInit { // 绘制 annotation let lastItem: any; - function updateAnnotation(data: any) { + const updateAnnotation = (data: any) => { if (data.item !== lastItem) { - innerView.annotation().clear(true); - innerView + this.innerView.annotation().clear(true); + this.innerView .annotation() .text({ position: ['50%', '50%'], @@ -168,7 +178,7 @@ export class OperationtablePieComponent implements OnInit { offsetX: -10, offsetY: 20, }) - innerView.render(true); + this.innerView.render(true); lastItem = data.item; @@ -176,9 +186,9 @@ export class OperationtablePieComponent implements OnInit { } // 清空 annotation - function clearAnnotation() { - innerView.annotation().clear(true); - innerView.render(true); + function clearAnnotation(this: any) { + this.innerView?.annotation()?.clear(true); + this.innerView.render(true); lastItem = null; } diff --git a/src/app/routes/datatable/services/data.service.ts b/src/app/routes/datatable/services/data.service.ts index a75ff652..609ed1b6 100644 --- a/src/app/routes/datatable/services/data.service.ts +++ b/src/app/routes/datatable/services/data.service.ts @@ -93,6 +93,15 @@ export class DataService extends BaseService { // 业务员-合规报表 $api_listPartComplianceReportPage = `/api/sdc/report/listPartComplianceReportPage`; + // 数据报表-订单类型比例 + $api_getBillTypeProportion = `/api/sdc/reportData/getBillTypeProportion`; + // 数据报表-运单直付比例 + $api_getWayBillDirectProportion = `/api/sdc/reportData/getWayBillDirectProportion`; + // 数据报表-统计订单金额-趋势 + $api_getBillAmount = `/api/sdc/reportData/getBillAmount`; + // // 数据报表-统计订单金额-趋势 + // $api_getBillAmount = `/api/sdc/reportData/getBillAmount`; + constructor(public injector: Injector) { diff --git a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.html b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.html index f561427f..aa167bec 100644 --- a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.html +++ b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.html @@ -65,7 +65,7 @@
- + + -
+ \ No newline at end of file diff --git a/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.ts b/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.ts index 2a64cece..a46d003c 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.ts +++ b/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.ts @@ -6,7 +6,7 @@ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @FilePath : \\tms-obc-web\\src\\app\\routes\\ticket-management\\components\\invoice-requested\\requested-invoice-modal\\requested-invoice-modal.component.ts */ -import { Component, ViewChild } from '@angular/core'; +import { ChangeDetectorRef, Component, ViewChild } from '@angular/core'; import { Router } from '@angular/router'; import { STChange, STColumn, STComponent, STRequestOptions } from '@delon/abc/st'; import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal'; @@ -24,23 +24,38 @@ export class RequestedInvoiceModalComponent { columns: STColumn[] = this.initST(); id: any; selectedRows: any[] = []; - constructor(public service: TicketService, private nzModalService: NzModalService, private modal: NzModalRef, private router: Router) {} + + constructor( + public service: TicketService, + private nzModalService: NzModalService, + private modal: NzModalRef, + private router: Router, + private cdr: ChangeDetectorRef + ) {} beforeReq = (requestOptions: STRequestOptions) => { Object.assign(requestOptions.body, { vatappHId: this.id }); return requestOptions; }; + afterRes = (data: any[], rawData?: any) => { + return data.map(item => ({ ...item, isDelete: data?.length > 1 })); + }; + /** * 移除订单 * * @returns */ removeOrder(item: any[]) { - if (this.st1._data?.length <= 1) { + if (this.st1.total <= 1 || item?.length === this.st1.total) { this.service.msgSrv.warning('开票申请记录不能少于一个订单'); return; } + if (item?.length <= 0) { + this.service.msgSrv.warning('请选择要移除订单'); + return; + } this.nzModalService.warning({ nzTitle: '确定从当前批次中移除所选订单？', nzContent: '移除后相关订单可以重新提交开票申请', @@ -111,7 +126,7 @@ export class RequestedInvoiceModalComponent { { text: '移除', click: (item: any) => this.removeOrder([item]), - iif: _ => this.st1._data?.length > 1 + iif: item => item.isDelete } ] } diff --git a/src/app/routes/vehicle/components/list/detail/detail.component.html b/src/app/routes/vehicle/components/list/detail/detail.component.html index a7422e70..56a65d87 100644 --- a/src/app/routes/vehicle/components/list/detail/detail.component.html +++ b/src/app/routes/vehicle/components/list/detail/detail.component.html @@ -1,4 +1,4 @@ - + @@ -8,84 +8,73 @@ - -
- - - - - - - -
- - + +
+ + + + + + + +
+ + - + 车辆基础信息 - - + - - - - - - - - - - - - - - - - - - - - - + + + + - - - + + - - - - - - + + + + + - - + + @@ -93,24 +82,30 @@ 行驶证信息 + [placeholder]="isEdit?'':'-'"> + + + + [nzPlaceHolder]="isEdit?'':'-'" [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit?'calendar':''"> + - - - - + + + + + - + @@ -119,118 +114,114 @@ + [nzPlaceHolder]="isEdit?'':'-'" [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit?'calendar':''"> + - + - - - + [nzShowArrow]="isEdit" [nzDisabled]="!isEdit"> + + + + [placeholder]="isEdit?'':'-'"> + [placeholder]="isEdit?'':'-'"> - + - + *ngTemplateOutlet="uploadTemplate;context:{image:detailData?.certificatePhotoFrontWatermark,key:'certificatePhotoFrontWatermark',hover: 'FrontWatermark'}"> + - + *ngTemplateOutlet="uploadTemplate;context:{image:detailData?.certificatePhotoBackWatermark,key:'certificatePhotoBackWatermark',hover: 'BackWatermark'}"> + 道路运输证信息 - + - + + [nzPlaceHolder]="isEdit?'':'-'" [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit?'calendar':''"> + + [nzPlaceHolder]="isEdit?'':'-'" [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit?'calendar':''"> + - + *ngTemplateOutlet="uploadTemplate;context:{image:detailData?.roadTransportPhotoWatermark,key:'roadTransportPhotoWatermark', hover: 'Watermark'}"> + 认证司机 - - -
- 未上传 - 草稿 - 待审核 - 已审核 - 已驳回 - 证件过期 -
- - + + +
+ 未上传 + 草稿 + 待审核 + 已审核 + 已驳回 + 证件过期 +
+ + - + -
- 评分: -
评价内容：
-
+
+ 评分: +
评价内容：
+
-
- 暂无评价内容 -
+
+ 暂无评价内容 +