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

edit

Browse Source
This commit is contained in:
Taric Xin
2022-04-12 17:06:27 +08:00
parent 82217dfc7b
commit 2cff827e3f
4 changed files with 58 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/app/routes/contract-management/components/contract-list/contract-list.component.html
View File

@ -30,7 +30,7 @@
</div> </div>
<div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand"> <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
<button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading" <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading"
(click)="st?.load(1)" acl [acl-ability]="['CONTRACT-INDEX-searchDetail']">查询</button> (click)="st?.load(1)" acl [acl-ability]="['CONTRACT-INDEX-searchDetail']">查询</button>
<button nz-button (click)="resetSF()">重置</button> <button nz-button (click)="resetSF()">重置</button>
<button nz-button nzType="link" (click)="expandToggle()"> <button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }} {{ !_$expand ? '展开' : '收起' }}
@ -48,14 +48,15 @@
</nz-alert> </nz-alert>
</div> </div>
<st #st [data]="service.$api_listDetailed_page" [columns]="columns" [req]="{ params: reqParams }" <st #st [data]="service.$api_listDetailed_page" [columns]="columns" [req]="{ params: reqParams }" [loading]="false"
[loading]="false" [scroll]="{ x: '1200px', y: '370px' }" (change)="stChange($event)"> [scroll]="{ x: '1200px', y: '370px' }" (change)="stChange($event)">
<ng-template st-row="contractCode" let-item let-index="index"> <ng-template st-row="contractCode" let-item let-index="index">
<a [routerLink]="'/contract-management/index/detail/' + item.id">{{ item?.contractCode }}</a> <a (click)="service.openURL(item?.contractFilePath)">{{ item?.contractCode }}</a>
<!-- <a [routerLink]="'/contract-management/index/detail/' + item.id">{{ item?.contractCode }}</a> -->
</ng-template> </ng-template>
<ng-template st-row="signingObject" let-item let-index="index"> <ng-template st-row="signingObject" let-item let-index="index">
<span *ngIf="item.signingObject == 0"></span> <span *ngIf="item.signingObject == 0"></span>
<span></span> <span></span>
</ng-template> </ng-template>
</st> </st>
</nz-card> </nz-card>

3
src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts
View File

