From 670543f8cf893a4c463a8d770e85383b2bac0eac Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 25 Mar 2022 15:04:50 +0800 Subject: [PATCH 1/3] fix bug --- .../components/compliance-audit/compliance-audit.component.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts index 8adef7ef..26b95ccb 100644 --- a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts +++ b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts @@ -121,7 +121,6 @@ export class OrderManagementComplianceAuditComponent implements OnInit { this.initST(); setTimeout(() => { this.st.load(); - this.getGoodsSourceStatistical(); }, 500); } ngOnInit(): void { From 9a0c58504cee1842c0bd86a7fe81eb0e105023bc Mon Sep 17 00:00:00 2001 From: Lingzi Date: Fri, 25 Mar 2022 15:22:32 +0800 Subject: [PATCH 2/3] fix bug --- .../showService/showService.component.html | 13 +-- .../list/showService/showservice.component.ts | 85 ++++++++++++++----- .../usercenter/services/usercenter.service.ts | 2 + 3 files changed, 66 insertions(+), 34 deletions(-) diff --git a/src/app/routes/usercenter/components/freight/list/showService/showService.component.html b/src/app/routes/usercenter/components/freight/list/showService/showService.component.html index 2c4deeca..82ea63f2 100644 --- a/src/app/routes/usercenter/components/freight/list/showService/showService.component.html +++ b/src/app/routes/usercenter/components/freight/list/showService/showService.component.html @@ -1,14 +1,5 @@ - - -
-
* 客服人员
-
- - - -
-
+
- +
\ No newline at end of file diff --git a/src/app/routes/usercenter/components/freight/list/showService/showservice.component.ts b/src/app/routes/usercenter/components/freight/list/showService/showservice.component.ts index d0e4b01e..107bdbd2 100644 --- a/src/app/routes/usercenter/components/freight/list/showService/showservice.component.ts +++ b/src/app/routes/usercenter/components/freight/list/showService/showservice.component.ts @@ -1,12 +1,13 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { apiConf } from '@conf/api.conf'; import { cacheConf } from '@conf/cache.conf'; -import { SFUISchema, SFSchema, SFUploadWidgetSchema, SFComponent, SFSelectWidgetSchema } from '@delon/form'; +import { SFUISchema, SFSchema, SFUploadWidgetSchema, SFComponent, SFSelectWidgetSchema, SFSchemaEnum } from '@delon/form'; import { _HttpClient } from '@delon/theme'; import { EACacheService, EAEnvironmentService } from '@shared'; import { NzModalRef } from 'ng-zorro-antd/modal'; import { NzUploadFile } from 'ng-zorro-antd/upload'; import { Observable, Observer, of } from 'rxjs'; +import { map } from 'rxjs/operators'; import { UsermanageService } from 'src/app/routes/usercenter/services/usercenter.service'; @Component({ @@ -19,7 +20,8 @@ export class ShowServiceComponent implements OnInit { appUserId = '' record: any = {}; i: any; - serviceList: any = []; + ui!: SFUISchema; + schema!: SFSchema; constructor( private modal: NzModalRef, @@ -27,27 +29,64 @@ export class ShowServiceComponent implements OnInit { ) { } ngOnInit(): void { - this.initData() + this.initSF() } - -close(): void { - this.modal.close(true) -} -initData(){ - this.service.request(this.service.$api_getStaffList).subscribe(res => { - this.serviceList = res - }) -} -submitForm(){ - const params:any = { - appUserId: this.appUserId, - }; - this.service.request(this.service.$api_getStaffList, params).subscribe(res => { - if(res){ - this.service.msgSrv.success('分配成功') - this.modal.close(true) - } - }) -} + initSF() { + this.schema = { + properties: { + _$expand: { type: 'boolean', ui: { hidden: true } }, + customerServiceId: { + title: '客服人员', + type: 'string', + ui: { + widget: 'select', + asyncData: () => { + const params = { + // enterpriseId: 1, + // enterpriseProjectId: this.i.mainProjectId, + } + return this.service.request(this.service.$api_getStaffList, params).pipe( + map((res: any) => { + return res.map((i: any) => { + return { label: i.name, value: i.appUserId }; + }); + }), + ); + // serverSearch: true, + // searchDebounceTime: 300, + // searchLoadingText: '搜索中...', + // onSearch: (q: any) => { + // if (!!q) { + // return this.service + // .request(this.service.$api_getStaffList, { + // nameOrPhone: q + // }) + // .pipe(map((res: any) => (res?.records as any[]).map(i => ({ name: i.name, value: i.appUserId } as SFSchemaEnum)))) + // .toPromise(); + // } else { + // return of([]); + // } + }, + } as SFSelectWidgetSchema + } + }, + required: ['customerServiceId'] + }; + } + close(): void { + this.modal.close(true) + } + submitForm() { + const params: any = { + ...this.sf.value, + enterpriseIdList: [this.i.id] + }; + this.service.request(this.service.$api_distributionCusService, params).subscribe(res => { + if (res) { + this.service.msgSrv.success('分配成功') + this.modal.close(true) + } + }) + } } diff --git a/src/app/routes/usercenter/services/usercenter.service.ts b/src/app/routes/usercenter/services/usercenter.service.ts index 47557dbb..6bd733d5 100644 --- a/src/app/routes/usercenter/services/usercenter.service.ts +++ b/src/app/routes/usercenter/services/usercenter.service.ts @@ -162,6 +162,8 @@ export class UsermanageService extends ShipperBaseService { $api_getEnterpriceRel = '/api/mdc/enterpriceRelLog/getEnterpriceRel'; // 员工列表 $api_getStaffList = '/api/mdc/cuc/userApp/getStaffList'; + // 分配客服人员 + $api_distributionCusService = '/api/mdc/cuc/enterpriseInfo/operate/distributionCusService'; constructor(public injector: Injector, public nzModalService: NzModalService, private nzImageService: NzImageService) { super(injector); From 0cbc13389f01df19622c6ac645b9914e17390a43 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 25 Mar 2022 15:59:31 +0800 Subject: [PATCH 3/3] fix bug --- .../modal/audit/appeal/appeal.component.html | 47 ++++- .../modal/audit/appeal/appeal.component.ts | 170 +++++++++--------- .../services/order-management.service.ts | 4 +- .../imagelist/imagelist.component.html | 12 +- .../imagelist/imagelist.component.ts | 17 +- 5 files changed, 151 insertions(+), 99 deletions(-) diff --git a/src/app/routes/order-management/modal/audit/appeal/appeal.component.html b/src/app/routes/order-management/modal/audit/appeal/appeal.component.html index d3e53fd1..6e717730 100644 --- a/src/app/routes/order-management/modal/audit/appeal/appeal.component.html +++ b/src/app/routes/order-management/modal/audit/appeal/appeal.component.html @@ -1,7 +1,48 @@ + - - +
+ + + {{ dataList?.representationsStatusLabel }} + + +
+
+ {{ item?.complianceName }} +
+
+ + + {{ dataList?.representationsCause }} + + + {{ dataList?.representationsDescribe }} + + +
+ + +
+ + +
-
diff --git a/src/app/routes/order-management/modal/audit/appeal/appeal.component.ts b/src/app/routes/order-management/modal/audit/appeal/appeal.component.ts index 9a7eada4..451a3796 100644 --- a/src/app/routes/order-management/modal/audit/appeal/appeal.component.ts +++ b/src/app/routes/order-management/modal/audit/appeal/appeal.component.ts @@ -22,11 +22,8 @@ import { OrderManagementService } from '../../../services/order-management.servi templateUrl: './appeal.component.html' }) export class OneCarOrderAppealComponent implements OnInit { - record: any = {}; i: any; - @ViewChild('sf', { static: false }) sf!: SFComponent; - schema: SFSchema = {}; - ui: SFUISchema = {}; + dataList: any; constructor( private modalRef: NzModalRef, private modal: NzModalService, @@ -36,93 +33,88 @@ export class OneCarOrderAppealComponent implements OnInit { ) {} ngOnInit(): void { - this.initSF(); + this.initDate(); } - initSF() { - this.schema = { - properties: { - abnormalCause: { - type: 'string', - title: '异常原因', - default: this.i.abnormalCause, - readOnly: true, - ui: { - widget: 'textarea', - autosize: { minRows: 4, maxRows: 6 } - } as SFTextareaWidgetSchema - }, - representationsCause: { - type: 'string', - title: '申诉原因', - ui: { - widget: 'dict-select', - params: { dictKey: 'bill:representation:reason' }, - containsAllLabel: false, - placeholder: '请选择', - errors: { required: '请选择' } - } - }, - representationsDescribe: { - type: 'string', - title: '申诉描述', - maxLength: 100, - ui: { - widget: 'textarea', - autosize: { minRows: 4, maxRows: 6 } - } as SFTextareaWidgetSchema - }, - fileArr: { - type: 'string', - title: '上传凭证', - ui: { - action: apiConf.fileUpload, - accept: 'image/png,image/jpeg,image/jpg', - limit: 5, - limitFileCount: 5, - resReName: 'data.fullFilePath', - urlReName: 'data.fullFilePath', - widget: 'upload', - descriptionI18n: '不超过5张，单张大小不超过5M，支持.jpg、.jpeg和 .png格式', - name: 'multipartFile', - multiple: true, - listType: 'picture-card', - beforeUpload: (file: any, _fileList: any) => { - return new Observable((observer: Observer) => { - const isLt2M = file.size / 1024 / 1024 < 5; - if (!isLt2M) { - this.service.msgSrv.warning('图片大小超过5M!'); - observer.complete(); - return; - } - observer.next(isLt2M); - observer.complete(); - }); - } - } as SFUploadWidgetSchema - } - }, - required: ['representationsCause', 'representationsDescribe'] - }; - this.ui = { - '*': { - spanLabelFixed: 100, - grid: { span: 20 } + // initSF() { + // this.schema = { + // properties: { + // abnormalCause: { + // type: 'string', + // title: '异常原因', + // default: this.i.abnormalCause, + // readOnly: true, + // ui: { + // widget: 'textarea', + // autosize: { minRows: 4, maxRows: 6 } + // } as SFTextareaWidgetSchema + // }, + // representationsCause: { + // type: 'string', + // title: '申诉原因', + // ui: { + // widget: 'dict-select', + // params: { dictKey: 'bill:representation:reason' }, + // containsAllLabel: false, + // placeholder: '请选择', + // errors: { required: '请选择' } + // } + // }, + // representationsDescribe: { + // type: 'string', + // title: '申诉描述', + // maxLength: 100, + // ui: { + // widget: 'textarea', + // autosize: { minRows: 4, maxRows: 6 } + // } as SFTextareaWidgetSchema + // }, + // fileArr: { + // type: 'string', + // title: '上传凭证', + // ui: { + // action: apiConf.fileUpload, + // accept: 'image/png,image/jpeg,image/jpg', + // limit: 5, + // limitFileCount: 5, + // resReName: 'data.fullFilePath', + // urlReName: 'data.fullFilePath', + // widget: 'upload', + // descriptionI18n: '不超过5张，单张大小不超过5M，支持.jpg、.jpeg和 .png格式', + // name: 'multipartFile', + // multiple: true, + // listType: 'picture-card', + // beforeUpload: (file: any, _fileList: any) => { + // return new Observable((observer: Observer) => { + // const isLt2M = file.size / 1024 / 1024 < 5; + // if (!isLt2M) { + // this.service.msgSrv.warning('图片大小超过5M!'); + // observer.complete(); + // return; + // } + // observer.next(isLt2M); + // observer.complete(); + // }); + // } + // } as SFUploadWidgetSchema + // } + // }, + // required: ['representationsCause', 'representationsDescribe'] + // }; + // this.ui = { + // '*': { + // spanLabelFixed: 100, + // grid: { span: 20 } + // } + // }; + // } + initDate(): void { + console.log(this.i); + this.service.request(this.service.$api_get_getOrderComplaintDetail, { id: this.i?.id }).subscribe((res: any) => { + if (res) { + console.log(res); + this.dataList = res } - }; - } - save(value: any): void { - // if (!this.sf.valid){ - // this.sf.validator({ emitError: true }); - // return; - // } - // this.service.request(this.service.$api_addCompleteVehicleRepresentations, { id: this.i?.id, ...this.sf.value }).subscribe(res => { - // if (res) { - // this.service.msgSrv.success('申诉成功！'); - // this.modalRef.close(true); - // } else { - // this.service.msgSrv.error(res.msg); - // } - // }); + }); } close(): void { 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 68e977d5..0292cef2 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 17:29:07 + * @LastEditTime : 2022-03-25 15:27:40 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\services\\order-management.service.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -174,6 +174,8 @@ export class OrderManagementService extends ShipperBaseService { $api_get_getTrajectory = `/api/sdc/billShipper/getTrajectoryByBillId`; // 获取订单司机轨迹 $api_get_getAppDriverPosition = `/api/sdc/billShipper/getAppDriverPosition`; + // 查看申述记录 + $api_get_getOrderComplaintDetail = `/api/sdc/billOperate/getOrderComplaintDetail`; /** * 根据企业ID，获取企业历史网络货运人 * @returns diff --git a/src/app/shared/components/imagelist/imagelist.component.html b/src/app/shared/components/imagelist/imagelist.component.html index 3936f667..10a80404 100644 --- a/src/app/shared/components/imagelist/imagelist.component.html +++ b/src/app/shared/components/imagelist/imagelist.component.html @@ -1,6 +1,16 @@ +
- + diff --git a/src/app/shared/components/imagelist/imagelist.component.ts b/src/app/shared/components/imagelist/imagelist.component.ts index 40bb7f37..6fba4fd0 100644 --- a/src/app/shared/components/imagelist/imagelist.component.ts +++ b/src/app/shared/components/imagelist/imagelist.component.ts @@ -1,10 +1,10 @@ /* * @Author: your name * @Date: 2021-12-09 17:36:13 - * @LastEditTime: 2021-12-10 14:12:24 - * @LastEditors: Please set LastEditors + * @LastEditTime : 2022-03-25 15:43:12 + * @LastEditors : Shiming * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE - * @FilePath: \tms-obc-web\src\app\shared\components\imagelist\imagelist.component.ts + * @FilePath : \\tms-obc-web\\src\\app\\shared\\components\\imagelist\\imagelist.component.ts */ import { Component, Input, OnInit } from '@angular/core'; import { ModalHelper, _HttpClient } from '@delon/theme'; @@ -26,13 +26,20 @@ export class ImageListComponent implements OnInit { private nzImageService: NzImageService ) {} - ngOnInit(): void {} + ngOnInit(): void { + + } showImg(index: any) { const params = { imgList: this.imgList, index }; - const images = this.imgList.map((url: string) => ({ src: url })); + const images = this.imgList.map((url: string) => { + if(url) { + console.log(url); + ({ src: url }) + } + }); this.nzImageService.preview(images); // this.modal.create(ImageViewComponent, { params }).subscribe(res => {}); }