Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix bug

Browse Source
This commit is contained in:
wangshiming
2022-03-25 15:59:31 +08:00
parent 4c0724fb90
commit 0cbc13389f
5 changed files with 151 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/app/routes/order-management/modal/audit/appeal/appeal.component.html
View File

@ -1,7 +1,48 @@
<!--
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-03-25 14:10:23
* @LastEditors : Shiming
* @LastEditTime : 2022-03-25 15:59:00
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\audit\\appeal\\appeal.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<nz-spin *ngIf="!i" class="modal-spin"></nz-spin> <nz-spin *ngIf="!i" class="modal-spin"></nz-spin>
<sf #sf mode="edit" [schema]="schema" [ui]="ui" button="none"></sf> <div nz-row>
<sv-container col="1">
<sv label="申诉结果">
{{ dataList?.representationsStatusLabel }}
</sv>
<sv label="异常原因">
<div *ngFor="let item of dataList?.billComplianceVOS; let id=index;">
<div>
{{ item?.complianceName }}
</div>
</div>
</sv>
<sv label="申诉原因">
{{ dataList?.representationsCause }}
</sv>
<sv label="申诉描述">
{{ dataList?.representationsDescribe }}
</sv>
<sv label="凭证">
<div >
<app-imagelist
[imgList]="[
dataList?.representationFirstFilePath ? dataList?.representationFirstFilePath : '',
dataList?.representationSecondFilePath,
dataList?.representationThirdFilePath,
dataList?.representationFourthFilePath,
dataList?.representationFifthFilePath
]"
>
</app-imagelist>
</div>
</sv>
</sv-container>
</div>
<div class="modal-footer"> <div class="modal-footer">
<button nz-button type="button" (click)="close()">关闭</button> <button nz-button type="button" (click)="close()">关闭</button>
<button nz-button type="submit" nzType="primary" (click)="save(sf.value)" [disabled]="!sf.valid" [nzLoading]="http.loading">确定</button>
</div> </div>

166
src/app/routes/order-management/modal/audit/appeal/appeal.component.ts
View File