@ -128,7 +128,8 @@ export class OrderManagementBulkeDetailComponent implements OnInit {
if(value ==='1'){ if(value ==='1'){
this.modalTitle = '附件信息'; this.modalTitle = '附件信息';
// this.modalcontent = this.i?.contractContent?.contractContent; // this.modalcontent = this.i?.contractContent?.contractContent;
this.service.reviewPDF(this.i?.contractContent?.contractFilePath) // this.service.reviewPDF(this.i?.contractContent?.contractFilePath)
this.service.openURL(this.i?.contractContent?.contractFilePath);
}else if(value === '2'){ }else if(value === '2'){
this.modalTitle = '补充协议'; this.modalTitle = '补充协议';
this.modalcontent = this.i?.supplementContent?.contractContent; this.modalcontent = this.i?.supplementContent?.contractContent;

26
src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts
View File

@ -24,7 +24,7 @@ import { OrderManagementService } from '../../services/order-management.service'
export class OrderManagementVehicleDetailComponent implements OnInit { export class OrderManagementVehicleDetailComponent implements OnInit {
id = this.route.snapshot.params.id; id = this.route.snapshot.params.id;
modalcontent: any; modalcontent: any;
modalTitle:string = ''; modalTitle: string = '';
trajectory = 'car'; trajectory = 'car';
mapList: any[] = []; //地图点位数据组 mapList: any[] = []; //地图点位数据组
pois: any[] = []; pois: any[] = [];
@ -55,7 +55,7 @@ export class OrderManagementVehicleDetailComponent implements OnInit {
{ {
title: '支付状态', title: '支付状态',
className: 'text-center', className: 'text-center',
index: 'paymentStatusLabel', index: 'paymentStatusLabel'
} }
]; ];
constructor( constructor(
@ -97,15 +97,15 @@ export class OrderManagementVehicleDetailComponent implements OnInit {
}); });
this.service.request(this.service.$api_listBillComplianceAbnormalByBillId, { id: this.id }).subscribe(res => { this.service.request(this.service.$api_listBillComplianceAbnormalByBillId, { id: this.id }).subscribe(res => {
if (res) { if (res) {
console.log('风险详情') console.log('风险详情');
console.log(res) console.log(res);
this.abnormalList = res this.abnormalList = res;
} }
}); });
this.service.request(this.service.$api_getAbnormalWarningByBillId, { id: this.id }).subscribe(res => { this.service.request(this.service.$api_getAbnormalWarningByBillId, { id: this.id }).subscribe(res => {
if (res) { if (res) {
console.log('异常预警') console.log('异常预警');
console.log(res) console.log(res);
} }
}); });
} }
@ -132,15 +132,15 @@ export class OrderManagementVehicleDetailComponent implements OnInit {
this.router.navigate(['order-management/vehicle-detailChange', this.id]); this.router.navigate(['order-management/vehicle-detailChange', this.id]);
} }
agreement(value: any) { agreement(value: any) {
if(value ==='1'){ if (value === '1') {
this.modalTitle = '附件信息'; // this.modalTitle = '附件信息';
this.modalcontent = this.i?.contractContent?.contractContent; // this.modalcontent = this.i?.contractContent?.contractContent;
this.service.openURL(this.i?.contractContent?.contractFilePath);
}else if(value === '2'){ } else if (value === '2') {
this.modalTitle = '补充协议'; this.modalTitle = '补充协议';
this.modalcontent = this.i?.supplementContent?.contractContent; this.modalcontent = this.i?.supplementContent?.contractContent;
this.isVisible = true;
} }
this.isVisible = true;
} }
handleCancel() { handleCancel() {
this.isVisible = false; this.isVisible = false;

68
src/app/shared/services/core/base.service.ts
View File

@ -34,7 +34,7 @@ import { IBase } from '../../interfaces';
import { EAFileUtil } from '../../utils'; import { EAFileUtil } from '../../utils';
@Injectable({ @Injectable({
providedIn: 'root', providedIn: 'root'
}) })
export class BaseService implements IBase { export class BaseService implements IBase {
// 新增实例接口地址 // 新增实例接口地址
@ -94,7 +94,7 @@ export class BaseService implements IBase {
parameter: any = {}, parameter: any = {},
method: 'POST' | 'GET', method: 'POST' | 'GET',
paramInBody: boolean = true, paramInBody: boolean = true,
paramType: 'JSON' | 'FORM' = 'JSON', paramType: 'JSON' | 'FORM' = 'JSON'
): Observable<any> { ): Observable<any> {
if (paramType === 'FORM') { if (paramType === 'FORM') {
parameter = this.getFormData(parameter); parameter = this.getFormData(parameter);
@ -104,7 +104,7 @@ export class BaseService implements IBase {
return this.http return this.http
.request(method, url, { .request(method, url, {
body: paramInBody ? parameter : null, body: paramInBody ? parameter : null,
params: paramInBody ? null : parameter, params: paramInBody ? null : parameter
}) })
.pipe( .pipe(
map((res: any) => { map((res: any) => {
@ -122,7 +122,7 @@ export class BaseService implements IBase {
this.msgSrv.warning(res.msg); this.msgSrv.warning(res.msg);
return allowBadCode ? res : null; return allowBadCode ? res : null;
} }
}), })
); );
} }
@ -144,7 +144,7 @@ export class BaseService implements IBase {
parameter: any = {}, parameter: any = {},
method: 'POST' | 'GET' = 'POST', method: 'POST' | 'GET' = 'POST',
paramInBody: boolean = true, paramInBody: boolean = true,
paramType: 'JSON' | 'FORM' = 'JSON', paramType: 'JSON' | 'FORM' = 'JSON'
): Observable<any> { ): Observable<any> {
return this.httpRequest(url, parameter, method, paramInBody, paramType); return this.httpRequest(url, parameter, method, paramInBody, paramType);
} }
@ -154,7 +154,7 @@ export class BaseService implements IBase {
parameter: any = {}, parameter: any = {},
method: 'POST' | 'GET' = 'POST', method: 'POST' | 'GET' = 'POST',
paramInBody: boolean = true, paramInBody: boolean = true,
paramType: 'JSON' | 'FORM' = 'JSON', paramType: 'JSON' | 'FORM' = 'JSON'
): Promise<any> { ): Promise<any> {
return this.request(url, parameter, method, paramInBody, paramType).toPromise(); return this.request(url, parameter, method, paramInBody, paramType).toPromise();
} }
@ -165,7 +165,7 @@ export class BaseService implements IBase {
url: string = this.$api_add_one, url: string = this.$api_add_one,
method: 'POST' | 'GET' = 'POST', method: 'POST' | 'GET' = 'POST',
paramInBody: boolean = true, paramInBody: boolean = true,
paramType: 'JSON' | 'FORM' = 'JSON', paramType: 'JSON' | 'FORM' = 'JSON'
): Observable<any> { ): Observable<any> {
return this.request(url, parameter, method, paramInBody, paramType); return this.request(url, parameter, method, paramInBody, paramType);
} }
@ -175,7 +175,7 @@ export class BaseService implements IBase {
url: string = this.$api_add_one, url: string = this.$api_add_one,
method: 'POST' | 'GET' = 'POST', method: 'POST' | 'GET' = 'POST',
paramInBody: boolean = true, paramInBody: boolean = true,
paramType: 'JSON' | 'FORM' = 'JSON', paramType: 'JSON' | 'FORM' = 'JSON'
): Promise<any> { ): Promise<any> {
return this.addOne(parameter, url, method, paramInBody, paramType).toPromise(); return this.addOne(parameter, url, method, paramInBody, paramType).toPromise();
} }
@ -185,7 +185,7 @@ export class BaseService implements IBase {
url: string = this.$api_add_many, url: string = this.$api_add_many,
method: 'POST' | 'GET' = 'POST', method: 'POST' | 'GET' = 'POST',
paramInBody: boolean = true, paramInBody: boolean = true,
paramType: 'JSON' | 'FORM' = 'JSON', paramType: 'JSON' | 'FORM' = 'JSON'
): Observable<any> { ): Observable<any> {
return this.request(url, parameter, method, paramInBody, paramType); return this.request(url, parameter, method, paramInBody, paramType);
} }
@ -195,7 +195,7 @@ export class BaseService implements IBase {
url: string = this.$api_add_many, url: string = this.$api_add_many,
method: 'POST' | 'GET' = 'POST', method: 'POST' | 'GET' = 'POST',
paramInBody: boolean = true, paramInBody: boolean = true,
paramType: 'JSON' | 'FORM' = 'JSON', paramType: 'JSON' | 'FORM' = 'JSON'
): Promise<any> { ): Promise<any> {
return this.addMany(parameter, url, method, paramInBody, paramType).toPromise(); return this.addMany(parameter, url, method, paramInBody, paramType).toPromise();
} }
@ -206,7 +206,7 @@ export class BaseService implements IBase {
url: string = this.$api_del_one, url: string = this.$api_del_one,
method: 'POST' | 'GET' = 'POST', method: 'POST' | 'GET' = 'POST',
paramInBody: boolean = true, paramInBody: boolean = true,
paramType: 'JSON' | 'FORM' = 'JSON', paramType: 'JSON' | 'FORM' = 'JSON'
): Observable<any> { ): Observable<any> {
return this.request(url, parameter, method, paramInBody, paramType); return this.request(url, parameter, method, paramInBody, paramType);
} }
@ -216,7 +216,7 @@ export class BaseService implements IBase {
url: string = this.$api_del_one, url: string = this.$api_del_one,
method: 'POST' | 'GET' = 'POST', method: 'POST' | 'GET' = 'POST',
paramInBody: boolean = true, paramInBody: boolean = true,
paramType: 'JSON' | 'FORM' = 'JSON', paramType: 'JSON' | 'FORM' = 'JSON'
): Promise<any> { ): Promise<any> {
return this.delOne(parameter, url, method, paramInBody, paramType).toPromise(); return this.delOne(parameter, url, method, paramInBody, paramType).toPromise();
} }
@ -226,7 +226,7 @@ export class BaseService implements IBase {
url: string = this.$api_del_many, url: string = this.$api_del_many,
method: 'POST' | 'GET' = 'POST', method: 'POST' | 'GET' = 'POST',
paramInBody: boolean = true, paramInBody: boolean = true,
paramType: 'JSON' | 'FORM' = 'JSON', paramType: 'JSON' | 'FORM' = 'JSON'
): Observable<any> { ): Observable<any> {
return this.request(url, parameter, method, paramInBody, paramType); return this.request(url, parameter, method, paramInBody, paramType);
} }
@ -236,7 +236,7 @@ export class BaseService implements IBase {
url: string = this.$api_del_many, url: string = this.$api_del_many,
method: 'POST' | 'GET' = 'POST', method: 'POST' | 'GET' = 'POST',
paramInBody: boolean = true, paramInBody: boolean = true,
paramType: 'JSON' | 'FORM' = 'JSON', paramType: 'JSON' | 'FORM' = 'JSON'
): Promise<any> { ): Promise<any> {
return this.delMany(parameter, url, method, paramInBody, paramType).toPromise(); return this.delMany(parameter, url, method, paramInBody, paramType).toPromise();
} }
@ -247,7 +247,7 @@ export class BaseService implements IBase {
url: string = this.$api_edit_one, url: string = this.$api_edit_one,
method: 'POST' | 'GET' = 'POST', method: 'POST' | 'GET' = 'POST',
paramInBody: boolean = true, paramInBody: boolean = true,
paramType: 'JSON' | 'FORM' = 'JSON', paramType: 'JSON' | 'FORM' = 'JSON'
): Observable<any> { ): Observable<any> {
return this.request(url, parameter, method, paramInBody, paramType); return this.request(url, parameter, method, paramInBody, paramType);
} }
@ -257,7 +257,7 @@ export class BaseService implements IBase {
url: string = this.$api_edit_one, url: string = this.$api_edit_one,
method: 'POST' | 'GET' = 'POST', method: 'POST' | 'GET' = 'POST',
paramInBody: boolean = true, paramInBody: boolean = true,
paramType: 'JSON' | 'FORM' = 'JSON', paramType: 'JSON' | 'FORM' = 'JSON'
): Promise<any> { ): Promise<any> {
return this.updateOne(parameter, url, method, paramInBody, paramType).toPromise(); return this.updateOne(parameter, url, method, paramInBody, paramType).toPromise();
} }
@ -267,7 +267,7 @@ export class BaseService implements IBase {
url: string = this.$api_edit_many, url: string = this.$api_edit_many,
method: 'POST' | 'GET' = 'POST', method: 'POST' | 'GET' = 'POST',
paramInBody: boolean = true, paramInBody: boolean = true,
paramType: 'JSON' | 'FORM' = 'JSON', paramType: 'JSON' | 'FORM' = 'JSON'
): Observable<any> { ): Observable<any> {
return this.request(url, parameter, method, paramInBody, paramType); return this.request(url, parameter, method, paramInBody, paramType);
} }
@ -277,7 +277,7 @@ export class BaseService implements IBase {
url: string = this.$api_edit_many, url: string = this.$api_edit_many,
method: 'POST' | 'GET' = 'POST', method: 'POST' | 'GET' = 'POST',
paramInBody: boolean = true, paramInBody: boolean = true,
paramType: 'JSON' | 'FORM' = 'JSON', paramType: 'JSON' | 'FORM' = 'JSON'
): Promise<any> { ): Promise<any> {
return this.updateMany(parameter, url, method, paramInBody, paramType).toPromise(); return this.updateMany(parameter, url, method, paramInBody, paramType).toPromise();
} }
@ -290,7 +290,7 @@ export class BaseService implements IBase {
url: string = this.$api_get_one, url: string = this.$api_get_one,
method: 'POST' | 'GET' = 'POST', method: 'POST' | 'GET' = 'POST',
paramInBody: boolean = true, paramInBody: boolean = true,
paramType: 'JSON' | 'FORM' = 'JSON', paramType: 'JSON' | 'FORM' = 'JSON'
): Observable<any> { ): Observable<any> {
return this.request(url, parameter, method, paramInBody, paramType); return this.request(url, parameter, method, paramInBody, paramType);
} }
@ -300,7 +300,7 @@ export class BaseService implements IBase {
url: string = this.$api_get_one, url: string = this.$api_get_one,
method: 'POST' | 'GET' = 'POST', method: 'POST' | 'GET' = 'POST',
paramInBody: boolean = true, paramInBody: boolean = true,
paramType: 'JSON' | 'FORM' = 'JSON', paramType: 'JSON' | 'FORM' = 'JSON'
): Promise<any> { ): Promise<any> {
return this.getOne(parameter, url, method, paramInBody, paramType).toPromise(); return this.getOne(parameter, url, method, paramInBody, paramType).toPromise();
} }
@ -313,12 +313,12 @@ export class BaseService implements IBase {
url: string = this.$api_get_many, url: string = this.$api_get_many,
method: 'POST' | 'GET' = 'POST', method: 'POST' | 'GET' = 'POST',
paramInBody: boolean = true, paramInBody: boolean = true,
paramType: 'JSON' | 'FORM' = 'JSON', paramType: 'JSON' | 'FORM' = 'JSON'
): Observable<any[]> { ): Observable<any[]> {
return this.httpRequest(url, parameter, method, paramInBody, paramType).pipe( return this.httpRequest(url, parameter, method, paramInBody, paramType).pipe(
map((res) => { map(res => {
return (res as any[]) || []; return (res as any[]) || [];
}), })
); );
} }
@ -327,7 +327,7 @@ export class BaseService implements IBase {
url: string = this.$api_get_many, url: string = this.$api_get_many,
method: 'POST' | 'GET' = 'POST', method: 'POST' | 'GET' = 'POST',
paramInBody: boolean = true, paramInBody: boolean = true,
paramType: 'JSON' | 'FORM' = 'JSON', paramType: 'JSON' | 'FORM' = 'JSON'
): Promise<any[]> { ): Promise<any[]> {
return this.getMany(parameter, url, method, paramInBody, paramType).toPromise(); return this.getMany(parameter, url, method, paramInBody, paramType).toPromise();
} }
@ -352,19 +352,19 @@ export class BaseService implements IBase {
paramInBody: boolean = true, paramInBody: boolean = true,
paramType: 'JSON' | 'FORM' = 'JSON', paramType: 'JSON' | 'FORM' = 'JSON',
allowBadCode: boolean = true, allowBadCode: boolean = true,
async: boolean = true, async: boolean = true
): Observable<any> | Promise<any> { ): Observable<any> | Promise<any> {
if (allowBadCode) { if (allowBadCode) {
url += `?_allow_badcode=true`; url += `?_allow_badcode=true`;
} }
const response = this.httpRequest(url, parameter, method, paramInBody, paramType).pipe( const response = this.httpRequest(url, parameter, method, paramInBody, paramType).pipe(
tap((res) => { tap(res => {
if (res.success) { if (res.success) {
this.msgSrv.success(`创建下载任务成功，请前往下载任务列表下载您的文件！`); this.msgSrv.success(`创建下载任务成功，请前往下载任务列表下载您的文件！`);
window.open('#/download'); window.open('#/download');
} }
return res; return res;
}), })
); );
return async ? response.toPromise() : response; return async ? response.toPromise() : response;
} }
@ -396,11 +396,15 @@ export class BaseService implements IBase {
this.msgSrv.warning(m.msg); this.msgSrv.warning(m.msg);
return false; return false;
} }
}), })
) )
.toPromise(); .toPromise();
} }
openURL(url: string) {
window.open(url);
}
/** /**
* 直接下载文件 * 直接下载文件
*/ */
@ -464,19 +468,19 @@ export class BaseService implements IBase {
*/ */
getDict(key: string): Observable<any[]> { getDict(key: string): Observable<any[]> {
return this.http.post(this.$api_get_dict, { dict: key }).pipe( return this.http.post(this.$api_get_dict, { dict: key }).pipe(
map((res) => { map(res => {
if (res.success === true) { if (res.success === true) {
return res.data.map((r: any) => { return res.data.map((r: any) => {
return { return {
label: r.itemValue, label: r.itemValue,
value: r.itemKey, value: r.itemKey
}; };
}); });
} else { } else {
this.msgSrv.warning(`获取取字典【${key}】时发生错误：${res.msg || '未知错误！'}`); this.msgSrv.warning(`获取取字典【${key}】时发生错误：${res.msg || '未知错误！'}`);
return []; return [];
} }
}), })
); );
} }
@ -508,7 +512,7 @@ export class BaseService implements IBase {
if (paramsIndex > -1) { if (paramsIndex > -1) {
const paramsStr = url.substr(paramsIndex + 1); const paramsStr = url.substr(paramsIndex + 1);
const params = paramsStr.split('&'); const params = paramsStr.split('&');
const keyMap = params.find((e) => e.includes(paramName)); const keyMap = params.find(e => e.includes(paramName));
const value = keyMap ? keyMap.split('=')[1] : ''; const value = keyMap ? keyMap.split('=')[1] : '';
return value; return value;
} }