Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into lxx
This commit is contained in:
xiaoxing.liu
@ -4,7 +4,7 @@
|
||||
* @Author : Shiming
|
||||
* @Date : 2022-01-18 09:51:21
|
||||
* @LastEditors : Shiming
|
||||
* @LastEditTime : 2022-04-24 17:51:09
|
||||
* @LastEditTime : 2022-04-25 10:32:29
|
||||
* @FilePath : \\tms-obc-web\\proxy.conf.js
|
||||
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
||||
*/
|
||||
@ -30,7 +30,7 @@ module.exports = {
|
||||
// },
|
||||
'//api': {
|
||||
target: {
|
||||
host: 'tms-api-test.eascs.com',
|
||||
host: 'tms-api-dev.eascs.com',
|
||||
protocol: 'https:',
|
||||
port: 443
|
||||
},
|
||||
|
||||
@ -15,6 +15,8 @@ export class BasicTableComponent implements AfterViewInit, OnDestroy {
|
||||
drawer: Subscription[] = [];
|
||||
schema: SFSchema = {};
|
||||
|
||||
deviationHeight = 0;
|
||||
|
||||
constructor(public searchDrawerService: SearchDrawerService) {}
|
||||
|
||||
ngAfterViewInit(): void {
|
||||
@ -60,13 +62,35 @@ export class BasicTableComponent implements AfterViewInit, OnDestroy {
|
||||
const header = document.getElementsByTagName('layout-pro-header')?.[0];
|
||||
if (windowHeight && header) {
|
||||
let scrollY = windowHeight - header.clientHeight - 35 - 49;
|
||||
// 剔除页头高度
|
||||
const headerWrapper = document.getElementsByTagName('page-header-wrapper')?.[0];
|
||||
if (headerWrapper) {
|
||||
scrollY -= headerWrapper.clientHeight;
|
||||
}
|
||||
const tabset = document.getElementsByTagName('nz-tabset')?.[0];
|
||||
// 计算所有tabs高度
|
||||
const tabset = document.getElementsByTagName('nz-tabs-nav');
|
||||
let tabsetHeight = 0;
|
||||
for (let index = 0; index < tabset.length; index++) {
|
||||
tabsetHeight += tabset[index].clientHeight;
|
||||
}
|
||||
console.log('tabsetHeight', tabsetHeight);
|
||||
if (tabset) {
|
||||
scrollY -= tabset.clientHeight;
|
||||
scrollY -= tabsetHeight;
|
||||
}
|
||||
// 剔除高度容器
|
||||
// 计算所有tabs高度
|
||||
const headerBox = document.getElementsByClassName('header_box');
|
||||
let headerBoxHeight = 0;
|
||||
for (let index = 0; index < headerBox.length; index++) {
|
||||
headerBoxHeight += headerBox[index].clientHeight;
|
||||
}
|
||||
console.log('headerBoxHeight', headerBoxHeight);
|
||||
|
||||
if (headerBox) {
|
||||
scrollY -= headerBoxHeight;
|
||||
}
|
||||
if (typeof this.deviationHeight === 'number') {
|
||||
scrollY -= this.deviationHeight;
|
||||
}
|
||||
this.scrollY = scrollY + 'px';
|
||||
}
|
||||
|
||||
1
src/app/routes/commom/index.ts
Normal file
1
src/app/routes/commom/index.ts
Normal file
@ -0,0 +1 @@
|
||||
export * from './components/basic-table/basic-table.component';
|
||||
@ -41,6 +41,32 @@
|
||||
flex: 1;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
.double_tabset_box {
|
||||
margin : -24px -24px 0;
|
||||
background: #ffffff;
|
||||
|
||||
.tab_header {
|
||||
.page_title {
|
||||
font-weight: bold;
|
||||
font-size : 17px;
|
||||
|
||||
.driver {
|
||||
color : #ff4d4f;
|
||||
margin-left : 17px;
|
||||
margin-right: 6px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.header_tab {
|
||||
|
||||
nz-tabs-nav {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.ant-table-pagination.ant-pagination {
|
||||
@ -87,4 +113,23 @@
|
||||
line-height: 21px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
.header_box {
|
||||
display : flex;
|
||||
align-items : center;
|
||||
justify-content: space-between;
|
||||
min-height : 47px;
|
||||
|
||||
.page_title {
|
||||
font-weight: bold;
|
||||
font-size : 17px;
|
||||
|
||||
.driver {
|
||||
color : #ff4d4f;
|
||||
margin-left : 17px;
|
||||
margin-right: 6px;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -5,7 +5,7 @@ import { OnChanges } from '@angular/core';
|
||||
* @Author : Shiming
|
||||
* @Date : 2022-01-05 11:01:55
|
||||
* @LastEditors : Shiming
|
||||
* @LastEditTime : 2022-03-30 10:45:19
|
||||
* @LastEditTime : 2022-04-25 10:28:10
|
||||
* @FilePath : \\tms-obc-web\\src\\app\\routes\\contract-management\\components\\contract-template-detail\\contract-template-detail.component.ts
|
||||
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
||||
*/
|
||||
@ -96,8 +96,6 @@ export class ContractManagementTemplateTextComponent implements OnInit {
|
||||
{ label: '运单合同', value: '3' },
|
||||
{ label: '运单补充协议', value: '4' },
|
||||
{ label: '委托代收合同', value: '5' },
|
||||
{ label: '电子提货单', value: '10' },
|
||||
{ label: '电子卸货单', value: '11' },
|
||||
];
|
||||
this.sf.getProperty('/contractType')!.schema.enum = this.Types;
|
||||
this.sf.getProperty('/contractType')!.widget.reset(this.Types);
|
||||
@ -178,7 +176,7 @@ export class ContractManagementTemplateTextComponent implements OnInit {
|
||||
}
|
||||
}
|
||||
},
|
||||
required: ['templateName', 'templateType']
|
||||
required: ['templateName', 'templateType','contractType']
|
||||
};
|
||||
this.ui = {
|
||||
'*': {
|
||||
|
||||
@ -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');
|
||||
|
||||
@ -9,41 +9,18 @@
|
||||
* 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>
|
||||
|
||||
<!-- 查询字段大于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-COMPLIANCE-AUDIT-search']"
|
||||
>查询</button
|
||||
>
|
||||
<button nz-button nzType="primary" [disabled]="false" acl [acl-ability]="['ORDER-COMPLIANCE-AUDIT-export']" (click)="exprot()"
|
||||
>导出</button
|
||||
>
|
||||
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="search()" acl
|
||||
[acl-ability]="['ORDER-COMPLIANCE-AUDIT-search']">查询</button>
|
||||
<button nz-button nzType="primary" [disabled]="false" acl [acl-ability]="['ORDER-COMPLIANCE-AUDIT-export']"
|
||||
(click)="exprot()">导出</button>
|
||||
<button nz-button [disabled]="false" (click)="resetSF()">重置</button>
|
||||
<button nz-button nzType="link" (click)="expandToggle()">
|
||||
{{ !_$expand ? '展开' : '收起' }}
|
||||
@ -52,23 +29,25 @@
|
||||
</div>
|
||||
</ng-container>
|
||||
</div>
|
||||
</nz-card>
|
||||
</nz-card> -->
|
||||
|
||||
<nz-card>
|
||||
<div style="margin-top: 15px">
|
||||
<st
|
||||
#st
|
||||
[bordered]="true"
|
||||
[scroll]="{ x: '2000px' }"
|
||||
[data]="service.$api_get_abnormalWarning"
|
||||
<nz-card class="table-box">
|
||||
<div class="header_box">
|
||||
<label class="page_title"> <label class="driver">|</label> 异常预警</label>
|
||||
<div class="mr-sm">
|
||||
<button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()" acl
|
||||
[acl-ability]="['ORDER-COMPLIANCE-AUDIT-search']">筛选</button>
|
||||
<button nz-button nzDanger acl [acl-ability]="['ORDER-COMPLIANCE-AUDIT-export']" (click)="exprot()">导出</button>
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<st #st [bordered]="true" [scroll]="{ x: '2000px' ,y:scrollY }" [data]="service.$api_get_abnormalWarning"
|
||||
[columns]="columns"
|
||||
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
|
||||
[res]="{ reName: { list: 'data.records', total: 'data.total' } }"
|
||||
[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="driverName" let-item let-index="index">
|
||||
<div> {{ item?.driverName }}{{ item?.driverPhone ? "/" + item?.driverPhone : '' }} </div>
|
||||
</ng-template>
|
||||
@ -84,11 +63,14 @@
|
||||
<span>{{ item?.billStatusLabel }}</span>
|
||||
</div>
|
||||
<div>
|
||||
<span >{{item?.billTypeLabel}}{{item?.serviceTypeLabel === item?.billTypeLabel ? '':item?.serviceTypeLabel}}</span>
|
||||
<span>{{item?.billTypeLabel}}{{item?.serviceTypeLabel === item?.billTypeLabel ?
|
||||
'':item?.serviceTypeLabel}}</span>
|
||||
</div>
|
||||
</ng-template>
|
||||
</st>
|
||||
</div>
|
||||
</nz-card>
|
||||
|
||||
<ng-template #extraTemplate>
|
||||
|
||||
</ng-template>
|
||||
@ -1,29 +1,24 @@
|
||||
import { Component, OnInit, ViewChild } from '@angular/core';
|
||||
import { STColumn, STComponent } from '@delon/abc/st';
|
||||
import { SFComponent, SFDateWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
|
||||
import { ModalHelper, _HttpClient } from '@delon/theme';
|
||||
import { NzModalService } from 'ng-zorro-antd/modal';
|
||||
import { map } from 'rxjs/operators';
|
||||
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 { OneCarOrderAppealComponent } from '../../modal/audit/appeal/appeal.component';
|
||||
import { BasicTableComponent } from 'src/app/routes/commom';
|
||||
|
||||
@Component({
|
||||
selector: 'app-order-management-abnormal-warning',
|
||||
templateUrl: './abnormal-warning.component.html',
|
||||
styleUrls: ['./abnormal-warning.component.less']
|
||||
styleUrls: ['../../../commom/less/commom-table.less', './abnormal-warning.component.less']
|
||||
})
|
||||
export class OrderManagementAbnormalWarningComponent implements OnInit {
|
||||
ui: SFUISchema = {};
|
||||
export class OrderManagementAbnormalWarningComponent extends BasicTableComponent implements OnInit {
|
||||
uiView: SFUISchema = {};
|
||||
schema: SFSchema = {};
|
||||
schemaView: SFSchema = {};
|
||||
changeId: any; // 主页面查看运费变更记录id - 用于运费变更记录
|
||||
changeViewId: any; // 查看运费变更记录id - 用于查看
|
||||
changeId: any; // 主页面查看运费变更记录id - 用于运费变更记录
|
||||
changeViewId: any; // 查看运费变更记录id - 用于查看
|
||||
auditId: any;
|
||||
auditIdR: any;
|
||||
auditMany = false;
|
||||
@ -31,22 +26,23 @@ export class OrderManagementAbnormalWarningComponent implements OnInit {
|
||||
isVisibleEvaluate = false;
|
||||
isVisible = false;
|
||||
isVisibleRE = false;
|
||||
_$expand = false;
|
||||
@ViewChild('st') private readonly st!: STComponent;
|
||||
@ViewChild('sf', { static: false }) sf!: SFComponent;
|
||||
@ViewChild('sfView', { static: false }) sfView!: SFComponent;
|
||||
@ViewChild('stFloat') private readonly stFloat!: STComponent;
|
||||
@ViewChild('stFloatView') private readonly stFloatView!: STComponent;
|
||||
columns: STColumn[] = [];
|
||||
columnsFloat: STColumn[] = [];
|
||||
columnsFloatView: STColumn[] = [];
|
||||
ViewCause: any; // 变更运费查看数据
|
||||
ViewCause: any; // 变更运费查看数据
|
||||
constructor(
|
||||
public service: OrderManagementService,
|
||||
private modal: NzModalService,
|
||||
public shipperservice: ShipperBaseService,
|
||||
private router: Router
|
||||
) { }
|
||||
private router: Router,
|
||||
public searchDrawerService: SearchDrawerService
|
||||
) {
|
||||
super(searchDrawerService);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询参数
|
||||
@ -96,14 +92,12 @@ export class OrderManagementAbnormalWarningComponent implements OnInit {
|
||||
billCode: {
|
||||
type: 'string',
|
||||
title: '订单号',
|
||||
ui: {
|
||||
}
|
||||
ui: {}
|
||||
},
|
||||
wayBillCode: {
|
||||
type: 'string',
|
||||
title: '运单号',
|
||||
ui: {
|
||||
}
|
||||
ui: {}
|
||||
},
|
||||
serviceType: {
|
||||
title: '服务类型',
|
||||
@ -112,7 +106,7 @@ export class OrderManagementAbnormalWarningComponent implements OnInit {
|
||||
ui: {
|
||||
widget: 'dict-select',
|
||||
params: { dictKey: 'service:type' },
|
||||
containsAllLabel: true,
|
||||
containsAllLabel: true
|
||||
} as SFSelectWidgetSchema
|
||||
},
|
||||
resourceType: {
|
||||
@ -120,12 +114,9 @@ export class OrderManagementAbnormalWarningComponent implements OnInit {
|
||||
type: 'string',
|
||||
default: '',
|
||||
ui: {
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value
|
||||
},
|
||||
widget: 'dict-select',
|
||||
params: { dictKey: 'goodresource:type' },
|
||||
containsAllLabel: true,
|
||||
containsAllLabel: true
|
||||
} as SFSelectWidgetSchema
|
||||
},
|
||||
shipperId: {
|
||||
@ -137,11 +128,8 @@ export class OrderManagementAbnormalWarningComponent 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 })
|
||||
@ -150,44 +138,24 @@ export class OrderManagementAbnormalWarningComponent implements OnInit {
|
||||
} else {
|
||||
return of([]);
|
||||
}
|
||||
},
|
||||
}
|
||||
} as SFSelectWidgetSchema
|
||||
},
|
||||
loadingPlace: {
|
||||
type: 'string',
|
||||
title: '装货地',
|
||||
ui: {
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value
|
||||
}
|
||||
}
|
||||
},
|
||||
dischargePlace: {
|
||||
type: 'string',
|
||||
title: '卸货地',
|
||||
ui: {
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value
|
||||
}
|
||||
}
|
||||
},
|
||||
driverName: {
|
||||
title: '承运司机',
|
||||
type: 'string',
|
||||
ui: {
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value
|
||||
}
|
||||
}
|
||||
},
|
||||
carNo: {
|
||||
title: '车牌号',
|
||||
type: 'string',
|
||||
ui: {
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value
|
||||
}
|
||||
}
|
||||
},
|
||||
warningTime: {
|
||||
title: '预警时间',
|
||||
@ -197,15 +165,11 @@ export class OrderManagementAbnormalWarningComponent implements OnInit {
|
||||
mode: 'range',
|
||||
format: 'yyyy-MM-dd',
|
||||
allowClear: true,
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value
|
||||
}
|
||||
} as SFDateWidgetSchema
|
||||
},
|
||||
}
|
||||
},
|
||||
type: 'object'
|
||||
};
|
||||
this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } };
|
||||
}
|
||||
|
||||
/**
|
||||
@ -227,13 +191,19 @@ export class OrderManagementAbnormalWarningComponent implements OnInit {
|
||||
className: 'text-left',
|
||||
index: 'wayCode'
|
||||
},
|
||||
{ title: '服务类型', index: 'serviceTypeLabel', width: '220px', className: 'text-left',format: (item) => {
|
||||
return item?.resourceTypeLabel + item?.serviceTypeLabel
|
||||
} },
|
||||
{
|
||||
title: '服务类型',
|
||||
index: 'serviceTypeLabel',
|
||||
width: '220px',
|
||||
className: 'text-left',
|
||||
format: item => {
|
||||
return item?.resourceTypeLabel + item?.serviceTypeLabel;
|
||||
}
|
||||
},
|
||||
{ title: '货主', index: 'shipperName', width: '220px', className: 'text-left' },
|
||||
{ title: '装货地', index: 'loadingAddressArr', width: '220px', className: 'text-left' },
|
||||
{ title: '卸货地', index: 'unloadingAddressArr', width: '220px', className: 'text-left' },
|
||||
{ title: '司机', render: 'driverName', width: '180px', className: 'text-left' },
|
||||
{ title: '司机', render: 'driverName', width: '180px', className: 'text-left' },
|
||||
{ title: '车牌号', index: 'carNo', width: '180px', className: 'text-left' },
|
||||
{ title: '预警类型', index: 'warningTypeLabel', width: '180px', className: 'text-left' },
|
||||
{
|
||||
@ -252,39 +222,15 @@ export class OrderManagementAbnormalWarningComponent implements OnInit {
|
||||
title: '提醒内容',
|
||||
className: 'text-left',
|
||||
width: '250px',
|
||||
index: 'warningContent',
|
||||
},
|
||||
|
||||
index: 'warningContent'
|
||||
}
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询字段个数
|
||||
*/
|
||||
get queryFieldCount(): number {
|
||||
return Object.keys(this.schema?.properties || {}).length;
|
||||
}
|
||||
tabChange(item: any) {}
|
||||
|
||||
|
||||
/**
|
||||
* 伸缩查询条件
|
||||
*/
|
||||
expandToggle(): void {
|
||||
this._$expand = !this._$expand;
|
||||
this.sf?.setValue('/_$expand', this._$expand);
|
||||
// 导出
|
||||
exprot() {
|
||||
this.service.exportStart({ ...this.reqParams, pageSize: -1 }, this.service.$api_abnormalWarning_asyncExport);
|
||||
}
|
||||
tabChange(item: any) { }
|
||||
/**
|
||||
* 重置表单
|
||||
*/
|
||||
resetSF(): void {
|
||||
this.sf.reset();
|
||||
this._$expand = false;
|
||||
}
|
||||
|
||||
|
||||
// 导出
|
||||
exprot() {
|
||||
this.service.exportStart({ ...this.reqParams, pageSize: -1 }, this.service.$api_abnormalWarning_asyncExport);
|
||||
}
|
||||
}
|
||||
|
||||
@ -10,59 +10,67 @@
|
||||
-->
|
||||
|
||||
<!-- 搜索表单 -->
|
||||
<page-header-wrapper title="" [tab]="tpTab">
|
||||
<!-- <page-header-wrapper title="" [tab]="tpTab">
|
||||
<ng-template #tpTab>
|
||||
<nz-tabset [nzSelectedIndex]="selectedIndex">
|
||||
<nz-tabset [nzSelectedIndex]="selectedIndex" [nzTabBarExtraContent]="extraTemplate">
|
||||
<nz-tab *ngFor="let tab of mainTabs" [nzTitle]="tab.name" (nzSelect)="selectMainTab(tab)">
|
||||
</nz-tab>
|
||||
</nz-tabset>
|
||||
</ng-template>
|
||||
</page-header-wrapper>
|
||||
<nz-card>
|
||||
</page-header-wrapper> -->
|
||||
<!-- <nz-card>
|
||||
<div nz-row nzGutter="12">
|
||||
<!-- 查询字段大于3个时，根据展开状态调整布局 -->
|
||||
<div nz-col [nzSpan]="24">
|
||||
<sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
|
||||
</div>
|
||||
<div nz-col [nzSpan]="24" style="display: flex; justify-content: flex-end;">
|
||||
<button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading"
|
||||
(click)="st?.load(1)" acl [acl-ability]="['ORDER-COMPLAINT-search']">查询</button>
|
||||
<button nz-button nzType="primary" acl [acl-ability]="['ORDER-COMPLAINT-export']" (click)="exprot()"
|
||||
>导出</button>
|
||||
<button nz-button (click)="resetSF()">重置</button>
|
||||
</div>
|
||||
<div nz-col [nzSpan]="24">
|
||||
<sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
|
||||
</div>
|
||||
<div nz-col [nzSpan]="24" style="display: flex; justify-content: flex-end;">
|
||||
<button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading"
|
||||
(click)="st?.load(1)" acl [acl-ability]="['ORDER-COMPLAINT-search']">查询</button>
|
||||
<button nz-button nzType="primary" acl [acl-ability]="['ORDER-COMPLAINT-export']" (click)="exprot()">导出</button>
|
||||
<button nz-button (click)="resetSF()">重置</button>
|
||||
</div>
|
||||
</div>
|
||||
</nz-card>
|
||||
</nz-card> -->
|
||||
|
||||
<nz-card>
|
||||
<nz-tabset (nzSelectedIndexChange)="selectChange($event)" >
|
||||
<nz-tab *ngFor="let tab of tabs; let i = index" [nzTitle]="tab.name" (nzClick)="tabChange(i)">
|
||||
<nz-card class="table-box">
|
||||
<div class="tab_header">
|
||||
<label class="page_title"> <label class="driver">|</label> 投诉管理</label>
|
||||
<nz-tabset [nzSelectedIndex]="selectedIndex" [nzTabBarExtraContent]="extraTemplate">
|
||||
<nz-tab *ngFor="let tab of mainTabs" [nzTitle]="tab.name" (nzSelect)="selectMainTab(tab)">
|
||||
</nz-tab>
|
||||
</nz-tabset>
|
||||
</div>
|
||||
<nz-tabset (nzSelectedIndexChange)="selectChange($event)">
|
||||
<nz-tab *ngFor="let tab of tabs; let i = index" [nzTitle]="tab.name" (nzClick)="tabChange(i)">
|
||||
</nz-tab>
|
||||
</nz-tabset>
|
||||
<div style="margin-top: 15px;">
|
||||
<st
|
||||
#st
|
||||
[bordered]="true"
|
||||
[scroll]="{ x: '2000px' }"
|
||||
[data]="service.$api_get_operate_listPage"
|
||||
[columns]="columns"
|
||||
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
|
||||
[res]="{ reName: { list: 'data.records', total: 'data.total' } }"
|
||||
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
|
||||
[loading]="false"
|
||||
>
|
||||
<ng-template st-row="complaintCode" let-item let-index="index">
|
||||
<a href="javascript:;" (click)="view(item)">{{item.complaintCode}}</a>
|
||||
</ng-template>
|
||||
<ng-template st-row="complaintCauseLabel" let-item let-index="index">
|
||||
<div *ngIf="selectedMainTabStatus == '2'">{{item?.drvComplaintCauseLabel}}</div>
|
||||
<div *ngIf="selectedMainTabStatus == '1'">{{item?.complaintCauseLabel}}</div>
|
||||
</ng-template>
|
||||
<div>
|
||||
<st #st [bordered]="true" [scroll]="{ x: '2000px',y:scrollY }" [data]="service.$api_get_operate_listPage"
|
||||
[columns]="columns"
|
||||
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
|
||||
[res]="{ reName: { list: 'data.records', total: 'data.total' } }"
|
||||
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" [loading]="false">
|
||||
<ng-template st-row="complaintCode" let-item let-index="index">
|
||||
<a href="javascript:;" (click)="view(item)">{{item.complaintCode}}</a>
|
||||
</ng-template>
|
||||
<ng-template st-row="complaintCauseLabel" let-item let-index="index">
|
||||
<div *ngIf="selectedMainTabStatus == '2'">{{item?.drvComplaintCauseLabel}}</div>
|
||||
<div *ngIf="selectedMainTabStatus == '1'">{{item?.complaintCauseLabel}}</div>
|
||||
</ng-template>
|
||||
</st>
|
||||
</div>
|
||||
</nz-card>
|
||||
|
||||
<nz-modal [(nzVisible)]="isVisibleRE" [nzWidth]="600" [nzFooter]="nzModalFooterview2" (nzOnOk)="handleOK()" nzTitle="处理" (nzOnCancel)="Cancel()">
|
||||
<ng-template #extraTemplate>
|
||||
<div class="mr-sm">
|
||||
<button nz-button nzDanger [nzLoading]="isLoading && st.loading" (click)="openDrawer()" acl
|
||||
[acl-ability]="['ORDER-COMPLAINT-search']">筛选</button>
|
||||
<button nz-button nzDanger acl [acl-ability]="['ORDER-COMPLAINT-export']" (click)="exprot()">导出</button>
|
||||
</div>
|
||||
</ng-template>
|
||||
|
||||
<nz-modal [(nzVisible)]="isVisibleRE" [nzWidth]="600" [nzFooter]="nzModalFooterview2" (nzOnOk)="handleOK()" nzTitle="处理"
|
||||
(nzOnCancel)="Cancel()">
|
||||
<ng-container *nzModalContent>
|
||||
<sf #sfView [schema]="schemaView" [ui]="uiView" [compact]="true" [button]="'none'">
|
||||
</sf>
|
||||
@ -72,6 +80,4 @@
|
||||
<button nz-button nzType="primary" (click)="handleOK()">通过</button>
|
||||
<button nz-button nzType="primary" (click)="handleCancel2()">强制取消</button>
|
||||
</ng-template>
|
||||
</nz-modal>
|
||||
|
||||
|
||||
</nz-modal>
|
||||
@ -6,20 +6,19 @@ import { ModalHelper, _HttpClient } from '@delon/theme';
|
||||
import { NzModalService } from 'ng-zorro-antd/modal';
|
||||
import { map } from 'rxjs/operators';
|
||||
import { OrderManagementService } from '../../services/order-management.service';
|
||||
import { SearchDrawerService } from '@shared';
|
||||
import { BasicTableComponent } from 'src/app/routes/commom/components/basic-table/basic-table.component';
|
||||
|
||||
@Component({
|
||||
selector: 'app-supply-management-complaint',
|
||||
templateUrl: './complaint.component.html',
|
||||
styleUrls: ['./complaint.component.less']
|
||||
styleUrls: ['../../../commom/less/commom-table.less', './complaint.component.less']
|
||||
})
|
||||
export class OrderManagementComplaintComponent implements OnInit {
|
||||
ui: SFUISchema = {};
|
||||
export class OrderManagementComplaintComponent extends BasicTableComponent implements OnInit {
|
||||
uiView: SFUISchema = {};
|
||||
schema: SFSchema = {};
|
||||
schemaView: SFSchema = {};
|
||||
auditMany = false;
|
||||
isVisibleRE = false;
|
||||
_$expand = false;
|
||||
channelId: any;
|
||||
resourceStatus: any;
|
||||
selectedMainTabStatus = '2';
|
||||
@ -51,7 +50,13 @@ export class OrderManagementComplaintComponent implements OnInit {
|
||||
type: 3
|
||||
}
|
||||
];
|
||||
constructor(public service: OrderManagementService, private modal: NzModalService, private router: Router) {
|
||||
constructor(
|
||||
public service: OrderManagementService,
|
||||
private modal: NzModalService,
|
||||
private router: Router,
|
||||
public searchDrawerService: SearchDrawerService
|
||||
) {
|
||||
super(searchDrawerService);
|
||||
// console.log(this.selectedIndex);
|
||||
// if (this.selectedIndex === 0) {
|
||||
// this.selectedMainTabStatus = '2';
|
||||
@ -101,16 +106,15 @@ export class OrderManagementComplaintComponent implements OnInit {
|
||||
wayBillCode: {
|
||||
type: 'string',
|
||||
title: '运单号',
|
||||
ui: {
|
||||
}
|
||||
ui: {}
|
||||
},
|
||||
complaintCause: {
|
||||
drvComplaintCause: {
|
||||
title: '投诉原因',
|
||||
type: 'string',
|
||||
ui: {
|
||||
widget: 'dict-select',
|
||||
params: { dictKey: 'drvcomplaint:cause' },
|
||||
hidden: this.selectedMainTabStatus == '1',
|
||||
hidden: this.selectedMainTabStatus == '1',
|
||||
containsAllLabel: true
|
||||
} as SFSelectWidgetSchema
|
||||
},
|
||||
@ -120,7 +124,7 @@ export class OrderManagementComplaintComponent implements OnInit {
|
||||
ui: {
|
||||
widget: 'dict-select',
|
||||
params: { dictKey: 'drvcomplaint:cause' },
|
||||
hidden: this.selectedMainTabStatus == '2',
|
||||
hidden: this.selectedMainTabStatus == '2',
|
||||
containsAllLabel: true
|
||||
} as SFSelectWidgetSchema
|
||||
},
|
||||
@ -132,16 +136,10 @@ export class OrderManagementComplaintComponent implements OnInit {
|
||||
widget: 'sl-from-to',
|
||||
type: 'date',
|
||||
format: 'yyyy-MM-dd',
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value
|
||||
},
|
||||
} as SFDateWidgetSchema
|
||||
}
|
||||
}
|
||||
};
|
||||
this.ui = {
|
||||
'*': { spanLabelFixed: 110, grid: { span: 8, gutter: 8 } }
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
@ -270,21 +268,7 @@ export class OrderManagementComplaintComponent 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.isLoading = true;
|
||||
}
|
||||
selectChange(e: number) {
|
||||
this.resourceStatus = e;
|
||||
this.initST();
|
||||
|
||||
@ -9,41 +9,18 @@
|
||||
* 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>
|
||||
|
||||
<!-- 查询字段大于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-COMPLIANCE-AUDIT-search']"
|
||||
>查询</button
|
||||
>
|
||||
<button nz-button nzType="primary" [disabled]="false" acl [acl-ability]="['ORDER-COMPLIANCE-AUDIT-export']" (click)="exprot()"
|
||||
>导出</button
|
||||
>
|
||||
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="search()" acl
|
||||
[acl-ability]="['ORDER-COMPLIANCE-AUDIT-search']">查询</button>
|
||||
<button nz-button nzType="primary" [disabled]="false" acl [acl-ability]="['ORDER-COMPLIANCE-AUDIT-export']"
|
||||
(click)="exprot()">导出</button>
|
||||
<button nz-button [disabled]="false" (click)="resetSF()">重置</button>
|
||||
<button nz-button nzType="link" (click)="expandToggle()">
|
||||
{{ !_$expand ? '展开' : '收起' }}
|
||||
@ -52,27 +29,24 @@
|
||||
</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?.spotQuantity + ')'"></nz-tab>
|
||||
<nz-tab [nzTitle]="'合格(' + tabs?.qualifiedtity + ')'"></nz-tab>
|
||||
<nz-tab [nzTitle]="'不合格(' + tabs?.unstayQuantity + ')'"></nz-tab>
|
||||
</nz-tabset>
|
||||
<div style="margin-top: 15px">
|
||||
<st
|
||||
#st
|
||||
[bordered]="true"
|
||||
[scroll]="{ x: '2000px' }"
|
||||
[data]="service.$api_get_listCompliancePage"
|
||||
<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?.spotQuantity + ')'"></nz-tab>
|
||||
<nz-tab [nzTitle]="'合格(' + tabs?.qualifiedtity + ')'"></nz-tab>
|
||||
<nz-tab [nzTitle]="'不合格(' + tabs?.unstayQuantity + ')'"></nz-tab>
|
||||
</nz-tabset>
|
||||
</div>
|
||||
<div>
|
||||
<st #st [bordered]="true" [scroll]="{ x: '2000px',y:scrollY }" [data]="service.$api_get_listCompliancePage"
|
||||
[columns]="columns"
|
||||
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
|
||||
[res]="{ reName: { list: 'data.records', total: 'data.total' } }"
|
||||
[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>
|
||||
@ -81,20 +55,25 @@
|
||||
<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">
|
||||
<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" [queryParams]="{ sts :1}">{{ 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"
|
||||
[queryParams]="{ sts :1}">{{ 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 === 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">
|
||||
@ -119,18 +98,16 @@
|
||||
|
||||
<ng-template #extraTemplate>
|
||||
<div>
|
||||
<button nz-button nzType="primary" (click)="audit()" acl [acl-ability]="['ORDER-COMPLIANCE-AUDIT-updateBillByComplianceBatch']"> 批量抽查 </button>
|
||||
<button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()" acl
|
||||
[acl-ability]="['ORDER-COMPLIANCE-AUDIT-search']">筛选</button>
|
||||
<button nz-button nzDanger acl [acl-ability]="['ORDER-COMPLIANCE-AUDIT-export']" (click)="exprot()">导出</button>
|
||||
<button nz-button nzType="primary" (click)="audit()" acl
|
||||
[acl-ability]="['ORDER-COMPLIANCE-AUDIT-updateBillByComplianceBatch']"> 批量抽查 </button>
|
||||
</div>
|
||||
</ng-template>
|
||||
|
||||
<nz-modal
|
||||
[(nzVisible)]="isVisibleRE"
|
||||
[nzWidth]="600"
|
||||
[nzFooter]="nzModalFooterview2"
|
||||
(nzOnOk)="handleOK()"
|
||||
nzTitle="抽查"
|
||||
(nzOnCancel)="handleCancel('1')"
|
||||
>
|
||||
<nz-modal [(nzVisible)]="isVisibleRE" [nzWidth]="600" [nzFooter]="nzModalFooterview2" (nzOnOk)="handleOK()" nzTitle="抽查"
|
||||
(nzOnCancel)="handleCancel('1')">
|
||||
<ng-container *nzModalContent>
|
||||
<sf #sfView [schema]="schemaView" [ui]="uiView" [compact]="true" [button]="'none'"> </sf>
|
||||
</ng-container>
|
||||
@ -140,18 +117,13 @@
|
||||
</ng-template>
|
||||
</nz-modal>
|
||||
|
||||
<nz-modal [(nzVisible)]="isVisible" [nzWidth]="600" [nzFooter]="nzModalFooter" nzTitle="运费变更记录" (nzOnCancel)="handleCancel('0')">
|
||||
<nz-modal [(nzVisible)]="isVisible" [nzWidth]="600" [nzFooter]="nzModalFooter" nzTitle="运费变更记录"
|
||||
(nzOnCancel)="handleCancel('0')">
|
||||
<ng-container *nzModalContent>
|
||||
<st
|
||||
#stFloat
|
||||
multiSort
|
||||
size="small"
|
||||
[bordered]="true"
|
||||
[data]="service.$api_get_listChangeApply"
|
||||
<st #stFloat multiSort size="small" [bordered]="true" [data]="service.$api_get_listChangeApply"
|
||||
[columns]="columnsFloat"
|
||||
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: changeParams }"
|
||||
[res]="{ reName: { list: 'data', total: 'data.total' } }"
|
||||
>
|
||||
[res]="{ reName: { list: 'data', total: 'data.total' } }">
|
||||
<ng-template st-row="order" let-item let-index="index">
|
||||
{{ index + 1 }}
|
||||
</ng-template>
|
||||
@ -163,35 +135,27 @@
|
||||
</ng-template>
|
||||
</nz-modal>
|
||||
|
||||
<nz-modal [(nzVisible)]="isVisibleView" [nzWidth]="600" [nzFooter]="nzModalFooterview" nzTitle="查看" (nzOnCancel)="handleCancel('2')">
|
||||
<nz-modal [(nzVisible)]="isVisibleView" [nzWidth]="600" [nzFooter]="nzModalFooterview" nzTitle="查看"
|
||||
(nzOnCancel)="handleCancel('2')">
|
||||
<ng-container *nzModalContent>
|
||||
<st
|
||||
#stFloatView
|
||||
size="small"
|
||||
[bordered]="true"
|
||||
[data]="service.$api_getChangeRecordWholeDetail"
|
||||
[columns]="columnsFloatView"
|
||||
[req]="{ method: 'POST', allInBody: true, params: changeViewParams }"
|
||||
[res]="{ reName: { list: 'data.list', total: 'data.total' } }"
|
||||
>
|
||||
<st #stFloatView size="small" [bordered]="true" [data]="service.$api_getChangeRecordWholeDetail"
|
||||
[columns]="columnsFloatView" [req]="{ method: 'POST', allInBody: true, params: changeViewParams }"
|
||||
[res]="{ reName: { list: 'data.list', total: 'data.total' } }">
|
||||
<ng-template st-row="amountBeforeChange" let-item let-index="index">
|
||||
{{ item.amountBeforeChange | currency }}
|
||||
</ng-template>
|
||||
<ng-template st-row="amountchangeValue" let-item let-index="index"> ￥{{ item.amountchangeValue | number: '0.2-2' }} </ng-template>
|
||||
<ng-template st-row="amountchangeValue" let-item let-index="index"> ￥{{ item.amountchangeValue | number: '0.2-2'
|
||||
}} </ng-template>
|
||||
<ng-template st-row="amountAfterChange" let-item let-index="index">
|
||||
{{ item.amountAfterChange | currency }}
|
||||
</ng-template>
|
||||
</st>
|
||||
<div
|
||||
><span>变更原因：{{ ViewCause?.changeCause }}</span></div
|
||||
>
|
||||
<div
|
||||
><span>拒绝原因：{{ ViewCause?.refuseCause }}</span></div
|
||||
>
|
||||
<div><span>变更原因：{{ ViewCause?.changeCause }}</span></div>
|
||||
<div><span>拒绝原因：{{ ViewCause?.refuseCause }}</span></div>
|
||||
<div><span>注：附加费依据调整后的运输费用重新计算</span></div>
|
||||
</ng-container>
|
||||
<ng-template #nzModalFooterview>
|
||||
<button nz-button nzType="default" (click)="handleCancel('2')">取消</button>
|
||||
<button nz-button nzType="primary" (click)="handleCancel('2')">确定</button>
|
||||
</ng-template>
|
||||
</nz-modal>
|
||||
</nz-modal>
|
||||
@ -8,22 +8,21 @@ 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 { OneCarOrderAppealComponent } from '../../modal/audit/appeal/appeal.component';
|
||||
import { BasicTableComponent } from 'src/app/routes/commom';
|
||||
|
||||
@Component({
|
||||
selector: 'app-order-management-compliance-audit',
|
||||
templateUrl: './compliance-audit.component.html',
|
||||
styleUrls: ['./compliance-audit.component.less']
|
||||
styleUrls: ['../../../commom/less/commom-table.less', './compliance-audit.component.less']
|
||||
})
|
||||
export class OrderManagementComplianceAuditComponent implements OnInit {
|
||||
ui: SFUISchema = {};
|
||||
export class OrderManagementComplianceAuditComponent extends BasicTableComponent implements OnInit {
|
||||
uiView: SFUISchema = {};
|
||||
schema: SFSchema = {};
|
||||
schemaView: SFSchema = {};
|
||||
changeId: any; // 主页面查看运费变更记录id - 用于运费变更记录
|
||||
changeViewId: any; // 查看运费变更记录id - 用于查看
|
||||
changeId: any; // 主页面查看运费变更记录id - 用于运费变更记录
|
||||
changeViewId: any; // 查看运费变更记录id - 用于查看
|
||||
auditId: any;
|
||||
auditIdR: any;
|
||||
auditMany = false;
|
||||
@ -31,16 +30,14 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
|
||||
isVisibleEvaluate = false;
|
||||
isVisible = false;
|
||||
isVisibleRE = false;
|
||||
_$expand = false;
|
||||
@ViewChild('st') private readonly st!: STComponent;
|
||||
@ViewChild('sf', { static: false }) sf!: SFComponent;
|
||||
@ViewChild('sfView', { static: false }) sfView!: SFComponent;
|
||||
@ViewChild('stFloat') private readonly stFloat!: STComponent;
|
||||
@ViewChild('stFloatView') private readonly stFloatView!: STComponent;
|
||||
columns: STColumn[] = [];
|
||||
columnsFloat: STColumn[] = [];
|
||||
columnsFloatView: STColumn[] = [];
|
||||
ViewCause: any; // 变更运费查看数据
|
||||
ViewCause: any; // 变更运费查看数据
|
||||
resourceStatus: any;
|
||||
tabs = {
|
||||
totalCount: 0,
|
||||
@ -52,8 +49,11 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
|
||||
public service: OrderManagementService,
|
||||
private modal: NzModalService,
|
||||
public shipperservice: ShipperBaseService,
|
||||
private router: Router
|
||||
) { }
|
||||
private router: Router,
|
||||
public searchDrawerService: SearchDrawerService
|
||||
) {
|
||||
super(searchDrawerService);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询参数
|
||||
@ -99,7 +99,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
|
||||
unstayQuantity: 0
|
||||
};
|
||||
const params: any = Object.assign({}, this.reqParams || {});
|
||||
delete params.complianceStatus
|
||||
delete params.complianceStatus;
|
||||
this.service.request(this.service.$api_get_getComplianceStatisticalStatus, params).subscribe(res => {
|
||||
if (res) {
|
||||
let totalCount = 0;
|
||||
@ -142,8 +142,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
|
||||
billCode: {
|
||||
type: 'string',
|
||||
title: '订单号',
|
||||
ui: {
|
||||
}
|
||||
ui: {}
|
||||
},
|
||||
resourceCode: {
|
||||
type: 'string',
|
||||
@ -159,7 +158,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
|
||||
searchLoadingText: '搜索中...',
|
||||
allowClear: true,
|
||||
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 })
|
||||
@ -179,56 +178,28 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
|
||||
title: '所属项目',
|
||||
ui: {
|
||||
widget: 'select',
|
||||
placeholder: '请先选择货主',
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value
|
||||
},
|
||||
placeholder: '请先选择货主'
|
||||
} as SFSelectWidgetSchema
|
||||
},
|
||||
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'
|
||||
},
|
||||
carCaptainName: {
|
||||
title: '车队长',
|
||||
type: 'string',
|
||||
ui: {
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value
|
||||
}
|
||||
}
|
||||
type: 'string'
|
||||
},
|
||||
paymentStatus: {
|
||||
title: '支付状态',
|
||||
@ -236,10 +207,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
|
||||
ui: {
|
||||
widget: 'dict-select',
|
||||
params: { dictKey: 'overall:payment:status' },
|
||||
containsAllLabel: true,
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value
|
||||
}
|
||||
containsAllLabel: true
|
||||
} as SFSelectWidgetSchema
|
||||
},
|
||||
enterpriseInfoId: {
|
||||
@ -249,9 +217,6 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
|
||||
widget: 'select',
|
||||
placeholder: '请选择',
|
||||
allowClear: true,
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value
|
||||
},
|
||||
asyncData: () => this.shipperservice.getNetworkFreightForwarder()
|
||||
}
|
||||
},
|
||||
@ -262,10 +227,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
|
||||
ui: {
|
||||
widget: 'dict-select',
|
||||
params: { dictKey: 'service:type' },
|
||||
containsAllLabel: true,
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value
|
||||
}
|
||||
containsAllLabel: true
|
||||
} as SFSelectWidgetSchema
|
||||
},
|
||||
createTime: {
|
||||
@ -275,16 +237,12 @@ export class OrderManagementComplianceAuditComponent 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 } } };
|
||||
}
|
||||
// 获取城市列表
|
||||
getRegionCode(regionCode: any) {
|
||||
@ -397,21 +355,21 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
|
||||
buttons: [
|
||||
{
|
||||
text: '查看申诉记录',
|
||||
click: _record => this.appeal(_record),
|
||||
click: _record => this.appeal(_record)
|
||||
// iif: item => item.billStatus == '5'
|
||||
},
|
||||
{
|
||||
text: '运费变更记录',
|
||||
click: _record => this.OpenPrice(_record),
|
||||
// iif: item => item.billStatus == '4',
|
||||
acl: { ability: ['ORDER-COMPLIANCE-AUDIT-listChangeApply'] },
|
||||
acl: { ability: ['ORDER-COMPLIANCE-AUDIT-listChangeApply'] }
|
||||
},
|
||||
{
|
||||
text: '合规抽查',
|
||||
click: _record => this.audit(_record),
|
||||
iif: item => item.complianceStatus == '0',
|
||||
acl: { ability: ['ORDER-COMPLIANCE-AUDIT-updateBillByCompliance'] },
|
||||
},
|
||||
acl: { ability: ['ORDER-COMPLIANCE-AUDIT-updateBillByCompliance'] }
|
||||
}
|
||||
]
|
||||
}
|
||||
];
|
||||
@ -441,15 +399,15 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
|
||||
buttons: [
|
||||
{
|
||||
text: '查看',
|
||||
click: (_record) => this.FloatView(_record),
|
||||
click: _record => this.FloatView(_record)
|
||||
},
|
||||
{
|
||||
text: '撤销',
|
||||
click: (_record) => this.revoke(_record),
|
||||
iif: item => item.handleStatus === '1' || item.handleStatus === 1,
|
||||
},
|
||||
],
|
||||
},
|
||||
click: _record => this.revoke(_record),
|
||||
iif: item => item.handleStatus === '1' || item.handleStatus === 1
|
||||
}
|
||||
]
|
||||
}
|
||||
];
|
||||
}
|
||||
initSTFloatView() {
|
||||
@ -508,49 +466,38 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
|
||||
this.router.navigate(['/order-management/risk-detail', item.id]);
|
||||
}
|
||||
/**
|
||||
* 浮动费用查看
|
||||
*/
|
||||
* 浮动费用查看
|
||||
*/
|
||||
FloatView(item: any) {
|
||||
console.log(item)
|
||||
console.log(item);
|
||||
this.changeViewId = item.id;
|
||||
this.service.request(this.service.$api_getChangeRecordWholeDetail, { id: this.changeViewId }).subscribe((res) => {
|
||||
this.service.request(this.service.$api_getChangeRecordWholeDetail, { id: this.changeViewId }).subscribe(res => {
|
||||
this.ViewCause = res;
|
||||
})
|
||||
this.isVisibleView = true
|
||||
});
|
||||
this.isVisibleView = true;
|
||||
}
|
||||
revoke(item: any) {
|
||||
this.modal.confirm({
|
||||
nzTitle: '是否确定立即撤销费用变更！</i>',
|
||||
nzOnOk: () =>
|
||||
this.service.request(this.service.$api_get_revokeChangeRecord, { id: item.id }).subscribe((res) => {
|
||||
console.log(res)
|
||||
this.service.request(this.service.$api_get_revokeChangeRecord, { id: item.id }).subscribe(res => {
|
||||
console.log(res);
|
||||
if (res) {
|
||||
this.service.msgSrv.success('撤销成功！')
|
||||
this.stFloat.reload()
|
||||
this.service.msgSrv.success('撤销成功！');
|
||||
this.stFloat.reload();
|
||||
}
|
||||
})
|
||||
});
|
||||
}
|
||||
/**
|
||||
* 伸缩查询条件
|
||||
*/
|
||||
expandToggle(): void {
|
||||
this._$expand = !this._$expand;
|
||||
this.sf?.setValue('/_$expand', this._$expand);
|
||||
}
|
||||
tabChange(item: any) { }
|
||||
tabChange(item: any) {}
|
||||
/**
|
||||
* 重置表单
|
||||
*/
|
||||
resetSF(): void {
|
||||
this.sf.reset();
|
||||
this._$expand = false;
|
||||
}
|
||||
|
||||
/**
|
||||
* 导入货源
|
||||
*/
|
||||
importGoodsSource() { }
|
||||
importGoodsSource() {}
|
||||
OpenPrice(item: any) {
|
||||
this.changeId = item.id;
|
||||
this.isVisible = true;
|
||||
@ -608,8 +555,8 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
|
||||
this.uiView = { '*': { spanLabelFixed: 110, grid: { span: 24 } } };
|
||||
}
|
||||
/*
|
||||
* 审核关闭弹窗
|
||||
*/
|
||||
* 审核关闭弹窗
|
||||
*/
|
||||
handleCancel(value?: string) {
|
||||
if (value === '0') {
|
||||
this.isVisible = false;
|
||||
@ -620,8 +567,8 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
|
||||
}
|
||||
}
|
||||
/**
|
||||
* 审核通过按钮
|
||||
*/
|
||||
* 审核通过按钮
|
||||
*/
|
||||
handleOK() {
|
||||
let idList: any[] = [];
|
||||
if (this.selectedRows.length > 0) {
|
||||
@ -629,25 +576,25 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
|
||||
idList.push(item.id);
|
||||
});
|
||||
} else {
|
||||
idList.push(this?.auditIdR)
|
||||
idList.push(this?.auditIdR);
|
||||
}
|
||||
const parms = {
|
||||
ids: idList,
|
||||
complianceRemark: this.sfView.value.complianceRemark,
|
||||
complianceStatus: 1,
|
||||
complianceStatus: 1
|
||||
};
|
||||
this.service.request(this.service.$api_get_updateBillByCompliance, parms).subscribe(res => {
|
||||
if (res) {
|
||||
this.service.msgSrv.success('提交成功！');
|
||||
this.isVisibleRE = false;
|
||||
this.st?.load(1);
|
||||
this.getGoodsSourceStatistical()
|
||||
this.getGoodsSourceStatistical();
|
||||
}
|
||||
});
|
||||
}
|
||||
/**
|
||||
* 审核拒绝按钮
|
||||
*/
|
||||
* 审核拒绝按钮
|
||||
*/
|
||||
reject() {
|
||||
if (!this.sfView.value.complianceRemark) {
|
||||
this.service.msgSrv.error('备注不能为空！');
|
||||
@ -659,25 +606,25 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
|
||||
idList.push(item.id);
|
||||
});
|
||||
} else {
|
||||
idList.push(this.sfView.value.billCode)
|
||||
idList.push(this.sfView.value.billCode);
|
||||
}
|
||||
const parms = {
|
||||
ids: idList,
|
||||
complianceRemark: this.sfView.value.complianceRemark,
|
||||
complianceStatus: 2,
|
||||
complianceStatus: 2
|
||||
};
|
||||
this.service.request(this.service.$api_get_updateBillByCompliance, parms).subscribe(res => {
|
||||
if (res) {
|
||||
this.service.msgSrv.success('提交成功！');
|
||||
this.isVisibleRE = false;
|
||||
this.st?.load(1);
|
||||
this.getGoodsSourceStatistical()
|
||||
this.getGoodsSourceStatistical();
|
||||
}
|
||||
});
|
||||
}
|
||||
/**
|
||||
*合规抽查
|
||||
*/
|
||||
*合规抽查
|
||||
*/
|
||||
audit(item?: any) {
|
||||
if (item) {
|
||||
this.isVisibleRE = true;
|
||||
@ -686,7 +633,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
|
||||
this.initSTAudit(1);
|
||||
} else {
|
||||
if (this.selectedRows.length <= 0) {
|
||||
this.service.msgSrv.error('请选择订单！')
|
||||
this.service.msgSrv.error('请选择订单！');
|
||||
return;
|
||||
} else {
|
||||
this.isVisibleRE = true;
|
||||
@ -694,8 +641,8 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
|
||||
}
|
||||
}
|
||||
}
|
||||
// 导出
|
||||
exprot() {
|
||||
this.service.exportStart({ ...this.reqParams, pageSize: -1 }, this.service.$api_get_asyncExportSpotCheckList);
|
||||
}
|
||||
// 导出
|
||||
exprot() {
|
||||
this.service.exportStart({ ...this.reqParams, pageSize: -1 }, this.service.$api_get_asyncExportSpotCheckList);
|
||||
}
|
||||
}
|
||||
|
||||
@ -126,7 +126,7 @@
|
||||
<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 nz-menu-item (click)="sign1('1')" acl [acl-ability]="['ORDER-RECEIPTS- electronicBilling']">
|
||||
批量生成电子单据
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
@ -26,7 +26,6 @@ export class OrderManagementRiskComponent extends BasicTableComponent implements
|
||||
isVisibleRE = false;
|
||||
resourceStatus: any;
|
||||
@ViewChild('st') private readonly st!: STComponent;
|
||||
@ViewChild('sf', { static: false }) sf!: SFComponent;
|
||||
@ViewChild('sfView', { static: false }) sfView!: SFComponent;
|
||||
columns: STColumn[] = [];
|
||||
tabs = {
|
||||
@ -38,7 +37,6 @@ export class OrderManagementRiskComponent extends BasicTableComponent implements
|
||||
constructor(
|
||||
public service: OrderManagementService,
|
||||
public shipperservice: ShipperBaseService,
|
||||
private modal: NzModalService,
|
||||
public router: Router,
|
||||
public searchDrawerService: SearchDrawerService
|
||||
) {
|
||||
|
||||
@ -83,14 +83,15 @@ export class ParterLevelConfigListComponent implements OnInit {
|
||||
title: '创建时间',
|
||||
index: 'createTime'
|
||||
},
|
||||
{
|
||||
title: '排序',
|
||||
index: 'sortId'
|
||||
},
|
||||
|
||||
{
|
||||
title: '启用时间',
|
||||
index: 'enableTime'
|
||||
},
|
||||
{
|
||||
title: '排序',
|
||||
index: 'sortId'
|
||||
},
|
||||
{
|
||||
title: '状态',
|
||||
index: 'stateLocked',
|
||||
|
||||
@ -8,30 +8,15 @@
|
||||
* @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\bulk\\bulk.component.html
|
||||
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
||||
-->
|
||||
<nz-card>
|
||||
<!-- 搜索表单 -->
|
||||
<!-- <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>
|
||||
|
||||
<!-- 查询字段大于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]="loading" (click)="search()" acl [acl-ability]="['SUPPLY-INDEX-bulkSearch']">查询</button>
|
||||
<button nz-button nzType="primary" [nzLoading]="loading" (click)="search()" acl
|
||||
[acl-ability]="['SUPPLY-INDEX-bulkSearch']">查询</button>
|
||||
<button nz-button nzType="primary" [disabled]="loading" (click)="exportFire()">导出</button>
|
||||
<button nz-button [disabled]="loading" (click)="resetSF()">重置</button>
|
||||
<button nz-button nzType="link" (click)="expandToggle()">
|
||||
@ -41,43 +26,49 @@
|
||||
</div>
|
||||
</ng-container>
|
||||
</div>
|
||||
</nz-card>
|
||||
</nz-card> -->
|
||||
<ng-template #extraTemplate>
|
||||
<div>
|
||||
<button (click)="audit('', 2)" nz-button nzType="primary" acl [acl-ability]="['SUPPLY-INDEX-bulkBatchAudit']">审核</button>
|
||||
<button (click)="releaseGoods()" nz-button nzType="primary" acl [acl-ability]="['SUPPLY-INDEX-bulkUndertakesToSupply']">代发货源</button>
|
||||
<button nz-button nzDanger (click)="openDrawer()" class="mr-sm" [nzLoading]="loading" acl
|
||||
[acl-ability]="['SUPPLY-INDEX-bulkSearch']">筛选</button>
|
||||
<button nz-button nzDanger [disabled]="loading" (click)="exportFire()">导出</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 acl [acl-ability]="['SUPPLY-INDEX-bulkBatchAudit']" (click)="audit('', 2)">
|
||||
审核
|
||||
</li>
|
||||
<li nz-menu-item acl [acl-ability]="['SUPPLY-INDEX-bulkUndertakesToSupply']" (click)="releaseGoods()">
|
||||
代发货源
|
||||
</li>
|
||||
</ul>
|
||||
</nz-dropdown-menu>
|
||||
</div>
|
||||
</ng-template>
|
||||
<nz-card>
|
||||
<nz-tabset (nzSelectedIndexChange)="selectChange($event)" [nzTabBarExtraContent]="extraTemplate">
|
||||
<nz-tab [nzTitle]="'全部(' + tabs?.totalQuantity + ')'"></nz-tab>
|
||||
<nz-tab [nzTitle]="'进行中(' + tabs?.stayQuantity + ')'"></nz-tab>
|
||||
<nz-tab [nzTitle]="'已完结(' + tabs?.completedQuantity + ')'"></nz-tab>
|
||||
<nz-tab [nzTitle]="'已取消(' + tabs?.cancelQuantity + ')'"></nz-tab>
|
||||
</nz-tabset>
|
||||
<div style="position: relative">
|
||||
<nz-alert
|
||||
nzType="info"
|
||||
[nzMessage]="'当前共' + st?.total + '行记录，已选择' + selectedRows.length + '项'"
|
||||
nzShowIcon
|
||||
[ngStyle]="{ margin: '0 0 1rem 0' }"
|
||||
>
|
||||
</nz-alert>
|
||||
<nz-card class="table-box" style="margin: 0;">
|
||||
<div class="tab_header">
|
||||
<nz-tabset (nzSelectedIndexChange)="selectChange($event)" [nzTabBarExtraContent]="extraTemplate">
|
||||
<nz-tab [nzTitle]="'全部(' + tabs?.totalQuantity + ')'"></nz-tab>
|
||||
<nz-tab [nzTitle]="'进行中(' + tabs?.stayQuantity + ')'"></nz-tab>
|
||||
<nz-tab [nzTitle]="'已完结(' + tabs?.completedQuantity + ')'"></nz-tab>
|
||||
<nz-tab [nzTitle]="'已取消(' + tabs?.cancelQuantity + ')'"></nz-tab>
|
||||
</nz-tabset>
|
||||
</div>
|
||||
<div style="margin-top: 15px">
|
||||
<st
|
||||
#st
|
||||
[scroll]="{ x: '2000px' }"
|
||||
[data]="service.$api_get_bulkPage_list"
|
||||
[columns]="columns"
|
||||
|
||||
<div>
|
||||
<div style="position: relative;">
|
||||
<nz-alert nzType="info" [nzMessage]="'当前共' + st?.total + '行记录，已选择' + selectedRows.length + '项'" nzShowIcon
|
||||
style="margin: 0.5rem 16px;display: block;" class="header_box">
|
||||
</nz-alert>
|
||||
</div>
|
||||
<st #st [scroll]="{ x: '2000px',y:scrollY }" [data]="service.$api_get_bulkPage_list" [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"
|
||||
>
|
||||
<ng-template st-row="createUserName" let-item let-index="index">
|
||||
<div> {{ item?.createUserName }}{{ item?.createUserPhone ? '/' + item?.createUserPhone : ''}} </div>
|
||||
</ng-template>
|
||||
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" [loading]="false">
|
||||
<ng-template st-row="createUserName" let-item let-index="index">
|
||||
<div> {{ item?.createUserName }}{{ item?.createUserPhone ? '/' + item?.createUserPhone : ''}} </div>
|
||||
</ng-template>
|
||||
<!--运费单价 -->
|
||||
<ng-template st-row="freightPrice" let-item let-index="index">
|
||||
<div class="mr-xs">{{ item?.freightPrice | currency }} </div>
|
||||
@ -97,8 +88,7 @@
|
||||
<ng-template st-row="orderSn" let-item let-index="index">
|
||||
<div *ngFor="let item of item?.wayBillClassifiedStatisticsVOList">
|
||||
<label>{{ item?.wayBillStatusLabel }}</label>
|
||||
(<span [ngStyle]="{ color: item?.count > 0 ? '#1890FF' : '' }">{{ item?.count }}</span
|
||||
>)
|
||||
(<span [ngStyle]="{ color: item?.count > 0 ? '#1890FF' : '' }">{{ item?.count }}</span>)
|
||||
</div>
|
||||
</ng-template>
|
||||
<!-- 货物信息 -->
|
||||
@ -115,10 +105,12 @@
|
||||
</st>
|
||||
</div>
|
||||
</nz-card>
|
||||
<nz-modal [(nzVisible)]="isVisible" [nzFooter]="nzModalFooter" nzTitle="货源审核" (nzOnCancel)="handleCancel('suppliersType')">
|
||||
<nz-modal [(nzVisible)]="isVisible" [nzFooter]="nzModalFooter" nzTitle="货源审核"
|
||||
(nzOnCancel)="handleCancel('suppliersType')">
|
||||
<ng-container *nzModalContent>
|
||||
<div style="position: relative" *ngIf="auditMany">
|
||||
<nz-alert nzType="info" [nzMessage]="'已选择' + selectedRows?.length + '项'" nzShowIcon [ngStyle]="{ margin: '0 0 1rem 0' }">
|
||||
<nz-alert nzType="info" [nzMessage]="'已选择' + selectedRows?.length + '项'" nzShowIcon
|
||||
[ngStyle]="{ margin: '0 0 1rem 0' }">
|
||||
</nz-alert>
|
||||
</div>
|
||||
<sf #sfFre [schema]="freightSchema" [ui]="ui2" [compact]="false" [button]="'none'"> </sf>
|
||||
@ -133,4 +125,4 @@
|
||||
<button (click)="audit('',2)" nz-button nzType="primary">批量审核</button>
|
||||
<button (click)="audit('')" nz-button nzType="primary">发布货源</button>
|
||||
</div>
|
||||
</ng-template> -->
|
||||
</ng-template> -->
|
||||
@ -3,32 +3,31 @@ import { Router } from '@angular/router';
|
||||
import { STColumn, STComponent, STRequestOptions } from '@delon/abc/st';
|
||||
import { SFComponent, SFDateWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
|
||||
import { _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 { BasicTableComponent } from 'src/app/routes/commom';
|
||||
import { SupplyManagementService } from '../../services/supply-management.service';
|
||||
import { SupplyManagementQrcodePageComponent } from '../qrcode-page/qrcode-page.component';
|
||||
import { SupplyManagementUpdatePriceComponent } from '../update-price/update-price.component';
|
||||
|
||||
@Component({
|
||||
selector: 'app-supply-management-bulk',
|
||||
templateUrl: './bulk.component.html'
|
||||
templateUrl: './bulk.component.html',
|
||||
styleUrls: ['../../../commom/less/commom-table.less']
|
||||
})
|
||||
export class SupplyManagementBulkComponent implements OnInit {
|
||||
export class SupplyManagementBulkComponent extends BasicTableComponent implements OnInit {
|
||||
resourceStatus: any;
|
||||
ui: SFUISchema = {};
|
||||
ui2: SFUISchema = {};
|
||||
schema: SFSchema = {};
|
||||
auditMany = false;
|
||||
isVisible = false;
|
||||
loading: boolean = true;
|
||||
auditID: any;
|
||||
_$expand = false;
|
||||
columns: STColumn[] = [];
|
||||
freightSchema: SFSchema = {};
|
||||
@ViewChild('st') private readonly st!: STComponent;
|
||||
@ViewChild('sf', { static: false }) sf!: SFComponent;
|
||||
@ViewChild('sfFre', { static: false }) sfFre!: SFComponent;
|
||||
|
||||
tabs: any = {
|
||||
@ -37,12 +36,16 @@ export class SupplyManagementBulkComponent implements OnInit {
|
||||
receivedQuantity: 0,
|
||||
stayQuantity: 0
|
||||
};
|
||||
deviationHeight = 10;
|
||||
constructor(
|
||||
public service: SupplyManagementService,
|
||||
private modal: NzModalService,
|
||||
private router: Router,
|
||||
public shipperservice: ShipperBaseService
|
||||
) { }
|
||||
public shipperservice: ShipperBaseService,
|
||||
public searchDrawerService: SearchDrawerService
|
||||
) {
|
||||
super(searchDrawerService);
|
||||
}
|
||||
|
||||
ngOnInit(): void {
|
||||
this.initSF();
|
||||
@ -136,10 +139,7 @@ export class SupplyManagementBulkComponent implements OnInit {
|
||||
widget: 'dict-select',
|
||||
containsAllLabel: true,
|
||||
params: { dictKey: 'service:type' },
|
||||
containAllLable: true,
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value
|
||||
}
|
||||
containAllLable: true
|
||||
} as SFSelectWidgetSchema
|
||||
},
|
||||
settlementBasis: {
|
||||
@ -149,10 +149,7 @@ export class SupplyManagementBulkComponent implements OnInit {
|
||||
widget: 'dict-select',
|
||||
containsAllLabel: true,
|
||||
params: { dictKey: 'goodresource:settlement:type' },
|
||||
containAllLable: true,
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value
|
||||
}
|
||||
containAllLable: true
|
||||
} as SFSelectWidgetSchema
|
||||
},
|
||||
releaseTime: {
|
||||
@ -162,9 +159,6 @@ export class SupplyManagementBulkComponent implements OnInit {
|
||||
widget: 'date',
|
||||
mode: 'range',
|
||||
format: 'yyyy-MM-dd',
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value
|
||||
},
|
||||
allowClear: true
|
||||
} as SFDateWidgetSchema
|
||||
},
|
||||
@ -175,9 +169,6 @@ export class SupplyManagementBulkComponent implements OnInit {
|
||||
widget: 'date',
|
||||
mode: 'range',
|
||||
format: 'yyyy-MM-dd',
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value
|
||||
},
|
||||
allowClear: true
|
||||
} as SFDateWidgetSchema
|
||||
},
|
||||
@ -187,9 +178,6 @@ export class SupplyManagementBulkComponent implements OnInit {
|
||||
ui: {
|
||||
widget: 'select',
|
||||
placeholder: '请选择',
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value
|
||||
},
|
||||
allowClear: true,
|
||||
asyncData: () => this.shipperservice.getNetworkFreightForwarder()
|
||||
}
|
||||
@ -202,9 +190,6 @@ export class SupplyManagementBulkComponent implements OnInit {
|
||||
serverSearch: true,
|
||||
searchDebounceTime: 300,
|
||||
searchLoadingText: '搜索中...',
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value
|
||||
},
|
||||
allowClear: true,
|
||||
onSearch: (q: any) => {
|
||||
let str = q.replace(/^\s+|\s+$/g, '');
|
||||
@ -364,27 +349,7 @@ export class SupplyManagementBulkComponent implements OnInit {
|
||||
// .createStatic(FormEditComponent, { i: { id: 0 } })
|
||||
// .subscribe(() => this.st.reload());
|
||||
}
|
||||
/**
|
||||
* 查询字段个数
|
||||
*/
|
||||
get queryFieldCount(): number {
|
||||
return Object.keys(this.schema?.properties || {}).length;
|
||||
}
|
||||
/**
|
||||
* 伸缩查询条件
|
||||
*/
|
||||
expandToggle(): void {
|
||||
this._$expand = !this._$expand;
|
||||
this.sf?.setValue('/_$expand', this._$expand);
|
||||
}
|
||||
|
||||
/**
|
||||
* 重置表单
|
||||
*/
|
||||
resetSF(): void {
|
||||
this.sf.reset();
|
||||
this._$expand = false;
|
||||
}
|
||||
get selectedRows() {
|
||||
return this.st?.list.filter(item => item.checked) || [];
|
||||
}
|
||||
@ -565,7 +530,7 @@ export class SupplyManagementBulkComponent implements OnInit {
|
||||
}
|
||||
});
|
||||
}
|
||||
userAction() { }
|
||||
userAction() {}
|
||||
// 导出
|
||||
exportFire() {
|
||||
this.service.exportStart(this.reqParams, this.service.$api_asyncExportBulkList);
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
* @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\index\\index.component.html
|
||||
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
||||
-->
|
||||
<page-header-wrapper [tab]="tpTab">
|
||||
<!-- <page-header-wrapper [tab]="tpTab">
|
||||
</page-header-wrapper>
|
||||
<ng-template #tpTab>
|
||||
<nz-tabset [(nzSelectedIndex)]="selectedIndex">
|
||||
@ -19,4 +19,17 @@
|
||||
<app-supply-management-bulk></app-supply-management-bulk>
|
||||
</nz-tab>
|
||||
</nz-tabset>
|
||||
</ng-template>
|
||||
</ng-template> -->
|
||||
<div class="double_tabset_box">
|
||||
<div class="header_box" style="margin-bottom: -12px;">
|
||||
<label class="page_title"> <label class="driver">|</label> 货源管理</label>
|
||||
</div>
|
||||
<nz-tabset [(nzSelectedIndex)]="selectedIndex" class="header_tab">
|
||||
<nz-tab nzTitle="整车货源">
|
||||
<app-supply-management-vehicle></app-supply-management-vehicle>
|
||||
</nz-tab>
|
||||
<nz-tab nzTitle="大宗货源">
|
||||
<app-supply-management-bulk></app-supply-management-bulk>
|
||||
</nz-tab>
|
||||
</nz-tabset>
|
||||
</div>
|
||||
@ -2,17 +2,17 @@ import { Component, OnInit, ViewChild } from '@angular/core';
|
||||
import { STColumn, STComponent } from '@delon/abc/st';
|
||||
import { SFSchema } from '@delon/form';
|
||||
import { ModalHelper, _HttpClient } from '@delon/theme';
|
||||
import { SearchDrawerService } from '@shared';
|
||||
import { BasicTableComponent } from 'src/app/routes/commom';
|
||||
|
||||
@Component({
|
||||
selector: 'app-supply-management-index',
|
||||
templateUrl: './index.component.html',
|
||||
styleUrls: ['../../../commom/less/commom-table.less']
|
||||
})
|
||||
export class SupplyManagementIndexComponent implements OnInit {
|
||||
selectedIndex = 0;
|
||||
|
||||
constructor(private http: _HttpClient, private modal: ModalHelper) { }
|
||||
|
||||
ngOnInit(): void { }
|
||||
|
||||
|
||||
ngOnInit(): void {}
|
||||
}
|
||||
|
||||
@ -10,28 +10,18 @@
|
||||
-->
|
||||
|
||||
<!-- 搜索表单 -->
|
||||
<nz-card>
|
||||
<!-- <nz-card>
|
||||
<div nz-row nzGutter="8">
|
||||
<div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
|
||||
<sf
|
||||
#sf
|
||||
[schema]="schema"
|
||||
[ui]="{ '*': { spanLabelFixed: 110, grid: { lg: 8, md: 12, sm: 12, xs: 24, gutter: 4 } } }"
|
||||
[compact]="true"
|
||||
[button]="'none'"
|
||||
></sf>
|
||||
<sf #sf [schema]="schema"
|
||||
[ui]="{ '*': { spanLabelFixed: 110, grid: { lg: 8, md: 12, sm: 12, xs: 24, gutter: 4 } } }" [compact]="true"
|
||||
[button]="'none'"></sf>
|
||||
</div>
|
||||
<div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" [class.expend-options]="_$expand" class="text-right">
|
||||
<button
|
||||
nz-button
|
||||
nzType="primary"
|
||||
[nzLoading]="loading"
|
||||
(click)="search()"
|
||||
acl
|
||||
[acl-ability]="['SUPPLY-INDEX-vehicleSearch']"
|
||||
>查询</button
|
||||
>
|
||||
<button nz-button nzType="primary" [disabled]="loading" (click)="exportFire()" >导出</button>
|
||||
<div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" [class.expend-options]="_$expand"
|
||||
class="text-right">
|
||||
<button nz-button nzType="primary" [nzLoading]="loading" (click)="search()" acl
|
||||
[acl-ability]="['SUPPLY-INDEX-vehicleSearch']">查询</button>
|
||||
<button nz-button nzType="primary" [disabled]="loading" (click)="exportFire()">导出</button>
|
||||
<button nz-button [disabled]="loading" (click)="resetSF()">重置</button>
|
||||
<button nz-button nzType="link" (click)="expandToggle()">
|
||||
{{ !_$expand ? '展开' : '收起' }}
|
||||
@ -39,41 +29,32 @@
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</nz-card>
|
||||
</nz-card> -->
|
||||
|
||||
<nz-card>
|
||||
<nz-tabset (nzSelectedIndexChange)="selectChange($event)" [nzTabBarExtraContent]="extraTemplate">
|
||||
<nz-tab [nzTitle]="'全部(' + tabs?.totalQuantity + ')'"></nz-tab>
|
||||
<nz-tab [nzTitle]="'待接单(' + tabs?.stayQuantity + ')'"></nz-tab>
|
||||
<nz-tab [nzTitle]="'已接单(' + tabs?.receivedQuantity + ')'"></nz-tab>
|
||||
<nz-tab [nzTitle]="'已取消(' + tabs?.cancelQuantity + ')'"></nz-tab>
|
||||
</nz-tabset>
|
||||
<div style="margin-top: 15px">
|
||||
<nz-card class="table-box" style="margin: 0;">
|
||||
<div class="tab_header">
|
||||
<nz-tabset (nzSelectedIndexChange)="selectChange($event)" [nzTabBarExtraContent]="extraTemplate">
|
||||
<nz-tab [nzTitle]="'全部(' + tabs?.totalQuantity + ')'"></nz-tab>
|
||||
<nz-tab [nzTitle]="'待接单(' + tabs?.stayQuantity + ')'"></nz-tab>
|
||||
<nz-tab [nzTitle]="'已接单(' + tabs?.receivedQuantity + ')'"></nz-tab>
|
||||
<nz-tab [nzTitle]="'已取消(' + tabs?.cancelQuantity + ')'"></nz-tab>
|
||||
</nz-tabset>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<!-- 选中提示框 -->
|
||||
<div style="position: relative">
|
||||
<nz-alert
|
||||
nzType="info"
|
||||
[nzMessage]="'当前共' + st?.total + '行记录，已选择' + selectedRows.length + '项'"
|
||||
nzShowIcon
|
||||
[ngStyle]="{ margin: '0 0 1rem 0' }"
|
||||
>
|
||||
<div style="position: relative;">
|
||||
<nz-alert nzType="info" [nzMessage]="'当前共' + st?.total + '行记录，已选择' + selectedRows.length + '项'" nzShowIcon
|
||||
style="margin: 0.5rem 16px;display: block;" class="header_box">
|
||||
</nz-alert>
|
||||
</div>
|
||||
<!-- [req]="{ params: reqParams }" -->
|
||||
|
||||
<st
|
||||
#st
|
||||
[data]="service.$api_get_wholePage_list"
|
||||
[columns]="columns"
|
||||
[req]="{ process: beforeReq }"
|
||||
[res]="{ process: afterRes }"
|
||||
[page]="{ }"
|
||||
[loading]="loading"
|
||||
[scroll]="{ x: '1200px', y: '500px' }"
|
||||
>
|
||||
<ng-template st-row="createUserName" let-item let-index="index">
|
||||
<div> {{ item?.createUserName }}/{{ item?.createUserPhone }} </div>
|
||||
</ng-template>
|
||||
<st #st [data]="service.$api_get_wholePage_list" [columns]="columns" [req]="{ process: beforeReq }"
|
||||
[res]="{ process: afterRes }" [page]="{ }" [loading]="loading" [scroll]="{ x: '1200px',y:scrollY }">
|
||||
<ng-template st-row="createUserName" let-item let-index="index">
|
||||
<div> {{ item?.createUserName }}/{{ item?.createUserPhone }} </div>
|
||||
</ng-template>
|
||||
<ng-template st-row="resourceCode" let-item let-index="index">
|
||||
<a [routerLink]="'vehicle-detail/' + item?.id">{{ item?.resourceCode }}</a>
|
||||
<p>{{ item?.resourceTypeLabel }}{{ item?.serviceTypeLabel }}</p>
|
||||
@ -97,25 +78,41 @@
|
||||
</nz-card>
|
||||
<ng-template #extraTemplate>
|
||||
<div>
|
||||
<button (click)="audit('', 2)" nz-button nzType="primary" acl [acl-ability]="['SUPPLY-INDEX-vehicleBatchAudit']">审核</button>
|
||||
<button (click)="releaseGoods()" nz-button nzType="primary" acl [acl-ability]="['SUPPLY-INDEX-vehicleUndertakesToSupply']"
|
||||
>代发货源</button
|
||||
>
|
||||
<button (click)="importGoodsSource()" nz-button nzType="primary">导入货源</button>
|
||||
<button nz-button nzDanger (click)="openDrawer()" class="mr-sm" acl
|
||||
[acl-ability]="['SUPPLY-INDEX-vehicleSearch']">筛选</button>
|
||||
<button nz-button nzDanger [disabled]="loading" (click)="exportFire()">导出</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 acl [acl-ability]="['SUPPLY-INDEX-vehicleBatchAudit']" (click)="audit('', 2)">
|
||||
审核
|
||||
</li>
|
||||
<li nz-menu-item acl [acl-ability]="['SUPPLY-INDEX-vehicleUndertakesToSupply']" (click)="releaseGoods()">
|
||||
代发货源
|
||||
</li>
|
||||
<li nz-menu-item (click)="importGoodsSource()">
|
||||
导入货源
|
||||
</li>
|
||||
</ul>
|
||||
</nz-dropdown-menu>
|
||||
</div>
|
||||
</ng-template>
|
||||
|
||||
<nz-modal [(nzVisible)]="isVisible" [nzFooter]="nzModalFooter" nzTitle="货源审核" (nzOnCancel)="handleCancel('suppliersType')">
|
||||
<nz-modal [(nzVisible)]="isVisible" [nzFooter]="nzModalFooter" nzTitle="货源审核"
|
||||
(nzOnCancel)="handleCancel('suppliersType')">
|
||||
<ng-container *nzModalContent>
|
||||
<div style="position: relative" *ngIf="auditMany">
|
||||
<nz-alert nzType="info" [nzMessage]="'已选择' + selectedRows?.length + '项'" nzShowIcon [ngStyle]="{ margin: '0 0 1rem 0' }">
|
||||
<nz-alert nzType="info" [nzMessage]="'已选择' + selectedRows?.length + '项'" nzShowIcon
|
||||
[ngStyle]="{ margin: '0 0 1rem 0' }">
|
||||
</nz-alert>
|
||||
</div>
|
||||
<sf #sfFre [schema]="freightSchema" [ui]="{ '*': { spanLabelFixed: 120, grid: { span: 16 } } }" [compact]="false" [button]="'none'">
|
||||
<sf #sfFre [schema]="freightSchema" [ui]="{ '*': { spanLabelFixed: 120, grid: { span: 16 } } }" [compact]="false"
|
||||
[button]="'none'">
|
||||
</sf>
|
||||
</ng-container>
|
||||
<ng-template #nzModalFooter>
|
||||
<button nz-button nzType="primary" (click)="handleOK(1)" [disabled]="">通过</button>
|
||||
<button nz-button nzType="default" (click)="handleOK(2)">不通过</button>
|
||||
</ng-template>
|
||||
</nz-modal>
|
||||
</nz-modal>
|
||||
@ -9,17 +9,17 @@ import { SupplyManagementService } from '../../services/supply-management.servic
|
||||
import { SupplyManagementVehicleAssignedCarComponent } from '../assigned-car/assigned-car.component';
|
||||
import { SupplyManagementUpdateExternalSnComponent } from '../update-external-sn/update-external-sn.component';
|
||||
import { of } from 'rxjs';
|
||||
import { ShipperBaseService } from '@shared';
|
||||
import { SearchDrawerService, ShipperBaseService } from '@shared';
|
||||
import { SupplyManagementImportSupplyComponent } from '../../model/import-supply/import-supply.component';
|
||||
import { BasicTableComponent } from 'src/app/routes/commom';
|
||||
|
||||
@Component({
|
||||
selector: 'app-supply-management-vehicle',
|
||||
templateUrl: './vehicle.component.html',
|
||||
styleUrls: ['./vehicle.component.less']
|
||||
styleUrls: ['../../../commom/less/commom-table.less', './vehicle.component.less']
|
||||
})
|
||||
export class SupplyManagementVehicleComponent implements OnInit {
|
||||
export class SupplyManagementVehicleComponent extends BasicTableComponent implements OnInit {
|
||||
@ViewChild('st') private readonly st!: STComponent;
|
||||
@ViewChild('sf', { static: false }) sf!: SFComponent;
|
||||
@ViewChild('sfFre', { static: false }) sfFre!: SFComponent;
|
||||
loading: boolean = true;
|
||||
schema: SFSchema = this.initSF();
|
||||
@ -38,13 +38,18 @@ export class SupplyManagementVehicleComponent implements OnInit {
|
||||
|
||||
resourceStatus: any;
|
||||
auditID: any;
|
||||
|
||||
deviationHeight = 10;
|
||||
constructor(
|
||||
public service: SupplyManagementService,
|
||||
private modal: NzModalService,
|
||||
private router: Router,
|
||||
private ar: ActivatedRoute,
|
||||
public shipperSrv: ShipperBaseService
|
||||
) { }
|
||||
public shipperSrv: ShipperBaseService,
|
||||
public searchDrawerService: SearchDrawerService
|
||||
) {
|
||||
super(searchDrawerService);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询参数
|
||||
@ -150,7 +155,7 @@ export class SupplyManagementVehicleComponent implements OnInit {
|
||||
/**
|
||||
* 导入货源
|
||||
*/
|
||||
importGoodsSource() {
|
||||
importGoodsSource() {
|
||||
const modalRef = this.modal.create({
|
||||
nzTitle: '货源导入',
|
||||
nzWidth: 600,
|
||||
@ -181,25 +186,25 @@ export class SupplyManagementVehicleComponent implements OnInit {
|
||||
type: 'primary',
|
||||
loading: this.service.http.loading,
|
||||
onClick: () => {
|
||||
if(!result?.failNumber) {
|
||||
if (!result?.failNumber) {
|
||||
this.service.msgSrv.error('没有失败数据！');
|
||||
tipsModal.destroy();
|
||||
this.st?.reload();
|
||||
this.getGoodsSourceStatistical();
|
||||
return;
|
||||
}
|
||||
this.service.downloadFile(this.service.$api_getFailUploadGoodsOperateResource, result.ids)
|
||||
this.service.downloadFile(this.service.$api_getFailUploadGoodsOperateResource, result.ids);
|
||||
tipsModal.destroy();
|
||||
this.st?.reload();
|
||||
this.getGoodsSourceStatistical();
|
||||
}
|
||||
},
|
||||
}
|
||||
]
|
||||
})
|
||||
tipsModal.afterClose.subscribe(result => {
|
||||
});
|
||||
tipsModal.afterClose.subscribe(result => {
|
||||
this.st?.reload();
|
||||
this.getGoodsSourceStatistical();
|
||||
})
|
||||
this.getGoodsSourceStatistical();
|
||||
});
|
||||
} else {
|
||||
this.st?.reload();
|
||||
this.getGoodsSourceStatistical();
|
||||
@ -207,7 +212,6 @@ export class SupplyManagementVehicleComponent implements OnInit {
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 重新指派
|
||||
*/
|
||||
@ -396,9 +400,6 @@ export class SupplyManagementVehicleComponent implements OnInit {
|
||||
serverSearch: true,
|
||||
searchDebounceTime: 300,
|
||||
searchLoadingText: '搜索中...',
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value
|
||||
},
|
||||
allowClear: true,
|
||||
onSearch: (q: any) => {
|
||||
let str = q.replace(/^\s+|\s+$/g, '');
|
||||
@ -434,10 +435,7 @@ export class SupplyManagementVehicleComponent implements OnInit {
|
||||
title: '所属项目',
|
||||
ui: {
|
||||
widget: 'select',
|
||||
placeholder: '请先选择货主',
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value
|
||||
}
|
||||
placeholder: '请先选择货主'
|
||||
} as SFSelectWidgetSchema
|
||||
},
|
||||
serviceType: {
|
||||
@ -447,9 +445,6 @@ export class SupplyManagementVehicleComponent implements OnInit {
|
||||
widget: 'dict-select',
|
||||
containsAllLabel: true,
|
||||
params: { dictKey: 'service:type' },
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value
|
||||
},
|
||||
allowClear: true
|
||||
} as SFSelectWidgetSchema
|
||||
},
|
||||
@ -460,10 +455,7 @@ export class SupplyManagementVehicleComponent implements OnInit {
|
||||
widget: 'dict-select',
|
||||
allowClear: true,
|
||||
containsAllLabel: true,
|
||||
params: { dictKey: 'goodresource:audit:status' },
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value
|
||||
}
|
||||
params: { dictKey: 'goodresource:audit:status' }
|
||||
} as SFSelectWidgetSchema
|
||||
},
|
||||
enterpriseInfoId: {
|
||||
@ -473,9 +465,6 @@ export class SupplyManagementVehicleComponent implements OnInit {
|
||||
widget: 'select',
|
||||
placeholder: '请选择',
|
||||
asyncData: () => this.shipperSrv.getNetworkFreightForwarder(),
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value
|
||||
},
|
||||
allowClear: true
|
||||
}
|
||||
}
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
<sf #sf [schema]="schema" [ui]="ui" [mode]="'search'" [loading]="false" (formSubmit)="st?.load(1)"
|
||||
(formReset)="resetSF()"></sf>
|
||||
</div>
|
||||
|
||||
edit
|
||||
<!-- 查询字段大于3个时，根据展开状态调整布局 -->
|
||||
<ng-container *ngIf="queryFieldCount > 4">
|
||||
<div nz-col [nzSpan]="_$expand ? 24 : 18">
|
||||
|
||||
@ -187,6 +187,10 @@ this.ui2 = { '*': { spanLabelFixed: 120, grid: { span: 24 } } };
|
||||
console.log(res)
|
||||
if(res) {
|
||||
this.formData = res;
|
||||
const List: any = [];
|
||||
List.push({ label: res.enterpriseName, value: res.id });
|
||||
this.sfFre.getProperty('/enterpriseId')!.schema.enum = List;
|
||||
this.sfFre.getProperty('/enterpriseId')!.widget.reset(List);
|
||||
}
|
||||
})
|
||||
this.edit = true;
|
||||
|
||||
@ -230,7 +230,7 @@ export class TaxManagementInvoiceReportingComponent implements OnInit {
|
||||
{
|
||||
title: '购买方企业名称', index: 'artoname', className: 'text-center', width: '200px', type: 'link',
|
||||
click: item => {
|
||||
window.open(`/#/usercenter/freight/list/detail/${item.ltdId}`, '_blank', 'noopener')
|
||||
window.open(`/#/usercenter/freight/list/detail/${item.arto}`, '_blank', 'noopener')
|
||||
}
|
||||
},
|
||||
{ title: '购买方统一社会信用代码', index: 'artotaxno', className: 'text-center', width: '200px' },
|
||||
|
||||
@ -72,8 +72,8 @@ export class EditPartnerComponentsAddComponent implements OnInit {
|
||||
// { label: '合伙人可见', value: 2 },
|
||||
// { label: '销售渠道可见', value: 3 },
|
||||
// ],
|
||||
// },
|
||||
enterpriceIds: {
|
||||
// },channelId
|
||||
channelId: {
|
||||
type: 'string',
|
||||
title: '合伙人修改为',
|
||||
ui: {
|
||||
@ -86,14 +86,19 @@ export class EditPartnerComponentsAddComponent implements OnInit {
|
||||
asyncData: () => this.shipperservice.getNetworkenterpriceIds()
|
||||
}
|
||||
},
|
||||
// settStartTime: {
|
||||
// title: '结算起算日期',
|
||||
// type: 'string',
|
||||
// ui: {
|
||||
// widget: 'sl-from-to', type: 'date', format: 'yyyy-MM-dd', visibleIf: {
|
||||
// _$expand: (value: boolean) => value,
|
||||
// },
|
||||
// } as SFDateWidgetSchema,
|
||||
// },
|
||||
settStartTime: {
|
||||
title: '结算起算日期',
|
||||
type: 'string',
|
||||
ui: {
|
||||
widget: 'sl-from-to', type: 'date', format: 'yyyy-MM-dd', visibleIf: {
|
||||
_$expand: (value: boolean) => value,
|
||||
},
|
||||
} as SFDateWidgetSchema,
|
||||
format: 'date',
|
||||
},
|
||||
remark: {
|
||||
type: 'string',
|
||||
@ -136,9 +141,18 @@ export class EditPartnerComponentsAddComponent implements OnInit {
|
||||
this.modal.close(true)
|
||||
}
|
||||
save() {
|
||||
const params = {
|
||||
...this.sf.value
|
||||
console.log(this?.rows);
|
||||
let enterId : any;
|
||||
if(this.sts == '1') {
|
||||
enterId = this.rows
|
||||
} else {
|
||||
enterId = [this.i.id]
|
||||
}
|
||||
const params = {
|
||||
...this.sf.value,
|
||||
enterpriceIds: enterId,
|
||||
}
|
||||
|
||||
this.service.request(this.service.$api_batchUpdateEnterpricePartner, params).subscribe(res => {
|
||||
if(res) {
|
||||
this.service.msgSrv.success('修改成功')
|
||||
|
||||
@ -141,6 +141,8 @@ export class FreightComponentsListComponent implements OnInit {
|
||||
this.selectedRows.forEach(item => {
|
||||
params.push(item.id);
|
||||
});
|
||||
console.log(params);
|
||||
|
||||
const modalRef = this.modal.create({
|
||||
nzTitle: '修改合伙人',
|
||||
nzContent: EditPartnerComponentsAddComponent,
|
||||
|
||||
@ -6,17 +6,10 @@
|
||||
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
|
||||
* @FilePath : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\abnormal-appear\\abnormal-appear.component.html
|
||||
-->
|
||||
<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>
|
||||
|
||||
<!-- 查询字段大于3个时，根据展开状态调整布局 -->
|
||||
<ng-container *ngIf="queryFieldCount > 4">
|
||||
<div nz-col [nzSpan]="_$expand ? 24 : 18">
|
||||
<sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
|
||||
@ -32,57 +25,62 @@
|
||||
</div>
|
||||
</ng-container>
|
||||
</div>
|
||||
</nz-card> -->
|
||||
|
||||
<nz-card class="table-box">
|
||||
<div class="tab_header">
|
||||
<label class="page_title"> <label class="driver">|</label> 异常上报</label>
|
||||
<nz-tabset [(nzSelectedIndex)]="selectedIndex" (nzSelectedIndexChange)="selectChange($event)"
|
||||
[nzTabBarExtraContent]="extraTemplate">
|
||||
<nz-tab [nzTitle]="'待回复(' + tabs?.stayQuantity + ')'"></nz-tab>
|
||||
<nz-tab [nzTitle]="'已回复(' + tabs?.receivedQuantity + ')'"> </nz-tab>
|
||||
</nz-tabset>
|
||||
</div>
|
||||
<div>
|
||||
<st #st [data]="service.$api_get_listOperatePage" [columns]="columns" [req]="{ params: reqParams }" [page]="{ }"
|
||||
[loading]="false" [scroll]="{ x: '2000px' ,y:scrollY }">
|
||||
<ng-template st-row="exceptionCertificateFirstFilePath" let-item let-index="index">
|
||||
<div class="imgBox">
|
||||
<div *ngIf="item?.exceptionCertificateFirstFilePath">
|
||||
<app-imagelist style="width: 40px;height: 40px" [imgList]="[item?.exceptionCertificateFirstFilePath]">
|
||||
</app-imagelist>
|
||||
</div>
|
||||
<div *ngIf="item?.exceptionCertificateSecondFilePath">
|
||||
<app-imagelist style="width: 40px;height: 40px" [imgList]="[item?.exceptionCertificateSecondFilePath]">
|
||||
</app-imagelist>
|
||||
</div>
|
||||
<div *ngIf="item?.exceptionCertificateThirdFilePath">
|
||||
<app-imagelist style="width: 40px;height: 40px" [imgList]="[item?.exceptionCertificateThirdFilePath]">
|
||||
</app-imagelist>
|
||||
</div>
|
||||
</div>
|
||||
</ng-template>
|
||||
</st>
|
||||
<!-- <st #st2 *ngIf="selectedIndex===1" [data]="service.$api_get_listOperatePage" [columns]="columns2"
|
||||
[req]="{ params: reqParams2 }" [page]="{ }" [loading]="false" [scroll]="{ x: '2000px',y:scrollY }">
|
||||
<ng-template st-row="exceptionCertificateFirstFilePath" let-item let-index="index">
|
||||
<div class="imgBox">
|
||||
<div *ngIf="item?.exceptionCertificateFirstFilePath">
|
||||
<app-imagelist [imgList]="[item?.exceptionCertificateFirstFilePath]"> </app-imagelist>
|
||||
</div>
|
||||
<div *ngIf="item?.exceptionCertificateSecondFilePath">
|
||||
<app-imagelist [imgList]="[item?.exceptionCertificateSecondFilePath]"> </app-imagelist>
|
||||
</div>
|
||||
<div *ngIf="item?.exceptionCertificateThirdFilePath">
|
||||
<app-imagelist [imgList]="[item?.exceptionCertificateThirdFilePath]"> </app-imagelist>
|
||||
</div>
|
||||
</div>
|
||||
</ng-template>
|
||||
</st> -->
|
||||
</div>
|
||||
</nz-card>
|
||||
|
||||
<nz-card class="content-box">
|
||||
<nz-tabset [(nzSelectedIndex)]="selectedIndex" (nzSelectedIndexChange)="selectChange($event)">
|
||||
<nz-tab [nzTitle]="'待回复(' + tabs?.stayQuantity + ')'">
|
||||
<st #st [data]="service.$api_get_listOperatePage" [columns]="columns"
|
||||
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
|
||||
[res]="{ reName: { list: 'data.records', total: 'data.total' } }"
|
||||
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" [loading]="false"
|
||||
[scroll]="{ x: '2000px' }">
|
||||
<ng-template st-row="exceptionCertificateFirstFilePath" let-item let-index="index">
|
||||
<div class="imgBox">
|
||||
<div *ngIf="item?.exceptionCertificateFirstFilePath">
|
||||
<app-imagelist style="width: 40px;height: 40px" [imgList]="[item?.exceptionCertificateFirstFilePath]">
|
||||
</app-imagelist>
|
||||
</div>
|
||||
<div *ngIf="item?.exceptionCertificateSecondFilePath">
|
||||
<app-imagelist style="width: 40px;height: 40px" [imgList]="[item?.exceptionCertificateSecondFilePath]">
|
||||
</app-imagelist>
|
||||
</div>
|
||||
<div *ngIf="item?.exceptionCertificateThirdFilePath">
|
||||
<app-imagelist style="width: 40px;height: 40px" [imgList]="[item?.exceptionCertificateThirdFilePath]">
|
||||
</app-imagelist>
|
||||
</div>
|
||||
</div>
|
||||
</ng-template>
|
||||
</st>
|
||||
</nz-tab>
|
||||
<nz-tab [nzTitle]="'已回复(' + tabs?.receivedQuantity + ')'">
|
||||
<st #st2 [data]="service.$api_get_listOperatePage" [columns]="columns2"
|
||||
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams2 }"
|
||||
[res]="{ reName: { list: 'data.records', total: 'data.total' } }"
|
||||
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" [loading]="false"
|
||||
[scroll]="{ x: '2000px' }">
|
||||
<ng-template st-row="exceptionCertificateFirstFilePath" let-item let-index="index">
|
||||
<div class="imgBox">
|
||||
<div *ngIf="item?.exceptionCertificateFirstFilePath">
|
||||
<app-imagelist [imgList]="[item?.exceptionCertificateFirstFilePath]"> </app-imagelist>
|
||||
</div>
|
||||
<div *ngIf="item?.exceptionCertificateSecondFilePath">
|
||||
<app-imagelist [imgList]="[item?.exceptionCertificateSecondFilePath]"> </app-imagelist>
|
||||
</div>
|
||||
<div *ngIf="item?.exceptionCertificateThirdFilePath">
|
||||
<app-imagelist [imgList]="[item?.exceptionCertificateThirdFilePath]"> </app-imagelist>
|
||||
</div>
|
||||
</div>
|
||||
</ng-template>
|
||||
</st>
|
||||
</nz-tab>
|
||||
</nz-tabset>
|
||||
</nz-card>
|
||||
<ng-template #extraTemplate>
|
||||
<div class="mr-sm">
|
||||
<button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()" acl
|
||||
[acl-ability]="['WAYBILL-ABNORMAL-search']">筛选</button>
|
||||
</div>
|
||||
</ng-template>
|
||||
|
||||
<ng-template #detailModal>
|
||||
<div nz-row nzGutter="8">
|
||||
|
||||
@ -10,32 +10,28 @@ import {
|
||||
SFSelectWidgetSchema,
|
||||
SFUISchema
|
||||
} from '@delon/form';
|
||||
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 { BasicTableComponent } from 'src/app/routes/commom';
|
||||
import { WaybillManagementServe } from '../../services/waybill-management.service';
|
||||
|
||||
@Component({
|
||||
selector: 'app-abnormal-appear',
|
||||
templateUrl: './abnormal-appear.component.html',
|
||||
styleUrls: ['./abnormal-appear.component.less']
|
||||
styleUrls: ['../../../commom/less/commom-table.less', './abnormal-appear.component.less']
|
||||
})
|
||||
export class WaybillManagementAbnormalAppearComponent implements OnInit {
|
||||
export class WaybillManagementAbnormalAppearComponent extends BasicTableComponent implements OnInit {
|
||||
@ViewChild('detailModal', { static: true })
|
||||
detailModal!: any;
|
||||
@ViewChild('replyModal', { static: true })
|
||||
replyModal!: any;
|
||||
@ViewChild('st', { static: true })
|
||||
st!: STComponent;
|
||||
@ViewChild('st2', { static: true })
|
||||
st2!: STComponent;
|
||||
@ViewChild('sf', { static: false }) sf!: SFComponent;
|
||||
ui: SFUISchema = {};
|
||||
ui2: SFUISchema = {};
|
||||
schema: SFSchema = {};
|
||||
addSchema: SFSchema = {};
|
||||
_$expand = false;
|
||||
editText = '';
|
||||
formData: any;
|
||||
isVisible = false;
|
||||
@ -74,44 +70,17 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
|
||||
{ title: '异常信息', index: 'exceptionContent', width: '250px', className: 'text-left' },
|
||||
{ title: '异常图片', render: 'exceptionCertificateFirstFilePath', width: '300px', className: 'text-left' },
|
||||
{ title: '上报时间', index: 'createTime', width: '180px', className: 'text-center' },
|
||||
{ title: '回复人', index: 'replyAppUserName', width: '180px', className: 'text-left', iif: _ => this.selectedIndex === 1 },
|
||||
{ title: '回复时间', index: 'replyTime', width: '180px', className: 'text-left', iif: _ => this.selectedIndex === 1 },
|
||||
{
|
||||
title: '操作',
|
||||
fixed: 'right',
|
||||
width: '100px',
|
||||
iif: _ => this.selectedIndex === 0,
|
||||
className: 'text-center',
|
||||
buttons: [{ text: '回复', click: item => this.replyAction(item) }]
|
||||
}
|
||||
];
|
||||
columns2: STColumn[] = [
|
||||
{
|
||||
title: '异常编号',
|
||||
index: 'exceptionCode',
|
||||
width: '180px',
|
||||
className: 'text-left',
|
||||
type: 'link',
|
||||
click: item => this.reviewDetailAction(item)
|
||||
},
|
||||
{ title: '异常类型', index: 'exceptionTypeLabel', width: '180px', className: 'text-left' },
|
||||
{
|
||||
title: '关联运单号',
|
||||
index: 'wayBillCode',
|
||||
width: '180px',
|
||||
className: 'text-left',
|
||||
type: 'link',
|
||||
click: item => this.routeToBill(item)
|
||||
},
|
||||
{ title: '网络货运人', index: 'enterpriseInfoName', width: '180px', className: 'text-left' },
|
||||
{ title: '货主', index: 'shipperAppUserName', width: '180px', className: 'text-left' },
|
||||
{ title: '装货地', index: 'loadingAddressArr', width: '180px', className: 'text-left' },
|
||||
{ title: '卸货地', index: 'unloadingAddressArr', width: '180px', className: 'text-left' },
|
||||
{ title: '承运司机', index: 'driver', width: '200px', className: 'text-left' },
|
||||
{ title: '异常信息', index: 'exceptionContent', width: '250px', className: 'text-left' },
|
||||
{ title: '异常图片', render: 'exceptionCertificateFirstFilePath', width: '220px', className: 'text-left' },
|
||||
{ title: '上报时间', index: 'createTime', width: '180px', className: 'text-left' },
|
||||
{ title: '回复内容', index: 'replyContent', width: '180px', className: 'text-left' },
|
||||
{ title: '回复人', index: 'replyAppUserName', width: '180px', className: 'text-left' },
|
||||
{ title: '回复时间', index: 'replyTime', width: '180px', className: 'text-left' }
|
||||
];
|
||||
resourceStatus: number | undefined;
|
||||
|
||||
get reqParams() {
|
||||
@ -140,28 +109,17 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
|
||||
public service: WaybillManagementServe,
|
||||
private nzModalService: NzModalService,
|
||||
public shipperSrv: ShipperBaseService,
|
||||
private router: Router
|
||||
) {}
|
||||
private router: Router,
|
||||
public searchDrawerService: SearchDrawerService
|
||||
) {
|
||||
super(searchDrawerService);
|
||||
}
|
||||
|
||||
ngOnInit(): void {
|
||||
this.initSF();
|
||||
this.getGoodsSourceStatistical();
|
||||
}
|
||||
|
||||
/**
|
||||
* 伸缩查询条件
|
||||
*/
|
||||
expandToggle(): void {
|
||||
this._$expand = !this._$expand;
|
||||
this.sf?.setValue('/_$expand', this._$expand);
|
||||
}
|
||||
/**
|
||||
* 查询字段个数
|
||||
*/
|
||||
get queryFieldCount(): number {
|
||||
return Object.keys(this.schema?.properties || {}).length;
|
||||
}
|
||||
|
||||
reviewDetailAction(item: any) {
|
||||
this.itemInfo = {};
|
||||
this.service.request(`${this.service.$api_get_listOperate_detail}${item.id}`, {}, 'GET').subscribe(res => {
|
||||
@ -217,7 +175,6 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
|
||||
initSF() {
|
||||
this.schema = {
|
||||
properties: {
|
||||
_$expand: { type: 'boolean', ui: { hidden: true } },
|
||||
exceptionCode: {
|
||||
type: 'string',
|
||||
title: '异常编号',
|
||||
@ -259,9 +216,6 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
|
||||
},
|
||||
change: (q: any) => {
|
||||
this.getRegionCode(q);
|
||||
},
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value
|
||||
}
|
||||
} as SFSelectWidgetSchema
|
||||
},
|
||||
@ -270,29 +224,16 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
|
||||
title: '所属项目',
|
||||
ui: {
|
||||
widget: 'select',
|
||||
placeholder: '请先选择货主',
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value
|
||||
}
|
||||
placeholder: '请先选择货主'
|
||||
} as SFSelectWidgetSchema
|
||||
},
|
||||
driverName: {
|
||||
title: '承运司机',
|
||||
type: 'string',
|
||||
ui: {
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value
|
||||
}
|
||||
}
|
||||
type: 'string'
|
||||
},
|
||||
carNo: {
|
||||
title: '车牌号',
|
||||
type: 'string',
|
||||
ui: {
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value
|
||||
}
|
||||
}
|
||||
type: 'string'
|
||||
},
|
||||
reportingTime: {
|
||||
title: '上报时间',
|
||||
@ -300,10 +241,7 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
|
||||
ui: {
|
||||
widget: 'date',
|
||||
mode: 'range',
|
||||
format: 'yyyy-MM-dd',
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value
|
||||
}
|
||||
format: 'yyyy-MM-dd'
|
||||
} as SFDateWidgetSchema
|
||||
},
|
||||
enterpriseInfoId: {
|
||||
@ -312,9 +250,6 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
|
||||
ui: {
|
||||
widget: 'select',
|
||||
placeholder: '请选择',
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value
|
||||
},
|
||||
allowClear: true,
|
||||
asyncData: () => this.shipperSrv.getNetworkFreightForwarder()
|
||||
}
|
||||
@ -328,7 +263,7 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
|
||||
this.resourceStatus = e;
|
||||
setTimeout(() => {
|
||||
this?.st?.load(1);
|
||||
this?.st2?.load(1);
|
||||
this.st.resetColumns();
|
||||
}, 0);
|
||||
}
|
||||
getGoodsSourceStatistical() {
|
||||
@ -351,11 +286,9 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
|
||||
});
|
||||
}
|
||||
search() {
|
||||
if (this.selectedIndex === 0) {
|
||||
this.st?.load(1);
|
||||
} else {
|
||||
this.st2?.load(1);
|
||||
}
|
||||
console.log(this.st);
|
||||
|
||||
this.st?.load(1);
|
||||
this.getGoodsSourceStatistical();
|
||||
}
|
||||
/**
|
||||
|
||||
@ -7,24 +7,9 @@
|
||||
* @FilePath : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\bulk\\bulk.component.html
|
||||
-->
|
||||
<!-- 搜索表单 -->
|
||||
<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>
|
||||
|
||||
<!-- 查询字段大于3个时，根据展开状态调整布局 -->
|
||||
<ng-container *ngIf="queryFieldCount > 4">
|
||||
<div nz-col [nzSpan]="_$expand ? 24 : 18">
|
||||
<sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
|
||||
@ -40,32 +25,26 @@
|
||||
</div>
|
||||
</ng-container>
|
||||
</div>
|
||||
</nz-card>
|
||||
</nz-card> -->
|
||||
|
||||
<nz-card>
|
||||
<nz-tabset (nzSelectedIndexChange)="selectChange($event)">
|
||||
<nz-tab [nzTitle]="'全部(' + tabs?.totalQuantity + ')'"></nz-tab>
|
||||
<nz-tab [nzTitle]="'待发车(' + tabs?.receivedQuantity + ')'"></nz-tab>
|
||||
<nz-tab [nzTitle]="'运输中(' + tabs?.cancelQuantity + ')'"></nz-tab>
|
||||
<nz-tab [nzTitle]="'待签收(' + tabs?.signQuantity + ')'"></nz-tab>
|
||||
<nz-tab [nzTitle]="'已完成(' + tabs?.compolatelQuantity + ')'"></nz-tab>
|
||||
<nz-tab [nzTitle]="'已取消(' + tabs?.deltQuantity + ')'"></nz-tab>
|
||||
</nz-tabset>
|
||||
<div style="margin-top: 15px">
|
||||
<st
|
||||
#st
|
||||
[bordered]="true"
|
||||
[scroll]="{ x: '2000px' }"
|
||||
[data]="service.$api_get_Bulkpage"
|
||||
[columns]="columns"
|
||||
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
|
||||
[res]="{ reName: { list: 'data.records', total: 'data.total' } }"
|
||||
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
|
||||
[loading]="false"
|
||||
>
|
||||
<ng-template st-row="createUserName" let-item let-index="index">
|
||||
<div> {{ item?.createUserName }}/{{ item?.createUserPhone }} </div>
|
||||
</ng-template>
|
||||
<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?.totalQuantity + ')'"></nz-tab>
|
||||
<nz-tab [nzTitle]="'待发车(' + tabs?.receivedQuantity + ')'"></nz-tab>
|
||||
<nz-tab [nzTitle]="'运输中(' + tabs?.cancelQuantity + ')'"></nz-tab>
|
||||
<nz-tab [nzTitle]="'待签收(' + tabs?.signQuantity + ')'"></nz-tab>
|
||||
<nz-tab [nzTitle]="'已完成(' + tabs?.compolatelQuantity + ')'"></nz-tab>
|
||||
<nz-tab [nzTitle]="'已取消(' + tabs?.deltQuantity + ')'"></nz-tab>
|
||||
</nz-tabset>
|
||||
</div>
|
||||
<div>
|
||||
<st #st [bordered]="true" [scroll]="{ x: '2000px',y:scrollY }" [data]="service.$api_get_Bulkpage" [columns]="columns"
|
||||
[req]="{ params: reqParams }" [page]="{ }" [loading]="false">
|
||||
<ng-template st-row="createUserName" let-item let-index="index">
|
||||
<div> {{ item?.createUserName }}/{{ item?.createUserPhone }} </div>
|
||||
</ng-template>
|
||||
<ng-template st-row="driverName" let-item let-index="index">
|
||||
<div> {{ item?.driverName }}/{{ item?.driverTelephone }}/{{ item?.driverLicenseCarNo }} </div>
|
||||
</ng-template>
|
||||
@ -78,7 +57,7 @@
|
||||
<span>{{item?.wayBillStatusLabel}}</span>
|
||||
</div>
|
||||
<div>
|
||||
<span >{{item?.resourceTypeLabel}}{{item?.serviceTypeLabel}}</span>
|
||||
<span>{{item?.resourceTypeLabel}}{{item?.serviceTypeLabel}}</span>
|
||||
</div>
|
||||
</ng-template>
|
||||
<ng-template st-row="freightPrice" let-item let-index="index">
|
||||
@ -98,7 +77,8 @@
|
||||
</ng-template>
|
||||
<ng-template st-row="goodsInfos" let-item let-index="index">
|
||||
<div>{{ item?.goodsInfos?.goodsName }}</div>
|
||||
<div>{{ item?.goodsInfos?.weight }}{{ item?.goodsInfos?.volume? '/' +item?.goodsInfos?.volume : '' }}{{ item?.goodsInfos?.number ? '/' + item?.goodsInfos?.number : '' }}</div>
|
||||
<div>{{ item?.goodsInfos?.weight }}{{ item?.goodsInfos?.volume? '/' +item?.goodsInfos?.volume : '' }}{{
|
||||
item?.goodsInfos?.number ? '/' + item?.goodsInfos?.number : '' }}</div>
|
||||
</ng-template>
|
||||
<ng-template st-row="loadingTime" let-item let-index="index">
|
||||
<div *ngIf="item?.loadingTime">装 | {{ item?.loadingTime }}</div>
|
||||
@ -107,3 +87,11 @@
|
||||
</st>
|
||||
</div>
|
||||
</nz-card>
|
||||
|
||||
<ng-template #extraTemplate>
|
||||
<div class="mr-sm">
|
||||
<button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()" acl
|
||||
[acl-ability]="['WAYBILL-BULK-search']">筛选</button>
|
||||
<button nz-button nzDanger acl [acl-ability]="['WAYBILL-BULK-export']" (click)="exprot()">导出</button>
|
||||
</div>
|
||||
</ng-template>
|
||||
@ -2,29 +2,24 @@ import { Component, OnInit, ViewChild } from '@angular/core';
|
||||
import { STColumn, STComponent } 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 { BasicTableComponent } from 'src/app/routes/commom';
|
||||
import { VehicleSureArriveComponent } from 'src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component';
|
||||
import { VehicleSureDepartComponent } from 'src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component';
|
||||
import { WaybillManagementServe } from '../../services/waybill-management.service';
|
||||
|
||||
|
||||
@Component({
|
||||
selector: 'app-supply-management-bulk',
|
||||
templateUrl: './bulk.component.html',
|
||||
styleUrls: ['./bulk.component.less']
|
||||
styleUrls: ['../../../commom/less/commom-table.less','./bulk.component.less']
|
||||
})
|
||||
export class WaybillManagementBulkComponent implements OnInit {
|
||||
ui: SFUISchema = {};
|
||||
export class WaybillManagementBulkComponent extends BasicTableComponent implements OnInit {
|
||||
uiView: SFUISchema = {};
|
||||
schema: SFSchema = {};
|
||||
schemaView: SFSchema = {};
|
||||
isVisibleEvaluate = false;
|
||||
_$expand = false;
|
||||
@ViewChild('st') private readonly st!: STComponent;
|
||||
@ViewChild('sf', { static: false }) sf!: SFComponent;
|
||||
columns: STColumn[] = [];
|
||||
resourceStatus: any;
|
||||
tabs = {
|
||||
@ -38,15 +33,19 @@ export class WaybillManagementBulkComponent implements OnInit {
|
||||
constructor(
|
||||
public service: WaybillManagementServe,
|
||||
private modal: NzModalService,
|
||||
public shipperservice: ShipperBaseService) { }
|
||||
public shipperservice: ShipperBaseService,
|
||||
public searchDrawerService: SearchDrawerService
|
||||
) {
|
||||
super(searchDrawerService);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询参数
|
||||
*/
|
||||
* 查询参数
|
||||
*/
|
||||
get reqParams() {
|
||||
const a: any = {};
|
||||
if (this.resourceStatus) {
|
||||
a.wayBillStatus = this.resourceStatus
|
||||
a.wayBillStatus = this.resourceStatus;
|
||||
}
|
||||
const params: any = Object.assign({}, this.sf?.value || {});
|
||||
delete params._$expand;
|
||||
@ -55,24 +54,22 @@ export class WaybillManagementBulkComponent implements OnInit {
|
||||
...params,
|
||||
createTime: {
|
||||
start: this.sf?.value?.createTime?.[0] || '',
|
||||
end: this.sf?.value?.createTime?.[1] || '',
|
||||
},
|
||||
end: this.sf?.value?.createTime?.[1] || ''
|
||||
}
|
||||
};
|
||||
}
|
||||
get selectedRows() {
|
||||
return this.st?.list.filter((item) => item.checked) || [];
|
||||
return this.st?.list.filter(item => item.checked) || [];
|
||||
}
|
||||
ngOnInit(): void {
|
||||
this.initSF();
|
||||
this.initST();
|
||||
this.getGoodsSourceStatistical()
|
||||
this.getGoodsSourceStatistical();
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 初始化查询表单
|
||||
*/
|
||||
* 初始化查询表单
|
||||
*/
|
||||
initSF() {
|
||||
this.schema = {
|
||||
properties: {
|
||||
@ -104,68 +101,39 @@ export class WaybillManagementBulkComponent implements OnInit {
|
||||
searchDebounceTime: 300,
|
||||
searchLoadingText: '搜索中...',
|
||||
allowClear: true,
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value
|
||||
},
|
||||
onSearch: (q: any) => {
|
||||
console.log(q)
|
||||
let str =q.replace(/^\s+|\s+$/g,"");
|
||||
console.log(q);
|
||||
let str = q.replace(/^\s+|\s+$/g, '');
|
||||
if (str) {
|
||||
return this.service
|
||||
.request(this.service.$api_enterpriceList, { enterpriseName: str})
|
||||
.pipe(map((res: any) => (res as any[]).map((i) => ({ label: i.enterpriseName, value: i.id } as SFSchemaEnum))))
|
||||
.request(this.service.$api_enterpriceList, { enterpriseName: str })
|
||||
.pipe(map((res: any) => (res as any[]).map(i => ({ label: i.enterpriseName, value: i.id } as SFSchemaEnum))))
|
||||
.toPromise();
|
||||
} else {
|
||||
return of([]);
|
||||
}
|
||||
},
|
||||
|
||||
} as SFSelectWidgetSchema,
|
||||
}
|
||||
} as SFSelectWidgetSchema
|
||||
},
|
||||
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'
|
||||
},
|
||||
licenseCarNo: {
|
||||
title: '车牌号',
|
||||
type: 'string',
|
||||
ui: {
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value
|
||||
}
|
||||
}
|
||||
type: 'string'
|
||||
},
|
||||
carCaptainName: {
|
||||
title: '车队长',
|
||||
type: 'string',
|
||||
ui: {
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value,
|
||||
},
|
||||
}
|
||||
type: 'string'
|
||||
},
|
||||
paymentstatus: {
|
||||
title: '支付状态',
|
||||
@ -173,11 +141,8 @@ export class WaybillManagementBulkComponent implements OnInit {
|
||||
ui: {
|
||||
widget: 'dict-select',
|
||||
params: { dictKey: 'overall:payment:status' },
|
||||
containsAllLabel: true,
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value,
|
||||
},
|
||||
} as SFSelectWidgetSchema,
|
||||
containsAllLabel: true
|
||||
} as SFSelectWidgetSchema
|
||||
},
|
||||
serviceType: {
|
||||
title: '服务类型',
|
||||
@ -185,10 +150,7 @@ export class WaybillManagementBulkComponent implements OnInit {
|
||||
ui: {
|
||||
widget: 'dict-select',
|
||||
containsAllLabel: true,
|
||||
params: { dictKey: 'service:type' },
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value
|
||||
}
|
||||
params: { dictKey: 'service:type' }
|
||||
} as SFSelectWidgetSchema
|
||||
},
|
||||
|
||||
@ -203,11 +165,8 @@ export class WaybillManagementBulkComponent implements OnInit {
|
||||
ui: {
|
||||
widget: 'select',
|
||||
allowClear: true,
|
||||
placeholder: '请选择',
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value,
|
||||
},
|
||||
},
|
||||
placeholder: '请选择'
|
||||
}
|
||||
},
|
||||
enterpriseInfoId: {
|
||||
type: 'string',
|
||||
@ -215,12 +174,9 @@ export class WaybillManagementBulkComponent implements OnInit {
|
||||
ui: {
|
||||
widget: 'select',
|
||||
placeholder: '请选择',
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value,
|
||||
},
|
||||
allowClear: true,
|
||||
asyncData: () => this.shipperservice.getNetworkFreightForwarder(),
|
||||
},
|
||||
asyncData: () => this.shipperservice.getNetworkFreightForwarder()
|
||||
}
|
||||
},
|
||||
createTime: {
|
||||
title: '创建时间',
|
||||
@ -229,16 +185,12 @@ export class WaybillManagementBulkComponent implements OnInit {
|
||||
widget: 'date',
|
||||
mode: 'range',
|
||||
format: 'yyyy-MM-dd',
|
||||
allowClear: true,
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value,
|
||||
},
|
||||
} as SFDateWidgetSchema,
|
||||
},
|
||||
allowClear: true
|
||||
} as SFDateWidgetSchema
|
||||
}
|
||||
},
|
||||
type: 'object',
|
||||
type: 'object'
|
||||
};
|
||||
this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } };
|
||||
}
|
||||
|
||||
/**
|
||||
@ -288,15 +240,14 @@ export class WaybillManagementBulkComponent implements OnInit {
|
||||
title: '接单数量',
|
||||
index: 'orderReceivingQuantity',
|
||||
width: '200px',
|
||||
className: 'text-left',
|
||||
className: 'text-left'
|
||||
},
|
||||
{
|
||||
title: '结算数量',
|
||||
index: '结算数量',
|
||||
width: '200px',
|
||||
className: 'text-left',
|
||||
format: (item: any) =>
|
||||
`${item.settlementWeight || ''}`
|
||||
format: (item: any) => `${item.settlementWeight || ''}`
|
||||
},
|
||||
{
|
||||
title: '承运司机',
|
||||
@ -308,7 +259,7 @@ export class WaybillManagementBulkComponent implements OnInit {
|
||||
title: '车队长',
|
||||
className: 'text-left',
|
||||
width: '200px',
|
||||
render: 'payeeName',
|
||||
render: 'payeeName'
|
||||
},
|
||||
{
|
||||
title: '装卸货时间',
|
||||
@ -320,7 +271,7 @@ export class WaybillManagementBulkComponent implements OnInit {
|
||||
title: '创建时间',
|
||||
width: '180px',
|
||||
className: 'text-left',
|
||||
index: 'createTime',
|
||||
index: 'createTime'
|
||||
},
|
||||
{
|
||||
title: '操作',
|
||||
@ -330,81 +281,36 @@ export class WaybillManagementBulkComponent implements OnInit {
|
||||
buttons: [
|
||||
{
|
||||
text: '确认发车',
|
||||
click: (_record) => this.sureDepart(_record),
|
||||
click: _record => this.sureDepart(_record),
|
||||
iif: item => item.wayBillStatus == '2',
|
||||
acl: { ability: ['WAYBILL-BULK-insertBulkStartCarInfo'] },
|
||||
acl: { ability: ['WAYBILL-BULK-insertBulkStartCarInfo'] }
|
||||
},
|
||||
{
|
||||
text: '确认到车',
|
||||
click: (_record) => this.sureArrive(_record),
|
||||
click: _record => this.sureArrive(_record),
|
||||
iif: item => item.wayBillStatus == '3',
|
||||
acl: { ability: ['WAYBILL-BULK-insertBulkUnloadCarInfo'] },
|
||||
},
|
||||
],
|
||||
},
|
||||
acl: { ability: ['WAYBILL-BULK-insertBulkUnloadCarInfo'] }
|
||||
}
|
||||
]
|
||||
}
|
||||
];
|
||||
}
|
||||
search() {
|
||||
this.st?.load(1);
|
||||
this.getGoodsSourceStatistical()
|
||||
}
|
||||
/**
|
||||
* 查询字段个数
|
||||
*/
|
||||
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;
|
||||
this.getGoodsSourceStatistical();
|
||||
}
|
||||
selectChange(e: number) {
|
||||
console.log(e);
|
||||
if (e >= 1) {
|
||||
this.resourceStatus = e + 1;
|
||||
} else {
|
||||
this.resourceStatus = 0
|
||||
this.resourceStatus = 0;
|
||||
}
|
||||
this.initST();
|
||||
setTimeout(() => {
|
||||
this.st.load(1);
|
||||
}, 500);
|
||||
}
|
||||
/**
|
||||
* 导入货源
|
||||
*/
|
||||
importGoodsSource() {
|
||||
|
||||
}
|
||||
audit(item: any) {
|
||||
console.log(item)
|
||||
}
|
||||
/**
|
||||
* 审核通过按钮
|
||||
*/
|
||||
handleOK() {
|
||||
|
||||
}
|
||||
/**
|
||||
*查看评价
|
||||
*/
|
||||
viewEvaluate(item: any) {
|
||||
console.log(item)
|
||||
this.isVisibleEvaluate = true
|
||||
}
|
||||
|
||||
getGoodsSourceStatistical() {
|
||||
this.tabs = {
|
||||
signQuantity: 0,
|
||||
@ -415,7 +321,7 @@ export class WaybillManagementBulkComponent implements OnInit {
|
||||
deltQuantity: 0
|
||||
};
|
||||
const params: any = Object.assign({}, this.reqParams || {});
|
||||
delete params.wayBillStatus
|
||||
delete params.wayBillStatus;
|
||||
this.service.request(this.service.$api_get_getBulkStatistics, params).subscribe(res => {
|
||||
if (res) {
|
||||
let totalCount = 0;
|
||||
@ -437,11 +343,11 @@ export class WaybillManagementBulkComponent implements OnInit {
|
||||
this.tabs.deltQuantity = ele?.count;
|
||||
break;
|
||||
}
|
||||
totalCount += ele.count
|
||||
totalCount += ele.count;
|
||||
});
|
||||
this.tabs.totalQuantity = totalCount
|
||||
this.tabs.totalQuantity = totalCount;
|
||||
}
|
||||
})
|
||||
});
|
||||
}
|
||||
// *确认发车
|
||||
|
||||
@ -458,7 +364,7 @@ export class WaybillManagementBulkComponent implements OnInit {
|
||||
});
|
||||
modalRef.afterClose.subscribe((result: any) => {
|
||||
this.st.load(1);
|
||||
this.getGoodsSourceStatistical()
|
||||
this.getGoodsSourceStatistical();
|
||||
});
|
||||
}
|
||||
// 确认到车
|
||||
@ -475,11 +381,11 @@ export class WaybillManagementBulkComponent implements OnInit {
|
||||
});
|
||||
modalRef.afterClose.subscribe((result: any) => {
|
||||
this.st.load(1);
|
||||
this.getGoodsSourceStatistical()
|
||||
this.getGoodsSourceStatistical();
|
||||
});
|
||||
}
|
||||
// 导出
|
||||
exprot() {
|
||||
this.service.exportStart(this.reqParams,this.service.$api_asyncExportBulkList)
|
||||
}
|
||||
// 导出
|
||||
exprot() {
|
||||
this.service.exportStart(this.reqParams, this.service.$api_asyncExportBulkList);
|
||||
}
|
||||
}
|
||||
|
||||
@ -7,31 +7,18 @@
|
||||
* @FilePath : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\vehicle\\vehicle.component.html
|
||||
-->
|
||||
<!-- 搜索表单 -->
|
||||
<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>
|
||||
|
||||
<!-- 查询字段大于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]="['WAYBILL-VEHICLE-search']">查询</button>
|
||||
<button nz-button nzType="primary" [disabled]="false" acl [acl-ability]="['WAYBILL-VEHICLE-export']" (click)="exprot()">导出</button>
|
||||
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="search()" acl
|
||||
[acl-ability]="['WAYBILL-VEHICLE-search']">查询</button>
|
||||
<button nz-button nzType="primary" [disabled]="false" acl [acl-ability]="['WAYBILL-VEHICLE-export']"
|
||||
(click)="exprot()">导出</button>
|
||||
<button nz-button [disabled]="false" (click)="resetSF()">重置</button>
|
||||
<button nz-button nzType="link" (click)="expandToggle()">
|
||||
{{ !_$expand ? '展开' : '收起' }}
|
||||
@ -40,36 +27,32 @@
|
||||
</div>
|
||||
</ng-container>
|
||||
</div>
|
||||
</nz-card>
|
||||
</nz-card> -->
|
||||
|
||||
<nz-card>
|
||||
<nz-tabset (nzSelectedIndexChange)="selectChange($event)">
|
||||
<nz-tab [nzTitle]="'全部(' + tabs?.totalQuantity + ')'"></nz-tab>
|
||||
<nz-tab [nzTitle]="'待接单(' + tabs?.stayQuantity + ')'"></nz-tab>
|
||||
<nz-tab [nzTitle]="'待发车(' + tabs?.receivedQuantity + ')'"></nz-tab>
|
||||
<nz-tab [nzTitle]="'运输中(' + tabs?.cancelQuantity + ')'"></nz-tab>
|
||||
<nz-tab [nzTitle]="'待签收(' + tabs?.signQuantity + ')'"></nz-tab>
|
||||
<nz-tab [nzTitle]="'已完成(' + tabs?.compolatelQuantity + ')'"></nz-tab>
|
||||
<nz-tab [nzTitle]="'已取消(' + tabs?.deltQuantity + ')'"></nz-tab>
|
||||
</nz-tabset>
|
||||
<div style="margin-top: 15px">
|
||||
<st
|
||||
#st
|
||||
[bordered]="true"
|
||||
[scroll]="{ x: '2000px' }"
|
||||
[data]="service.$api_get_wholePage"
|
||||
[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]="'全部(' + tabs?.totalQuantity + ')'"></nz-tab>
|
||||
<nz-tab [nzTitle]="'待接单(' + tabs?.stayQuantity + ')'"></nz-tab>
|
||||
<nz-tab [nzTitle]="'待发车(' + tabs?.receivedQuantity + ')'"></nz-tab>
|
||||
<nz-tab [nzTitle]="'运输中(' + tabs?.cancelQuantity + ')'"></nz-tab>
|
||||
<nz-tab [nzTitle]="'待签收(' + tabs?.signQuantity + ')'"></nz-tab>
|
||||
<nz-tab [nzTitle]="'已完成(' + tabs?.compolatelQuantity + ')'"></nz-tab>
|
||||
<nz-tab [nzTitle]="'已取消(' + tabs?.deltQuantity + ')'"></nz-tab>
|
||||
</nz-tabset>
|
||||
</div>
|
||||
<div>
|
||||
<st #st [bordered]="true" [scroll]="{ x: '2000px',y:scrollY }" [data]="service.$api_get_wholePage" [columns]="columns"
|
||||
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
|
||||
[res]="{ reName: { list: 'data.records', total: 'data.total' } }"
|
||||
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
|
||||
[loading]="false"
|
||||
>
|
||||
<ng-template st-row="createUserName" let-item let-index="index">
|
||||
<div> {{ item?.createUserName }}/{{ item?.createUserPhone }} </div>
|
||||
</ng-template>
|
||||
<ng-template st-row="createUserName" let-item let-index="index">
|
||||
<div> {{ item?.createUserName }}/{{ item?.createUserPhone }} </div>
|
||||
</ng-template>
|
||||
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" [loading]="false">
|
||||
<ng-template st-row="createUserName" let-item let-index="index">
|
||||
<div> {{ item?.createUserName }}/{{ item?.createUserPhone }} </div>
|
||||
</ng-template>
|
||||
<ng-template st-row="createUserName" let-item let-index="index">
|
||||
<div> {{ item?.createUserName }}/{{ item?.createUserPhone }} </div>
|
||||
</ng-template>
|
||||
<ng-template st-row="driverName" let-item let-index="index">
|
||||
<div> {{ item?.driverName }}/{{ item?.driverTelephone }}/{{ item?.driverLicenseCarNo }} </div>
|
||||
</ng-template>
|
||||
@ -95,7 +78,7 @@
|
||||
<span>{{item?.wayBillStatusLabel}}</span>
|
||||
</div>
|
||||
<div>
|
||||
<span >{{item?.resourceTypeLabel}}{{item?.serviceTypeLabel}}</span>
|
||||
<span>{{item?.resourceTypeLabel}}{{item?.serviceTypeLabel}}</span>
|
||||
</div>
|
||||
</ng-template>
|
||||
<ng-template st-row="wayBill" let-item let-index="index">
|
||||
@ -103,7 +86,8 @@
|
||||
</ng-template>
|
||||
<ng-template st-row="goodsInfos" let-item let-index="index">
|
||||
<div>{{ item?.goodsInfos?.goodsName }}</div>
|
||||
<div>{{ item?.goodsInfos?.weight }}{{ item?.goodsInfos?.volume? '/' +item?.goodsInfos?.volume : '' }}{{ item?.goodsInfos?.number ? '/' + item?.goodsInfos?.number : '' }}</div>
|
||||
<div>{{ item?.goodsInfos?.weight }}{{ item?.goodsInfos?.volume? '/' +item?.goodsInfos?.volume : '' }}{{
|
||||
item?.goodsInfos?.number ? '/' + item?.goodsInfos?.number : '' }}</div>
|
||||
</ng-template>
|
||||
<ng-template st-row="loadingTime" let-item let-index="index">
|
||||
<div *ngIf="item?.loadingTime">装 | {{ item?.loadingTime }}</div>
|
||||
@ -112,3 +96,11 @@
|
||||
</st>
|
||||
</div>
|
||||
</nz-card>
|
||||
|
||||
<ng-template #extraTemplate>
|
||||
<div class="mr-sm">
|
||||
<button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()" acl
|
||||
[acl-ability]="['WAYBILL-VEHICLE-search']">筛选</button>
|
||||
<button nz-button nzDanger acl [acl-ability]="['WAYBILL-VEHICLE-export']" (click)="exprot()">导出</button>
|
||||
</div>
|
||||
</ng-template>
|
||||
@ -2,11 +2,12 @@ import { Component, OnInit, ViewChild } from '@angular/core';
|
||||
import { STColumn, STComponent } 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 { NzUploadChangeParam } from 'ng-zorro-antd/upload';
|
||||
import { of } from 'rxjs';
|
||||
import { map } from 'rxjs/operators';
|
||||
import { BasicTableComponent } from 'src/app/routes/commom';
|
||||
import { VehicleSureArriveComponent } from 'src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component';
|
||||
import { VehicleSureDepartComponent } from 'src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component';
|
||||
import { WaybillManagementServe } from '../../services/waybill-management.service';
|
||||
@ -14,17 +15,13 @@ import { WaybillManagementServe } from '../../services/waybill-management.servic
|
||||
@Component({
|
||||
selector: 'app-supply-management-vehicle',
|
||||
templateUrl: './vehicle.component.html',
|
||||
styleUrls: ['./vehicle.component.less', '../../../commom/less/expend-but.less', '../../../commom/less/box.less']
|
||||
styleUrls: ['../../../commom/less/commom-table.less', './vehicle.component.less']
|
||||
})
|
||||
export class WaybillManagementVehicleComponent implements OnInit {
|
||||
ui: SFUISchema = {};
|
||||
schema: SFSchema = {};
|
||||
export class WaybillManagementVehicleComponent extends BasicTableComponent implements OnInit {
|
||||
isVisibleEvaluate = false;
|
||||
isVisible = false;
|
||||
_$expand = false;
|
||||
resourceStatus: any;
|
||||
@ViewChild('st') private readonly st!: STComponent;
|
||||
@ViewChild('sf', { static: false }) sf!: SFComponent;
|
||||
columns: STColumn[] = [];
|
||||
tabs = {
|
||||
signQuantity: 0,
|
||||
@ -35,7 +32,14 @@ export class WaybillManagementVehicleComponent implements OnInit {
|
||||
compolatelQuantity: 0,
|
||||
deltQuantity: 0
|
||||
};
|
||||
constructor(public service: WaybillManagementServe, private modal: NzModalService, public shipperservice: ShipperBaseService) {}
|
||||
constructor(
|
||||
public service: WaybillManagementServe,
|
||||
private modal: NzModalService,
|
||||
public shipperservice: ShipperBaseService,
|
||||
public searchDrawerService: SearchDrawerService
|
||||
) {
|
||||
super(searchDrawerService);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询参数
|
||||
@ -99,9 +103,6 @@ export class WaybillManagementVehicleComponent implements OnInit {
|
||||
searchDebounceTime: 300,
|
||||
searchLoadingText: '搜索中...',
|
||||
allowClear: true,
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value
|
||||
},
|
||||
onSearch: (q: any) => {
|
||||
let str = q.replace(/^\s+|\s+$/g, '');
|
||||
if (str) {
|
||||
@ -123,57 +124,29 @@ export class WaybillManagementVehicleComponent implements OnInit {
|
||||
title: '所属项目',
|
||||
ui: {
|
||||
widget: 'select',
|
||||
placeholder: '请先选择货主',
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value
|
||||
}
|
||||
placeholder: '请先选择货主'
|
||||
} as SFSelectWidgetSchema
|
||||
},
|
||||
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'
|
||||
},
|
||||
licenseCarNo: {
|
||||
title: '车牌号',
|
||||
type: 'string',
|
||||
ui: {
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value
|
||||
}
|
||||
}
|
||||
type: 'string'
|
||||
},
|
||||
carCaptainName: {
|
||||
title: '车队长',
|
||||
type: 'string',
|
||||
ui: {
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value
|
||||
}
|
||||
}
|
||||
type: 'string'
|
||||
},
|
||||
paymentstatus: {
|
||||
title: '支付状态',
|
||||
@ -181,10 +154,7 @@ export class WaybillManagementVehicleComponent implements OnInit {
|
||||
ui: {
|
||||
widget: 'dict-select',
|
||||
params: { dictKey: 'overall:payment:status' },
|
||||
containsAllLabel: true,
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value
|
||||
}
|
||||
containsAllLabel: true
|
||||
} as SFSelectWidgetSchema
|
||||
},
|
||||
serviceType: {
|
||||
@ -193,10 +163,7 @@ export class WaybillManagementVehicleComponent implements OnInit {
|
||||
ui: {
|
||||
widget: 'dict-select',
|
||||
containsAllLabel: true,
|
||||
params: { dictKey: 'service:type' },
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value
|
||||
}
|
||||
params: { dictKey: 'service:type' }
|
||||
} as SFSelectWidgetSchema
|
||||
},
|
||||
|
||||
@ -211,10 +178,7 @@ export class WaybillManagementVehicleComponent implements OnInit {
|
||||
ui: {
|
||||
widget: 'select',
|
||||
placeholder: '请选择',
|
||||
allowClear: true,
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value
|
||||
}
|
||||
allowClear: true
|
||||
}
|
||||
},
|
||||
enterpriseInfoId: {
|
||||
@ -223,9 +187,6 @@ export class WaybillManagementVehicleComponent implements OnInit {
|
||||
ui: {
|
||||
widget: 'select',
|
||||
placeholder: '请选择',
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value
|
||||
},
|
||||
allowClear: true,
|
||||
asyncData: () => this.shipperservice.getNetworkFreightForwarder()
|
||||
}
|
||||
@ -237,16 +198,12 @@ export class WaybillManagementVehicleComponent 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 } } };
|
||||
}
|
||||
// 获取城市列表
|
||||
getRegionCode(regionCode: any) {
|
||||
@ -364,29 +321,9 @@ export class WaybillManagementVehicleComponent 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) {
|
||||
console.log(item);
|
||||
}
|
||||
/**
|
||||
* 重置表单
|
||||
*/
|
||||
resetSF(): void {
|
||||
this.sf.reset();
|
||||
this._$expand = false;
|
||||
}
|
||||
search() {
|
||||
this.st?.load(1);
|
||||
this.getGoodsSourceStatistical();
|
||||
|
||||
@ -41,6 +41,7 @@ export class SearchDrawerComponent implements OnInit, AfterViewInit {
|
||||
|
||||
resetSF(): void {
|
||||
this.sf.reset();
|
||||
this.defaultValue = {};
|
||||
}
|
||||
|
||||
search() {
|
||||
|
||||
@ -26,6 +26,9 @@ export class ShipperBaseService extends BaseService {
|
||||
|
||||
// 获取货主企业列表
|
||||
public $api_enterpriceList = '/api/mdc/cuc/enterpriseInfo/operate/enterpriceList';
|
||||
|
||||
// 合伙人下拉列表
|
||||
public $api_partner_lists = '/api/mdc/partner/list';
|
||||
// 批量获取项目信息
|
||||
public $api_get_project_list = '/api/mdc/cuc/enterpriseProject/getProjectList';
|
||||
constructor(public injector: Injector) {
|
||||
@ -146,19 +149,19 @@ export class ShipperBaseService extends BaseService {
|
||||
);
|
||||
}
|
||||
/**
|
||||
* 获取网络货运人
|
||||
* 合伙人下拉列表
|
||||
* @returns
|
||||
*/
|
||||
getNetworkEnterpriseName(params = {}, containerAll = false) {
|
||||
return this.request(this.$api_get_network_freight_forwarder_list, params).pipe(
|
||||
return this.request(this.$api_partner_lists, params).pipe(
|
||||
map((res: any) => {
|
||||
if (!res) {
|
||||
return [];
|
||||
}
|
||||
const list = res.map((item: any) => {
|
||||
return {
|
||||
label: item.enterpriseName,
|
||||
value: item.enterpriseName
|
||||
label: item.keyword,
|
||||
value: item.id
|
||||
};
|
||||
});
|
||||
const obj = [];
|
||||
@ -174,15 +177,15 @@ export class ShipperBaseService extends BaseService {
|
||||
* @returns
|
||||
*/
|
||||
getNetworkenterpriceIds(params = {}, containerAll = false) {
|
||||
return this.request(this.$api_get_network_freight_forwarder_list, params).pipe(
|
||||
return this.request(this.$api_partner_lists, params).pipe(
|
||||
map((res: any) => {
|
||||
if (!res) {
|
||||
return [];
|
||||
}
|
||||
const list = res.map((item: any) => {
|
||||
return {
|
||||
label: item.enterpriseName,
|
||||
value: item.enterpriseName
|
||||
label: item.contactName + '/' + item.contactMobile,
|
||||
value: item.id
|
||||
};
|
||||
});
|
||||
const obj = [];
|
||||
|
||||
Reference in New Issue
Block a user