Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

解决冲突

Browse Source
This commit is contained in:
wangshiming
2022-02-24 14:35:53 +08:00
parent cbecaeaa15
commit 5fc5dd07a7
13 changed files with 899 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
src/app/routes/contract-management/components/contract-template-frame/contract-template-frame.component.html Normal file
View File

@ -0,0 +1,82 @@
<!--
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-01-12 10:52:50
* @LastEditors : Shiming
* @LastEditTime : 2022-02-24 10:31:05
* @FilePath : \\tms-obc-web\\src\\app\\routes\\contract-management\\components\\contract-template\\contract-template.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<!-- 搜索表单 -->
<nz-card>
<div nz-row nzGutter="8">
<!-- 查询字段小于或等于3个时，不显示伸缩按钮 -->
<div nz-col nzSpan="24" *ngIf="queryFieldCount <= 4">
<sf
#sf
[schema]="schema"
[ui]="ui"
[mode]="'search'"
[disabled]="!sf?.valid"
[loading]="service.http.loading"
(formSubmit)="st?.load(1)"
(formReset)="resetSF()"
></sf>
</div>
<!-- 查询字段大于3个时，根据展开状态调整布局 -->
<ng-container>
<div nz-col [nzSpan]="_$expand ? 24 : 18">
<sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'">
<ng-template sf-template="signTime" let-me let-ui="ui" let-schema="schema">
<nz-range-picker [nzShowTime]="true" [(ngModel)]="sf.value.signTime"></nz-range-picker>
</ng-template>
<ng-template sf-template="effectiveEndTime" let-me let-ui="ui" let-schema="schema">
<nz-range-picker [nzShowTime]="true" [(ngModel)]="sf.value.effectiveEndTime"></nz-range-picker>
</ng-template>
</sf>
</div>
<div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
<button
nz-button
nzType="primary"
[disabled]="!sf.valid"
[nzLoading]="service.http.loading"
(click)="st?.load(1)"
acl
[acl-ability]="['CONTRACT-INDEX-listFrame']"
>查询</button
>
<button nz-button (click)="resetSF()">重置</button>
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
</button>
</div>
</ng-container>
</div>
</nz-card>
<nz-card>
<div class="NewBtn">
<button nz-button nzType="primary" (click)="creatTemplate()" acl [acl-ability]="['CONTRACT-TEMPLATE-new']"> 新建 </button>
</div>
<div style="margin-top: 15px">
<st
#st
[bordered]="true"
[data]="service.$api_get_contractTemplate_page"
[columns]="columns"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
[res]="{ reName: { list: 'data.records', total: 'data.total' } }"
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
[loading]="service.http.loading"
>
<ng-template st-row="templateName" let-item let-index="index">
<a (click)="view(item)">{{ item.templateName }}</a>
</ng-template>
</st>
</div>
</nz-card>

4
src/app/routes/contract-management/components/contract-template-frame/contract-template-frame.component.less Normal file
View File

@ -0,0 +1,4 @@
.NewBtn{
float: right;
margin-bottom: 15px;
}

35
src/app/routes/contract-management/components/contract-template-frame/contract-template-frame.component.spec.ts Normal file
View File

