Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop
This commit is contained in:
@ -1,7 +1,7 @@
|
||||
<!--
|
||||
* @Author: your name
|
||||
* @Date: 2021-12-03 15:31:52
|
||||
* @LastEditTime: 2021-12-29 14:44:43
|
||||
* @LastEditTime: 2022-01-04 15:31:43
|
||||
* @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
|
||||
@ -85,7 +85,7 @@
|
||||
{{i?.driverName}}/{{i?.driverPhone}}/{{i?.carNo}}
|
||||
</sv>
|
||||
<sv label="车型车长载重">
|
||||
{{i?.carModel}},{{i?.carLength}},{{i?.carLoad ? i?.carLoad +'吨': ''}}
|
||||
{{i?.carModelLabel}},{{i?.carLengthLabel}}米,{{i?.carLoad ? i?.carLoad +'吨': ''}}
|
||||
</sv>
|
||||
</sv-container>
|
||||
<div class="mt-md" >
|
||||
|
||||
@ -17,6 +17,7 @@ import { PublishGoodsChooseFamifiarComponent } from '../choose-famifiar/choose-f
|
||||
import { SupplyManagementService} from '../../services/supply-management.service';
|
||||
import { map } from 'rxjs/operators';
|
||||
import { of } from 'rxjs';
|
||||
import { PublishSuccessComponent } from '../onecar-publish/publish-success/publish-success.component';
|
||||
@Component({
|
||||
selector: 'app-publish-goods-bulk-publish',
|
||||
templateUrl: './bulk-publish.component.html',
|
||||
@ -35,6 +36,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
|
||||
totalFees: any; // 总数信息
|
||||
totalDistance = 0.0; //总里程
|
||||
totalTime = 0.0; //路程总时间
|
||||
enterpriseProjectIds: any;
|
||||
id = this.route.snapshot.params.id;
|
||||
// // 单位
|
||||
unit1 = '吨';
|
||||
@ -132,7 +134,6 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
|
||||
ui: {
|
||||
widget: 'select',
|
||||
placeholder: '请选择',
|
||||
allowClear: true,
|
||||
} as SFSelectWidgetSchema
|
||||
},
|
||||
enterpriseInfoName: {
|
||||
@ -185,20 +186,26 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
|
||||
}
|
||||
// 获取城市列表
|
||||
getRegionCode(regionCode: any) {
|
||||
console.log(regionCode)
|
||||
console.log(regionCode);
|
||||
return this.service
|
||||
.request(this.service.$api_get_enterprise_project, { id: regionCode })
|
||||
.pipe(
|
||||
map((res) =>
|
||||
map(res =>
|
||||
res.map((item: any) => ({
|
||||
label: item.projectName,
|
||||
value: item.id,
|
||||
})),
|
||||
),
|
||||
value: item.id
|
||||
}))
|
||||
)
|
||||
)
|
||||
.subscribe((res) => {
|
||||
.subscribe(res => {
|
||||
this.sf1.getProperty('/enterpriseProjectId')!.schema.enum = res;
|
||||
this.sf1.getProperty('/enterpriseProjectId')!.widget.reset(res);
|
||||
console.log('12345645454545454=============')
|
||||
console.log(this.enterpriseProjectIds)
|
||||
console.log(res)
|
||||
if(this.enterpriseProjectIds) {
|
||||
this.sf1.setValue('/enterpriseProjectId', this.enterpriseProjectIds);
|
||||
}
|
||||
});
|
||||
}
|
||||
// initSF2() {
|
||||
@ -527,10 +534,21 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
requests(url: any, params: any) {
|
||||
this.service.request(url, params).subscribe((res: any) => {
|
||||
console.log(res)
|
||||
})
|
||||
if (res) {
|
||||
this.modalService.create({
|
||||
nzTitle: '',
|
||||
nzContent: PublishSuccessComponent,
|
||||
nzWidth: 900,
|
||||
nzFooter: null,
|
||||
nzComponentParams: { type: 'onecar' }
|
||||
});
|
||||
} else {
|
||||
this.service.msgSrv.error(res.msg);
|
||||
}
|
||||
});
|
||||
}
|
||||
// 打开地图
|
||||
openMap(type: string, index: number) {
|
||||
@ -588,6 +606,23 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
|
||||
// 初始化信息
|
||||
dataR (res: any) {
|
||||
// this.dataList = res;
|
||||
if (res?.shipperAppUserName) {
|
||||
const List: any = [];
|
||||
this.service.request(this.service.$api_enterpriceList, { enterpriseName: res?.shipperAppUserName }).subscribe(rs => {
|
||||
rs?.forEach((element: any) => {
|
||||
List.push({ label: element.enterpriseName, value: element.id });
|
||||
});
|
||||
this.sf1.getProperty('/shipperAppUserId')!.schema.enum = List;
|
||||
this.sf1.getProperty('/shipperAppUserId')!.widget.reset(List);
|
||||
if (res?.shipperAppUserId) {
|
||||
this.sf1.setValue('/shipperAppUserId', res?.shipperAppUserId);
|
||||
this.getRegionCode(res?.shipperAppUserId);
|
||||
}
|
||||
});
|
||||
}
|
||||
if(res?.enterpriseProjectId) {
|
||||
this.enterpriseProjectIds = res.enterpriseProjectId
|
||||
}
|
||||
this.sf1data = {
|
||||
// shipperAppUserName: res?.shipperAppUserName || '',
|
||||
enterpriseProjectId: res?.enterpriseProjectId || '',
|
||||
|
||||
@ -81,9 +81,11 @@ export class SystemLogsComponent implements OnInit {
|
||||
ngOnInit(): void {}
|
||||
|
||||
beforeReq = (requestOptions: STRequestOptions) => {
|
||||
requestOptions.body.operateType = '1'
|
||||
if (this.sf) {
|
||||
Object.assign(requestOptions.body, {
|
||||
...this.sf.value,
|
||||
operateType: '1',
|
||||
endTime: this.sf.value.time?.[1] || null,
|
||||
startTime: this.sf.value.time?.[0] || null
|
||||
});
|
||||
|
||||
@ -0,0 +1,35 @@
|
||||
<!--
|
||||
* @Author: your name
|
||||
* @Date: 2022-01-04 14:42:30
|
||||
* @LastEditTime: 2022-01-04 14:58:19
|
||||
* @LastEditors: your name
|
||||
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
|
||||
* @FilePath: \tms-obc-web\src\app\routes\sys-setting\components\system-supply-logs\system-supply-logs.component.html
|
||||
-->
|
||||
<page-header-wrapper title="货源操作日志">
|
||||
</page-header-wrapper>
|
||||
|
||||
<nz-card class="search-box">
|
||||
<div nz-row nzGutter="8">
|
||||
<div nz-col [nzSpan]="_$expand ? 24 : 18">
|
||||
<sf #sf [schema]="searchSchema" [ui]="{ '*': { spanLabelFixed: 90,grid: { span: 8 } }}" [compact]="true"
|
||||
[button]="'none'"></sf>
|
||||
</div>
|
||||
<div nz-col [nzSpan]="6" [nzOffset]="_$expand ? 18 : 0" [class.expend-options]="_$expand" class="text-right">
|
||||
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</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>
|
||||
</div>
|
||||
</nz-card>
|
||||
|
||||
<nz-card class="content-box">
|
||||
<st #st [data]="service.$api_get_systemt_logs" [columns]="columns"
|
||||
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, process: beforeReq }"
|
||||
[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" [scroll]="{ y: '370px' }"></st>
|
||||
</nz-card>
|
||||
@ -0,0 +1,32 @@
|
||||
:host::ng-deep {
|
||||
.search-box {
|
||||
.ant-card-body {
|
||||
padding-bottom: 18px;
|
||||
}
|
||||
}
|
||||
|
||||
.content-box {
|
||||
.ant-card-body {
|
||||
padding-top: 14px;
|
||||
}
|
||||
}
|
||||
|
||||
nz-range-picker {
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
|
||||
.expend-options {
|
||||
margin-top: 0;
|
||||
}
|
||||
|
||||
|
||||
@media (min-width: 1200px) {
|
||||
.expend-options {
|
||||
position : absolute;
|
||||
right : 0;
|
||||
bottom : 25px;
|
||||
max-width: 400px;
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,91 @@
|
||||
/*
|
||||
* @Author: your name
|
||||
* @Date: 2022-01-04 14:42:30
|
||||
* @LastEditTime: 2022-01-04 16:04:46
|
||||
* @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\sys-setting\components\system-supply-logs\system-supply-logs.component.ts
|
||||
*/
|
||||
import { Component, OnInit, ViewChild } from '@angular/core';
|
||||
import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st';
|
||||
import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
|
||||
import { dateTimePickerUtil } from '@delon/util';
|
||||
import { NzModalService } from 'ng-zorro-antd/modal';
|
||||
import { SystemService } from '../../services/system.service';
|
||||
|
||||
@Component({
|
||||
selector: 'app-system-logs',
|
||||
templateUrl: './system-supply-logs.component.html',
|
||||
styleUrls: ['./system-supply-logs.component.less']
|
||||
})
|
||||
export class SystemSupplyLogsComponent implements OnInit {
|
||||
@ViewChild('st', { static: true })
|
||||
st!: STComponent;
|
||||
@ViewChild('sf', { static: false })
|
||||
sf!: SFComponent;
|
||||
|
||||
searchSchema: SFSchema = {
|
||||
properties: {
|
||||
operateObject: {
|
||||
type: 'string',
|
||||
title: '货源编码',
|
||||
ui: {
|
||||
placeholder: '请输入',
|
||||
}
|
||||
},
|
||||
time: {
|
||||
title: '登录时间',
|
||||
type: 'string',
|
||||
ui: {
|
||||
widget: 'sl-from-to-search',
|
||||
format: 'yyyy-MM-dd HH:mm:ss',
|
||||
nzShowTime: true,
|
||||
} as SFDateWidgetSchema
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
columns: STColumn[] = [
|
||||
|
||||
{ title: 'ID', index: 'id' },
|
||||
{ title: '货源编码', index: 'operateObject' },
|
||||
{ title: '说明', index: 'operationContent' },
|
||||
{ title: '操作人', index: 'operator' },
|
||||
{ title: '操作时间', index: 'operatorTimestamp', type: 'date' },
|
||||
];
|
||||
|
||||
_$expand = false;
|
||||
|
||||
constructor(public service: SystemService, private nzModalService: NzModalService) {}
|
||||
|
||||
ngOnInit(): void {}
|
||||
|
||||
beforeReq = (requestOptions: STRequestOptions) => {
|
||||
requestOptions.body.operateType = '4'
|
||||
if (this.sf) {
|
||||
Object.assign(requestOptions.body, {
|
||||
...this.sf.value,
|
||||
operateType: '4',
|
||||
endTime: this.sf.value.time?.[1] || null,
|
||||
startTime: this.sf.value.time?.[0] || null
|
||||
});
|
||||
}
|
||||
return requestOptions;
|
||||
};
|
||||
|
||||
/**
|
||||
* 重置表单
|
||||
*/
|
||||
resetSF() {
|
||||
this.sf.reset();
|
||||
this._$expand = false;
|
||||
}
|
||||
|
||||
/**
|
||||
* 伸缩查询条件
|
||||
*/
|
||||
expandToggle() {
|
||||
this._$expand = !this._$expand;
|
||||
this.sf?.setValue('/expand', this._$expand);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,35 @@
|
||||
<!--
|
||||
* @Author: your name
|
||||
* @Date: 2022-01-04 14:44:59
|
||||
* @LastEditTime: 2022-01-04 15:00: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\sys-setting\components\system-waybill-logs\system-waybill-logs.component.html
|
||||
-->
|
||||
<page-header-wrapper title="订单操作日志">
|
||||
</page-header-wrapper>
|
||||
|
||||
<nz-card class="search-box">
|
||||
<div nz-row nzGutter="8">
|
||||
<div nz-col [nzSpan]="_$expand ? 24 : 18">
|
||||
<sf #sf [schema]="searchSchema" [ui]="{ '*': { spanLabelFixed: 90,grid: { span: 8 } }}" [compact]="true"
|
||||
[button]="'none'"></sf>
|
||||
</div>
|
||||
<div nz-col [nzSpan]="6" [nzOffset]="_$expand ? 18 : 0" [class.expend-options]="_$expand" class="text-right">
|
||||
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</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>
|
||||
</div>
|
||||
</nz-card>
|
||||
|
||||
<nz-card class="content-box">
|
||||
<st #st [data]="service.$api_get_systemt_logs" [columns]="columns"
|
||||
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, process: beforeReq }"
|
||||
[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" [scroll]="{ y: '370px' }"></st>
|
||||
</nz-card>
|
||||
@ -0,0 +1,32 @@
|
||||
:host::ng-deep {
|
||||
.search-box {
|
||||
.ant-card-body {
|
||||
padding-bottom: 18px;
|
||||
}
|
||||
}
|
||||
|
||||
.content-box {
|
||||
.ant-card-body {
|
||||
padding-top: 14px;
|
||||
}
|
||||
}
|
||||
|
||||
nz-range-picker {
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
|
||||
.expend-options {
|
||||
margin-top: 0;
|
||||
}
|
||||
|
||||
|
||||
@media (min-width: 1200px) {
|
||||
.expend-options {
|
||||
position : absolute;
|
||||
right : 0;
|
||||
bottom : 25px;
|
||||
max-width: 400px;
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,90 @@
|
||||
/*
|
||||
* @Author: your name
|
||||
* @Date: 2022-01-04 14:44:59
|
||||
* @LastEditTime: 2022-01-04 16:05: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\sys-setting\components\system-waybill-logs\system-waybill-logs.component.ts
|
||||
*/
|
||||
import { Component, OnInit, ViewChild } from '@angular/core';
|
||||
import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st';
|
||||
import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
|
||||
import { dateTimePickerUtil } from '@delon/util';
|
||||
import { NzModalService } from 'ng-zorro-antd/modal';
|
||||
import { SystemService } from '../../services/system.service';
|
||||
|
||||
@Component({
|
||||
selector: 'app-system-logs',
|
||||
templateUrl: './system-waybill-logs.component.html',
|
||||
styleUrls: ['./system-waybill-logs.component.less']
|
||||
})
|
||||
export class SystemWaybillLogsComponent implements OnInit {
|
||||
@ViewChild('st', { static: true })
|
||||
st!: STComponent;
|
||||
@ViewChild('sf', { static: false })
|
||||
sf!: SFComponent;
|
||||
|
||||
searchSchema: SFSchema = {
|
||||
properties: {
|
||||
operateObject: {
|
||||
type: 'string',
|
||||
title: '订单号',
|
||||
ui: {
|
||||
placeholder: '请输入',
|
||||
}
|
||||
},
|
||||
time: {
|
||||
title: '登录时间',
|
||||
type: 'string',
|
||||
ui: {
|
||||
widget: 'sl-from-to-search',
|
||||
format: 'yyyy-MM-dd HH:mm:ss',
|
||||
nzShowTime: true,
|
||||
} as SFDateWidgetSchema
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
columns: STColumn[] = [
|
||||
{ title: 'ID', index: 'id' },
|
||||
{ title: '订单号', index: 'operateObject' },
|
||||
{ title: '说明', index: 'operationContent' },
|
||||
{ title: '操作人', index: 'operator' },
|
||||
{ title: '操作时间', index: 'operatorTimestamp', type: 'date' },
|
||||
];
|
||||
|
||||
_$expand = false;
|
||||
|
||||
constructor(public service: SystemService, private nzModalService: NzModalService) {}
|
||||
|
||||
ngOnInit(): void {}
|
||||
|
||||
beforeReq = (requestOptions: STRequestOptions) => {
|
||||
requestOptions.body.operateType = '3'
|
||||
if (this.sf) {
|
||||
Object.assign(requestOptions.body, {
|
||||
...this.sf.value,
|
||||
operateType: '3',
|
||||
endTime: this.sf.value.time?.[1] || null,
|
||||
startTime: this.sf.value.time?.[0] || null
|
||||
});
|
||||
}
|
||||
return requestOptions;
|
||||
};
|
||||
|
||||
/**
|
||||
* 重置表单
|
||||
*/
|
||||
resetSF() {
|
||||
this.sf.reset();
|
||||
this._$expand = false;
|
||||
}
|
||||
|
||||
/**
|
||||
* 伸缩查询条件
|
||||
*/
|
||||
expandToggle() {
|
||||
this._$expand = !this._$expand;
|
||||
this.sf?.setValue('/expand', this._$expand);
|
||||
}
|
||||
}
|
||||
@ -21,6 +21,8 @@ import { RoleManagementComponent } from './components/role-management/role-manag
|
||||
import { StaffManagementComponent } from './components/staff-management/staff-management.component';
|
||||
import { SystemConfigComponent } from './components/system-config/system-config.component';
|
||||
import { SystemLogsComponent } from './components/system-logs/system-logs.component';
|
||||
import { SystemSupplyLogsComponent } from './components/system-supply-logs/system-supply-logs.component';
|
||||
import { SystemWaybillLogsComponent } from './components/system-waybill-logs/system-waybill-logs.component';
|
||||
import { UserLogsComponent } from './components/user-logs/user-logs.component';
|
||||
import { VersionLogsComponent } from './components/version-logs/version-logs.component';
|
||||
|
||||
@ -40,6 +42,8 @@ const routes: Routes = [
|
||||
{ path: 'crm-management', component: CrmManagementComponent },
|
||||
{ path: 'network-freight', component: NetworkFreightComponent },
|
||||
{ path: 'close-account', component: CloseAccountComponent },
|
||||
{ path: 'system-supply-logs', component: SystemSupplyLogsComponent },
|
||||
{ path: 'system-waybill-logs', component: SystemWaybillLogsComponent },
|
||||
];
|
||||
|
||||
@NgModule({
|
||||
|
||||
@ -1,3 +1,11 @@
|
||||
/*
|
||||
* @Author: your name
|
||||
* @Date: 2021-12-03 15:23:05
|
||||
* @LastEditTime: 2022-01-04 14:46:23
|
||||
* @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\sys-setting\sys-setting.module.ts
|
||||
*/
|
||||
import { NgModule } from '@angular/core';
|
||||
import { CommonModule } from '@angular/common';
|
||||
import { SharedModule } from '@shared';
|
||||
@ -24,6 +32,8 @@ import { GoodsNameConfigComponent } from './components/goods-name-config/goods-n
|
||||
import { CrmManagementComponent } from './components/crm-management/crm-management.component';
|
||||
import { NetworkFreightComponent } from './components/network-freight/network-freight.component';
|
||||
import { CloseAccountComponent } from './components/close-account/close-account.component';
|
||||
import { SystemSupplyLogsComponent } from './components/system-supply-logs/system-supply-logs.component';
|
||||
import { SystemWaybillLogsComponent } from './components/system-waybill-logs/system-waybill-logs.component';
|
||||
|
||||
const COMPONENTS = [
|
||||
StaffManagementComponent,
|
||||
@ -40,7 +50,9 @@ const COMPONENTS = [
|
||||
GoodsNameConfigComponent,
|
||||
CrmManagementComponent,
|
||||
NetworkFreightComponent,
|
||||
CloseAccountComponent
|
||||
CloseAccountComponent,
|
||||
SystemSupplyLogsComponent,
|
||||
SystemWaybillLogsComponent
|
||||
];
|
||||
const NOTROUTECOMPONENTS = [
|
||||
BuyerTranspowerComponent,
|
||||
|
||||
@ -160,8 +160,8 @@ export class UserCenterComponentsDriverCaptainComponent implements OnInit {
|
||||
title: '注册渠道',
|
||||
enum: [
|
||||
{ label: '全部', value: '' },
|
||||
{ label: '自己录入', value: 1 },
|
||||
{ label: '货主录', value: 2 }
|
||||
{ label: '用户注册', value: 1 },
|
||||
{ label: '货主添加', value: 2 }
|
||||
],
|
||||
default: '',
|
||||
ui: {
|
||||
@ -194,7 +194,7 @@ export class UserCenterComponentsDriverCaptainComponent implements OnInit {
|
||||
}
|
||||
},
|
||||
{ title: '推广业务员', className: 'text-center', render: 'promotersTelephone' },
|
||||
{ title: '注册渠道', className: 'text-center', index: 'source', type: 'enum', enum: { 1: '自己录入', 2: '货主录入' } },
|
||||
{ title: '注册渠道', className: 'text-center', index: 'source', type: 'enum', enum: { 1: '用户注册', 2: '货主添加' } },
|
||||
{ title: '注册时间', className: 'text-center', index: 'createTime' },
|
||||
{
|
||||
title: '操作',
|
||||
|
||||
@ -180,8 +180,8 @@ export class UserCenterComponentsDriverComponent implements OnInit {
|
||||
title: '注册渠道',
|
||||
enum: [
|
||||
{ label: '全部', value: '' },
|
||||
{ label: '自己录入', value: 1 },
|
||||
{ label: '货主录入', value: 2 }
|
||||
{ label: '用户注册', value: 1 },
|
||||
{ label: '货主添加', value: 2 }
|
||||
],
|
||||
default: '',
|
||||
ui: {
|
||||
@ -251,7 +251,7 @@ export class UserCenterComponentsDriverComponent implements OnInit {
|
||||
}
|
||||
},
|
||||
{ title: '推广业务员', className: 'text-center', render: 'promotersTelephone' },
|
||||
{ title: '注册渠道', className: 'text-center', index: 'source', type: 'enum', enum: { 1: '自己录入', 2: '运营录入' } },
|
||||
{ title: '注册渠道', className: 'text-center', index: 'source', type: 'enum', enum: { 1: '用户注册', 2: '货主添加' } },
|
||||
{ title: '注册时间', className: 'text-center', index: 'createTime' },
|
||||
{
|
||||
title: '操作',
|
||||
|
||||
@ -90,8 +90,8 @@ export class FreightComponentsListComponent implements OnInit {
|
||||
title: '注册渠道',
|
||||
enum: [
|
||||
{ label: '全部', value: '' },
|
||||
{ label: '自己录入', value: 1 },
|
||||
{ label: '运营录入', value: 2 }
|
||||
{ label: '用户注册', value: 1 },
|
||||
{ label: '货主添加', value: 2 }
|
||||
],
|
||||
default: '',
|
||||
ui: {
|
||||
@ -147,7 +147,7 @@ export class FreightComponentsListComponent implements OnInit {
|
||||
{ title: '网络货运人', className: 'text-center', index: 'networkTransporter' },
|
||||
{ title: '常用服务', className: 'text-center', index: 'oftenUsedServices', type: 'enum', enum: { 10: '整车发货', 20: '大宗发货' } },
|
||||
{ title: '推广业务员', className: 'text-center', render: 'promotersTelephone' },
|
||||
{ title: '注册渠道', className: 'text-center', index: 'source', type: 'enum', enum: { 1: '自己录入', 2: '运营录入' } },
|
||||
{ title: '注册渠道', className: 'text-center', index: 'source', type: 'enum', enum: { 1: '用户注册', 2: '货主添加' } },
|
||||
{
|
||||
title: 'CRM审核状态',
|
||||
className: 'text-center',
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<!--
|
||||
* @Author: your name
|
||||
* @Date: 2021-12-03 15:31:52
|
||||
* @LastEditTime: 2021-12-28 17:04:16
|
||||
* @LastEditTime: 2022-01-04 15:34:07
|
||||
* @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
|
||||
@ -80,13 +80,13 @@
|
||||
{{i?.driver?.name}}/{{i?.driver?.phone}}
|
||||
</sv>
|
||||
<sv label="车型车长载重">
|
||||
{{i?.goodsInfos?.[0]?.weight}}吨,{{i?.goodsInfos?.[0]?.volume}}方,{{i?.goodsInfos?.[0]?.number}}件
|
||||
{{i?.carVO?.carModelLabel}},{{i?.carVO?.carLengthLabel}}米,{{i?.carVO?.carLoad ? i?.carVO?.carLoad +'吨': ''}}
|
||||
</sv>
|
||||
<sv label="计划装货时间">
|
||||
{{i?.loadPlanTime}}
|
||||
{{i?.loadingTime}}
|
||||
</sv>
|
||||
<sv label="计划卸货时间">
|
||||
{{i?.unloadPlanTime}}
|
||||
{{i?.unloadingTime}}
|
||||
</sv>
|
||||
<sv label="接单数量">
|
||||
{{i?.acceptWeight}}吨,{{i?.acceptVolume}}方,{{i?.acceptNumber}}件
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<!--
|
||||
* @Author: your name
|
||||
* @Date: 2021-12-03 15:31:52
|
||||
* @LastEditTime: 2021-12-28 17:11:42
|
||||
* @LastEditTime: 2022-01-04 15:35:11
|
||||
* @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
|
||||
@ -80,13 +80,13 @@
|
||||
{{i?.driver?.name}}/{{i?.driver?.phone}}
|
||||
</sv>
|
||||
<sv label="车型车长载重">
|
||||
{{i?.goodsInfos?.[0]?.weight}}吨,{{i?.goodsInfos?.[0]?.volume}}方,{{i?.goodsInfos?.[0]?.number}}件
|
||||
{{i?.carVO?.carModelLabel}},{{i?.carVO?.carLengthLabel}}米,{{i?.carVO?.carLoad ? i?.carVO?.carLoad +'吨': ''}}
|
||||
</sv>
|
||||
<sv label="计划装货时间">
|
||||
{{i?.loadPlanTime}}
|
||||
{{i?.loadingTime}}
|
||||
</sv>
|
||||
<sv label="计划卸货时间">
|
||||
{{i?.unloadPlanTime}}
|
||||
{{i?.unloadingTime}}
|
||||
</sv>
|
||||
<sv label="接单数量">
|
||||
{{i?.acceptWeight}}吨,{{i?.acceptVolume}}方,{{i?.acceptNumber}}件
|
||||
|
||||
@ -433,6 +433,14 @@
|
||||
"text": "系统操作日志",
|
||||
"link": "/system/system-logs"
|
||||
},
|
||||
{
|
||||
"text": "货源操作日志",
|
||||
"link": "/system/system-supply-logs"
|
||||
},
|
||||
{
|
||||
"text": "订单操作日志",
|
||||
"link": "/system/system-waybill-logs"
|
||||
},
|
||||
{
|
||||
"text": "用户登录日志",
|
||||
"link": "/system/user-logs"
|
||||
|
||||
Reference in New Issue
Block a user