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

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

Browse Source
This commit is contained in:
wangshiming
2022-04-25 10:28:46 +08:00
parent 51b9cb6973 03c5d34ebb
commit 0ab94297da
13 changed files with 262 additions and 368 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/app/routes/financial-management/components/platform-account/withdraw-deposit/withdraw-deposit.component.ts
View File

@ -240,11 +240,21 @@ export class CwcAccountManagementWithdrawDepositComponent implements OnInit {
this.sf.setValue('/payPsd', val);
if (val || val !== '') {
const last = val.substr(val.length - 1);
const password = this.sf.getValue('/payPassword');
const password = this.sf.getValue('/payPassword') || '';
const start = this.psd?.nativeElement.selectionStart;
const index = val.lastIndexOf('•');
if (last !== '•') {
this.sf.setValue('/payPassword', start !== 1 ? (password + last) : last);
if (password.length !== 0) {
// 新增 或 替换
const pre = password.substr(0, index + 1);
const detail = val.substr(index + 1, val.length);
this.sf.setValue('/payPassword', pre + detail);
} else {
// 新增
this.sf.setValue('/payPassword', val);
}
} else {
// 删除
this.sf.setValue('/payPassword', password.substr(0, val.length));
}
const payPswVal = this.sf.getValue('/payPsd');

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

@ -1,4 +1,4 @@
billCode<!--
<!--
* @Description :
* @Version : 1.0
* @Author : Shiming
@ -9,61 +9,40 @@ billCode<!--
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<!-- 搜索表单 -->
<page-header-wrapper [title]="''"> </page-header-wrapper>
<!-- <page-header-wrapper [title]="''"> </page-header-wrapper>
<nz-card>
<div nz-row nzGutter="8">
<!-- 查询字段小于或等于3个时，不显示伸缩按钮 -->
<div nz-col nzSpan="24" *ngIf="queryFieldCount <= 4">
<sf
#sf
[schema]="schema"
[ui]="ui"
[mode]="'search'"
[disabled]="!sf?.valid"
[loading]="false"
(formSubmit)="st?.load(1)"
(formReset)="resetSF()"
></sf>
<div nz-col [nzSpan]="_$expand ? 24 : 18">
<sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
</div>
<div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="search()" acl
[acl-ability]="['ORDER-RECEIPTS-search']">查询</button>
<button nz-button nzType="primary" [disabled]="false" (click)="exprot()">导出</button>
<button nz-button [disabled]="false" (click)="resetSF()">重置</button>
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
</button>
</div>
<!-- 查询字段大于3个时，根据展开状态调整布局 -->
<ng-container *ngIf="queryFieldCount > 4">
<div nz-col [nzSpan]="_$expand ? 24 : 18">
<sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
</div>
<div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="search()" acl [acl-ability]="['ORDER-RECEIPTS-search']"
>查询</button
>
<button nz-button nzType="primary" [disabled]="false" (click)="exprot()">导出</button>
<button nz-button [disabled]="false" (click)="resetSF()">重置</button>
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
</button>
</div>
</ng-container>
</div>
</nz-card>
</nz-card> -->
<nz-card>
<nz-tabset (nzSelectedIndexChange)="selectChange($event)" [nzTabBarExtraContent]="extraTemplate">
<nz-tab [nzTitle]="'全部(' + tabs?.totalCount + ')'"></nz-tab>
<nz-tab [nzTitle]="'待审核(' + tabs?.receivedQuantity + ')'"></nz-tab>
<nz-tab [nzTitle]="'已审核(' + tabs?.stayQuantity + ')'"></nz-tab>
</nz-tabset>
<div style="margin-top: 15px">
<st
#st
[bordered]="true"
[scroll]="{ x: '2000px' }"
[data]="service.$api_get_billExamine_page"
[columns]="columns"
[req]="{ process: beforeReq }"
<nz-card class="table-box">
<div class="tab_header">
<label class="page_title"> <label class="driver">|</label> 单据审核</label>
<nz-tabset (nzSelectedIndexChange)="selectChange($event)" [nzTabBarExtraContent]="extraTemplate">
<nz-tab [nzTitle]="'全部(' + tabs?.totalCount + ')'"></nz-tab>
<nz-tab [nzTitle]="'待审核(' + tabs?.receivedQuantity + ')'"></nz-tab>
<nz-tab [nzTitle]="'已审核(' + tabs?.stayQuantity + ')'"></nz-tab>
</nz-tabset>
</div>
<div>
<st #st [bordered]="true" [scroll]="{ x: '2000px',y:scrollY }" [data]="service.$api_get_billExamine_page"
[columns]="columns" [req]="{ process: beforeReq }"
[res]="{ reName: { list: 'data.records', total: 'data.total' } , process: afterRes}"
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
[loading]="false"
>
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" [loading]="false">
<ng-template st-row="freightPrice" let-item let-index="index">
{{ item.freightPrice | currency }}
</ng-template>
@ -79,12 +58,13 @@ billCode<!--
</ng-template>
<ng-template st-row="unloadingLadingBillFilePath" let-item let-index="index">
<div class="imgBox">
<div *ngIf="item.unloadingLadingBillFilePath">
<app-imagelist style="width: 40px" [imgList]="[item.unloadingLadingBillFilePath]"> </app-imagelist>
</div>
<div *ngIf="item.unloadingPeopleVehiclesGoodsFilePath">
<app-imagelist style="width: 40px" [imgList]="[item.unloadingPeopleVehiclesGoodsFilePath]"> </app-imagelist>
</div>
<div *ngIf="item.unloadingLadingBillFilePath">
<app-imagelist style="width: 40px" [imgList]="[item.unloadingLadingBillFilePath]"> </app-imagelist>
</div>
<div *ngIf="item.unloadingPeopleVehiclesGoodsFilePath">
<app-imagelist style="width: 40px" [imgList]="[item.unloadingPeopleVehiclesGoodsFilePath]">
</app-imagelist>
</div>
</div>
</ng-template>
<ng-template st-row="loadingTime" let-item let-index="index">
@ -92,21 +72,26 @@ billCode<!--
<div *ngIf="item?.unloadingTime">卸 | {{ item?.unloadingTime }}</div>
</ng-template>
<ng-template st-row="driverName" let-item let-index="index">
<div> {{ item?.driverName }}{{ item?.driverPhone ? "/" + item?.driverPhone : ''}}{{ item?.carNo ? "/" + item?.carNo : '' }} </div>
<div> {{ item?.driverName }}{{ item?.driverPhone ? "/" + item?.driverPhone : ''}}{{ item?.carNo ? "/" +
item?.carNo : '' }} </div>
</ng-template>
<ng-template st-row="payeeName" let-item let-index="index">
<div> {{ item?.payeeName }}{{item?.payeePhone ? "/" + item?.payeePhone : '' }} </div>
</ng-template>
<ng-template st-row="billCode" let-item let-index="index">
<!-- <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>
<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 === 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">
@ -131,7 +116,20 @@ billCode<!--
<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)="sign1('1')" acl [acl-ability]="['ORDER-RECEIPTS- electronicBilling']"> 批量生成电子单据 </button>
<button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()" acl
[acl-ability]="['ORDER-RECEIPTS-search']">查询</button>
<button nz-button nzDanger [disabled]="false" (click)="exprot()">导出</button>
<button nz-button nz-dropdown [nzDropdownMenu]="menu" nzPlacement="bottomLeft">
更多<i nz-icon nzType="down" nzTheme="outline"></i></button>
<nz-dropdown-menu #menu="nzDropdownMenu">
<ul nz-menu>
<li nz-menu-item (click)="sign('1')" acl [acl-ability]="['ORDER-RECEIPTS-billAuditPassBatch']">
批量通过
</li>
<li nz-menu-item a(click)="sign1('1')" acl [acl-ability]="['ORDER-RECEIPTS- electronicBilling']">
批量生成电子单据
</li>
</ul>
</nz-dropdown-menu>
</div>
</ng-template>
</ng-template>

25
src/app/routes/order-management/components/receipts-audit/receipts-audit.component.less
View File

@ -1,22 +1,3 @@
:host {
p{
margin-bottom: 0
}
.left_btn {
width: 50px;
height: 32px;
padding-left: 8px;
line-height:32px;
background-color: #d7d7d7;
}
::ng-deep {
.imgBox {
display: flex;
img {
width: 60px !important;
}
}
}
}
p{
margin-bottom: 0
}

145
src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts
View File

@ -8,25 +8,23 @@ import { OrderManagementService } from '../../services/order-management.service'
import { UpdateFreightComponent } from '../../modal/bulk/update-freight/update-freight.component';
import { ConfirReceiptComponent } from '../../modal/bulk/confir-receipt/confir-receipt.component';
import { of } from 'rxjs';
import { ShipperBaseService } from '@shared';
import { SearchDrawerService, ShipperBaseService } from '@shared';
import { Router } from '@angular/router';
import { orderManagementVoucherViewComponent } from '../../modal/audit/voucher-view/voucher-view.component';
import { BasicTableComponent } from 'src/app/routes/commom/components/basic-table/basic-table.component';
@Component({
selector: 'app-order-management-receipts-audit',
templateUrl: './receipts-audit.component.html',
styleUrls: ['./receipts-audit.component.less']
styleUrls: ['../../../commom/less/commom-table.less', './receipts-audit.component.less']
})
export class OrderManagementReceiptsAuditComponent implements OnInit {
ui: SFUISchema = {};
export class OrderManagementReceiptsAuditComponent extends BasicTableComponent implements OnInit {
uiView: SFUISchema = {};
schema: SFSchema = {};
schemaView: SFSchema = {};
auditMany = false;
isVisibleView = false;
isVisibleEvaluate = false;
isVisible = false;
_$expand = false;
@ViewChild('st') private readonly st!: STComponent;
@ViewChild('sf', { static: false }) sf!: SFComponent;
columns: STColumn[] = [];
@ -41,8 +39,11 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
public service: OrderManagementService,
private modal: NzModalService,
public shipperservice: ShipperBaseService,
private router: Router
) { }
private router: Router,
public searchDrawerService: SearchDrawerService
) {
super(searchDrawerService);
}
/**
* 查询参数
@ -73,22 +74,22 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
if (this.sf) {
Object.assign(requestOptions.body, {
...a,
...params,
createTime: {
start: this.sf?.value?.createTime?.[0] || '',
end: this.sf?.value?.createTime?.[1] || ''
}
...params,
createTime: {
start: this.sf?.value?.createTime?.[0] || '',
end: this.sf?.value?.createTime?.[1] || ''
}
});
}
this.loading = true;
return requestOptions;
};
afterRes = (data: any[], rawData?: any) => {
console.log(data)
this.loading = false
console.log(data);
this.loading = false;
return data.map(item => ({
...item,
// disabled: item.billStatus !== '4'
...item
// disabled: item.billStatus !== '4'
}));
};
get selectedRows() {
@ -105,7 +106,7 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
totalCount: 0
};
const params: any = Object.assign({}, this.reqParams || {});
delete params.auditStatus
delete params.auditStatus;
this.service.request(this.service.$api_get_getAuditStatistical, params).subscribe(res => {
if (res) {
let totalCount = 0;
@ -173,7 +174,7 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
_$expand: (value: boolean) => value
},
onSearch: (q: any) => {
let str =q.replace(/^\s+|\s+$/g,"");
let str = q.replace(/^\s+|\s+$/g, '');
if (str) {
return this.service
.request(this.service.$api_enterpriceList, { enterpriseName: str })
@ -196,7 +197,7 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
placeholder: '请先选择货主',
visibleIf: {
_$expand: (value: boolean) => value
},
}
} as SFSelectWidgetSchema
},
loadingPlace: {
@ -298,12 +299,12 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
loadingDocuments: {
type: 'string',
title: '装卸货凭证',
enum:[
{label: '全部',value: ''},
{label: '无装卸货凭证',value: '1'},
{label: '装卸货凭证齐全',value: '2'},
{label: '只有装货凭证',value: '3'},
{label: '只有卸货凭证',value: '4'},
enum: [
{ label: '全部', value: '' },
{ label: '无装卸货凭证', value: '1' },
{ label: '装卸货凭证齐全', value: '2' },
{ label: '只有装货凭证', value: '3' },
{ label: '只有卸货凭证', value: '4' }
],
ui: {
widget: 'select',
@ -311,13 +312,12 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
allowClear: true,
visibleIf: {
_$expand: (value: boolean) => value
},
}
}
},
}
},
type: 'object'
};
this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } };
}
/**
@ -397,27 +397,27 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
{
text: '生成电子单据',
click: _record => this.generate(_record, 2),
iif: item => !item?.loadingElectronicsLadingBillFilePath || !item?.unloadingElectronicsLadingBillFilePath,
acl: { ability: ['ORDER-RECEIPTS-electronicBillingOne'] },
iif: item => !item?.loadingElectronicsLadingBillFilePath || !item?.unloadingElectronicsLadingBillFilePath,
acl: { ability: ['ORDER-RECEIPTS-electronicBillingOne'] }
},
{
text: '通过',
click: _record => this.sign(_record),
iif: item => !item?.loadingElectronicsLadingBillFilePath || !item?.unloadingElectronicsLadingBillFilePath,
acl: { ability: ['ORDER-RECEIPTS-billAuditPassBatch'] },
iif: item => !item?.loadingElectronicsLadingBillFilePath || !item?.unloadingElectronicsLadingBillFilePath,
acl: { ability: ['ORDER-RECEIPTS-billAuditPassBatch'] }
},
{
text: '修改',
click: _record => this.modification(_record),
iif: item => !item?.loadingElectronicsLadingBillFilePath || !item?.unloadingElectronicsLadingBillFilePath,
acl: { ability: ['ORDER-RECEIPTS-updateBillExamine'] },
iif: item => !item?.loadingElectronicsLadingBillFilePath || !item?.unloadingElectronicsLadingBillFilePath,
acl: { ability: ['ORDER-RECEIPTS-updateBillExamine'] }
},
{
text: '查看凭证',
click: _record => this.generate(_record, 3),
iif: item => item?.loadingElectronicsLadingBillFilePath && item?.unloadingElectronicsLadingBillFilePath,
acl: { ability: ['ORDER-RECEIPTS-view'] },
},
acl: { ability: ['ORDER-RECEIPTS-view'] }
}
]
}
];
@ -428,32 +428,18 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
get queryFieldCount(): number {
return Object.keys(this.schema?.properties || {}).length;
}
/**
* 伸缩查询条件
*/
expandToggle(): void {
this._$expand = !this._$expand;
this.sf?.setValue('/_$expand', this._$expand);
}
tabChange(item: any) { }
/**
* 重置表单
*/
resetSF(): void {
this.sf.reset();
this._$expand = false;
}
tabChange(item: any) {}
/**
* 导入货源
*/
importGoodsSource() { }
audit(item: any) { }
importGoodsSource() {}
audit(item: any) {}
/**
* 审核通过按钮
*/
handleOK() { }
handleOK() {}
OpenPrice(item: any) {
this.isVisible = true;
}
@ -471,7 +457,7 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
});
modalRef.afterClose.subscribe((result: any) => {
this.st.load(1);
this.getGoodsSourceStatistical()
this.getGoodsSourceStatistical();
});
}
// 生成电子单据
@ -491,31 +477,31 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
nzFooter: null
});
modalRef.afterClose.subscribe((result: any) => {
if(result) {
if (result) {
this.st.load();
this.getGoodsSourceStatistical()
this.getGoodsSourceStatistical();
}
});
}
// 通过
sign(item?: any) {
let params: any = []
let params: any = [];
let text = '';
if (item === '1') {
if (this.selectedRows.length <= 0) {
this.service.msgSrv.error('请选择订单！')
return
this.service.msgSrv.error('请选择订单！');
return;
}
this.selectedRows.forEach(ite => {
params.push(ite.id);
});
text = `<b>已选择${this.selectedRows.length}条订单，确认批量通过审核吗？</b>`
text = `<b>已选择${this.selectedRows.length}条订单，确认批量通过审核吗？</b>`;
} else {
text = `<b>确认通过审核吗？</b>`
text = `<b>确认通过审核吗？</b>`;
params.push(item.id);
}
console.log(this.selectedRows)
console.log(params)
console.log(this.selectedRows);
console.log(params);
this.modal.confirm({
nzTitle: text,
nzContent: `<b>通过后不可修改，可以再生成电子单据。</b>`,
@ -535,8 +521,8 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
// 批量生成电子单据
sign1(item?: any) {
if (this.selectedRows?.length <= 0) {
this.service.msgSrv.error('请选择订单！')
return
this.service.msgSrv.error('请选择订单！');
return;
}
let params: any[] = [];
this.selectedRows.forEach(item => {
@ -545,17 +531,16 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
this.modal.confirm({
nzTitle: `<b>已选择${this.selectedRows.length}条订单，确认批量生成电子单据吗？</b>`,
nzContent: `<b>确认后单据不可修改，请谨慎操作。</b>`,
nzOnOk: () =>
{
this.service.downloadFile(this.service.$api_createBillEsignGoods,params)
this.service.msgSrv.success('生成成功！');
this.st?.reload()
nzOnOk: () => {
this.service.downloadFile(this.service.$api_createBillEsignGoods, params);
this.service.msgSrv.success('生成成功！');
this.st?.reload();
// this.getGoodsSourceStatistical();
}
})
}
});
}
// 获取所属项目
getRegionCode(regionCode: any) {
// 获取所属项目
getRegionCode(regionCode: any) {
console.log(regionCode);
return this.service
.request(this.service.$api_get_enterprise_project, { id: regionCode })
@ -575,8 +560,8 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
// }
});
}
// 导出
exprot() {
this.service.exportStart({ ...this.reqParams, pageSize: -1 }, this.service.$api_get_asyncExportExamineBillList);
}
// 导出
exprot() {
this.service.exportStart({ ...this.reqParams, pageSize: -1 }, this.service.$api_get_asyncExportExamineBillList);
}
}

113
src/app/routes/order-management/components/risk/risk.component.html
View File

@ -9,61 +9,42 @@
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<!-- 搜索表单 -->
<page-header-wrapper [title]="''"> </page-header-wrapper>
<!-- <page-header-wrapper [title]="''"> </page-header-wrapper>
<nz-card>
<div nz-row nzGutter="8">
<!-- 查询字段小于或等于3个时，不显示伸缩按钮 -->
<div nz-col nzSpan="24" *ngIf="queryFieldCount <= 4">
<sf
#sf
[schema]="schema"
[ui]="ui"
[mode]="'search'"
[disabled]="!sf?.valid"
[loading]="false"
(formSubmit)="search()"
(formReset)="resetSF()"
></sf>
<div nz-col [nzSpan]="_$expand ? 24 : 18">
<sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
</div>
<div nz-col [nzSpan]="_$expand ? 24 : 6" class="text-right">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="search()" acl
[acl-ability]="['ORDER-RISK-search']">查询</button>
<button nz-button nzType="primary" [disabled]="false" (click)="exprot()">导出</button>
<button nz-button [disabled]="false" (click)="resetSF()">重置</button>
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
</button>
</div>
<!-- 查询字段大于3个时，根据展开状态调整布局 -->
<ng-container *ngIf="queryFieldCount > 4">
<div nz-col [nzSpan]="_$expand ? 24 : 18">
<sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
</div>
<div nz-col [nzSpan]="_$expand ? 24 : 6" class="text-right">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="search()" acl [acl-ability]="['ORDER-RISK-search']">查询</button>
<button nz-button nzType="primary" [disabled]="false" (click)="exprot()">导出</button>
<button nz-button [disabled]="false" (click)="resetSF()">重置</button>
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
</button>
</div>
</ng-container>
</div>
</nz-card>
</nz-card> -->
<nz-card>
<nz-tabset (nzSelectedIndexChange)="selectChange($event)" [nzTabBarExtraContent]="extraTemplate">
<nz-tab [nzTitle]="'全部'"></nz-tab>
<nz-tab [nzTitle]="'待申诉(' + tabs?.stayQuantity + ')'"></nz-tab>
<nz-tab [nzTitle]="'申诉中(' + tabs?.underwayQuantity + ')'"></nz-tab>
<nz-tab [nzTitle]="'申诉成功(' + tabs?.receivedQuantity + ')'"></nz-tab>
<nz-tab [nzTitle]="'申诉失败(' + tabs?.cancelQuantity + ')'"></nz-tab>
</nz-tabset>
<div style="margin-top: 15px">
<st
#st
[bordered]="true"
[scroll]="{ x: '2000px' }"
[data]="service.$api_get_listRiskPage"
[columns]="columns"
<nz-card class="table-box">
<div class="tab_header">
<label class="page_title"> <label class="driver">|</label> 风险单管理</label>
<nz-tabset (nzSelectedIndexChange)="selectChange($event)" [nzTabBarExtraContent]="extraTemplate">
<nz-tab [nzTitle]="'全部'"></nz-tab>
<nz-tab [nzTitle]="'待申诉(' + tabs?.stayQuantity + ')'"></nz-tab>
<nz-tab [nzTitle]="'申诉中(' + tabs?.underwayQuantity + ')'"></nz-tab>
<nz-tab [nzTitle]="'申诉成功(' + tabs?.receivedQuantity + ')'"></nz-tab>
<nz-tab [nzTitle]="'申诉失败(' + tabs?.cancelQuantity + ')'"></nz-tab>
</nz-tabset>
</div>
<div>
<st #st [bordered]="true" [scroll]="{ x: '2000px',y:scrollY }" [data]="service.$api_get_listRiskPage" [columns]="columns"
[req]="{ process: beforeReq }"
[res]="{ reName: { list: 'data.records', total: 'data.total' } , process: afterRes}"
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
[loading]="false"
>
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" [loading]="false">
<!-- <ng-template st-row="billCode" let-item let-index="index">
<a [routerLink]="'/order-management/risk-detail/' + item.id">{{ item.billCode }}</a>
<div>
@ -75,14 +56,18 @@
</ng-template> -->
<ng-template st-row="billCode" let-item let-index="index">
<!-- <div>{{ item.billCode }}</div> -->
<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>
<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?.representationsStatusLabel }}</span>
</div>
<div>
<span >{{item?.billTypeLabel}}{{item?.billTypeLabel === item?.serviceTypeLabel ? '' : item?.serviceTypeLabel}}</span>
<span>{{item?.billTypeLabel}}{{item?.billTypeLabel === item?.serviceTypeLabel ? '' :
item?.serviceTypeLabel}}</span>
</div>
</ng-template>
<ng-template st-row="timeer" let-item let-index="index">
@ -96,7 +81,8 @@
</div>
</ng-template>
<ng-template st-row="driverName" let-item let-index="index">
<div> {{ item?.driverName }}{{ item?.driverPhone ? "/" + item?.driverPhone : '' }}{{ item?.carNo ? "/" + item?.carNo : ''}} </div>
<div> {{ item?.driverName }}{{ item?.driverPhone ? "/" + item?.driverPhone : '' }}{{ item?.carNo ? "/" +
item?.carNo : ''}} </div>
</ng-template>
<ng-template st-row="payeeName" let-item>
<div *ngIf="item?.driverId !== item?.payeeId">
@ -113,7 +99,7 @@
<ng-template st-row="goodsInfoVOList" let-item let-index="index">
<div *ngFor="let i of item?.goodsInfoVOList">
<p>货物名称：{{ i?.goodsName }}</p>
<p>重量/体积：{{ i?.weight ? i?.weight + '吨' : '' }}{{ i?.volume ? "/" + i?.volume + '方' : ''}}</p>
<p>重量/体积：{{ i?.weight ? i?.weight + '吨' : '' }}{{ i?.volume ? "/" + i?.volume + '方' : ''}}</p>
<p>车型/车长：{{ i?.carModelLabel }} {{ i?.carLengthLabel ? "/" + i?.carLengthLabel : ''}}</p>
</div>
</ng-template>
@ -121,14 +107,8 @@
</div>
</nz-card>
<nz-modal
[(nzVisible)]="isVisibleRE"
[nzWidth]="600"
[nzFooter]="nzModalFooterview2"
(nzOnOk)="handleOK()"
nzTitle="审核"
(nzOnCancel)="handleCancel()"
>
<nz-modal [(nzVisible)]="isVisibleRE" [nzWidth]="600" [nzFooter]="nzModalFooterview2" (nzOnOk)="handleOK()" nzTitle="审核"
(nzOnCancel)="handleCancel()">
<ng-container *nzModalContent>
<sf #sfView [schema]="schemaView" [ui]="uiView" [compact]="true" [button]="'none'"> </sf>
</ng-container>
@ -139,7 +119,10 @@
</nz-modal>
<ng-template #extraTemplate>
<div>
<button nz-button nzType="primary" (click)="audit()" acl [acl-ability]="['ORDER-RISK-batchAudit']"> 批量审核 </button>
<div class="mr-sm">
<button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()" acl
[acl-ability]="['ORDER-RISK-search']">筛选</button>
<button nz-button nzDanger [disabled]="false" (click)="exprot()">导出</button>
<button nz-button nzType="primary" (click)="audit()" acl [acl-ability]="['ORDER-RISK-batchAudit']"> 批量审核 </button>
</div>
</ng-template>
</ng-template>

