Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

This commit is contained in:
Taric Xin
2021-12-07 13:25:56 +08:00
21 changed files with 1403 additions and 16 deletions

View File

@ -0,0 +1,103 @@
<!--
* @Author: your name
* @Date: 2021-12-03 11:10:14
* @LastEditTime: 2021-12-07 11:16:41
* @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\supply-management\components\vehicle\vehicle.component.html
-->
<!-- 搜索表单 -->
<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]="service.http.loading"
(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" [disabled]="!sf.valid" [nzLoading]="service.http.loading"
(click)="st?.load(1)">查询</button>
<button nz-button nzType="primary"
>导出</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>
<nz-tabset (nzSelectedIndexChange)="selectChange($event)" >
<nz-tab *ngFor="let tab of tabs; let i = index" [nzTitle]="tab.name + ' (' + tab.count + ') '" (nzClick)="tabChange(i)">
</nz-tab>
</nz-tabset>
<div style="margin-top: 15px;">
<!-- [req]="{ method: 'GET', 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] }"
[loadingDelay]="500" [loading]="service.http.loading" -->
<st #st [scroll]="{ x: '1200px' }" [data]="service.$api_get_catalogue_member" [columns]="columns">
<ng-template st-row="goodsId" let-item let-index="index">
<a [routerLink]="'/order-management/bulk-detail/'+item.id">{{item.no}}</a>
</ng-template>
</st>
</div>
</nz-card>
<nz-modal [(nzVisible)]="isVisibleView" [nzWidth]="600" [nzFooter]="nzModalFooterview" nzTitle="查看" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel('0')">
<ng-container *nzModalContent>
<sv-container labelWidth="160" class="apply-sv">
<sv label="车牌号" col="1">{{ infoData1?.enterpriseName }}</sv>
<sv label="车型" col="1">{{ infoData1?.unifiedSocialCreditCode }}</sv>
<sv label="车长" col="1">{{ infoData1?.enterpriseType }}</sv>
<sv label="载重" col="1">{{ infoData1?.registrationCapital }} 万元</sv>
<sv label="备注" col="1">{{ infoData1?.enterpriseRegistrationTime }}</sv>
<sv label=" 行驶证" col="1">
<!-- <span class="sv-img"
><img
[src]="infoData1?.enterpriseQualificationCertificateurl"
(click)="viewImg(infoData1?.enterpriseQualificationCertificateurl)"
/></span> -->
</sv>
<sv label="行驶证过期时间" col="1">{{ infoData1?.enterpriseAddress }}</sv>
<sv label="道运证" col="1">
<!-- <span class="sv-img"
><img
[src]="infoData1?.enterpriseQualificationCertificateurl"
(click)="viewImg(infoData1?.enterpriseQualificationCertificateurl)"
/></span> -->
</sv>
<sv label="道运证过期时间" col="1">{{ infoData1?.businessScope }}</sv>
</sv-container>
</ng-container>
<ng-template #nzModalFooterview>
<button *ngIf="!auditstatus" nz-button nzType="default" (click)="Reject()">驳回</button>
<button *ngIf="!auditstatus" nz-button nzType="primary" (click)="handleOK()">通过</button>
<button *ngIf="auditstatus" nz-button nzType="primary" (click)="handleCancel('0')">取消</button>
</ng-template>
</nz-modal>
<nz-modal [(nzVisible)]="isVisibleRE" [nzWidth]="600" [nzFooter]="nzModalFooterview2" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel('1')">
<ng-container *nzModalContent>
<sf #sfView [schema]="schemaView" [ui]="uiView" [compact]="true" [button]="'none'">
</sf>
</ng-container>
<ng-template #nzModalFooterview2>
<button nz-button nzType="default" (click)="handleCancel('1')">取消</button>
<button nz-button nzType="primary" (click)="handleOK()">确定</button>
</ng-template>
</nz-modal>

View File

@ -0,0 +1,7 @@
.left_btn {
width: 50px;
height: 32px;
padding-left: 8px;
line-height:32px;
background-color: #d7d7d7;
}

View File

@ -0,0 +1,40 @@
/*
* @Author: your name
* @Date: 2021-12-06 20:03:28
* @LastEditTime: 2021-12-07 11:21:42
* @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\order-management\components\bulk\bulk.component.spec.ts
*/
/*
* @Author: your name
* @Date: 2021-12-06 19:39:49
* @LastEditTime: 2021-12-06 19:41:08
* @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\bulk\bulk.component.spec.ts
*/
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
import { OrderManagementAdditionalcComponent } from './additionalc.component';
describe('OrderManagementAdditionalcComponent', () => {
let component: OrderManagementAdditionalcComponent;
let fixture: ComponentFixture<OrderManagementAdditionalcComponent>;
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [ OrderManagementAdditionalcComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(OrderManagementAdditionalcComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

View File

@ -0,0 +1,289 @@
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 { SupplyManagementService } from '../../services/order-management.service';
@Component({
selector: 'app-supply-management-additionalc',
templateUrl: './additionalc.component.html',
styleUrls: ['./additionalc.component.less']
})
export class OrderManagementAdditionalcComponent implements OnInit {
url = `/user?_allow_anonymous=true`;
ui: SFUISchema = {};
uiView: SFUISchema = {};
schema: SFSchema = {};
schemaView: SFSchema = {};
auditMany = false;
auditstatus = false;
isVisibleView = false;
isVisibleRE = false;
_$expand = false;
infoData1: any;
@ViewChild('st') private readonly st!: STComponent;
@ViewChild('sf', { static: false }) sf!: SFComponent;
@ViewChild('sfView', { static: false }) sfView!: SFComponent;
columns: STColumn[] = [];
demoValue: any;
datass: any = [
{
one: '1',
two: '1',
three: '1',
id: 1
},
{
one: '2',
two: '2',
three: '2',
id: 2
},
];
tabs = [ {
name: '全部',
type: 5,
count: 0,
},
{
name: '待审核',
type: 5,
count: 0,
},
{
name: '已审核',
type: 5,
count: 0,
},
{
name: '驳回',
type: 5,
count: 0,
}
];
constructor(public service: SupplyManagementService, private modal: NzModalService) { }
/**
* 查询参数
*/
get reqParams() {
return {
...this.sf?.value,
};
}
get selectedRows() {
return this.st?.list.filter((item) => item.checked) || [];
}
ngOnInit(): void {
this.initSF();
this.initST();
this.initSFReject();
}
/**
* 初始化查询表单
*/
initSF() {
this.schema = {
properties: {
no: {
type: 'string',
title: '公司名称',
},
no2: {
type: 'string',
title: '车牌号'
},
},
};
this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } };
}
initSFReject() {
this.schemaView = {
properties: {
roleDescription: {
title: '驳回原因',
type: 'string',
maxLength: 50,
ui: {
placeholder: '请输入驳回原因最多不超过50字',
widget: 'textarea',
autosize: { minRows: 2, maxRows: 6 }
},
},
},
};
this.uiView = { '*': { spanLabelFixed: 110, grid: { span: 12 } } };
}
/**
* 初始化数据列表
*/
initST() {
this.columns = [
{
title: '公司名称',
width: '100px',
className: 'text-center',
render: 'goodsId'
},
{
title: '车牌号',
width: '100px',
className: 'text-center',
},
{ title: '车型', index: 'externalSn', width: '120px', className: 'text-center' },
{ title: '车长(m)', index: 'linkUrl', width: '120px', className: 'text-center' },
{
title: '载重(吨)',
className: 'text-center',
width: '120px',
},
{
title: '行驶证',
className: 'text-center',
width: '120px',
},
{
title: '道运证',
className: 'text-center',
width: '120px',
},
{
title: '审核状态',
className: 'text-center',
width: '120px',
},
{
title: '驳回原因',
className: 'text-center',
width: '120px',
},
{
title: '添加时间',
className: 'text-center',
width: '120px',
},
{
title: '驳回原因',
className: 'text-center',
width: '120px',
render: 'feiong'
},
{
title: '添加人',
className: 'text-center',
width: '120px',
},
{
title: '操作',
fixed: 'right',
width: '200px',
className: 'text-left',
buttons: [
{
text: '审核',
click: (_record) => this.viewAudit(_record),
},
{
text: '查看详情',
click: (_record) => this.viewDetail(_record),
},
],
},
];
}
/**
* 查询字段个数
*/
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;
}
// 获取录单员
getCatalogueMember() {
const params = {
};
return this.service.request(this.service.$api_get_catalogue_member, params, 'GET').pipe(
map((res) => {
if (res) {
console.log(res)
}
}),
);
}
selectChange(e: number) {
console.log(e);
}
/**
* 导入货源
*/
importGoodsSource() {
}
audit(item: any) {
console.log(item)
}
/*
* 审核关闭弹窗
*/
handleCancel(item: string) {
if(item === '0') {
this.isVisibleView = false
} else{
this.isVisibleRE = false
}
}
/**
* 审核通过按钮
*/
handleOK() {
}
/**
*查看评价
*/
viewDetail(item: any) {
console.log(item)
this.auditstatus = true;
this.isVisibleView = true
}
viewAudit(item: any) {
console.log(item)
this.auditstatus = false;
this.isVisibleView = true
}
/**
*驳回
*/
Reject() {
this.isVisibleRE = true;
}
}

View File

@ -1,7 +1,7 @@
<!--
* @Author: your name
* @Date: 2021-12-03 15:31:52
* @LastEditTime: 2021-12-06 20:38:55
* @LastEditTime: 2021-12-07 09:50:21
* @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\order-management\components\vehicle-detail\vehicle-detail.component.html
@ -19,7 +19,7 @@
<div nz-col nzSpan="4">
<sv-container class="bdr">
<sv label="订单号" col="1">{{ i?.no }}</sv>
<sv-title class="text-center text-lg">待接单</sv-title>
<sv-title class="text-center text-lg">待接单555</sv-title>
<sv-title>
<div class="">
<a class="btn-size" (click)="hand()">指派车队长</a>
@ -112,15 +112,17 @@
<nz-divider></nz-divider>
<div style="display: flex; justify-content: space-evenly;">
<div>
<div>
<span class="leftPadding">司机运输费</span>
<div style="position: relative;">
<div style="height: 24px; width: 90px; background-color: #68758e;position: absolute; top: -109%; left: -12%;color: #fff;text-align: center;">平台支付</div>
<span class="leftPadding">司机运输费666</span>
<span class="leftPadding">1000.00</span>
<span class="leftPadding">未支付</span>
</div>
</div>
<div>
<div>
<span class="leftPadding">司机运输费</span>
<div style="position: relative;">
<div style="height: 24px; width: 90px; background-color: #68758e;position: absolute; top: -109%; left: -5%;color: #fff;text-align: center;">货主支付</div>
<span class="leftPadding">司机运输费22</span>
<span class="leftPadding">1000.00</span>
<span class="leftPadding">未支付</span>
</div>
@ -134,7 +136,7 @@
<nz-divider></nz-divider>
<div nz-row>
<nz-card nzTitle="轨迹信息" style="width: 100%;" >
<nz-card nzTitle="轨迹信息77" style="width: 100%;" >
<div>
<st #st [data]="i?.auditRecordList" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
</st>
@ -144,4 +146,6 @@
</div>
</nz-card>
</div>
</nz-card>
</nz-card>

View File

@ -1,12 +1,14 @@
<!--
* @Author: your name
* @Date: 2021-12-03 11:10:14
* @LastEditTime: 2021-12-06 21:03:59
* @LastEditTime: 2021-12-07 11:11:27
* @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\supply-management\components\vehicle\vehicle.component.html
-->
<!-- 搜索表单 -->
<page-header-wrapper [title]="''">
</page-header-wrapper>
<nz-card>
<div nz-row nzGutter="8">
<!-- 查询字段小于或等于3个时不显示伸缩按钮 -->

View File

@ -0,0 +1,103 @@
<!--
* @Author: your name
* @Date: 2021-12-03 11:10:14
* @LastEditTime: 2021-12-07 11:16:41
* @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\supply-management\components\vehicle\vehicle.component.html
-->
<!-- 搜索表单 -->
<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]="service.http.loading"
(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" [disabled]="!sf.valid" [nzLoading]="service.http.loading"
(click)="st?.load(1)">查询</button>
<button nz-button nzType="primary"
>导出</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>
<nz-tabset (nzSelectedIndexChange)="selectChange($event)" >
<nz-tab *ngFor="let tab of tabs; let i = index" [nzTitle]="tab.name + ' (' + tab.count + ') '" (nzClick)="tabChange(i)">
</nz-tab>
</nz-tabset>
<div style="margin-top: 15px;">
<!-- [req]="{ method: 'GET', 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] }"
[loadingDelay]="500" [loading]="service.http.loading" -->
<st #st [scroll]="{ x: '1200px' }" [data]="service.$api_get_catalogue_member" [columns]="columns">
<ng-template st-row="goodsId" let-item let-index="index">
<a [routerLink]="'/order-management/bulk-detail/'+item.id">{{item.no}}</a>
</ng-template>
</st>
</div>
</nz-card>
<nz-modal [(nzVisible)]="isVisibleView" [nzWidth]="600" [nzFooter]="nzModalFooterview" nzTitle="查看" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel('0')">
<ng-container *nzModalContent>
<sv-container labelWidth="160" class="apply-sv">
<sv label="车牌号" col="1">{{ infoData1?.enterpriseName }}</sv>
<sv label="车型" col="1">{{ infoData1?.unifiedSocialCreditCode }}</sv>
<sv label="车长" col="1">{{ infoData1?.enterpriseType }}</sv>
<sv label="载重" col="1">{{ infoData1?.registrationCapital }} 万元</sv>
<sv label="备注" col="1">{{ infoData1?.enterpriseRegistrationTime }}</sv>
<sv label=" 行驶证" col="1">
<!-- <span class="sv-img"
><img
[src]="infoData1?.enterpriseQualificationCertificateurl"
(click)="viewImg(infoData1?.enterpriseQualificationCertificateurl)"
/></span> -->
</sv>
<sv label="行驶证过期时间" col="1">{{ infoData1?.enterpriseAddress }}</sv>
<sv label="道运证" col="1">
<!-- <span class="sv-img"
><img
[src]="infoData1?.enterpriseQualificationCertificateurl"
(click)="viewImg(infoData1?.enterpriseQualificationCertificateurl)"
/></span> -->
</sv>
<sv label="道运证过期时间" col="1">{{ infoData1?.businessScope }}</sv>
</sv-container>
</ng-container>
<ng-template #nzModalFooterview>
<button *ngIf="!auditstatus" nz-button nzType="default" (click)="Reject()">驳回</button>
<button *ngIf="!auditstatus" nz-button nzType="primary" (click)="handleOK()">通过</button>
<button *ngIf="auditstatus" nz-button nzType="primary" (click)="handleCancel('0')">取消</button>
</ng-template>
</nz-modal>
<nz-modal [(nzVisible)]="isVisibleRE" [nzWidth]="600" [nzFooter]="nzModalFooterview2" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel('1')">
<ng-container *nzModalContent>
<sf #sfView [schema]="schemaView" [ui]="uiView" [compact]="true" [button]="'none'">
</sf>
</ng-container>
<ng-template #nzModalFooterview2>
<button nz-button nzType="default" (click)="handleCancel('1')">取消</button>
<button nz-button nzType="primary" (click)="handleOK()">确定</button>
</ng-template>
</nz-modal>

View File

@ -0,0 +1,7 @@
.left_btn {
width: 50px;
height: 32px;
padding-left: 8px;
line-height:32px;
background-color: #d7d7d7;
}

View File

@ -0,0 +1,40 @@
/*
* @Author: your name
* @Date: 2021-12-06 20:03:28
* @LastEditTime: 2021-12-07 11:08:28
* @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\order-management\components\bulk\bulk.component.spec.ts
*/
/*
* @Author: your name
* @Date: 2021-12-06 19:39:49
* @LastEditTime: 2021-12-06 19:41:08
* @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\bulk\bulk.component.spec.ts
*/
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
import { OrderManagementCarManageComponent } from './car-manage.component';
describe('OrderManagementCarManageComponent', () => {
let component: OrderManagementCarManageComponent;
let fixture: ComponentFixture<OrderManagementCarManageComponent>;
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [ OrderManagementCarManageComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(OrderManagementCarManageComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

View File

@ -0,0 +1,292 @@
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 { SupplyManagementService } from '../../services/order-management.service';
@Component({
selector: 'app-supply-management-car-manage',
templateUrl: './car-manage.component.html',
styleUrls: ['./car-manage.component.less']
})
export class OrderManagementCarManageComponent implements OnInit {
url = `/user?_allow_anonymous=true`;
ui: SFUISchema = {};
uiView: SFUISchema = {};
schema: SFSchema = {};
schemaView: SFSchema = {};
auditMany = false;
auditstatus = false;
isVisibleView = false;
isVisibleRE = false;
_$expand = false;
infoData1: any;
@ViewChild('st') private readonly st!: STComponent;
@ViewChild('sf', { static: false }) sf!: SFComponent;
@ViewChild('sfView', { static: false }) sfView!: SFComponent;
columns: STColumn[] = [];
demoValue: any;
datass: any = [
{
one: '1',
two: '1',
three: '1',
id: 1
},
{
one: '2',
two: '2',
three: '2',
id: 2
},
];
tabs = [ {
name: '全部',
type: 5,
count: 0,
},
{
name: '检测中',
type: 5,
count: 0,
},
{
name: '不合格',
type: 5,
count: 0,
},
{
name: '合格',
type: 5,
count: 0,
},
{
name: '申诉中',
type: 5,
count: 0,
},
{
name: '已取消',
type: 5,
count: 0,
}
];
constructor(public service: SupplyManagementService, private modal: NzModalService) { }
/**
* 查询参数
*/
get reqParams() {
return {
...this.sf?.value,
};
}
get selectedRows() {
return this.st?.list.filter((item) => item.checked) || [];
}
ngOnInit(): void {
this.initSF();
this.initST();
this.initSFReject();
}
/**
* 初始化查询表单
*/
initSF() {
this.schema = {
properties: {
no: {
type: 'string',
title: '运单号',
},
no2: {
type: 'string',
title: '托运公司'
},
no3: {
type: 'string',
title: '车牌号'
},
},
};
this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } };
}
initSFReject() {
this.schemaView = {
properties: {
roleDescription: {
title: '驳回原因',
type: 'string',
maxLength: 50,
ui: {
placeholder: '请输入驳回原因最多不超过50字',
widget: 'textarea',
autosize: { minRows: 2, maxRows: 6 }
},
},
},
};
this.uiView = { '*': { spanLabelFixed: 110, grid: { span: 12 } } };
}
/**
* 初始化数据列表
*/
initST() {
this.columns = [
{
title: '运单号',
width: '100px',
className: 'text-center',
render: 'goodsId'
},
{
title: '检测状态',
width: '100px',
className: 'text-center',
},
{ title: '异常原因', index: 'externalSn', width: '120px', className: 'text-center' },
{ title: '驳回原因', index: 'linkUrl', width: '120px', className: 'text-center' },
{
title: '托运公司',
className: 'text-center',
width: '120px',
},
{
title: '发货省/市/区',
className: 'text-center',
width: '120px',
},
{
title: '收货省/市/区',
className: 'text-center',
width: '120px',
},
{
title: '运单费用',
className: 'text-center',
width: '120px',
},
{
title: '司机手机号',
className: 'text-center',
width: '120px',
},
{
title: '车牌号',
className: 'text-center',
width: '120px',
},
{
title: '交易时间',
className: 'text-center',
width: '120px',
render: 'feiong'
},
{
title: '创建时间',
className: 'text-center',
width: '120px',
},
{
title: '创建人',
className: 'text-center',
width: '120px',
},
{
title: '操作',
fixed: 'right',
width: '200px',
className: 'text-left',
buttons: [
{
text: '审核',
click: (_record) => this.viewAudit(_record),
},
],
},
];
}
/**
* 查询字段个数
*/
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;
}
// 获取录单员
getCatalogueMember() {
const params = {
};
return this.service.request(this.service.$api_get_catalogue_member, params, 'GET').pipe(
map((res) => {
if (res) {
console.log(res)
}
}),
);
}
selectChange(e: number) {
console.log(e);
}
/**
* 导入货源
*/
importGoodsSource() {
}
audit(item: any) {
console.log(item)
}
/*
* 审核关闭弹窗
*/
handleCancel(item: string) {
if(item === '0') {
this.isVisibleView = false
} else{
this.isVisibleRE = false
}
}
/**
* 审核通过按钮
*/
handleOK() {
}
viewAudit(item: any) {
console.log(item)
this.isVisibleRE = true;
}
Reject() {
}
}

View File

@ -0,0 +1,114 @@
<!--
* @Author: your name
* @Date: 2021-12-03 11:10:14
* @LastEditTime: 2021-12-07 11:12:19
* @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\supply-management\components\vehicle\vehicle.component.html
-->
<!-- 搜索表单 -->
<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]="service.http.loading"
(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" [disabled]="!sf.valid" [nzLoading]="service.http.loading"
(click)="st?.load(1)">查询</button>
<button nz-button nzType="primary"
>导出</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>
<nz-tabset (nzSelectedIndexChange)="selectChange($event)" >
<nz-tab *ngFor="let tab of tabs; let i = index" [nzTitle]="tab.name + ' (' + tab.count + ') '" (nzClick)="tabChange(i)">
</nz-tab>
</nz-tabset>
<div style="margin-top: 15px;">
<!-- [req]="{ method: 'GET', 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] }"
[loadingDelay]="500" [loading]="service.http.loading" -->
<st #st [scroll]="{ x: '1200px' }" [data]="service.$api_get_catalogue_member" [columns]="columns">
<ng-template st-row="goodsId" let-item let-index="index">
<a [routerLink]="'/order-management/bulk-detail/'+item.id">{{item.no}}</a>
</ng-template>
</st>
</div>
</nz-card>
<nz-modal [(nzVisible)]="isVisibleView" [nzWidth]="600" [nzFooter]="nzModalFooterview" nzTitle="查看" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel('0')">
<ng-container *nzModalContent>
<sv-container labelWidth="160" class="apply-sv">
<sv label="身份证号" col="1">{{ infoData1?.enterpriseName }}</sv>
<sv label="姓名" col="1">{{ infoData1?.unifiedSocialCreditCode }}</sv>
<sv label="手机号" col="1">{{ infoData1?.enterpriseType }}</sv>
<sv label="银行卡号" col="1">{{ infoData1?.registrationCapital }} 万元</sv>
<sv label="开户行" col="1">{{ infoData1?.enterpriseRegistrationTime }}</sv>
<sv label="备注" col="1">
{{ infoData1?.enterpriseRegistrationTime }}
</sv>
<sv label="身份证正面照" col="1">
<!-- <span class="sv-img"
><img
[src]="infoData1?.enterpriseQualificationCertificateurl"
(click)="viewImg(infoData1?.enterpriseQualificationCertificateurl)"
/></span> -->
</sv>
<sv label="身份证过期时间" col="1">{{ infoData1?.enterpriseAddress }}</sv>
<sv label="驾驶证照片" col="1">
<!-- <span class="sv-img"
><img
[src]="infoData1?.enterpriseQualificationCertificateurl"
(click)="viewImg(infoData1?.enterpriseQualificationCertificateurl)"
/></span> -->
</sv>
<sv label="驾驶证过期时间" col="1">{{ infoData1?.businessScope }}</sv>
<sv label="从业资格证" col="1">
<!-- <span class="sv-img"
><img
[src]="infoData1?.enterpriseQualificationCertificateurl"
(click)="viewImg(infoData1?.enterpriseQualificationCertificateurl)"
/></span> -->
</sv>
<sv label="从业资格证过期时间" col="2">{{ infoData1?.businessScope }}</sv>
<sv col="2">已临期</sv>
</sv-container>
</ng-container>
<ng-template #nzModalFooterview>
<button *ngIf="!auditstatus" nz-button nzType="default" (click)="Reject()">驳回</button>
<button *ngIf="!auditstatus" nz-button nzType="primary" (click)="handleOK()">通过</button>
<button *ngIf="auditstatus" nz-button nzType="primary" (click)="handleCancel('0')">取消</button>
</ng-template>
</nz-modal>
<nz-modal [(nzVisible)]="isVisibleRE" [nzWidth]="600" [nzFooter]="nzModalFooterview2" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel('1')">
<ng-container *nzModalContent>
<sf #sfView [schema]="schemaView" [ui]="uiView" [compact]="true" [button]="'none'">
</sf>
</ng-container>
<ng-template #nzModalFooterview2>
<button nz-button nzType="default" (click)="handleCancel('1')">取消</button>
<button nz-button nzType="primary" (click)="handleOK()">确定</button>
</ng-template>
</nz-modal>

View File

@ -0,0 +1,7 @@
.left_btn {
width: 50px;
height: 32px;
padding-left: 8px;
line-height:32px;
background-color: #d7d7d7;
}

View File

@ -0,0 +1,40 @@
/*
* @Author: your name
* @Date: 2021-12-06 20:03:28
* @LastEditTime: 2021-12-06 20:03: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\order-management\components\bulk\bulk.component.spec.ts
*/
/*
* @Author: your name
* @Date: 2021-12-06 19:39:49
* @LastEditTime: 2021-12-06 19:41:08
* @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\bulk\bulk.component.spec.ts
*/
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
import { OrderManagementDriverManageComponent } from './driver-manage.component';
describe('OrderManagementDriverManageComponent', () => {
let component: OrderManagementDriverManageComponent;
let fixture: ComponentFixture<OrderManagementDriverManageComponent>;
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [ OrderManagementDriverManageComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(OrderManagementDriverManageComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

View File

@ -0,0 +1,299 @@
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 { SupplyManagementService } from '../../services/order-management.service';
@Component({
selector: 'app-supply-management-driver-manage',
templateUrl: './driver-manage.component.html',
styleUrls: ['./driver-manage.component.less']
})
export class OrderManagementDriverManageComponent implements OnInit {
url = `/user?_allow_anonymous=true`;
ui: SFUISchema = {};
uiView: SFUISchema = {};
schema: SFSchema = {};
schemaView: SFSchema = {};
auditMany = false;
auditstatus = false;
isVisibleView = false;
isVisibleRE = false;
_$expand = false;
infoData1: any;
@ViewChild('st') private readonly st!: STComponent;
@ViewChild('sf', { static: false }) sf!: SFComponent;
@ViewChild('sfView', { static: false }) sfView!: SFComponent;
columns: STColumn[] = [];
demoValue: any;
datass: any = [
{
one: '1',
two: '1',
three: '1',
id: 1
},
{
one: '2',
two: '2',
three: '2',
id: 2
},
];
tabs = [ {
name: '全部',
type: 5,
count: 0,
},
{
name: '待审核',
type: 5,
count: 0,
},
{
name: '已审核',
type: 5,
count: 0,
},
{
name: '驳回',
type: 5,
count: 0,
}
];
constructor(public service: SupplyManagementService, private modal: NzModalService) { }
/**
* 查询参数
*/
get reqParams() {
return {
...this.sf?.value,
};
}
get selectedRows() {
return this.st?.list.filter((item) => item.checked) || [];
}
ngOnInit(): void {
this.initSF();
this.initST();
this.initSFReject();
}
/**
* 初始化查询表单
*/
initSF() {
this.schema = {
properties: {
no: {
type: 'string',
title: '公司名称',
},
no2: {
type: 'string',
title: '姓名'
},
no1: {
type: 'string',
title: '手机号'
},
},
};
this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } };
}
initSFReject() {
this.schemaView = {
properties: {
roleDescription: {
title: '驳回原因',
type: 'string',
maxLength: 50,
ui: {
placeholder: '请输入驳回原因最多不超过50字',
widget: 'textarea',
autosize: { minRows: 2, maxRows: 6 }
},
},
},
};
this.uiView = { '*': { spanLabelFixed: 110, grid: { span: 12 } } };
}
/**
* 初始化数据列表
*/
initST() {
this.columns = [
{
title: '公司名称',
width: '100px',
className: 'text-center',
render: 'goodsId'
},
{
title: '姓名',
width: '100px',
className: 'text-center',
},
{ title: '身份证号', index: 'externalSn', width: '120px', className: 'text-center' },
{ title: '手机号', index: 'linkUrl', width: '120px', className: 'text-center' },
{
title: '身份证',
className: 'text-center',
width: '120px',
},
{
title: '驾驶证',
className: 'text-center',
width: '120px',
},
{
title: '从业资格证',
className: 'text-center',
width: '120px',
},
{
title: '平台认证状态',
className: 'text-center',
width: '120px',
},
{
title: '银行卡',
className: 'text-center',
width: '120px',
},
{
title: '审核状态',
className: 'text-center',
width: '120px',
},
{
title: '驳回原因',
className: 'text-center',
width: '120px',
render: 'feiong'
},
{
title: '添加时间',
className: 'text-center',
width: '120px',
},
{
title: '添加人',
className: 'text-center',
width: '120px',
render: 'enStatusStr27878'
},
{
title: '操作',
fixed: 'right',
width: '200px',
className: 'text-left',
buttons: [
{
text: '审核',
click: (_record) => this.viewAudit(_record),
},
{
text: '查看详情',
click: (_record) => this.viewDetail(_record),
},
],
},
];
}
/**
* 查询字段个数
*/
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;
}
// 获取录单员
getCatalogueMember() {
const params = {
};
return this.service.request(this.service.$api_get_catalogue_member, params, 'GET').pipe(
map((res) => {
if (res) {
console.log(res)
}
}),
);
}
selectChange(e: number) {
console.log(e);
}
/**
* 导入货源
*/
importGoodsSource() {
}
audit(item: any) {
console.log(item)
}
/*
* 审核关闭弹窗
*/
handleCancel(item: string) {
if(item === '0') {
this.isVisibleView = false
} else{
this.isVisibleRE = false
}
}
/**
* 审核通过按钮
*/
handleOK() {
}
/**
*查看评价
*/
viewDetail(item: any) {
console.log(item)
this.auditstatus = true;
this.isVisibleView = true
}
viewAudit(item: any) {
console.log(item)
this.auditstatus = false;
this.isVisibleView = true
}
/**
*驳回
*/
Reject() {
this.isVisibleRE = true;
}
}

View File

@ -1,12 +1,14 @@
<!--
* @Author: your name
* @Date: 2021-12-03 11:10:14
* @LastEditTime: 2021-12-06 20:40:22
* @LastEditTime: 2021-12-07 11:12:44
* @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\supply-management\components\vehicle\vehicle.component.html
-->
<!-- 搜索表单 -->
<page-header-wrapper [title]="''">
</page-header-wrapper>
<nz-card>
<div nz-row nzGutter="8">
<!-- 查询字段小于或等于3个时不显示伸缩按钮 -->

View File

@ -1,14 +1,18 @@
/*
* @Author: your name
* @Date: 2021-12-03 15:31:52
* @LastEditTime: 2021-12-06 20:21:41
* @LastEditTime: 2021-12-07 09:59:57
* @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\order-management\order-management-routing.module.ts
*/
import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router';
import { OrderManagementAdditionalcComponent } from './components/additionalc/additionalc.component';
import { OrderManagementBulkeDetailComponent } from './components/bulk-detail/bulk-detail.component';
import { OrderManagementBulkComponent } from './components/bulk/bulk.component';
import { OrderManagementCarManageComponent } from './components/car-manage/car-manage.component';
import { OrderManagementDriverManageComponent } from './components/driver-manage/driver-manage.component';
import { OrderManagementVehicleDetailComponent } from './components/vehicle-detail/vehicle-detail.component';
import { OrderManagementVehicleComponent } from './components/vehicle/vehicle.component';
@ -16,7 +20,10 @@ const routes: Routes = [
{ path: 'vehicle', component: OrderManagementVehicleComponent },
{ path: 'vehicle-detail/:id', component: OrderManagementVehicleDetailComponent },
{ path: 'bulk', component: OrderManagementBulkComponent },
{ path: 'bulk-detail/:id', component: OrderManagementVehicleDetailComponent },
{ path: 'bulk-detail/:id', component: OrderManagementBulkeDetailComponent },
{ path: 'driver-manage', component: OrderManagementDriverManageComponent },
{ path: 'car-manage', component: OrderManagementCarManageComponent },
{ path: 'additionalc', component: OrderManagementAdditionalcComponent },
]
@NgModule({
imports: [RouterModule.forChild(routes)],

View File

@ -1,7 +1,10 @@
import { NgModule, Type } from '@angular/core';
import { SharedModule } from '@shared';
import { OrderManagementAdditionalcComponent } from './components/additionalc/additionalc.component';
import { OrderManagementBulkeDetailComponent } from './components/bulk-detail/bulk-detail.component';
import { OrderManagementBulkComponent } from './components/bulk/bulk.component';
import { OrderManagementCarManageComponent } from './components/car-manage/car-manage.component';
import { OrderManagementDriverManageComponent } from './components/driver-manage/driver-manage.component';
import { OrderManagementVehicleDetailComponent } from './components/vehicle-detail/vehicle-detail.component';
import { OrderManagementVehicleComponent } from './components/vehicle/vehicle.component';
@ -11,7 +14,10 @@ const COMPONENTS: Type<void>[] = [
OrderManagementVehicleComponent,
OrderManagementVehicleDetailComponent,
OrderManagementBulkComponent,
OrderManagementBulkeDetailComponent
OrderManagementBulkeDetailComponent,
OrderManagementDriverManageComponent,
OrderManagementCarManageComponent,
OrderManagementAdditionalcComponent
];
@NgModule({

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 44 KiB

View File

@ -183,6 +183,31 @@
"icon": "anticon anticon-dashboard",
"link": "/order-management/bulk"
},
{
"text": "结算单",
"children": [
{
"text": "司机管理",
"icon": "anticon anticon-dashboard",
"link": "/order-management/driver-manage"
},
{
"text": "车辆管理",
"icon": "anticon anticon-dashboard",
"link": "/order-management/car-manage"
}
]
},
{
"text": "补录单",
"children": [
{
"text": "补录运单",
"icon": "anticon anticon-dashboard",
"link": "/order-management/additionalc"
}
]
},
{
"text": "整车订单详情",
"icon": "anticon anticon-dashboard",

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

View File

@ -1,8 +1,8 @@
<!--
* @Author: your name
* @Date: 2021-11-29 10:04:12
* @LastEditTime: 2021-12-06 15:29:11
* @LastEditors: your name
* @LastEditTime: 2021-12-07 13:23:49
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\index.html
-->
@ -15,7 +15,7 @@
<base href="/" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta http-equiv="x-ua-compatible" content="ie=edge" />
<link rel="icon" type="image/x-icon" href="favicon.ico" />
<link rel="icon" type="image/x-icon" href="./favicon.ico" />
<!-- Apple Touch Icon -->
<!-- <link rel="apple-touch-icon" href="custom-icon.png"> -->
<style type="text/css">