Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop
This commit is contained in:
wangshiming
@ -13,13 +13,9 @@
|
||||
<nz-card>
|
||||
<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)="search()" acl [acl-ability]="['SUPPLY-INDEX-vehicleSearch']">查询</button>
|
||||
@ -43,25 +39,12 @@
|
||||
<div style="margin-top: 15px">
|
||||
<!-- 选中提示框 -->
|
||||
<div style="position: relative">
|
||||
<nz-alert
|
||||
nzType="info"
|
||||
[nzMessage]="'当前共' + st?.total + '行记录，已选择' + selectedRows.length + '项'"
|
||||
nzShowIcon
|
||||
[ngStyle]="{ margin: '0 0 1rem 0' }"
|
||||
>
|
||||
<nz-alert nzType="info" [nzMessage]="'当前共' + st?.total + '行记录，已选择' + selectedRows.length + '项'" nzShowIcon
|
||||
[ngStyle]="{ margin: '0 0 1rem 0' }">
|
||||
</nz-alert>
|
||||
</div>
|
||||
<st
|
||||
#st
|
||||
[scroll]="{ x: '2000px' }"
|
||||
[data]="service.$api_get_wholePage_list"
|
||||
[columns]="columns"
|
||||
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
|
||||
[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"
|
||||
[scroll]="{ x: '1200px', y: '500px' }"
|
||||
>
|
||||
<st #st [data]="service.$api_get_wholePage_list" [columns]="columns" [req]="{ params: reqParams }"
|
||||
[res]="{ process: afterRes }" [loading]="service.http.loading" [scroll]="{ x: '1200px', y: '500px' }">
|
||||
<ng-template st-row="resourceCode" let-item let-index="index">
|
||||
<a [routerLink]="'vehicle-detail/' + item?.id">{{ item?.resourceCode }}</a>
|
||||
<p>{{ item?.resourceTypeLabel }}{{ item?.serviceTypeLabel }}</p>
|
||||
@ -80,16 +63,6 @@
|
||||
<div>车型: {{ item?.carModelLabel }}</div>
|
||||
<div class="error">车长: {{ item?.expand }} 米</div>
|
||||
</ng-template>
|
||||
<ng-template #contentTemplate>
|
||||
<div>
|
||||
<p>预付：¥200.00</p>
|
||||
<p>到付：¥200.00</p>
|
||||
<p>油卡：¥200.00</p>
|
||||
<p>回单付：¥200.00</p>
|
||||
<p>小计：¥200.00</p>
|
||||
<p>附加费：¥200.00</p>
|
||||
</div>
|
||||
</ng-template>
|
||||
</st>
|
||||
</div>
|
||||
</nz-card>
|
||||
@ -101,16 +74,19 @@
|
||||
</div>
|
||||
</ng-template>
|
||||
|
||||
<nz-modal [(nzVisible)]="isVisible" [nzFooter]="nzModalFooter" nzTitle="货源审核" (nzOnCancel)="handleCancel('suppliersType')">
|
||||
<nz-modal [(nzVisible)]="isVisible" [nzFooter]="nzModalFooter" nzTitle="货源审核"
|
||||
(nzOnCancel)="handleCancel('suppliersType')">
|
||||
<ng-container *nzModalContent>
|
||||
<div style="position: relative" *ngIf="auditMany">
|
||||
<nz-alert nzType="info" [nzMessage]="'已选择' + selectedRows?.length + '项'" nzShowIcon [ngStyle]="{ margin: '0 0 1rem 0' }">
|
||||
<nz-alert nzType="info" [nzMessage]="'已选择' + selectedRows?.length + '项'" nzShowIcon
|
||||
[ngStyle]="{ margin: '0 0 1rem 0' }">
|
||||
</nz-alert>
|
||||
</div>
|
||||
<sf #sfFre [schema]="freightSchema" [ui]="ui2" [compact]="false" [button]="'none'"> </sf>
|
||||
<sf #sfFre [schema]="freightSchema" [ui]="{ '*': { spanLabelFixed: 120, grid: { span: 16 } } }" [compact]="false"
|
||||
[button]="'none'"> </sf>
|
||||
</ng-container>
|
||||
<ng-template #nzModalFooter>
|
||||
<button nz-button nzType="primary" (click)="handleOK(1)" [disabled]="">通过</button>
|
||||
<button nz-button nzType="default" (click)="handleOK(2)">不通过</button>
|
||||
</ng-template>
|
||||
</nz-modal>
|
||||
</nz-modal>
|
||||
@ -1,24 +0,0 @@
|
||||
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
import { SupplyManagementVehicleComponent } from './vehicle.component';
|
||||
|
||||
describe('SupplyManagementVehicleComponent', () => {
|
||||
let component: SupplyManagementVehicleComponent;
|
||||
let fixture: ComponentFixture<SupplyManagementVehicleComponent>;
|
||||
|
||||
beforeEach(waitForAsync(() => {
|
||||
TestBed.configureTestingModule({
|
||||
declarations: [ SupplyManagementVehicleComponent ]
|
||||
})
|
||||
.compileComponents();
|
||||
}));
|
||||
|
||||
beforeEach(() => {
|
||||
fixture = TestBed.createComponent(SupplyManagementVehicleComponent);
|
||||
component = fixture.componentInstance;
|
||||
fixture.detectChanges();
|
||||
});
|
||||
|
||||
it('should create', () => {
|
||||
expect(component).toBeTruthy();
|
||||
});
|
||||
});
|
||||
@ -18,23 +18,24 @@ import { ShipperBaseService } from '@shared';
|
||||
styleUrls: ['./vehicle.component.less']
|
||||
})
|
||||
export class SupplyManagementVehicleComponent implements OnInit {
|
||||
ui2: SFUISchema = {};
|
||||
schema: SFSchema = this.initSF();
|
||||
freightSchema: SFSchema = {};
|
||||
auditMany = false;
|
||||
isVisible = false;
|
||||
_$expand = false;
|
||||
|
||||
@ViewChild('st') private readonly st!: STComponent;
|
||||
@ViewChild('sf', { static: false }) sf!: SFComponent;
|
||||
@ViewChild('sfFre', { static: false }) sfFre!: SFComponent;
|
||||
|
||||
schema: SFSchema = this.initSF();
|
||||
columns: STColumn[] = this.initST();
|
||||
_$expand = false;
|
||||
tabs = {
|
||||
totalQuantity: 0,
|
||||
cancelQuantity: 0,
|
||||
receivedQuantity: 0,
|
||||
stayQuantity: 0
|
||||
};
|
||||
|
||||
isVisible = false;
|
||||
freightSchema: SFSchema = {};
|
||||
auditMany = false;
|
||||
|
||||
resourceStatus: any;
|
||||
auditID: any;
|
||||
constructor(
|
||||
@ -94,7 +95,6 @@ export class SupplyManagementVehicleComponent implements OnInit {
|
||||
},
|
||||
require: ['remarks']
|
||||
};
|
||||
this.ui2 = { '*': { spanLabelFixed: 120, grid: { span: 16 } } };
|
||||
}
|
||||
|
||||
add(): void {
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
<app-dynamic-setting-h5 [tabs]="tabs" [configList]="configList" [selectedTab]="selectedTab"
|
||||
(selectedEvent)="getConfigList($event)" (saveEvent)="saveAction($event)">
|
||||
(selectedEvent)="getConfigList($event)" (saveEvent)="saveAction($event)" [labelWidth]="labelWidth">
|
||||
</app-dynamic-setting-h5>
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* @Description :
|
||||
* @Description :
|
||||
* @Version : 1.0
|
||||
* @Author : Shiming
|
||||
* @Date : 2022-01-25 13:10:49
|
||||
@ -21,7 +21,7 @@ import { SystemService } from '../../services/system.service';
|
||||
export class BasicSettingComponent implements OnInit {
|
||||
tabs: any[] = [];
|
||||
selectedTab: any = null;
|
||||
|
||||
labelWidth = 250;
|
||||
configList: any = [];
|
||||
constructor(public service: SystemService) {}
|
||||
|
||||
@ -49,9 +49,11 @@ export class BasicSettingComponent implements OnInit {
|
||||
res = res.map(item => ({
|
||||
...item,
|
||||
remark: item.remark ? JSON.parse(item.remark) : null,
|
||||
itemValue: item?.itemValue ? item?.itemType !== 8? JSON.parse(item?.itemValue) : item?.itemValue : item?.itemValue,
|
||||
itemValue: item?.itemValue ? (item?.itemType !== 8 ? JSON.parse(item?.itemValue) : item?.itemValue) : item?.itemValue,
|
||||
itemData: item.itemData ? JSON.parse(item.itemData) : item.itemData
|
||||
}));
|
||||
const hiddenType = res.find(item => item.itemType === 7 || item.itemType === 999);
|
||||
this.labelWidth = hiddenType ? 0 : 250;
|
||||
this.configList = res;
|
||||
} else {
|
||||
this.configList = [];
|
||||
|
||||
Reference in New Issue
Block a user