-
+
+
+
+
-
+
\ 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
;
-
- 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/tax-management/components/individual-collect/individual-collect.component.html b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.html
index 149c130e..5ba2e9bf 100644
--- a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.html
+++ b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.html
@@ -1,17 +1,5 @@
-
-
-
+
-
-
-
-
-
+ -->
+
+
+
+
-
@@ -44,8 +37,23 @@
已选择
{{ selectedRows.length }} 条数据