@ -0,0 +1,35 @@
/*
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-01-05 09:45:47
* @LastEditors : Shiming
* @LastEditTime : 2022-02-24 10:25:58
* @FilePath : \\tms-obc-web\\src\\app\\routes\\contract-management\\components\\contract-template\\contract-template.component.spec.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
import { ContractManagementTemplateFrameComponent } from './contract-template-frame.component';
describe('ContractManagementTemplateFrameComponent', () => {
let component: ContractManagementTemplateFrameComponent;
let fixture: ComponentFixture<ContractManagementTemplateFrameComponent>;
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [ ContractManagementTemplateFrameComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(ContractManagementTemplateFrameComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

250
src/app/routes/contract-management/components/contract-template-frame/contract-template-frame.component.ts Normal file
View File

@ -0,0 +1,250 @@
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-frame-complaint',
templateUrl: './contract-template-frame.component.html',
styleUrls: ['./contract-template-frame.component.less']
})
export class ContractManagementTemplateFrameComponent 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 {
templateType: 'MX',
...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: {
_$expand: { type: 'boolean', ui: { hidden: true } },
templateName: {
type: 'string',
title: '模板名称',
},
signingObject: {
type: 'string',
title: '签约对象',
enum: [
{ label: '全部', value: '' },
{ label: '货主', value: 1 },
{ label: '司机', value: 2 }
],
ui: {
widget: 'select',
placeholder: '请选择'
}
},
contractType: {
title: '合同类型',
type: 'string',
default: '',
ui: {
widget: 'dict-select',
containsAllLable: true,
params: { dictKey: 'contract:type' },
containAllLable: true,
} as SFSelectWidgetSchema
},
resourceType: {
title: '货源类型',
type: 'string',
default: '',
ui: {
widget: 'dict-select',
params: { dictKey: 'contract:template:type' },
containsAllLable: 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: 'templateName'
},
{
title: '签约对象',
width: '100px',
className: 'text-center',
index: 'signingObject'
},
{
title: '合同类型',
width: '100px',
className: 'text-center',
index: 'contractType'
},
{
title: '货源类型',
width: '100px',
className: 'text-center',
index: 'resourceType'
},
{ title: '创建人', index: 'createUserId', width: '120px', className: 'text-center' },
{
title: '创建时间',
className: 'text-center',
index: 'createTime'
},
{
title: '操作',
fixed: 'right',
className: 'text-left',
buttons: [
{
text: '编辑',
click: (_record) => this.edit(_record),
acl: { ability: ['CONTRACT-TEMPLATE-edit'] },
},
{
text: '删除',
click: (_record) => this.delete(_record),
acl: { ability: ['CONTRACT-TEMPLATE-delete'] },
},
],
},
];
}
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) {
}
/**
* 重置表单
*/
resetSF(): void {
this.sf.reset();
this._$expand = false;
}
edit(value: any) {
this.router.navigate(['/contract-management/template/text/' + value.id],{
queryParams: {
status: 2
}
})
}
creatTemplate() {
this.router.navigate(['/contract-management/template/text/' + 0], {
queryParams: {
status: 1
}
})
}
goBack() {
window.history.go(-1)
}
view(value: any) {
this.router.navigate(['/contract-management/template/text/' + value.id],{
queryParams: {
status: 3
}
})
}
delete(value: any) {
this.modal.confirm({
nzTitle: '<i>删除确认</i>',
nzOnOk: () =>
this.service.request(this.service.$api_deletebatch_contractTemplate, [value.id]).subscribe(res => {
if (res) {
this.service.msgSrv.success('删除成功！');
this.st.reload(1)
}
})
});
}
}

82
src/app/routes/contract-management/components/contract-template-partner/contract-template-partner.component.html Normal file
View File