@ -22,11 +22,8 @@ import { OrderManagementService } from '../../../services/order-management.servi
templateUrl: './appeal.component.html' templateUrl: './appeal.component.html'
}) })
export class OneCarOrderAppealComponent implements OnInit { export class OneCarOrderAppealComponent implements OnInit {
record: any = {};
i: any; i: any;
@ViewChild('sf', { static: false }) sf!: SFComponent; dataList: any;
schema: SFSchema = {};
ui: SFUISchema = {};
constructor( constructor(
private modalRef: NzModalRef, private modalRef: NzModalRef,
private modal: NzModalService, private modal: NzModalService,
@ -36,93 +33,88 @@ export class OneCarOrderAppealComponent implements OnInit {
) {} ) {}
ngOnInit(): void { ngOnInit(): void {
this.initSF(); this.initDate();
} }
initSF() { // initSF() {
this.schema = { // this.schema = {
properties: { // properties: {
abnormalCause: { // abnormalCause: {
type: 'string', // type: 'string',
title: '异常原因', // title: '异常原因',
default: this.i.abnormalCause, // default: this.i.abnormalCause,
readOnly: true, // readOnly: true,
ui: { // ui: {
widget: 'textarea', // widget: 'textarea',
autosize: { minRows: 4, maxRows: 6 } // autosize: { minRows: 4, maxRows: 6 }
} as SFTextareaWidgetSchema // } as SFTextareaWidgetSchema
}, // },
representationsCause: { // representationsCause: {
type: 'string', // type: 'string',
title: '申诉原因', // title: '申诉原因',
ui: { // ui: {
widget: 'dict-select', // widget: 'dict-select',
params: { dictKey: 'bill:representation:reason' }, // params: { dictKey: 'bill:representation:reason' },
containsAllLabel: false, // containsAllLabel: false,
placeholder: '请选择', // placeholder: '请选择',
errors: { required: '请选择' } // errors: { required: '请选择' }
} // }
}, // },
representationsDescribe: { // representationsDescribe: {
type: 'string', // type: 'string',
title: '申诉描述', // title: '申诉描述',
maxLength: 100, // maxLength: 100,
ui: { // ui: {
widget: 'textarea', // widget: 'textarea',
autosize: { minRows: 4, maxRows: 6 } // autosize: { minRows: 4, maxRows: 6 }
} as SFTextareaWidgetSchema // } as SFTextareaWidgetSchema
}, // },
fileArr: { // fileArr: {
type: 'string', // type: 'string',
title: '上传凭证', // title: '上传凭证',
ui: { // ui: {
action: apiConf.fileUpload, // action: apiConf.fileUpload,
accept: 'image/png,image/jpeg,image/jpg', // accept: 'image/png,image/jpeg,image/jpg',
limit: 5, // limit: 5,
limitFileCount: 5, // limitFileCount: 5,
resReName: 'data.fullFilePath', // resReName: 'data.fullFilePath',
urlReName: 'data.fullFilePath', // urlReName: 'data.fullFilePath',
widget: 'upload', // widget: 'upload',
descriptionI18n: '不超过5张，单张大小不超过5M，支持.jpg、.jpeg和 .png格式', // descriptionI18n: '不超过5张，单张大小不超过5M，支持.jpg、.jpeg和 .png格式',
name: 'multipartFile', // name: 'multipartFile',
multiple: true, // multiple: true,
listType: 'picture-card', // listType: 'picture-card',
beforeUpload: (file: any, _fileList: any) => { // beforeUpload: (file: any, _fileList: any) => {
return new Observable((observer: Observer<boolean>) => { // return new Observable((observer: Observer<boolean>) => {
const isLt2M = file.size / 1024 / 1024 < 5; // const isLt2M = file.size / 1024 / 1024 < 5;
if (!isLt2M) { // if (!isLt2M) {
this.service.msgSrv.warning('图片大小超过5M!'); // this.service.msgSrv.warning('图片大小超过5M!');
observer.complete(); // observer.complete();
return;
}
observer.next(isLt2M);
observer.complete();
});
}
} as SFUploadWidgetSchema
}
},
required: ['representationsCause', 'representationsDescribe']
};
this.ui = {
'*': {
spanLabelFixed: 100,
grid: { span: 20 }
}
};
}
save(value: any): void {
// if (!this.sf.valid){
// this.sf.validator({ emitError: true });
// return; // return;
// } // }
// this.service.request(this.service.$api_addCompleteVehicleRepresentations, { id: this.i?.id, ...this.sf.value }).subscribe(res => { // observer.next(isLt2M);
// if (res) { // observer.complete();
// this.service.msgSrv.success('申诉成功！');
// this.modalRef.close(true);
// } else {
// this.service.msgSrv.error(res.msg);
// }
// }); // });
// }
// } 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
}
});
} }
close(): void { close(): void {

4
src/app/routes/order-management/services/order-management.service.ts
View File

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2021-12-03 15:31:52 * @Date : 2021-12-03 15:31:52
* @LastEditors : Shiming * @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 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\services\\order-management.service.ts
* Copyright (C) 2022 huzhenhong. All rights reserved. * 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_getTrajectory = `/api/sdc/billShipper/getTrajectoryByBillId`;
// 获取订单司机轨迹 // 获取订单司机轨迹
$api_get_getAppDriverPosition = `/api/sdc/billShipper/getAppDriverPosition`; $api_get_getAppDriverPosition = `/api/sdc/billShipper/getAppDriverPosition`;
// 查看申述记录
$api_get_getOrderComplaintDetail = `/api/sdc/billOperate/getOrderComplaintDetail`;
/** /**
* 根据企业ID，获取企业历史网络货运人 * 根据企业ID，获取企业历史网络货运人
* @returns * @returns

12
src/app/shared/components/imagelist/imagelist.component.html
View File

@ -1,6 +1,16 @@
<!--
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-03-23 14:24:05
* @LastEditors : Shiming
* @LastEditTime : 2022-03-25 15:47:50
* @FilePath : \\tms-obc-web\\src\\app\\shared\\components\\imagelist\\imagelist.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<div class="imgBox"> <div class="imgBox">
<ng-container *ngFor="let item of imgList; let i = index"> <ng-container *ngFor="let item of imgList; let i = index">
<ng-container *ngIf="item; else elseTemplate"> <ng-container *ngIf="item;">
<img nz-image [nzSrc]="item" /> <img nz-image [nzSrc]="item" />
</ng-container> </ng-container>
<ng-template #elseTemplate> <ng-template #elseTemplate>

17
src/app/shared/components/imagelist/imagelist.component.ts
View File

@ -1,10 +1,10 @@
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-12-09 17:36:13 * @Date: 2021-12-09 17:36:13
* @LastEditTime: 2021-12-10 14:12:24 * @LastEditTime : 2022-03-25 15:43:12
* @LastEditors: Please set LastEditors * @LastEditors : Shiming
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @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 { Component, Input, OnInit } from '@angular/core';
import { ModalHelper, _HttpClient } from '@delon/theme'; import { ModalHelper, _HttpClient } from '@delon/theme';
@ -26,13 +26,20 @@ export class ImageListComponent implements OnInit {
private nzImageService: NzImageService private nzImageService: NzImageService
) {} ) {}
ngOnInit(): void {} ngOnInit(): void {
}
showImg(index: any) { showImg(index: any) {
const params = { const params = {
imgList: this.imgList, imgList: this.imgList,
index 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.nzImageService.preview(images);
// this.modal.create(ImageViewComponent, { params }).subscribe(res => {}); // this.modal.create(ImageViewComponent, { params }).subscribe(res => {});
} }