diff --git a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html
index e65eb5c0..a76a0439 100644
--- a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html
+++ b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html
@@ -282,9 +282,8 @@
-
- 查看附件
- 补充协议
+ 查看附件
+ 补充协议
@@ -361,10 +360,10 @@
-
+
- 暂无附件信息
-
+ 暂无附件信息
+
diff --git a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts
index fce3e71c..32a8b032 100644
--- a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts
+++ b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts
@@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-24 16:58:02
* @LastEditors : Shiming
- * @LastEditTime : 2022-03-21 14:44:18
+ * @LastEditTime : 2022-03-23 14:44:37
* @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.
*/
@@ -55,6 +55,8 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit {
dirverBankCard: any; // 货源单设置回显
listImagUrls: any[] = []; // 货源单设置回显
dirvingMessage = [];
+ modalcontent: any;
+ modalTitle:string = '';
imges: any;
totalObj: any;
attObj: any;
@@ -908,7 +910,14 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit {
});
};
agreement(value: any) {
- this.imges = this.i?.agreementFilePath;
+ if(value ==='1'){
+ this.modalTitle = '附件信息';
+ this.modalcontent = this.i?.contractContent?.contractContent;
+
+ }else if(value === '2'){
+ this.modalTitle = '补充协议';
+ this.modalcontent = this.i?.supplementContent?.contractContent;
+ }
this.isVisible = true;
}
handleCancel() {
diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html
index 94efaf7d..87429cfe 100644
--- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html
+++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html
@@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-06 20:20:26
* @LastEditors : Shiming
- * @LastEditTime : 2022-03-22 11:06:16
+ * @LastEditTime : 2022-03-23 14:43:34
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@@ -163,9 +163,8 @@
-
- 查看附件
- 补充协议
+ 查看附件
+ 补充协议
@@ -249,10 +248,10 @@
-
+
- 暂无附件信息
-
+ 暂无附件信息
+
diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts
index a5d10d51..d0da463c 100644
--- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts
+++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts
@@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-06 20:20:26
* @LastEditors : Shiming
- * @LastEditTime : 2022-03-22 10:56:18
+ * @LastEditTime : 2022-03-23 14:44:43
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@@ -34,6 +34,8 @@ export class OrderManagementBulkeDetailComponent implements OnInit {
imges: any;
totalObj: any;
attObj: any;
+ modalcontent: any;
+ modalTitle:string = '';
isVisible = false;
logColumns2: STColumn[] = [
{ title: '时间', index: 'vinOutTime' },
@@ -120,7 +122,14 @@ export class OrderManagementBulkeDetailComponent implements OnInit {
this.router.navigate(['order-management/bulk-detailChange', this.id]);
}
agreement(value: any) {
- this.imges = this.i?.agreementFilePath;
+ if(value ==='1'){
+ this.modalTitle = '附件信息';
+ this.modalcontent = this.i?.contractContent?.contractContent;
+
+ }else if(value === '2'){
+ this.modalTitle = '补充协议';
+ this.modalcontent = this.i?.supplementContent?.contractContent;
+ }
this.isVisible = true;
}
handleCancel() {
diff --git a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html
index 0554935e..bffdaa4c 100644
--- a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html
+++ b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html
@@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-23 13:39:58
* @LastEditors : Shiming
- * @LastEditTime : 2022-03-11 16:41:08
+ * @LastEditTime : 2022-03-23 14:46:17
* @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.
-->
@@ -257,9 +257,8 @@
-
- 查看附件
- 补充协议
+ 查看附件
+ 补充协议
@@ -334,13 +333,13 @@
-
+
- 暂无附件信息
-
+ 暂无附件信息
+
-
+
diff --git a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts
index 3f77e312..9d8e5fff 100644
--- a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts
+++ b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts
@@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-23 13:39:58
* @LastEditors : Shiming
- * @LastEditTime : 2022-03-21 14:44:31
+ * @LastEditTime : 2022-03-23 14:49:18
* @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.
*/
@@ -54,6 +54,8 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
listImagUrls: any[] = []; // 货源单设置回显
billExpenses: any[] = []; //运费信息表格信息
dirvingMessage = [];
+ modalcontent: any;
+ modalTitle:string = '';
attObj: any;
totalObj: any;
approvalLsit: any;
@@ -855,7 +857,14 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
});
};
agreement(value: any) {
- this.imges = this.i?.agreementFilePath;
+ if(value ==='1'){
+ this.modalTitle = '附件信息';
+ this.modalcontent = this.i?.contractContent?.contractContent;
+
+ }else if(value === '2'){
+ this.modalTitle = '补充协议';
+ this.modalcontent = this.i?.supplementContent?.contractContent;
+ }
this.isVisible = true;
}
handleCancel() {
diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html
index fd15143d..1d8427aa 100644
--- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html
+++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html
@@ -169,9 +169,8 @@
-
- 查看附件
- 补充协议
+ 查看附件
+ 补充协议
@@ -231,13 +230,13 @@
-
+
- 暂无附件信息
-
+ 暂无附件信息
+
-
+
diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts
index aef380fc..4bbe0ef8 100644
--- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts
+++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts
@@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-28 14:42:03
* @LastEditors : Shiming
- * @LastEditTime : 2022-03-08 14:56:43
+ * @LastEditTime : 2022-03-23 14:45:58
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@@ -23,6 +23,8 @@ import { OrderManagementService } from '../../services/order-management.service'
})
export class OrderManagementVehicleDetailComponent implements OnInit {
id = this.route.snapshot.params.id;
+ modalcontent: any;
+ modalTitle:string = '';
trajectory = 'car';
mapList: any[] = []; //地图点位数据组
pois: any[] = [];
@@ -124,7 +126,14 @@ export class OrderManagementVehicleDetailComponent implements OnInit {
this.router.navigate(['order-management/vehicle-detailChange', this.id]);
}
agreement(value: any) {
- this.imges = this.i?.agreementFilePath;
+ if(value ==='1'){
+ this.modalTitle = '附件信息';
+ this.modalcontent = this.i?.contractContent?.contractContent;
+
+ }else if(value === '2'){
+ this.modalTitle = '补充协议';
+ this.modalcontent = this.i?.supplementContent?.contractContent;
+ }
this.isVisible = true;
}
handleCancel() {
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 e16ec52c..21ef7ea9 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
@@ -55,12 +55,12 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
{ title: '关联运单号', index: 'wayBillCode', width: '180px', className: 'text-left' },
{ title: '网络货运人', index: 'enterpriseInfoName', width: '180px', className: 'text-left' },
{ title: '货主', index: 'shipperAppUserName', width: '180px', className: 'text-left' },
- { title: '装货地', index: 'loadingPlace', width: '180px', className: 'text-left' },
- { title: '卸货地', index: 'dischargePlace', width: '180px', className: 'text-left' },
+ { title: '装货地', index: 'loadingAddressArr', width: '180px', className: 'text-left' },
+ { title: '卸货地', index: 'unloadingAddressArr', width: '180px', className: 'text-left' },
{ title: '承运司机', index: 'driver', width: '90px', className: 'text-left' },
{ title: '异常信息', index: 'exceptionContent', width: '250px', className: 'text-left' },
{ title: '异常图片', render: 'exceptionCertificateFirstFilePath', width: '220px', className: 'text-left' },
- { title: '上报时间', index: 'reportingTime', width: '180px', className: 'text-left' },
+ { title: '上报时间', index: 'createTime', width: '180px', className: 'text-left' },
{ title: '回复内容', index: 'replyContent', width: '180px', className: 'text-left' },
{ title: '回复人', index: 'replyAppUserName', width: '180px', className: 'text-left' },
{ title: '回复时间', index: 'replyTime', width: '180px', className: 'text-left' }
diff --git a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html
index 3c566dc6..284b56e4 100644
--- a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html
+++ b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html
@@ -183,9 +183,8 @@
-
- 查看附件
- 补充协议
+ 查看附件
+ 补充协议
@@ -249,10 +248,10 @@
-
+
- 暂无附件信息
-
+ 暂无附件信息
+
diff --git a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.ts b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.ts
index 3a6ddbe1..375f357c 100644
--- a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.ts
+++ b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.ts
@@ -1,7 +1,7 @@
/*
* @Author: your name
* @Date: 2021-12-03 15:31:52
- * @LastEditTime : 2022-03-21 14:56:00
+ * @LastEditTime : 2022-03-23 14:47:57
* @LastEditors : Shiming
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\bulk-detail\\bulk-detail.component.ts
@@ -35,6 +35,8 @@ export class WaybillManagementBulkeDetailComponent implements OnInit {
addressItems:any[] = []; //打点地址数据组
billExpenses: any[] = []; //运费信息表格信息
imges: any;
+ modalcontent: any;
+ modalTitle:string = '';
unLoadingPlaceVOList: any = [];
logColumns2: STColumn[] = [
{ title: '时间', index: 'vinOutTime' },
@@ -102,7 +104,14 @@ export class WaybillManagementBulkeDetailComponent implements OnInit {
window.history.go(-1);
}
agreement(value: any) {
- this.imges = this.i?.agreementFilePath
+ if(value ==='1'){
+ this.modalTitle = '附件信息';
+ this.modalcontent = this.i?.contractContent?.contractContent;
+
+ }else if(value === '2'){
+ this.modalTitle = '补充协议';
+ this.modalcontent = this.i?.supplementContent?.contractContent;
+ }
this.isVisible = true;
}
handleCancel() {
diff --git a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html
index d143b547..c45de3e6 100644
--- a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html
+++ b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html
@@ -165,9 +165,8 @@
-
- 查看附件
- 补充协议
+ 查看附件
+ 补充协议
@@ -229,10 +228,10 @@
-
+
- 暂无附件信息
-
+ 暂无附件信息
+
diff --git a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.ts b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.ts
index 18b300f9..d3533066 100644
--- a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.ts
+++ b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.ts
@@ -1,7 +1,7 @@
/*
* @Author: your name
* @Date: 2021-12-03 15:31:52
- * @LastEditTime : 2022-03-21 14:55:34
+ * @LastEditTime : 2022-03-23 14:49:13
* @LastEditors : Shiming
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\vehicle-detail\\vehicle-detail.component.ts
@@ -39,6 +39,8 @@ export class WaybillManagementVehicleDetailComponent implements OnInit, OnDestro
{ title: '时间', index: 'vinOutTime' },
{ title: '地点', index: 'cityName' }
];
+ modalcontent: any;
+ modalTitle:string = '';
billExpenses: any[] = []; //运费信息表格信息
logColumns: STColumn[] = [
{ title: '款项', index: 'costCodeLabel' },
@@ -94,7 +96,14 @@ export class WaybillManagementVehicleDetailComponent implements OnInit, OnDestro
window.history.go(-1);
}
agreement(value: any) {
- this.imges = this.i?.agreementFilePath;
+ if(value ==='1'){
+ this.modalTitle = '附件信息';
+ this.modalcontent = this.i?.contractContent?.contractContent;
+
+ }else if(value === '2'){
+ this.modalTitle = '补充协议';
+ this.modalcontent = this.i?.supplementContent?.contractContent;
+ }
this.isVisible = true;
}
handleCancel() {