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

Merge branch 'develop' of gitlab.eascs.com:tms-ui/tms-obc-web into develop

Browse Source
This commit is contained in:
Lingzi
2022-03-25 14:40:22 +08:00
parent af6135f1ed b4423eef37
commit c87ca9f9e6
20 changed files with 280 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/app/routes/financial-management/components/receivable-order/receivable-order.component.ts
View File

@ -119,9 +119,9 @@ export class ReceivableOrderComponent implements OnInit {
brmtype: {
type: 'string',
title: '收款类型',
enum: [{ value: '1', label: '费用款项' }],
ui: {
widget: 'select',
widget: 'dict-select',
params: { dictKey: 'driverrecord:receive:type' },
placeholder: '请选择',
visibleIf: {
expand: (value: boolean) => value
@ -131,9 +131,9 @@ export class ReceivableOrderComponent implements OnInit {
arvattype: {
type: 'string',
title: '付款类型',
enum: [{ value: '1', label: '费用款项' }],
ui: {
widget: 'select',
widget: 'dict-select',
params: { dictKey: 'pay:type' },
placeholder: '请选择',
visibleIf: {
expand: (value: boolean) => value
@ -181,6 +181,23 @@ export class ReceivableOrderComponent implements OnInit {
}
}
},
bankType: {
type: 'string',
title: '银行类型',
enum: [
{ label: '全部', value: '' },
{ label: '平安银行', value: '1' },
{ label: '浦发银行', value: '2' }
],
ui: {
widget: 'select',
placeholder: '请选择',
visibleIf: {
expand: (value: boolean) => value
}
},
default: ''
},
ahxdate: {
title: '核销日期',
type: 'string',
@ -245,7 +262,6 @@ export class ReceivableOrderComponent implements OnInit {
{ title: '订单号', index: 'billHCode', type: 'link', width: 140 },
{ title: '网络货运人', index: 'ltdName', width: 160 },
{ title: '核销日期', index: 'ahxdate', type: 'date', width: 160 },
{ title: '付款账户', index: 'shipperaccount', width: 170 },
{ title: '收款账户', index: 'ltdaccountId', width: 160 },
{ title: '核销类型', index: 'ahxType', type: 'enum', enum: { '1': '预收款' }, width: 120 },
{
@ -265,6 +281,7 @@ export class ReceivableOrderComponent implements OnInit {
{ title: '银行类型', index: 'banktype', type: 'enum', enum: { '1': '平安', '2': '浦发' }, width: 120 },
{ title: '收款类型', index: 'arvattype', type: 'enum', enum: { '1': '费用款项' }, width: 120 },
{ title: '付款人', index: 'artoname', width: 200 },
{ title: '付款账户', index: 'shipperaccount', width: 170 },
{ title: '结算客户', index: 'cnoName', width: 120 },
{ title: '银行水单', index: 'bankreceipt', width: 200 },
{ title: '创建时间', index: 'createTime', width: 180 },

2
src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.html
View File

@ -73,7 +73,7 @@
</button>
</div>
</div>
<st #inputST [data]="service.$api_get_advance_collection_detail" [columns]="columns"
<st #inputST [data]="service.$api_get_refund_detail_page" [columns]="columns"
[page]="{ show: false }" [req]="{ process: beforeReq }" [res]="{ reName: { list: 'data' } }"
[loading]="false" [scroll]="{ x: '1200px', y: '370px' }" class="mt-md">
<ng-template st-row="no" let-item let-index="index" let-column="column">

3
src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts
View File

@ -33,11 +33,12 @@ export class WithdrawalsDetailComponent implements OnInit {
ngOnInit(): void {}
beforeReq = (requestOptions: STRequestOptions) => {
if (this.inputSF.value) {
if (this.inputSF?.value) {
Object.assign(requestOptions.body, {
...this.inputSF.value
});
}
Object.assign(requestOptions.body, { refundApplicationId: this.route.snapshot.params.id });
return requestOptions;
};

2
src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts
View File

@ -254,7 +254,7 @@ export class WithdrawalsRecordComponent {
{ title: '提现单号', index: 'refundApplyCode', width: 120 },
{ title: '网络货运人', index: 'ltdName', width: 140 },
{ title: '银行类型', index: 'bankTypeLabel', width: 100 },
{ title: '账户类型', index: 'accountType', width: 100 },
{ title: '账户类型', index: 'accountTypeLabel', width: 100 },
{ title: '账户名称', index: 'bankAccountName', width: 140 },
{ title: '虚拟账户', index: 'virtualAccount', width: 100 },
{

2
src/app/routes/financial-management/services/freight-account.service.ts
View File

@ -50,6 +50,8 @@ export class FreightAccountService extends ShipperBaseService {
$api_get_refund_page = '/api/fcc/refundApplicationOBC/list/page';
// 获取提现申请表详情
$api_get_refund_detail = '/api/fcc/refundApplicationOBC/get';
// 获取提现支付详情
$api_get_refund_detail_page = '/api/fcc/refundApplicationOBC/get/payList';
// 同意提现
$api_agree_refund = '/api/fcc/refundApplicationOBC/agreeRefund';
// 拒绝提现

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

@ -186,6 +186,13 @@ export class OrderManagementBulkComponent implements OnInit {
placeholder: '最多100个单号，空号隔开',
}
},
wayBillCode: {
type: 'string',
title: '运单号',
ui: {
placeholder: '最多100个单号，空号隔开',
}
},
resourceCode: {
type: 'string',
title: '货源编号'
@ -199,6 +206,9 @@ export class OrderManagementBulkComponent implements OnInit {
searchDebounceTime: 300,
searchLoadingText: '搜索中...',
allowClear: true,
visibleIf: {
_$expand: (value: boolean) => value
},
onSearch: (q: any) => {
let str =q.replace(/^\s+|\s+$/g,"");
if (str) {

5
src/app/routes/order-management/components/compliance-audit/compliance-audit.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-01-12 10:52:50
* @LastEditors : Shiming
* @LastEditTime : 2022-03-24 09:48:40
* @LastEditTime : 2022-03-25 13:44:42
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\compliance-audit\\compliance-audit.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@ -89,11 +89,12 @@
<ng-template st-row="billCode" let-item let-index="index">
<a *ngIf="item.billType == '1'" [routerLink]="'/order-management/vehicle/vehicle-detail/' + item.id">{{ item.billCode }}</a>
<a *ngIf="item.billType == '2'" [routerLink]="'/order-management/bulk/bulk-detail/' + item.id">{{ item.billCode }}</a>
<a *ngIf="item.billType == '3'" [routerLink]="'/order-management/vehicle/vehicle-detail/' + item.id">{{ item.billCode }}</a>
<div>
<span>{{ item?.billStatusLabel }}</span>
</div>
<div>
<span >{{item?.billTypeLabel}}{{item?.serviceTypeLabel}}</span>
<span >{{item?.billTypeLabel}}{{item?.serviceTypeLabel === item?.billTypeLabel ? '':item?.serviceTypeLabel}}</span>
</div>
</ng-template>
<ng-template st-row="goodsName" let-item let-index="index">

20
src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts
View File

@ -10,6 +10,7 @@ import { ConfirReceiptComponent } from '../../modal/bulk/confir-receipt/confir-r
import { of } from 'rxjs';
import { ShipperBaseService } from '@shared';
import { Router } from '@angular/router';
import { OneCarOrderAppealComponent } from '../../modal/audit/appeal/appeal.component';
@Component({
selector: 'app-order-management-compliance-audit',
@ -397,7 +398,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
buttons: [
{
text: '查看申诉记录',
click: _record => console.log('1'),
click: _record => this.appeal(_record),
// iif: item => item.billStatus == '5'
},
{
@ -489,6 +490,23 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
get queryFieldCount(): number {
return Object.keys(this.schema?.properties || {}).length;
}
// 申诉记录
appeal(item: any) {
const modalRef = this.modal.create({
nzTitle: '申诉',
nzContent: OneCarOrderAppealComponent,
nzComponentParams: {
i: item
},
nzFooter: null
});
modalRef.afterClose.subscribe((res) => {
if(res){
this.resetSF;
this.st.load();
}
});
}
/**
* 浮动费用查看
*/

7
src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-01-12 10:52:50
* @LastEditors : Shiming
* @LastEditTime : 2022-03-24 09:30:32
* @LastEditTime : 2022-03-25 13:44:11
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\receipts-audit\\receipts-audit.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@ -101,11 +101,12 @@
<!-- <div>{{ item.billCode }}</div> -->
<a *ngIf="item.resourceType == '1'" [routerLink]="'/order-management/vehicle/vehicle-detail/' + item.id">{{ item.billCode }}</a>
<a *ngIf="item.resourceType == '2'" [routerLink]="'/order-management/bulk/bulk-detail/' + item.id">{{ item.billCode }}</a>
<a *ngIf="item.resourceType == '3'" [routerLink]="'/order-management/vehicle/vehicle-detail/' + item.id">{{ item.billCode }}</a>
<div>
<span>{{item?.billStatusLabel}}</span>
</div>
<div>
<span >{{item?.resourceTypeLabel}}{{item?.serviceTypeLabel}}</span>
<span >{{item?.resourceTypeLabel}}{{item?.serviceTypeLabel === item?.resourceTypeLabel ? '':item?.serviceTypeLabel}}</span>
</div>
</ng-template>
<ng-template st-row="goodsName" let-item let-index="index">
@ -130,7 +131,7 @@
<ng-template #extraTemplate>
<div>
<button nz-button nzType="primary" (click)="sign('1')" acl [acl-ability]="['ORDER-RECEIPTS-billAuditPassBatch']"> 批量签收 </button>
<button nz-button nzType="primary" (click)="sign('1')" acl [acl-ability]="['ORDER-RECEIPTS-billAuditPassBatch']"> 批量通过 </button>
<button nz-button nzType="primary" (click)="sign1('1')" acl [acl-ability]="['ORDER-RECEIPTS- electronicBilling']"> 批量生成电子单据 </button>
</div>
</ng-template>

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

@ -203,6 +203,13 @@ export class OrderManagementVehicleComponent extends BasicTableComponent impleme
placeholder: '最多100个单号，空号隔开'
}
},
wayBillCode: {
type: 'string',
title: '运单号',
ui: {
placeholder: '最多100个单号，空号隔开',
}
},
resourceCode: {
type: 'string',
title: '货源编号'

7
src/app/routes/order-management/modal/audit/appeal/appeal.component.html Normal file
View File

@ -0,0 +1,7 @@
<nz-spin *ngIf="!i" class="modal-spin"></nz-spin>
<sf #sf mode="edit" [schema]="schema" [ui]="ui" button="none"></sf>
<div class="modal-footer">
<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>

131
src/app/routes/order-management/modal/audit/appeal/appeal.component.ts Normal file
View File

@ -0,0 +1,131 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { apiConf } from '@conf/api.conf';
import {
SFComponent,
SFCustomWidgetSchema,
SFNumberWidgetSchema,
SFRadioWidgetSchema,
SFSchema,
SFSelectWidgetSchema,
SFTextareaWidgetSchema,
SFUISchema,
SFUploadWidgetSchema
} from '@delon/form';
import { _HttpClient } from '@delon/theme';
import { NzMessageService } from 'ng-zorro-antd/message';
import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal';
import { Observable, Observer } from 'rxjs';
import { OrderManagementService } from '../../../services/order-management.service';
@Component({
selector: 'app-order-management-appeal',
templateUrl: './appeal.component.html'
})
export class OneCarOrderAppealComponent implements OnInit {
record: any = {};
i: any;
@ViewChild('sf', { static: false }) sf!: SFComponent;
schema: SFSchema = {};
ui: SFUISchema = {};
constructor(
private modalRef: NzModalRef,
private modal: NzModalService,
private msgSrv: NzMessageService,
public http: _HttpClient,
public service: OrderManagementService
) {}
ngOnInit(): void {
this.initSF();
}
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<boolean>) => {
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 }
}
};
}
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 {
this.modalRef.destroy();
}
}

6
src/app/routes/order-management/order-management.module.ts
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-01-06 09:24:00
* @LastEditors : Shiming
* @LastEditTime : 2022-02-22 13:55:06
* @LastEditTime : 2022-03-25 14:10:36
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\order-management.module.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@ -24,6 +24,7 @@ import { OrderManagementVehicleDetailChangeComponent } from './components/vehicl
import { OrderManagementVehicleDetailComponent } from './components/vehicle-detail/vehicle-detail.component';
import { OrderManagementVehicleComponent } from './components/vehicle/vehicle.component';
import { OneCarOrderAppealComponent } from './modal/audit/appeal/appeal.component';
import { orderManagementVoucherViewComponent } from './modal/audit/voucher-view/voucher-view.component';
import { ConfirReceiptComponent } from './modal/bulk/confir-receipt/confir-receipt.component';
import { UpdateFreightComponent } from './modal/bulk/update-freight/update-freight.component';
@ -64,7 +65,8 @@ const COMPONENTS: Type<void>[] = [
orderManagementVoucherViewComponent,
OrderManagementComplianceAuditComponent,
OneCarOrderCancelConfirmComponent,
OneCarOrderViewtrackComponent
OneCarOrderViewtrackComponent,
OneCarOrderAppealComponent
];
@NgModule({

6
src/app/routes/passport/components/order-agreement/order-agreement.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-27 21:08:36
* @LastEditors : Shiming
* @LastEditTime : 2022-02-24 10:50:46
* @LastEditTime : 2022-03-25 13:56:06
* @FilePath : \\tms-obc-web\\src\\app\\routes\\passport\\components\\order-agreement\\order-agreement.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@ -13,7 +13,7 @@
<h1 class="mb-md mt-md">
{{ agreementContent?.agreementName }}
</h1>
<p class="md">最新版本生效日期：{{ agreementContent?.modifyTime }}</p>
<div [innerHTML]="agreementContent?.agreementContent | safehtml"></div>
<p class="md" *ngIf="agreementContent?.modifyTime">最新版本生效日期：{{ agreementContent?.modifyTime }}</p>
<div [innerHTML]="agreementContent?.agreementContent || agreementContent?.contractContent | safehtml"></div>
</div>
</div>

2
src/app/routes/passport/components/order-agreement/order-agreement.component.ts
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-03-14 14:17:38
* @LastEditors : Shiming
* @LastEditTime : 2022-03-24 19:19:17
* @LastEditTime : 2022-03-25 13:52:54
* @FilePath : \\tms-obc-web\\src\\app\\routes\\passport\\components\\order-agreement\\order-agreement.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/

9
src/app/routes/vehicle/components/audit/audit.component.ts
View File

@ -14,7 +14,7 @@ import { CarSettleCarauthComponent } from '../list/carauth/carauth.component';
})
export class VehicleComponentsAuditComponent implements OnInit {
_$expand = false;
resourceStatus: any;
resourceStatus: any = 1;
defaultTabs = 1;
ui!: SFUISchema;
schema!: SFSchema;
@ -224,7 +224,12 @@ export class VehicleComponentsAuditComponent implements OnInit {
}
// 导出
exportFire() {
this.service.downloadFile(this.service.$api_carLicenseAudit_export, this.reqParams);
this.service.request(this.service.$api_carLicenseAudit_export, this.reqParams).subscribe((res: any) => {
if(res) {
this.service.msgSrv.success('导出成功,请去右上角下载中心下载')
return
}
});
}
addModal() {
const i = {

40
src/app/routes/vehicle/components/list/list.component.ts
View File

@ -127,6 +127,15 @@ export class VehicleComponentsListComponent implements OnInit {
}
}
},
carLoad: {
title: '载重',
type: 'string',
ui: {
visibleIf: {
expand: (value: boolean) => value
}
}
},
isSelf: {
type: 'string',
title: '是否挂靠',
@ -174,7 +183,23 @@ export class VehicleComponentsListComponent implements OnInit {
expand: (value: boolean) => value
}
}
}
},
isSelfs: {
type: 'string',
title: '是否入网',
enum: [
{ label: '全部', value: '' },
{ label: '是', value: 1 },
{ label: '否', value: 0 }
],
ui: {
widget: 'select',
allowClear: true,
visibleIf: {
expand: (value: boolean) => value
}
}
},
// putOnRecord: {
// type: 'string',
// title: '是否已备案',
@ -211,8 +236,8 @@ export class VehicleComponentsListComponent implements OnInit {
false: { text: '空闲', color: 'default' }
}
},
{ title: '道运证', width: '150px', className: 'text-center', index: 'roadTransportNo' },
{ title: '审核人', width: '150px', className: 'text-center', index: 'approvalUserName' },
// { title: '道运证', width: '150px', className: 'text-center', index: 'roadTransportNo' },
// { title: '审核人', width: '150px', className: 'text-center', index: 'approvalUserName' },
{
title: '行驶证到期状态',
@ -238,11 +263,11 @@ export class VehicleComponentsListComponent implements OnInit {
3: { text: '已到期', color: 'error' }
}
},
{ title: '是否入网', width: '200px', className: 'text-center', index: 'carOwner' },
{ title: '所有人', width: '200px', className: 'text-center', index: 'carOwner' },
{ title: '是否挂靠', width: '150px', className: 'text-center', render: 'isSelf' },
{ title: '挂靠协议', width: '150px', className: 'text-center', render: 'approvalAuditStatus' },
// { title: '是否已备案', className: 'text-center', render: 'putOnRecord', },
{
title: '操作',
fixed: 'right',
@ -283,6 +308,11 @@ export class VehicleComponentsListComponent implements OnInit {
}
// 导出
exportFire() {
this.service.downloadFile(this.service.$api_carLicense_export, this.reqParams);
this.service.request(this.service.$api_carLicense_export, this.reqParams).subscribe((res: any) => {
if(res) {
this.service.msgSrv.success('导出成功,请去右上角下载中心下载')
return
}
});
}
}

7
src/app/routes/waybill-management/components/bulk/bulk.component.ts
View File

@ -84,6 +84,13 @@ export class WaybillManagementBulkComponent implements OnInit {
placeholder: '最多100个运单，空号隔开'
}
},
billCode: {
type: 'string',
title: '订单号',
ui: {
placeholder: '最多100个单号，空号隔开'
}
},
resourceCode: {
type: 'string',
title: '货源编号'

7
src/app/routes/waybill-management/components/vehicle/vehicle.component.ts
View File

@ -82,6 +82,13 @@ export class WaybillManagementVehicleComponent implements OnInit {
placeholder: '最多100个运单，空号隔开'
}
},
billCode: {
type: 'string',
title: '订单号',
ui: {
placeholder: '最多100个单号，空号隔开'
}
},
resourceCode: {
type: 'string',
title: '货源编号'

16
src/app/shared/components/dict-select/dict-select.component.ts
View File

@ -11,27 +11,25 @@ import { DictSelectService } from './dict-select.service';
{
provide: NG_VALUE_ACCESSOR,
useExisting: forwardRef(() => DictSelectComponent),
multi: true,
},
multi: true
}
],
changeDetection: ChangeDetectionStrategy.OnPush,
changeDetection: ChangeDetectionStrategy.OnPush
})
export class DictSelectComponent implements OnInit, ControlValueAccessor {
private onChangeFn?: (val: string) => void;
private onTouchedFn?: () => void;
defaultUrl = `/api/mdc/pbc/dictItems/getDictValue`;
@Input() value: any = '' || []; // 默认选中值
@Input() url: string = ''; // 获取字典数据的地址
@Input() params = {};// 请求参数
@Input() params = {}; // 请求参数
dictList: any[] = [];
@Input() containsAllLabel = true; // 是否包含全部这一选项
@Input() mode: 'multiple' | 'tags' | 'default' = 'default';
constructor(public service: DictSelectService, public cdr: ChangeDetectorRef) { }
constructor(public service: DictSelectService, public cdr: ChangeDetectorRef) {}
writeValue(geo: string): void {
if (geo == null) {
@ -55,9 +53,10 @@ export class DictSelectComponent implements OnInit, ControlValueAccessor {
this.service.getDictList(this.url || this.defaultUrl, this.params).subscribe(res => {
if (res) {
this.dictList = res || [];
if (this.dictList.length > 0 && this.containsAllLabel) {
if (this.dictList.length > 0 && this.containsAllLabel !== false) {
const obj = { label: '全部', value: '' };
this.dictList.unshift(obj);
console.log(this.dictList);
}
this.cdr.markForCheck();
}
@ -70,5 +69,4 @@ export class DictSelectComponent implements OnInit, ControlValueAccessor {
isEmpty(val: any) {
return val === undefined || val === null || val === '';
}
}