-
-
- {{ item.resourceCode | currency }}
-
-
- {{ item.practicalPremium | currency }}
-
-
- {{ item.insureAmount | currency }}
-
-
- {{ item.premium | currency }}
-
-
- {{ item.processResult == '2' ? item.processMessage : '' }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ {{ item.resourceCode | currency }}
+
+
+ {{ item.practicalPremium | currency }}
+
+
+ {{ item.insureAmount | currency }}
+
+
+ {{ item.premium | currency }}
+
+
+ {{ item.processResult == '2' ? item.processMessage : '' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
\ No newline at end of file
+
diff --git a/src/app/routes/usercenter/components/freight/user/detail/detail.component.less b/src/app/routes/usercenter/components/freight/user/detail/detail.component.less
index e30f5583..7f9dfbd0 100644
--- a/src/app/routes/usercenter/components/freight/user/detail/detail.component.less
+++ b/src/app/routes/usercenter/components/freight/user/detail/detail.component.less
@@ -3,7 +3,7 @@
:host {
::ng-deep {
.user-info {
- display : flex;
+ display: flex;
font-size: 16px;
.enterprise-name {
@@ -11,9 +11,9 @@
}
img {
- width : 64px;
- height : 64px;
- margin-right : 15px;
+ width: 64px;
+ height: 64px;
+ margin-right: 15px;
border-radius: 50%;
}
@@ -22,4 +22,5 @@
}
}
}
-}
\ No newline at end of file
+
+}
diff --git a/src/app/routes/usercenter/components/freight/user/user.component.html b/src/app/routes/usercenter/components/freight/user/user.component.html
index e94a51d0..b9054e98 100644
--- a/src/app/routes/usercenter/components/freight/user/user.component.html
+++ b/src/app/routes/usercenter/components/freight/user/user.component.html
@@ -32,7 +32,7 @@
+ -->
+
+
+
-
-
-
+
+
正常
-
-
-
-
-
+
\ No newline at end of file
diff --git a/src/app/routes/vehicle/components/audit/audit.component.spec.ts b/src/app/routes/vehicle/components/audit/audit.component.spec.ts
deleted file mode 100644
index e815b19d..00000000
--- a/src/app/routes/vehicle/components/audit/audit.component.spec.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * @Author: your name
- * @Date: 2021-12-01 20:05:59
- * @LastEditTime: 2021-12-01 20:35:33
- * @LastEditors: your name
- * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- * @FilePath: \tms-obc-web\src\app\routes\vehicle\components\list\list.component.spec.ts
- */
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { VehicleComponentsListComponent } from './list.component';
-
-describe('VehicleComponentsListComponent', () => {
- let component: VehicleComponentsListComponent;
- let fixture: ComponentFixture;
-
- beforeEach(async(() => {
- TestBed.configureTestingModule({
- declarations: [VehicleComponentsListComponent],
- }).compileComponents();
- }));
-
- beforeEach(() => {
- fixture = TestBed.createComponent(VehicleComponentsListComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/src/app/routes/vehicle/components/audit/audit.component.ts b/src/app/routes/vehicle/components/audit/audit.component.ts
index 95ad7e8b..bc5fd25f 100644
--- a/src/app/routes/vehicle/components/audit/audit.component.ts
+++ b/src/app/routes/vehicle/components/audit/audit.component.ts
@@ -3,37 +3,32 @@ import { ActivatedRoute, Router } from '@angular/router';
import { STColumn, STColumnBadge, STComponent, STData } from '@delon/abc/st';
import { SFComponent, SFDateWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
import { ModalHelper } from '@delon/theme';
+import { SearchDrawerService } from '@shared';
import { NzModalService } from 'ng-zorro-antd/modal';
import { of, Subject } from 'rxjs';
import { map } from 'rxjs/operators';
+import { BasicTableComponent } from 'src/app/routes/commom';
import { VehicleService } from '../../../vehicle/services/vehicle.service';
import { CarSettleCarauthComponent } from '../list/carauth/carauth.component';
@Component({
selector: 'app-Vehicle-components-audit',
- templateUrl: './audit.component.html'
+ templateUrl: './audit.component.html',
+ styleUrls: ['../../../commom/less/commom-table.less']
})
-export class VehicleComponentsAuditComponent implements OnInit {
- _$expand = false;
+export class VehicleComponentsAuditComponent extends BasicTableComponent implements OnInit {
resourceStatus: any = 1;
defaultTabs = 1;
- ui!: SFUISchema;
- schema!: SFSchema;
columns!: STColumn[];
@ViewChild('st', { static: false }) st!: STComponent;
- @ViewChild('sf', { static: false }) sf!: SFComponent;
constructor(
public service: VehicleService,
- private modal: NzModalService,
private router: Router,
private ar: ActivatedRoute,
- private modalHelper: ModalHelper
- ) {}
- /**
- * 查询字段个数navigate
- */
- get queryFieldCount(): number {
- return Object.keys(this.schema?.properties || {}).length;
+ private modalHelper: ModalHelper,
+ public searchDrawerService: SearchDrawerService
+ ) {
+ super(searchDrawerService);
}
/**
@@ -65,6 +60,11 @@ export class VehicleComponentsAuditComponent implements OnInit {
this.st?.load(1);
});
}
+
+ search() {
+ this.st?.load(1);
+ }
+
dataProcess(data: STData[]): STData[] {
return data.map((i, index) => {
i.showSortFlag = false;
@@ -101,9 +101,6 @@ export class VehicleComponentsAuditComponent implements OnInit {
return of([]);
}
},
- visibleIf: {
- _$expand: (value: boolean) => value
- }
} as SFSelectWidgetSchema
},
carNoColor: {
@@ -130,12 +127,7 @@ export class VehicleComponentsAuditComponent implements OnInit {
saveUser: {
type: 'string',
title: '录入人员',
- ui: {
- visibleIf: {
- expand: (value: boolean) => value
- }
- }
- },
+ }
// approvalStatus: {
// type: 'string',
// title: '审核状态',
@@ -170,7 +162,6 @@ export class VehicleComponentsAuditComponent implements OnInit {
// }
}
};
- this.ui = { '*': { spanLabelFixed: 120, grid: { span: 8, gutter: 4 }, enter: () => this.st.load() } };
}
initST() {
@@ -228,20 +219,9 @@ export class VehicleComponentsAuditComponent implements OnInit {
daoyun(item: any) {
this.router.navigate(['./view', item], { relativeTo: this.ar });
}
- expandToggle() {
- this._$expand = !this._$expand;
- this.sf?.setValue('/expand', this._$expand);
- }
creat() {
this.router.navigate(['./new'], { relativeTo: this.ar });
}
- /**
- * 重置表单
- */
- resetSF() {
- this.sf.reset();
- this._$expand = false;
- }
// 导出
exportFire() {
let params = Object.assign({}, this.reqParams || {});
diff --git a/src/app/routes/vehicle/components/audit/detail/detail.component.html b/src/app/routes/vehicle/components/audit/detail/detail.component.html
index d4af99da..40eb67d3 100644
--- a/src/app/routes/vehicle/components/audit/detail/detail.component.html
+++ b/src/app/routes/vehicle/components/audit/detail/detail.component.html
@@ -7,7 +7,7 @@
- 车牌号66：{{ detailData?.carNo }}
+
{{ item?.driverName }}/{{ item?.driverTelephone }}/{{ item?.carNo }}
-
- {{ item?.distance ? ((item?.distance)/1000).toFixed(4) + '公里' : '' }}
-
-
- {{ item?.billCode }}
-
-
- {{ item?.resourceCode }}
-
-
- {{ item?.resourceStatusLabel }}
-
- {{ item.insureCode }}
-
- {{ item?.insureStatusLabel }}
-
- {{ item?.goodsInfoName }}
-
- {{ item?.weight ? item?.weight + '吨/' : '' }}
- {{ item?.volume ? item?.volume + '方' : '' }}
- {{ item?.number ? item?.number + '件' : '' }}
-
-
-
- - {{ data.expenseName }}：{{ data.price | currency }} - {{ data.paymentStatusLabel }} -
-
+
+
+
+
+ {{ item?.driverName }}/{{ item?.driverTelephone }}/{{ item?.carNo }}
+
+ {{ item?.distance ? ((item?.distance)/1000).toFixed(4) + '公里' : '' }}
+
+
+ {{ item?.billCode }}
+
+
+ {{ item?.resourceCode }}
+
+
+ {{ item?.resourceStatusLabel }}
+
+ {{ item.insureCode }}
+
+ {{ item?.insureStatusLabel }}
+
+ {{ item?.goodsInfoName }}
+
+ {{ item?.weight ? item?.weight + '吨/' : '' }}
+ {{ item?.volume ? item?.volume + '方' : '' }}
+ {{ item?.number ? item?.number + '件' : '' }}
+
+
+
+ + {{ data.expenseName }}：{{ data.price | currency }} + {{ data.paymentStatusLabel }} +
+
-
+ ;
-
- beforeEach(waitForAsync(() => {
- TestBed.configureTestingModule({
- declarations: [ insuranceManagementListComponent ]
- })
- .compileComponents();
- }));
-
- beforeEach(() => {
- fixture = TestBed.createComponent(insuranceManagementListComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/src/app/routes/insurance-management/components/list/list.component.ts b/src/app/routes/insurance-management/components/list/list.component.ts
index cd287883..611f0236 100644
--- a/src/app/routes/insurance-management/components/list/list.component.ts
+++ b/src/app/routes/insurance-management/components/list/list.component.ts
@@ -5,31 +5,26 @@ import { ModalHelper, _HttpClient } from '@delon/theme';
import { NzModalService } from 'ng-zorro-antd/modal';
import { map } from 'rxjs/operators';
import { of } from 'rxjs';
-import { ShipperBaseService } from '@shared';
+import { SearchDrawerService, ShipperBaseService } from '@shared';
import { Router } from '@angular/router';
import { InsuranceManagementService } from '../../services/insurance-management.service';
-import { VehicleImgViewComponent } from 'src/app/routes/vehicle/components/list/img-view/img-view.component';
-import { ImageViewComponent } from 'src/app/shared/components/imagelist';
+import { BasicTableComponent } from 'src/app/routes/commom';
@Component({
selector: 'app-insurance-management-list',
templateUrl: './list.component.html',
- styleUrls: ['./list.component.less']
+ styleUrls: ['../../../commom/less/commom-table.less']
})
-export class insuranceManagementListComponent implements OnInit {
- ui: SFUISchema = {};
+export class insuranceManagementListComponent extends BasicTableComponent implements OnInit {
uiView: SFUISchema = {};
- schema: SFSchema = {};
schemaView: SFSchema = {};
auditMany = false;
isVisibleView = false;
isVisibleEvaluate = false;
isVisible = false;
- _$expand = false;
@ViewChild('st') private readonly st!: STComponent;
@ViewChild('stFloat') private readonly stFloat!: STComponent;
@ViewChild('stFloatView') private readonly stFloatView!: STComponent;
- @ViewChild('sf', { static: false }) sf!: SFComponent;
@ViewChild('sfFre', { static: false }) sfFre!: SFComponent;
@ViewChild('sfView', { static: false }) sfView!: SFComponent;
columns: STColumn[] = [];
@@ -63,8 +58,10 @@ export class insuranceManagementListComponent implements OnInit {
private modal: NzModalService,
public shipperservice: ShipperBaseService,
private router: Router,
- private modale: ModalHelper,
- ) { }
+ public searchDrawerService: SearchDrawerService
+ ) {
+ super(searchDrawerService);
+ }
/**
* 查询参数
@@ -90,7 +87,7 @@ export class insuranceManagementListComponent implements OnInit {
insureTime: {
start: this.sf?.value?.insureTime?.[0] || '',
end: this.sf?.value?.insureTime?.[1] || ''
- },
+ }
};
}
get selectedRows() {
@@ -164,11 +161,7 @@ export class insuranceManagementListComponent implements OnInit {
policyNo: {
type: 'string',
title: '保单号',
- ui: {
- visibleIf: {
- _$expand: (value: boolean) => value
- },
- }
+ ui: {}
},
insureType: {
title: '类型',
@@ -176,29 +169,18 @@ export class insuranceManagementListComponent implements OnInit {
ui: {
widget: 'dict-select',
params: { dictKey: 'insure:type' },
- containsAllLabel: true,
- visibleIf: {
- _$expand: (value: boolean) => value
- }
+ containsAllLabel: true
} as SFSelectWidgetSchema
},
startAddress: {
type: 'string',
title: '始发地',
- ui: {
- visibleIf: {
- _$expand: (value: boolean) => value
- }
- }
+ ui: {}
},
endAddress: {
type: 'string',
title: '目的地',
- ui: {
- visibleIf: {
- _$expand: (value: boolean) => value
- }
- }
+ ui: {}
},
shipperAppUserId: {
type: 'string',
@@ -209,11 +191,8 @@ export class insuranceManagementListComponent implements OnInit {
searchDebounceTime: 300,
searchLoadingText: '搜索中...',
allowClear: true,
- visibleIf: {
- _$expand: (value: boolean) => value
- },
onSearch: (q: any) => {
- let str =q.replace(/^\s+|\s+$/g,"");
+ let str = q.replace(/^\s+|\s+$/g, '');
if (str) {
return this.service
.request(this.service.$api_enterpriceList, { enterpriseName: str })
@@ -233,30 +212,19 @@ export class insuranceManagementListComponent implements OnInit {
title: '所属项目',
ui: {
widget: 'select',
- placeholder: '请先选择货主',
- visibleIf: {
- _$expand: (value: boolean) => value
- },
+ placeholder: '请先选择货主'
} as SFSelectWidgetSchema
},
driverName: {
title: '承运司机',
type: 'string',
- ui: {
- visibleIf: {
- _$expand: (value: boolean) => value
- }
- }
+ ui: {}
},
carNo: {
title: '车牌号',
type: 'string',
- ui: {
- visibleIf: {
- _$expand: (value: boolean) => value
- }
- }
+ ui: {}
},
insureStatus: {
title: '投保状态',
@@ -264,10 +232,7 @@ export class insuranceManagementListComponent implements OnInit {
ui: {
widget: 'dict-select',
params: { dictKey: 'insure:status' },
- containsAllLabel: true,
- visibleIf: {
- _$expand: (value: boolean) => value
- }
+ containsAllLabel: true
} as SFSelectWidgetSchema
},
insureRefundStatus: {
@@ -276,10 +241,7 @@ export class insuranceManagementListComponent implements OnInit {
ui: {
widget: 'dict-select',
params: { dictKey: 'insure:refund:status' },
- containsAllLable: true,
- visibleIf: {
- _$expand: (value: boolean) => value
- }
+ containsAllLable: true
} as SFSelectWidgetSchema
},
enterpriseInfoId: {
@@ -289,9 +251,6 @@ export class insuranceManagementListComponent implements OnInit {
widget: 'select',
placeholder: '请选择',
allowClear: true,
- visibleIf: {
- _$expand: (value: boolean) => value
- },
asyncData: () => this.shipperservice.getNetworkFreightForwarder()
}
},
@@ -302,10 +261,7 @@ export class insuranceManagementListComponent implements OnInit {
widget: 'date',
mode: 'range',
format: 'yyyy-MM-dd',
- allowClear: true,
- visibleIf: {
- _$expand: (value: boolean) => value
- }
+ allowClear: true
} as SFDateWidgetSchema
},
createTime: {
@@ -315,10 +271,7 @@ export class insuranceManagementListComponent implements OnInit {
widget: 'date',
mode: 'range',
format: 'yyyy-MM-dd',
- allowClear: true,
- visibleIf: {
- _$expand: (value: boolean) => value
- }
+ allowClear: true
} as SFDateWidgetSchema
},
recordTime: {
@@ -328,17 +281,12 @@ export class insuranceManagementListComponent implements OnInit {
widget: 'date',
mode: 'range',
format: 'yyyy-MM-dd',
- allowClear: true,
- visibleIf: {
- _$expand: (value: boolean) => value
- }
+ allowClear: true
} as SFDateWidgetSchema
- },
-
+ }
},
type: 'object'
};
- this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } };
}
// 获取城市列表
getRegionCode(regionCode: any) {
@@ -462,14 +410,14 @@ export class insuranceManagementListComponent implements OnInit {
title: '失败原因',
width: '180px',
className: 'text-left',
- render: 'processMessage',
+ render: 'processMessage'
// processResult=2
},
{
title: '退款状态',
width: '180px',
className: 'text-left',
- index: 'insureRefundStatusLabel',
+ index: 'insureRefundStatusLabel'
// processResult=2
},
{
@@ -481,7 +429,7 @@ export class insuranceManagementListComponent implements OnInit {
{
text: '查看保单',
click: _record => this.showImg(_record),
- iif: item => item.insureStatus == '2'
+ iif: item => item.insureStatus == '2'
// acl: { ability: ['VEHICLE-LIST-view'] },
// iif: item =>
// item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '1'
@@ -489,7 +437,7 @@ export class insuranceManagementListComponent implements OnInit {
{
text: '退保费',
click: _record => this.retreatPrice(_record),
- iif: item => item.insureStatus == '2'
+ iif: item => item.insureStatus == '2'
// acl: { ability: ['VEHICLE-LIST-view'] },
}
]
@@ -499,39 +447,18 @@ export class insuranceManagementListComponent implements OnInit {
showImg(_record: any) {
// var newUrl=_record.policyUrl.replace('http','https')
// console.log(newUrl);
-
+
// window.open(newUrl,'_self');
window.open(`${_record.newPolicyUrl}`);
// this.service.downloadFile(`${_record.newPolicyUrl}`)
-
// const params = {
// imgList: [_record.policyUrl],
// index: 0
// };
// this.modal.create({ nzContent: ImageViewComponent, nzComponentParams: { params } });
}
- /**
- * 查询字段个数
- */
- get queryFieldCount(): number {
- return Object.keys(this.schema?.properties || {}).length;
- }
- /**
- * 伸缩查询条件
- */
- expandToggle(): void {
- this._$expand = !this._$expand;
- this.sf?.setValue('/_$expand', this._$expand);
- }
- tabChange(item: any) { }
- /**
- * 重置表单
- */
- resetSF(): void {
- this.sf.reset();
- this._$expand = false;
- }
+ tabChange(item: any) {}
// 退保费
retreatPrice(value: any) {
@@ -541,7 +468,7 @@ export class insuranceManagementListComponent implements OnInit {
nzContent: '退还后不可撤销，请谨慎操作！',
nzCancelText: '取消',
nzOnOk: () => {
- this.service.request(this.service.$api_get_addINPBillRefundApplication, {id: value.id}).subscribe(res => {
+ this.service.request(this.service.$api_get_addINPBillRefundApplication, { id: value.id }).subscribe(res => {
if (res) {
this.service.msgSrv.success('删除菜单成功');
}
diff --git a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html
index 3f826f85..6b0be53f 100644
--- a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html
+++ b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html
@@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-24 16:58:02
* @LastEditors : Shiming
- * @LastEditTime : 2022-04-21 15:33:31
+ * @LastEditTime : 2022-05-06 14:37:36
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail-change\\bulk-detail-change.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@@ -288,8 +288,14 @@
-
+
+
diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html
index de78de28..4d91eb55 100644
--- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html
+++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html
@@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-06 20:20:26
* @LastEditors : Shiming
- * @LastEditTime : 2022-05-06 10:02:52
+ * @LastEditTime : 2022-05-06 14:36:18
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@@ -287,8 +287,14 @@
-
+
+
diff --git a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html
index 873829d3..f1f7015d 100644
--- a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html
+++ b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html
@@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-23 13:39:58
* @LastEditors : Shiming
- * @LastEditTime : 2022-04-21 15:33:42
+ * @LastEditTime : 2022-05-06 14:38:38
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail-change\\vehicle-detail-change.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@@ -322,8 +322,14 @@
-
+
+
diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html
index 7a96dafd..ef272981 100644
--- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html
+++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html
@@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-28 14:42:03
* @LastEditors : Shiming
- * @LastEditTime : 2022-04-22 16:27:43
+ * @LastEditTime : 2022-05-06 14:37:17
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@@ -290,8 +290,14 @@
-
+
+
diff --git a/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.html b/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.html
index b2e78101..56142c59 100644
--- a/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.html
+++ b/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.html
@@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-02-22 13:53:29
* @LastEditors : Shiming
- * @LastEditTime : 2022-04-22 16:27:40
+ * @LastEditTime : 2022-05-06 14:38:09
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\view-track\\view-track.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@@ -12,8 +12,14 @@
-
+
+
diff --git a/src/app/routes/partner/account-management/components/list/list.component.html b/src/app/routes/partner/account-management/components/list/list.component.html
index 71c0c44e..4973a46c 100644
--- a/src/app/routes/partner/account-management/components/list/list.component.html
+++ b/src/app/routes/partner/account-management/components/list/list.component.html
@@ -1,3 +1,13 @@
+
@@ -48,7 +58,7 @@
{{selectItem?.enterpriseName || selectItem?.contactName}}
- {{selectItem?.channelId}}
+ {{selectItem?.channelIdLabel}}
+
\ No newline at end of file
diff --git a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts
index 2503b9fe..c36afa1a 100644
--- a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts
+++ b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts
@@ -2,20 +2,19 @@ import { Component, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { STChange, STColumn, STComponent, STData } from '@delon/abc/st';
import { SFComponent, SFDateWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
+import { SearchDrawerService } from '@shared';
import { NzModalService } from 'ng-zorro-antd/modal';
+import { BasicTableComponent } from 'src/app/routes/commom';
import { TaxManagementService } from '../../services/tax-management.service';
@Component({
selector: 'app-tax-management-individual-collect',
templateUrl: './individual-collect.component.html',
- styleUrls: ['../../../commom/less/box.less']
+ styleUrls: ['../../../commom/less/commom-table.less']
})
-export class TaxManagementIndividualCollectComponent implements OnInit {
- _$expand = false;
- schema!: SFSchema;
+export class TaxManagementIndividualCollectComponent extends BasicTableComponent implements OnInit {
columns!: STColumn[];
@ViewChild('st', { static: false }) st!: STComponent;
- @ViewChild('sf', { static: false }) sf!: SFComponent;
tabs: any[] = [
{ name: '待申报', value: '0' },
{ name: '待审核', value: '1' },
@@ -26,7 +25,9 @@ export class TaxManagementIndividualCollectComponent implements OnInit {
selectedIndex = '0';
selectedRows: any[] = [];
- constructor(public service: TaxManagementService, private router: Router, private ar: ActivatedRoute, private modal: NzModalService) {}
+ constructor(public service: TaxManagementService, public searchDrawerService: SearchDrawerService) {
+ super(searchDrawerService);
+ }
/**
* 查询参数
@@ -39,14 +40,6 @@ export class TaxManagementIndividualCollectComponent implements OnInit {
return { ...params };
}
- /**
- * 伸缩查询条件
- */
- expandToggle() {
- this._$expand = !this._$expand;
- this.sf?.setValue('/_$expand', this._$expand);
- }
-
stChange(e: STChange): void {
switch (e.type) {
case 'checkbox':
@@ -55,13 +48,6 @@ export class TaxManagementIndividualCollectComponent implements OnInit {
}
}
- /**
- * 重置表单
- */
- resetSF() {
- this.sf.reset();
- this._$expand = false;
- }
/**
* 程序初始化入口
*/
@@ -76,7 +62,6 @@ export class TaxManagementIndividualCollectComponent implements OnInit {
initSF() {
this.schema = {
properties: {
- _$expand: { type: 'boolean', ui: { hidden: true } },
overdueStatus: {
title: '是否逾期',
type: 'string',
@@ -98,7 +83,7 @@ export class TaxManagementIndividualCollectComponent implements OnInit {
ui: {
widget: 'sl-from-to',
type: 'date',
- format: 'yyyy-MM-dd',
+ format: 'yyyy-MM-dd'
} as SFDateWidgetSchema
},
sbrq: {
@@ -108,9 +93,6 @@ export class TaxManagementIndividualCollectComponent implements OnInit {
widget: 'sl-from-to',
type: 'date',
format: 'yyyy-MM-dd',
- visibleIf: {
- _$expand: (value: boolean) => value
- }
} as SFDateWidgetSchema
},
nsrmc: {
@@ -120,9 +102,6 @@ export class TaxManagementIndividualCollectComponent implements OnInit {
widget: 'select',
placeholder: '请选择',
allowClear: true,
- visibleIf: {
- _$expand: (value: boolean) => value
- },
asyncData: () => this.service.getNetworkEnterpriseName()
}
}
@@ -273,7 +252,7 @@ export class TaxManagementIndividualCollectComponent implements OnInit {
this.service.msgSrv.success('更新成功');
this.search();
}
- })
+ });
}
search() {
diff --git a/src/app/routes/tax-management/components/individual-income/individual-income.component.html b/src/app/routes/tax-management/components/individual-income/individual-income.component.html
index bf8b851d..021f0ec1 100644
--- a/src/app/routes/tax-management/components/individual-income/individual-income.component.html
+++ b/src/app/routes/tax-management/components/individual-income/individual-income.component.html
@@ -1,17 +1,5 @@
-
-
-
+ -->
+
+
+
-
-
-
-
@@ -45,10 +37,29 @@
已选择
{{ selectedRows.length }} 条数据
-
-
-
-
+
+
+
+
+
+
+
diff --git a/src/app/routes/tax-management/components/individual-income/individual-income.component.ts b/src/app/routes/tax-management/components/individual-income/individual-income.component.ts
index 3fc0ea7d..82cb4beb 100644
--- a/src/app/routes/tax-management/components/individual-income/individual-income.component.ts
+++ b/src/app/routes/tax-management/components/individual-income/individual-income.component.ts
@@ -1,22 +1,18 @@
import { Component, OnInit, ViewChild } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
import { STChange, STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st';
-import { SFComponent, SFDateWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
-import { ShipperBaseService } from '@shared';
-import { NzModalService } from 'ng-zorro-antd/modal';
+import { SFDateWidgetSchema } from '@delon/form';
+import { SearchDrawerService } from '@shared';
+import { BasicTableComponent } from 'src/app/routes/commom';
import { TaxManagementService } from '../../services/tax-management.service';
@Component({
selector: 'app-tax-management-individual-income',
templateUrl: './individual-income.component.html',
- styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less']
+ styleUrls: ['../../../commom/less/commom-table.less']
})
-export class TaxManagementIndividualIncomeComponent implements OnInit {
- _$expand = false;
- schema!: SFSchema;
+export class TaxManagementIndividualIncomeComponent extends BasicTableComponent implements OnInit {
columns!: STColumn[];
@ViewChild('st', { static: false }) st!: STComponent;
- @ViewChild('sf', { static: false }) sf!: SFComponent;
isLoading: boolean = false;
tabs: any[] = [
{ name: '待申报', value: '0' },
@@ -30,7 +26,9 @@ export class TaxManagementIndividualIncomeComponent implements OnInit {
selectedRows: any[] = [];
- constructor(public service: TaxManagementService) {}
+ constructor(public service: TaxManagementService, public searchDrawerService: SearchDrawerService) {
+ super(searchDrawerService);
+ }
beforeReq = (requestOptions: STRequestOptions) => {
Object.assign(requestOptions.body, { declareStatus: this.selectedIndex });
@@ -50,22 +48,6 @@ export class TaxManagementIndividualIncomeComponent implements OnInit {
}
}
- /**
- * 伸缩查询条件
- */
- expandToggle() {
- this._$expand = !this._$expand;
- this.sf?.setValue('/_$expand', this._$expand);
- }
-
- /**
- * 重置表单
- */
- resetSF() {
- this.sf.reset();
- this._$expand = false;
- this.isLoading = true;
- }
/**
* 程序初始化入口
*/
@@ -80,7 +62,6 @@ export class TaxManagementIndividualIncomeComponent implements OnInit {
initSF() {
this.schema = {
properties: {
- _$expand: { type: 'boolean', ui: { hidden: true } },
driverName: { title: '司机姓名', type: 'string', ui: { placeholder: '请输入' } },
telephone: {
type: 'string',
@@ -140,10 +121,7 @@ export class TaxManagementIndividualIncomeComponent implements OnInit {
ui: {
placeholder: '请选择',
widget: 'select',
- containsAllLabel: true,
- visibleIf: {
- _$expand: (value: boolean) => value
- }
+ containsAllLabel: true
},
default: ''
},
@@ -153,10 +131,7 @@ export class TaxManagementIndividualIncomeComponent implements OnInit {
ui: {
widget: 'sl-from-to',
type: 'date',
- format: 'yyyy-MM-dd',
- visibleIf: {
- _$expand: (value: boolean) => value
- }
+ format: 'yyyy-MM-dd'
} as SFDateWidgetSchema
},
declareDate: {
@@ -165,10 +140,7 @@ export class TaxManagementIndividualIncomeComponent implements OnInit {
ui: {
widget: 'sl-from-to',
type: 'date',
- format: 'yyyy-MM-dd',
- visibleIf: {
- _$expand: (value: boolean) => value
- }
+ format: 'yyyy-MM-dd'
} as SFDateWidgetSchema
},
ltdId: {
@@ -178,9 +150,6 @@ export class TaxManagementIndividualIncomeComponent implements OnInit {
widget: 'select',
placeholder: '请选择',
allowClear: true,
- visibleIf: {
- _$expand: (value: boolean) => value
- },
asyncData: () => this.service.getNetworkFreightForwarder()
}
}
diff --git a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html
index 8657dfe0..73ab8a36 100644
--- a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html
+++ b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html
@@ -1,17 +1,5 @@
-
-
-
+ -->
+
+
+
-
-
-
+
待上传
@@ -101,11 +91,26 @@
已选择
{{ selectedRows.length }} 条数据
-
-
-
-
+
+
+
+
+
-
+
\ No newline at end of file
diff --git a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.less b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.less
deleted file mode 100644
index 94ec07e0..00000000
--- a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.less
+++ /dev/null
@@ -1,22 +0,0 @@
-:host {
- .text-black {
- color: #000;
- }
- .icon {
- display: inline-block;
- width: 1em;
- height: 1em;
- stroke-width: 0;
- stroke: currentColor;
- /* stylelint-disable-next-line order/properties-order */
- fill: currentColor;
- }
- ::ng-deep {
- .imgBox {
- display: flex;
- img {
- width: 60px !important;
- }
- }
- }
-}
diff --git a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.spec.ts b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.spec.ts
deleted file mode 100644
index 2c07610f..00000000
--- a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-import { DatatableOrderReportingComponent } from './order-reporting.component';
-
-describe('DatatableOrderReportingComponent', () => {
- let component: DatatableOrderReportingComponent;
- let fixture: ComponentFixture;
-
- beforeEach(waitForAsync(() => {
- TestBed.configureTestingModule({
- declarations: [ DatatableOrderReportingComponent ]
- })
- .compileComponents();
- }));
-
- beforeEach(() => {
- fixture = TestBed.createComponent(DatatableOrderReportingComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts
index 53e0f9f0..1343b38f 100644
--- a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts
+++ b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts
@@ -1,29 +1,24 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { STColumn, STComponent, STData } from '@delon/abc/st';
-import { SFComponent, SFDateWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
-import { ShipperBaseService } from '@shared';
+import { SFDateWidgetSchema, SFSchemaEnum, SFSelectWidgetSchema } from '@delon/form';
+import { SearchDrawerService, ShipperBaseService } from '@shared';
import { NzModalService } from 'ng-zorro-antd/modal';
import { of } from 'rxjs';
import { map } from 'rxjs/operators';
+import { BasicTableComponent } from 'src/app/routes/commom';
import { TaxManagementService } from '../../services/tax-management.service';
import { TaxManagementUploadSettingComponent } from './upload-setting/upload-setting.component';
import { TaxManagementOrderVerifyResultComponent } from './verify-result/verify-result.component';
-// import { DatatableReportingUploadSettingComponent } from '../upload-setting/upload-setting.component';
-// import { DatatableReportingVerifyResultComponent } from '../verify-result/verify-result.component';
@Component({
selector: 'app-tax-management-order-reporting',
templateUrl: './order-reporting.component.html',
- styleUrls: ['./order-reporting.component.less']
+ styleUrls: ['../../../commom/less/commom-table.less']
})
-export class TaxManagementOrderReportingComponent implements OnInit {
- _$expand = false;
- ui!: SFUISchema;
- schema!: SFSchema;
+export class TaxManagementOrderReportingComponent extends BasicTableComponent implements OnInit {
columns!: STColumn[];
@ViewChild('st', { static: false }) st!: STComponent;
- @ViewChild('sf', { static: false }) sf!: SFComponent;
tabType!: string;
isLoading: boolean = false;
tabs: any[] = [
@@ -41,15 +36,9 @@ export class TaxManagementOrderReportingComponent implements OnInit {
private ar: ActivatedRoute,
public shipperservice: ShipperBaseService,
private modal: NzModalService,
- public shipperSrv: ShipperBaseService
+ public searchDrawerService: SearchDrawerService
) {
- }
-
- /**
- * 查询字段个数
- */
- get queryFieldCount(): number {
- return Object.keys(this.schema?.properties || {}).length;
+ super(searchDrawerService);
}
/**
@@ -57,7 +46,7 @@ export class TaxManagementOrderReportingComponent implements OnInit {
*/
get reqParams() {
const params = Object.assign({}, this.sf?.value || {}, {
- putStatus: this.selectedIndex,
+ putStatus: this.selectedIndex
});
delete params._$expand;
return { ...params };
@@ -70,22 +59,6 @@ export class TaxManagementOrderReportingComponent implements OnInit {
return this.st?.list.filter((item: any) => item.checked) || [];
}
- /**
- * 伸缩查询条件
- */
- expandToggle() {
- this._$expand = !this._$expand;
- this.sf?.setValue('/_$expand', this._$expand);
- }
-
- /**
- * 重置表单
- */
- resetSF() {
- this.sf.reset();
- this._$expand = false;
- this.isLoading = true
- }
/**
* 程序初始化入口
*/
@@ -106,8 +79,8 @@ export class TaxManagementOrderReportingComponent implements OnInit {
type: 'string',
title: '运单号',
ui: {
- placeholder: '请输入',
- },
+ placeholder: '请输入'
+ }
},
shipperId: {
type: 'string',
@@ -119,7 +92,7 @@ export class TaxManagementOrderReportingComponent implements OnInit {
searchLoadingText: '搜索中...',
allowClear: true,
onSearch: (q: any) => {
- let str = q.replace(/^\s+|\s+$/g, "");
+ let str = q.replace(/^\s+|\s+$/g, '');
if (str) {
return this.service
.request(this.service.$api_enterpriceList, { enterpriseName: str })
@@ -128,17 +101,14 @@ export class TaxManagementOrderReportingComponent implements OnInit {
} else {
return of([]);
}
- },
-
+ }
} as SFSelectWidgetSchema
},
driverName: {
title: '承运司机',
type: 'string',
ui: {
- placeholder: '请输入司机姓名/手机号', visibleIf: {
- _$expand: (value: boolean) => value,
- },
+ placeholder: '请输入司机姓名/手机号'
}
},
carNo: {
@@ -146,10 +116,7 @@ export class TaxManagementOrderReportingComponent implements OnInit {
type: 'string',
maxLength: 9,
ui: {
- placeholder: '请输入',
- visibleIf: {
- _$expand: (value: boolean) => value,
- },
+ placeholder: '请输入'
}
},
collectionUserName: {
@@ -157,10 +124,7 @@ export class TaxManagementOrderReportingComponent implements OnInit {
type: 'string',
maxLength: 9,
ui: {
- placeholder: '请输入',
- visibleIf: {
- _$expand: (value: boolean) => value,
- },
+ placeholder: '请输入'
}
},
// putStatus: {
@@ -183,16 +147,13 @@ export class TaxManagementOrderReportingComponent implements OnInit {
title: '本地校验',
type: 'string',
enum: [
- {label: '校验中',value: 0},
- {label: '通过',value: 1},
- {label: '不通过',value: 2},
+ { label: '校验中', value: 0 },
+ { label: '通过', value: 1 },
+ { label: '不通过', value: 2 }
],
ui: {
- widget:'select',
- placeholder: '请选择',
- visibleIf: {
- _$expand: (value: boolean) => value,
- },
+ widget: 'select',
+ placeholder: '请选择'
}
},
networkTransporter: {
@@ -202,9 +163,6 @@ export class TaxManagementOrderReportingComponent implements OnInit {
widget: 'select',
placeholder: '请选择',
allowClear: true,
- visibleIf: {
- _$expand: (value: boolean) => value
- },
asyncData: () => this.shipperservice.getNetworkFreightForwarder()
}
},
@@ -214,11 +172,8 @@ export class TaxManagementOrderReportingComponent implements OnInit {
ui: {
widget: 'sl-from-to',
type: 'date',
- format: 'yyyy-MM-dd',
- visibleIf: {
- _$expand: (value: boolean) => value,
- },
- } as SFDateWidgetSchema,
+ format: 'yyyy-MM-dd'
+ } as SFDateWidgetSchema
},
orderPayTime: {
title: '结束时间',
@@ -226,17 +181,10 @@ export class TaxManagementOrderReportingComponent implements OnInit {
ui: {
widget: 'sl-from-to',
type: 'date',
- format: 'yyyy-MM-dd',
- visibleIf: {
- _$expand: (value: boolean) => value,
- },
- } as SFDateWidgetSchema,
- },
- },
- };
- this.ui = {
- '*': { spanLabelFixed: 120, grid: { span: 8, gutter: 4 }, enter: () => this.search() },
- $time: { grid: { span: 24 } },
+ format: 'yyyy-MM-dd'
+ } as SFDateWidgetSchema
+ }
+ }
};
}
@@ -245,33 +193,33 @@ export class TaxManagementOrderReportingComponent implements OnInit {
*/
initST() {
this.columns = [
- { title: '', type: 'checkbox', className: 'text-center', width: '60px', },
- { title: '上传状态', render: 'putStatus', className: 'text-center', width: '120px', },
- { title: '本地校验', render: 'checkStatus', className: 'text-center', width: '120px', },
+ { title: '', type: 'checkbox', className: 'text-center', width: '60px' },
+ { title: '上传状态', render: 'putStatus', className: 'text-center', width: '120px' },
+ { title: '本地校验', render: 'checkStatus', className: 'text-center', width: '120px' },
{
title: '订单号',
index: 'billCode',
className: 'text-center',
- width: '150px',
+ width: '150px'
},
- { title: '运单号', index: 'wayBillCode', className: 'text-center', width: '150px', },
+ { title: '运单号', index: 'wayBillCode', className: 'text-center', width: '150px' },
{
title: '网络货运人',
index: 'networkTransporterName',
className: 'text-center',
- width: '180px',
+ width: '180px'
},
{
title: '档案编号',
index: 'archivesNo',
className: 'text-center',
- width: '180px',
+ width: '180px'
},
{
title: '品牌型号',
index: 'carBrand',
className: 'text-center',
- width: '180px',
+ width: '180px'
},
{ title: '装货地', index: 'loadingAddress', render: 'loadingPlace', className: 'text-center', width: '200px' },
{ title: '装货地详细地址', index: 'loadingDetailedAddress', render: 'loadingPlace', className: 'text-center', width: '200px' },
@@ -301,12 +249,10 @@ export class TaxManagementOrderReportingComponent implements OnInit {
{ title: '提货单', render: 'loadingLadingBill', className: 'text-center', width: '100px' },
{ title: '签收单', render: 'signatureForm', className: 'text-center', width: '100px' },
{ title: '上传次数', index: 'putNumber', className: 'text-center', width: '100px' },
- { title: '最近上传时间', index: 'recentlyPutTime', className: 'text-center', width: '180px' },
+ { title: '最近上传时间', index: 'recentlyPutTime', className: 'text-center', width: '180px' }
];
}
-
-
/**
*撤回
* @param record 记录实例
@@ -331,10 +277,9 @@ export class TaxManagementOrderReportingComponent implements OnInit {
this.service.msgSrv.success('撤销成功');
this.search();
}
- })
+ });
}
});
-
}
/**
*撤销
@@ -354,7 +299,7 @@ export class TaxManagementOrderReportingComponent implements OnInit {
this.service.msgSrv.success('更新成功');
this.st.load(1);
}
- })
+ });
}
/**
*撤销
@@ -381,10 +326,9 @@ export class TaxManagementOrderReportingComponent implements OnInit {
this.service.msgSrv.success('撤销成功');
this.search();
}
- })
+ });
}
});
-
}
selectChange(item: any) {
@@ -393,7 +337,7 @@ export class TaxManagementOrderReportingComponent implements OnInit {
this.selectedIndex = item?.value || '';
setTimeout(() => {
this.st.load();
- })
+ });
}
/**
@@ -403,7 +347,7 @@ export class TaxManagementOrderReportingComponent implements OnInit {
// this.router.navigate(['../view', record.uuid], { relativeTo: this.ar });
this.router.navigate(['../detail'], {
queryParams: {
- id: record.id,
+ id: record.id
},
relativeTo: this.ar
});
@@ -431,21 +375,21 @@ export class TaxManagementOrderReportingComponent implements OnInit {
* 上传
*/
upload() {
- let status = false
+ let status = false;
if (this.selectedRows.length === 0) {
this.openWainingModal('请选择需要上传的数据');
return;
}
this.selectedRows.forEach(item => {
if (item?.putStatus != '0') {
- status = true
+ status = true;
}
});
- if(status) {
+ if (status) {
this.service.msgSrv.warning('选择了已上传，请重新勾选！');
return;
}
-
+
// if(this.selectedRows.find(item => item.checkStatus !== 1)) {
// this.service.msgSrv.warning('选择了未通过校验的订单，请重新勾选！');
// return;
@@ -459,10 +403,9 @@ export class TaxManagementOrderReportingComponent implements OnInit {
this.service.msgSrv.success('上传成功');
this.st.load();
}
- })
+ });
}
-
/**
*
* @param params 上传设置
@@ -479,7 +422,7 @@ export class TaxManagementOrderReportingComponent implements OnInit {
if (res) {
this.st.load();
}
- })
+ });
}
/**
@@ -499,7 +442,7 @@ export class TaxManagementOrderReportingComponent implements OnInit {
if (res) {
this.st.load();
}
- })
+ });
}
/**
@@ -509,17 +452,16 @@ export class TaxManagementOrderReportingComponent implements OnInit {
if (record?.billStatus !== '2') {
return;
}
- this.openWainingModal('监管审核结果', record?.result)
+ this.openWainingModal('监管审核结果', record?.result);
}
-
search() {
this.st.load(1);
}
/**
- * 异步导出
- */
+ * 异步导出
+ */
export() {
this.service.exportStart(this.sf?.value, this.service.$api_async_export_order_reporting_list);
}
@@ -528,8 +470,7 @@ export class TaxManagementOrderReportingComponent implements OnInit {
this.modal.warning({
nzMask: false,
nzTitle: title,
- nzContent: content,
- })
+ nzContent: content
+ });
}
-
}
diff --git a/src/app/routes/ticket-management/components/billing-order/billing-order.component.html b/src/app/routes/ticket-management/components/billing-order/billing-order.component.html
index e6588a35..dbe91bcd 100644
--- a/src/app/routes/ticket-management/components/billing-order/billing-order.component.html
+++ b/src/app/routes/ticket-management/components/billing-order/billing-order.component.html
@@ -1,7 +1,5 @@
-
+
-
+
+
+ [loading]="false" [scroll]="{ x:'1200px',y:scrollY }">
待受理
处理中
diff --git a/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts b/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts
index 57ea5983..e60d7803 100644
--- a/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts
+++ b/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts
@@ -2,27 +2,29 @@ import { Component, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st';
import { SFComponent, SFSchema, SFDateWidgetSchema, SFSelectWidgetSchema } from '@delon/form';
+import { SearchDrawerService } from '@shared';
import { NzModalService } from 'ng-zorro-antd/modal';
+import { BasicTableComponent } from 'src/app/routes/commom';
import { TicketService } from '../../services/ticket.service';
@Component({
selector: 'app-billing-order',
templateUrl: './billing-order.component.html',
- styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less']
+ styleUrls: ['../../../commom/less/commom-table.less']
})
-export class BillingOrderComponent implements OnInit {
+export class BillingOrderComponent extends BasicTableComponent {
@ViewChild('st', { static: true })
st!: STComponent;
- @ViewChild('sf', { static: false })
- sf!: SFComponent;
columns: STColumn[] = this.initST();
- searchSchema: SFSchema = this.initSF();
+ schema: SFSchema = this.initSF();
- _$expand = false;
+ constructor(public service: TicketService, private router: Router, public searchDrawerService: SearchDrawerService) {
+ super(searchDrawerService);
+ }
- constructor(public service: TicketService, private nzModalService: NzModalService, private router: Router, private ar: ActivatedRoute) {}
-
- ngOnInit(): void {}
+ search() {
+ this.st?.load(1);
+ }
beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) {
@@ -38,22 +40,6 @@ export class BillingOrderComponent implements OnInit {
this.router.navigateByUrl(`/order-management/vehicle/vehicle-detail/${item.billId}`);
}
- /**
- * 重置表单
- */
- resetSF() {
- this.sf.reset();
- this._$expand = false;
- }
-
- /**
- * 伸缩查询条件
- */
- expandToggle() {
- this._$expand = !this._$expand;
- this.sf?.setValue('/expand', this._$expand);
- }
-
export() {
this.service.exportStart({ ...this.sf?.value, pageSize: -1 }, this.service.$api_export_InvoicedBillInfoPage);
}
@@ -118,20 +104,14 @@ export class BillingOrderComponent implements OnInit {
type: 'string',
title: '申请编号',
ui: {
- autocomplete: 'off',
- visibleIf: {
- expand: (value: boolean) => value
- }
+ autocomplete: 'off'
}
},
vatinvcode: {
type: 'string',
title: '分票编号',
ui: {
- placeholder: '请输入',
- visibleIf: {
- expand: (value: boolean) => value
- }
+ placeholder: '请输入'
}
},
vatappdate: {
@@ -140,10 +120,7 @@ export class BillingOrderComponent implements OnInit {
ui: {
widget: 'sl-from-to',
type: 'date',
- format: 'yyyy-MM-dd HH:mm:ss',
- visibleIf: {
- expand: (value: boolean) => value
- }
+ format: 'yyyy-MM-dd HH:mm:ss'
} as SFDateWidgetSchema
},
sts: {
@@ -152,10 +129,7 @@ export class BillingOrderComponent implements OnInit {
ui: {
widget: 'dict-select',
params: { dictKey: 'etc:invoicing:status' },
- placeholder: '请选择',
- visibleIf: {
- expand: (value: boolean) => value
- }
+ placeholder: '请选择'
}
},
invoiceno: {
@@ -163,10 +137,7 @@ export class BillingOrderComponent implements OnInit {
title: '发票号码',
ui: {
placeholder: '请输入',
- autocomplete: 'off',
- visibleIf: {
- expand: (value: boolean) => value
- }
+ autocomplete: 'off'
}
},
invoicedate: {
@@ -175,10 +146,7 @@ export class BillingOrderComponent implements OnInit {
ui: {
widget: 'sl-from-to',
type: 'date',
- format: 'yyyy-MM-dd',
- visibleIf: {
- expand: (value: boolean) => value
- }
+ format: 'yyyy-MM-dd'
} as SFDateWidgetSchema
},
enterpriseInfoId: {
@@ -188,9 +156,6 @@ export class BillingOrderComponent implements OnInit {
widget: 'select',
placeholder: '请选择',
allowClear: true,
- visibleIf: {
- expand: (value: boolean) => value
- },
asyncData: () => this.service.getNetworkFreightForwarder()
}
}
diff --git a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html
index e8a60d09..e2611f6f 100644
--- a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html
+++ b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html
@@ -1,7 +1,5 @@
-
+
-
+ -->
+
+
+
-
-
-
-
+
+
+
-
+
\ No newline at end of file
diff --git a/src/app/routes/insurance-management/components/list/list.component.less b/src/app/routes/insurance-management/components/list/list.component.less
deleted file mode 100644
index 149a0bc9..00000000
--- a/src/app/routes/insurance-management/components/list/list.component.less
+++ /dev/null
@@ -1,13 +0,0 @@
-
- :host {
- p{
- margin-bottom: 0
- }
- .left_btn {
- width: 50px;
- height: 32px;
- padding-left: 8px;
- line-height:32px;
- background-color: #d7d7d7;
- }
- }
\ No newline at end of file
diff --git a/src/app/routes/insurance-management/components/list/list.component.spec.ts b/src/app/routes/insurance-management/components/list/list.component.spec.ts
deleted file mode 100644
index 1cb2cef1..00000000
--- a/src/app/routes/insurance-management/components/list/list.component.spec.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * @Description :
- * @Version : 1.0
- * @Author : Shiming
- * @Date : 2021-12-06 20:03:28
- * @LastEditors : Shiming
- * @LastEditTime : 2022-01-25 17:22:11
- * @FilePath : \\tms-obc-web\\src\\app\\routes\\insurance-management\\components\\list\\list.component.spec.ts
- * Copyright (C) 2022 huzhenhong. All rights reserved.
- */
-
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-import { insuranceManagementListComponent } from './list.component';
-
-describe('insuranceManagementListComponent', () => {
- let component: insuranceManagementListComponent;
- let fixture: ComponentFixture
+ ![]()
+
+ 暂无停车信息
+
+ ![]()
+
+ 暂无停车信息
+
+ ![]()
+
+ 暂无停车信息
+
+ ![]()
+
+ 暂无停车信息
+
+ ![]()
+
+ 暂无停车信息
+
-
-
-
-
+
+
+
+ -
+
- + 申报 + +
- + 更正 + +
- + 更新数据 + +
+
+
+
+
+
--
+
- + 申报 + +
- + 更正 + +
- + 修改起征点 + +
- + 更新数据 + +
+
+
+
+
+
+
- -
+
- + 上传 + +
- + 撤回 + +
- + 更新数据 + +
- + 税务设置 + +
+
+
+
+
+
+
+
+
+
+
-
+
+
-
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/src/app/routes/usercenter/components/driver/captain/captain.component.less b/src/app/routes/usercenter/components/driver/captain/captain.component.less
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/app/routes/usercenter/components/driver/captain/captain.component.ts b/src/app/routes/usercenter/components/driver/captain/captain.component.ts
index bf8cbf37..d197169b 100644
--- a/src/app/routes/usercenter/components/driver/captain/captain.component.ts
+++ b/src/app/routes/usercenter/components/driver/captain/captain.component.ts
@@ -3,29 +3,39 @@ import { ActivatedRoute, Router } from '@angular/router';
import { STColumn, STColumnBadge, STComponent, STData } from '@delon/abc/st';
import { SFComponent, SFSchema, SFUISchema } from '@delon/form';
import { ModalHelper } from '@delon/theme';
-import { DynamicSettingModalComponent } from '@shared';
+import { DynamicSettingModalComponent, SearchDrawerService } from '@shared';
import { NzModalService } from 'ng-zorro-antd/modal';
+import { BasicTableComponent } from 'src/app/routes/commom';
import { UsermanageService } from '../../../services/usercenter.service';
import { CtcCaptatinAddComponent } from './add/add.component';
@Component({
selector: 'app-usercenter-components-driver-captain',
templateUrl: './captain.component.html',
- styleUrls: ['./captain.component.less']
+ styleUrls: ['../../../../commom/less/commom-table.less']
})
-export class UserCenterComponentsDriverCaptainComponent implements OnInit {
- _$expand = false;
-
- ui: SFUISchema = { '*': { spanLabelFixed: 120, grid: { lg: 8, md: 12, sm: 12, xs: 24 } } };
+export class UserCenterComponentsDriverCaptainComponent extends BasicTableComponent implements OnInit {
schema: SFSchema = this.initSF();
columns: STColumn[] = this.initST();
@ViewChild('st', { static: false }) st!: STComponent;
- @ViewChild('sf', { static: false }) sf!: SFComponent;
@ViewChild('promoterModal', { static: false })
promoterModal!: any;
promotersTelephone = '';
- constructor(public service: UsermanageService, private modal: NzModalService, private router: Router, private ar: ActivatedRoute, private modalHelper: ModalHelper,) {}
+ constructor(
+ public service: UsermanageService,
+ private modal: NzModalService,
+ private router: Router,
+ private ar: ActivatedRoute,
+ private modalHelper: ModalHelper,
+ public searchDrawerService: SearchDrawerService
+ ) {
+ super(searchDrawerService);
+ }
+
+ search() {
+ this.st?.load(1);
+ }
/**
* 查询参数
@@ -98,22 +108,9 @@ export class UserCenterComponentsDriverCaptainComponent implements OnInit {
});
}
- expandToggle() {
- this._$expand = !this._$expand;
- this.sf?.setValue('/expand', this._$expand);
- }
-
- /**
- * 重置表单
- */
- resetSF() {
- this.sf.reset();
- this._$expand = false;
- }
-
exportList() {
const params = this.reqParams;
- this.service.downloadFile(this.service.$api_export_driver_cap, {...params, pageSize: -1});
+ this.service.downloadFile(this.service.$api_export_driver_cap, { ...params, pageSize: -1 });
}
private initSF(): SFSchema {
@@ -146,10 +143,7 @@ export class UserCenterComponentsDriverCaptainComponent implements OnInit {
type: 'string',
maxLength: 11,
ui: {
- placeholder: '请输入',
- visibleIf: {
- expand: (value: boolean) => value
- }
+ placeholder: '请输入'
}
},
identityStatus: {
@@ -163,10 +157,7 @@ export class UserCenterComponentsDriverCaptainComponent implements OnInit {
],
default: '',
ui: {
- widget: 'select',
- visibleIf: {
- expand: (value: boolean) => value
- }
+ widget: 'select'
}
},
source: {
@@ -176,14 +167,11 @@ export class UserCenterComponentsDriverCaptainComponent implements OnInit {
{ label: '全部', value: '' },
{ label: '用户注册', value: 1 },
{ label: '货主添加', value: 2 },
- { label: '运营添加', value: 3 },
+ { label: '运营添加', value: 3 }
],
default: '',
ui: {
- widget: 'select',
- visibleIf: {
- expand: (value: boolean) => value
- }
+ widget: 'select'
}
}
}
@@ -209,7 +197,7 @@ export class UserCenterComponentsDriverCaptainComponent implements OnInit {
}
},
{ title: '推广业务员', className: 'text-center', render: 'promotersTelephone' },
- { title: '注册渠道', className: 'text-center', index: 'source', type: 'enum', enum: { 1: '用户注册', 2: '货主添加' , 3: '运营添加'} },
+ { title: '注册渠道', className: 'text-center', index: 'source', type: 'enum', enum: { 1: '用户注册', 2: '货主添加', 3: '运营添加' } },
{ title: '注册时间', className: 'text-center', index: 'createTime' },
{
title: '操作',
@@ -222,7 +210,7 @@ export class UserCenterComponentsDriverCaptainComponent implements OnInit {
this.router.navigate(['/usercenter/driver/captain/detail', item.appUserId]);
},
acl: { ability: ['USERCENTER-DRIVER-CAPTAIN-view'] }
- },
+ }
// {
// text: '基础设置',
// click: item => this.settingAction(item),
diff --git a/src/app/routes/usercenter/components/driver/detail/detail.component.html b/src/app/routes/usercenter/components/driver/detail/detail.component.html
index 46f78375..9add6b62 100644
--- a/src/app/routes/usercenter/components/driver/detail/detail.component.html
+++ b/src/app/routes/usercenter/components/driver/detail/detail.component.html
@@ -39,10 +39,60 @@
-
-
-
+ -->
+
+
+
diff --git a/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.ts b/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.ts
index 46fe8dcd..70e36b6c 100644
--- a/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.ts
+++ b/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.ts
@@ -2,21 +2,23 @@ import { Component, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute } from '@angular/router';
import { STColumn, STComponent } from '@delon/abc/st';
import { SFComponent, SFSchema } from '@delon/form';
-import { DynamicSettingModalComponent } from '@shared';
+import { DynamicSettingModalComponent, SearchDrawerService } from '@shared';
import { NzModalService } from 'ng-zorro-antd/modal';
+import { BasicTableComponent } from 'src/app/routes/commom';
import { UsermanageService } from '../../../services/usercenter.service';
@Component({
selector: 'app-usercenter-components-driver-config',
templateUrl: './driver-config.component.html',
- styleUrls: ['./driver-config.component.less']
+ styleUrls: ['../../../../commom/less/commom-table.less']
})
-export class UserCenterComponentsDriverConfigComponent implements OnInit {
+export class UserCenterComponentsDriverConfigComponent extends BasicTableComponent implements OnInit {
schema: SFSchema = this.initSF();
columns: STColumn[] = this.initST();
@ViewChild('st', { static: false }) st!: STComponent;
- @ViewChild('sf', { static: false }) sf!: SFComponent;
- constructor(public service: UsermanageService, private modal: NzModalService) {}
+ constructor(public service: UsermanageService, private modal: NzModalService, public searchDrawerService: SearchDrawerService) {
+ super(searchDrawerService);
+ }
/**
* 查询参数
@@ -33,6 +35,10 @@ export class UserCenterComponentsDriverConfigComponent implements OnInit {
ngOnInit() {}
+ search() {
+ this.st?.load(1);
+ }
+
settingAction(item?: any) {
const modal = this.modal.create({
nzTitle: '配置',
@@ -105,7 +111,7 @@ export class UserCenterComponentsDriverConfigComponent implements OnInit {
// { title: '', type: 'checkbox', className: 'text-center' },
{ title: '司机姓名', className: 'text-center', width: '170px', index: 'name' },
{ title: '手机号', className: 'text-center', width: '170px', index: 'mobile' },
- { title: '类型', className: 'text-center', width: '170px',render: 'isCaptain' },
+ { title: '类型', className: 'text-center', width: '170px', render: 'isCaptain' },
{ title: '月承运金额上限（元）', className: 'text-center', width: '200px', render: 'monthFreightAmount' },
{ title: '日提现金额上限（元）', className: 'text-center', width: '200px', render: 'dayWithdrawalAmount' },
{ title: '月提现金额上限（元）', className: 'text-center', width: '200px', render: 'monthWithdrawalAmount' },
diff --git a/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts b/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts
index 9574f30a..b1e3ed5f 100644
--- a/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts
+++ b/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts
@@ -257,7 +257,7 @@ export class FreightConfigComponent extends BasicTableComponent implements OnIni
format: item => `${item.contractSurchargeRatio}%`
},
{
- title: '合同单业务量（万元）',
+ title: '合同单业务量（元）',
index: 'contractQuota',
width: 170,
type: 'widget',
@@ -265,7 +265,7 @@ export class FreightConfigComponent extends BasicTableComponent implements OnIni
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.contractQuota }) }
},
{
- title: '货源单业务量（万元）',
+ title: '货源单业务量（元）',
index: 'goodsQuota',
width: 170,
type: 'widget',
diff --git a/src/app/routes/usercenter/components/freight/list/detail/detail.component.html b/src/app/routes/usercenter/components/freight/list/detail/detail.component.html
index 4449618b..befa6692 100644
--- a/src/app/routes/usercenter/components/freight/list/detail/detail.component.html
+++ b/src/app/routes/usercenter/components/freight/list/detail/detail.component.html
@@ -114,10 +114,11 @@
-
-
-
-
+
+
@@ -159,4 +201,4 @@
已选择
{{ selectedRows.length }} 张发票 发票金额总计
{{totalCallNo }}
清空
+
-
-
-
-
+
+
+
+
+
-
+
+
diff --git a/src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.ts b/src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.ts
index 67a101d4..1984c232 100644
--- a/src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.ts
+++ b/src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.ts
@@ -2,28 +2,34 @@ import { Component, OnInit, ViewChild } from '@angular/core';
import { Router } from '@angular/router';
import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st';
import { SFComponent, SFSchema } from '@delon/form';
+import { SearchDrawerService } from '@shared';
import { NzModalService } from 'ng-zorro-antd/modal';
+import { BasicTableComponent } from 'src/app/routes/commom';
import { TicketService } from '../../services/ticket.service';
import { TransactionDetailsComponent } from './transaction-details/transaction-details.component';
@Component({
selector: 'app-etc-invoiced-list',
templateUrl: './etc-invoiced-list.component.html',
- styleUrls: ['../../../commom/less/box.less']
+ styleUrls: ['../../../commom/less/commom-table.less']
})
-export class ETCInvoicedListComponent implements OnInit {
+export class ETCInvoicedListComponent extends BasicTableComponent implements OnInit {
@ViewChild('st', { static: true })
st!: STComponent;
- @ViewChild('sf', { static: false })
- sf!: SFComponent;
columns: STColumn[] = this.initST();
- searchSchema: SFSchema = this.initSF();
+ schema: SFSchema = this.initSF();
- _$expand = false;
- constructor(public service: TicketService, private nzModalService: NzModalService, private router: Router) {}
+ constructor(public service: TicketService, private nzModalService: NzModalService, public searchDrawerService: SearchDrawerService) {
+ super(searchDrawerService);
+ }
ngOnInit(): void {}
+ search() {
+ this.st?.load(1);
+ }
+
+
beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) {
Object.assign(requestOptions.body, {
@@ -52,22 +58,6 @@ export class ETCInvoicedListComponent implements OnInit {
});
}
- /**
- * 重置表单
- */
- resetSF() {
- this.sf.reset();
- this._$expand = false;
- }
-
- /**
- * 伸缩查询条件
- */
- expandToggle() {
- this._$expand = !this._$expand;
- this.sf?.setValue('/expand', this._$expand);
- }
-
private initSF(): SFSchema {
return {
properties: {
@@ -106,10 +96,7 @@ export class ETCInvoicedListComponent implements OnInit {
ui: {
widget: 'dict-select',
params: { dictKey: 'etc:invoicing:status' },
- placeholder: '请选择',
- visibleIf: {
- expand: (value: boolean) => value
- }
+ placeholder: '请选择'
},
default: ''
},
@@ -122,10 +109,7 @@ export class ETCInvoicedListComponent implements OnInit {
searchDebounceTime: 300,
searchLoadingText: '搜索中...',
allowClear: true,
- onSearch: (q: any) => this.service.getEnterpriceList({ enterpriseName: q }),
- visibleIf: {
- expand: (value: boolean) => value
- }
+ onSearch: (q: any) => this.service.getEnterpriceList({ enterpriseName: q })
}
},
enterpriseInfoId: {
@@ -135,9 +119,6 @@ export class ETCInvoicedListComponent implements OnInit {
widget: 'select',
placeholder: '请选择',
allowClear: true,
- visibleIf: {
- expand: (value: boolean) => value
- },
asyncData: () => this.service.getNetworkFreightForwarder()
},
default: ''
diff --git a/src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.html b/src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.html
index c859f75b..693100db 100644
--- a/src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.html
+++ b/src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.html
@@ -1,17 +1,5 @@
-
-
+
-
+
+
+ [loading]="false" [scroll]="{ x:'1200px',y:scrollY }">
{{item.driverName}}
{{item.driverCellphone}}
diff --git a/src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.ts b/src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.ts
index 9293cf62..4182c025 100644
--- a/src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.ts
+++ b/src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.ts
@@ -1,28 +1,29 @@
-import { Component, OnInit, ViewChild } from '@angular/core';
+import { Component, ViewChild } from '@angular/core';
import { Router } from '@angular/router';
-import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st';
-import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form';
-import { NzModalService } from 'ng-zorro-antd/modal';
+import { STComponent, STColumn, STRequestOptions } from '@delon/abc/st';
+import { SFSchema, SFDateWidgetSchema } from '@delon/form';
+import { SearchDrawerService } from '@shared';
+import { BasicTableComponent } from 'src/app/routes/commom';
import { TicketService } from '../../services/ticket.service';
@Component({
selector: 'app-etc-invoiced-logs',
templateUrl: './etc-invoiced-logs.component.html',
- styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less']
+ styleUrls: ['../../../commom/less/commom-table.less']
})
-export class ETCInvoicedLogsComponent implements OnInit {
+export class ETCInvoicedLogsComponent extends BasicTableComponent {
@ViewChild('st', { static: true })
st!: STComponent;
- @ViewChild('sf', { static: false })
- sf!: SFComponent;
columns: STColumn[] = this.initST();
- searchSchema: SFSchema = this.initSF();
+ schema: SFSchema = this.initSF();
- _$expand = false;
+ constructor(public service: TicketService, private router: Router, public searchDrawerService: SearchDrawerService) {
+ super(searchDrawerService);
+ }
- constructor(public service: TicketService, private nzModalService: NzModalService, private router: Router) {}
-
- ngOnInit(): void {}
+ search() {
+ this.st?.load(1);
+ }
beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) {
@@ -46,22 +47,6 @@ export class ETCInvoicedLogsComponent implements OnInit {
this.router.navigate(['/ticket/invoice-requested-detail/1']);
}
- /**
- * 重置表单
- */
- resetSF() {
- this.sf.reset();
- this._$expand = false;
- }
-
- /**
- * 伸缩查询条件
- */
- expandToggle() {
- this._$expand = !this._$expand;
- this.sf?.setValue('/expand', this._$expand);
- }
-
exportList() {
const params = { listSource: 1, pageSize: -1 };
if (this.sf) {
@@ -107,10 +92,7 @@ export class ETCInvoicedLogsComponent implements OnInit {
type: 'string',
title: '车牌号',
ui: {
- placeholder: '请输入',
- visibleIf: {
- expand: (value: boolean) => value
- }
+ placeholder: '请输入'
}
},
exTime: {
@@ -118,10 +100,7 @@ export class ETCInvoicedLogsComponent implements OnInit {
type: 'string',
ui: {
widget: 'sl-from-to-search',
- format: 'yyyy-MM-dd',
- visibleIf: {
- expand: (value: boolean) => value
- }
+ format: 'yyyy-MM-dd'
} as SFDateWidgetSchema
},
invoiceMakeTime: {
@@ -129,20 +108,14 @@ export class ETCInvoicedLogsComponent implements OnInit {
type: 'string',
ui: {
widget: 'sl-from-to-search',
- format: 'yyyy-MM-dd',
- visibleIf: {
- expand: (value: boolean) => value
- }
+ format: 'yyyy-MM-dd'
} as SFDateWidgetSchema
},
sellerName: {
type: 'string',
title: '销售方',
ui: {
- placeholder: '请输入',
- visibleIf: {
- expand: (value: boolean) => value
- }
+ placeholder: '请输入'
}
},
ltdId: {
@@ -152,9 +125,6 @@ export class ETCInvoicedLogsComponent implements OnInit {
widget: 'select',
placeholder: '请选择',
allowClear: true,
- visibleIf: {
- expand: (value: boolean) => value
- },
asyncData: () => this.service.getNetworkFreightForwarder()
},
default: ''
diff --git a/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.html b/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.html
index afa89459..278e364a 100644
--- a/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.html
+++ b/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.html
@@ -1,14 +1,4 @@
-
-
+
-
+
+
-
\ No newline at end of file
+
diff --git a/src/app/routes/usercenter/components/driver/captain/captain.component.html b/src/app/routes/usercenter/components/driver/captain/captain.component.html
index 35a6123f..d05fe6c7 100644
--- a/src/app/routes/usercenter/components/driver/captain/captain.component.html
+++ b/src/app/routes/usercenter/components/driver/captain/captain.component.html
@@ -1,39 +1,14 @@
-
-
-
- 已选择
- {{ selectedRows.length }} 条数据
- 清空
-
+
+
+
+
+
-
+
+
+
+
+ 已选择
+ {{ selectedRows.length }} 条数据
+ 清空
+
+
+
+
+ -
+
- + 添加 + +
- + 删除 + +
+
+
+
+
+
+
+
+
+
+
+
+ {{item.driverCellphone}}
+
+
-
+
+
+ 已选择
+ {{ selectedRows.length }} 张发票
+ 清空
+
+
+
+
+
+
+ [loading]="false" [scroll]="{ x:'1200px',y:scrollY }" (change)="stChange($event)">
{{item.driverName}}
{{item.driverPhone}}
diff --git a/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.ts b/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.ts
index 2faefd48..c4b41238 100644
--- a/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.ts
+++ b/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.ts
@@ -2,30 +2,32 @@ import { Component, OnInit, ViewChild } from '@angular/core';
import { Router } from '@angular/router';
import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st';
import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form';
+import { SearchDrawerService } from '@shared';
import { NzModalService } from 'ng-zorro-antd/modal';
+import { BasicTableComponent } from 'src/app/routes/commom';
import { TicketService } from '../../services/ticket.service';
@Component({
selector: 'app-etc-invoiced-requested',
templateUrl: './etc-invoiced-requested.component.html',
- styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less']
+ styleUrls: ['../../../commom/less/commom-table.less']
})
-export class ETCInvoicedRequestedComponent implements OnInit {
+export class ETCInvoicedRequestedComponent extends BasicTableComponent {
@ViewChild('st', { static: true })
st!: STComponent;
- @ViewChild('sf', { static: false })
- sf!: SFComponent;
@ViewChild('auditModal', { static: false })
auditModal!: any;
columns: STColumn[] = this.initST();
- searchSchema: SFSchema = this.initSF();
-
- _$expand = false;
+ schema: SFSchema = this.initSF();
selectedRows: any[] = [];
- constructor(public service: TicketService, private nzModalService: NzModalService, private router: Router) {}
+ constructor(public service: TicketService, private nzModalService: NzModalService, public searchDrawerService: SearchDrawerService) {
+ super(searchDrawerService);
+ }
- ngOnInit(): void {}
+ search() {
+ this.st?.load(1);
+ }
beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) {
@@ -68,22 +70,6 @@ export class ETCInvoicedRequestedComponent implements OnInit {
});
}
- /**
- * 重置表单
- */
- resetSF() {
- this.sf.reset();
- this._$expand = false;
- }
-
- /**
- * 伸缩查询条件
- */
- expandToggle() {
- this._$expand = !this._$expand;
- this.sf?.setValue('/expand', this._$expand);
- }
-
private initSF(): SFSchema {
return {
properties: {
@@ -123,9 +109,6 @@ export class ETCInvoicedRequestedComponent implements OnInit {
title: '司机姓名',
ui: {
placeholder: '请输入',
- visibleIf: {
- expand: (value: boolean) => value
- }
}
},
driverPhone: {
@@ -133,9 +116,6 @@ export class ETCInvoicedRequestedComponent implements OnInit {
title: '司机手机',
ui: {
placeholder: '请输入',
- visibleIf: {
- expand: (value: boolean) => value
- }
}
},
licenseCarNo: {
@@ -143,9 +123,6 @@ export class ETCInvoicedRequestedComponent implements OnInit {
title: '车牌号',
ui: {
placeholder: '请输入',
- visibleIf: {
- expand: (value: boolean) => value
- }
}
},
licenseBelonging: {
@@ -153,9 +130,6 @@ export class ETCInvoicedRequestedComponent implements OnInit {
title: '车辆所有人',
ui: {
placeholder: '请输入',
- visibleIf: {
- expand: (value: boolean) => value
- }
}
},
dischargePlace: {
@@ -164,9 +138,6 @@ export class ETCInvoicedRequestedComponent implements OnInit {
ui: {
autocomplete: 'off',
placeholder: '请选择',
- visibleIf: {
- expand: (value: boolean) => value
- }
}
},
loadingPlace: {
@@ -175,9 +146,6 @@ export class ETCInvoicedRequestedComponent implements OnInit {
ui: {
autocomplete: 'off',
placeholder: '请选择',
- visibleIf: {
- expand: (value: boolean) => value
- }
}
},
shipperId: {
@@ -190,9 +158,6 @@ export class ETCInvoicedRequestedComponent implements OnInit {
searchLoadingText: '搜索中...',
allowClear: true,
onSearch: (q: any) => this.service.getEnterpriceList({ enterpriseName: q }),
- visibleIf: {
- expand: (value: boolean) => value
- }
}
},
enterpriseInfoName: {
@@ -202,9 +167,6 @@ export class ETCInvoicedRequestedComponent implements OnInit {
widget: 'select',
placeholder: '请选择',
allowClear: true,
- visibleIf: {
- expand: (value: boolean) => value
- },
asyncData: () => this.service.getNetworkFreightForwarder()
},
default: ''
diff --git a/src/app/routes/ticket-management/components/express-info/express-info.component.html b/src/app/routes/ticket-management/components/express-info/express-info.component.html
index ec192d9d..f7aa3f37 100644
--- a/src/app/routes/ticket-management/components/express-info/express-info.component.html
+++ b/src/app/routes/ticket-management/components/express-info/express-info.component.html
@@ -1,4 +1,4 @@
-
+
-
-
-
+ -->
-
-
+ [loading]="false" [scroll]="{ x: '1200px',y:scrollY }" (change)="stChange($event)">
{{ item.no }}
预览发票
@@ -63,13 +56,13 @@
\ No newline at end of file
diff --git a/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts b/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts
index dd85d9da..2ffb2050 100644
--- a/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts
+++ b/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts
@@ -1,27 +1,24 @@
-import { CurrencyPipe } from '@angular/common';
-import { Component, OnInit, ViewChild } from '@angular/core';
+import { Component, ViewChild } from '@angular/core';
import { Router } from '@angular/router';
import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st';
-import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form';
+import { SFSchema, SFDateWidgetSchema } from '@delon/form';
+import { SearchDrawerService } from '@shared';
import { NzModalService } from 'ng-zorro-antd/modal';
+import { BasicTableComponent } from 'src/app/routes/commom';
import { TicketService } from '../../services/ticket.service';
@Component({
selector: 'app-invoiced-list',
templateUrl: './invoiced-list.component.html',
- styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less']
+ styleUrls: ['../../../commom/less/commom-table.less']
})
-export class InvoicedListComponent implements OnInit {
+export class InvoicedListComponent extends BasicTableComponent {
@ViewChild('st', { static: true })
st!: STComponent;
- @ViewChild('sf', { static: false })
- sf!: SFComponent;
@ViewChild('logosticsLogsModal', { static: false })
logosticsLogsModal!: any;
columns: STColumn[] = this.initST();
- searchSchema: SFSchema = this.initSF();
-
- _$expand = false;
+ schema: SFSchema = this.initSF();
selectedRows: any[] = [];
totalCallNo = 0;
@@ -34,12 +31,21 @@ export class InvoicedListComponent implements OnInit {
@ViewChild('requestedModal', { static: false })
requestedModal!: any;
openInfo: any = { expresscompany: null, expressno: null };
- constructor(public service: TicketService, private nzModalService: NzModalService, private router: Router) {}
+ constructor(
+ public service: TicketService,
+ private nzModalService: NzModalService,
+ private router: Router,
+ public searchDrawerService: SearchDrawerService
+ ) {
+ super(searchDrawerService);
+ }
- ngOnInit(): void {}
+ search() {
+ this.st?.load(1);
+ }
beforeReq = (requestOptions: STRequestOptions) => {
- Object.assign(requestOptions.body,{sts: '3'})
+ Object.assign(requestOptions.body, { sts: '3' });
if (this.sf) {
Object.assign(requestOptions.body, {
...this.sf?.value,
@@ -49,7 +55,7 @@ export class InvoicedListComponent implements OnInit {
}
});
}
- return requestOptions ;
+ return requestOptions;
};
stChange(e: STChange): void {
@@ -167,22 +173,6 @@ export class InvoicedListComponent implements OnInit {
});
}
- /**
- * 重置表单
- */
- resetSF() {
- this.sf.reset();
- this._$expand = false;
- }
-
- /**
- * 伸缩查询条件
- */
- expandToggle() {
- this._$expand = !this._$expand;
- this.sf?.setValue('/expand', this._$expand);
- }
-
private initSF(): SFSchema {
return {
properties: {
@@ -220,20 +210,14 @@ export class InvoicedListComponent implements OnInit {
widget: 'sl-from-to-search',
format: 'yyyy-MM-dd',
placeholder: '请选择',
- nzShowTime: true,
- visibleIf: {
- expand: (value: boolean) => value
- }
+ nzShowTime: true
} as SFDateWidgetSchema
},
artoname: {
type: 'string',
title: '购买人',
ui: {
- placeholder: '请输入',
- visibleIf: {
- expand: (value: boolean) => value
- }
+ placeholder: '请输入'
}
},
ltdId: {
@@ -243,9 +227,6 @@ export class InvoicedListComponent implements OnInit {
widget: 'select',
placeholder: '请选择',
allowClear: true,
- visibleIf: {
- expand: (value: boolean) => value
- },
asyncData: () => this.service.getNetworkFreightForwarder({}, true)
},
default: ''
@@ -254,10 +235,7 @@ export class InvoicedListComponent implements OnInit {
type: 'string',
title: '分票编号',
ui: {
- placeholder: '请输入',
- visibleIf: {
- expand: (value: boolean) => value
- }
+ placeholder: '请输入'
}
},
invoicetype: {
@@ -269,10 +247,7 @@ export class InvoicedListComponent implements OnInit {
],
ui: {
widget: 'select',
- placeholder: '请选择',
- visibleIf: {
- expand: (value: boolean) => value
- }
+ placeholder: '请选择'
},
default: ''
}
diff --git a/src/app/routes/usercenter/components/driver/captain/captain-detail/captain-detail.component.html b/src/app/routes/usercenter/components/driver/captain/captain-detail/captain-detail.component.html
index 0e8b40a9..bbc32cbc 100644
--- a/src/app/routes/usercenter/components/driver/captain/captain-detail/captain-detail.component.html
+++ b/src/app/routes/usercenter/components/driver/captain/captain-detail/captain-detail.component.html
@@ -36,10 +36,39 @@
-
-
- 银行结算信息（暂无银行信息）
-
-
- {{ item.bankName }}
-
-
- {{ item?.bankCardNumber }}
-
-
+
@@ -147,4 +185,4 @@
{{item.driverPhone}}
-
+
+
\ No newline at end of file
diff --git a/src/app/routes/ticket-management/components/express-info/express-info.component.ts b/src/app/routes/ticket-management/components/express-info/express-info.component.ts
index 1cbf2974..5d1cfa5f 100644
--- a/src/app/routes/ticket-management/components/express-info/express-info.component.ts
+++ b/src/app/routes/ticket-management/components/express-info/express-info.component.ts
@@ -1,34 +1,24 @@
-/*
- * @Description :
- * @Version : 1.0
- * @Author : Shiming
- * @Date : 2022-04-28 20:27:22
- * @LastEditors : Shiming
- * @LastEditTime : 2022-04-29 14:14:59
- * @FilePath : \\tms-obc-web\\src\\app\\routes\\ticket-management\\components\\express-info\\express-info.component.ts
- * Copyright (C) 2022 huzhenhong. All rights reserved.
- */
import { Component, OnInit, ViewChild } from '@angular/core';
import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st';
import { SFComponent, SFDateWidgetSchema, SFSchema } from '@delon/form';
+import { SearchDrawerService } from '@shared';
import { NzModalService } from 'ng-zorro-antd/modal';
+import { BasicTableComponent } from 'src/app/routes/commom';
import { TicketService } from '../../services/ticket.service';
import { ExpressDetailModalComponent } from './express-detail-modal/express-detail-modal.component';
@Component({
selector: 'app-express-info',
templateUrl: './express-info.component.html',
- styleUrls: ['../../../commom/less/box.less']
+ styleUrls: ['../../../commom/less/commom-table.less']
})
-export class ExpressInfoComponent implements OnInit {
+export class ExpressInfoComponent extends BasicTableComponent {
@ViewChild('st', { static: true })
st!: STComponent;
- @ViewChild('sf', { static: false })
- sf!: SFComponent;
url = `/api/fcc/ficoExpressH/getListPage`;
- searchSchema: SFSchema = {
+ schema: SFSchema = {
properties: {
expressCode: {
title: '快递单号',
@@ -88,12 +78,16 @@ export class ExpressInfoComponent implements OnInit {
selectedRows: any[] = [];
- reqParams = { pageIndex: 1, pageSize: 10 };
-
- constructor(public service: TicketService, private nzModalService: NzModalService) {}
+ constructor(public service: TicketService, private nzModalService: NzModalService, public searchDrawerService: SearchDrawerService) {
+ super(searchDrawerService);
+ }
ngOnInit(): void {}
+ search() {
+ this.st?.load(1);
+ }
+
beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) {
Object.assign(requestOptions.body, {
@@ -162,10 +156,4 @@ export class ExpressInfoComponent implements OnInit {
}
});
}
- /**
- * 重置表单
- */
- resetSF() {
- this.sf.reset();
- }
}
diff --git a/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.html b/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.html
index d016b77f..42c83821 100644
--- a/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.html
+++ b/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.html
@@ -1,4 +1,4 @@
-
+
-
+
+
-
+
+
-
+
+
+
+
+
-
+
+
+ 已选择
+ {{ selectedRows.length }} 张发票
+ 清空
+
+
+
+
+
-
+
+ [loading]="false" [scroll]="{ x:'1200px',y:scrollY }" (change)="stChange($event)">
\ No newline at end of file
diff --git a/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.ts b/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.ts
index 54322cb9..f5c9dd9a 100644
--- a/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.ts
+++ b/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.ts
@@ -1,32 +1,39 @@
-import { Component, OnInit, ViewChild } from '@angular/core';
+import { Component, ViewChild } from '@angular/core';
import { Router } from '@angular/router';
import { STComponent, STColumn, STRequestOptions, STChange } from '@delon/abc/st';
-import { SFComponent, SFDateWidgetSchema, SFSchema } from '@delon/form';
+import { SFDateWidgetSchema, SFSchema } from '@delon/form';
+import { SearchDrawerService } from '@shared';
import { NzModalService } from 'ng-zorro-antd/modal';
+import { BasicTableComponent } from 'src/app/routes/commom';
import { TicketService } from '../../services/ticket.service';
import { AddCollectionInvoiceModalComponent } from './add-collection-invoice-modal/add-collection-invoice-modal.component';
@Component({
selector: 'app-input-invoice',
templateUrl: './input-invoice.component.html',
- styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less']
+ styleUrls: ['../../../commom/less/commom-table.less']
})
-export class InputInvoiceComponent implements OnInit {
+export class InputInvoiceComponent extends BasicTableComponent {
@ViewChild('st', { static: true })
st!: STComponent;
- @ViewChild('sf', { static: false })
- sf!: SFComponent;
@ViewChild('auditModal', { static: false })
auditModal!: any;
columns: STColumn[] = this.initST();
- searchSchema: SFSchema = this.initSF();
-
- _$expand = false;
+ schema: SFSchema = this.initSF();
selectedRows: any[] = [];
- constructor(public service: TicketService, private nzModalService: NzModalService, private router: Router) {}
+ constructor(
+ public service: TicketService,
+ private nzModalService: NzModalService,
+ private router: Router,
+ public searchDrawerService: SearchDrawerService
+ ) {
+ super(searchDrawerService);
+ }
- ngOnInit(): void {}
+ search() {
+ this.st?.load(1);
+ }
beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) {
@@ -66,22 +73,6 @@ export class InputInvoiceComponent implements OnInit {
});
}
- /**
- * 重置表单
- */
- resetSF() {
- this.sf.reset();
- this._$expand = false;
- }
-
- /**
- * 伸缩查询条件
- */
- expandToggle() {
- this._$expand = !this._$expand;
- this.sf?.setValue('/expand', this._$expand);
- }
-
private initSF(): SFSchema {
return {
properties: {
@@ -127,10 +118,7 @@ export class InputInvoiceComponent implements OnInit {
],
ui: {
widget: 'select',
- placeholder: '请选择',
- visibleIf: {
- expand: (value: boolean) => value
- }
+ placeholder: '请选择'
},
default: ''
},
@@ -141,10 +129,7 @@ export class InputInvoiceComponent implements OnInit {
widget: 'select',
placeholder: '请选择',
allowClear: true,
- asyncData: () => this.service.getCRMCustomerId(),
- visibleIf: {
- expand: (value: boolean) => value
- }
+ asyncData: () => this.service.getCRMCustomerId()
}
},
createtime: {
@@ -152,10 +137,7 @@ export class InputInvoiceComponent implements OnInit {
type: 'string',
ui: {
widget: 'sl-from-to-search',
- format: 'yyyy-MM-dd',
- visibleIf: {
- expand: (value: boolean) => value
- }
+ format: 'yyyy-MM-dd'
} as SFDateWidgetSchema
},
sts: {
@@ -168,10 +150,7 @@ export class InputInvoiceComponent implements OnInit {
],
ui: {
widget: 'select',
- placeholder: '请选择',
- visibleIf: {
- expand: (value: boolean) => value
- }
+ placeholder: '请选择'
},
default: ''
},
@@ -180,40 +159,28 @@ export class InputInvoiceComponent implements OnInit {
title: '发票日期',
ui: {
widget: 'sl-from-to-search',
- format: 'yyyy-MM-dd',
- visibleIf: {
- expand: (value: boolean) => value
- }
+ format: 'yyyy-MM-dd'
}
},
remarks: {
type: 'string',
title: '收票备注',
ui: {
- placeholder: '请输入',
- visibleIf: {
- expand: (value: boolean) => value
- }
+ placeholder: '请输入'
}
},
billCode: {
type: 'string',
title: '订单号',
ui: {
- placeholder: '请输入',
- visibleIf: {
- expand: (value: boolean) => value
- }
+ placeholder: '请输入'
}
},
feecode: {
type: 'string',
title: '费用号',
ui: {
- placeholder: '请输入',
- visibleIf: {
- expand: (value: boolean) => value
- }
+ placeholder: '请输入'
}
}
}
diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html
index f88880f2..2badcf22 100644
--- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html
+++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html
@@ -1,16 +1,4 @@
-
-
-
-
+
+
+
-
-
-
+
+ [page]="{}" [res]="{ process: afterRes }" [loading]="false" [scroll]="{ x: '1200px',y:scrollY }" (change)="stChange($event)">
{{ item.vatappcode }}
diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.less b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.less deleted file mode 100644 index 370d3cae..00000000 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.less +++ /dev/null @@ -1,7 +0,0 @@ -:host::ng-deep { - - .ant-tabs-tab-btn { - padding-left : 16px; - padding-right: 16px; - } -} \ No newline at end of file diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts index cce37763..ad4c620e 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts @@ -1,11 +1,11 @@ -import { query } from '@angular/animations'; -import { CurrencyPipe } from '@angular/common'; import { Component, ViewChild } from '@angular/core'; import { Router } from '@angular/router'; import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st'; -import { SFComponent, SFSchema, SFDateWidgetSchema, SFUISchema } from '@delon/form'; +import { SFSchema, SFDateWidgetSchema } from '@delon/form'; +import { SearchDrawerService } from '@shared'; import { NzModalService } from 'ng-zorro-antd/modal'; import { delay } from 'rxjs/operators'; +import { BasicTableComponent } from 'src/app/routes/commom'; import { TicketService } from '../../services/ticket.service'; import { PrintOrderModalComponent } from './print-order-modal/print-order-modal.component'; @@ -15,26 +15,33 @@ import { UpdateAddressModalComponent } from './update-address-modal/update-addre @Component({ selector: 'app-invoice-requested', templateUrl: './invoice-requested.component.html', - styleUrls: ['./invoice-requested.component.less', '../../../commom/less/box.less'] + styleUrls: ['../../../commom/less/commom-table.less'] }) -export class InvoiceRequestedComponent { +export class InvoiceRequestedComponent extends BasicTableComponent { @ViewChild('st', { static: true }) st!: STComponent; - @ViewChild('sf', { static: false }) - sf!: SFComponent; @ViewChild('rejectModal', { static: false }) rejectModal!: any; resourceStatus: any = '1'; columns: STColumn[] = this.initST(); - searchSchema: SFSchema = this.initSF(); - - _$expand = false; + schema: SFSchema = this.initSF(); totalCallNo = 0; selectedRows: any[] = []; rejectReason = ''; - constructor(public service: TicketService, private nzModalService: NzModalService, private router: Router) {} + constructor( + public service: TicketService, + private nzModalService: NzModalService, + private router: Router, + public searchDrawerService: SearchDrawerService + ) { + super(searchDrawerService); + } + + search() { + this.st?.load(1); + } beforeReq = (requestOptions: STRequestOptions) => { if (this.resourceStatus) { @@ -300,22 +307,6 @@ export class InvoiceRequestedComponent { } } - /** - * 重置表单 - */ - resetSF() { - this.sf.reset(); - this._$expand = false; - } - - /** - * 伸缩查询条件 - */ - expandToggle() { - this._$expand = !this._$expand; - this.sf?.setValue('/expand', this._$expand); - } - // 导出 exprot() { this.service.exportStart({ ...this.sf?.value, pageSize: -1 }, this.service.$api_export_invoice_requested_page); @@ -357,9 +348,6 @@ export class InvoiceRequestedComponent { default: '', ui: { widget: 'select', - visibleIf: { - expand: (value: boolean) => value - }, asyncData: () => this.service.getEnterpriseProject() } }, @@ -369,9 +357,6 @@ export class InvoiceRequestedComponent { ui: { widget: 'select', placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value - }, allowClear: true, asyncData: () => this.service.getNetworkFreightForwarder() }, @@ -379,12 +364,7 @@ export class InvoiceRequestedComponent { }, otherremarks: { type: 'string', - title: '其他需求', - ui: { - visibleIf: { - expand: (value: boolean) => value - } - } + title: '其他需求' }, createTime: { title: '申请时间', @@ -393,10 +373,7 @@ export class InvoiceRequestedComponent { widget: 'sl-from-to-search', format: 'yyyy-MM-dd', placeholder: '请选择', - nzShowTime: true, - visibleIf: { - expand: (value: boolean) => value - } + nzShowTime: true } as SFDateWidgetSchema }, isdetail: { @@ -409,10 +386,7 @@ export class InvoiceRequestedComponent { ], ui: { widget: 'select', - placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value - } + placeholder: '请选择' }, default: '' }, @@ -425,10 +399,7 @@ export class InvoiceRequestedComponent { searchDebounceTime: 300, searchLoadingText: '搜索中...', allowClear: true, - onSearch: (q: any) => this.service.getEnterpriceList({ enterpriseName: q }), - visibleIf: { - expand: (value: boolean) => value - } + onSearch: (q: any) => this.service.getEnterpriceList({ enterpriseName: q }) } } } diff --git a/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.html b/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.html index 1dff8e97..0514aa52 100644 --- a/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.html +++ b/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.html @@ -1,14 +1,4 @@ - -
+
+
+
+
+
-
已选择
@@ -47,17 +40,35 @@
{{ totalCallNo }}
清空
-
-
-
-
+
+
+
+ -
+
- + 批量受理 + +
- + 驳回 + +
- + 修改地址 + +
- + 快递下单 + +
diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.less b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.less deleted file mode 100644 index 370d3cae..00000000 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.less +++ /dev/null @@ -1,7 +0,0 @@ -:host::ng-deep { - - .ant-tabs-tab-btn { - padding-left : 16px; - padding-right: 16px; - } -} \ No newline at end of file diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts index cce37763..ad4c620e 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts @@ -1,11 +1,11 @@ -import { query } from '@angular/animations'; -import { CurrencyPipe } from '@angular/common'; import { Component, ViewChild } from '@angular/core'; import { Router } from '@angular/router'; import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st'; -import { SFComponent, SFSchema, SFDateWidgetSchema, SFUISchema } from '@delon/form'; +import { SFSchema, SFDateWidgetSchema } from '@delon/form'; +import { SearchDrawerService } from '@shared'; import { NzModalService } from 'ng-zorro-antd/modal'; import { delay } from 'rxjs/operators'; +import { BasicTableComponent } from 'src/app/routes/commom'; import { TicketService } from '../../services/ticket.service'; import { PrintOrderModalComponent } from './print-order-modal/print-order-modal.component'; @@ -15,26 +15,33 @@ import { UpdateAddressModalComponent } from './update-address-modal/update-addre @Component({ selector: 'app-invoice-requested', templateUrl: './invoice-requested.component.html', - styleUrls: ['./invoice-requested.component.less', '../../../commom/less/box.less'] + styleUrls: ['../../../commom/less/commom-table.less'] }) -export class InvoiceRequestedComponent { +export class InvoiceRequestedComponent extends BasicTableComponent { @ViewChild('st', { static: true }) st!: STComponent; - @ViewChild('sf', { static: false }) - sf!: SFComponent; @ViewChild('rejectModal', { static: false }) rejectModal!: any; resourceStatus: any = '1'; columns: STColumn[] = this.initST(); - searchSchema: SFSchema = this.initSF(); - - _$expand = false; + schema: SFSchema = this.initSF(); totalCallNo = 0; selectedRows: any[] = []; rejectReason = ''; - constructor(public service: TicketService, private nzModalService: NzModalService, private router: Router) {} + constructor( + public service: TicketService, + private nzModalService: NzModalService, + private router: Router, + public searchDrawerService: SearchDrawerService + ) { + super(searchDrawerService); + } + + search() { + this.st?.load(1); + } beforeReq = (requestOptions: STRequestOptions) => { if (this.resourceStatus) { @@ -300,22 +307,6 @@ export class InvoiceRequestedComponent { } } - /** - * 重置表单 - */ - resetSF() { - this.sf.reset(); - this._$expand = false; - } - - /** - * 伸缩查询条件 - */ - expandToggle() { - this._$expand = !this._$expand; - this.sf?.setValue('/expand', this._$expand); - } - // 导出 exprot() { this.service.exportStart({ ...this.sf?.value, pageSize: -1 }, this.service.$api_export_invoice_requested_page); @@ -357,9 +348,6 @@ export class InvoiceRequestedComponent { default: '', ui: { widget: 'select', - visibleIf: { - expand: (value: boolean) => value - }, asyncData: () => this.service.getEnterpriseProject() } }, @@ -369,9 +357,6 @@ export class InvoiceRequestedComponent { ui: { widget: 'select', placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value - }, allowClear: true, asyncData: () => this.service.getNetworkFreightForwarder() }, @@ -379,12 +364,7 @@ export class InvoiceRequestedComponent { }, otherremarks: { type: 'string', - title: '其他需求', - ui: { - visibleIf: { - expand: (value: boolean) => value - } - } + title: '其他需求' }, createTime: { title: '申请时间', @@ -393,10 +373,7 @@ export class InvoiceRequestedComponent { widget: 'sl-from-to-search', format: 'yyyy-MM-dd', placeholder: '请选择', - nzShowTime: true, - visibleIf: { - expand: (value: boolean) => value - } + nzShowTime: true } as SFDateWidgetSchema }, isdetail: { @@ -409,10 +386,7 @@ export class InvoiceRequestedComponent { ], ui: { widget: 'select', - placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value - } + placeholder: '请选择' }, default: '' }, @@ -425,10 +399,7 @@ export class InvoiceRequestedComponent { searchDebounceTime: 300, searchLoadingText: '搜索中...', allowClear: true, - onSearch: (q: any) => this.service.getEnterpriceList({ enterpriseName: q }), - visibleIf: { - expand: (value: boolean) => value - } + onSearch: (q: any) => this.service.getEnterpriceList({ enterpriseName: q }) } } } diff --git a/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.html b/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.html index 1dff8e97..0514aa52 100644 --- a/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.html +++ b/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.html @@ -1,14 +1,4 @@ - -
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
- 个人信息
+
+
-
-
-
+
+
-
- 个人信息
+
+
-
\ No newline at end of file
+
diff --git a/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.html b/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.html
index b98f1832..e0a9e0d7 100644
--- a/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.html
+++ b/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.html
@@ -1,16 +1,5 @@
-
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
- 驾驶证信息
+
- 载具信息
-
-
- {{ carDatail?.carNo }}
-
-
- {{ carDatail?.carNoColorLabel }}
-
-
- {{ carDatail?.carModelLabel }}
-
-
- {{ carDatail?.carLengthLabel ? carDatail?.carLengthLabel +'米' :'' }}
-
-
- {{ carDatail?.isDefault?'是':'否' }}
-
-
- {{ carDatail?.isSelf?'否':'是' }}
-
-
-
-
-
-
-
-
-
-
+
- 银行结算信息 （暂无银行信息）
-
-
-
- {{ item.bankName }}
-
-
- {{ item?.bankCardNumber }}
-
-
-
-
-
- 服务评级
+
+
-
- 关联企业
+
@@ -383,4 +499,4 @@
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
- {{driverDetail.signingOrganization}}
-
-
-
-
-
-
-
-
-
+
+
+
+
+ {{driverDetail.signingOrganization}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ carDatail?.carNo }}
+
+
+ {{ carDatail?.carNoColorLabel }}
+
+
+ {{ carDatail?.carModelLabel }}
+
+
+ {{ carDatail?.carLengthLabel ? carDatail?.carLengthLabel +'米' :'' }}
+
+
+ {{ carDatail?.isDefault?'是':'否' }}
+
+
+ {{ carDatail?.isSelf?'否':'是' }}
+
+
+
+
+
+
+
+
+
+
-
+
+
-
+
+
-
+
+
+
+ {{item?.monthFreightAmount | currency}}
+
- 关联企业
+
+
+
+
+
+
+
+
+ 企业基本信息
@@ -130,251 +131,296 @@
-
-
-
-
-
- {{detailData.enterpriseName}}
-
-
-
-
-
-
-
- {{detailData.unifiedSocialCreditCode}}
-
-
-
-
+
+
+
+
+
+ {{detailData.enterpriseName}}
+
+
+
+
+
+
+
+ {{detailData.unifiedSocialCreditCode}}
+
+
+
+
-
-
-
-
-
-
-
-
- {{detailData?.registrationCapital}}
-
- 万元
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
- {{ detailData?.fullRegionVO?.provinceName }}{{ detailData?.fullRegionVO?.cityName }}{{
- detailData?.fullRegionVO?.areaName }}
-
-
-
-
-
-
-
- {{ detailData?.fullRegionVO?.provinceName }}{{
- detailData?.fullRegionVO?.cityName }}{{
- detailData?.fullRegionVO?.areaName }}{{detailData.enterpriseAddress}}
-
-
-
-
-
+
+
+
+
+
+ {{detailData?.registrationCapital}}
+
+ 万元
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ detailData?.fullRegionVO?.provinceName }}{{ detailData?.fullRegionVO?.cityName }}{{
+ detailData?.fullRegionVO?.areaName }}
+
+
+
+
+
+
+
+ {{ detailData?.fullRegionVO?.provinceName }}{{
+ detailData?.fullRegionVO?.cityName }}{{
+ detailData?.fullRegionVO?.areaName }}{{detailData.enterpriseAddress}}
+
+
+
+
+
+
+
+ {{detailData.businessScope}}
+
+
+
+
-
-
- {{detailData.businessScope}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 法人信息
+
+
+
+
+
+
+
+
+
+
+
+ - 四要素验证： - - - -
- -+ 四要素验证： + + + +
+ +
+
- 企业管理员信息
+
+
+
+
+
+
+
+ 法人信息
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+ *ngIf="!isEdit && !detailData?.legalPersonIdentityVO?.validEndTime && detailData.legalPersonIdentityVO.validStartTime">
+
-
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+
-
+
+
+
+
-
-
-
-
+
+ 企业管理员信息
-
-
-
-
-
- {{detailData.adminUserInfo?.mobile}}
-
-
-
-
-
-
-
-
-
- 企业开票信息
-
-
-
-
-
- {{detailData.createBank}}
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
- {{detailData.registerAddress}}
-
-
-
-
- 服务评级
+
+
+ {{detailData.adminUserInfo?.mobile}}
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{detailData.createBank}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{detailData.registerAddress}}
+
+
+
+
+
+
+
+
+
+
+
+
-
diff --git a/src/app/routes/usercenter/components/freight/user/user.component.less b/src/app/routes/usercenter/components/freight/user/user.component.less
deleted file mode 100644
index 6bcd149d..00000000
--- a/src/app/routes/usercenter/components/freight/user/user.component.less
+++ /dev/null
@@ -1,12 +0,0 @@
-:host::ng-deep {
-
- nz-range-picker {
- width: 100%;
- }
-
- .content-box {
- .ant-card-body {
- padding-top: 6px;
- }
- }
-}
\ No newline at end of file
diff --git a/src/app/routes/usercenter/components/freight/user/user.component.ts b/src/app/routes/usercenter/components/freight/user/user.component.ts
index 0b92249e..58e2f015 100644
--- a/src/app/routes/usercenter/components/freight/user/user.component.ts
+++ b/src/app/routes/usercenter/components/freight/user/user.component.ts
@@ -22,7 +22,11 @@ export class FreightComponentsUserComponent extends BasicTableComponent implemen
resourceStatus: any = 0;
- constructor(public service: UsermanageService, private modal: NzModalService, private router: Router, private ar: ActivatedRoute,
+ constructor(
+ public service: UsermanageService,
+ private modal: NzModalService,
+ private router: Router,
+ private ar: ActivatedRoute,
public searchDrawerService: SearchDrawerService
) {
super(searchDrawerService);
@@ -32,7 +36,6 @@ export class FreightComponentsUserComponent extends BasicTableComponent implemen
this.st?.load(1);
}
-
ngOnInit() {
this.ar.url.subscribe(params => {
this.st?.load(1);
@@ -114,6 +117,16 @@ export class FreightComponentsUserComponent extends BasicTableComponent implemen
});
}
+ exportList() {
+ const params = { certificationStatus: this.resourceStatus, pageSize: -1 };
+ if (this.sf) {
+ Object.assign(params, {
+ ...this.sf?.value
+ });
+ }
+ this.service.downloadFile(this.service.$api_get_user_list_export, params);
+ }
+
private initSF(): SFSchema {
return {
properties: {
@@ -157,7 +170,7 @@ export class FreightComponentsUserComponent extends BasicTableComponent implemen
],
default: '',
ui: {
- widget: 'select',
+ widget: 'select'
}
},
promotersTelephone: {
@@ -165,7 +178,7 @@ export class FreightComponentsUserComponent extends BasicTableComponent implemen
type: 'string',
maxLength: 11,
ui: {
- placeholder: '请输入手机号',
+ placeholder: '请输入手机号'
}
},
effectiveDate: {
@@ -174,7 +187,7 @@ export class FreightComponentsUserComponent extends BasicTableComponent implemen
ui: {
widget: 'date',
mode: 'range',
- format: 'yyyy-MM-dd',
+ format: 'yyyy-MM-dd'
} as SFDateWidgetSchema
}
}
@@ -212,19 +225,19 @@ export class FreightComponentsUserComponent extends BasicTableComponent implemen
click: (item: any) => {
this.router.navigate(['./view', item.appUserId], { relativeTo: this.ar });
},
- acl: { ability: ['USERCENTER-FREIGHT-USER-view'] },
+ acl: { ability: ['USERCENTER-FREIGHT-USER-view'] }
},
{
text: '冻结',
iif: item => item.stateLocked === 0,
click: (item: any) => this.userAction(0, [item.appUserId]),
- acl: { ability: ['USERCENTER-FREIGHT-USER-lock'] },
+ acl: { ability: ['USERCENTER-FREIGHT-USER-lock'] }
},
{
text: '启用',
iif: item => item.stateLocked === 1,
click: (item: any) => this.userAction(1, [item.appUserId]),
- acl: { ability: ['USERCENTER-FREIGHT-USER-lock'] },
+ acl: { ability: ['USERCENTER-FREIGHT-USER-lock'] }
}
]
}
diff --git a/src/app/routes/usercenter/services/usercenter.service.ts b/src/app/routes/usercenter/services/usercenter.service.ts
index 7dd0d387..3eb93f75 100644
--- a/src/app/routes/usercenter/services/usercenter.service.ts
+++ b/src/app/routes/usercenter/services/usercenter.service.ts
@@ -49,6 +49,8 @@ export class UsermanageService extends ShipperBaseService {
// 货主员工列表(运营后台)
$api_get_user_list = '/api/mdc/cuc/userApp/getShipperUserInfoList';
+ // 货主员工列表导出(运营后台-企业项目维度)
+ $api_get_user_list_export = '/api/mdc/cuc/userApp/shipperUserInfoExport';
// 冻结或恢复员工
$api_lock_staff = '/api/mdc/cuc/userApp/freezeOrResumeStaff';
// 冻结或恢复应用用户
diff --git a/src/app/routes/vehicle/components/audit/audit.component.html b/src/app/routes/vehicle/components/audit/audit.component.html
index 34452531..ef3e82a6 100644
--- a/src/app/routes/vehicle/components/audit/audit.component.html
+++ b/src/app/routes/vehicle/components/audit/audit.component.html
@@ -1,26 +1,6 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+ {{item?.carModel}}-{{item?.carLengthLabel? item?.carLengthLabel + '米' : ''}}-{{ item?.carLoad?
item?.carLoad + '吨' : ''}}
@@ -69,11 +62,4 @@
车牌号66：{{ detailData?.carNo }}
+ 车牌号：{{ detailData?.carNo }}
-
-
-
+ -->
+
+
+
+
+
+
+
+
-
+
- {{ item?.carModelLabel }}-{{ item?.carLengthLabel ? item?.carLengthLabel + '米' : '' }}-{{
+ {{ item?.carModel ? item?.carModel + '-' : ''}}{{ item?.carLengthLabel ? item?.carLengthLabel + '米' : '' }}-{{
item?.carLoad ? item?.carLoad + '吨' : ''
}}
diff --git a/src/app/routes/vehicle/components/list/list.component.ts b/src/app/routes/vehicle/components/list/list.component.ts
index 04a43d76..96e68569 100644
--- a/src/app/routes/vehicle/components/list/list.component.ts
+++ b/src/app/routes/vehicle/components/list/list.component.ts
@@ -1,25 +1,29 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { STColumn, STComponent, STData } from '@delon/abc/st';
-import { SFComponent, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
-import { NzModalService } from 'ng-zorro-antd/modal';
+import { SFSchemaEnum, SFSelectWidgetSchema } from '@delon/form';
+import { SearchDrawerService } from '@shared';
import { of } from 'rxjs';
import { map } from 'rxjs/operators';
+import { BasicTableComponent } from 'src/app/routes/commom';
import { VehicleService } from '../../../vehicle/services/vehicle.service';
@Component({
selector: 'app-Vehicle-components-list',
- templateUrl: './list.component.html'
+ templateUrl: './list.component.html',
+ styleUrls: ['../../../commom/less/commom-table.less']
})
-export class VehicleComponentsListComponent implements OnInit {
- _$expand = false;
-
- ui!: SFUISchema;
- schema!: SFSchema;
+export class VehicleComponentsListComponent extends BasicTableComponent implements OnInit {
columns!: STColumn[];
@ViewChild('st', { static: false }) st!: STComponent;
- @ViewChild('sf', { static: false }) sf!: SFComponent;
- constructor(public service: VehicleService, private modal: NzModalService, private router: Router, private ar: ActivatedRoute) {}
+ constructor(
+ public service: VehicleService,
+ private router: Router,
+ private ar: ActivatedRoute,
+ public searchDrawerService: SearchDrawerService
+ ) {
+ super(searchDrawerService);
+ }
/**
* 查询参数
@@ -37,6 +41,10 @@ export class VehicleComponentsListComponent implements OnInit {
return params;
}
+ search() {
+ this.st?.load(1);
+ }
+
ngOnInit() {
this.initSF();
this.initST();
@@ -109,10 +117,7 @@ export class VehicleComponentsListComponent implements OnInit {
ui: {
widget: 'dict-select',
params: { dictKey: 'car:model' },
- containsAllLabel: true,
- visibleIf: {
- expand: (value: boolean) => value
- }
+ containsAllLabel: true
}
},
carLength: {
@@ -121,20 +126,12 @@ export class VehicleComponentsListComponent implements OnInit {
ui: {
widget: 'dict-select',
params: { dictKey: 'car:length' },
- containsAllLabel: true,
- visibleIf: {
- expand: (value: boolean) => value
- }
+ containsAllLabel: true
}
},
carLoad: {
title: '载重',
- type: 'string',
- ui: {
- visibleIf: {
- expand: (value: boolean) => value
- }
- }
+ type: 'string'
},
isSelf: {
type: 'string',
@@ -145,10 +142,7 @@ export class VehicleComponentsListComponent implements OnInit {
],
ui: {
widget: 'select',
- allowClear: true,
- visibleIf: {
- expand: (value: boolean) => value
- }
+ allowClear: true
}
},
driverLicenseStatus: {
@@ -162,10 +156,7 @@ export class VehicleComponentsListComponent implements OnInit {
default: '',
ui: {
widget: 'select',
- allowClear: true,
- visibleIf: {
- expand: (value: boolean) => value
- }
+ allowClear: true
}
},
roadTransportStatus: {
@@ -178,12 +169,9 @@ export class VehicleComponentsListComponent implements OnInit {
],
ui: {
widget: 'select',
- allowClear: true,
- visibleIf: {
- expand: (value: boolean) => value
- }
+ allowClear: true
}
- },
+ }
// isSelfs: {
// type: 'string',
// title: '是否入网',
@@ -216,7 +204,6 @@ export class VehicleComponentsListComponent implements OnInit {
// },
}
};
- this.ui = { '*': { spanLabelFixed: 130, grid: { span: 8, gutter: 4 }, enter: () => this.st.load() } };
}
initST() {
@@ -292,20 +279,9 @@ export class VehicleComponentsListComponent implements OnInit {
}
];
}
- expandToggle() {
- this._$expand = !this._$expand;
- this.sf?.setValue('/expand', this._$expand);
- }
creat() {
this.router.navigate(['./new'], { relativeTo: this.ar });
}
- /**
- * 重置表单
- */
- resetSF() {
- this.sf.reset();
- this._$expand = false;
- }
// 导出
exportFire() {
let params = Object.assign({}, this.reqParams || {});
diff --git a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html
index c62d42f6..580a0c64 100644
--- a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html
+++ b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html
@@ -274,8 +274,14 @@
-
+
+
+ ![]()
+
+ 暂无停车信息
+
diff --git a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html
index 8174c36f..e73b0c90 100644
--- a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html
+++ b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html
@@ -1,7 +1,7 @@
+
+
-
+
+
+
+ {{ item?.carModelLabel }}-{{ item?.carLengthLabel ? item?.carLengthLabel + '米' : '' }}-{{
+
-
+
+
diff --git a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html
index 8174c36f..e73b0c90 100644
--- a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html
+++ b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html
@@ -1,7 +1,7 @@
{{ item?.carModel ? item?.carModel + '-' : ''}}{{ item?.carLengthLabel ? item?.carLengthLabel + '米' : '' }}-{{
item?.carLoad ? item?.carLoad + '吨' : ''
}}
diff --git a/src/app/routes/vehicle/components/list/list.component.ts b/src/app/routes/vehicle/components/list/list.component.ts
index 04a43d76..96e68569 100644
--- a/src/app/routes/vehicle/components/list/list.component.ts
+++ b/src/app/routes/vehicle/components/list/list.component.ts
@@ -1,25 +1,29 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { STColumn, STComponent, STData } from '@delon/abc/st';
-import { SFComponent, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
-import { NzModalService } from 'ng-zorro-antd/modal';
+import { SFSchemaEnum, SFSelectWidgetSchema } from '@delon/form';
+import { SearchDrawerService } from '@shared';
import { of } from 'rxjs';
import { map } from 'rxjs/operators';
+import { BasicTableComponent } from 'src/app/routes/commom';
import { VehicleService } from '../../../vehicle/services/vehicle.service';
@Component({
selector: 'app-Vehicle-components-list',
- templateUrl: './list.component.html'
+ templateUrl: './list.component.html',
+ styleUrls: ['../../../commom/less/commom-table.less']
})
-export class VehicleComponentsListComponent implements OnInit {
- _$expand = false;
-
- ui!: SFUISchema;
- schema!: SFSchema;
+export class VehicleComponentsListComponent extends BasicTableComponent implements OnInit {
columns!: STColumn[];
@ViewChild('st', { static: false }) st!: STComponent;
- @ViewChild('sf', { static: false }) sf!: SFComponent;
- constructor(public service: VehicleService, private modal: NzModalService, private router: Router, private ar: ActivatedRoute) {}
+ constructor(
+ public service: VehicleService,
+ private router: Router,
+ private ar: ActivatedRoute,
+ public searchDrawerService: SearchDrawerService
+ ) {
+ super(searchDrawerService);
+ }
/**
* 查询参数
@@ -37,6 +41,10 @@ export class VehicleComponentsListComponent implements OnInit {
return params;
}
+ search() {
+ this.st?.load(1);
+ }
+
ngOnInit() {
this.initSF();
this.initST();
@@ -109,10 +117,7 @@ export class VehicleComponentsListComponent implements OnInit {
ui: {
widget: 'dict-select',
params: { dictKey: 'car:model' },
- containsAllLabel: true,
- visibleIf: {
- expand: (value: boolean) => value
- }
+ containsAllLabel: true
}
},
carLength: {
@@ -121,20 +126,12 @@ export class VehicleComponentsListComponent implements OnInit {
ui: {
widget: 'dict-select',
params: { dictKey: 'car:length' },
- containsAllLabel: true,
- visibleIf: {
- expand: (value: boolean) => value
- }
+ containsAllLabel: true
}
},
carLoad: {
title: '载重',
- type: 'string',
- ui: {
- visibleIf: {
- expand: (value: boolean) => value
- }
- }
+ type: 'string'
},
isSelf: {
type: 'string',
@@ -145,10 +142,7 @@ export class VehicleComponentsListComponent implements OnInit {
],
ui: {
widget: 'select',
- allowClear: true,
- visibleIf: {
- expand: (value: boolean) => value
- }
+ allowClear: true
}
},
driverLicenseStatus: {
@@ -162,10 +156,7 @@ export class VehicleComponentsListComponent implements OnInit {
default: '',
ui: {
widget: 'select',
- allowClear: true,
- visibleIf: {
- expand: (value: boolean) => value
- }
+ allowClear: true
}
},
roadTransportStatus: {
@@ -178,12 +169,9 @@ export class VehicleComponentsListComponent implements OnInit {
],
ui: {
widget: 'select',
- allowClear: true,
- visibleIf: {
- expand: (value: boolean) => value
- }
+ allowClear: true
}
- },
+ }
// isSelfs: {
// type: 'string',
// title: '是否入网',
@@ -216,7 +204,6 @@ export class VehicleComponentsListComponent implements OnInit {
// },
}
};
- this.ui = { '*': { spanLabelFixed: 130, grid: { span: 8, gutter: 4 }, enter: () => this.st.load() } };
}
initST() {
@@ -292,20 +279,9 @@ export class VehicleComponentsListComponent implements OnInit {
}
];
}
- expandToggle() {
- this._$expand = !this._$expand;
- this.sf?.setValue('/expand', this._$expand);
- }
creat() {
this.router.navigate(['./new'], { relativeTo: this.ar });
}
- /**
- * 重置表单
- */
- resetSF() {
- this.sf.reset();
- this._$expand = false;
- }
// 导出
exportFire() {
let params = Object.assign({}, this.reqParams || {});
diff --git a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html
index c62d42f6..580a0c64 100644
--- a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html
+++ b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html
@@ -274,8 +274,14 @@
+ ![]()
+
+ 暂无停车信息
+