diff --git a/proxy.conf.js b/proxy.conf.js index 445b7e9d..fc9f6f33 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-18 09:51:21 * @LastEditors : Shiming - * @LastEditTime : 2022-01-25 15:35:06 + * @LastEditTime : 2022-01-25 16:49:35 * @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-test.eascs.com', + host: 'tms-api-dev.eascs.com', protocol: 'https:', port: 443 }, diff --git a/src/app/routes/order-management/components/bulk/bulk.component.html b/src/app/routes/order-management/components/bulk/bulk.component.html index abade9ae..f4da9a9c 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.html +++ b/src/app/routes/order-management/components/bulk/bulk.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-12 10:52:50 * @LastEditors : Shiming - * @LastEditTime : 2022-01-24 09:53:48 + * @LastEditTime : 2022-01-25 16:52:29 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk\\bulk.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -200,16 +200,21 @@ - -
- 评分: -
评价内容:
-
+ + + + + + +
暂无评价内容
-
- 暂无评价内容 -
+ + + + + +
暂无评价内容
diff --git a/src/app/routes/order-management/components/bulk/bulk.component.ts b/src/app/routes/order-management/components/bulk/bulk.component.ts index 4416f1d5..4815d172 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.ts +++ b/src/app/routes/order-management/components/bulk/bulk.component.ts @@ -30,6 +30,8 @@ export class OrderManagementBulkComponent implements OnInit { changeViewId: any; // 查看运费变更记录id - 用于查看 ViewCause: any; // 变更运费查看数据 sfViewFormData: any; // 变更运费查看的sf 数据 + shipList: any; // 货主评价 数据 + diverList: any; // 司机评价 数据 @ViewChild('st') private readonly st!: STComponent; @ViewChild('stFloat') private readonly stFloat!: STComponent; @ViewChild('stFloatView') private readonly stFloatView!: STComponent; @@ -635,9 +637,12 @@ export class OrderManagementBulkComponent implements OnInit { } this.service.request(this.service.$api_getBillEvaluateByShipper, params).subscribe(res => { console.log(res) + console.log(res.evaluateInfos) + this.shipList = res.evaluateInfos }); this.service.request(this.service.$api_getBillEvaluateDriverByShipper, params2).subscribe(res => { console.log(res) + this.diverList = res.evaluateInfos }); } /** diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.html b/src/app/routes/order-management/components/vehicle/vehicle.component.html index e7f3724b..f691e49d 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.html +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-12 10:52:50 * @LastEditors : Shiming - * @LastEditTime : 2022-01-19 14:39:41 + * @LastEditTime : 2022-01-25 16:34:30 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle\\vehicle.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -177,16 +177,21 @@ - -
- 评分: -
评价内容:
-
+ + + + + + +
暂无评价内容
-
- 暂无评价内容 -
+ + + + + +
暂无评价内容
diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.ts b/src/app/routes/order-management/components/vehicle/vehicle.component.ts index 8b081670..08d9fb51 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts @@ -29,6 +29,8 @@ export class OrderManagementVehicleComponent implements OnInit { changeId: any; // 主页面查看运费变更记录id - 用于运费变更记录 changeViewId: any; // 查看运费变更记录id - 用于查看 ViewCause: any; // 变更运费查看数据 + shipList: any; // 货主评价 数据 + diverList: any; // 司机评价 数据 _$expand = false; @ViewChild('st') private readonly st!: STComponent; @ViewChild('stFloat') private readonly stFloat!: STComponent; @@ -598,9 +600,12 @@ resourceStatus: any; } this.service.request(this.service.$api_getBillEvaluateByShipper, params).subscribe(res => { console.log(res) + this.shipList = res.evaluateInfos + }); this.service.request(this.service.$api_getBillEvaluateDriverByShipper, params2).subscribe(res => { console.log(res) + this.diverList = res.evaluateInfos }); } /**