From fcdc8fddd980b4787e1d705abd557d2b99a6d740 Mon Sep 17 00:00:00 2001 From: weiyu Date: Mon, 25 Apr 2022 14:39:09 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E5=8F=AF=E5=BC=80=E7=A5=A8=E8=AE=A2?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../invoice-reporting.component.ts | 2 +- .../billing-order.component.html | 32 +++ .../billing-order/billing-order.component.ts | 259 ++++++++++++++++++ .../ticket-management-routing.module.ts | 4 +- .../ticket-management.module.ts | 4 +- 5 files changed, 298 insertions(+), 3 deletions(-) create mode 100644 src/app/routes/ticket-management/components/billing-order/billing-order.component.html create mode 100644 src/app/routes/ticket-management/components/billing-order/billing-order.component.ts diff --git a/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.ts b/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.ts index 49955f8a..cb2c9e06 100644 --- a/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.ts +++ b/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.ts @@ -230,7 +230,7 @@ export class TaxManagementInvoiceReportingComponent implements OnInit { { title: '购买方企业名称', index: 'artoname', className: 'text-center', width: '200px', type: 'link', click: item => { - window.open(`/#/usercenter/freight/list/detail/${item.ltdId}`, '_blank', 'noopener') + window.open(`/#/usercenter/freight/list/detail/${item.arto}`, '_blank', 'noopener') } }, { title: '购买方统一社会信用代码', index: 'artotaxno', className: 'text-center', width: '200px' }, diff --git a/src/app/routes/ticket-management/components/billing-order/billing-order.component.html b/src/app/routes/ticket-management/components/billing-order/billing-order.component.html new file mode 100644 index 00000000..459c631c --- /dev/null +++ b/src/app/routes/ticket-management/components/billing-order/billing-order.component.html @@ -0,0 +1,32 @@ + + + + + +
+
+ +
+
+ + + + +
+
+ + + + + + {{item.driverName}}
{{item.driverCellphone}} + + + \ No newline at end of file diff --git a/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts b/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts new file mode 100644 index 00000000..5bd08959 --- /dev/null +++ b/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts @@ -0,0 +1,259 @@ +import { Component, OnInit, ViewChild } from '@angular/core'; +import { Router } from '@angular/router'; +import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st'; +import { SFComponent, SFSchema, SFDateWidgetSchema, SFSelectWidgetSchema } from '@delon/form'; +import { NzModalService } from 'ng-zorro-antd/modal'; +import { TicketService } from '../../services/ticket.service'; + +@Component({ + selector: 'app-billing-order', + templateUrl: './billing-order.component.html', + styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less'] +}) +export class BillingOrderComponent implements OnInit { + @ViewChild('st', { static: true }) + st!: STComponent; + @ViewChild('sf', { static: false }) + sf!: SFComponent; + columns: STColumn[] = this.initST(); + searchSchema: SFSchema = this.initSF(); + + _$expand = false; + + 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, + exTime: { + start: this.sf.value.exTime?.[0] || '', + end: this.sf.value.exTime?.[1] || '' + }, + invoiceMakeTime: { + start: this.sf.value.invoiceMakeTime?.[0] || '', + end: this.sf.value.invoiceMakeTime?.[1] || '' + } + }); + } + return requestOptions; + }; + + routeTo(item: any) { + return; + this.router.navigate(['/ticket/invoice-requested-detail/1']); + } + + /** + * 重置表单 + */ + resetSF() { + this.sf.reset(); + this._$expand = false; + } + + /** + * 伸缩查询条件 + */ + expandToggle() { + this._$expand = !this._$expand; + this.sf?.setValue('/expand', this._$expand); + } + + exportList() { + const params = { listSource: 1, pageSize: -1 }; + if (this.sf) { + Object.assign(params, { + ...this.sf.value + }); + } + this.service.downloadFile(this.service.$api_export_invoice_logs_page, params); + } + + private initSF(): SFSchema { + return { + properties: { + expand: { + type: 'boolean', + ui: { + hidden: true + } + }, + billCode: { + type: 'string', + title: '订单号', + ui: { + placeholder: '请输入' + } + }, + serviceType: { + title: '服务类型', + type: 'string', + default: '', + ui: { + widget: 'dict-select', + params: { dictKey: 'service:type' }, + containsAllLabel: true, + visibleIf: { + _$expand: (value: boolean) => value + } + } as SFSelectWidgetSchema + }, + enterpriseName: { + type: 'string', + title: '货主名称', + ui: { + placeholder: '请输入', + } + }, + vatappHCode: { + type: 'string', + title: '申请编号', + ui: { + autocomplete: 'off', + visibleIf: { + expand: (value: boolean) => value + } + } + }, + vatinvcode: { + type: 'string', + title: '分票编号', + ui: { + placeholder: '请输入', + visibleIf: { + expand: (value: boolean) => value + } + } + }, + createTime: { + title: '申请时间', + type: 'string', + ui: { + widget: 'sl-from-to-search', + format: 'yyyy-MM-dd HH:mm:ss', + nzShowTime: true, + visibleIf: { + expand: (value: boolean) => value + } + } as SFDateWidgetSchema + }, + invoicingStatus: { + type: 'string', + title: '开票状态', + ui: { + widget: 'dict-select', + params: { dictKey: 'etc:invoicing:status' }, + placeholder: '请选择', + visibleIf: { + expand: (value: boolean) => value + } + }, + default: '' + }, + invoiceNum: { + type: 'string', + title: '发票号码', + ui: { + placeholder: '请输入', + autocomplete: 'off', + visibleIf: { + expand: (value: boolean) => value + } + } + }, + approvalTime: { + title: '审核时间', + type: 'string', + ui: { + widget: 'sl-from-to-search', + format: 'yyyy-MM-dd HH:mm:ss', + nzShowTime: true, + visibleIf: { + expand: (value: boolean) => value + } + } as SFDateWidgetSchema + }, + invoiceMakeTime: { + title: '开票日期', + type: 'string', + ui: { + widget: 'sl-from-to-search', + format: 'yyyy-MM-dd', + visibleIf: { + expand: (value: boolean) => value + } + } as SFDateWidgetSchema + }, + ltdId: { + type: 'string', + title: '网络货运人', + ui: { + widget: 'select', + placeholder: '请选择', + allowClear: true, + visibleIf: { + expand: (value: boolean) => value + }, + asyncData: () => this.service.getNetworkFreightForwarder() + }, + default: '' + } + } + }; + } + + private initST(): STColumn[] { + return [ + { title: '发票号码', index: 'invoiceNum', width: 100, type: 'link', click: item => this.routeTo(item) }, + { title: '发票代码', index: 'invoiceCode', width: 130 }, + { title: '订单号', index: 'billCode', width: 180 }, + { title: '运单号', index: 'waybillCode', width: 180 }, + { title: '入站口', index: 'enStationName', width: 100 }, + { title: '出站口', index: 'exStationName', width: 100 }, + { title: '司机', render: 'call3No', width: 140 }, + { title: '车牌号', index: 'carNo', width: 100 }, + // { title: '里程（km）', index: 'mileage', width: 120 }, + { title: '交易id', index: 'tradeId', width: 200 }, + { + title: '交易金额（元）', + index: 'fee', + width: 150, + type: 'widget', + className: 'text-right', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.fee }) } + }, + { title: '税率', index: 'taxRate', width: 90, format: item => `${item.taxRate ? ((item.taxRate as number) * 100).toFixed(2) : 0}%` }, + { + title: '金额（元）', + index: 'invoiceAmount', + width: 120, + type: 'widget', + className: 'text-right', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.invoiceAmount }) } + }, + { + title: '税额（元）', + index: 'totalTaxAmount', + width: 150, + type: 'widget', + className: 'text-right', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.totalTaxAmount }) } + }, + { + title: '价税合计（元）', + index: 'totalAmount', + width: 150, + type: 'widget', + className: 'text-right font-weight-bold', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.totalAmount }) } + }, + { title: '交易时间', index: 'exTime', type: 'date', width: 150 }, + { title: '开票日期', index: 'invoiceMakeTime', type: 'date', width: 150 }, + { title: '销售方', index: 'sellerName', width: 150 }, + { title: '网络货运人', index: 'enterpriseInfoName', width: 220 } + ]; + } +} diff --git a/src/app/routes/ticket-management/ticket-management-routing.module.ts b/src/app/routes/ticket-management/ticket-management-routing.module.ts index 5cbcd7d0..51369dec 100644 --- a/src/app/routes/ticket-management/ticket-management-routing.module.ts +++ b/src/app/routes/ticket-management/ticket-management-routing.module.ts @@ -1,5 +1,6 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; +import { BillingOrderComponent } from './components/billing-order/billing-order.component'; import { CancellationInvoiceComponent } from './components/cancellation-invoice/cancellation-invoice.component'; import { ETCBlacklistComponent } from './components/etc-blacklist/etc-blacklist.component'; import { ETCInvoicedListComponent } from './components/etc-invoiced-list/etc-invoiced-list.component'; @@ -28,7 +29,8 @@ const routes: Routes = [ { path: 'input-invoice', component: InputInvoiceComponent }, { path: 'input-invoice/detail/:id', component: InputInvoiceDetailComponent }, { path: 'input-invoice/edit/:id', component: EditCollectionInvoiceComponent }, - { path: 'express-info', component: ExpressInfoComponent } + { path: 'express-info', component: ExpressInfoComponent }, + { path: 'billing-order', component: BillingOrderComponent } ]; @NgModule({ diff --git a/src/app/routes/ticket-management/ticket-management.module.ts b/src/app/routes/ticket-management/ticket-management.module.ts index e0d47e51..dede5926 100644 --- a/src/app/routes/ticket-management/ticket-management.module.ts +++ b/src/app/routes/ticket-management/ticket-management.module.ts @@ -26,6 +26,7 @@ import { PrintOrderModalComponent } from './components/invoice-requested/print-o import { ExpressInfoComponent } from './components/express-info/express-info.component'; import { ExpressDetailModalComponent } from './components/express-info/express-detail-modal/express-detail-modal.component'; import { UpdateAddressModalComponent } from './components/invoice-requested/update-address-modal/update-address-modal.component'; +import { BillingOrderComponent } from './components/billing-order/billing-order.component'; const COMPONENTS: any = [ ETCInvoicedListComponent, @@ -41,7 +42,8 @@ const COMPONENTS: any = [ InputInvoiceComponent, InputInvoiceDetailComponent, EditCollectionInvoiceComponent, - ExpressInfoComponent + ExpressInfoComponent, + BillingOrderComponent ]; const NOTROUTECOMPONENTS: any = [ TransactionDetailsComponent, From 456f086f8daed78a6329ea3bf8633faf50e8c7cd Mon Sep 17 00:00:00 2001 From: weiyu Date: Mon, 25 Apr 2022 16:17:32 +0800 Subject: [PATCH 02/16] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../billing-order/billing-order.component.ts | 108 ++++++++++++------ 1 file changed, 76 insertions(+), 32 deletions(-) diff --git a/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts b/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts index 5bd08959..4a98a475 100644 --- a/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts +++ b/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts @@ -207,27 +207,12 @@ export class BillingOrderComponent implements OnInit { private initST(): STColumn[] { return [ - { title: '发票号码', index: 'invoiceNum', width: 100, type: 'link', click: item => this.routeTo(item) }, - { title: '发票代码', index: 'invoiceCode', width: 130 }, { title: '订单号', index: 'billCode', width: 180 }, { title: '运单号', index: 'waybillCode', width: 180 }, - { title: '入站口', index: 'enStationName', width: 100 }, - { title: '出站口', index: 'exStationName', width: 100 }, - { title: '司机', render: 'call3No', width: 140 }, - { title: '车牌号', index: 'carNo', width: 100 }, - // { title: '里程（km）', index: 'mileage', width: 120 }, - { title: '交易id', index: 'tradeId', width: 200 }, + { title: '银行类型', index: 'bankTypeLabel', width: 100 }, + { title: '网络货运人', index: 'enterpriseInfoName', width: 220 }, { - title: '交易金额（元）', - index: 'fee', - width: 150, - type: 'widget', - className: 'text-right', - widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.fee }) } - }, - { title: '税率', index: 'taxRate', width: 90, format: item => `${item.taxRate ? ((item.taxRate as number) * 100).toFixed(2) : 0}%` }, - { - title: '金额（元）', + title: '开票金额（元）', index: 'invoiceAmount', width: 120, type: 'widget', @@ -235,25 +220,84 @@ export class BillingOrderComponent implements OnInit { widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.invoiceAmount }) } }, { - title: '税额（元）', - index: 'totalTaxAmount', - width: 150, + title: '总费用（元）', + index: 'totalAmount', + width: 120, type: 'widget', className: 'text-right', - widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.totalTaxAmount }) } - }, - { - title: '价税合计（元）', - index: 'totalAmount', - width: 150, - type: 'widget', - className: 'text-right font-weight-bold', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.totalAmount }) } }, - { title: '交易时间', index: 'exTime', type: 'date', width: 150 }, + { + title: '运输费（元）', + index: 'shippingFee', + width: 120, + type: 'widget', + className: 'text-right', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.shippingFee }) } + }, + { + title: '技术服务费（元）', + index: 'invoiceAmount', + width: 120, + type: 'widget', + className: 'text-right', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.invoiceAmount }) } + }, + { + title: '附加费（元）', + index: 'aliasFee', + width: 120, + type: 'widget', + className: 'text-right', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.aliasFee }) } + }, + { + title: '附加费率', + className: 'text-right', + index: 'aliasFeeRatio', + width: 130, + format: record => `${record.aliasFeeRatio}%` + }, + { title: '货主名称', index: 'enterpriseName', className: 'text-center', width: '200px' }, + { title: '所属项目', index: 'projectName', width: 100 }, + { + title: '服务类型', + index: 'serviceTypeLabel', + width: 150 + }, + { title: '装货地', index: 'loadingAddressArr', width: '120px', className: 'text-left' }, + { title: '卸货地', index: 'dischargeAddress', className: 'text-center'}, + { title: '货物信息', index: 'goodsName', className: 'text-center', width: '180px' }, + { title: '车牌号', index: 'carNo', width: 100 }, + { + title: '承运司机', + className: 'text-right', + width: '150px', + render: 'driverName' + }, + { + title: '车队长', + className: 'text-left', + width: '180px', + index: 'payeeName', + render: 'payeeName' + }, + { title: '业务员',width: '100px', index: 'salesmanName',className: 'text-center', }, + { title: '录单时间', index: 'recordTime',type: 'date', className: 'text-center', width: '150px' }, + { title: '装货时间', index: 'loadingTime', type: 'date', width: '150px',className: 'text-center', }, + { title: '卸货时间', index: 'unloadingTime', type: 'date', width: '150px',className: 'text-center', }, + { title: '订单完成时间', index: 'billfinTime', type: 'date', width: 150,className: 'text-center', }, + { title: '支付完成时间', index: 'payfinTime', type: 'date', width: 150,className: 'text-center', }, + { title: '开票状态', index: 'approvalStatus2', className: 'text-center', width: 180 }, + { title: '申请开票时间', index: 'approvalInvoiceTime',type: 'date', className: 'text-center', width: 180 }, + { title: '申请开票编号', index: 'approvalInvoiceNO', className: 'text-center', width: 180 }, + { title: '分票编号', index: 'vatinvcode',className: 'text-center', }, + { title: '发票号码', index: 'invoiceNum', width: 100,className: 'text-center', }, + { title: '发票代码', index: 'invoiceCode', width: 130 }, + { title: '审核时间', index: 'approveTime',type: 'date', width: 130 }, { title: '开票日期', index: 'invoiceMakeTime', type: 'date', width: 150 }, - { title: '销售方', index: 'sellerName', width: 150 }, - { title: '网络货运人', index: 'enterpriseInfoName', width: 220 } + { title: '作废日期', index: 'invalidTime', type: 'date', width: 150 }, + { title: 'ETC开票金额', render: 'vatmoney', className: 'text-left', width: 200 } ]; } } From 9fd75c3dde9864ed3234a0ca4f4066b409fcfef2 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Tue, 26 Apr 2022 16:46:46 +0800 Subject: [PATCH 03/16] fix bug --- .../rebate-setting/add/add.component.html | 9 +++-- .../rebate-setting/add/add.component.ts | 15 +------- .../rebate-table/rebate-table.component.html | 17 +++++---- .../rebate-table/rebate-table.component.ts | 37 ++++++------------- 4 files changed, 29 insertions(+), 49 deletions(-) diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html index eed8266a..1762a6cb 100644 --- a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html +++ b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-02-24 20:09:49 * @LastEditors : Shiming - * @LastEditTime : 2022-04-26 15:50:41 + * @LastEditTime : 2022-04-26 16:04:31 * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add\\add.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -37,8 +37,11 @@ -
- +
+ +
+
+
diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts index 052b5c3c..fbf255c8 100644 --- a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts +++ b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-03-21 09:26:45 * @LastEditors : Shiming - * @LastEditTime : 2022-04-26 15:51:04 + * @LastEditTime : 2022-04-26 16:37:57 * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add\\add.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -25,6 +25,7 @@ export class ParterRebateManageMentAddComponent implements OnInit { @ViewChild('table') table!: any; titleText :string= '新增'; tabelData: any; + tabelType: any; formData: any; addStatus: boolean = false; hiden: boolean = false; @@ -88,7 +89,6 @@ export class ParterRebateManageMentAddComponent implements OnInit { text: '移除', click: _record => this.delete(_record), iif: ()=> { - console.log(this.hiden); return !this.hiden }, acl: { ability: ['AbnormalAppear-reply'] } @@ -98,7 +98,6 @@ export class ParterRebateManageMentAddComponent implements OnInit { ]; } ngOnInit() { - console.log(this.ar.snapshot.queryParams.id); if(this.ar.snapshot?.queryParams?.id) { this.titleText= '查看' this.hiden= true @@ -128,14 +127,11 @@ export class ParterRebateManageMentAddComponent implements OnInit { this.partnerId = []; if (res) { if (Array.isArray(res)) { - console.log(res); - console.log(this.partnerPeopleList); this.partnerPeopleList = this.partnerPeopleList.concat(res); res.forEach((ele: any) => { this.partnerId.push(ele?.id); }); } else { - console.log(res); this.partnerPeopleList = this.partnerPeopleList.concat(res); this.partnerId.push(res?.id); } @@ -148,9 +144,6 @@ export class ParterRebateManageMentAddComponent implements OnInit { }); } save() { - console.log(this.partnerId); - console.log(this.partnerId.join(',')); - const params = { accountingRate: this.accountingRate, configName: this.configName, @@ -162,10 +155,8 @@ export class ParterRebateManageMentAddComponent implements OnInit { remarke: this.remarke, partnerType: this.partnerType }; - console.log(params); this.service.request(this.service.$api_save_rebateConfig, params).subscribe((res: any) => { if (res) { - console.log(res); this.service.msgSrv.success('新增成功！'); this.router.navigate(['/partner/rebate/setting']); } @@ -173,7 +164,6 @@ export class ParterRebateManageMentAddComponent implements OnInit { } initData(id:string) { this.service.request(this.service.$api_get_getPartnerRebateConfigInfo, {id: id}).subscribe((res: any) => { - console.log(res); if(res) { this.configName = res?.configName; this.accountingRate = res?.accountingRate; @@ -189,7 +179,6 @@ export class ParterRebateManageMentAddComponent implements OnInit { }) } changePartner(value: any) { - console.log(value); if (value == '3') { this.addStatus = true; } else { diff --git a/src/app/shared/components/rebate-table/rebate-table.component.html b/src/app/shared/components/rebate-table/rebate-table.component.html index f23994c1..36d3872c 100644 --- a/src/app/shared/components/rebate-table/rebate-table.component.html +++ b/src/app/shared/components/rebate-table/rebate-table.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-25 20:18:52 * @LastEditors : Shiming - * @LastEditTime : 2022-04-22 14:09:16 + * @LastEditTime : 2022-04-26 16:20:47 * @FilePath : \\tms-obc-web\\src\\app\\shared\\components\\rebate-table\\rebate-table.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -23,7 +23,7 @@ 初始业务量（万/月） 到达业务量（万/月） 管理费比例% - 操作 + 操作 @@ -37,8 +37,11 @@
- - + + + + +
@@ -72,11 +75,11 @@
- - + + - - diff --git a/src/app/shared/components/rebate-table/rebate-table.component.ts b/src/app/shared/components/rebate-table/rebate-table.component.ts index d2b3fa09..faf3a9e6 100644 --- a/src/app/shared/components/rebate-table/rebate-table.component.ts +++ b/src/app/shared/components/rebate-table/rebate-table.component.ts @@ -11,6 +11,7 @@ import { EventEmitter} from '@angular/core' }) export class RebateTableComponent implements OnInit { @Input() data: any =[]; + @Input() type: any; @Output() private dataChange: EventEmitter = new EventEmitter(); emit() { @@ -24,15 +25,13 @@ export class RebateTableComponent implements OnInit { constructor(public service: BaseService, private cdr: ChangeDetectorRef) {} ngOnInit(): void { - this.data = [ - { - gradeConfigId: '', - startAmount: 0, - endAmount: 0, - managementFeeRatio: 0, - } - ]; - this.loadData(); + if(this.type == '2') { + this.loadData(); + + } + console.log(this.type); + console.log(this.data); + this.changeendAmountAction(); } @@ -40,7 +39,7 @@ export class RebateTableComponent implements OnInit { this.service.request('/api/mdc/partnerGradeConfig/listPartnerGradeConfig').subscribe(res => { if (res) { console.log(res); - this.grage = res; + this.grage = res; this.cdr.detectChanges(); } }); @@ -70,6 +69,8 @@ export class RebateTableComponent implements OnInit { changeendAmountAction() { this.changeSub.pipe(debounceTime(500)).subscribe((res: string) => { if (res) { + console.log(res); + const paras = res.split(','); const num = Number(paras[0]); const i = Number(paras[1]); @@ -113,22 +114,6 @@ export class RebateTableComponent implements OnInit { this.data = [...newArr]; } - save() { - console.log(this.data) - let params= { - rebateConfigDTOS: this.data - } - console.log(params); - this.service.request('/api/mdc/cuc/rebateConfig/saveBatch', params).subscribe(res => { - if (res) { - console.log(res); - this.service.msgSrv.success('修改成功'); - this.loadData(); - } - }); - } - - /** * 遍历同步后置位公里数 * @param event 车长 From c9afdb19d4b6cb4754f279ea839f927b748da40b Mon Sep 17 00:00:00 2001 From: wangshiming Date: Tue, 26 Apr 2022 16:52:20 +0800 Subject: [PATCH 04/16] fix bug --- .../rebate-setting/add/add.component.html | 6 +- .../rebate-table/rebate-table.component.ts | 55 +++++++++++-------- 2 files changed, 36 insertions(+), 25 deletions(-) diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html index 1762a6cb..e680165f 100644 --- a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html +++ b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-02-24 20:09:49 * @LastEditors : Shiming - * @LastEditTime : 2022-04-26 16:04:31 + * @LastEditTime : 2022-04-26 16:51:07 * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add\\add.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -38,10 +38,10 @@
- +
- +
diff --git a/src/app/shared/components/rebate-table/rebate-table.component.ts b/src/app/shared/components/rebate-table/rebate-table.component.ts index faf3a9e6..179735ca 100644 --- a/src/app/shared/components/rebate-table/rebate-table.component.ts +++ b/src/app/shared/components/rebate-table/rebate-table.component.ts @@ -3,35 +3,55 @@ import { Subject } from 'rxjs'; import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnInit, Output, ViewChild } from '@angular/core'; import { BaseService } from '@shared'; import { SFComponent, SFSchema, SFUISchema } from '@delon/form'; -import { EventEmitter} from '@angular/core' +import { EventEmitter } from '@angular/core'; @Component({ selector: 'app-rebate-table', templateUrl: './rebate-table.component.html', styleUrls: ['./rebate-table.component.less'] }) export class RebateTableComponent implements OnInit { - @Input() data: any =[]; + @Input() data: any = []; @Input() type: any; + @Input() hiden!: boolean; @Output() private dataChange: EventEmitter = new EventEmitter(); emit() { - this.dataChange.emit(this.data) + this.dataChange.emit(this.data); } headers: any[] = []; - gradeConfigId: string =''; + gradeConfigId: string = ''; grage: any[] = []; formatterDollar = (value: number): string => `${value}`; changeSub = new Subject(); constructor(public service: BaseService, private cdr: ChangeDetectorRef) {} ngOnInit(): void { - if(this.type == '2') { - this.loadData(); - + if (this.type == '2') { + this.loadData(); } + if (!this.hiden && this.type == '2') { + this.data = [ + { + gradeConfigId: '', + startAmount: 0, + endAmount: 0, + managementFeeRatio: 0, + } + ]; + } else if (!this.hiden && this.type == '1'){ + this.data = [ + { + gradeConfigId: 0, + startAmount: 0, + endAmount: 0, + managementFeeRatio: 0, + } + ]; + } + console.log(this.type); console.log(this.data); - + this.changeendAmountAction(); } @@ -39,21 +59,12 @@ export class RebateTableComponent implements OnInit { this.service.request('/api/mdc/partnerGradeConfig/listPartnerGradeConfig').subscribe(res => { if (res) { console.log(res); - this.grage = res; + this.grage = res; this.cdr.detectChanges(); } }); - // this.service.request('/api/mdc/pbc/sysConfigItem/findItemValueByItemKeys', [ - // "rebate.config.minrebatePrice" - // ]).subscribe(res => { - // if (res) { - // console.log(res); - // } - // }); } - - /** * 修改结束公里数 * @param event 车长 @@ -70,7 +81,7 @@ export class RebateTableComponent implements OnInit { this.changeSub.pipe(debounceTime(500)).subscribe((res: string) => { if (res) { console.log(res); - + const paras = res.split(','); const num = Number(paras[0]); const i = Number(paras[1]); @@ -79,7 +90,7 @@ export class RebateTableComponent implements OnInit { console.log(this.data[i].endAmount); this.data[i].endAmount = null; setTimeout(() => { - this.data[i].endAmount = this.data[i]?.startAmount + 1 ; + this.data[i].endAmount = this.data[i]?.startAmount + 1; }, 0); this.changeNextstartAmount(this.data[i]?.startAmount + 1, i + 1); return; @@ -99,7 +110,7 @@ export class RebateTableComponent implements OnInit { gradeConfigId: '', startAmount: 0, endAmount: 0, - managementFeeRatio: 0, + managementFeeRatio: 0 }); this.data = [...this.data]; } @@ -108,7 +119,7 @@ export class RebateTableComponent implements OnInit { deleteRow(index: number) { console.log(index); var newArr = this.data.concat(); - newArr.splice(this.data.length-1,1) + newArr.splice(this.data.length - 1, 1); // this.data = this.data.pop() console.log(newArr); this.data = [...newArr]; From 58d0023b4d5be257cd5f230d8c76d2e05626af6b Mon Sep 17 00:00:00 2001 From: wangshiming Date: Tue, 26 Apr 2022 16:57:34 +0800 Subject: [PATCH 05/16] fix bug --- .../rebate-table/rebate-table.component.ts | 25 +++++-------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/src/app/shared/components/rebate-table/rebate-table.component.ts b/src/app/shared/components/rebate-table/rebate-table.component.ts index 179735ca..56dd0cee 100644 --- a/src/app/shared/components/rebate-table/rebate-table.component.ts +++ b/src/app/shared/components/rebate-table/rebate-table.component.ts @@ -1,8 +1,7 @@ import { debounceTime } from 'rxjs/operators'; import { Subject } from 'rxjs'; -import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnInit, Output, ViewChild } from '@angular/core'; +import { ChangeDetectorRef, Component, Input, OnInit, Output } from '@angular/core'; import { BaseService } from '@shared'; -import { SFComponent, SFSchema, SFUISchema } from '@delon/form'; import { EventEmitter } from '@angular/core'; @Component({ selector: 'app-rebate-table', @@ -10,9 +9,9 @@ import { EventEmitter } from '@angular/core'; styleUrls: ['./rebate-table.component.less'] }) export class RebateTableComponent implements OnInit { - @Input() data: any = []; - @Input() type: any; - @Input() hiden!: boolean; + @Input() data: any = []; // 数据 + @Input() type: any; // 配置类型 1全部等级 2不同等级 + @Input() hiden!: boolean; // 判断新增/查看 @Output() private dataChange: EventEmitter = new EventEmitter(); emit() { @@ -29,6 +28,7 @@ export class RebateTableComponent implements OnInit { if (this.type == '2') { this.loadData(); } + // 新增-不同等级情况 if (!this.hiden && this.type == '2') { this.data = [ { @@ -38,6 +38,7 @@ export class RebateTableComponent implements OnInit { managementFeeRatio: 0, } ]; + // 新增-全部等级情况 } else if (!this.hiden && this.type == '1'){ this.data = [ { @@ -48,17 +49,12 @@ export class RebateTableComponent implements OnInit { } ]; } - - console.log(this.type); - console.log(this.data); - this.changeendAmountAction(); } loadData() { this.service.request('/api/mdc/partnerGradeConfig/listPartnerGradeConfig').subscribe(res => { if (res) { - console.log(res); this.grage = res; this.cdr.detectChanges(); } @@ -72,22 +68,17 @@ export class RebateTableComponent implements OnInit { */ changeendAmount(event: any, i: number) { if (event) { - console.log(event); - this.changeSub.next(`${event},${i}`); } } changeendAmountAction() { this.changeSub.pipe(debounceTime(500)).subscribe((res: string) => { if (res) { - console.log(res); - const paras = res.split(','); const num = Number(paras[0]); const i = Number(paras[1]); if (num <= this.data[i]?.startAmount) { - console.log(this.data[i].endAmount); this.data[i].endAmount = null; setTimeout(() => { this.data[i].endAmount = this.data[i]?.startAmount + 1; @@ -102,8 +93,6 @@ export class RebateTableComponent implements OnInit { } add() { - console.log(this.data); - const tem = this.data[this.data?.length - 1]; if (tem) { this.data.push({ @@ -117,11 +106,9 @@ export class RebateTableComponent implements OnInit { } deleteRow(index: number) { - console.log(index); var newArr = this.data.concat(); newArr.splice(this.data.length - 1, 1); // this.data = this.data.pop() - console.log(newArr); this.data = [...newArr]; } From d3e8365cf62668b56f47ccef932ccf07ec58ae91 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Tue, 26 Apr 2022 16:59:05 +0800 Subject: [PATCH 06/16] fix bug --- .../components/rebate-table/rebate-table.component.html | 4 ++-- .../shared/components/rebate-table/rebate-table.component.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/shared/components/rebate-table/rebate-table.component.html b/src/app/shared/components/rebate-table/rebate-table.component.html index 36d3872c..c1ddf0d6 100644 --- a/src/app/shared/components/rebate-table/rebate-table.component.html +++ b/src/app/shared/components/rebate-table/rebate-table.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-25 20:18:52 * @LastEditors : Shiming - * @LastEditTime : 2022-04-26 16:20:47 + * @LastEditTime : 2022-04-26 16:58:41 * @FilePath : \\tms-obc-web\\src\\app\\shared\\components\\rebate-table\\rebate-table.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -41,7 +41,7 @@ - + diff --git a/src/app/shared/components/rebate-table/rebate-table.component.ts b/src/app/shared/components/rebate-table/rebate-table.component.ts index 56dd0cee..0e6581fc 100644 --- a/src/app/shared/components/rebate-table/rebate-table.component.ts +++ b/src/app/shared/components/rebate-table/rebate-table.component.ts @@ -42,7 +42,7 @@ export class RebateTableComponent implements OnInit { } else if (!this.hiden && this.type == '1'){ this.data = [ { - gradeConfigId: 0, + gradeConfigId: '0', startAmount: 0, endAmount: 0, managementFeeRatio: 0, From e64feb0246e6118db6e8c0872830d9340344474f Mon Sep 17 00:00:00 2001 From: wangshiming Date: Tue, 26 Apr 2022 19:50:36 +0800 Subject: [PATCH 07/16] fix bug --- .../rebate-setting/add/add.component.html | 4 +- .../components/config/config.component.html | 134 ++++++++++-------- .../components/config/config.component.less | 3 + .../components/config/config.component.ts | 83 ++++++++++- 4 files changed, 159 insertions(+), 65 deletions(-) diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html index e680165f..20a16e80 100644 --- a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html +++ b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-02-24 20:09:49 * @LastEditors : Shiming - * @LastEditTime : 2022-04-26 16:51:07 + * @LastEditTime : 2022-04-26 19:50:16 * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add\\add.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -54,7 +54,7 @@ (ngModelChange)="changePartner(partnerType)" style="max-width: 400px; min-width: 200px" > - + diff --git a/src/app/routes/partner/system-config/components/config/config.component.html b/src/app/routes/partner/system-config/components/config/config.component.html index e942c052..413ced69 100644 --- a/src/app/routes/partner/system-config/components/config/config.component.html +++ b/src/app/routes/partner/system-config/components/config/config.component.html @@ -12,7 +12,7 @@

提现手续费配置

-
+
按照提现金额收取 @@ -20,7 +20,7 @@ %手续费
- +
按照提现金额收取

合伙人提现配置

-
+
@@ -45,25 +45,33 @@ -
- - - - -
- -
- +
+ + + +
+ +
+ +
-

客服电话配置

+

客户定义配置

-
- - - -
+
+ 客户 + + 天内没有交易订单的视为“沉默客户” +
+
+ 客户 + + 天内没有交易订单的视为“沉默客户” +
+
+ 说明：交易订单指从司机已接单开始的订单。 +
@@ -90,7 +98,7 @@

短信配置

-
+

配置用户端登陆页注册帐号、修改密码、修改手机号时的短信内容

- -
-
-

通知配置

-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - -
-
-
-

客服电话配置

-
-
- - - -
-
-

证件提醒配置

-
-
- - 距离到期时间 - - 天开始提醒，每隔 - - 天提醒一次 - -
-
+
diff --git a/src/app/routes/partner/system-config/components/config/config.component.ts b/src/app/routes/partner/system-config/components/config/config.component.ts index a7501487..bbac9eb1 100644 --- a/src/app/routes/partner/system-config/components/config/config.component.ts +++ b/src/app/routes/partner/system-config/components/config/config.component.ts @@ -1,8 +1,23 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { SFComponent, SFSchema, SFUploadWidgetSchema } from '@delon/form'; -import { Observable, Observer } from 'rxjs'; +import { NzUploadFile } from 'ng-zorro-antd/upload'; +import { Observable, Observer, of } from 'rxjs'; import { ConfigService } from '../../services/config.service'; - +import { apiConf } from '@conf/api.conf'; +const IMAGECONFIG = { + previewFile: (file: NzUploadFile) => of(file.url), + action: apiConf.waterFileUpload, + fileType: 'image/png,image/jpeg,image/jpg,image/gif', + fileSize: 5120, + limit: 1, + limitFileCount: 1, + resReName: 'data.fullFileWatermarkPath', + urlReName: 'data.fullFileWatermarkPath', + widget: 'upload', + name: 'multipartFile', + multiple: false, + listType: 'picture-card' +} as SFUploadWidgetSchema; @Component({ selector: 'app-parterl-config', templateUrl: './config.component.html', @@ -10,6 +25,7 @@ import { ConfigService } from '../../services/config.service'; }) export class PartnerSystemConfigComponent implements OnInit { @ViewChild('sf', { static: false }) sf!: SFComponent; + @ViewChild('sf2', { static: false }) sf2!: SFComponent; formDate: any = { isAudit: false, isEveryDay: false, @@ -62,21 +78,23 @@ export class PartnerSystemConfigComponent implements OnInit { i: any; schema!: SFSchema; + schema2!: SFSchema; - imageConfig = { - widget: 'upload', - action: `/scm/cms/cms/upload/multipartFile/fileModel`, - limit: 1, - limitFileCount: 1, - resReName: 'url', - urlReName: 'url', - data: { - appId: this.service.envSrv.getEnvironment().appId - }, - multiple: false, - listType: 'picture-card', - showRequired: true - }; + // IMAGECONFIG = { + // widget: 'upload', + // action: `/scm/cms/cms/upload/multipartFile/fileModel`, + // limit: 1, + // limitFileCount: 1, + // resReName: 'url', + // urlReName: 'url', + // data: { + // appId: this.service.envSrv.getEnvironment().appId + // }, + // multiple: false, + // listType: 'picture-card', + // showRequired: true + // }; + constructor(private service: ConfigService) {} ngOnInit() { @@ -155,105 +173,117 @@ export class PartnerSystemConfigComponent implements OnInit { this.schema = { properties: { - sysMinLogo: { + roadTransportPhoto: { title: '', type: 'string', ui: { hidden: true } }, + roadTransportPhotoWatermark: { type: 'string', - title: '系统LOGO(小)', - // enum: [], + title: '分享海报', ui: { - ...this.imageConfig, - descriptionI18n: '小尺寸logo，支持JPG、PNG格式，文件小于2M（建议尺寸32*32px）。', + ...IMAGECONFIG, + descriptionI18n: '支持JPG、PNG格式，文件小于2M（建议尺寸 750px* 1624 px）。', change: args => { if (args.type === 'success') { - const avatar = this.getImageModel(args, 'sysMinLogo'); - this.sf?.setValue('/sysMinLogo', avatar); - this.i.sysMinLogo = avatar; + this.sf.setValue('/roadTransportPhoto', args.fileList[0].response.data.fullFilePath); } }, - beforeUpload: this.uploadBefore } as SFUploadWidgetSchema }, - sysMaxLogo: { + share: { title: '', type: 'string', ui: { hidden: true } }, + shareWatermark: { type: 'string', - title: '系统LOGO(大)', + title: '分享图', ui: { - ...this.imageConfig, - descriptionI18n: '小尺寸logo，支持JPG、PNG格式，文件小于2M（建议尺寸32*32px）。', + ...IMAGECONFIG, + descriptionI18n: '支持JPG、PNG格式，文件小于2M（ 建议尺寸 856px * 688px）。', change: args => { if (args.type === 'success') { - const avatar = this.getImageModel(args, -1); - this.sf?.setValue('/sysMaxLogo', avatar); - this.i.sysMaxLogo = avatar; + this.sf.setValue('/share', args.fileList[0].response.data.fullFilePath); } }, - beforeUpload: this.uploadBefore } as SFUploadWidgetSchema }, - sysMaxLogo1: { + take: { title: '', type: 'string', ui: { hidden: true } }, + takeWatermark: { type: 'string', - title: '用户默认头像', + title: '受邀海报', ui: { - ...this.imageConfig, - descriptionI18n: '支持JPG、PNG格式，文件小于2M（建议尺寸60*60px）。', + ...IMAGECONFIG, + descriptionI18n: '支持JPG、PNG格式，文件小于2M（建议尺寸 750px* 1624 px）。', change: args => { if (args.type === 'success') { - const avatar = this.getImageModel(args, -1); - this.sf?.setValue('/sysMaxLogo1', avatar); - this.i.sysMaxLogo1 = avatar; + this.sf.setValue('/take', args.fileList[0].response.data.fullFilePath); } }, - beforeUpload: this.uploadBefore } as SFUploadWidgetSchema }, - sysMaxLogo2: { + complianceRemark: { + title: '分享文案', type: 'string', - title: '企业默认头像', + maxLength: 50, ui: { - ...this.imageConfig, - descriptionI18n: '支持JPG、PNG格式，文件小于2M（建议尺寸60*60px）。', - change: args => { - if (args.type === 'success') { - const avatar = this.getImageModel(args, -1); - this.sf?.setValue('/sysMaxLogo2', avatar); - this.i.sysMaxLogo2 = avatar; - } - }, - beforeUpload: this.uploadBefore - } as SFUploadWidgetSchema - }, - sysMaxLogo3: { - type: 'string', - title: '货主PC端登陆页海报', - ui: { - ...this.imageConfig, - descriptionI18n: '支持JPG、PNG格式，文件小于5M（建议尺寸1920*630px）。', - change: args => { - if (args.type === 'success') { - const avatar = this.getImageModel(args, -1); - this.sf?.setValue('/sysMaxLogo3', avatar); - this.i.sysMaxLogo3 = avatar; - } - }, - beforeUpload: this.uploadBefore - } as SFUploadWidgetSchema - }, - sysMaxLogo4: { - type: 'string', - title: 'APP开屏海报', - ui: { - ...this.imageConfig, - descriptionI18n: '支持JPG、PNG格式，文件小于5M（建议尺寸375*773px）。', - change: args => { - if (args.type === 'success') { - const avatar = this.getImageModel(args, -1); - this.sf?.setValue('/sysMaxLogo4', avatar); - this.i.sysMaxLogo4 = avatar; - } - }, - beforeUpload: this.uploadBefore - } as SFUploadWidgetSchema - }, + placeholder: '请不要超过50个字', + widget: 'textarea', + autosize: { minRows: 3, maxRows: 6 } + } + } }, - required: ['sysMinLogo', 'sysMaxLogo', 'sysMaxLogo1', 'sysMaxLogo2', 'sysMaxLogo3', 'sysMaxLogo4'] + required: ['roadTransportPhotoWatermark', 'shareWatermark', 'takeWatermark', 'complianceRemark'] + }; + this.schema2 = { + properties: { + roadTransportPhoto: { title: '', type: 'string', ui: { hidden: true } }, + roadTransportPhotoWatermark: { + type: 'string', + title: '分享海报', + ui: { + ...IMAGECONFIG, + descriptionI18n: '支持JPG、PNG格式，文件小于2M（建议尺寸750px* 1624 px）。', + change: args => { + if (args.type === 'success') { + this.sf2.setValue('/roadTransportPhoto', args.fileList[0].response.data.fullFilePath); + } + }, + } as SFUploadWidgetSchema + }, + share: { title: '', type: 'string', ui: { hidden: true } }, + shareWatermark: { + type: 'string', + title: '分享图', + ui: { + ...IMAGECONFIG, + descriptionI18n: '支持JPG、PNG格式，文件小于2M（建议尺寸 856px * 688px）。', + change: args => { + if (args.type === 'success') { + this.sf2.setValue('/share', args.fileList[0].response.data.fullFilePath); + } + }, + } as SFUploadWidgetSchema + }, + take: { title: '', type: 'string', ui: { hidden: true } }, + takeWatermark: { + type: 'string', + title: '受邀海报', + ui: { + ...IMAGECONFIG, + descriptionI18n: '支持JPG、PNG格式，文件小于2M（建议尺寸750px* 1624 px）。', + change: args => { + if (args.type === 'success') { + this.sf2.setValue('/take', args.fileList[0].response.data.fullFilePath); + } + }, + } as SFUploadWidgetSchema + }, + complianceRemark: { + title: '分享文案', + type: 'string', + maxLength: 50, + ui: { + placeholder: '请不要超过50个字', + widget: 'textarea', + autosize: { minRows: 3, maxRows: 6 } + } + } + }, + required: ['roadTransportPhotoWatermark', 'shareWatermark', 'takeWatermark', 'complianceRemark'] }; } private uploadBefore = (file: any, fileList: any) => { From 5969a77c6b6e64c1f5dd73dd96b9dbe6d85e6e08 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Tue, 26 Apr 2022 20:27:08 +0800 Subject: [PATCH 10/16] fix bug --- .../routes/vehicle/components/list/detail/detail.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/routes/vehicle/components/list/detail/detail.component.ts b/src/app/routes/vehicle/components/list/detail/detail.component.ts index 9e729f83..69654d5e 100644 --- a/src/app/routes/vehicle/components/list/detail/detail.component.ts +++ b/src/app/routes/vehicle/components/list/detail/detail.component.ts @@ -28,7 +28,7 @@ export class VehicleComponentsListDetailComponent implements OnInit { modalName = ''; ui!: SFUISchema; columns!: STColumn[]; - uploadURl = apiConf.fileUpload; + uploadURl = apiConf.waterFileUpload; schema!: SFSchema; @ViewChild('sf', { static: false }) sf!: SFComponent; schema1!: SFSchema; @@ -219,7 +219,7 @@ export class VehicleComponentsListDetailComponent implements OnInit { changeUpload({ file, fileList, type }: any, key: string) { console.log({ file, fileList, type }); if (type === 'success') { - this.detailData[key] = file.response.data.fullFilePath; + this.detailData[key] = file.response.data.fullFileWatermarkPath; } } deleteImg(key: string) { From 3ffde89a2132a3be1068076604c3c4c76cf5d004 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Tue, 26 Apr 2022 20:29:51 +0800 Subject: [PATCH 11/16] fix bug --- .../routes/vehicle/components/audit/detail/detail.component.ts | 1 + .../routes/vehicle/components/list/detail/detail.component.ts | 1 + 2 files changed, 2 insertions(+) diff --git a/src/app/routes/vehicle/components/audit/detail/detail.component.ts b/src/app/routes/vehicle/components/audit/detail/detail.component.ts index 89ece581..5702d767 100644 --- a/src/app/routes/vehicle/components/audit/detail/detail.component.ts +++ b/src/app/routes/vehicle/components/audit/detail/detail.component.ts @@ -137,6 +137,7 @@ export class VehicleComponentsAuditDetailComponent implements OnInit, OnDestroy reset() { this.detailData = { ...this.tempalateData }; this.isEdit = false; + this.getDetailList(); } save() { diff --git a/src/app/routes/vehicle/components/list/detail/detail.component.ts b/src/app/routes/vehicle/components/list/detail/detail.component.ts index 69654d5e..62cb659d 100644 --- a/src/app/routes/vehicle/components/list/detail/detail.component.ts +++ b/src/app/routes/vehicle/components/list/detail/detail.component.ts @@ -247,6 +247,7 @@ export class VehicleComponentsListDetailComponent implements OnInit { reset() { this.detailData = { ...this.tempalateData }; this.isEdit = false; + this.getDetailList(); } save() { From 0b99448629da6795f560478d9a06eb3642c7f686 Mon Sep 17 00:00:00 2001 From: weiyu Date: Tue, 26 Apr 2022 20:38:37 +0800 Subject: [PATCH 12/16] =?UTF-8?q?=E5=8F=AF=E5=BC=80=E7=A5=A8=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E8=81=94=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../billing-order.component.html | 4 +- .../billing-order/billing-order.component.ts | 64 +++++++++---------- .../services/ticket.service.ts | 4 +- 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/app/routes/ticket-management/components/billing-order/billing-order.component.html b/src/app/routes/ticket-management/components/billing-order/billing-order.component.html index 85530e83..3f494035 100644 --- a/src/app/routes/ticket-management/components/billing-order/billing-order.component.html +++ b/src/app/routes/ticket-management/components/billing-order/billing-order.component.html @@ -13,7 +13,7 @@ class="text-right"> - +