diff --git a/src/app/routes/order-management/components/complaint/complaint.component.ts b/src/app/routes/order-management/components/complaint/complaint.component.ts index e308c49c..f0df957e 100644 --- a/src/app/routes/order-management/components/complaint/complaint.component.ts +++ b/src/app/routes/order-management/components/complaint/complaint.component.ts @@ -71,15 +71,13 @@ export class OrderManagementComplaintComponent implements OnInit { if(this.selectedMainTabStatus) { a.complaintType = this.selectedMainTabStatus } + console.log( this.sf?.value); + const params: any = Object.assign({}, this.sf?.value || {}); delete params._$expand; return { ...a, ...params, - complainantTime: { - start: this.sf?.value?.complainantTime?.[0] || '', - end: this.sf?.value?.complainantTime?.[1] || '' - } }; } get selectedRows() { @@ -110,19 +108,12 @@ export class OrderManagementComplaintComponent implements OnInit { widget: 'dict-select', params: { dictKey: 'complaint:cause' }, containsAllLabel: true, - visibleIf: { - _$expand: (value: boolean) => value - } } as SFSelectWidgetSchema }, complainantTime: { - title: '投诉时间', type: 'string', - ui: { - widget: 'date', - mode: 'range', - format: 'yyyy-MM-dd', - } as SFDateWidgetSchema, + title: '投诉时间', + ui: { widget: 'sl-from-to', type: 'date', format: 'yyyy-MM-dd' } as SFDateWidgetSchema, }, }, }; @@ -255,7 +246,6 @@ export class OrderManagementComplaintComponent implements OnInit { */ resetSF(): void { this.sf.reset(); - this._$expand = false; } selectChange(e: number) { this.resourceStatus = e; diff --git a/src/app/shared/widget/from-to/from-to.widget.ts b/src/app/shared/widget/from-to/from-to.widget.ts index e388f426..2724593d 100644 --- a/src/app/shared/widget/from-to/from-to.widget.ts +++ b/src/app/shared/widget/from-to/from-to.widget.ts @@ -61,13 +61,12 @@ export class EAFromToWidget extends ControlWidget implements OnInit { } onChange(result: Array): void { - console.log('onChange: ', result); - + // console.log('onChange: ', result); if (this.type === 'date') { if (JSON.stringify(result) !== '[]') { this.setValue({ start: format(result[0], this.format), end: format(result[1], this.format) }); } else { - this.setValue(null); + this.setValue({ start: '', end: '' }); } } else if (this.type === 'number') { } else { @@ -82,4 +81,8 @@ export class EAFromToWidget extends ControlWidget implements OnInit { _change(value: string): void { this.setValue(value); } + + reset(value: string) { + this.date = []; + } } diff --git a/src/app/shared/widget/tinymce/tinymce.widget.ts b/src/app/shared/widget/tinymce/tinymce.widget.ts index 958643a8..3657a550 100644 --- a/src/app/shared/widget/tinymce/tinymce.widget.ts +++ b/src/app/shared/widget/tinymce/tinymce.widget.ts @@ -1,3 +1,13 @@ +/* + * @Description : + * @Version : 1.0 + * @Author : Shiming + * @Date : 2021-11-29 10:04:12 + * @LastEditors : Shiming + * @LastEditTime : 2022-03-24 18:18:00 + * @FilePath : \\tms-obc-web\\src\\app\\shared\\widget\\tinymce\\tinymce.widget.ts + * Copyright (C) 2022 huzhenhong. All rights reserved. + */ import { Component, OnInit } from '@angular/core'; import { ControlWidget } from '@delon/form';