From bbfa5d5fb53c50ac1df340f4672404324cf2b559 Mon Sep 17 00:00:00 2001 From: "weiye.cheng" Date: Tue, 4 Jan 2022 18:43:43 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BF=9D=E5=8D=95?= =?UTF-8?q?=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/policy/policy.component.html | 65 ++++++ .../policy/policy.component.spec.ts | 24 ++ .../components/policy/policy.component.ts | 205 ++++++++++++++++++ .../contract-management-routing.module.ts | 3 +- .../contract-management.module.ts | 5 +- .../services/contract-management.service.ts | 3 + src/assets/mocks/menu-data.json | 4 + 7 files changed, 306 insertions(+), 3 deletions(-) create mode 100644 src/app/routes/contract-management/components/policy/policy.component.html create mode 100644 src/app/routes/contract-management/components/policy/policy.component.spec.ts create mode 100644 src/app/routes/contract-management/components/policy/policy.component.ts diff --git a/src/app/routes/contract-management/components/policy/policy.component.html b/src/app/routes/contract-management/components/policy/policy.component.html new file mode 100644 index 00000000..ce3db2d0 --- /dev/null +++ b/src/app/routes/contract-management/components/policy/policy.component.html @@ -0,0 +1,65 @@ + + + + + +
+ +
+ +
+ + + +
+ +
+
+ + + +
+ +
+ + + + + + + + + + +
+
+ + + {{paramValue}} + + + +
+
+ \ No newline at end of file diff --git a/src/app/routes/contract-management/components/policy/policy.component.spec.ts b/src/app/routes/contract-management/components/policy/policy.component.spec.ts new file mode 100644 index 00000000..b369df96 --- /dev/null +++ b/src/app/routes/contract-management/components/policy/policy.component.spec.ts @@ -0,0 +1,24 @@ +import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ContractManagementPolicyComponent } from './policy.component'; + +describe('ContractManagementPolicyComponent', () => { + let component: ContractManagementPolicyComponent; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ ContractManagementPolicyComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(ContractManagementPolicyComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/routes/contract-management/components/policy/policy.component.ts b/src/app/routes/contract-management/components/policy/policy.component.ts new file mode 100644 index 00000000..6026a506 --- /dev/null +++ b/src/app/routes/contract-management/components/policy/policy.component.ts @@ -0,0 +1,205 @@ +import { Component, OnInit, ViewChild } from '@angular/core'; +import { STColumn, STComponent, STChange } from '@delon/abc/st'; +import { SFComponent, SFSchema, SFDateWidgetSchema, SFUISchema } from '@delon/form'; +import { ModalHelper, _HttpClient } from '@delon/theme'; +import { NzModalService } from 'ng-zorro-antd/modal'; +import { TicketService } from '../../services/contract-management.service'; +import { Router } from '@angular/router'; + +@Component({ + selector: 'app-contract-management-policy', + templateUrl: './policy.component.html' +}) +export class ContractManagementPolicyComponent implements OnInit { + @ViewChild('st', { static: true }) + st!: STComponent; + @ViewChild('sf', { static: false }) + sf!: SFComponent; + @ViewChild('auditModal', { static: false }) + auditModal!: any; + schema: SFSchema = {}; + columns: STColumn[] = []; + ui: SFUISchema = {}; + @ViewChild('promoterModal', { static: false }) + promoterModal!: any; + _$expand = false; + + selectedRows: any[] = []; + paramValue = ''; + constructor(public service: TicketService, private modal: NzModalService, private router: Router) {} + + /** + * 查询参数 + */ + get reqParams() { + const params: any = { + ...(this.sf && this.sf.value) + }; + delete params.expand; + return params; + } + + ngOnInit(): void { + this.initST(); + this.initSF(); + } + + openDetail(item?: any) { + this.paramValue = item?.paramValue + const modal = this.modal.create({ + nzTitle: '传入值', + nzContent: this.promoterModal, + nzOnOk: () => { + return; + } + }); + + } + + initST() { + this.columns = [ + { title: '', type: 'checkbox', width: '50px', className: 'text-center' }, + { + title: '订单ID', + width: '100px', + className: 'text-center', + index: 'billId' + }, + { + title: '项目ID', + width: '100px', + className: 'text-center', + index: 'enterpriseProjectId' + }, + { + title: '保险公司', + width: '100px', + className: 'text-center', + index: 'insuranceCompany' + }, + { + title: '投保金额', + width: '100px', + className: 'text-center', + index: 'insureAmount' + }, + + { + title: '保单号', + width: '100px', + className: 'text-center', + index: 'policyNo' + }, + { + title: '保单地址', + width: '100px', + className: 'text-center', + index: 'policyUrl' + }, + { + title: '保费', + width: '100px', + className: 'text-center', + index: 'premium' + }, + { + title: '处理消息', + width: '100px', + className: 'text-center', + index: 'processMessage' + }, + { + title: '处理结果', + width: '100px', + className: 'text-center', + index: 'processResult' + }, + { + title: '操作', + width: '170px', + className: 'text-center', + buttons: [ + { + text: '查看传入值', + click: item => { + this.openDetail(item) + } + } + ] + } + ]; + } + + initSF() { + this.schema = { + properties: { + _$expand: { type: 'boolean', ui: { hidden: true } }, + billId: { + type: 'string', + title: '订单id' + }, + enterpriseProjectId: { + type: 'string', + title: '项目id' + }, + insuranceCompany: { + type: 'string', + title: '保险公司' + }, + policyNo: { + type: 'string', + title: '保单号' + }, + processResult: { + type: 'string', + title: '处理结果', + enum: [ + { label: '全部', value: '' }, + { label: '成功', value: 1 }, + { label: '失败', value: 2 } + ], + ui: { + widget: 'select', + placeholder: '请选择', + visibleIf: { + _$expand: (value: boolean) => value + }, + allowClear: true + } + } + }, + type: 'object' + }; + this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } }; + } + + /** + * 重置表单 + */ + resetSF() { + this.sf.reset(); + this._$expand = false; + } + + /** + * 伸缩查询条件 + */ + expandToggle(): void { + this._$expand = !this._$expand; + this.sf?.setValue('/_$expand', this._$expand); + } + + get queryFieldCount(): number { + return Object.keys(this.schema?.properties || {}).length; + } + stChange(e: STChange): void { + switch (e.type) { + case 'checkbox': + this.selectedRows = e.checkbox!; + break; + case 'filter': + this.st.load(); + break; + } + } +} diff --git a/src/app/routes/contract-management/contract-management-routing.module.ts b/src/app/routes/contract-management/contract-management-routing.module.ts index 6459588c..a8109ccf 100644 --- a/src/app/routes/contract-management/contract-management-routing.module.ts +++ b/src/app/routes/contract-management/contract-management-routing.module.ts @@ -9,9 +9,10 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import { ContractManagementContractListComponent } from './components/contract-list/contract-list.component'; +import { ContractManagementPolicyComponent } from './components/policy/policy.component'; const routes: Routes = [ { path: 'list', component: ContractManagementContractListComponent }, -]; + { path: 'policy', component: ContractManagementPolicyComponent }]; @NgModule({ imports: [RouterModule.forChild(routes)], diff --git a/src/app/routes/contract-management/contract-management.module.ts b/src/app/routes/contract-management/contract-management.module.ts index 8364e34d..10102991 100644 --- a/src/app/routes/contract-management/contract-management.module.ts +++ b/src/app/routes/contract-management/contract-management.module.ts @@ -11,10 +11,11 @@ import { CommonModule } from '@angular/common'; import { SharedModule } from '@shared'; import { ContractManagementManagementRoutingModule } from './contract-management-routing.module'; import { ContractManagementContractListComponent } from './components/contract-list/contract-list.component'; +import { ContractManagementPolicyComponent } from './components/policy/policy.component'; const COMPONENTS: any = [ - ContractManagementContractListComponent -]; + ContractManagementContractListComponent, + ContractManagementPolicyComponent]; const NOTROUTECOMPONENTS: any = []; @NgModule({ declarations: [...COMPONENTS, ...NOTROUTECOMPONENTS], diff --git a/src/app/routes/contract-management/services/contract-management.service.ts b/src/app/routes/contract-management/services/contract-management.service.ts index 59cef689..c9e912ce 100644 --- a/src/app/routes/contract-management/services/contract-management.service.ts +++ b/src/app/routes/contract-management/services/contract-management.service.ts @@ -5,6 +5,9 @@ import { BaseService } from 'src/app/shared/services'; providedIn: 'root' }) export class TicketService extends BaseService { + + $api_get_getPremiumInformationPage = `/api/sdc/billOperate/listPremiumInformationPage`; + constructor(public injector: Injector) { super(injector); } diff --git a/src/assets/mocks/menu-data.json b/src/assets/mocks/menu-data.json index fd9f7dbe..b690639b 100644 --- a/src/assets/mocks/menu-data.json +++ b/src/assets/mocks/menu-data.json @@ -380,6 +380,10 @@ "icon": "anticon anticon-dashboard", "group": true, "children": [ + { + "text": "保单管理", + "link": "/contract-management/policy" + }, { "text": "合同列表", "link": "/contract-management/list" From 8618108b816c237c86719805293ca10f182bd0dd Mon Sep 17 00:00:00 2001 From: wangshiming Date: Tue, 4 Jan 2022 21:05:44 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../complaint-detail.component.html | 42 ++++++ .../complaint-detail.component.less | 10 ++ .../complaint-detail.component.spec.ts | 32 +++++ .../complaint-detail.component.ts | 128 ++++++++++++++++++ .../complaint/complaint.component.html | 38 ++++-- .../complaint/complaint.component.ts | 67 +++++++-- .../order-management-routing.module.ts | 4 +- .../order-management.module.ts | 6 +- .../services/order-management.service.ts | 12 +- 9 files changed, 316 insertions(+), 23 deletions(-) create mode 100644 src/app/routes/order-management/components/complaint-detail/complaint-detail.component.html create mode 100644 src/app/routes/order-management/components/complaint-detail/complaint-detail.component.less create mode 100644 src/app/routes/order-management/components/complaint-detail/complaint-detail.component.spec.ts create mode 100644 src/app/routes/order-management/components/complaint-detail/complaint-detail.component.ts diff --git a/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.html b/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.html new file mode 100644 index 00000000..c2e0a3d9 --- /dev/null +++ b/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.html @@ -0,0 +1,42 @@ + + + + + + + + + +

投诉单号：{{datailList?.id}}

+ + + + + + + + + + + +
+ +
+ +
+ {{ i.time }} +
+
{{ i.tags }}
+
+ + + diff --git a/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.less b/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.less new file mode 100644 index 00000000..0df0abc9 --- /dev/null +++ b/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.less @@ -0,0 +1,10 @@ +.info{ + color: #666; +} +:host{ + ::ng-deep{ + .dealBox .ant-card-body{ + width: 500px; + } + } +} \ No newline at end of file diff --git a/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.spec.ts b/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.spec.ts new file mode 100644 index 00000000..4e7dc35e --- /dev/null +++ b/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.spec.ts @@ -0,0 +1,32 @@ +/* + * @Author: your name + * @Date: 2022-01-04 17:29:18 + * @LastEditTime: 2022-01-04 17:31:21 + * @LastEditors: your name + * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE + * @FilePath: \tms-obc-web\src\app\routes\order-management\components\complaint-detail\complaint-detail.component.spec.ts + */ +import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; +import { OrderManagementComplaintDetailComponent } from './complaint-detail.component'; + +describe('OrderManagementComplaintDetailComponent', () => { + let component: OrderManagementComplaintDetailComponent; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ OrderManagementComplaintDetailComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(OrderManagementComplaintDetailComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.ts b/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.ts new file mode 100644 index 00000000..061230ad --- /dev/null +++ b/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.ts @@ -0,0 +1,128 @@ +import { Component, OnInit, ViewChild, ɵɵsetComponentScope } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; +import { SFComponent, SFSchema, SFSelectWidgetSchema, SFTextareaWidgetSchema, SFUISchema } from '@delon/form'; +import { _HttpClient } from '@delon/theme'; +import { NzModalService } from 'ng-zorro-antd/modal'; +import { OrderManagementService } from '../../services/order-management.service'; +// import { RiskOrderService } from '../../services/risk-order.service'; +// import { CtcAppealComponent } from '../appeal/appeal.component'; + +@Component({ + selector: 'app-oder-management-component-risk-detail', + templateUrl: './complaint-detail.component.html', + styleUrls: ['./complaint-detail.component.less'] +}) +export class OrderManagementComplaintDetailComponent implements OnInit { + @ViewChild('sf', { static: false }) sf!: SFComponent; + ui: SFUISchema = {}; + schema: SFSchema = {}; + // abnormalReason = [ + // '司机装货轨迹异常', + // '司机卸货轨迹异常', + // '车辆装货轨迹异常', + // '司机位置未移动，或运输途中未打开APP', + // '运单轨迹严重异常' + // ] + i: any; + datailList: any; + id: string = ''; + constructor(private modal: NzModalService, public service: OrderManagementService, public ar: ActivatedRoute) { + this.id = this.ar.snapshot.params.id; + } + + ngOnInit(): void { + if (this.id) + { + this.getDetail(this.id); + this.initSF(); + } + + } + initSF() { + this.schema = { + properties: { + complaintCause: { + title: '投诉原因', + type: 'string', + maxLength: 30, + ui: { + widget: 'text', + change: (value, orgData) => console.log(value, orgData), + } as SFSelectWidgetSchema, + }, + complaintDetails: { + title: '投诉详情', + type: 'string', + ui: { + widget: 'textarea', + placeholder: '请输入', + autosize: { + minRows: 4, + maxRows: 4 + } + }, + readOnly: true + } as SFTextareaWidgetSchema, + imgUrls: { + type: 'string', + title: '上传凭证', + ui: { + widget: 'custom' + } + }, + }, + }; + + this.ui = { + '*': { + spanLabelFixed: 180, + grid: { span: 18 }, + width: 600, + }, + $title1: { + spanLabelFixed: 0, + }, + $title2: { + spanLabelFixed: 0, + }, + $title3: { + spanLabelFixed: 0, + }, + $unit: { + spanLabelFixed: 20, + grid: { span: 3 }, + }, + }; + } + getDetail(id: string) { + this.service.request(this.service.$api_get_getComplaintDriverDetails, { id }).subscribe(res => { + if (res) { + this.datailList = res; + } + }) + } + + edit(item: any): void { + const modalRef = this.modal.create({ + nzTitle: '申诉', + nzWidth: '40%', + // nzContent: CtcAppealComponent, + nzComponentParams: { + i: item + }, + nzFooter: null + }); + modalRef.afterClose.subscribe(res => { + if (res) { + + } + }) + } + kkk(value: any) { + console.log(value) + } + goBack() { + window.history.go(-1) + } + +} diff --git a/src/app/routes/order-management/components/complaint/complaint.component.html b/src/app/routes/order-management/components/complaint/complaint.component.html index 6cc34634..a8c16e90 100644 --- a/src/app/routes/order-management/components/complaint/complaint.component.html +++ b/src/app/routes/order-management/components/complaint/complaint.component.html @@ -1,7 +1,7 @@ - - - {{item.no}} + + + {{item.complaintCode}} + + +
+ {{item?.complainant?.name}} +
+ + +
+ {{item?.complainant?.name}} +
+ + TMS运营管理系统 +
提交时间：{{datailList?.complainantTime}}
+ + 运多星运营后台 +
操作人员：{{datailList?.complainantIdLabel}}
+
处理详情：{{datailList?.handleDetails}}
+
处理结果：{{datailList?.handleResult}}
+ diff --git a/src/app/routes/order-management/components/complaint/complaint.component.ts b/src/app/routes/order-management/components/complaint/complaint.component.ts index ad7190cb..3a0b86f9 100644 --- a/src/app/routes/order-management/components/complaint/complaint.component.ts +++ b/src/app/routes/order-management/components/complaint/complaint.component.ts @@ -1,3 +1,4 @@ +import { Router } from '@angular/router'; import { Component, OnInit, ViewChild } from '@angular/core'; import { STColumn, STComponent } from '@delon/abc/st'; import { SFComponent, SFDateWidgetSchema, SFSchema, SFSelectWidgetSchema, SFUISchema } from '@delon/form'; @@ -60,7 +61,11 @@ export class OrderManagementComplaintComponent implements OnInit { count: 0, } ]; - constructor(public service: OrderManagementService, private modal: NzModalService) { } + constructor( + public service: OrderManagementService, + private modal: NzModalService, + private router: Router + ) { } /** * 查询参数 @@ -171,7 +176,7 @@ export class OrderManagementComplaintComponent implements OnInit { }, { text: '查看', - click: (_record) => this.viewEvaluate(_record), + click: (_record) => this.view(_record), }, ], }, @@ -311,4 +316,7 @@ export class OrderManagementComplaintComponent implements OnInit { this.isVisibleRE = true this.channelId = item.id; } + view(value: any) { + this.router.navigate(['/order-management/complaint-detail/' + value.id]) + } } From c7f9874e43f47d2ec46131ca9be322cbb14ff2be Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 5 Jan 2022 11:00:51 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../contract-list/contract-list.component.ts | 4 +- .../contract-template.component.html | 97 ++++++++ .../contract-template.component.less | 0 .../contract-template.component.spec.ts | 32 +++ .../contract-template.component.ts | 212 ++++++++++++++++++ .../components/policy/policy.component.ts | 4 +- .../contract-management-routing.module.ts | 6 +- .../contract-management.module.ts | 9 +- .../services/contract-management.service.ts | 13 +- .../driver/detail/detail.component.html | 17 +- .../driver/detail/detail.component.ts | 40 ++-- .../usercenter/services/usercenter.service.ts | 4 +- src/assets/mocks/menu-data.json | 4 + 13 files changed, 413 insertions(+), 29 deletions(-) create mode 100644 src/app/routes/contract-management/components/contract-template/contract-template.component.html create mode 100644 src/app/routes/contract-management/components/contract-template/contract-template.component.less create mode 100644 src/app/routes/contract-management/components/contract-template/contract-template.component.spec.ts create mode 100644 src/app/routes/contract-management/components/contract-template/contract-template.component.ts diff --git a/src/app/routes/contract-management/components/contract-list/contract-list.component.ts b/src/app/routes/contract-management/components/contract-list/contract-list.component.ts index e6141fa0..0d170a34 100644 --- a/src/app/routes/contract-management/components/contract-list/contract-list.component.ts +++ b/src/app/routes/contract-management/components/contract-list/contract-list.component.ts @@ -3,7 +3,7 @@ import { Router } from '@angular/router'; import { STComponent, STColumn, STChange } from '@delon/abc/st'; import { SFComponent, SFSchema, SFDateWidgetSchema, SFUISchema } from '@delon/form'; import { NzModalService } from 'ng-zorro-antd/modal'; -import { TicketService } from '../../services/contract-management.service'; +import { ContractManagementService } from '../../services/contract-management.service'; @Component({ selector: 'app-contract-management-contract-list', @@ -25,7 +25,7 @@ export class ContractManagementContractListComponent implements OnInit { reqParams = {}; selectedRows: any[] = []; - constructor(public service: TicketService, private nzModalService: NzModalService, private router: Router) {} + constructor(public service: ContractManagementService, private nzModalService: NzModalService, private router: Router) {} ngOnInit(): void { this.initST() diff --git a/src/app/routes/contract-management/components/contract-template/contract-template.component.html b/src/app/routes/contract-management/components/contract-template/contract-template.component.html new file mode 100644 index 00000000..d1adb932 --- /dev/null +++ b/src/app/routes/contract-management/components/contract-template/contract-template.component.html @@ -0,0 +1,97 @@ + + + + + +
+ +
+ +
+ + + +
+ +
+
+ + + + +
+ +
+ + + +
+ + + {{item.complaintCode}} + + +
+ {{item?.complainant?.name}} +
+ + +
+ {{item?.complainant?.name}} +
+ + + +
{{item.no}}
+ + +
+ {{item.no}} +
+ + +
+

预付：¥200.00

+

到付：¥200.00

+

油卡：¥200.00

+

回单付：¥200.00

+

小计：¥200.00

+

附加费：¥200.00

+
+ + +
+ + +
+ +
+ diff --git a/src/app/routes/contract-management/components/contract-template/contract-template.component.less b/src/app/routes/contract-management/components/contract-template/contract-template.component.less new file mode 100644 index 00000000..e69de29b diff --git a/src/app/routes/contract-management/components/contract-template/contract-template.component.spec.ts b/src/app/routes/contract-management/components/contract-template/contract-template.component.spec.ts new file mode 100644 index 00000000..7e58e461 --- /dev/null +++ b/src/app/routes/contract-management/components/contract-template/contract-template.component.spec.ts @@ -0,0 +1,32 @@ +/* + * @Author: your name + * @Date: 2021-12-07 14:27:59 + * @LastEditTime: 2021-12-07 14:28:59 + * @LastEditors: your name + * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE + * @FilePath: \tms-obc-web\src\app\routes\order-management\components\risk\risk.component.spec.ts + */ +import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; +import { OrderManagementTemplateComponent } from './contract-template.component'; + +describe('OrderManagementTemplateComponent', () => { + let component: OrderManagementTemplateComponent; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ OrderManagementTemplateComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(OrderManagementTemplateComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/routes/contract-management/components/contract-template/contract-template.component.ts b/src/app/routes/contract-management/components/contract-template/contract-template.component.ts new file mode 100644 index 00000000..e52b65e8 --- /dev/null +++ b/src/app/routes/contract-management/components/contract-template/contract-template.component.ts @@ -0,0 +1,212 @@ +import { Router } from '@angular/router'; +import { Component, OnInit, ViewChild } from '@angular/core'; +import { STColumn, STComponent } from '@delon/abc/st'; +import { SFComponent, SFDateWidgetSchema, SFSchema, SFSelectWidgetSchema, SFUISchema } from '@delon/form'; +import { ModalHelper, _HttpClient } from '@delon/theme'; +import { NzModalService } from 'ng-zorro-antd/modal'; +import { map } from 'rxjs/operators'; +import { ContractManagementService } from '../../services/contract-management.service'; + + +@Component({ + selector: 'app-contract-management-template-complaint', + templateUrl: './contract-template.component.html', + styleUrls: ['./contract-template.component.less'] +}) +export class OrderManagementTemplateComponent implements OnInit { + ui: SFUISchema = {}; + uiView: SFUISchema = {}; + schema: SFSchema = {}; + schemaView: SFSchema = {}; + auditMany = false; + _$expand = false; + channelId: any; + @ViewChild('st') private readonly st!: STComponent; + @ViewChild('sf', { static: false }) sf!: SFComponent; + columns: STColumn[] = []; + datass: any = [ + { + one: '1', + two: '1', + three: '1', + id: 1 + }, + { + one: '2', + two: '2', + three: '2', + id: 2 + }, +]; + constructor( + public service: ContractManagementService, + private modal: NzModalService, + private router: Router + ) { } + + /** + * 查询参数 + */ + get reqParams() { + return { + ...this.sf?.value, + }; + } + get selectedRows() { + return this.st?.list.filter((item) => item.checked) || []; + } + ngOnInit(): void { + this.initSF(); + this.initST(); + this.initSTAudit(); + } + + + + /** + * 初始化查询表单 + */ + initSF() { + this.schema = { + properties: { + complaintCode: { + type: 'string', + title: '模板名称', + }, + serviceType: { + title: '模板类型', + type: 'string', + default: '', + ui: { + widget: 'dict-select', + params: { dictKey: 'service:type' }, + containAllLable:true, + visibleIf: { + _$expand: (value: boolean) => value, + }, + } as SFSelectWidgetSchema, + }, + }, + }; + this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } }; + } + + /** + * 初始化数据列表 + */ + initST() { + this.columns = [ + { + title: '合同模板名称', + className: 'text-center', + render: 'complaintCode' + }, + { + title: '模板类型', + className: 'text-center', + index: 'wayBillCode' + }, + { + title: '单据类型', + index: 'complainantTime', + className: 'text-center', + }, + { title: '创建人', index: 'driverId', width: '120px', className: 'text-center' }, + { + title: '创建时间', + className: 'text-center', + render: 'complainant' + }, + { + title: '操作', + fixed: 'right', + className: 'text-left', + buttons: [ + { + text: '编辑', + click: (_record) => this.view(_record), + }, + { + text: '删除', + click: (_record) => this.view(_record), + }, + ], + }, + ]; + } + initSTAudit() { + this.schemaView = { + properties: { + handleResult: { + title: '处理结果', + type: 'string', + maxLength: 50, + ui: { + placeholder: '最多不超过50字', + widget: 'textarea', + autosize: { minRows: 3, maxRows: 6 } + }, + }, + }, + required: ['handleResult'] + }; + this.uiView = { '*': { spanLabelFixed: 110, grid: { span: 24 } } }; + } + /** + * 查询字段个数 + */ + 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) { + console.log(item) + } + /** + * 重置表单 + */ + resetSF(): void { + this.sf.reset(); + this._$expand = false; + } + /* + * 审核关闭弹窗 + view: 1 + 浮动费用： 0 + 查看评价： 3 + */ + handleCancel(type: string) { + const paramsa = { + handleStatus: 0, + id: this.channelId + } + // this.service.request(this.service.$api_get_dealWithComplaint, paramsa).subscribe((res: any) =>{ + // console.log(res) + // if(res) { + // this.service.msgSrv.success('已拒绝！') + // this.isVisibleRE = false + // } else{ + // this.service.msgSrv.error(res?.msg) + // } + // }) + } + /** + /** + *查看评价 + */ + viewEvaluate(item: any) { + this.channelId = item.id; + } + view(value: any) { + this.router.navigate(['/order-management/complaint-detail/' + value.id]) + } + creatTemplate() { + + } +} diff --git a/src/app/routes/contract-management/components/policy/policy.component.ts b/src/app/routes/contract-management/components/policy/policy.component.ts index 6026a506..4cd872d8 100644 --- a/src/app/routes/contract-management/components/policy/policy.component.ts +++ b/src/app/routes/contract-management/components/policy/policy.component.ts @@ -3,7 +3,7 @@ import { STColumn, STComponent, STChange } from '@delon/abc/st'; import { SFComponent, SFSchema, SFDateWidgetSchema, SFUISchema } from '@delon/form'; import { ModalHelper, _HttpClient } from '@delon/theme'; import { NzModalService } from 'ng-zorro-antd/modal'; -import { TicketService } from '../../services/contract-management.service'; +import { ContractManagementService } from '../../services/contract-management.service'; import { Router } from '@angular/router'; @Component({ @@ -26,7 +26,7 @@ export class ContractManagementPolicyComponent implements OnInit { selectedRows: any[] = []; paramValue = ''; - constructor(public service: TicketService, private modal: NzModalService, private router: Router) {} + constructor(public service: ContractManagementService, private modal: NzModalService, private router: Router) {} /** * 查询参数 diff --git a/src/app/routes/contract-management/contract-management-routing.module.ts b/src/app/routes/contract-management/contract-management-routing.module.ts index a8109ccf..835ba827 100644 --- a/src/app/routes/contract-management/contract-management-routing.module.ts +++ b/src/app/routes/contract-management/contract-management-routing.module.ts @@ -1,17 +1,19 @@ /* * @Author: your name * @Date: 2021-12-07 15:57:49 - * @LastEditTime: 2021-12-07 16:11:00 - * @LastEditors: your name + * @LastEditTime: 2022-01-05 09:50:37 + * @LastEditors: Please set LastEditors * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @FilePath: \tms-obc-web\src\app\routes\contract-management\contract-management-routing.module.ts */ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import { ContractManagementContractListComponent } from './components/contract-list/contract-list.component'; +import { OrderManagementTemplateComponent } from './components/contract-template/contract-template.component'; import { ContractManagementPolicyComponent } from './components/policy/policy.component'; const routes: Routes = [ { path: 'list', component: ContractManagementContractListComponent }, + { path: 'template', component: OrderManagementTemplateComponent }, { path: 'policy', component: ContractManagementPolicyComponent }]; @NgModule({ diff --git a/src/app/routes/contract-management/contract-management.module.ts b/src/app/routes/contract-management/contract-management.module.ts index 10102991..4e31b24f 100644 --- a/src/app/routes/contract-management/contract-management.module.ts +++ b/src/app/routes/contract-management/contract-management.module.ts @@ -1,8 +1,8 @@ /* * @Author: your name * @Date: 2021-12-07 15:57:49 - * @LastEditTime: 2021-12-07 16:11:48 - * @LastEditors: your name + * @LastEditTime: 2022-01-05 09:50:29 + * @LastEditors: Please set LastEditors * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @FilePath: \tms-obc-web\src\app\routes\contract-management\contract-management.module.ts */ @@ -12,10 +12,13 @@ import { SharedModule } from '@shared'; import { ContractManagementManagementRoutingModule } from './contract-management-routing.module'; import { ContractManagementContractListComponent } from './components/contract-list/contract-list.component'; import { ContractManagementPolicyComponent } from './components/policy/policy.component'; +import { OrderManagementTemplateComponent } from './components/contract-template/contract-template.component'; const COMPONENTS: any = [ ContractManagementContractListComponent, - ContractManagementPolicyComponent]; + ContractManagementPolicyComponent, + OrderManagementTemplateComponent +]; const NOTROUTECOMPONENTS: any = []; @NgModule({ declarations: [...COMPONENTS, ...NOTROUTECOMPONENTS], diff --git a/src/app/routes/contract-management/services/contract-management.service.ts b/src/app/routes/contract-management/services/contract-management.service.ts index c9e912ce..850d3b98 100644 --- a/src/app/routes/contract-management/services/contract-management.service.ts +++ b/src/app/routes/contract-management/services/contract-management.service.ts @@ -1,13 +1,22 @@ +/* + * @Author: your name + * @Date: 2022-01-04 21:05:49 + * @LastEditTime: 2022-01-05 09:51:54 + * @LastEditors: Please set LastEditors + * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE + * @FilePath: \tms-obc-web\src\app\routes\contract-management\services\contract-management.service.ts + */ import { Injectable, Injector } from '@angular/core'; import { BaseService } from 'src/app/shared/services'; @Injectable({ providedIn: 'root' }) -export class TicketService extends BaseService { +export class ContractManagementService extends BaseService { $api_get_getPremiumInformationPage = `/api/sdc/billOperate/listPremiumInformationPage`; - + // 查询投诉列表 + $api_get_operate_listPage = `/api/sdc/complaint/operate/listPage`; constructor(public injector: Injector) { super(injector); } 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 6bf3c797..71b3df27 100644 --- a/src/app/routes/usercenter/components/driver/detail/detail.component.html +++ b/src/app/routes/usercenter/components/driver/detail/detail.component.html @@ -121,8 +121,21 @@ [nzBorderless]="!isEditDriver" [placeholder]="isEditDriver?'':'-'"> - + + + { + if (res) { + console.log(res); + this.contencarModel = res; + } + }); // 获取用户个人信息 this.service.request(this.service.$api_get_user_identity, { id: this.route.snapshot.params.id }).subscribe(res => { if (res) { @@ -85,8 +92,10 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit { // 获取驾驶证信息 this.service.request(this.service.$api_get_driver_license, { appUserId: this.route.snapshot.params.id }).subscribe(res => { if (res?.id) { - console.log('driverDetail' ,res); + Object.assign(res, { driverModel: res.driverModel ? res.driverModel.split(',') : [] }); + console.log('driverDetail', res); this.driverDetail = res; + this.tempalateDriverData = { ...this.driverDetail }; } }); @@ -229,7 +238,7 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit { */ ratify(type: number) { if (type) { - console.log(this.driverDetail) + console.log(this.driverDetail); this.isEditDriver = true; } else { this.isEditUser = true; @@ -250,28 +259,28 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit { this.isEditUser = false; } } - /* + /* * 根据地区code查询地区详情 * code：请求参数 * type：参数 name：获取省市区名称，fullcode：获取省市区code * num：参数 1：第一个地区选择，2：第二个地区选择 */ - initDetailByCode() { - // 根据地区code查询地区详情 - this.service.request(this.service.$api_get_region_by_code, { regionCode:'' }).subscribe((res: any) => { - console.log(res) - this.adressCodeList = res - }) - } + initDetailByCode() { + // 根据地区code查询地区详情 + this.service.request(this.service.$api_get_region_by_code, { regionCode: '' }).subscribe((res: any) => { + console.log(res); + this.adressCodeList = res; + }); + } /** * 修改驾驶证，从业资格证信息 */ saveDriver() { - console.log(this.route.snapshot.params.id) + console.log(this.route.snapshot.params.id); const driverDetail = this.driverDetail; const licenseDetail = this.licenseDetail; - console.log(this.driverDetail) + console.log(this.driverDetail); const params = { userId: this.route.snapshot.params.id, mobile: this.userDetail?.phone, @@ -280,7 +289,7 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit { appUserId: driverDetail?.appUserId || this.route.snapshot.params.id, certificatePhoto: driverDetail.certificatePhoto, certificatePhotoWatermark: driverDetail.certificatePhotoWatermark, - driverModel: driverDetail.driverModel, + driverModel: driverDetail.driverModel.join(','), id: driverDetail.id, licenseNo: driverDetail.licenseNo, signingOrganization: driverDetail.signingOrganization, @@ -311,6 +320,7 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit { : this.datePipe.transform(licenseDetail.validStartTime, 'yyyy-MM-dd') } }; + console.log(params) this.service.request(this.service.$api_update_driver_license, params).subscribe(res => { if (res) { this.service.msgSrv.success('修改成功'); diff --git a/src/app/routes/usercenter/services/usercenter.service.ts b/src/app/routes/usercenter/services/usercenter.service.ts index a0f85e35..a38584b1 100644 --- a/src/app/routes/usercenter/services/usercenter.service.ts +++ b/src/app/routes/usercenter/services/usercenter.service.ts @@ -1,7 +1,7 @@ /* * @Author: your name * @Date: 2021-11-29 15:22:34 - * @LastEditTime: 2022-01-04 10:11:16 + * @LastEditTime: 2022-01-05 10:30:26 * @LastEditors: Please set LastEditors * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @FilePath: \tms-obc-web\src\app\routes\usercenter\services\usercenter.service.ts @@ -105,6 +105,8 @@ export class UsermanageService extends ShipperBaseService { $api_ocr_recognize_business_license = '/api/mdc/pbc/hwc/ocr/recognizeBusinessLicense'; // 身份证识别 $api_ocr_recognize_id_card = '/api/mdc/pbc/hwc/ocr/recognizeIdCard'; + // 获取字典 + $api_getDictValue = '/api/mdc/pbc/dictItems/getDictValue'; constructor(public injector: Injector, private nzModalService: NzModalService, public eaCacheSrv: EACacheService) { super(injector,eaCacheSrv); diff --git a/src/assets/mocks/menu-data.json b/src/assets/mocks/menu-data.json index 5d094f24..292d338e 100644 --- a/src/assets/mocks/menu-data.json +++ b/src/assets/mocks/menu-data.json @@ -387,6 +387,10 @@ { "text": "合同列表", "link": "/contract-management/list" + }, + { + "text": "合同模板", + "link": "/contract-management/template" } ] },