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

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

Browse Source
This commit is contained in:
wangshiming
2022-01-10 16:48:53 +08:00
parent d0f2b30d5b fb3a88fd4e
commit 5aaf422d54
8 changed files with 72 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/routes/sys-setting/components/staff-management/staff-modal/staff-modal.component.ts
View File

@ -62,7 +62,7 @@ export class SystemStaffStaffModalComponent implements OnInit {
default: staff?.roleId || null default: staff?.roleId || null
} }
}, },
required: ['staffName', 'telephone'] required: ['staffName', 'telephone', 'roleId']
}; };
this.ui = { this.ui = {
'*': { '*': {

4
src/app/routes/ticket-management/components/etc-blacklist/add-cart/add-cart.component.html
View File

@ -7,9 +7,9 @@
<button nz-button (click)="resetSF()">重置</button> <button nz-button (click)="resetSF()">重置</button>
</div> </div>
<st #st [data]="service.$mock_url" [columns]="columns" bordered size="small" <st #st [data]="service.$api_get_etc_cart_list" [columns]="columns" bordered size="small"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, process: beforeReq }" [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, process: beforeReq }"
[res]="{ reName: { list: 'data.records', total: 'data.total' } }" [res]="{ reName: { list: 'data.records', total: 'data.total' }, process: afterRes }"
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100] }" [loading]="service.http.loading" [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100] }" [loading]="service.http.loading"
[scroll]="{ x:'650px',y: '400px' }" (change)="stChange($event)"></st> [scroll]="{ x:'650px',y: '400px' }" (change)="stChange($event)"></st>
</div> </div>

16
src/app/routes/ticket-management/components/etc-blacklist/add-cart/add-cart.component.ts
View File

@ -7,7 +7,7 @@ import { TicketService } from '../../../services/ticket.service';
@Component({ @Component({
selector: 'app-add-cart', selector: 'app-add-cart',
templateUrl: './add-cart.component.html', templateUrl: './add-cart.component.html'
}) })
export class AddCartComponent implements OnInit { export class AddCartComponent implements OnInit {
data = []; data = [];
@ -18,25 +18,25 @@ export class AddCartComponent implements OnInit {
sf!: SFComponent; sf!: SFComponent;
columns: STColumn[] = [ columns: STColumn[] = [
{ title: '', index: 'key', type: 'checkbox' }, { title: '', index: 'key', type: 'checkbox' },
{ title: '车牌号', index: 'no' }, { title: '车牌号', index: 'carNo' },
{ title: '车辆所有人', index: 'callNo' } { title: '车辆所有人', index: 'carOwner' }
]; ];
searchSchema: SFSchema = { searchSchema: SFSchema = {
properties: { properties: {
params1: { carNo: {
title: '', title: '',
type: 'string', type: 'string',
ui: { ui: {
placeholder: '请输入车牌号' placeholder: '请输入车牌号'
} }
}, },
params2: { carOwner: {
title: '', title: '',
type: 'string', type: 'string',
ui: { ui: {
placeholder: '请输入车辆所有人' placeholder: '请输入车辆所有人'
} }
}, }
} }
}; };
@ -53,6 +53,10 @@ export class AddCartComponent implements OnInit {
return requestOptions; return requestOptions;
}; };
afterRes = (data: any[], rawData?: any) => {
return data.map(item => ({ ...item, disabled: item.isWhiteList }));
};
stChange(e: STChange): void { stChange(e: STChange): void {
switch (e.type) { switch (e.type) {
case 'checkbox': case 'checkbox':

2
src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.html
View File

@ -31,7 +31,7 @@
<a *ngIf="selectedRows.length > 0" (click)="st.clearCheck()" class="ml-lg">清空</a> <a *ngIf="selectedRows.length > 0" (click)="st.clearCheck()" class="ml-lg">清空</a>
</div> </div>
</div> </div>
<st #st [data]="service.$api_get_etc_shipper_list" [columns]="columns" <st #st [data]="tabType===1?service.$api_get_etc_shipper_list:service.$api_get_etc_cart_page" [columns]="columns"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, process: beforeReq }" [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, process: beforeReq }"
[res]="{ reName: { list: 'data.records', total: 'data.total' } }" [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"

31
src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.ts
View File

@ -1,4 +1,4 @@
import { Component, OnInit, ViewChild } from '@angular/core'; import { ChangeDetectionStrategy, Component, OnInit, ViewChild } from '@angular/core';
import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st'; import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st';
import { SFComponent, SFSchema } from '@delon/form'; import { SFComponent, SFSchema } from '@delon/form';
import { NzModalService } from 'ng-zorro-antd/modal'; import { NzModalService } from 'ng-zorro-antd/modal';
@ -10,7 +10,8 @@ import { AddOwnerComponent } from './add-owner/add-owner.component';
@Component({ @Component({
selector: 'app-etc-blacklist', selector: 'app-etc-blacklist',
templateUrl: './etc-blacklist.component.html', templateUrl: './etc-blacklist.component.html',
styleUrls: ['../../../commom/less/box.less', './etc-blacklist.component.less'] styleUrls: ['../../../commom/less/box.less', './etc-blacklist.component.less'],
changeDetection: ChangeDetectionStrategy.OnPush
}) })
export class ETCBlacklistComponent implements OnInit { export class ETCBlacklistComponent implements OnInit {
@ViewChild('st', { static: true }) @ViewChild('st', { static: true })
@ -59,7 +60,7 @@ export class ETCBlacklistComponent implements OnInit {
setTimeout(() => { setTimeout(() => {
this.tabs.forEach(i => (i.isActived = false)); this.tabs.forEach(i => (i.isActived = false));
item.isActived = !item.isActived; item.isActived = !item.isActived;
this.st.load(1); // this.st.load(1);
this.st.resetColumns(); this.st.resetColumns();
}, 500); }, 500);
} }
@ -116,7 +117,19 @@ export class ETCBlacklistComponent implements OnInit {
nzWidth: 700, nzWidth: 700,
nzComponentParams: { data: [] }, nzComponentParams: { data: [] },
nzOnOk: com => { nzOnOk: com => {
console.log(com.selectedData); if (com.selectedData?.length <= 0) {
this.service.msgSrv.warning('请选择车辆');
return false;
}
const ids = com.selectedData.map(node => node.carId);
this.service.request(this.service.$api_save_etc_shipper, { carIds: ids }).subscribe(res => {
if (res) {
this.service.msgSrv.success('添加成功');
modal.destroy();
this.st.load(1);
}
});
return false;
} }
}); });
modal.afterClose.subscribe(res => { modal.afterClose.subscribe(res => {
@ -148,14 +161,16 @@ export class ETCBlacklistComponent implements OnInit {
if (res) { if (res) {
this.service.msgSrv.success('删除成功'); this.service.msgSrv.success('删除成功');
this.st.load(1); this.st.load(1);
this.selectedRows = [];
modal.destroy(); modal.destroy();
} }
}); });
} else { } else {
this.service.request(this.service.$api_delete_etc_shipper, ids).subscribe(res => { this.service.request(this.service.$api_delete_etc_cart, ids).subscribe(res => {
if (res) { if (res) {
this.service.msgSrv.success('删除成功'); this.service.msgSrv.success('删除成功');
this.st.load(1); this.st.load(1);
this.selectedRows = [];
modal.destroy(); modal.destroy();
} }
}); });
@ -250,7 +265,7 @@ export class ETCBlacklistComponent implements OnInit {
{ title: '', index: 'key', type: 'checkbox' }, { title: '', index: 'key', type: 'checkbox' },
{ title: '企业名称', index: 'shipperAppUserName', iif: () => this.tabType === 1 }, { title: '企业名称', index: 'shipperAppUserName', iif: () => this.tabType === 1 },
{ title: '联系人姓名', index: 'contactName', iif: () => this.tabType === 1 }, { title: '联系人姓名', index: 'contactName', iif: () => this.tabType === 1 },
{ title: '联系人手机号', index: 'contactPhoneNumber' }, { title: '联系人手机号', index: 'contactPhoneNumber', iif: () => this.tabType === 1 },
{ {
title: '认证状态', title: '认证状态',
className: 'text-center', className: 'text-center',
@ -259,8 +274,8 @@ export class ETCBlacklistComponent implements OnInit {
enum: { 1: '未上传', 0: '草稿', 10: '待审核', 20: '已审核', 30: '已驳回', 40: '证件过期' }, enum: { 1: '未上传', 0: '草稿', 10: '待审核', 20: '已审核', 30: '已驳回', 40: '证件过期' },
iif: () => this.tabType === 1 iif: () => this.tabType === 1
}, },
{ title: '车牌号', index: 'no', iif: () => this.tabType === 2 }, { title: '车牌号', index: 'carNo', iif: () => this.tabType === 2 },
{ title: '车辆所有人', index: 'no', iif: () => this.tabType === 2 }, { title: '车辆所有人', index: 'carOwner', iif: () => this.tabType === 2 },
{ title: '创建者', index: 'createUserIdLabel' }, { title: '创建者', index: 'createUserIdLabel' },
{ {
title: '创建时间', title: '创建时间',

6
src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.html
View File

@ -32,16 +32,16 @@
</div> </div>
</div> </div>
<st #st [data]="service.$mock_url" [columns]="columns" <st #st [data]="service.$api_get_apply_invoice_page" [columns]="columns"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, process: beforeReq }" [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, process: beforeReq }"
[res]="{ reName: { list: 'data.records', total: 'data.total' } }" [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
[loading]="service.http.loading" [scroll]="{ x:'1200px',y: '370px' }" (change)="stChange($event)"> [loading]="service.http.loading" [scroll]="{ x:'1200px',y: '370px' }" (change)="stChange($event)">
<ng-template st-row="call1No" let-item let-index="index" let-column="column"> <ng-template st-row="call1No" let-item let-index="index" let-column="column">
张三<br>13812345678 {{item.driverName}}<br>{{item.driverTelephone}}
</ng-template> </ng-template>
<ng-template st-row="call1N2o" let-item let-index="index" let-column="column"> <ng-template st-row="call1N2o" let-item let-index="index" let-column="column">
粤B88888<br>张三 {{item.licenseCarNo}}<br> {{item.licenseBelonging}}
</ng-template> </ng-template>
</st> </st>
</nz-card> </nz-card>

42
src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.ts
View File

@ -80,7 +80,7 @@ export class ETCInvoicedRequestedComponent implements OnInit {
hidden: true hidden: true
} }
}, },
orderSn: { wayBillCode: {
type: 'string', type: 'string',
title: '运单号', title: '运单号',
ui: { ui: {
@ -88,7 +88,7 @@ export class ETCInvoicedRequestedComponent implements OnInit {
placeholder: '请输入' placeholder: '请输入'
} }
}, },
orderS2n: { billCode: {
type: 'string', type: 'string',
title: '订单号', title: '订单号',
ui: { ui: {
@ -96,7 +96,7 @@ export class ETCInvoicedRequestedComponent implements OnInit {
placeholder: '请输入' placeholder: '请输入'
} }
}, },
order2S2n: { billType: {
type: 'string', type: 'string',
title: '订单类型', title: '订单类型',
ui: { ui: {
@ -105,7 +105,7 @@ export class ETCInvoicedRequestedComponent implements OnInit {
placeholder: '请选择' placeholder: '请选择'
} }
}, },
orderSn1: { driverName: {
type: 'string', type: 'string',
title: '司机姓名', title: '司机姓名',
ui: { ui: {
@ -115,7 +115,7 @@ export class ETCInvoicedRequestedComponent implements OnInit {
} }
} }
}, },
ord0erSn1: { driverPhone: {
type: 'string', type: 'string',
title: '司机手机', title: '司机手机',
ui: { ui: {
@ -125,7 +125,7 @@ export class ETCInvoicedRequestedComponent implements OnInit {
} }
} }
}, },
orderSn2: { licenseCarNo: {
type: 'string', type: 'string',
title: '车牌号', title: '车牌号',
ui: { ui: {
@ -135,7 +135,7 @@ export class ETCInvoicedRequestedComponent implements OnInit {
} }
} }
}, },
orderS1n2: { licenseBelonging: {
type: 'string', type: 'string',
title: '车辆所有人', title: '车辆所有人',
ui: { ui: {
@ -145,7 +145,7 @@ export class ETCInvoicedRequestedComponent implements OnInit {
} }
} }
}, },
orderS3: { dischargePlace: {
type: 'string', type: 'string',
title: '卸货地', title: '卸货地',
ui: { ui: {
@ -156,7 +156,7 @@ export class ETCInvoicedRequestedComponent implements OnInit {
} }
} }
}, },
orderSn4: { loadingPlace: {
type: 'string', type: 'string',
title: '装货地', title: '装货地',
ui: { ui: {
@ -167,7 +167,7 @@ export class ETCInvoicedRequestedComponent implements OnInit {
} }
} }
}, },
orderSn5: { shipperId: {
type: 'string', type: 'string',
title: '托运人', title: '托运人',
enum: [{ label: '全部', value: '全部' }], enum: [{ label: '全部', value: '全部' }],
@ -200,19 +200,19 @@ export class ETCInvoicedRequestedComponent implements OnInit {
private initST(): STColumn[] { private initST(): STColumn[] {
return [ return [
{ title: '', index: 'key', type: 'checkbox' }, { title: '', index: 'key', type: 'checkbox' },
{ title: '运单号', index: 'no' }, { title: '运单号', index: 'wayBillCode' },
{ title: '订单号', index: 'no' }, { title: '订单号', index: 'billCode' },
{ title: '订单类型', index: 'no' }, { title: '订单类型', index: 'billType' },
{ title: '装货地', index: 'callNo' }, { title: '装货地', index: 'loadingPlace' },
{ title: '卸货地', index: 'callNo' }, { title: '卸货地', index: 'dischargePlace' },
{ title: '司机信息', render: 'call1No' }, { title: '司机信息', render: 'call1No' },
{ title: '车辆信息', render: 'call1N2o' }, { title: '车辆信息', render: 'call1N2o' },
{ title: '托运人', index: 'callNo' }, { title: '托运人', index: 'shipperAppUserName' },
{ title: '网络货运人', index: 'callNo' }, { title: '网络货运人', index: 'enterpriseInfoName' },
{ title: '接单时间', index: 'updatedAt', type: 'date' }, { title: '接单时间', index: 'orderReceivingTime', type: 'date' },
{ title: '装货时间', index: 'updatedAt', type: 'date' }, { title: '装货时间', index: 'shipperAppUserName', type: 'date' },
{ title: '卸货时间', index: 'updatedAt', type: 'date' }, { title: '卸货时间', index: 'unloadingTime', type: 'date' },
{ title: '签收时间', index: 'updatedAt', type: 'date' } { title: '签收时间', index: 'submissionTime', type: 'date' }
]; ];
} }
} }

11
src/app/routes/ticket-management/services/ticket.service.ts
View File

@ -55,6 +55,17 @@ export class TicketService extends ShipperBaseService {
$api_save_etc_shipper = '/api/fcc/ficoShipperWhiteList/save'; $api_save_etc_shipper = '/api/fcc/ficoShipperWhiteList/save';
// 查询ETC企业列表 // 查询ETC企业列表
$api_get_etc_list = '/api/mdc/cuc/enterpriseInfo/operate/etcList'; $api_get_etc_list = '/api/mdc/cuc/enterpriseInfo/operate/etcList';
// 查询ETC认证车辆信息筛选
$api_get_etc_cart_list = '/api/mdc/cuc/carLicense/operate/findCarLicenseScreenList';
// 查询ETC认证车辆信息筛选
$api_get_etc_cart_page = '/api/fcc/ficoCarWhiteList/list/page';
// 保存ETC白名单（车辆）
$api_save_etc_cart = '/api/fcc/ficoCarWhiteList/save';
// 删除ETC白名单（车辆）
$api_delete_etc_cart = '/api/fcc/ficoCarWhiteList/deleteBatch';
// ETC申请开票界面查询
$api_get_apply_invoice_page = '/api/sdc/invoiceEtcOperate/list/listEtcApplyPageList';
// 进项发票查询 // 进项发票查询
$api_get_input_invoice_page = '/api/fcc/ficoInpinvH/getListPage'; $api_get_input_invoice_page = '/api/fcc/ficoInpinvH/getListPage';