From 6b08457f6c639e37322478edad92f76254c08ba4 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Tue, 22 Mar 2022 17:00:57 +0800 Subject: [PATCH 1/4] fix bug --- .../components/complaint/complaint.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/routes/order-management/components/complaint/complaint.component.ts b/src/app/routes/order-management/components/complaint/complaint.component.ts index 0bd36347..eb081b50 100644 --- a/src/app/routes/order-management/components/complaint/complaint.component.ts +++ b/src/app/routes/order-management/components/complaint/complaint.component.ts @@ -30,8 +30,8 @@ export class OrderManagementComplaintComponent implements OnInit { columns: STColumn[] = []; selectedIndex: number = 0; mainTabs = [ - { name: '投诉', status: '1' }, - { name: '被投诉', status: '2' }, + { name: '司机投诉', status: '1' }, + { name: '货主投诉', status: '2' }, ] tabs = [ { name: '全部', From 39c64209219d8766cd08c09c843a7cf0424e7e55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= Date: Tue, 22 Mar 2022 17:14:50 +0800 Subject: [PATCH 2/4] =?UTF-8?q?dict-select=E7=BB=84=E4=BB=B6=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E9=87=8D=E7=BD=AE=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/shared/widget/dict-select/dict-select.widget.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/app/shared/widget/dict-select/dict-select.widget.ts b/src/app/shared/widget/dict-select/dict-select.widget.ts index 57b64ba5..d8906295 100644 --- a/src/app/shared/widget/dict-select/dict-select.widget.ts +++ b/src/app/shared/widget/dict-select/dict-select.widget.ts @@ -1,5 +1,5 @@ /* - * @Description : + * @Description : * @Version : 1.0 * @Author : Shiming * @Date : 2021-12-13 10:36:49 @@ -37,4 +37,8 @@ export class DictSelectWidget extends ControlWidget implements OnInit { if (this.ui.change) this.ui.change(value); this.setValue(value); } + + reset(value: any) { + this.setValue(value); + } } From 0ca940305bd2ed6a251cf9b74568a17a56a4b8a4 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Tue, 22 Mar 2022 17:37:28 +0800 Subject: [PATCH 3/4] fix bug --- .../risk-detail/risk-detail.component.html | 53 ++++++++++-------- .../risk-detail/risk-detail.component.ts | 55 +++++++++++++++---- .../services/order-management.service.ts | 3 +- 3 files changed, 76 insertions(+), 35 deletions(-) diff --git a/src/app/routes/order-management/components/risk-detail/risk-detail.component.html b/src/app/routes/order-management/components/risk-detail/risk-detail.component.html index ff434c8d..f9510e7b 100644 --- a/src/app/routes/order-management/components/risk-detail/risk-detail.component.html +++ b/src/app/routes/order-management/components/risk-detail/risk-detail.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-16 10:19:08 * @LastEditors : Shiming - * @LastEditTime : 2022-02-25 11:38:11 + * @LastEditTime : 2022-03-22 17:32:53 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\risk-detail\\risk-detail.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -17,44 +17,51 @@ - {{datailList?.billCode}} + {{i?.billCode}} - 待申述 - 申述中 - 申述成功 - 申诉失败 + 待申述 + 申述中 + 申述成功 + 申诉失败 - {{datailList?.driverName}} / {{datailList?.driverPhoneNumber}} / {{i?.carId}} - {{datailList?.payeeName}} / {{datailList?.payeePhoneNumber}} - {{datailList?.loadTime}} - {{datailList?.unloadTime}} - {{datailList?.loadingPlace}} - {{datailList?.dischargePlace}} + {{i?.driverName}} / {{i?.driverPhoneNumber}} / {{i?.carId}} + {{i?.payeeName}} / {{i?.payeePhoneNumber}} + {{i?.loadTime}} + {{i?.unloadTime}} + {{i?.loadingPlace}} + {{i?.dischargePlace}}
-
+
{{items.complianceName}}
- - + + + + + + + + - - - 申诉成功 - 重新提交申诉申请
操作人员：张三
- - 驳回
操作人员：张三
- - 提交申诉申请
操作人员：张三
+ +
{{item?.operationContent}}
+
操作人:{{item?.operator}}
 diff --git a/src/app/routes/order-management/components/risk-detail/risk-detail.component.ts b/src/app/routes/order-management/components/risk-detail/risk-detail.component.ts index 41f20698..d982d8f4 100644 --- a/src/app/routes/order-management/components/risk-detail/risk-detail.component.ts +++ b/src/app/routes/order-management/components/risk-detail/risk-detail.component.ts @@ -24,7 +24,7 @@ export class OrderManagementRiskDetailComponent implements OnInit { // '运单轨迹严重异常' // ] i: any; - datailList: any; + logList: any = []; id: string = ''; constructor(private modal: NzModalService, public service: OrderManagementService, public ar: ActivatedRoute) { this.id = this.ar.snapshot.params.id; @@ -41,7 +41,7 @@ export class OrderManagementRiskDetailComponent implements OnInit { initSF() { this.schema = { properties: { - representationsCause: { + representationsCauseLabel: { title: '申诉原因', type: 'string', maxLength: 30, @@ -65,7 +65,7 @@ export class OrderManagementRiskDetailComponent implements OnInit { readOnly: true } as SFTextareaWidgetSchema, - enterpriseQualificationCe: { + uploadVanchor: { type: 'string', title: '上传凭证', ui: { @@ -96,13 +96,39 @@ export class OrderManagementRiskDetailComponent implements OnInit { }, }; } - getDetail(id: string) { - this.service.request(this.service.$api_get_getRiskDetail, { id }).subscribe(res => { - if (res) { - this.datailList = res; - } - }) - } + /** + * 获取详情 + * @param id + */ + getDetail(id: string) { + this.service.request(this.service.$api_get_getRiskDetail, { id }).subscribe(res => { + if (res) { + this.i = Object.assign({}, res); + console.log(this.i); + let list: any = []; + this.i.fileArr.map((item: any, index: number) => { + const obj = { + uid: index, + name: '文件' + (index + 1), + status: 'done', + url: item, + }; + list.push(obj); + }); + this.i.uploadVanchor = list; + this.initSF(); + this.getLog(this.i?.billCode); + } + }) + } + // getDetail(id: string) { + + // this.service.request(this.service.$api_get_getRiskDetail, { id }).subscribe(res => { + // if (res) { + // this.i = res; + // } + // }) + // } edit(item: any): void { const modalRef = this.modal.create({ @@ -123,5 +149,12 @@ export class OrderManagementRiskDetailComponent implements OnInit { goBack() { window.history.go(-1) } - + /** + * 获取操作日志 + */ + getLog(operateObject: any) { + this.service.request(this.service.$api_get_risk_order_log, { operateObject, operateType: '8', size: 100 }).subscribe(res => { + this.logList = res?.records; + }) + } } diff --git a/src/app/routes/order-management/services/order-management.service.ts b/src/app/routes/order-management/services/order-management.service.ts index f91d5f4e..6ce20270 100644 --- a/src/app/routes/order-management/services/order-management.service.ts +++ b/src/app/routes/order-management/services/order-management.service.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-03 15:31:52 * @LastEditors : Shiming - * @LastEditTime : 2022-03-22 10:49:37 + * @LastEditTime : 2022-03-22 17:29:07 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\services\\order-management.service.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -167,6 +167,7 @@ export class OrderManagementService extends ShipperBaseService { const params = { dictKey: dictKey }; return this.request(this.$api_getDictValue, params); } + $api_get_risk_order_log = `/api/mdc/pbc/operationLogRecords/getOperationLogRecordsList`; // 获取货源的操作日志 // 获取数据字典 $api_getDictValue = `/api/mdc/pbc/dictItems/getDictValue`; // 获取轨迹 From c5e718297805f5c97af63a05f8fda7813e15a632 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Tue, 22 Mar 2022 17:45:32 +0800 Subject: [PATCH 4/4] fix bug --- .../components/risk-detail/risk-detail.component.html | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/app/routes/order-management/components/risk-detail/risk-detail.component.html b/src/app/routes/order-management/components/risk-detail/risk-detail.component.html index f9510e7b..dc664833 100644 --- a/src/app/routes/order-management/components/risk-detail/risk-detail.component.html +++ b/src/app/routes/order-management/components/risk-detail/risk-detail.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-16 10:19:08 * @LastEditors : Shiming - * @LastEditTime : 2022-03-22 17:32:53 + * @LastEditTime : 2022-03-22 17:44:13 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\risk-detail\\risk-detail.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -49,11 +49,10 @@ - - - - - + --> +