Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop
This commit is contained in:
Taric Xin
@ -4,7 +4,7 @@
|
||||
* @Author : Shiming
|
||||
* @Date : 2022-01-18 09:51:21
|
||||
* @LastEditors : Shiming
|
||||
* @LastEditTime : 2022-04-19 14:20:28
|
||||
* @LastEditTime : 2022-04-20 14:18:40
|
||||
* @FilePath : \\tms-obc-web\\proxy.conf.js
|
||||
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
||||
*/
|
||||
|
||||
@ -566,7 +566,7 @@ export class insuranceManagementListComponent implements OnInit {
|
||||
}
|
||||
// 保险配置
|
||||
changeOrder() {
|
||||
this.router.navigate(['/insurance-management/list-set', 1]);
|
||||
this.router.navigate(['/insurance-management/list-set']);
|
||||
}
|
||||
exprot() {
|
||||
this.service.downloadFile(this.service.$api_get_asyncExport, { ...this.reqParams, pageSize: -1 });
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
* @Author : Shiming
|
||||
* @Date : 2022-01-06 09:24:00
|
||||
* @LastEditors : Shiming
|
||||
* @LastEditTime : 2022-01-25 17:21:54
|
||||
* @LastEditTime : 2022-04-20 10:16:09
|
||||
* @FilePath : \\tms-obc-web\\src\\app\\routes\\insurance-management\\insurance-management-routing.module.ts
|
||||
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
||||
*/
|
||||
@ -16,7 +16,7 @@ import { insuranceManagementSetComponent } from './components/set/set.component'
|
||||
|
||||
const routes: Routes = [
|
||||
{ path: 'list', component: insuranceManagementListComponent },
|
||||
{ path: 'list-set/:id', component: insuranceManagementSetComponent },
|
||||
{ path: 'list-set', component: insuranceManagementSetComponent },
|
||||
]
|
||||
@NgModule({
|
||||
imports: [RouterModule.forChild(routes)],
|
||||
|
||||
@ -0,0 +1,20 @@
|
||||
<!--
|
||||
* @Description :
|
||||
* @Version : 1.0
|
||||
* @Author : Shiming
|
||||
* @Date : 2021-12-06 20:20:26
|
||||
* @LastEditors : Shiming
|
||||
* @LastEditTime : 2022-01-26 09:27:28
|
||||
* @FilePath : \\tms-obc-web\\src\\app\\routes\\interface-docking\\components\\set\\set.component.html
|
||||
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
||||
-->
|
||||
<page-header-wrapper [title]="''" [logo]="logo">
|
||||
<ng-template #logo>
|
||||
<button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
|
||||
<i nz-icon nzType="left" nzTheme="outline"></i>
|
||||
</button>
|
||||
</ng-template>
|
||||
</page-header-wrapper>
|
||||
<nz-card>
|
||||
<app-insurance-table></app-insurance-table>
|
||||
</nz-card>
|
||||
@ -0,0 +1,94 @@
|
||||
:host {
|
||||
.btn-size {
|
||||
font-size: 14px;
|
||||
}
|
||||
|
||||
.bdr {
|
||||
border-right: 1px solid #ccc;
|
||||
}
|
||||
|
||||
.bdl {
|
||||
border-left: 1px solid #ccc;
|
||||
}
|
||||
|
||||
.source-info {
|
||||
p {
|
||||
margin-bottom: .5em;
|
||||
}
|
||||
}
|
||||
|
||||
.freight-info-box {
|
||||
width: 95%;
|
||||
}
|
||||
|
||||
.freigth-label {
|
||||
display : inline-block;
|
||||
width : 50px;
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
::ng-deep {
|
||||
.approval-status {
|
||||
.ant-steps {
|
||||
width : 70%;
|
||||
margin: 0 auto;
|
||||
}
|
||||
}
|
||||
|
||||
// .ant-tabs-top>.ant-tabs-nav,
|
||||
// .ant-tabs-bottom>.ant-tabs-nav,
|
||||
// .ant-tabs-top>div>.ant-tabs-nav,
|
||||
// .ant-tabs-bottom>div>.ant-tabs-nav {
|
||||
// margin: 0;
|
||||
// }
|
||||
|
||||
// .ant-anchor-ink::before {
|
||||
// width: 0;
|
||||
// }
|
||||
|
||||
// .ant-tabs-card.ant-tabs-top>.ant-tabs-nav .ant-tabs-tab+.ant-tabs-tab,
|
||||
// .ant-tabs-card.ant-tabs-bottom>.ant-tabs-nav .ant-tabs-tab+.ant-tabs-tab,
|
||||
// .ant-tabs-card.ant-tabs-top>div>.ant-tabs-nav .ant-tabs-tab+.ant-tabs-tab,
|
||||
// .ant-tabs-card.ant-tabs-bottom>div>.ant-tabs-nav .ant-tabs-tab+.ant-tabs-tab {
|
||||
// margin-left: 40px
|
||||
// }
|
||||
}
|
||||
|
||||
.leftPadding {
|
||||
padding-right: 100px;
|
||||
}
|
||||
.handling-info {
|
||||
min-height: 100px;
|
||||
border: 1px solid #ccc;
|
||||
|
||||
.loading-row {
|
||||
display: flex;
|
||||
}
|
||||
|
||||
.handling-info-icon {
|
||||
width: 32px;
|
||||
height: 32px;
|
||||
margin-right: 24px;
|
||||
color: #fff;
|
||||
line-height: 32px;
|
||||
text-align: center;
|
||||
border-radius: 50%;
|
||||
|
||||
&.loading-bg {
|
||||
background-color: #50D4AB;
|
||||
}
|
||||
|
||||
&.unloaing-bg {
|
||||
background: #F66F6A;
|
||||
}
|
||||
}
|
||||
|
||||
.info {
|
||||
flex: 1;
|
||||
}
|
||||
|
||||
.time-info {
|
||||
margin-left: 56px;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,24 @@
|
||||
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
import { interfaceDockingSetComponent } from './set.component';
|
||||
|
||||
describe('interfaceDockingSetComponent', () => {
|
||||
let component: interfaceDockingSetComponent;
|
||||
let fixture: ComponentFixture<interfaceDockingSetComponent>;
|
||||
|
||||
beforeEach(waitForAsync(() => {
|
||||
TestBed.configureTestingModule({
|
||||
declarations: [ interfaceDockingSetComponent ]
|
||||
})
|
||||
.compileComponents();
|
||||
}));
|
||||
|
||||
beforeEach(() => {
|
||||
fixture = TestBed.createComponent(interfaceDockingSetComponent);
|
||||
component = fixture.componentInstance;
|
||||
fixture.detectChanges();
|
||||
});
|
||||
|
||||
it('should create', () => {
|
||||
expect(component).toBeTruthy();
|
||||
});
|
||||
});
|
||||
@ -0,0 +1,40 @@
|
||||
/*
|
||||
* @Description :
|
||||
* @Version : 1.0
|
||||
* @Author : Shiming
|
||||
* @Date : 2021-12-06 20:20:26
|
||||
* @LastEditors : Shiming
|
||||
* @LastEditTime : 2022-01-25 20:43:37
|
||||
* @FilePath : \\tms-obc-web\\src\\app\\routes\\insurance-management\\components\\set\\set.component.ts
|
||||
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
||||
*/
|
||||
import { Component, OnInit } from '@angular/core';
|
||||
import { ActivatedRoute } from '@angular/router';
|
||||
import { NzMessageService } from 'ng-zorro-antd/message';
|
||||
import {InterfaceDockingService} from '../../services/interface-docking.service';
|
||||
@Component({
|
||||
selector: 'app-interface-docking-set',
|
||||
templateUrl: './set.component.html',
|
||||
styleUrls: ['./set.component.less']
|
||||
})
|
||||
export class interfaceDockingSetComponent implements OnInit {
|
||||
|
||||
constructor(
|
||||
private route: ActivatedRoute,
|
||||
private msgSrv: NzMessageService,
|
||||
private service: InterfaceDockingService,
|
||||
) {
|
||||
|
||||
}
|
||||
|
||||
ngOnInit(): void {
|
||||
this.initData()
|
||||
}
|
||||
initData() {
|
||||
|
||||
}
|
||||
goBack() {
|
||||
window.history.go(-1);
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,85 @@
|
||||
<!--
|
||||
* @Description :
|
||||
* @Version : 1.0
|
||||
* @Author : Shiming
|
||||
* @Date : 2022-01-12 10:52:50
|
||||
* @LastEditors : Shiming
|
||||
* @LastEditTime : 2022-02-28 17:00:48
|
||||
* @FilePath : \\tms-obc-web\\src\\app\\routes\\interface-docking\\components\\waybill\\waybill.component.html
|
||||
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
||||
-->
|
||||
<!-- 搜索表单 -->
|
||||
<page-header-wrapper [title]="''"> </page-header-wrapper>
|
||||
<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]="false"
|
||||
(formSubmit)="st?.load(1)"
|
||||
(formReset)="resetSF()"
|
||||
></sf>
|
||||
</div>
|
||||
|
||||
<!-- 查询字段大于3个时，根据展开状态调整布局 -->
|
||||
<ng-container *ngIf="queryFieldCount > 4">
|
||||
<div nz-col [nzSpan]="_$expand ? 24 : 18">
|
||||
<sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
|
||||
</div>
|
||||
<div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
|
||||
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="search()" acl [acl-ability]="['WAYBILL-LIST-search']">查询</button>
|
||||
<button nz-button nzType="primary" [disabled]="false" acl [acl-ability]="['WAYBILL-LIST-export']" (click)="exprot()">导出</button>
|
||||
<button nz-button [disabled]="false" (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>
|
||||
<nz-tabset (nzSelectedIndexChange)="selectChange($event)" [nzTabBarExtraContent]="extraTemplate">
|
||||
<nz-tab [nzTitle]="'全部(' + tabs?.totalCount + ')'"></nz-tab>
|
||||
<nz-tab [nzTitle]="'新建(' + tabs?.billStatus1 + ')'"></nz-tab>
|
||||
<nz-tab [nzTitle]="'运单已发送(' + tabs?.billStatus2 + ')'"></nz-tab>
|
||||
<nz-tab [nzTitle]="'司机信息已获取(' + tabs?.billStatus3 + ')'"></nz-tab>
|
||||
<nz-tab [nzTitle]="'司机信息已反馈(' + tabs?.billStatus4 + ')'"></nz-tab>
|
||||
<nz-tab [nzTitle]="'签收单号已接收(' + tabs?.billStatus5 + ')'"></nz-tab>
|
||||
<nz-tab [nzTitle]="'签收单号已反馈(' + tabs?.billStatus6 + ')'"></nz-tab>
|
||||
<nz-tab [nzTitle]="'报道已接收(' + tabs?.billStatus7 + ')'"></nz-tab>
|
||||
<nz-tab [nzTitle]="'报道已反馈(' + tabs?.billStatus8 + ')'"></nz-tab>
|
||||
<nz-tab [nzTitle]="'发运已接收(' + tabs?.billStatus9 + ')'"></nz-tab>
|
||||
<nz-tab [nzTitle]="'发运已反馈(' + tabs?.billStatus10 + ')'"></nz-tab>
|
||||
<nz-tab [nzTitle]="'签收已接收(' + tabs?.billStatus11 + ')'"></nz-tab>
|
||||
<nz-tab [nzTitle]="'签收已反馈(' + tabs?.billStatus12 + ')'"></nz-tab>
|
||||
<nz-tab [nzTitle]="'POD已获取(' + tabs?.billStatus13 + ')'"></nz-tab>
|
||||
<nz-tab [nzTitle]="'POD已反馈(' + tabs?.billStatus14 + ')'"></nz-tab>
|
||||
|
||||
</nz-tabset>
|
||||
<div style="margin-top: 15px">
|
||||
<st
|
||||
#st
|
||||
[bordered]="true"
|
||||
[scroll]="{ x: '2000px' }"
|
||||
[data]="service.$api_waybillInfo_list"
|
||||
[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]="false"
|
||||
>
|
||||
|
||||
</st>
|
||||
</div>
|
||||
</nz-card>
|
||||
|
||||
<ng-template #extraTemplate>
|
||||
|
||||
</ng-template>
|
||||
@ -0,0 +1,13 @@
|
||||
|
||||
:host {
|
||||
p{
|
||||
margin-bottom: 0
|
||||
}
|
||||
.left_btn {
|
||||
width: 50px;
|
||||
height: 32px;
|
||||
padding-left: 8px;
|
||||
line-height:32px;
|
||||
background-color: #d7d7d7;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,35 @@
|
||||
/*
|
||||
* @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\\waybill\\waybill.component.spec.ts
|
||||
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
||||
*/
|
||||
|
||||
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
import {interfaceDockingWaybillComponent} from './waybill.component';
|
||||
|
||||
describe('interfaceDockingWaybillComponent', () => {
|
||||
let component: interfaceDockingWaybillComponent;
|
||||
let fixture: ComponentFixture<interfaceDockingWaybillComponent>;
|
||||
|
||||
beforeEach(waitForAsync(() => {
|
||||
TestBed.configureTestingModule({
|
||||
declarations: [ interfaceDockingWaybillComponent ]
|
||||
})
|
||||
.compileComponents();
|
||||
}));
|
||||
|
||||
beforeEach(() => {
|
||||
fixture = TestBed.createComponent(interfaceDockingWaybillComponent);
|
||||
component = fixture.componentInstance;
|
||||
fixture.detectChanges();
|
||||
});
|
||||
|
||||
it('should create', () => {
|
||||
expect(component).toBeTruthy();
|
||||
});
|
||||
});
|
||||
@ -0,0 +1,287 @@
|
||||
import { Component, OnInit, ViewChild } from '@angular/core';
|
||||
import { STColumn, STComponent } from '@delon/abc/st';
|
||||
import { SFComponent, SFDateWidgetSchema, SFSchema, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
|
||||
import { map } from 'rxjs/operators';
|
||||
import { ShipperBaseService } from '@shared';
|
||||
import {InterfaceDockingService} from "../../services/interface-docking.service";
|
||||
|
||||
@Component({
|
||||
selector: 'app-interface-docking-waybill',
|
||||
templateUrl: './waybill.component.html',
|
||||
styleUrls: ['./waybill.component.less']
|
||||
})
|
||||
export class interfaceDockingWaybillComponent implements OnInit {
|
||||
ui: SFUISchema = {};
|
||||
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[] = [];
|
||||
resourceStatus: any;
|
||||
tabs = {
|
||||
totalCount: 0,
|
||||
billStatus1: 0,
|
||||
billStatus2: 0,
|
||||
billStatus3: 0,
|
||||
billStatus4: 0,
|
||||
billStatus5: 0,
|
||||
billStatus6: 0,
|
||||
billStatus7: 0,
|
||||
billStatus8: 0,
|
||||
billStatus9: 0,
|
||||
billStatus10: 0,
|
||||
billStatus11: 0,
|
||||
billStatus12: 0,
|
||||
billStatus13: 0,
|
||||
billStatus14: 0
|
||||
};
|
||||
constructor(
|
||||
public service: InterfaceDockingService,
|
||||
public shipperservice: ShipperBaseService,
|
||||
) { }
|
||||
|
||||
/**
|
||||
* 查询参数
|
||||
*/
|
||||
get reqParams() {
|
||||
const a: any = {};
|
||||
if (this.resourceStatus) {
|
||||
a.billStatus = this.resourceStatus;
|
||||
}
|
||||
const params: any = Object.assign({}, this.sf?.value || {});
|
||||
delete params._$expand;
|
||||
return {
|
||||
...a,
|
||||
...params,
|
||||
createTime: {
|
||||
start: this.sf?.value?.createTime?.[0] || '',
|
||||
end: this.sf?.value?.createTime?.[1] || ''
|
||||
},
|
||||
planDeliverTime: {
|
||||
start: this.sf?.value?.planDeliverTime?.[0] || '',
|
||||
end: this.sf?.value?.planDeliverTime?.[1] || ''
|
||||
},
|
||||
};
|
||||
}
|
||||
get selectedRows() {
|
||||
return this.st?.list.filter(item => item.checked) || [];
|
||||
}
|
||||
search() {
|
||||
this.st?.load(1);
|
||||
this.getGoodsSourceStatistical();
|
||||
}
|
||||
getGoodsSourceStatistical() {
|
||||
this.tabs = {
|
||||
totalCount: 0,
|
||||
billStatus1: 0,
|
||||
billStatus2: 0,
|
||||
billStatus3: 0,
|
||||
billStatus4: 0,
|
||||
billStatus5: 0,
|
||||
billStatus6: 0,
|
||||
billStatus7: 0,
|
||||
billStatus8: 0,
|
||||
billStatus9: 0,
|
||||
billStatus10: 0,
|
||||
billStatus11: 0,
|
||||
billStatus12: 0,
|
||||
billStatus13: 0,
|
||||
billStatus14: 0
|
||||
};
|
||||
const params: any = Object.assign({}, this.reqParams || {});
|
||||
delete params.status;
|
||||
this.service.request(this.service.$api_listStatisticalStatus, params).subscribe((res: any) => {
|
||||
if (res) {
|
||||
let totalCount = 0;
|
||||
res.forEach((element: any) => {
|
||||
if (element.statusLabel === '新建') {
|
||||
this.tabs.billStatus1 = element.quantity;
|
||||
} else if (element.statusLabel === '运单已发送') {
|
||||
this.tabs.billStatus2 = element.quantity;
|
||||
} else if (element.statusLabel === '司机信息已获取') {
|
||||
this.tabs.billStatus3 = element.quantity;
|
||||
} else if (element.statusLabel === '司机信息已反馈') {
|
||||
this.tabs.billStatus4 = element.quantity;
|
||||
} else if (element.statusLabel === '签收单号已接收') {
|
||||
this.tabs.billStatus5 = element.quantity;
|
||||
} else if (element.statusLabel === '签收单号已反馈') {
|
||||
this.tabs.billStatus6 = element.quantity;
|
||||
} else if (element.statusLabel === '报道已接收') {
|
||||
this.tabs.billStatus7 = element.quantity;
|
||||
} else if (element.statusLabel === '报道已反馈') {
|
||||
this.tabs.billStatus8 = element.quantity;
|
||||
} else if (element.statusLabel === '发运已接收') {
|
||||
this.tabs.billStatus9 = element.quantity;
|
||||
} else if (element.statusLabel === '发运已反馈') {
|
||||
this.tabs.billStatus10 = element.quantity;
|
||||
} else if (element.statusLabel === '签收已接收') {
|
||||
this.tabs.billStatus11 = element.quantity;
|
||||
} else if (element.statusLabel === '签收已反馈') {
|
||||
this.tabs.billStatus12 = element.quantity;
|
||||
} else if (element.statusLabel === 'POD已获取') {
|
||||
this.tabs.billStatus13 = element.quantity;
|
||||
} else if (element.statusLabel === 'POD已反馈') {
|
||||
this.tabs.billStatus14 = element.quantity;
|
||||
}
|
||||
totalCount += element.quantity;
|
||||
});
|
||||
this.tabs.totalCount = totalCount;
|
||||
}
|
||||
});
|
||||
}
|
||||
selectChange(e: number) {
|
||||
this.resourceStatus = e;
|
||||
this.initST();
|
||||
setTimeout(() => {
|
||||
this.st.load();
|
||||
}, 500);
|
||||
}
|
||||
ngOnInit(): void {
|
||||
this.getGoodsSourceStatistical();
|
||||
this.initSF();
|
||||
this.initST();
|
||||
}
|
||||
|
||||
/**
|
||||
* 初始化查询表单
|
||||
*/
|
||||
initSF() {
|
||||
this.schema = {
|
||||
properties: {
|
||||
_$expand: { type: 'boolean', ui: { hidden: true } },
|
||||
blNo: {
|
||||
type: 'string',
|
||||
title: '运单号'
|
||||
},
|
||||
status: {
|
||||
title: '运单状态',
|
||||
type: 'string',
|
||||
ui: {
|
||||
widget: 'dict-select',
|
||||
params: { dictKey: 'api:bill:status' },
|
||||
containsAllLabel: true,
|
||||
} as SFSelectWidgetSchema
|
||||
},
|
||||
source: {
|
||||
title: '运单来源',
|
||||
type: 'string',
|
||||
ui: {
|
||||
widget: 'dict-select',
|
||||
params: { dictKey: 'api:bill:source' },
|
||||
containsAllLabel: true,
|
||||
} as SFSelectWidgetSchema
|
||||
},
|
||||
planDeliverTime: {
|
||||
title: '计划发货时间',
|
||||
type: 'string',
|
||||
ui: {
|
||||
widget: 'date',
|
||||
mode: 'range',
|
||||
format: 'yyyy-MM-dd',
|
||||
allowClear: true,
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value
|
||||
}
|
||||
} as SFDateWidgetSchema
|
||||
},
|
||||
createTime: {
|
||||
title: '创建时间',
|
||||
type: 'string',
|
||||
ui: {
|
||||
widget: 'date',
|
||||
mode: 'range',
|
||||
format: 'yyyy-MM-dd',
|
||||
allowClear: true,
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value
|
||||
}
|
||||
} as SFDateWidgetSchema
|
||||
},
|
||||
},
|
||||
type: 'object'
|
||||
};
|
||||
this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } };
|
||||
}
|
||||
// 获取城市列表
|
||||
getRegionCode(regionCode: any) {
|
||||
console.log(regionCode);
|
||||
return this.service
|
||||
.request(this.service.$api_get_enterprise_project, { id: regionCode })
|
||||
.pipe(
|
||||
map(res =>
|
||||
res.map((item: any) => ({
|
||||
label: item.projectName,
|
||||
value: item.id
|
||||
}))
|
||||
)
|
||||
)
|
||||
.subscribe(res => {
|
||||
this.sf.getProperty('/enterpriseProjectId')!.schema.enum = res;
|
||||
this.sf.getProperty('/enterpriseProjectId')!.widget.reset(res);
|
||||
});
|
||||
}
|
||||
/**
|
||||
* 初始化数据列表
|
||||
*/
|
||||
initST() {
|
||||
this.columns = [
|
||||
{ title: '', type: 'checkbox', fixed: 'left', width: '50px', className: 'text-center' },
|
||||
{
|
||||
title: '运单号',
|
||||
width: '180px',
|
||||
fixed: 'left',
|
||||
className: 'text-left',
|
||||
render: 'blNo',
|
||||
index: 'blNo'
|
||||
},
|
||||
{
|
||||
title: '运单状态',
|
||||
width: '250px',
|
||||
className: 'text-left',
|
||||
index: 'statusLabel'
|
||||
},
|
||||
{ title: '运单来源', index: 'sourceLabel', width: '220px', className: 'text-left' },
|
||||
{ title: '计划发货时间', index: 'planDeliverTime', width: '220px', className: 'text-left' },
|
||||
{ title: '创建时间', index: 'createTime', width: '220px', className: 'text-left' },
|
||||
{ title: '件数', index: 'quantity', width: '220px', className: 'text-left' },
|
||||
{ title: '重量', index: 'weight', width: '180px', className: 'text-left' },
|
||||
{ title: '体积', index: 'volume', width: '180px', className: 'text-left' },
|
||||
];
|
||||
}
|
||||
/**
|
||||
* 查询字段个数
|
||||
*/
|
||||
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;
|
||||
}
|
||||
|
||||
exprot() {
|
||||
this.service.downloadFile(this.service.$api_get_asyncExport, { ...this.reqParams, pageSize: -1 });
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,25 @@
|
||||
/*
|
||||
* @Description :
|
||||
* @Version : 1.0
|
||||
* @Author : Shiming
|
||||
* @Date : 2022-01-06 09:24:00
|
||||
* @LastEditors : Shiming
|
||||
* @LastEditTime : 2022-01-25 17:21:54
|
||||
* @FilePath : \\tms-obc-web\\src\\app\\routes\\insurance-management\\interface-docking-routing.module.ts
|
||||
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
||||
*/
|
||||
import { NgModule } from '@angular/core';
|
||||
import { RouterModule, Routes } from '@angular/router';
|
||||
import {interfaceDockingWaybillComponent} from './components/waybill/waybill.component';
|
||||
import {interfaceDockingSetComponent} from './components/set/set.component';
|
||||
|
||||
|
||||
const routes: Routes = [
|
||||
{ path: 'list', component: interfaceDockingWaybillComponent },
|
||||
{ path: 'list-set/:id', component: interfaceDockingSetComponent },
|
||||
]
|
||||
@NgModule({
|
||||
imports: [RouterModule.forChild(routes)],
|
||||
exports: [RouterModule]
|
||||
})
|
||||
export class InterfaceDockingRoutingModule { }
|
||||
23
src/app/routes/interface-docking/interface-docking.module.ts
Normal file
23
src/app/routes/interface-docking/interface-docking.module.ts
Normal file
@ -0,0 +1,23 @@
|
||||
/*
|
||||
* @Description :
|
||||
* @Version : 1.0
|
||||
* @Author : Shiming
|
||||
* @Date : 2022-01-06 09:24:00
|
||||
* @LastEditors : Shiming
|
||||
* @LastEditTime : 2022-01-25 20:45:45
|
||||
* @FilePath : \\tms-obc-web\\src\\app\\routes\\interface-docking\\interface-docking.module.ts
|
||||
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
||||
*/
|
||||
|
||||
import { NgModule, Type } from '@angular/core';
|
||||
import { InsuranceTableModule, SharedModule } from '@shared';
|
||||
import { interfaceDockingWaybillComponent } from './components/waybill/waybill.component';
|
||||
import { interfaceDockingSetComponent } from './components/set/set.component';
|
||||
import { InterfaceDockingRoutingModule } from './interface-docking-routing.module';
|
||||
const COMPONENTS: Type<void>[] = [interfaceDockingWaybillComponent, interfaceDockingSetComponent];
|
||||
|
||||
@NgModule({
|
||||
imports: [SharedModule, InterfaceDockingRoutingModule, InsuranceTableModule],
|
||||
declarations: COMPONENTS
|
||||
})
|
||||
export class InterfaceDockingModule {}
|
||||
@ -0,0 +1,39 @@
|
||||
/*
|
||||
* @Description :
|
||||
* @Version : 1.0
|
||||
* @Author : fangliang
|
||||
* @Date : 2022-04-14
|
||||
* @LastEditors : fangliang
|
||||
* @LastEditTime : 2022-04-14
|
||||
* @FilePath : \\tms-obc-web\\src\\app\\routes\\interface-docking\\services\\interface-docking.service.ts
|
||||
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
||||
*/
|
||||
|
||||
import { Injectable, Injector } from '@angular/core';
|
||||
import { EACacheService, ShipperBaseService } from '@shared';
|
||||
import { map } from 'rxjs/operators';
|
||||
|
||||
@Injectable({
|
||||
providedIn: 'root'
|
||||
})
|
||||
export class InterfaceDockingService extends ShipperBaseService {
|
||||
|
||||
// 查询运单信息表
|
||||
public $api_waybillInfo_list = '/api/sdc/dock/bill/list/page';
|
||||
public $api_listStatisticalStatus = '/api/sdc/dock/bill/listStatisticalStatus';
|
||||
|
||||
|
||||
// 保险费列表数据导出接口
|
||||
$api_get_asyncExport = `/api/sdc/premiumInfo/asyncExport`;
|
||||
|
||||
public reviewPDF(url: string) {
|
||||
if (!url) {
|
||||
return;
|
||||
}
|
||||
this.openURL(url);
|
||||
}
|
||||
|
||||
constructor(public injector: Injector) {
|
||||
super(injector);
|
||||
}
|
||||
}
|
||||
@ -4,7 +4,7 @@
|
||||
* @Author : Shiming
|
||||
* @Date : 2021-12-24 16:58:02
|
||||
* @LastEditors : Shiming
|
||||
* @LastEditTime : 2022-04-11 19:26:19
|
||||
* @LastEditTime : 2022-04-20 14:46:48
|
||||
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail-change\\bulk-detail-change.component.ts
|
||||
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
||||
*/
|
||||
@ -146,7 +146,7 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit {
|
||||
appId: this.envSrv.env.appId,
|
||||
content: [
|
||||
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
|
||||
`上传位置:${this.i?.loadingAddressArr[0]}`,
|
||||
`上传位置:${this.i?.unLoadingPlaceList[0]?.province}`,
|
||||
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
|
||||
],
|
||||
position: '2',
|
||||
@ -192,7 +192,7 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit {
|
||||
appId: this.envSrv.env.appId,
|
||||
content: [
|
||||
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
|
||||
`上传位置:${this.i?.loadingAddressArr[0]}`,
|
||||
`上传位置:${this.i?.unLoadingPlaceList[0]?.province}`,
|
||||
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
|
||||
],
|
||||
position: '2',
|
||||
@ -246,7 +246,7 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit {
|
||||
appId: this.envSrv.env.appId,
|
||||
content: [
|
||||
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
|
||||
`上传位置:${this.i?.unloadingAddressArr[0]}`,
|
||||
`上传位置:${this.i?.unLoadingPlaceList[1]?.province}`,
|
||||
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
|
||||
],
|
||||
position: '2',
|
||||
@ -292,7 +292,7 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit {
|
||||
appId: this.envSrv.env.appId,
|
||||
content: [
|
||||
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
|
||||
`上传位置:${this.i?.unloadingAddressArr[0]}`,
|
||||
`上传位置:${this.i?.unLoadingPlaceList[1]?.province}`,
|
||||
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
|
||||
],
|
||||
position: '2',
|
||||
@ -571,21 +571,21 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit {
|
||||
acceptVolume: this.sf4.value?.acceptVolume,
|
||||
settlementWeight: this.sf4.value?.settlementWeight,
|
||||
settlementVolume: this.sf4.value?.settlementVolume,
|
||||
loadingLadingBillFilePath: this.sf.value?.loadingLadingBillFilePath?.data
|
||||
? this.sf.value?.loadingLadingBillFilePath.data.fullFilePath
|
||||
: this.sf.value?.loadingLadingBillFilePath?.url,
|
||||
loadingLadingBillFilePath: this.sf?.value?.loadingLadingBillFilePath?.data
|
||||
? this.sf?.value?.loadingLadingBillFilePath.data.fullFilePath
|
||||
: this.sf?.value?.loadingLadingBillFilePath?.url,
|
||||
|
||||
loadingPeopleVehiclesGoodsFilePath: this.sf.value?.loadingPeopleVehiclesGoodsFilePath?.data
|
||||
? this.sf.value?.loadingPeopleVehiclesGoodsFilePath.data.fullFilePath
|
||||
: this.sf.value?.loadingPeopleVehiclesGoodsFilePath?.url,
|
||||
loadingPeopleVehiclesGoodsFilePath: this.sf?.value?.loadingPeopleVehiclesGoodsFilePath?.data
|
||||
? this.sf?.value?.loadingPeopleVehiclesGoodsFilePath.data.fullFilePath
|
||||
: this.sf?.value?.loadingPeopleVehiclesGoodsFilePath?.url,
|
||||
|
||||
unloadingLadingBillFilePath: this.sf.value?.unloadingLadingBillFilePath?.data
|
||||
? this.sf.value?.unloadingLadingBillFilePath.data.fullFilePath
|
||||
: this.sf.value?.unloadingLadingBillFilePath?.url,
|
||||
unloadingLadingBillFilePath: this.sf?.value?.unloadingLadingBillFilePath?.data
|
||||
? this.sf?.value?.unloadingLadingBillFilePath.data.fullFilePath
|
||||
: this.sf?.value?.unloadingLadingBillFilePath?.url,
|
||||
|
||||
unloadingPeopleVehiclesGoodsFilePath: this.sf.value?.unloadingPeopleVehiclesGoodsFilePath?.data
|
||||
? this.sf.value?.unloadingPeopleVehiclesGoodsFilePath.data.fullFilePath
|
||||
: this.sf.value?.unloadingPeopleVehiclesGoodsFilePath?.url
|
||||
unloadingPeopleVehiclesGoodsFilePath: this.sf?.value?.unloadingPeopleVehiclesGoodsFilePath?.data
|
||||
? this.sf?.value?.unloadingPeopleVehiclesGoodsFilePath.data.fullFilePath
|
||||
: this.sf?.value?.unloadingPeopleVehiclesGoodsFilePath?.url
|
||||
};
|
||||
this.service.request(this.service.$api_set_modifyBulkOrder, params).subscribe((res: any) => {
|
||||
if (res) {
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
* @Author : Shiming
|
||||
* @Date : 2021-12-23 13:39:58
|
||||
* @LastEditors : Shiming
|
||||
* @LastEditTime : 2022-04-11 19:26:34
|
||||
* @LastEditTime : 2022-04-20 14:48:08
|
||||
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail-change\\vehicle-detail-change.component.ts
|
||||
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
||||
*/
|
||||
@ -137,7 +137,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
|
||||
appId: this.envSrv.env.appId,
|
||||
content: [
|
||||
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
|
||||
`上传位置:${this.i?.loadingAddressArr[0]}`,
|
||||
`上传位置:${this.i?.unLoadingPlaceList[0]?.province}`,
|
||||
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
|
||||
],
|
||||
position: '2',
|
||||
@ -183,7 +183,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
|
||||
appId: this.envSrv.env.appId,
|
||||
content: [
|
||||
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
|
||||
`上传位置:${this.i?.loadingAddressArr[0]}`,
|
||||
`上传位置:${this.i?.unLoadingPlaceList[0]?.province}`,
|
||||
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
|
||||
],
|
||||
position: '2',
|
||||
@ -237,7 +237,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
|
||||
appId: this.envSrv.env.appId,
|
||||
content: [
|
||||
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
|
||||
`上传位置:${this.i?.unloadingAddressArr[0]}`,
|
||||
`上传位置:${this.i?.unLoadingPlaceList[1]?.province}`,
|
||||
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
|
||||
],
|
||||
position: '2',
|
||||
@ -283,7 +283,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
|
||||
appId: this.envSrv.env.appId,
|
||||
content: [
|
||||
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
|
||||
`上传位置:${this.i?.unloadingAddressArr[0]}`,
|
||||
`上传位置:${this.i?.unLoadingPlaceList[1]?.province}`,
|
||||
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
|
||||
],
|
||||
position: '2',
|
||||
|
||||
@ -20,7 +20,6 @@ import { WaybillManagementServe } from 'src/app/routes/waybill-management/servic
|
||||
providers: [DatePipe]
|
||||
})
|
||||
export class VehicleSureArriveComponent implements OnInit {
|
||||
record: any = {};
|
||||
i: any;
|
||||
formData: any;
|
||||
Status: any;
|
||||
@ -70,8 +69,8 @@ export class VehicleSureArriveComponent implements OnInit {
|
||||
data: {
|
||||
appId: this.envSrv.env.appId,
|
||||
content: [
|
||||
`上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
|
||||
`上传位置:${this.record?.loadingAddressArr[0]}`,
|
||||
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
|
||||
`上传位置:${this.i?.loadingPlace[0]}`,
|
||||
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
|
||||
],
|
||||
position: '2',
|
||||
@ -115,8 +114,8 @@ export class VehicleSureArriveComponent implements OnInit {
|
||||
data: {
|
||||
appId: this.envSrv.env.appId,
|
||||
content: [
|
||||
`上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
|
||||
`上传位置:${this.record?.loadingAddressArr[0]}`,
|
||||
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
|
||||
`上传位置:${this.i?.loadingPlace[0]}`,
|
||||
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
|
||||
],
|
||||
position: '2',
|
||||
@ -168,8 +167,8 @@ export class VehicleSureArriveComponent implements OnInit {
|
||||
data: {
|
||||
appId: this.envSrv.env.appId,
|
||||
content: [
|
||||
`上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
|
||||
`上传位置:${this.record?.unloadingAddressArr[0]}`,
|
||||
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
|
||||
`上传位置:${this.i?.dischargePlace[0]}`,
|
||||
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
|
||||
],
|
||||
position: '2',
|
||||
@ -213,8 +212,8 @@ export class VehicleSureArriveComponent implements OnInit {
|
||||
data: {
|
||||
appId: this.envSrv.env.appId,
|
||||
content: [
|
||||
`上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
|
||||
`上传位置:${this.record?.unloadingAddressArr[0]}`,
|
||||
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
|
||||
`上传位置:${this.i?.dischargePlace[0]}`,
|
||||
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
|
||||
],
|
||||
position: '2',
|
||||
@ -283,8 +282,8 @@ export class VehicleSureArriveComponent implements OnInit {
|
||||
data: {
|
||||
appId: this.envSrv.env.appId,
|
||||
content: [
|
||||
`上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
|
||||
`上传位置:${this.record?.loadingAddressArr[0]}`,
|
||||
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
|
||||
`上传位置:${this.i?.loadingPlace[0]}`,
|
||||
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
|
||||
],
|
||||
position: '2',
|
||||
@ -328,8 +327,8 @@ export class VehicleSureArriveComponent implements OnInit {
|
||||
data: {
|
||||
appId: this.envSrv.env.appId,
|
||||
content: [
|
||||
`上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
|
||||
`上传位置:${this.record?.loadingAddressArr[0]}`,
|
||||
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
|
||||
`上传位置:${this.i?.loadingPlace[0]}`,
|
||||
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
|
||||
],
|
||||
position: '2',
|
||||
@ -381,8 +380,8 @@ export class VehicleSureArriveComponent implements OnInit {
|
||||
data: {
|
||||
appId: this.envSrv.env.appId,
|
||||
content: [
|
||||
`上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
|
||||
`上传位置:${this.record?.unloadingAddressArr[0]}`,
|
||||
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
|
||||
`上传位置:${this.i?.dischargePlace[0]}`,
|
||||
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
|
||||
],
|
||||
position: '2',
|
||||
@ -426,8 +425,8 @@ export class VehicleSureArriveComponent implements OnInit {
|
||||
data: {
|
||||
appId: this.envSrv.env.appId,
|
||||
content: [
|
||||
`上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
|
||||
`上传位置:${this.record?.unloadingAddressArr[0]}`,
|
||||
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
|
||||
`上传位置:${this.i?.dischargePlace[0]}`,
|
||||
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
|
||||
],
|
||||
position: '2',
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
* @Author : Shiming
|
||||
* @Date : 2021-12-15 13:17:42
|
||||
* @LastEditors : Shiming
|
||||
* @LastEditTime : 2022-01-18 17:24:01
|
||||
* @LastEditTime : 2022-04-20 14:26:51
|
||||
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\sure-depart\\sure-depart.component.html
|
||||
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
||||
-->
|
||||
@ -26,5 +26,5 @@
|
||||
|
||||
<div class="modal-footer">
|
||||
<button nz-button type="button" (click)="close()">关闭</button>
|
||||
<button nz-button type="submit" nzType="primary" (click)="save(sf.value)" [nzLoading]="http.loading">确认发车</button>
|
||||
<button nz-button type="submit" nzType="primary" *ngIf="schema" (click)="save(sf.value)" [nzLoading]="http.loading">确认发车</button>
|
||||
</div>
|
||||
|
||||
@ -37,13 +37,17 @@ export class VehicleSureDepartComponent implements OnInit {
|
||||
public service: WaybillManagementServe,
|
||||
private envSrv: EAEnvironmentService,
|
||||
private datePipe: DatePipe
|
||||
) { }
|
||||
) {
|
||||
|
||||
}
|
||||
|
||||
ngOnInit(): void {
|
||||
this.initSF();
|
||||
console.log(this.i);
|
||||
this.initSF();
|
||||
|
||||
this.data.weight = this.i?.weight;
|
||||
this.i.time = this.i.loadingTime;
|
||||
|
||||
}
|
||||
initSF() {
|
||||
if (this.Status === 1) {
|
||||
@ -77,8 +81,8 @@ export class VehicleSureDepartComponent implements OnInit {
|
||||
data: {
|
||||
appId: this.envSrv.env.appId,
|
||||
content: [
|
||||
`上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
|
||||
`上传位置:${this.record?.loadingAddressArr[0]}`,
|
||||
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
|
||||
`上传位置:${this.i?.loadingPlace[0]}`,
|
||||
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
|
||||
],
|
||||
position: '2',
|
||||
@ -122,8 +126,8 @@ export class VehicleSureDepartComponent implements OnInit {
|
||||
data: {
|
||||
appId: this.envSrv.env.appId,
|
||||
content: [
|
||||
`上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
|
||||
`上传位置:${this.record?.loadingAddressArr[0]}`,
|
||||
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
|
||||
`上传位置:${this.i?.loadingPlace[0]}`,
|
||||
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
|
||||
],
|
||||
position: '2',
|
||||
@ -200,8 +204,8 @@ export class VehicleSureDepartComponent implements OnInit {
|
||||
data: {
|
||||
appId: this.envSrv.env.appId,
|
||||
content: [
|
||||
`上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
|
||||
`上传位置:${this.record?.loadingAddressArr[0]}`,
|
||||
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
|
||||
`上传位置:${this.i?.loadingPlace[0]}`,
|
||||
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
|
||||
],
|
||||
position: '2',
|
||||
@ -245,8 +249,8 @@ export class VehicleSureDepartComponent implements OnInit {
|
||||
data: {
|
||||
appId: this.envSrv.env.appId,
|
||||
content: [
|
||||
`上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
|
||||
`上传位置:${this.record?.loadingAddressArr[0]}`,
|
||||
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
|
||||
`上传位置:${this.i?.loadingPlace[0]}`,
|
||||
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
|
||||
],
|
||||
position: '2',
|
||||
|
||||
@ -77,6 +77,10 @@ const routes: Routes = [
|
||||
},
|
||||
{ path: 'datatable', loadChildren: () => import('./datatable/datatable.module').then((m) => m.DatatableModule) },
|
||||
{ path: 'tax', loadChildren: () => import('./tax-management/taxmanagement.module').then((m) => m.TaxManagementModule) },
|
||||
{
|
||||
path: 'interface-docking',
|
||||
loadChildren: () => import('./interface-docking/interface-docking.module').then(m => m.InterfaceDockingModule)
|
||||
},
|
||||
]
|
||||
},
|
||||
// passport
|
||||
|
||||
@ -516,7 +516,7 @@ export class NetworkFreightComponent implements OnInit {
|
||||
}
|
||||
// 基础设置
|
||||
settingAction(item?: any) {
|
||||
this.nzModalService.create({
|
||||
const modalRef = this.nzModalService.create({
|
||||
nzTitle: '系统配置',
|
||||
nzContent: DynamicSettingModalComponent,
|
||||
nzWidth: 900,
|
||||
@ -526,6 +526,12 @@ export class NetworkFreightComponent implements OnInit {
|
||||
},
|
||||
nzFooter: null
|
||||
});
|
||||
modalRef.afterClose.subscribe((res: boolean) => {
|
||||
if (res) {
|
||||
this.resetSF;
|
||||
this.st.load();
|
||||
}
|
||||
})
|
||||
}
|
||||
// 应用设置
|
||||
settingApp(item?: any) {
|
||||
|
||||
@ -40,7 +40,7 @@ export class CarSettleAddDriverComponent implements OnInit {
|
||||
public service: UsermanageService,
|
||||
private envSrv: EAEnvironmentService,
|
||||
private eaCacheSrv: EACacheService
|
||||
) {}
|
||||
) { }
|
||||
|
||||
ngOnInit(): void {
|
||||
this.companyData = this.eaCacheSrv.get(cacheConf.env);
|
||||
@ -243,7 +243,7 @@ export class CarSettleAddDriverComponent implements OnInit {
|
||||
default: ''
|
||||
}
|
||||
},
|
||||
required: ['mobile','certificatePhotoFrontWatermark', 'certificatePhotoBackWatermark', 'name', 'certificateNumber', 'bankCardNo']
|
||||
required: ['mobile', 'certificatePhotoFrontWatermark', 'certificatePhotoBackWatermark', 'name', 'certificateNumber']
|
||||
};
|
||||
this.schema1 = {
|
||||
properties: {
|
||||
@ -353,7 +353,7 @@ export class CarSettleAddDriverComponent implements OnInit {
|
||||
errors: {
|
||||
required: '请选择起始日期'
|
||||
},
|
||||
change: i => {}
|
||||
change: i => { }
|
||||
} as SFDateWidgetSchema
|
||||
},
|
||||
validEndTime: {
|
||||
@ -366,7 +366,7 @@ export class CarSettleAddDriverComponent implements OnInit {
|
||||
errors: {
|
||||
required: '请选择终止日期'
|
||||
},
|
||||
change: i => {}
|
||||
change: i => { }
|
||||
} as SFDateWidgetSchema
|
||||
},
|
||||
signingOrganization: {
|
||||
@ -481,7 +481,7 @@ export class CarSettleAddDriverComponent implements OnInit {
|
||||
errors: {
|
||||
required: '请选择起始日期'
|
||||
},
|
||||
change: i => {}
|
||||
change: i => { }
|
||||
} as SFDateWidgetSchema
|
||||
},
|
||||
validEndTime: {
|
||||
@ -494,7 +494,7 @@ export class CarSettleAddDriverComponent implements OnInit {
|
||||
errors: {
|
||||
required: '请选择终止日期'
|
||||
},
|
||||
change: i => {}
|
||||
change: i => { }
|
||||
} as SFDateWidgetSchema
|
||||
}
|
||||
},
|
||||
@ -547,7 +547,7 @@ export class CarSettleAddDriverComponent implements OnInit {
|
||||
grid: { span: 18 },
|
||||
width: 600,
|
||||
},
|
||||
$titleB:{
|
||||
$titleB: {
|
||||
grid: { span: 24 },
|
||||
},
|
||||
$certificatePhotoWatermark: {
|
||||
@ -564,7 +564,7 @@ export class CarSettleAddDriverComponent implements OnInit {
|
||||
grid: { span: 18 },
|
||||
width: 600,
|
||||
},
|
||||
$titleC:{
|
||||
$titleC: {
|
||||
grid: { span: 24 },
|
||||
},
|
||||
$certificatePhotoWatermark: {
|
||||
@ -579,7 +579,7 @@ export class CarSettleAddDriverComponent implements OnInit {
|
||||
getRegionToThree() {
|
||||
// 获取一、二、三级地区详情
|
||||
this.service.http.post(this.service.$api_getRegionToThree).subscribe((res) => {
|
||||
if(this.sf1){
|
||||
if (this.sf1) {
|
||||
this.sf1.getProperty('/enterpriseAddressCode')!.schema.enum = res.data;
|
||||
this.sf1?.getProperty('/enterpriseAddressCode')?.widget.reset(res.data);
|
||||
}
|
||||
|
||||
@ -265,13 +265,13 @@
|
||||
{{ carDatail?.carNo }}
|
||||
</sv>
|
||||
<sv label="车牌颜色">
|
||||
{{ carDatail?.carNoColor }}
|
||||
{{ carDatail?.carNoColorLabel }}
|
||||
</sv>
|
||||
<sv label="车型">
|
||||
{{ carDatail?.carModel }}
|
||||
{{ carDatail?.carModelLabel }}
|
||||
</sv>
|
||||
<sv label="车长">
|
||||
{{ carDatail?.carLength }}
|
||||
{{ carDatail?.carLengthLabel ? carDatail?.carLengthLabel +'米' :'' }}
|
||||
</sv>
|
||||
<sv label="是否为当前车辆">
|
||||
{{ carDatail?.isDefault?'是':'否' }}
|
||||
|
||||
@ -35,7 +35,7 @@
|
||||
</button>
|
||||
<button *ngIf="!userDetail?.stateLocked" [nzLoading]="service.http.loading" nz-button nzDanger nzGhost
|
||||
(click)="userAction(0)" acl [acl-ability]="['USERCENTER-FREIGHT-USER-D-lock']">
|
||||
冻结33
|
||||
冻结
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
@ -80,7 +80,23 @@
|
||||
<input nz-input type="text" [minlength]="18" [maxlength]="18" [(ngModel)]="userIdentityDetail.certificateNumber" [readonly]="!isEditUser"
|
||||
[nzBorderless]="!isEditUser" [placeholder]="isEditUser?'':'-'">
|
||||
</sv>
|
||||
<sv label="身份证照">
|
||||
<sv label="有效期" col="1">
|
||||
<nz-date-picker [(ngModel)]="userIdentityDetail.validStartTime" [nzDisabled]="!isEditUser" nzPlaceHolder=" "
|
||||
[nzBorderless]="!isEditUser" [nzSuffixIcon]="isEditUser?'calendar':''" style="width: 130px;" class="calendar">
|
||||
</nz-date-picker>
|
||||
-
|
||||
<ng-container *ngIf="!isEditUser && !userIdentityDetail?.validEndTime && userIdentityDetail?.validStartTime">
|
||||
<label style="padding-left: 11px;">长期</label>
|
||||
</ng-container>
|
||||
<nz-date-picker [(ngModel)]="userIdentityDetail.validEndTime" [nzDisabled]="!isEditUser" nzPlaceHolder=" "
|
||||
[nzBorderless]="!isEditUser" [nzSuffixIcon]="isEditUser?'calendar':''" style="width: 130px;" class="calendar">
|
||||
</nz-date-picker>
|
||||
<ng-container *ngIf="isEditUser">
|
||||
<label nz-checkbox [ngModel]="!!!userIdentityDetail.validEndTime"
|
||||
(ngModelChange)="$event?userIdentityDetail.validEndTime='':''" class="ml-sm">长期</label>
|
||||
</ng-container>
|
||||
</sv>
|
||||
<sv label="身份证照" col="1">
|
||||
<div class="d-flex">
|
||||
<ng-container
|
||||
*ngTemplateOutlet="uploadTemplate;context:{data:userIdentityDetail,status:isEditUser,key:'certificatePhotoFrontWatermark',key2:'certificatePhotoFront',hover:'certificateBackFront'}">
|
||||
|
||||
@ -3,7 +3,7 @@ import { ActivatedRoute } from '@angular/router';
|
||||
import { apiConf } from '@conf/api.conf';
|
||||
import { STColumn, STComponent } from '@delon/abc/st';
|
||||
import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
|
||||
import { ModalHelper, _HttpClient } from '@delon/theme';
|
||||
import { ModalHelper, _HttpClient, DatePipe } from '@delon/theme';
|
||||
import { NzImageService } from 'ng-zorro-antd/image';
|
||||
import { NzMessageService } from 'ng-zorro-antd/message';
|
||||
import { NzModalService } from 'ng-zorro-antd/modal';
|
||||
@ -13,7 +13,8 @@ import { UsermanageService } from '../../../../services/usercenter.service';
|
||||
@Component({
|
||||
selector: 'app-supplier-components-list-view',
|
||||
templateUrl: './detail.component.html',
|
||||
styleUrls: ['./detail.component.less']
|
||||
styleUrls: ['./detail.component.less'],
|
||||
providers:[DatePipe]
|
||||
})
|
||||
export class FreightComponentsUserDetailComponent implements OnInit {
|
||||
@ViewChild('redectModal', { static: false })
|
||||
@ -39,7 +40,8 @@ export class FreightComponentsUserDetailComponent implements OnInit {
|
||||
private nzModalService: NzModalService,
|
||||
public service: UsermanageService,
|
||||
public route: ActivatedRoute,
|
||||
private nzImageService: NzImageService
|
||||
private nzImageService: NzImageService,
|
||||
private datePipe: DatePipe
|
||||
) {}
|
||||
|
||||
ngOnInit() {
|
||||
@ -154,7 +156,12 @@ export class FreightComponentsUserDetailComponent implements OnInit {
|
||||
}
|
||||
|
||||
saveUser() {
|
||||
const params = { ...this.userIdentityDetail };
|
||||
const params = {...this.userIdentityDetail};
|
||||
Object.assign(params, {
|
||||
...this.userIdentityDetail,
|
||||
validStartTime: this.datePipe.transform(this.userIdentityDetail?.validStartTime, 'yyyy-MM-dd'),
|
||||
validEndTime: this.datePipe.transform(this.userIdentityDetail?.validEndTime, 'yyyy-MM-dd'),
|
||||
});
|
||||
this.service.request(this.service.$api_update_driver_identity, params).subscribe(res => {
|
||||
if (res) {
|
||||
this.service.msgSrv.success('修改成功');
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
import { Placeholder } from '@angular/compiler/src/i18n/i18n_ast';
|
||||
import { Component, OnInit, ViewChild } from '@angular/core';
|
||||
import { apiConf } from '@conf/api.conf';
|
||||
import { cacheConf } from '@conf/cache.conf';
|
||||
@ -131,7 +132,8 @@ export class CarSettleCarauthComponent implements OnInit {
|
||||
},
|
||||
];
|
||||
this.sf?.setValue('/carFrontPhotoWatermark', avatar);
|
||||
this.detailData.carFrontPhoto = args.file.response.data.fullFilePath
|
||||
this.detailData.carFrontPhoto = args.file.response.data.fullFilePath;
|
||||
this.checkCarCard(args.file.response.data.fullFilePath, 'back');
|
||||
}
|
||||
},
|
||||
beforeUpload: (file: any, _fileList: any) => {
|
||||
@ -174,12 +176,10 @@ export class CarSettleCarauthComponent implements OnInit {
|
||||
carModel: {
|
||||
title: '车型',
|
||||
type: 'string',
|
||||
readOnly: true,
|
||||
ui: {
|
||||
widget: 'dict-select',
|
||||
params: { dictKey: 'car:model' },
|
||||
placeholder: '请选择车型',
|
||||
containsAllLabel:false,
|
||||
} as SFSelectWidgetSchema,
|
||||
placeholder:'请上传行驶证自动带出'
|
||||
},
|
||||
},
|
||||
carLength: {
|
||||
title: '车长',
|
||||
@ -682,6 +682,7 @@ export class CarSettleCarauthComponent implements OnInit {
|
||||
this.sf.setValue('/carDistinguishCode', res.vin);
|
||||
this.sf.setValue('/carOwner', res.name);
|
||||
this.sf.setValue('/useNature', res.useCharacter === '非营运' ? 0 : 1);
|
||||
this.sf.setValue('/carModel', res?.vehicleType);
|
||||
|
||||
} else {
|
||||
this.sf.setValue('/curbWeight', res.unladenMass);
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
* @Author : Shiming
|
||||
* @Date : 2022-01-10 16:06:17
|
||||
* @LastEditors : Shiming
|
||||
* @LastEditTime : 2022-03-22 10:05:15
|
||||
* @LastEditTime : 2022-04-20 10:00:02
|
||||
* @FilePath : \\tms-obc-web\\src\\app\\shared\\components\\dynamic-setting\\dynamic-setting-modal\\dynamic-setting-modal.component.ts
|
||||
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
||||
*/
|
||||
|
||||
@ -210,6 +210,15 @@
|
||||
"link": "/insurance-management/list"
|
||||
}]
|
||||
},
|
||||
{
|
||||
"text": "接口对接",
|
||||
"icon": "iconfont icon-yundan-copy",
|
||||
"group": true,
|
||||
"children": [{
|
||||
"text": "运单列表",
|
||||
"link": "/interface-docking/list"
|
||||
}]
|
||||
},
|
||||
{
|
||||
"text": "财务管理",
|
||||
"icon": "iconfont icon-caiwu-copy",
|
||||
|
||||
Reference in New Issue
Block a user