13
src/app/routes/order-management/components/risk/risk.component.less
View File

@ -1,13 +0,0 @@
:host {
p{
margin-bottom: 0
}
.left_btn {
width: 50px;
height: 32px;
padding-left: 8px;
line-height:32px;
background-color: #d7d7d7;
}
}

181
src/app/routes/order-management/components/risk/risk.component.ts
View File

@ -4,21 +4,20 @@ import { Component, OnInit, ViewChild } from '@angular/core';
import { STColumn, STComponent, STRequestOptions } from '@delon/abc/st';
import { SFComponent, SFDateWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
import { ModalHelper, _HttpClient } from '@delon/theme';
import { ShipperBaseService } from '@shared';
import { SearchDrawerService, ShipperBaseService } from '@shared';
import { NzModalService } from 'ng-zorro-antd/modal';
import { of } from 'rxjs';
import { map } from 'rxjs/operators';
import { OrderManagementService } from '../../services/order-management.service';
import { BasicTableComponent } from 'src/app/routes/commom/components/basic-table/basic-table.component';
@Component({
selector: 'app-supply-management-risk',
templateUrl: './risk.component.html',
styleUrls: ['./risk.component.less']
styleUrls: ['../../../commom/less/commom-table.less', './risk.component.less']
})
export class OrderManagementRiskComponent implements OnInit {
ui: SFUISchema = {};
export class OrderManagementRiskComponent extends BasicTableComponent implements OnInit {
uiView: SFUISchema = {};
schema: SFSchema = {};
schemaView: SFSchema = {};
auditMany = false;
loading: boolean = true;
@ -26,7 +25,6 @@ export class OrderManagementRiskComponent implements OnInit {
auditIdR: any;
isVisibleRE = false;
resourceStatus: any;
_$expand = false;
@ViewChild('st') private readonly st!: STComponent;
@ViewChild('sf', { static: false }) sf!: SFComponent;
@ViewChild('sfView', { static: false }) sfView!: SFComponent;
@ -41,8 +39,11 @@ export class OrderManagementRiskComponent implements OnInit {
public service: OrderManagementService,
public shipperservice: ShipperBaseService,
private modal: NzModalService,
public router: Router
) { }
public router: Router,
public searchDrawerService: SearchDrawerService
) {
super(searchDrawerService);
}
/**
* 查询参数
@ -50,7 +51,7 @@ export class OrderManagementRiskComponent implements OnInit {
get reqParams() {
const a: any = {};
if (this.resourceStatus) {
a.representationsStatus = this.resourceStatus
a.representationsStatus = this.resourceStatus;
}
const params: any = Object.assign({}, this.sf?.value || {});
delete params._$expand;
@ -59,14 +60,14 @@ export class OrderManagementRiskComponent implements OnInit {
...params,
createTime: {
start: this.sf?.value?.createTime?.[0] || '',
end: this.sf?.value?.createTime?.[1] || '',
},
end: this.sf?.value?.createTime?.[1] || ''
}
};
}
beforeReq = (requestOptions: STRequestOptions) => {
const a: any = {};
if (this.resourceStatus) {
a.representationsStatus = this.resourceStatus
a.representationsStatus = this.resourceStatus;
}
const params: any = Object.assign({}, this.sf?.value || {});
delete params._$expand;
@ -76,51 +77,51 @@ export class OrderManagementRiskComponent implements OnInit {
...params,
createTime: {
start: this.sf?.value?.createTime?.[0] || '',
end: this.sf?.value?.createTime?.[1] || '',
},
end: this.sf?.value?.createTime?.[1] || ''
}
});
}
this.loading = true;
return requestOptions;
};
afterRes = (data: any[], rawData?: any) => {
console.log(data)
this.loading = false
console.log(data);
this.loading = false;
return data.map(item => ({
...item,
disabled: item.representationsStatus !== '2'
disabled: item.representationsStatus !== '2'
}));
};
search() {
this.st?.load(1);
this.getGoodsSourceStatistical()
this.getGoodsSourceStatistical();
}
get selectedRows() {
return this.st?.list.filter(item => item.checked) || [];
}
ngOnInit(): void {
this.getGoodsSourceStatistical()
this.getGoodsSourceStatistical();
this.initSF();
this.initST();
}
getGoodsSourceStatistical() {
this.service.request(this.service.$api_get_listStatisticalStatus, this.reqParams).subscribe(res => {
if (res) {
res.forEach((element: any) => {
console.log(element.representationsStatus);
if(element.representationsStatus === '1') {
this.tabs.stayQuantity = element.quantity
} else if (element.representationsStatus == '4') {
this.tabs.cancelQuantity = element.quantity
} else if (element.representationsStatus == '3') {
this.tabs.receivedQuantity = element.quantity
}else if (element.representationsStatus == '2') {
this.tabs.underwayQuantity = element.quantity
}
});
console.log(this.tabs)
res.forEach((element: any) => {
console.log(element.representationsStatus);
if (element.representationsStatus === '1') {
this.tabs.stayQuantity = element.quantity;
} else if (element.representationsStatus == '4') {
this.tabs.cancelQuantity = element.quantity;
} else if (element.representationsStatus == '3') {
this.tabs.receivedQuantity = element.quantity;
} else if (element.representationsStatus == '2') {
this.tabs.underwayQuantity = element.quantity;
}
});
console.log(this.tabs);
}
})
});
}
/**
* 初始化查询表单
@ -146,48 +147,23 @@ export class OrderManagementRiskComponent implements OnInit {
},
loadingPlace: {
type: 'string',
title: '装货地',
ui: {
visibleIf: {
_$expand: (value: boolean) => value
}
}
title: '装货地'
},
dischargePlace: {
type: 'string',
title: '卸货地',
ui: {
visibleIf: {
_$expand: (value: boolean) => value
}
}
title: '卸货地'
},
driverName: {
title: '承运司机',
type: 'string',
ui: {
visibleIf: {
_$expand: (value: boolean) => value
}
}
type: 'string'
},
carNo: {
title: '车牌号',
type: 'string',
ui: {
visibleIf: {
_$expand: (value: boolean) => value
}
}
type: 'string'
},
payeeName: {
type: 'string',
title: '车队长',
ui: {
visibleIf: {
_$expand: (value: boolean) => value
}
}
title: '车队长'
},
wayBillType: {
title: '运单类型',
@ -195,10 +171,7 @@ export class OrderManagementRiskComponent implements OnInit {
ui: {
widget: 'dict-select',
params: { dictKey: 'bill:type' },
containsAllLabel: true,
visibleIf: {
_$expand: (value: boolean) => value
}
containsAllLabel: true
} as SFSelectWidgetSchema
},
shipperAppUserName: {
@ -210,11 +183,8 @@ export class OrderManagementRiskComponent implements OnInit {
searchDebounceTime: 300,
searchLoadingText: '搜索中...',
allowClear: true,
visibleIf: {
_$expand: (value: boolean) => value
},
onSearch: (q: any) => {
let str =q.replace(/^\s+|\s+$/g,"");
let str = q.replace(/^\s+|\s+$/g, '');
if (str) {
return this.service
.request(this.service.$api_enterpriceList, { enterpriseName: str })
@ -223,7 +193,7 @@ export class OrderManagementRiskComponent implements OnInit {
} else {
return of([]);
}
},
}
} as SFSelectWidgetSchema
},
enterpriseInfoId: {
@ -233,11 +203,8 @@ export class OrderManagementRiskComponent implements OnInit {
widget: 'select',
placeholder: '请选择',
allowClear: true,
visibleIf: {
_$expand: (value: boolean) => value,
},
asyncData: () => this.shipperservice.getNetworkFreightForwarder(),
},
asyncData: () => this.shipperservice.getNetworkFreightForwarder()
}
},
createTime: {
title: '创建时间',
@ -246,16 +213,12 @@ export class OrderManagementRiskComponent implements OnInit {
widget: 'date',
mode: 'range',
format: 'yyyy-MM-dd',
allowClear: true,
visibleIf: {
_$expand: (value: boolean) => value
}
allowClear: true
} as SFDateWidgetSchema
}
},
type: 'object'
};
this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } };
}
/**
@ -347,14 +310,14 @@ export class OrderManagementRiskComponent implements OnInit {
{
text: '审核',
click: _record => this.audit(_record),
iif: item => item.representationsStatus == '2' ,
acl: { ability: ['ORDER-RISK-audit'] },
iif: item => item.representationsStatus == '2',
acl: { ability: ['ORDER-RISK-audit'] }
},
{
text: '详情',
click: _record => this.viewEvaluate(_record),
iif: item => item.representationsStatus !== '1' ,
acl: { ability: ['ORDER-RISK-riskDetail'] },
iif: item => item.representationsStatus !== '1',
acl: { ability: ['ORDER-RISK-riskDetail'] }
}
]
}
@ -419,30 +382,10 @@ export class OrderManagementRiskComponent implements OnInit {
this.uiView = { '*': { spanLabelFixed: 110, grid: { span: 24 } } };
}
/**
* 查询字段个数
*/
get queryFieldCount(): number {
return Object.keys(this.schema?.properties || {}).length;
}
/**
* 伸缩查询条件
*/
expandToggle(): void {
this._$expand = !this._$expand;
this.sf?.setValue('/_$expand', this._$expand);
}
tabChange(item: any) {
console.log(item);
}
/**
* 重置表单
*/
resetSF(): void {
this.sf.reset();
this._$expand = false;
}
selectChange(e: number) {
this.resourceStatus = e;
@ -454,7 +397,7 @@ export class OrderManagementRiskComponent implements OnInit {
/**
* 导入货源
*/
importGoodsSource() { }
importGoodsSource() {}
/*
* 审核关闭弹窗
@ -472,20 +415,20 @@ export class OrderManagementRiskComponent implements OnInit {
idList.push(item.id);
});
} else {
idList.push(this.sfView.value.id)
idList.push(this.sfView.value.id);
}
const parms = {
ids: idList,
auditRemark: this.sfView.value.representationsCause,
representationsStatus: 3,
auditStatus: 2,
auditStatus: 2
};
this.service.request(this.service.$api_get_listRisk_audit, parms).subscribe(res => {
if (res) {
this.service.msgSrv.success('审核通过成功！');
this.isVisibleRE = false;
this.st?.load(1);
this.getGoodsSourceStatistical()
this.getGoodsSourceStatistical();
}
});
}
@ -499,7 +442,7 @@ export class OrderManagementRiskComponent implements OnInit {
idList.push(item.id);
});
} else {
idList.push(this.sfView.value.id)
idList.push(this.sfView.value.id);
}
if (!this.sfView.value.representationsCause) {
this.service.msgSrv.error('拒绝原因为空！');
@ -509,14 +452,14 @@ export class OrderManagementRiskComponent implements OnInit {
ids: idList,
auditRemark: this.sfView.value.representationsCause,
representationsStatus: 4,
auditStatus: 3,
auditStatus: 3
};
this.service.request(this.service.$api_get_listRisk_audit, parms).subscribe(res => {
if (res) {
this.service.msgSrv.success('审核拒绝成功！');
this.isVisibleRE = false;
this.st?.load(1);
this.getGoodsSourceStatistical()
this.getGoodsSourceStatistical();
}
});
}
@ -531,7 +474,7 @@ export class OrderManagementRiskComponent implements OnInit {
this.isVisibleRE = true;
} else {
if (this.selectedRows.length <= 0) {
this.service.msgSrv.error('请选择订单！')
this.service.msgSrv.error('请选择订单！');
return;
} else {
this.initSTAudit(2);
@ -545,8 +488,8 @@ export class OrderManagementRiskComponent implements OnInit {
viewEvaluate(item: any) {
this.router.navigate(['/order-management/risk-detail', item.id]);
}
// 导出
exprot() {
this.service.exportStart({ ...this.reqParams, pageSize: -1 }, this.service.$api_get_asyncExportRiskBillList);
}
// 导出
exprot() {
this.service.exportStart({ ...this.reqParams, pageSize: -1 }, this.service.$api_get_asyncExportRiskBillList);
}
}

2
src/app/routes/usercenter/components/freight/list/detail/detail.component.html
View File

@ -369,7 +369,7 @@
<sv-container col="3" class="mt16">
<sv-title>合伙人信息</sv-title>
<sv label="合伙人名称">
{{partnerInfo.partnerEnterpriseName}}
{{partnerInfo.partnerContactName}}
</sv>
<sv label="手机号">
<input nz-input type="text" [(ngModel)]="partnerInfo.partnerContactMobile" [readonly]="!isEdit"

2
src/app/routes/usercenter/components/freight/list/detail/detail.component.ts
View File

@ -116,7 +116,7 @@ export class FreightComponentsListDetailComponent implements OnInit, OnDestroy {
className: 'text-center'
},
{ title: '修改时间', render: 'modifyTime', className: 'text-center' },
{ title: '生效时间', render: 'effectiveTime', className: 'text-center' },
{ title: '生效时间', index: 'effectiveTime', className: 'text-center' },
{ title: '操作人', render: 'approvalUser', className: 'text-center' },
];

3
src/app/routes/usercenter/components/freight/list/list.component.html
View File

@ -57,6 +57,9 @@
<ng-template st-row="contacter" let-item let-index="index">
{{ item.contacter }}<br>/{{item.mobile}}
</ng-template>
<ng-template st-row="partnerName" let-item let-index="index">
{{ item.partnerName }}<br>/{{item.promotersTelephone}}
</ng-template>
<ng-template st-row="promotersTelephone" let-item let-index="index">
<a acl [acl-ability]="['USERCENTER-FREIGHT-LIST-salesman']" (click)="addPromoter(item)">{{ item.promotersTelephone
|| '添加' }}</a>

2
src/app/routes/usercenter/components/freight/list/list.component.ts
View File

@ -424,7 +424,7 @@ export class FreightComponentsListComponent implements OnInit {
enum: { 10: '整车发货', 20: '大宗发货' },
width: 140
},
{ title: '业务员', className: 'text-center', render: 'promotersTelephone', width: 150 },
{ title: '渠道销售', className: 'text-center', render: 'promotersTelephone', width: 150 },
{ title: '合伙人', className: 'text-center', render: 'partnerName', width: 150 },
{ title: '客服人员', className: 'text-center', index: 'customerServiceIdLabel', width: 150 },
{ title: '网络货运人', className: 'text-center', index: 'netTranName', width: 180 },

3
src/app/shared/components/search-drawer/index.ts Normal file
View File

@ -0,0 +1,3 @@
export * from './search-drawer.component';
export * from './search-drawer.module';
export * from './search-drawer.service';

1
src/app/shared/index.ts
View File

@ -22,6 +22,7 @@ export * from './components/dynamic-setting';
export * from './components/singlepage-setting';
export * from './components/insurance-table/index';
export * from './components/rebate-table/index';
export * from './components/search-drawer';
// Utils
export * from './utils';