Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

edit

Browse Source
This commit is contained in:
Taric Xin
2022-02-24 20:45:50 +08:00
parent 7f7ee30ff3
commit 2c2715acf0
2 changed files with 65 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/app/routes/usercenter/components/freight/freight-config/freight-config.component.html
View File

@ -13,27 +13,16 @@
<!-- 搜索表单 -->
<div nz-row nzGutter="8">
<div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
<sf
#sf
[schema]="schema"
[ui]="{ '*': { spanLabelFixed: 110, grid: { lg: 8, md: 12, sm: 12, xs: 24, gutter: 4 } } }"
[compact]="true"
[button]="'none'"
></sf>
<sf #sf [schema]="schema"
[ui]="{ '*': { spanLabelFixed: 110, grid: { lg: 8, md: 12, sm: 12, xs: 24, gutter: 4 } } }" [compact]="true"
[button]="'none'"></sf>
</div>
<div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" [class.expend-options]="_$expand" class="text-right">
<button
nz-button
nzType="primary"
[nzLoading]="service.http.loading"
(click)="st?.load(1)"
acl
[acl-ability]="['USERCENTER-FREIGHT-LIST-list']"
>查询</button
>
<button nz-button nzType="primary" [disabled]="service.http.loading" acl [acl-ability]="['USERCENTER-FREIGHT-LIST-export']"
>导出</button
>
<div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" [class.expend-options]="_$expand"
class="text-right">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)" acl
[acl-ability]="['USERCENTER-FREIGHT-LIST-list']">查询</button>
<button nz-button nzType="primary" [disabled]="service.http.loading" acl
[acl-ability]="['USERCENTER-FREIGHT-LIST-export']">导出</button>
<button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button>
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}

26
src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts
View File

@ -10,7 +10,7 @@ import { UsermanageService } from '../../../services/usercenter.service';
@Component({
selector: 'app-freight-config',
templateUrl: './freight-config.component.html',
styleUrls: ['../../../../commom/less/box.less']
styleUrls: ['../../../../commom/less/box.less', '../../../../commom/less/expend-but.less']
})
export class FreightConfigComponent implements OnInit {
schema: SFSchema = this.initSF();
@ -38,15 +38,21 @@ export class FreightConfigComponent implements OnInit {
beforeReq = (requestOptions: STRequestOptions) => {
Object.assign(requestOptions.body, { listSource: 1 });
if (this.sf) {
console.log(1);
if (this.sf?.value) {
Object.assign(requestOptions.body, {
...this.sf.value
});
if (this.sf?.value.createTime) {
Object.assign(requestOptions.body, {
...this.sf.value,
createTime: {
start: this.sf?.value.effectiveDate[0],
end: this.sf?.value.effectiveDate[1]
start: this.sf?.value.createTime[0],
end: this.sf?.value.createTime[1]
}
});
}
}
return requestOptions;
};
@ -239,17 +245,17 @@ export class FreightConfigComponent implements OnInit {
}
}
},
effectiveDate: {
createTime: {
title: '注册时间',
type: 'string',
ui: {
widget: 'date',
mode: 'range',
widget: 'sl-from-to-search',
format: 'yyyy-MM-dd',
placeholder: '请选择',
nzShowTime: true,
visibleIf: {
_$expand: (value: boolean) => value
},
allowClear: true
}
} as SFDateWidgetSchema
}
}