@ -0,0 +1,82 @@
<!--
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-01-12 10:52:50
* @LastEditors : Shiming
* @LastEditTime : 2022-02-24 10:31:05
* @FilePath : \\tms-obc-web\\src\\app\\routes\\contract-management\\components\\contract-template\\contract-template.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<!-- 搜索表单 -->
<nz-card>
<div nz-row nzGutter="8">
<!-- 查询字段小于或等于3个时，不显示伸缩按钮 -->
<div nz-col nzSpan="24" *ngIf="queryFieldCount <= 4">
<sf
#sf
[schema]="schema"
[ui]="ui"
[mode]="'search'"
[disabled]="!sf?.valid"
[loading]="service.http.loading"
(formSubmit)="st?.load(1)"
(formReset)="resetSF()"
></sf>
</div>
<!-- 查询字段大于3个时，根据展开状态调整布局 -->
<ng-container>
<div nz-col [nzSpan]="_$expand ? 24 : 18">
<sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'">
<ng-template sf-template="signTime" let-me let-ui="ui" let-schema="schema">
<nz-range-picker [nzShowTime]="true" [(ngModel)]="sf.value.signTime"></nz-range-picker>
</ng-template>
<ng-template sf-template="effectiveEndTime" let-me let-ui="ui" let-schema="schema">
<nz-range-picker [nzShowTime]="true" [(ngModel)]="sf.value.effectiveEndTime"></nz-range-picker>
</ng-template>
</sf>
</div>
<div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
<button
nz-button
nzType="primary"
[disabled]="!sf.valid"
[nzLoading]="service.http.loading"
(click)="st?.load(1)"
acl
[acl-ability]="['CONTRACT-INDEX-listFrame']"
>查询</button
>
<button nz-button (click)="resetSF()">重置</button>
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
</button>
</div>
</ng-container>
</div>
</nz-card>
<nz-card>
<div class="NewBtn">
<button nz-button nzType="primary" (click)="creatTemplate()" acl [acl-ability]="['CONTRACT-TEMPLATE-new']"> 新建 </button>
</div>
<div style="margin-top: 15px">
<st
#st
[bordered]="true"
[data]="service.$api_get_contractTemplate_page"
[columns]="columns"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
[res]="{ reName: { list: 'data.records', total: 'data.total' } }"
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
[loading]="service.http.loading"
>
<ng-template st-row="templateName" let-item let-index="index">
<a (click)="view(item)">{{ item.templateName }}</a>
</ng-template>
</st>
</div>
</nz-card>

4
src/app/routes/contract-management/components/contract-template-partner/contract-template-partner.component.less Normal file
View File

@ -0,0 +1,4 @@
.NewBtn{
float: right;
margin-bottom: 15px;
}

35
src/app/routes/contract-management/components/contract-template-partner/contract-template-partner.component.spec.ts Normal file
View File

@ -0,0 +1,35 @@
/*
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-01-05 09:45:47
* @LastEditors : Shiming
* @LastEditTime : 2022-02-24 14:09:28
* @FilePath : \\tms-obc-web\\src\\app\\routes\\contract-management\\components\\contract-template-partner\\contract-template-partner.component.spec.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
import { ContractManagementTemplatePartnerComponent } from './contract-template-partner.component';
describe('ContractManagementTemplatePartnerComponent', () => {
let component: ContractManagementTemplatePartnerComponent;
let fixture: ComponentFixture<ContractManagementTemplatePartnerComponent>;
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [ ContractManagementTemplatePartnerComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(ContractManagementTemplatePartnerComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

250
src/app/routes/contract-management/components/contract-template-partner/contract-template-partner.component.ts Normal file
View File

@ -0,0 +1,250 @@
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-partner-complaint',
templateUrl: './contract-template-partner.component.html',
styleUrls: ['./contract-template-partner.component.less']
})
export class ContractManagementTemplatePartnerComponent 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 {
templateType: 'MX',
...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: {
_$expand: { type: 'boolean', ui: { hidden: true } },
templateName: {
type: 'string',
title: '模板名称',
},
signingObject: {
type: 'string',
title: '签约对象',
enum: [
{ label: '全部', value: '' },
{ label: '货主', value: 1 },
{ label: '司机', value: 2 }
],
ui: {
widget: 'select',
placeholder: '请选择'
}
},
contractType: {
title: '合同类型',
type: 'string',
default: '',
ui: {
widget: 'dict-select',
containsAllLable: true,
params: { dictKey: 'contract:type' },
containAllLable: true,
} as SFSelectWidgetSchema
},
resourceType: {
title: '货源类型',
type: 'string',
default: '',
ui: {
widget: 'dict-select',
params: { dictKey: 'contract:template:type' },
containsAllLable: 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: 'templateName'
},
{
title: '签约对象',
width: '100px',
className: 'text-center',
index: 'signingObject'
},
{
title: '合同类型',
width: '100px',
className: 'text-center',
index: 'contractType'
},
{
title: '货源类型',
width: '100px',
className: 'text-center',
index: 'resourceType'
},
{ title: '创建人', index: 'createUserId', width: '120px', className: 'text-center' },
{
title: '创建时间',
className: 'text-center',
index: 'createTime'
},
{
title: '操作',
fixed: 'right',
className: 'text-left',
buttons: [
{
text: '编辑',
click: (_record) => this.edit(_record),
acl: { ability: ['CONTRACT-TEMPLATE-edit'] },
},
{
text: '删除',
click: (_record) => this.delete(_record),
acl: { ability: ['CONTRACT-TEMPLATE-delete'] },
},
],
},
];
}
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) {
}
/**
* 重置表单
*/
resetSF(): void {
this.sf.reset();
this._$expand = false;
}
edit(value: any) {
this.router.navigate(['/contract-management/template/text/' + value.id],{
queryParams: {
status: 2
}
})
}
creatTemplate() {
this.router.navigate(['/contract-management/template/text/' + 0], {
queryParams: {
status: 1
}
})
}
goBack() {
window.history.go(-1)
}
view(value: any) {
this.router.navigate(['/contract-management/template/text/' + value.id],{
queryParams: {
status: 3
}
})
}
delete(value: any) {
this.modal.confirm({
nzTitle: '<i>删除确认</i>',
nzOnOk: () =>
this.service.request(this.service.$api_deletebatch_contractTemplate, [value.id]).subscribe(res => {
if (res) {
this.service.msgSrv.success('删除成功！');
this.st.reload(1)
}
})
});
}
}

