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

车辆接口更新

Browse Source
This commit is contained in:
wangshiming
2022-01-20 19:45:38 +08:00
parent cb9e56892b
commit f86f4cc801
7 changed files with 130 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
proxy.conf.js
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-01-18 09:51:21
* @LastEditors : Shiming
* @LastEditTime : 2022-01-20 17:31:54
* @LastEditTime : 2022-01-20 19:40:51
* @FilePath : \\tms-obc-web\\proxy.conf.js
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@ -20,7 +20,7 @@ module.exports = {
// }
'//api': {
target: {
host: 'tms-api-dev.eascs.com',
host: 'tms-api-test.eascs.com',
protocol: 'https:',
port: 443
},

6
src/app/routes/financial-management/components/cost-management/cost-management-detail/cost-management-detail.component.html
View File

@ -96,6 +96,12 @@
<ng-template st-row="no" let-item let-index="index" let-column="column">
{{ textStatus ? item.hrmoney : item.hrvatmoney }}
</ng-template>
<ng-template st-row="billTime" let-item let-index="index" let-column="column">
{{costInfo.billTime}}
</ng-template>
<ng-template st-row="cnoName" let-item let-index="index" let-column="column">
{{costInfo.cnoName}}
</ng-template>
</st>
</nz-tab>
<nz-tab nzTitle="开票信息">

4
src/app/routes/financial-management/components/cost-management/cost-management-detail/cost-management-detail.component.ts
View File

@ -54,10 +54,10 @@ export class CostManagementDetailComponent implements OnInit {
{ title: '序号', render: 'no', width: 70, className: 'text-left' },
{ title: '费用明细号', index: 'feeHId', className: 'text-left', width: 200 },
{ title: '订单号', index: 'billHCode', className: 'text-left', width: 200 },
{ title: '订单日期', index: 'callNo', className: 'text-left', width: 200 },
{ title: '订单日期', render: 'billTime', className: 'text-left', width: 200 },
{ title: '运单号', index: 'waybillHCode', className: 'text-left', width: 200 },
{ title: '运单日期', index: 'waybillDate', className: 'text-left', width: 200 },
{ title: '结算客户', render: 'artocode', className: 'text-left', width: 200 },
{ title: '结算客户', render: 'cnoName', className: 'text-left', width: 200 },
{ title: '订单费用类型', index: 'billLType', className: 'text-left', width: 200 },
{ title: '费用科目', index: 'feeSubId', className: 'text-left', width: 200 },
{ title: '税率', index: 'hrvatrate', className: 'text-right', width: 200 },

17
src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-23 13:39:58
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:20:14
* @LastEditTime : 2022-01-20 19:28:44
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail-change\\vehicle-detail-change.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@ -215,21 +215,24 @@
</ng-template>
<ng-template sf-template="carmand" let-item let-ui="ui">
{{i?.goodsInfoList?.[0]?.maxWeightLabel}}/{{i?.goodsInfoList?.[0]?.maxCubeLabel}}
{{ i?.carModel }}/{{ i?.carLength }}
</ng-template>
<!-- <sv label="用车需求">{{ i?.carModel }}/{{ i?.carLength }} </sv>
<sv label="承运司机">
{{i?.driverName}}/{{i?.driverPhone}}/{{i?.carNo}}
</sv> -->
<ng-template sf-template="drivers" let-item let-ui="ui">
{{ i?.driverId }}
{{i?.driverName}}/{{i?.driverPhone}}/{{i?.carNo}}
</ng-template>
<ng-template sf-template="weightModel" let-item let-ui="ui">
{{i?.goodsInfoList?.[0]?.weight}}顿,{{i?.goodsInfoList?.[0]?.volume}}方,{{i?.goodsInfoList?.[0]?.number}}件
{{ i?.driverCarModelLabel }},{{ i?.driverCarLengthLabel }}米,{{ i?.driverCarWeight }}吨
</ng-template>
<ng-template sf-template="loadTime" let-item let-ui="ui">
<ng-template sf-template="loadPlanTime" let-item let-ui="ui">
<nz-date-picker nzShowTime nzFormat="yyyy-MM-dd HH:mm:ss" [(ngModel)]="loadTime"></nz-date-picker>
</ng-template>
<ng-template sf-template="unloadTime" let-item let-ui="ui">
<ng-template sf-template="unloadPlanTime" let-item let-ui="ui">
<nz-date-picker nzShowTime nzFormat="yyyy-MM-dd HH:mm:ss" [(ngModel)]="unloadTime"></nz-date-picker>
</ng-template>
</sf>

124
src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-23 13:39:58
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:20:33
* @LastEditTime : 2022-01-20 19:29:05
* @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.
*/
@ -13,13 +13,14 @@ import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'
import { ActivatedRoute, Router } from '@angular/router';
import { apiConf } from '@conf/api.conf';
import { STColumn, STComponent } from '@delon/abc/st';
import { SFComponent, SFSchema, SFUISchema, SFUploadWidgetSchema } from '@delon/form';
import { SFComponent, SFSchema, SFSelectWidgetSchema, SFUISchema, SFUploadWidgetSchema } from '@delon/form';
import { AmapPoiPickerComponent, AmapService, EAEnvironmentService, ShipperBaseService } from '@shared';
import { NzCardComponent } from 'ng-zorro-antd/card';
import { NzMessageService } from 'ng-zorro-antd/message';
import { NzModalService } from 'ng-zorro-antd/modal';
import { NzUploadChangeParam, NzUploadFile } from 'ng-zorro-antd/upload';
import { Observable, Observer } from 'rxjs';
import { map } from 'rxjs/operators';
import { OrderManagementService } from '../../services/order-management.service';
function getBase64(file: File): Promise<string | ArrayBuffer | null> {
return new Promise((resolve, reject) => {
@ -287,7 +288,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
};
}
initData() {
this.service.request(this.service.$api_set_getWholeOrderDetail, { id: this.id }).subscribe(res => {
this.service.request(this.service.$api_get_getWholeBillDetail, { id: this.id }).subscribe(res => {
console.log(res);
if (res) {
this.i = res;
@ -303,6 +304,16 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
});
this.listImagUrls = arr;
this.sf4data = res?.goodsInfoList?.[0];
this.sf3data = {
goodsTypeId: res?.goodsInfoList[0]?.goodsTypeId || '',
goodsTypeName: res?.goodsInfoList[0]?.goodsTypeName || '',
goodsNameId: res?.goodsInfoList[0]?.goodsNameId || '',
goodsName: res?.goodsInfoList[0]?.goodsName || ''
};
if (this.sf3data.goodsTypeName === '其它') {
this.sf3data.goodsName1 = res?.goodsInfoList[0]?.goodsName || '';
}
this.changeGoodsType(this.sf3data.goodsTypeId, { label: this.sf3data.goodsTypeName, value: this.sf3data.goodsTypeId });
// 对装卸货信息进行初始化
res?.unLoadingPlaceList.forEach((element: any) => {
if (element.type === 1 || element.type === '1') {
@ -548,38 +559,71 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
initSF3() {
this.schema3 = {
properties: {
// enterpriseInfoId: {
// title: '网络货运人',
// type: 'string',
// ui: {
// placeholder: '请选择',
// widget: 'select',
// asyncData: () => this.shipperservice.getNetworkFreightForwarder(),
// visibleIf: {
// _$expand: (value: boolean) => value,
// },
// }
// },
goodsName: {
goodsTypeId: {
type: 'string',
title: '货物名称',
ui: {
widget: 'dict-select',
params: { dictKey: 'GoodsName' },
placeholder: '请选择'
widget: 'select',
placeholder: '请选择',
errors: { required: '请选择货物类型' },
asyncData: () =>
this.shipperservice.loadConfigByKey('goods.name.config.type').pipe(
map((data: any) => {
return data[0].children?.map((m: any) => {
return { label: m.name, value: m.id };
});
})
),
change: (value: any, data: any) => {
this.changeGoodsType(value, data);
this.sf3.setValue('/goodsTypeName', data.label);
}
} as SFSelectWidgetSchema
},
qita: {
goodsTypeName: {
type: 'string',
title: '',
ui: {
hidden: true
}
},
goodsNameId: {
type: 'string',
title: '',
ui: {
widget: 'select',
placeholder: '请选择',
errors: { required: '请填写货物名称' },
change: (_value: any, data: any) => {
this.sf3.setValue('/goodsName', data.label);
},
visibleIf: {
goodsName: value => value === '3'
goodsTypeName: (value: any) => value && value !== '其它'
}
}
},
goodsName: {
type: 'string',
title: '',
ui: {
hidden: true,
visibleIf: {
goodsTypeName: (value: any) => value && value !== '其它'
}
}
},
goodsName1: {
type: 'string',
title: '',
ui: {
errors: { required: '请填写货物名称' },
visibleIf: {
goodsTypeName: (value: any) => value && value === '其它'
}
}
}
},
required: ['goodsName']
required: ['goodsTypeId', 'goodsName', 'goodsNameId']
};
this.ui3 = {
'*': {
@ -594,6 +638,32 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
}
};
}
changeGoodsType(value: string, data: any) {
if (data.label === '其它') return;
const params = {
pageIndex: 1,
pageSize: 100,
configId: value
};
this.service
.request(this.service.$api_get_config_item_page, params)
.pipe(
map(data => {
return data.records?.map((m: any) => {
return { label: m.name, value: m.id };
});
})
)
.subscribe(res => {
if (res) {
this.sf3.getProperty('/goodsNameId')!.schema.enum = res;
this.sf3.getProperty('/goodsNameId')!.widget?.reset(res);
if (this.sf3data.goodsNameId) {
this.sf3.setValue('/goodsNameId', this.sf3data.goodsNameId);
}
}
});
}
initST() {
this.logColumns = [
{ title: '款项', index: 'costName' },
@ -669,7 +739,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
placeholder: '请输入'
}
},
loadTime: {
loadPlanTime: {
type: 'string',
title: '发车时间',
ui: {
@ -677,7 +747,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
placeholder: '请输入'
}
},
unloadTime: {
unloadPlanTime: {
type: 'string',
title: '到车时间',
ui: {
@ -686,7 +756,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
}
}
},
required: ['weight', 'loadTime', 'unloadTime']
required: ['weight', 'loadPlanTime', 'unloadPlanTime']
};
this.ui4 = {
'*': {
@ -711,10 +781,10 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
$drivers: {
grid: { span: 12 }
},
$loadTime: {
$loadPlanTime: {
grid: { span: 12 }
},
$unloadTime: {
$unloadPlanTime: {
grid: { span: 12 }
}
};

4
src/app/routes/order-management/services/order-management.service.ts
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-03 15:31:52
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:24:32
* @LastEditTime : 2022-01-20 19:16:44
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\services\\order-management.service.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@ -124,6 +124,8 @@ export class OrderManagementService extends ShipperBaseService {
// 获取货主企业列表
public $api_enterpriceList = '/api/mdc/cuc/enterpriseInfo/operate/enterpriceList';
// 查询系统配置项
public $api_get_config_item_page = '/api/mdc/pbc/sysConfigItem/list/page';
/**
* 根据企业ID，获取企业历史网络货运人
* @returns

18
src/app/routes/waybill-management/components/bulk/bulk.component.spec.ts
View File

@ -1,10 +1,10 @@
/*
* @Author: your name
* @Date: 2021-12-06 20:03:28
* @LastEditTime: 2021-12-06 20:03:29
* @LastEditors: Please set LastEditors
* @LastEditTime : 2022-01-20 19:09:36
* @LastEditors : Shiming
* @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
* @FilePath : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\bulk\\bulk.component.spec.ts
*/
/*
* @Author: your name
@ -15,21 +15,21 @@
* @FilePath: \tms-obc-web\src\app\routes\order-management\components\bulk\bulk.component.spec.ts
*/
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
import { OrderManagementBulkComponent } from './bulk.component';
import { WaybillManagementBulkComponent } from './bulk.component';
describe('OrderManagementBulkComponent', () => {
let component: OrderManagementBulkComponent;
let fixture: ComponentFixture<OrderManagementBulkComponent>;
describe('WaybillManagementBulkComponent', () => {
let component: WaybillManagementBulkComponent;
let fixture: ComponentFixture<WaybillManagementBulkComponent>;
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [ OrderManagementBulkComponent ]
declarations: [ WaybillManagementBulkComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(OrderManagementBulkComponent);
fixture = TestBed.createComponent(WaybillManagementBulkComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});