diff --git a/src/app/routes/insurance-management/components/list/list.component.ts b/src/app/routes/insurance-management/components/list/list.component.ts
index 7cc54aaa..a49f2c47 100644
--- a/src/app/routes/insurance-management/components/list/list.component.ts
+++ b/src/app/routes/insurance-management/components/list/list.component.ts
@@ -412,12 +412,12 @@ export class insuranceManagementListComponent implements OnInit {
{
title: '货主',
className: 'text-left',
- width: '180px',
+ width: '250px',
index: 'shipperAppUserName'
},
{
title: '所属项目',
- width: '200px',
+ width: '250px',
className: 'text-left',
index: 'enterpriseProjectName'
},
diff --git a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts
index 3e3da31a..8098d2f5 100644
--- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts
+++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts
@@ -826,7 +826,6 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
nzContent: TranAgreementComponent,
nzWidth: 900,
nzFooter: null,
- nzComponentParams: { type: 'next' }
});
modalRef.afterClose.subscribe(result => {
if (result) {
diff --git a/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.html b/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.html
index e77d92f8..156e8383 100644
--- a/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.html
+++ b/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.html
@@ -1,6 +1,5 @@
-
-
- 委托运输协议
+
+ {{ agreement?.agreementName }}
diff --git a/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.ts b/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.ts
index 49c85b79..12018aa6 100644
--- a/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.ts
+++ b/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.ts
@@ -4,12 +4,13 @@
* @Author : Shiming
* @Date : 2022-01-06 15:01:40
* @LastEditors : Shiming
- * @LastEditTime : 2022-01-18 17:29:05
+ * @LastEditTime : 2022-02-24 16:24:32
* @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\tran-agreement\\tran-agreement.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { Component } from '@angular/core';
import { NzModalRef } from 'ng-zorro-antd/modal';
+import { SupplyManagementService } from '../../services/supply-management.service';
@Component({
selector: 'publish-goods-tran-agreement',
@@ -18,11 +19,19 @@ import { NzModalRef } from 'ng-zorro-antd/modal';
})
export class TranAgreementComponent {
- type: any;
- constructor(private modal: NzModalRef) {
+ agreement:any;
+ constructor(private modal: NzModalRef,public service: SupplyManagementService,) {
}
+ ngOnInit() {
+ this.service.request(this.service.$api_getAgreementInfoByType,{type:'6'}).subscribe((res) => {
+ if (res) {
+ this.agreement = res;
+ }
+ });
+ }
+
handleOk(){
this.modal.close(true);
}
diff --git a/src/app/routes/supply-management/services/supply-management.service.ts b/src/app/routes/supply-management/services/supply-management.service.ts
index 09c8ca38..ffdbc334 100644
--- a/src/app/routes/supply-management/services/supply-management.service.ts
+++ b/src/app/routes/supply-management/services/supply-management.service.ts
@@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-03 11:10:14
* @LastEditors : Shiming
- * @LastEditTime : 2022-02-17 16:58:46
+ * @LastEditTime : 2022-02-24 16:23:02
* @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\services\\supply-management.service.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@@ -111,7 +111,8 @@ export class SupplyManagementService extends BaseService {
public $api_getOperationLogRecordsList = '/api/mdc/pbc/operationLogRecords/getOperationLogRecordsList';
// 获取数据字典
$api_getDictValue = `/api/mdc/pbc/dictItems/getDictValue`;
-
+ // 获取协议信息
+ public $api_getAgreementInfoByType = '/api/mdc/pbc/agreementInfo/getAgreementInfoByType';
/**
* 获取车型、车长字典数据
* @returns
diff --git a/src/app/routes/vehicle/components/list/list.component.ts b/src/app/routes/vehicle/components/list/list.component.ts
index 817881c3..28757f35 100644
--- a/src/app/routes/vehicle/components/list/list.component.ts
+++ b/src/app/routes/vehicle/components/list/list.component.ts
@@ -199,7 +199,7 @@ export class VehicleComponentsListComponent implements OnInit {
// { title: '', type: 'checkbox', className: 'text-center' },
{ title: '车牌号', width: '150px', className: 'text-center', index: 'carNo' },
{ title: '车牌颜色', width: '150px', className: 'text-center', index: 'carNoColorLabel' },
- { title: '车型-车长-载重', width: '150px', className: 'text-center', render: 'carLength' },
+ { title: '车型-车长-载重', width: '180px', className: 'text-center', render: 'carLength' },
{
title: '运营状态',
width: '150px',
@@ -238,7 +238,7 @@ export class VehicleComponentsListComponent implements OnInit {
3: { text: '已到期', color: 'error' }
}
},
- { title: '所有人', width: '150px', className: 'text-center', index: 'carOwner' },
+ { title: '所有人', width: '200px', className: 'text-center', index: 'carOwner' },
{ title: '是否挂靠', width: '150px', className: 'text-center', render: 'isSelf' },
{ title: '挂靠协议', width: '150px', className: 'text-center', render: 'approvalAuditStatus' },
// { title: '是否已备案', className: 'text-center', render: 'putOnRecord', },
diff --git a/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.ts b/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.ts
index c2be082a..b22e712e 100644
--- a/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.ts
+++ b/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.ts
@@ -33,8 +33,8 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
columns: STColumn[] = [
{ title: '异常编号', index: 'exceptionCode',width: '180px',className: 'text-left', },
{ title: '关联运单号', index: 'wayBillCode',width: '180px',className: 'text-left', },
- { title: '网络货运人', index: 'enterpriseInfoName',width: '220px',className: 'text-left', },
- { title: '货主', index: 'shipperAppUserName' ,width: '220px',className: 'text-left',},
+ { title: '网络货运人', index: 'enterpriseInfoName',width: '250px',className: 'text-left', },
+ { title: '货主', index: 'shipperAppUserName' ,width: '250px',className: 'text-left',},
{ title: '装货地', index: 'loadingAddressArr' ,width: '220px',className: 'text-left',},
{ title: '卸货地', index: 'unloadingAddressArr' ,width: '220px',className: 'text-left',},
{ title: '承运司机', index: 'driver' ,width: '250px',className: 'text-left',},
diff --git a/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts b/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts
index fa427fd6..bdd5d180 100644
--- a/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts
@@ -304,7 +304,7 @@ export class WaybillManagementVehicleComponent implements OnInit {
{
title: '货物信息',
className: 'text-left',
- width: '180px',
+ width: '250px',
render: 'goodsInfos'
},
{