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

Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

Browse Source
This commit is contained in:
Taric Xin
2022-02-25 15:28:01 +08:00
parent 385bbaa82b 4520daabe9
commit d79ff8fc01
6 changed files with 64 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/app/routes/supply-management/components/bulk/bulk.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-01-12 10:52:50
* @LastEditors : Shiming
* @LastEditTime : 2022-02-10 16:32:01
* @LastEditTime : 2022-02-25 15:22:19
* @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\bulk\\bulk.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@ -31,9 +31,9 @@
<sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
</div>
<div nz-col [nzSpan]="_$expand ? 24 : 6" class="text-right">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="search()" acl [acl-ability]="['SUPPLY-INDEX-bulkSearch']">查询</button>
<button nz-button nzType="primary" [disabled]="service.http.loading">导入</button>
<button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button>
<button nz-button nzType="primary" [nzLoading]="loading" (click)="search()" acl [acl-ability]="['SUPPLY-INDEX-bulkSearch']">查询</button>
<button nz-button nzType="primary" [nzLoading]="loading">导入</button>
<button nz-button [nzLoading]="loading" (click)="resetSF()">重置</button>
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
@ -70,10 +70,10 @@
[scroll]="{ x: '2000px' }"
[data]="service.$api_get_bulkPage_list"
[columns]="columns"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
[req]="{ process: beforeReq }"
[res]="{ reName: { list: 'data.records', total: 'data.total' } , process: afterRes}"
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
[loading]="service.http.loading"
[loading]="loading"
>
<!--运费单价 -->
<ng-template st-row="freightPrice" let-item let-index="index">

28
src/app/routes/supply-management/components/bulk/bulk.component.ts
View File

@ -1,6 +1,6 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { Router } from '@angular/router';
import { STColumn, STComponent } from '@delon/abc/st';
import { STColumn, STComponent, STRequestOptions } from '@delon/abc/st';
import { SFComponent, SFDateWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
import { ModalHelper, _HttpClient } from '@delon/theme';
import { ShipperBaseService } from '@shared';
@ -24,6 +24,7 @@ export class SupplyManagementBulkComponent implements OnInit {
schema: SFSchema = {};
auditMany = false;
isVisible = false;
loading: boolean = true;
auditID: any;
_$expand = false;
columns: STColumn[] = [];
@ -74,12 +75,37 @@ export class SupplyManagementBulkComponent implements OnInit {
},
};
}
beforeReq = (requestOptions: STRequestOptions) => {
const a:any = {};
if(this.resourceStatus) {
a.resourceStatus = this.resourceStatus
}
const params: any = Object.assign({}, this.sf?.value || {});
delete params._$expand;
if (this.sf) {
Object.assign(requestOptions.body, {
...a,
...params,
releaseTime: {
start: this.sf?.value?.releaseTime?.[0] || '',
end: this.sf?.value?.releaseTime?.[1] || '',
},
deadlineTime: {
start: this.sf?.value?.deadlineTime?.[0] || '',
end: this.sf?.value?.deadlineTime?.[1] || '',
},
});
}
this.loading = true;
return requestOptions;
};
search() {
this.st?.load(1);
this.getGoodsSourceStatistical()
}
afterRes = (data: any[], rawData?: any) => {
console.log(data)
this.loading = false
return data.map(item => ({
...item,
disabled: item.auditStatus !== '1'

1
src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts
View File

@ -378,6 +378,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
grid: { lg: 8, md: 12, sm: 12, xs: 24 }
},
$carModel: {
spanLabelFixed: 100,
grid: { span: 8 }
},
$carLength: {

1
src/app/routes/supply-management/components/release-publish/release-publish.component.ts
View File

@ -388,6 +388,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
grid: { lg: 8, md: 12, sm: 12, xs: 24 }
},
$carModel: {
spanLabelFixed: 100,
grid: { span: 8 }
},
$carLength: {

14
src/app/routes/supply-management/components/vehicle/vehicle.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-01-12 10:52:50
* @LastEditors : Shiming
* @LastEditTime : 2022-02-25 11:18:30
* @LastEditTime : 2022-02-25 15:22:22
* @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\vehicle\\vehicle.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@ -25,14 +25,14 @@
<button
nz-button
nzType="primary"
[nzLoading]="service.http.loading"
[nzLoading]="loading"
(click)="search()"
acl
[acl-ability]="['SUPPLY-INDEX-vehicleSearch']"
>查询</button
>
<button nz-button nzType="primary" [disabled]="service.http.loading">导出</button>
<button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button>
<button nz-button nzType="primary" [nzLoading]="loading">导出</button>
<button nz-button [nzLoading]="loading" (click)="resetSF()">重置</button>
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
@ -59,14 +59,16 @@
>
</nz-alert>
</div>
<!-- [req]="{ params: reqParams }" -->
<st
#st
[data]="service.$api_get_wholePage_list"
[columns]="columns"
[req]="{ params: reqParams }"
[req]="{ process: beforeReq }"
[res]="{ process: afterRes }"
[page]="{ }"
[loading]="service.http.loading"
[loading]="loading"
[scroll]="{ x: '1200px', y: '500px' }"
>
<ng-template st-row="resourceCode" let-item let-index="index">

23
src/app/routes/supply-management/components/vehicle/vehicle.component.ts
View File

@ -1,6 +1,6 @@
import { ActivatedRoute, Router } from '@angular/router';
import { Component, OnInit, ViewChild, OnChanges } from '@angular/core';
import { STColumn, STComponent } from '@delon/abc/st';
import { STColumn, STComponent, STRequestOptions } from '@delon/abc/st';
import { SFComponent, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
import { ModalHelper, _HttpClient } from '@delon/theme';
import { NzModalService } from 'ng-zorro-antd/modal';
@ -21,7 +21,7 @@ export class SupplyManagementVehicleComponent implements OnInit {
@ViewChild('st') private readonly st!: STComponent;
@ViewChild('sf', { static: false }) sf!: SFComponent;
@ViewChild('sfFre', { static: false }) sfFre!: SFComponent;
loading:boolean = true;
schema: SFSchema = this.initSF();
columns: STColumn[] = this.initST();
_$expand = false;
@ -58,11 +58,30 @@ export class SupplyManagementVehicleComponent implements OnInit {
if (this.resourceStatus) {
a.resourceStatus = this.resourceStatus;
}
this.loading = true
return {
...a
};
}
beforeReq = (requestOptions: STRequestOptions) => {
const params = Object.assign({}, this.sf?.value || {});
delete params._$expand;
const a: any = {
...params
};
if (this.resourceStatus) {
a.resourceStatus = this.resourceStatus;
}
if (this.sf) {
Object.assign(requestOptions.body, {
...a
});
}
this.loading = true;
return requestOptions;
};
afterRes = (data: any[], rawData?: any) => {
this.loading = false
return data.map(item => ({
...item,
disabled: item.auditStatus !== '1',