1
src/app/routes/contract-management/components/contract-template/contract-template.component.ts
View File

@ -49,6 +49,7 @@ export class ContractManagementTemplateDetailComponent implements OnInit {
*/
get reqParams() {
return {
templateType: 'KJ',
...this.sf?.value,
};
}

8
src/app/routes/contract-management/components/template/template.component.html
View File

@ -4,8 +4,8 @@
* @Author : Shiming
* @Date : 2022-01-07 13:27:10
* @LastEditors : Shiming
* @LastEditTime : 2022-02-23 19:39:38
* @FilePath : \\tms-obc-web\\src\\app\\routes\\contract-management\\components\\index\\index.component.html
* @LastEditTime : 2022-02-24 14:10:45
* @FilePath : \\tms-obc-web\\src\\app\\routes\\contract-management\\components\\template\\template.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@ -17,10 +17,10 @@
<app-contract-management-template-detail-complaint></app-contract-management-template-detail-complaint>
</nz-tab>
<nz-tab nzTitle="框架合同">
<app-contract-management-contract-frame></app-contract-management-contract-frame>
<app-contract-management-template-frame-complaint></app-contract-management-template-frame-complaint>
</nz-tab>
<nz-tab nzTitle="合伙人合同">
<app-contract-management-contract-partner></app-contract-management-contract-partner>
<app-contract-management-template-partner-complaint></app-contract-management-template-partner-complaint>
</nz-tab>
</nz-tabset>
</ng-template>

8
src/app/routes/contract-management/contract-management.module.ts
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-01-04 21:05:49
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:15:08
* @LastEditTime : 2022-02-24 14:09:24
* @FilePath : \\tms-obc-web\\src\\app\\routes\\contract-management\\contract-management.module.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@ -22,6 +22,8 @@ import { ContractManagementDetailComponent } from './components/contract-detail/
import { ContractManagementPartnerComponent } from './components/contract-partner/contract-partner.component';
import { ContractManagementTemplateComponent } from './components/template/template.component';
import { ContractManagementTemplateTextComponent } from './components/contract-template-detail/contract-template-detail.component';
import { ContractManagementTemplateFrameComponent } from './components/contract-template-frame/contract-template-frame.component';
import { ContractManagementTemplatePartnerComponent } from './components/contract-template-partner/contract-template-partner.component';
const COMPONENTS: any = [
ContractManagementContractListComponent,
@ -33,7 +35,9 @@ const COMPONENTS: any = [
ContractManagementDetailComponent,
ContractManagementPartnerComponent,
ContractManagementTemplateComponent,
ContractManagementTemplateTextComponent
ContractManagementTemplateTextComponent,
ContractManagementTemplateFrameComponent,
ContractManagementTemplatePartnerComponent
];
const NOTROUTECOMPONENTS: any = [];
@NgModule({

20
src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html
View File

@ -220,22 +220,12 @@
<nz-card>
<div class="card-title">服务信息</div>
<div nz-row>
<div nz-col nzSpan="18">
<sf #sf55 [schema]="schema55" [button]="'none'" [ui]="ui55" [formData]="sf55data"></sf>
</div>
</div>
<div nz-row [nzGutter]="24" style="margin-bottom: 24px">
<div nz-col [nzSpan]="10">
<div class="align-center">
<span style="font-weight: bolder; margin-right: 12px">购买货运险</span>
<nz-alert nzType="warning" [nzMessage]="template1" nzShowIcon></nz-alert>
</div>
</div>
</div>
<ng-template #template1>推荐投保，填写货值自动估保费，司机接单后不可退保。详见<a target="_blank" [queryParams]="{ type: 10 }" [routerLink]="['/passport/agreement']">《投保告知》</a></ng-template>
<div nz-row>
<div nz-col nzSpan="18">
<div nz-col nzSpan="16">
<sf #sf5 [schema]="schema5" [button]="'none'" [ui]="ui5" [formData]="sf5data">
<ng-template sf-template="freeInsurance" let-i let-ui="ui">
<nz-alert nzType="warning" [nzMessage]="template1" nzShowIcon></nz-alert>
</ng-template>
<ng-template #template1>推荐投保，填写货值自动估保费，司机接单后不可退保。详见<a target="_blank" [queryParams]="{ type: 10 }" [routerLink]="['/agreement']">《投保告知》</a></ng-template>
<ng-template sf-template="goodsValue" let-i let-ui="ui">
<div class="align-center">
<nz-input-number

176
src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts
View File

@ -122,7 +122,6 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
this.initSF3();
this.initSF4();
this.initSF5();
this.initSF55();
this.initSF6();
this.initSF7();
this.initdata();
@ -386,21 +385,17 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
}
};
}
initSF55() {
this.schema55 = {
initSF5() {
this.schema5 = {
properties: {
insuranceType: {
type: 'string',
title: '增值服务套餐',
enum: [
{ label: '不购买', value: '0' },
{ label: '套餐一', value: '1' },
{ label: '套餐二', value: '2' }
],
ui: {
widget: 'select'
widget: 'dict-select',
params: { dictKey: 'bill:insurance:type' },
},
default: '0'
default: '3'
},
type1: {
type: 'string',
@ -423,34 +418,46 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
visibleIf: { insuranceType: (value: string) => value === '2' }
} as SFCheckboxWidgetSchema,
default: ['车辆实时定位', '轨迹查询', '数据保护', '专属技术服务', '赠送综合险']
}
}
};
this.ui55 = {
'*': {
spanLabelFixed: 100,
grid: { span: 24 }
},
$insuranceType: {
grid: { span: 12 }
}
};
}
initSF5() {
this.schema5 = {
properties: {
},
freeInsurance: {
type: 'string',
title: '赠送保险',
ui: {
widget: 'custom',
visibleIf: { insuranceType: (value: string) => value !== '3' }
}
},
insurancePackagedGoods:{
type: 'string',
title: '货物包装',
ui: {
widget: 'dict-select',
params: { dictKey: 'insure:packaged:goods' },
visibleIf: { insuranceType: (value: string) => value !== '3' }
} as SFSelectWidgetSchema
},
hidenField:{
type: 'string',
title: '',
default:' ',
ui: {
widget:'text'
}
},
goodsValue: {
type: 'string',
title: '货物价值',
ui: {
widget: 'custom'
widget: 'custom',
visibleIf: { insuranceType: (value: string) => value !== '3' }
}
},
insurancePremium: {
type: 'string',
title: '',
ui: {
widget: 'custom'
widget: 'custom',
visibleIf: { insuranceType: (value: string) => value !== '3' }
}
},
insuranceRate: {
@ -460,15 +467,108 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
hidden: true
}
}
}
},
required: ['insurancePackagedGoods']
};
this.ui5 = {
'*': {
spanLabelFixed: 115,
grid: { span: 12 }
},
$type1:{
grid: { span: 24 }
},
$type2:{
grid: { span: 24 }
},
$freeInsurance:{
grid: { span: 24 }
}
};
}
// initSF55() {
// this.schema55 = {
// properties: {
// insuranceType: {
// type: 'string',
// title: '增值服务套餐',
// enum: [
// { label: '不购买', value: '0' },
// { label: '套餐一', value: '1' },
// { label: '套餐二', value: '2' }
// ],
// ui: {
// widget: 'select'
// },
// default: '0'
// },
// type1: {
// type: 'string',
// title: '',
// enum: ['车辆实时定位', '轨迹查询', '数据保护', '赠送基本险'],
// readOnly: true,
// ui: {
// widget: 'checkbox',
// visibleIf: { insuranceType: (value: string) => value === '1' }
// } as SFCheckboxWidgetSchema,
// default: ['车辆实时定位', '轨迹查询', '数据保护', '赠送基本险']
// },
// type2: {
// type: 'string',
// title: '',
// enum: ['车辆实时定位', '轨迹查询', '数据保护', '专属技术服务', '赠送综合险'],
// readOnly: true,
// ui: {
// widget: 'checkbox',
// visibleIf: { insuranceType: (value: string) => value === '2' }
// } as SFCheckboxWidgetSchema,
// default: ['车辆实时定位', '轨迹查询', '数据保护', '专属技术服务', '赠送综合险']
// }
// }
// };
// this.ui55 = {
// '*': {
// spanLabelFixed: 100,
// grid: { span: 24 }
// },
// $insuranceType: {
// grid: { span: 12 }
// }
// };
// }
// initSF5() {
// this.schema5 = {
// properties: {
// goodsValue: {
// type: 'string',
// title: '货物价值',
// ui: {
// widget: 'custom'
// }
// },
// insurancePremium: {
// type: 'string',
// title: '',
// ui: {
// widget: 'custom'
// }
// },
// insuranceRate: {
// type: 'string',
// title: '保险费率',
// ui: {
// hidden: true
// }
// }
// }
// };
// this.ui5 = {
// '*': {
// spanLabelFixed: 115,
// grid: { span: 12 }
// }
// };
// }
initSF6() {
this.schema6 = {
properties: {
@ -871,7 +971,6 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
loadingTime: this.validateForm1?.value?.loadingTime,
unloadingTime: this.validateForm1?.value?.unloadingTime,
unLoadingPlaceDTOList: [...this.startInfo, ...this.endInfo],
insuranceType: this.sf55.value.insuranceType,
goodsInfoDTOList: [
{
...this.sf4.value,
@ -1111,13 +1210,20 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
this.sf4data.id = res?.goodsInfoVOList[0]?.id;
}
this.totalFees = res?.shippingInformationVO?.totalFee || '0';
// this.sf5data = {
// goodsValue: res?.goodsValue,
// insurancePremium: res?.insurancePremium || '',
// insuranceRate: res?.insuranceRate || ''
// };
// this.sf55data = {
// insuranceType: res?.insuranceType || ''
// };
this.sf5data = {
goodsValue: res?.goodsValue,
insuranceType: res?.insuranceType || '',
goodsValue: res?.goodsValue || '',
insurancePremium: res?.insurancePremium || '',
insuranceRate: res?.insuranceRate || ''
};
this.sf55data = {
insuranceType: res?.insuranceType || ''
insuranceRate: res?.insuranceRate || '',
insurancePackagedGoods: res?.insurancePackagedGoods || '',
};
this.sf6data = {
stateReceipt: res?.stateReceipt,