diff --git a/src/app/routes/supply-management/components/vehicle/vehicle.component.html b/src/app/routes/supply-management/components/vehicle/vehicle.component.html index c88527bd..533fd632 100644 --- a/src/app/routes/supply-management/components/vehicle/vehicle.component.html +++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.html @@ -13,13 +13,9 @@
- +
@@ -43,25 +39,12 @@
- +
- + {{ item?.resourceCode }}

{{ item?.resourceTypeLabel }}{{ item?.serviceTypeLabel }}

@@ -80,16 +63,6 @@
车型: {{ item?.carModelLabel }}
车长: {{ item?.expand }} 米
 - -
-

预付：¥200.00

-

到付：¥200.00

-

油卡：¥200.00

-

回单付：¥200.00

-

小计：¥200.00

-

附加费：¥200.00

-
-
@@ -101,16 +74,19 @@
- +
- +
- + - + \ No newline at end of file diff --git a/src/app/routes/supply-management/components/vehicle/vehicle.component.spec.ts b/src/app/routes/supply-management/components/vehicle/vehicle.component.spec.ts deleted file mode 100644 index e231763d..00000000 --- a/src/app/routes/supply-management/components/vehicle/vehicle.component.spec.ts +++ /dev/null @@ -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; - - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - declarations: [ SupplyManagementVehicleComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(SupplyManagementVehicleComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts index 5a5c87c0..01e8ab3c 100644 --- a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts @@ -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 { diff --git a/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.html b/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.html index a2d3866f..9cd465f6 100644 --- a/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.html +++ b/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.html @@ -1,3 +1,3 @@ + (selectedEvent)="getConfigList($event)" (saveEvent)="saveAction($event)" [labelWidth]="labelWidth"> \ No newline at end of file diff --git a/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.ts b/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.ts index 6a764ec1..e765f3dc 100644 --- a/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.ts +++ b/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.ts @@ -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 = []; diff --git a/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html b/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html index 9ca22a0d..94a36194 100644 --- a/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html +++ b/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html @@ -24,26 +24,29 @@

{{selectedTab?.name}}

- + + + - + +
+
@@ -70,30 +74,34 @@ style="margin-left: 0;" class=" mr-xl">
+ + - + + - - - + + + + - + + + + + diff --git a/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.less b/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.less index 4b87d5c1..c6877599 100644 --- a/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.less +++ b/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.less @@ -1,27 +1,37 @@ :host { - ::ng-deep { - .card-height { - min-height: 600px; - } - - .save-btn { - width : 100%; - text-align: right; - } - - .block-radio { - display : flex; - min-height: 32px; - } - - input { - width : 100px; - margin-left: 10px; - } - - .ant-form-item-control-input-content { - display: flex; - } + ::ng-deep { + .card-height { + min-height: 600px; } - - } \ No newline at end of file + + .save-btn { + width : 100%; + text-align: right; + } + + .block-radio { + display : flex; + min-height: 32px; + } + + input { + width : 100px; + margin-left: 10px; + } + + .ant-form-item-control-input-content { + display: flex; + } + + .ant-form-item-label>label { + height: 36px; + } + + .se__horizontal>.se__item .se__label-text { + overflow : auto; + text-overflow: unset; + white-space : normal; + } + } + +} \ No newline at end of file diff --git a/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.ts b/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.ts index bf0ace43..1d06ce37 100644 --- a/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.ts +++ b/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.ts @@ -11,7 +11,7 @@ import { Component, OnInit, EventEmitter, Input, Output } from '@angular/core'; import { BaseService } from '@shared'; -const JSONTYPE = new Set([5, 6, 9]); +const JSONTYPE = new Set([5, 6, 9, 999]); @Component({ selector: 'app-dynamic-setting-h5', templateUrl: './dynamic-setting-h5.component.html', @@ -39,14 +39,13 @@ export class DynamicSettingH5Component implements OnInit { listUrls: any; constructor(public service: BaseService) {} - ngOnInit() { - } + ngOnInit() {} changeType(type: any): void { this.selectedTab = type; this.selectedEvent.emit(this.selectedTab); } - + saveAction() { if (this.configList?.length < 0) { return; @@ -54,7 +53,7 @@ export class DynamicSettingH5Component implements OnInit { let params = [...this.configList]; params = params.map((item: any) => { if (item.itemType == 9) { - const files = item.itemValue?.map(({ response, name }: any) => ({ url:response?.data?.fullFilePath, name })); + const files = item.itemValue?.map(({ response, name }: any) => ({ url: response?.data?.fullFilePath, name })); return { ...item, remark: item.remark ? JSON.stringify(item.remark) : null, diff --git a/src/app/shared/components/dynamic-setting/dynamic-setting-modal/dynamic-setting-modal.component.ts b/src/app/shared/components/dynamic-setting/dynamic-setting-modal/dynamic-setting-modal.component.ts index 9d0ebbc3..e0b090b1 100644 --- a/src/app/shared/components/dynamic-setting/dynamic-setting-modal/dynamic-setting-modal.component.ts +++ b/src/app/shared/components/dynamic-setting/dynamic-setting-modal/dynamic-setting-modal.component.ts @@ -35,7 +35,6 @@ export class DynamicSettingModalComponent implements OnInit { ngOnInit() { if(this.configvalue) { - console.log(this.configvalue) this.configFullKey = this.configvalue } this.getTypeList(); diff --git a/src/app/shared/components/dynamic-setting/dynamic-setting.module.ts b/src/app/shared/components/dynamic-setting/dynamic-setting.module.ts index e3306a56..e628602b 100644 --- a/src/app/shared/components/dynamic-setting/dynamic-setting.module.ts +++ b/src/app/shared/components/dynamic-setting/dynamic-setting.module.ts @@ -1,5 +1,5 @@ /* - * @Description : + * @Description : * @Version : 1.0 * @Author : Shiming * @Date : 2022-01-25 13:10:49 @@ -13,14 +13,14 @@ import { CommonModule } from '@angular/common'; import { DynamicSettingH5Component } from './dynamic-setting-h5/dynamic-setting-h5.component'; import { SHARED_ZORRO_MODULES } from '../../shared-zorro.module'; import { SHARED_DELON_MODULES } from '../../shared-delon.module'; -import { NzSwitchModule } from 'ng-zorro-antd/switch'; import { FormsModule } from '@angular/forms'; import { DynamicSettingModalComponent } from './dynamic-setting-modal/dynamic-setting-modal.component'; import { FreightTableComponent } from './freight-table/freight-table.component'; +import { SEModule } from '@delon/abc/se'; const COMPONENTS = [DynamicSettingH5Component, DynamicSettingModalComponent, FreightTableComponent]; @NgModule({ declarations: [...COMPONENTS], - imports: [CommonModule, FormsModule, NzSwitchModule,SHARED_ZORRO_MODULES, SHARED_DELON_MODULES], + imports: [CommonModule, FormsModule, SHARED_ZORRO_MODULES, SEModule], exports: [...COMPONENTS] }) export class DynamicSettingModule {}