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

替换containsAllLable

Browse Source
This commit is contained in:
潘晓云
2022-03-09 16:33:45 +08:00
parent 957a66254f
commit b0a7611ae4
28 changed files with 1365 additions and 1105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/app/routes/contract-management/components/contract-list/contract-list.component.ts
View File

@ -33,7 +33,7 @@ export class ContractManagementContractListComponent implements OnInit {
} }
delete params.signTime; delete params.signTime;
delete params._$expand; delete params._$expand;
if(this.datePipe.transform(this.sf?.value?.signTime?.[0], 'yyyy-MM-dd HH:mm:ss') && this.datePipe.transform(this.sf?.value?.signTime?.[1], 'yyyy-MM-dd HH:mm:ss')) { if (this.datePipe.transform(this.sf?.value?.signTime?.[0], 'yyyy-MM-dd HH:mm:ss') && this.datePipe.transform(this.sf?.value?.signTime?.[1], 'yyyy-MM-dd HH:mm:ss')) {
params.signTime = { params.signTime = {
start: this.datePipe.transform(this.sf?.value?.signTime?.[0], 'yyyy-MM-dd HH:mm:ss'), start: this.datePipe.transform(this.sf?.value?.signTime?.[0], 'yyyy-MM-dd HH:mm:ss'),
end: this.datePipe.transform(this.sf?.value?.signTime?.[1], 'yyyy-MM-dd HH:mm:ss'), end: this.datePipe.transform(this.sf?.value?.signTime?.[1], 'yyyy-MM-dd HH:mm:ss'),
@ -49,7 +49,7 @@ export class ContractManagementContractListComponent implements OnInit {
private nzModalService: NzModalService, private nzModalService: NzModalService,
private router: Router, private router: Router,
private datePipe: DatePipe, private datePipe: DatePipe,
) {} ) { }
ngOnInit(): void { ngOnInit(): void {
this.initST() this.initST()
@ -70,13 +70,13 @@ export class ContractManagementContractListComponent implements OnInit {
title: '单据类型', title: '单据类型',
width: '100px', width: '100px',
className: 'text-center', className: 'text-center',
index:'documentType' index: 'documentType'
}, },
{ {
title: '合同名称', title: '合同名称',
width: '100px', width: '100px',
className: 'text-center', className: 'text-center',
index:'contractName' index: 'contractName'
}, },
{ title: '托运人', index: 'shipperName', width: '120px', className: 'text-center' }, { title: '托运人', index: 'shipperName', width: '120px', className: 'text-center' },
{ title: '承运人', index: 'carrierName', width: '120px', className: 'text-center' }, { title: '承运人', index: 'carrierName', width: '120px', className: 'text-center' },
@ -112,8 +112,8 @@ export class ContractManagementContractListComponent implements OnInit {
]; ];
} }
/** /**
* 初始化查询表单 * 初始化查询表单
*/ */
initSF() { initSF() {
this.schema = { this.schema = {
properties: { properties: {
@ -145,9 +145,9 @@ export class ContractManagementContractListComponent implements OnInit {
default: '', default: '',
ui: { ui: {
widget: 'dict-select', widget: 'dict-select',
containsAllLable: true, containsAllLabel: true,
params: { dictKey: 'contract:document:type' }, params: { dictKey: 'contract:document:type' },
containAllLable:true, containAllLable: true,
visibleIf: { visibleIf: {
_$expand: (value: boolean) => value, _$expand: (value: boolean) => value,
}, },
@ -169,8 +169,8 @@ export class ContractManagementContractListComponent implements OnInit {
this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } }; this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } };
} }
/** /**
* 查询字段个数 * 查询字段个数
*/ */
get queryFieldCount(): number { get queryFieldCount(): number {
return Object.keys(this.schema?.properties || {}).length; return Object.keys(this.schema?.properties || {}).length;
} }

8
src/app/routes/contract-management/components/contract-template/contract-template.component.ts
View File

@ -37,7 +37,7 @@ export class ContractManagementTemplateComponent implements OnInit {
three: '2', three: '2',
id: 2 id: 2
}, },
]; ];
constructor( constructor(
public service: ContractManagementService, public service: ContractManagementService,
private modal: NzModalService, private modal: NzModalService,
@ -80,7 +80,7 @@ export class ContractManagementTemplateComponent implements OnInit {
ui: { ui: {
widget: 'dict-select', widget: 'dict-select',
params: { dictKey: 'contract:template:type' }, params: { dictKey: 'contract:template:type' },
containsAllLable: true, containsAllLabel: true,
visibleIf: { visibleIf: {
_$expand: (value: boolean) => value, _$expand: (value: boolean) => value,
}, },
@ -178,7 +178,7 @@ export class ContractManagementTemplateComponent implements OnInit {
} }
edit(value: any) { edit(value: any) {
this.router.navigate(['/contract-management/template/detail/' + value.id],{ this.router.navigate(['/contract-management/template/detail/' + value.id], {
queryParams: { queryParams: {
status: 2 status: 2
} }
@ -195,7 +195,7 @@ export class ContractManagementTemplateComponent implements OnInit {
window.history.go(-1) window.history.go(-1)
} }
view(value: any) { view(value: any) {
this.router.navigate(['/contract-management/template/detail/' + value.id],{ this.router.navigate(['/contract-management/template/detail/' + value.id], {
queryParams: { queryParams: {
status: 3 status: 3
} }

26
src/app/routes/financial-management/components/payment-order/payment-order.component.ts
View File

@ -23,26 +23,26 @@ export class PaymentOrderComponent implements OnInit {
_$expand = false; _$expand = false;
selectedRows: any[] = []; selectedRows: any[] = [];
constructor(public service: FreightAccountService, private nzModalService: NzModalService, private router: Router) {} constructor(public service: FreightAccountService, private nzModalService: NzModalService, private router: Router) { }
ngOnInit(): void {} ngOnInit(): void { }
beforeReq = (requestOptions: STRequestOptions) => { beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) { if (this.sf) {
let params = {...this.sf.value}; let params = { ...this.sf.value };
if(params.payDate){ if (params.payDate) {
const payDate = {start:this.sf?.value?.payDate?.[0],end:this.sf?.value?.payDate?.[1]} const payDate = { start: this.sf?.value?.payDate?.[0], end: this.sf?.value?.payDate?.[1] }
params.payDate = payDate; params.payDate = payDate;
} }
if(params.payDate2){ if (params.payDate2) {
const payDate2 = {start:this.sf?.value?.payDate2?.[0],end:this.sf?.value?.payDate2?.[1]} const payDate2 = { start: this.sf?.value?.payDate2?.[0], end: this.sf?.value?.payDate2?.[1] }
params.payDate2 = payDate2; params.payDate2 = payDate2;
} }
if(params.createTime){ if (params.createTime) {
const createTime = {start:this.sf?.value?.createTime?.[0],end:this.sf?.value?.createTime?.[1]} const createTime = { start: this.sf?.value?.createTime?.[0], end: this.sf?.value?.createTime?.[1] }
params.createTime = createTime; params.createTime = createTime;
} }
Object.assign(requestOptions.body,params ); Object.assign(requestOptions.body, params);
} }
return requestOptions; return requestOptions;
}; };
@ -113,7 +113,7 @@ export class PaymentOrderComponent implements OnInit {
title: '付款状态', title: '付款状态',
ui: { ui: {
widget: 'dict-select', widget: 'dict-select',
containsAllLable: true, containsAllLabel: true,
params: { dictKey: 'refund:apply:status' }, params: { dictKey: 'refund:apply:status' },
placeholder: '请选择' placeholder: '请选择'
} }
@ -123,7 +123,7 @@ export class PaymentOrderComponent implements OnInit {
title: '付款类型', title: '付款类型',
ui: { ui: {
widget: 'dict-select', widget: 'dict-select',
containsAllLable: true, containsAllLabel: true,
params: { dictKey: 'pay:type' }, params: { dictKey: 'pay:type' },
placeholder: '请选择', placeholder: '请选择',
visibleIf: { visibleIf: {
@ -136,7 +136,7 @@ export class PaymentOrderComponent implements OnInit {
title: '付款方式', title: '付款方式',
ui: { ui: {
widget: 'dict-select', widget: 'dict-select',
containsAllLable: true, containsAllLabel: true,
params: { dictKey: 'pay:mode' }, params: { dictKey: 'pay:mode' },
placeholder: '请选择', placeholder: '请选择',
visibleIf: { visibleIf: {

8
src/app/routes/insurance-management/components/list/list.component.ts
View File

@ -64,7 +64,7 @@ export class insuranceManagementListComponent implements OnInit {
public shipperservice: ShipperBaseService, public shipperservice: ShipperBaseService,
private router: Router, private router: Router,
private modale: ModalHelper, private modale: ModalHelper,
) {} ) { }
/** /**
* 查询参数 * 查询参数
@ -176,7 +176,7 @@ export class insuranceManagementListComponent implements OnInit {
ui: { ui: {
widget: 'dict-select', widget: 'dict-select',
params: { dictKey: 'insure:type' }, params: { dictKey: 'insure:type' },
containsAllLable: true, containsAllLabel: true,
visibleIf: { visibleIf: {
_$expand: (value: boolean) => value _$expand: (value: boolean) => value
} }
@ -263,7 +263,7 @@ export class insuranceManagementListComponent implements OnInit {
ui: { ui: {
widget: 'dict-select', widget: 'dict-select',
params: { dictKey: 'insure:status' }, params: { dictKey: 'insure:status' },
containsAllLable: true, containsAllLabel: true,
visibleIf: { visibleIf: {
_$expand: (value: boolean) => value _$expand: (value: boolean) => value
} }
@ -501,7 +501,7 @@ export class insuranceManagementListComponent implements OnInit {
this._$expand = !this._$expand; this._$expand = !this._$expand;
this.sf?.setValue('/_$expand', this._$expand); this.sf?.setValue('/_$expand', this._$expand);
} }
tabChange(item: any) {} tabChange(item: any) { }
/** /**
* 重置表单 * 重置表单
*/ */

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

@ -72,7 +72,7 @@ export class OrderManagementBulkComponent implements OnInit {
private modal: NzModalService, private modal: NzModalService,
public shipperservice: ShipperBaseService, public shipperservice: ShipperBaseService,
private router: Router private router: Router
) {} ) { }
/** /**
* 查询参数 * 查询参数
@ -257,7 +257,7 @@ export class OrderManagementBulkComponent implements OnInit {
ui: { ui: {
widget: 'dict-select', widget: 'dict-select',
params: { dictKey: 'overall:payment:status' }, params: { dictKey: 'overall:payment:status' },
containsAllLable: true, containsAllLabel: true,
visibleIf: { visibleIf: {
_$expand: (value: boolean) => value _$expand: (value: boolean) => value
} }
@ -312,7 +312,7 @@ export class OrderManagementBulkComponent implements OnInit {
ui: { ui: {
widget: 'dict-select', widget: 'dict-select',
params: { dictKey: 'service:type' }, params: { dictKey: 'service:type' },
containsAllLable: true, containsAllLabel: true,
visibleIf: { visibleIf: {
_$expand: (value: boolean) => value _$expand: (value: boolean) => value
} }
@ -323,7 +323,7 @@ export class OrderManagementBulkComponent implements OnInit {
type: 'string', type: 'string',
ui: { ui: {
widget: 'dict-select', widget: 'dict-select',
containsAllLable: true, containsAllLabel: true,
params: { dictKey: 'goodresource:settlement:type' }, params: { dictKey: 'goodresource:settlement:type' },
containAllLable: true, containAllLable: true,
visibleIf: { visibleIf: {
@ -605,7 +605,7 @@ export class OrderManagementBulkComponent implements OnInit {
this._$expand = !this._$expand; this._$expand = !this._$expand;
this.sf?.setValue('/_$expand', this._$expand); this.sf?.setValue('/_$expand', this._$expand);
} }
tabChange(item: any) {} tabChange(item: any) { }
/** /**
* 重置表单 * 重置表单
*/ */
@ -617,8 +617,8 @@ export class OrderManagementBulkComponent implements OnInit {
/** /**
* 导入货源 * 导入货源
*/ */
importGoodsSource() {} importGoodsSource() { }
audit(item: any) {} audit(item: any) { }
/* /*
* 审核关闭弹窗 * 审核关闭弹窗
@ -639,7 +639,7 @@ export class OrderManagementBulkComponent implements OnInit {
/** /**
* 审核通过按钮 * 审核通过按钮
*/ */
handleOK() {} handleOK() { }
OpenPrice(item: any) { OpenPrice(item: any) {
this.changeId = item.id; this.changeId = item.id;
this.isVisible = true; this.isVisible = true;
@ -692,7 +692,7 @@ export class OrderManagementBulkComponent implements OnInit {
nzFooter: null nzFooter: null
}); });
modal.afterClose.subscribe((res: any) => { modal.afterClose.subscribe((res: any) => {
if(res) { if (res) {
this.st.reload(1); this.st.reload(1);
this.getGoodsSourceStatistical(); this.getGoodsSourceStatistical();
} }
@ -773,8 +773,8 @@ export class OrderManagementBulkComponent implements OnInit {
this.router.navigate(['order-management/bulk-detailChange', value.id]); this.router.navigate(['order-management/bulk-detailChange', value.id]);
} }
/** /**
*申请退款 *申请退款
*/ */
applyRefund(item: any) { applyRefund(item: any) {
const modalRef = this.modal.create({ const modalRef = this.modal.create({
nzTitle: '申请退款', nzTitle: '申请退款',
@ -786,7 +786,7 @@ export class OrderManagementBulkComponent implements OnInit {
nzFooter: null nzFooter: null
}); });
modalRef.afterClose.subscribe((res: boolean) => { modalRef.afterClose.subscribe((res: boolean) => {
if(res) { if (res) {
this.resetSF; this.resetSF;
this.st.load(); this.st.load();
} }

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

@ -51,7 +51,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
private modal: NzModalService, private modal: NzModalService,
public shipperservice: ShipperBaseService, public shipperservice: ShipperBaseService,
private router: Router private router: Router
) {} ) { }
/** /**
* 查询参数 * 查询参数
@ -232,7 +232,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
ui: { ui: {
widget: 'dict-select', widget: 'dict-select',
params: { dictKey: 'overall:payment:status' }, params: { dictKey: 'overall:payment:status' },
containsAllLable: true, containsAllLabel: true,
visibleIf: { visibleIf: {
_$expand: (value: boolean) => value _$expand: (value: boolean) => value
} }
@ -258,7 +258,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
ui: { ui: {
widget: 'dict-select', widget: 'dict-select',
params: { dictKey: 'service:type' }, params: { dictKey: 'service:type' },
containsAllLable: true, containsAllLabel: true,
visibleIf: { visibleIf: {
_$expand: (value: boolean) => value _$expand: (value: boolean) => value
} }
@ -462,16 +462,20 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
index: 'amountAfterChange', index: 'amountAfterChange',
render: 'amountAfterChange' render: 'amountAfterChange'
}, },
{ title: '变更值', {
title: '变更值',
index: 'amountchangeValue', index: 'amountchangeValue',
render: 'amountchangeValue', render: 'amountchangeValue',
width: '120px', width: '120px',
className: 'text-center' }, className: 'text-center'
{ title: '变更后', },
{
title: '变更后',
index: 'amountBeforeChange', index: 'amountBeforeChange',
render: 'amountBeforeChange', render: 'amountBeforeChange',
width: '120px', width: '120px',
className: 'text-center' } className: 'text-center'
}
]; ];
} }
/** /**
@ -481,12 +485,12 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
return Object.keys(this.schema?.properties || {}).length; return Object.keys(this.schema?.properties || {}).length;
} }
/** /**
* 浮动费用查看 * 浮动费用查看
*/ */
FloatView(item: any) { FloatView(item: any) {
console.log(item) console.log(item)
this.changeViewId = item.id; 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.ViewCause = res;
}) })
this.isVisibleView = true this.isVisibleView = true
@ -495,9 +499,9 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
this.modal.confirm({ this.modal.confirm({
nzTitle: '是否确定立即撤销费用变更！</i>', nzTitle: '是否确定立即撤销费用变更！</i>',
nzOnOk: () => nzOnOk: () =>
this.service.request(this.service.$api_get_revokeChangeRecord, { id: item.id}).subscribe((res) => { this.service.request(this.service.$api_get_revokeChangeRecord, { id: item.id }).subscribe((res) => {
console.log(res) console.log(res)
if(res) { if (res) {
this.service.msgSrv.success('撤销成功！') this.service.msgSrv.success('撤销成功！')
this.stFloat.reload() this.stFloat.reload()
} }
@ -511,7 +515,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
this._$expand = !this._$expand; this._$expand = !this._$expand;
this.sf?.setValue('/_$expand', this._$expand); this.sf?.setValue('/_$expand', this._$expand);
} }
tabChange(item: any) {} tabChange(item: any) { }
/** /**
* 重置表单 * 重置表单
*/ */
@ -523,7 +527,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
/** /**
* 导入货源 * 导入货源
*/ */
importGoodsSource() {} importGoodsSource() { }
OpenPrice(item: any) { OpenPrice(item: any) {
this.changeId = item.id; this.changeId = item.id;
this.isVisible = true; this.isVisible = true;
@ -584,20 +588,20 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
* 审核关闭弹窗 * 审核关闭弹窗
*/ */
handleCancel(value?: string) { handleCancel(value?: string) {
if(value === '0') { if (value === '0') {
this.isVisible = false; this.isVisible = false;
} else if(value === '1') { } else if (value === '1') {
this.isVisibleRE = false; this.isVisibleRE = false;
} else if(value === '2') { } else if (value === '2') {
this.isVisibleView = false; this.isVisibleView = false;
} }
} }
/** /**
* 审核通过按钮 * 审核通过按钮
*/ */
handleOK() { handleOK() {
let idList: any[] = []; let idList: any[] = [];
if(this.selectedRows.length > 0) { if (this.selectedRows.length > 0) {
this.selectedRows.forEach(item => { this.selectedRows.forEach(item => {
idList.push(item.id); idList.push(item.id);
}); });
@ -622,12 +626,12 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
* 审核拒绝按钮 * 审核拒绝按钮
*/ */
reject() { reject() {
if(!this.sfView.value.complianceRemark) { if (!this.sfView.value.complianceRemark) {
this.service.msgSrv.error('备注不能为空！'); this.service.msgSrv.error('备注不能为空！');
return; return;
} }
let idList: any[] = []; let idList: any[] = [];
if(this.selectedRows.length > 0) { if (this.selectedRows.length > 0) {
this.selectedRows.forEach(item => { this.selectedRows.forEach(item => {
idList.push(item.id); idList.push(item.id);
}); });
@ -649,15 +653,15 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
}); });
} }
/** /**
*合规抽查 *合规抽查
*/ */
audit(item?: any) { audit(item?: any) {
if (item) { if (item) {
this.isVisibleRE = true; this.isVisibleRE = true;
this.auditId = item.id; this.auditId = item.id;
this.initSTAudit(1); this.initSTAudit(1);
} else { } else {
if(this.selectedRows.length <= 0) { if (this.selectedRows.length <= 0) {
this.service.msgSrv.error('请选择订单！') this.service.msgSrv.error('请选择订单！')
return; return;
} else { } else {

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

@ -41,7 +41,7 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
private modal: NzModalService, private modal: NzModalService,
public shipperservice: ShipperBaseService, public shipperservice: ShipperBaseService,
private router: Router private router: Router
) {} ) { }
/** /**
* 查询参数 * 查询参数
@ -207,7 +207,7 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
ui: { ui: {
widget: 'dict-select', widget: 'dict-select',
params: { dictKey: 'overall:payment:status' }, params: { dictKey: 'overall:payment:status' },
containsAllLable: true, containsAllLabel: true,
visibleIf: { visibleIf: {
_$expand: (value: boolean) => value _$expand: (value: boolean) => value
} }
@ -233,7 +233,7 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
ui: { ui: {
widget: 'dict-select', widget: 'dict-select',
params: { dictKey: 'service:type' }, params: { dictKey: 'service:type' },
containsAllLable: true, containsAllLabel: true,
visibleIf: { visibleIf: {
_$expand: (value: boolean) => value _$expand: (value: boolean) => value
} }
@ -244,7 +244,7 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
type: 'string', type: 'string',
ui: { ui: {
widget: 'dict-select', widget: 'dict-select',
containsAllLable: true, containsAllLabel: true,
params: { dictKey: 'goodresource:settlement:type' }, params: { dictKey: 'goodresource:settlement:type' },
containAllLable: true, containAllLable: true,
visibleIf: { visibleIf: {
@ -347,7 +347,7 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
{ {
text: '修改　　　　', text: '修改　　　　',
click: _record => this.modification(_record), click: _record => this.modification(_record),
iif: item => item.auditStatus == '1' , iif: item => item.auditStatus == '1',
acl: { ability: ['ORDER-RECEIPTS-updateBillExamine'] }, acl: { ability: ['ORDER-RECEIPTS-updateBillExamine'] },
}, },
{ {
@ -373,7 +373,7 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
this._$expand = !this._$expand; this._$expand = !this._$expand;
this.sf?.setValue('/_$expand', this._$expand); this.sf?.setValue('/_$expand', this._$expand);
} }
tabChange(item: any) {} tabChange(item: any) { }
/** /**
* 重置表单 * 重置表单
*/ */
@ -385,13 +385,13 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
/** /**
* 导入货源 * 导入货源
*/ */
importGoodsSource() {} importGoodsSource() { }
audit(item: any) {} audit(item: any) { }
/** /**
* 审核通过按钮 * 审核通过按钮
*/ */
handleOK() {} handleOK() { }
OpenPrice(item: any) { OpenPrice(item: any) {
this.isVisible = true; this.isVisible = true;
} }
@ -415,7 +415,7 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
// 生成电子单据 // 生成电子单据
generate(item: any, sts?: number) { generate(item: any, sts?: number) {
let text = '查看凭证'; let text = '查看凭证';
if(sts == 2) { if (sts == 2) {
text = '生成电子单据'; text = '生成电子单据';
} }
const modalRef = this.modal.create({ const modalRef = this.modal.create({
@ -437,8 +437,8 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
sign(item?: any) { sign(item?: any) {
let params: any = [] let params: any = []
let text = ''; let text = '';
if(item === '1') { if (item === '1') {
if(this.selectedRows.length <= 0) { if (this.selectedRows.length <= 0) {
this.service.msgSrv.error('请选择订单！') this.service.msgSrv.error('请选择订单！')
return return
} }
@ -470,7 +470,7 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
} }
// 批量生成电子单据 // 批量生成电子单据
sign1(item?: any) { sign1(item?: any) {
if(this.selectedRows.length <= 0) { if (this.selectedRows.length <= 0) {
this.service.msgSrv.error('请选择订单！') this.service.msgSrv.error('请选择订单！')
return return
} }

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

@ -40,7 +40,7 @@ export class OrderManagementRiskComponent implements OnInit {
public shipperservice: ShipperBaseService, public shipperservice: ShipperBaseService,
private modal: NzModalService, private modal: NzModalService,
public router: Router public router: Router
) {} ) { }
/** /**
* 查询参数 * 查询参数
@ -54,8 +54,8 @@ export class OrderManagementRiskComponent implements OnInit {
// ...a, // ...a,
// ...this.sf?.value, // ...this.sf?.value,
// }; // };
const a:any = {}; const a: any = {};
if(this.resourceStatus) { if (this.resourceStatus) {
a.representationsStatus = this.resourceStatus a.representationsStatus = this.resourceStatus
} }
const params: any = Object.assign({}, this.sf?.value || {}); const params: any = Object.assign({}, this.sf?.value || {});
@ -85,7 +85,7 @@ export class OrderManagementRiskComponent implements OnInit {
this.service.request(this.service.$api_get_listStatisticalStatus, this.reqParams).subscribe(res => { this.service.request(this.service.$api_get_listStatisticalStatus, this.reqParams).subscribe(res => {
if (res) { if (res) {
res.forEach((element: any) => { res.forEach((element: any) => {
if(element.representationsStatusLabel === '待申述') { if (element.representationsStatusLabel === '待申述') {
this.tabs.stayQuantity = element.quantity this.tabs.stayQuantity = element.quantity
} else if (element.representationsStatusLabel === '申诉失败') { } else if (element.representationsStatusLabel === '申诉失败') {
this.tabs.receivedQuantity = element.quantity this.tabs.receivedQuantity = element.quantity
@ -168,7 +168,7 @@ export class OrderManagementRiskComponent implements OnInit {
ui: { ui: {
widget: 'dict-select', widget: 'dict-select',
params: { dictKey: 'freight:type' }, params: { dictKey: 'freight:type' },
containsAllLable: true, containsAllLabel: true,
visibleIf: { visibleIf: {
_$expand: (value: boolean) => value _$expand: (value: boolean) => value
} }
@ -180,7 +180,7 @@ export class OrderManagementRiskComponent implements OnInit {
ui: { ui: {
widget: 'dict-select', widget: 'dict-select',
params: { dictKey: 'BulkFreightUnitPriceType' }, params: { dictKey: 'BulkFreightUnitPriceType' },
containsAllLable: true, containsAllLabel: true,
visibleIf: { visibleIf: {
_$expand: (value: boolean) => value _$expand: (value: boolean) => value
} }
@ -307,7 +307,7 @@ export class OrderManagementRiskComponent implements OnInit {
{ {
text: '审核', text: '审核',
click: _record => this.audit(_record), click: _record => this.audit(_record),
iif: item => item.representationsStatus == '1' || item.representationsStatus == '2' , iif: item => item.representationsStatus == '1' || item.representationsStatus == '2',
acl: { ability: ['ORDER-RISK-audit'] }, acl: { ability: ['ORDER-RISK-audit'] },
}, },
{ {
@ -405,7 +405,7 @@ export class OrderManagementRiskComponent implements OnInit {
/** /**
* 导入货源 * 导入货源
*/ */
importGoodsSource() {} importGoodsSource() { }
/* /*
* 审核关闭弹窗 * 审核关闭弹窗
@ -418,7 +418,7 @@ export class OrderManagementRiskComponent implements OnInit {
*/ */
handleOK() { handleOK() {
let idList: any[] = []; let idList: any[] = [];
if(this.selectedRows.length > 0) { if (this.selectedRows.length > 0) {
this.selectedRows.forEach(item => { this.selectedRows.forEach(item => {
idList.push(item.id); idList.push(item.id);
}); });
@ -444,14 +444,14 @@ export class OrderManagementRiskComponent implements OnInit {
*/ */
reject() { reject() {
let idList: any[] = []; let idList: any[] = [];
if(this.selectedRows.length > 0) { if (this.selectedRows.length > 0) {
this.selectedRows.forEach(item => { this.selectedRows.forEach(item => {
idList.push(item.id); idList.push(item.id);
}); });
} else { } else {
idList.push(this.sfView.value.billCode) idList.push(this.sfView.value.billCode)
} }
if(!this.sfView.value.representationsCause) { if (!this.sfView.value.representationsCause) {
this.service.msgSrv.error('拒绝原因为空！'); this.service.msgSrv.error('拒绝原因为空！');
return; return;
} }
@ -478,7 +478,7 @@ export class OrderManagementRiskComponent implements OnInit {
this.initSTAudit(1); this.initSTAudit(1);
this.isVisibleRE = true; this.isVisibleRE = true;
} else { } else {
if(this.selectedRows.length <= 0) { if (this.selectedRows.length <= 0) {
this.service.msgSrv.error('请选择订单！') this.service.msgSrv.error('请选择订单！')
return; return;
} else { } else {

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

@ -54,8 +54,8 @@ export class OrderManagementVehicleComponent implements OnInit {
three: '2', three: '2',
id: 2 id: 2
}, },
]; ];
tabs = { tabs = {
cancelQuantity: 0, cancelQuantity: 0,
receivedQuantity: 0, receivedQuantity: 0,
stayQuantity: 0, stayQuantity: 0,
@ -63,8 +63,8 @@ tabs = {
compolatelQuantity: 0, compolatelQuantity: 0,
GoingQuantity: 0, GoingQuantity: 0,
totalCount: 0 totalCount: 0
}; };
resourceStatus: any; resourceStatus: any;
constructor( constructor(
public service: OrderManagementService, public service: OrderManagementService,
private modal: NzModalService, private modal: NzModalService,
@ -86,8 +86,8 @@ resourceStatus: any;
}; };
} }
get reqParams() { get reqParams() {
const a:any = {}; const a: any = {};
if(this.resourceStatus) { if (this.resourceStatus) {
a.billStatus = this.resourceStatus; a.billStatus = this.resourceStatus;
} }
const params: any = Object.assign({}, this.sf?.value || {}); const params: any = Object.assign({}, this.sf?.value || {});
@ -127,11 +127,11 @@ resourceStatus: any;
}; };
const params: any = Object.assign({}, this.reqParams || {}); const params: any = Object.assign({}, this.reqParams || {});
delete params.billStatus delete params.billStatus
this.service.request(this.service.$api_statisticalStatus,params).subscribe(res => { this.service.request(this.service.$api_statisticalStatus, params).subscribe(res => {
if (res) { if (res) {
let totalCount = 0; let totalCount = 0;
res.forEach((element: any) => { res.forEach((element: any) => {
if(element.billStatusLabel === '待发车') { if (element.billStatusLabel === '待发车') {
this.tabs.stayQuantity = element.quantity this.tabs.stayQuantity = element.quantity
} else if (element.billStatusLabel === '待接单') { } else if (element.billStatusLabel === '待接单') {
this.tabs.receivedQuantity = element.quantity this.tabs.receivedQuantity = element.quantity
@ -179,7 +179,7 @@ resourceStatus: any;
onSearch: (q: any) => { onSearch: (q: any) => {
if (!!q) { if (!!q) {
return this.service return this.service
.request(this.service.$api_enterpriceList, { enterpriseName: q}) .request(this.service.$api_enterpriceList, { enterpriseName: q })
.pipe(map((res: any) => (res as any[]).map((i) => ({ label: i.enterpriseName, value: i.id } as SFSchemaEnum)))) .pipe(map((res: any) => (res as any[]).map((i) => ({ label: i.enterpriseName, value: i.id } as SFSchemaEnum))))
.toPromise(); .toPromise();
} else { } else {
@ -254,7 +254,7 @@ resourceStatus: any;
ui: { ui: {
widget: 'dict-select', widget: 'dict-select',
params: { dictKey: 'overall:payment:status' }, params: { dictKey: 'overall:payment:status' },
containsAllLable: true, containsAllLabel: true,
visibleIf: { visibleIf: {
_$expand: (value: boolean) => value, _$expand: (value: boolean) => value,
}, },
@ -328,7 +328,7 @@ resourceStatus: any;
ui: { ui: {
widget: 'dict-select', widget: 'dict-select',
params: { dictKey: 'service:type' }, params: { dictKey: 'service:type' },
containsAllLable: true, containsAllLabel: true,
visibleIf: { visibleIf: {
_$expand: (value: boolean) => value, _$expand: (value: boolean) => value,
}, },
@ -516,16 +516,20 @@ resourceStatus: any;
index: 'amountAfterChange', index: 'amountAfterChange',
render: 'amountAfterChange' render: 'amountAfterChange'
}, },
{ title: '变更值', {
title: '变更值',
index: 'amountchangeValue', index: 'amountchangeValue',
render: 'amountchangeValue', render: 'amountchangeValue',
width: '120px', width: '120px',
className: 'text-center' }, className: 'text-center'
{ title: '变更后', },
{
title: '变更后',
index: 'amountBeforeChange', index: 'amountBeforeChange',
render: 'amountBeforeChange', render: 'amountBeforeChange',
width: '120px', width: '120px',
className: 'text-center' } className: 'text-center'
}
]; ];
} }
// 获取城市列表 // 获取城市列表
@ -548,7 +552,7 @@ resourceStatus: any;
// this.sf1.setValue('/enterpriseProjectId', this.enterpriseProjectIds); // this.sf1.setValue('/enterpriseProjectId', this.enterpriseProjectIds);
// } // }
}); });
} }
/** /**
* 查询字段个数 * 查询字段个数
*/ */
@ -596,11 +600,11 @@ resourceStatus: any;
*/ */
handleCancel(type: string) { handleCancel(type: string) {
console.log(type) console.log(type)
if(type === '0') { if (type === '0') {
this.isVisible = false this.isVisible = false
} else if(type === '1') { } else if (type === '1') {
this.isVisibleView = false this.isVisibleView = false
} else if(type === '2') { } else if (type === '2') {
this.isVisibleEvaluate = false this.isVisibleEvaluate = false
} }
} }
@ -614,7 +618,7 @@ resourceStatus: any;
FloatView(item: any) { FloatView(item: any) {
console.log(item) console.log(item)
this.changeViewId = item.id; 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.ViewCause = res;
}) })
this.isVisibleView = true this.isVisibleView = true
@ -644,8 +648,8 @@ resourceStatus: any;
}); });
} }
/** /**
*变更运费 *变更运费
*/ */
updateFreight(item: any) { updateFreight(item: any) {
console.log(item?.isFreightChangeApplication) console.log(item?.isFreightChangeApplication)
this.service.request(this.service.$api_get_getFreightChangeWholeDetail, { id: item.id }).subscribe(data => { this.service.request(this.service.$api_get_getFreightChangeWholeDetail, { id: item.id }).subscribe(data => {
@ -654,11 +658,11 @@ resourceStatus: any;
nzTitle: '变更运费', nzTitle: '变更运费',
nzWidth: 580, nzWidth: 580,
nzContent: VehicleUpdateFreightComponent, nzContent: VehicleUpdateFreightComponent,
nzComponentParams: { data: { ...data, id: item.id,isFreightChangeApplication: item?.isFreightChangeApplication } }, nzComponentParams: { data: { ...data, id: item.id, isFreightChangeApplication: item?.isFreightChangeApplication } },
nzFooter: null, nzFooter: null,
}); });
modal.afterClose.subscribe((res: Boolean) => { modal.afterClose.subscribe((res: Boolean) => {
if(res) { if (res) {
this.st.load(); this.st.load();
this.getGoodsSourceStatistical() this.getGoodsSourceStatistical()
} }
@ -674,7 +678,7 @@ resourceStatus: any;
this.selectedRows.forEach(item => { this.selectedRows.forEach(item => {
params.push(item.id); params.push(item.id);
}); });
if(params.length === 0) { if (params.length === 0) {
this.service.msgSrv.error('请先选择订单！') this.service.msgSrv.error('请先选择订单！')
return return
} }
@ -693,8 +697,8 @@ resourceStatus: any;
}); });
} }
/** /**
*修改网络货运人 *修改网络货运人
*/ */
modifyFreightPeople() { modifyFreightPeople() {
let params: any[] = []; let params: any[] = [];
this.selectedRows.forEach(item => { this.selectedRows.forEach(item => {
@ -704,7 +708,7 @@ resourceStatus: any;
this.selectedRows.forEach(item => { this.selectedRows.forEach(item => {
params2.push(item.enterpriseInfoId); params2.push(item.enterpriseInfoId);
}); });
if(params.length === 0) { if (params.length === 0) {
this.service.msgSrv.error('请先选择订单！') this.service.msgSrv.error('请先选择订单！')
return return
} }
@ -733,14 +737,14 @@ resourceStatus: any;
}); });
} }
/** /**
*修改网络货运人 *修改网络货运人
*/ */
modifycaptain() { modifycaptain() {
let params: any[] = []; let params: any[] = [];
this.selectedRows.forEach(item => { this.selectedRows.forEach(item => {
params.push(item.id); params.push(item.id);
}); });
if(params.length === 0) { if (params.length === 0) {
this.service.msgSrv.error('请先选择订单！') this.service.msgSrv.error('请先选择订单！')
return return
} }
@ -787,9 +791,9 @@ resourceStatus: any;
this.modal.confirm({ this.modal.confirm({
nzTitle: '是否确定立即撤销费用变更！</i>', nzTitle: '是否确定立即撤销费用变更！</i>',
nzOnOk: () => nzOnOk: () =>
this.service.request(this.service.$api_get_revokeChangeRecord, { id: item.id}).subscribe((res) => { this.service.request(this.service.$api_get_revokeChangeRecord, { id: item.id }).subscribe((res) => {
console.log(res) console.log(res)
if(res) { if (res) {
this.service.msgSrv.success('撤销成功！') this.service.msgSrv.success('撤销成功！')
this.stFloat.reload() this.stFloat.reload()
} }
@ -803,7 +807,7 @@ resourceStatus: any;
nzTitle: '<b>确定取消该订单吗?</b>', nzTitle: '<b>确定取消该订单吗?</b>',
nzContent: `<b>取消后无法恢复，请确认</b>`, nzContent: `<b>取消后无法恢复，请确认</b>`,
nzOnOk: () => nzOnOk: () =>
this.service.request(this.service.$api_get_cancelAnOrder, {id: item.id}).subscribe((res) => { this.service.request(this.service.$api_get_cancelAnOrder, { id: item.id }).subscribe((res) => {
if (res === true) { if (res === true) {
this.service.msgSrv.success('操作成功！'); this.service.msgSrv.success('操作成功！');
this.st.load(1); this.st.load(1);
@ -818,7 +822,7 @@ resourceStatus: any;
this.selectedRows.forEach(item => { this.selectedRows.forEach(item => {
params.push(item.id); params.push(item.id);
}); });
if(params.length === 0) { if (params.length === 0) {
this.service.msgSrv.error('请先选择订单！') this.service.msgSrv.error('请先选择订单！')
return return
} }
@ -848,7 +852,7 @@ resourceStatus: any;
nzFooter: null nzFooter: null
}); });
modalRef.afterClose.subscribe((res: boolean) => { modalRef.afterClose.subscribe((res: boolean) => {
if(res) { if (res) {
this.resetSF; this.resetSF;
this.st.load(); this.st.load();
} }

14
src/app/routes/partner/account-management/components/list/list.component.html
View File

@ -1,5 +1,11 @@
<nz-card> <nz-card>
<sf mode="search" [schema]="schema" [ui]="ui" [button]="'none'" (formSubmit)="st.load(1)" (formReset)="resetSF()" #sf> <!-- <div nz-row>
<div [nzSpan]="" nz-col>
</div>
</div> -->
<sf [schema]="schema" [mode]="'search'" [ui]="ui" [button]="'none'" (formSubmit)="st.load(1)" (formReset)="resetSF()"
#sf>
<button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading" <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading"
(click)="st?.load(1)">查询</button> (click)="st?.load(1)">查询</button>
<button nz-button (click)="resetSF()">重置</button> <button nz-button (click)="resetSF()">重置</button>
@ -8,7 +14,7 @@
</nz-card> </nz-card>
<nz-card> <nz-card>
<st #st [data]="service.$api_get_partner_statistics_page" [columns]="columns" [scroll]="{ x: '1200px' }" <st #st [data]="service. $api_get_account_management_page" [columns]="columns" [scroll]="{ x: '1200px' }"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }" [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
[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] }"
@ -28,8 +34,6 @@
<ng-template st-row="approvalStatus3" let-item> <ng-template st-row="approvalStatus3" let-item>
<div class="text-right">{{item.yskmoney | currency:' '}}</div> <div class="text-right">{{item.yskmoney | currency:' '}}</div>
</ng-template> </ng-template>
<ng-template st-row="approvalStatus4" let-item>
<div class="text-right">{{item.armoney | currency:' '}}</div>
</ng-template>
</st> </st>
</nz-card> </nz-card>

72
src/app/routes/partner/account-management/components/list/list.component.ts
View File

@ -2,7 +2,10 @@ import { Component, OnInit, ViewChild } from '@angular/core';
import { STColumn, STComponent } from '@delon/abc/st'; import { STColumn, STComponent } from '@delon/abc/st';
import { SFComponent, SFSchema, SFUISchema } from '@delon/form'; import { SFComponent, SFSchema, SFUISchema } from '@delon/form';
import { ModalHelper, _HttpClient } from '@delon/theme'; import { ModalHelper, _HttpClient } from '@delon/theme';
import { NzModalService } from 'ng-zorro-antd/modal';
import { BussinessStatisticsService } from '../../../business-statistics/services/bussiness-statistics.service'; import { BussinessStatisticsService } from '../../../business-statistics/services/bussiness-statistics.service';
import { AccountManagemantService } from '../../services/account-managemant.service';
import { PartnerAccountManagementVirtualAccountDetailComponent } from '../virtual-account-detail/virtual-account-detail.component';
@Component({ @Component({
selector: 'app-partner-list', selector: 'app-partner-list',
@ -16,7 +19,7 @@ export class PartnerAccountManagementListComponent implements OnInit {
@ViewChild('sf') private readonly sf!: SFComponent; @ViewChild('sf') private readonly sf!: SFComponent;
columns: STColumn[] = []; columns: STColumn[] = [];
constructor(public service: BussinessStatisticsService) { } constructor(public service: AccountManagemantService, public modal: NzModalService) { }
/** /**
* 查询参数 * 查询参数
*/ */
@ -41,45 +44,36 @@ export class PartnerAccountManagementListComponent implements OnInit {
}, },
}, },
abnormalCause1: { abnormalCause1: {
title: '类型', title: '手机号',
type: 'string', type: 'string',
default: '',
enum: [
{
label: '全部',
value: ''
},
{
label: '个人',
value: '1'
},
{
label: '企业',
value: '2'
}
],
ui: { ui: {
widget: 'select' placeholder: '请输入',
}, },
}, },
} }
} }
this.ui = { '*': { spanLabelFixed: 120, grid: { span: 8, gutter: 4 } } }; this.ui = { '*': { spanLabelFixed: 120, grid: { span: 8, gutter: 12 } }, };
} }
/** /**
* 初始化数据列表 * 初始化数据列表
*/ */
initST() { initST() {
this.columns = [ this.columns = [
{ title: '合伙人名称', index: 'carNo', className: 'text-center', width: 150 }, { title: '合伙人名称', index: 'carNo', className: 'text-center', width: 300 },
{ title: '类型', render: 'carModelLabel', className: 'text-center', width: 150 }, { title: '手机号', render: 'carModelLabel', className: 'text-center', width: 200 },
{ title: '注册时间', index: 'carNo', className: 'text-center', width: 150 }, { title: '账户总额（元）', render: 'approvalStatus1', className: 'text-right', sort: true, width: 200 },
{ title: '本月新增客户', render: 'approvalStatus0', className: 'text-center', sort: true, width: 150 }, { title: '待入账余额（元）', render: 'approvalStatus2', className: 'text-right', sort: true, width: 200 },
{ title: '客户总数', render: 'approvalStatus', className: 'text-center', sort: true, width: 150 }, { title: '可用余额（元）', render: 'approvalStatus3', className: 'text-right', sort: true, width: 250 },
{ title: '本月已结算金额（元）', render: 'approvalStatus1', className: 'text-right', sort: true, width: 180 }, { title: '虚拟账户', index: 'approvalStatus4', className: 'text-center', width: 200 },
{ title: '累计已结算金额（元）', render: 'approvalStatus2', className: 'text-right', sort: true, width: 180 }, {
{ title: '本月预估收益（元）', render: 'approvalStatus3', className: 'text-right', sort: true, width: 180 }, title: '操作',
{ title: '累计收益（元）', render: 'approvalStatus4', className: 'text-right', sort: true, width: 180 }, buttons: [
{
text: '虚拟账户明细',
click: (_record) => this.viewVirtual(_record)
}
]
}
]; ];
} }
@ -90,6 +84,28 @@ export class PartnerAccountManagementListComponent implements OnInit {
}) })
} }
/**
*
* @param _record 当前行信息
*/
viewVirtual(_record: any) {
const modalRef = this.modal.create({
nzTitle: '虚拟账户明细',
nzContent: PartnerAccountManagementVirtualAccountDetailComponent,
nzComponentParams: {
id: _record?.id
},
nzWidth: '85%',
nzFooter: null
});
modalRef.afterClose.subscribe(result => {
});
}
/**
*
*/
export() { export() {
} }

27
src/app/routes/partner/account-management/components/virtual-account-detail/virtual-account-detail.component.html Normal file
View File

@ -0,0 +1,27 @@
<nz-card>
<div nz-row>
<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" [disabled]="!sf.valid" (click)="st?.load(1)">查询</button>
<button nz-button (click)="resetSF()">重置</button>
<button nz-button (click)="export()" nzType="primary" nzGhost>导出</button>
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
</button>
</div>
</div>
<div class="mt-sm">
<st #st [data]="amService.$api_get_account_management_page" [columns]="columns" [columns]="columns"
[scroll]="{ x: '1200px' }"
[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]="amService.http.loading"></st>
</div>
</nz-card>
<div class="modal-footer text-center">
<button nz-button type="button" nzType="primary" (click)="close()">确定</button>
</div>

24
src/app/routes/partner/account-management/components/virtual-account-detail/virtual-account-detail.component.spec.ts Normal file
View File

@ -0,0 +1,24 @@
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
import { PartnerAccountManagementVirtualAccountDetailComponent } from './virtual-account-detail.component';
describe('PartnerAccountManagementVirtualAccountDetailComponent', () => {
let component: PartnerAccountManagementVirtualAccountDetailComponent;
let fixture: ComponentFixture<PartnerAccountManagementVirtualAccountDetailComponent>;
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [PartnerAccountManagementVirtualAccountDetailComponent]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(PartnerAccountManagementVirtualAccountDetailComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

174
src/app/routes/partner/account-management/components/virtual-account-detail/virtual-account-detail.component.ts Normal file
View File

@ -0,0 +1,174 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { STColumn, STComponent } from '@delon/abc/st';
import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
import { _HttpClient } from '@delon/theme';
import { NzModalRef } from 'ng-zorro-antd/modal';
import { ShipperBaseService } from 'src/app/shared/services/business/shipper-base.service';
import { AccountManagemantService } from '../../services/account-managemant.service';
@Component({
selector: 'app-partner-virtual-account-detail',
templateUrl: './virtual-account-detail.component.html',
})
export class PartnerAccountManagementVirtualAccountDetailComponent implements OnInit {
url = `/user`;
schema!: SFSchema;
ui!: SFUISchema;
@ViewChild('st') private readonly st!: STComponent;
@ViewChild('sf') private readonly sf!: SFComponent;
columns: STColumn[] = [];
id = '';
_$expand = false;
constructor(public shipperservice: ShipperBaseService, public amService: AccountManagemantService, private modalRef: NzModalRef) { }
get reqParams() {
return { ...this.sf?.value };
}
ngOnInit(): void {
this.initSF();
this.initST();
}
initSF() {
this.schema = {
properties: {
_$expand: {
type: 'boolean', ui: { hidden: true }
},
abnormalCause: {
title: '合伙人名称',
type: 'string',
ui: {
placeholder: '请输入',
},
},
abnormalCause1: {
title: '手机号',
type: 'string',
ui: {
placeholder: '请输入',
},
},
abnormalCause2: {
title: '网络货运人',
type: 'string',
default: '',
ui: {
widget: 'select',
placeholder: '请选择',
allowClear: true,
asyncData: () => this.shipperservice.getNetworkFreightForwarder({}, true)
}
},
bankType: {
type: 'string',
title: '银行类型',
default: '',
ui: {
widget: 'dict-select',
params: {
dictKey: 'bankname:type'
},
placeholder: '请选择',
allowClear: true,
containsAllLabel: true,
visibleIf: {
_$expand: (value: boolean) => value,
},
},
},
abnormalCause3: {
title: '虚拟账户',
type: 'string',
ui: {
placeholder: '请输入',
visibleIf: {
_$expand: (value: boolean) => value
},
},
},
createTime: {
type: 'string',
title: '创建时间',
ui: {
widget: 'sl-from-to',
type: 'date',
autoComplete: 'off',
format: 'yyyy-MM-dd',
visibleIf: {
_$expand: (value: boolean) => value
},
} as SFDateWidgetSchema,
},
}
}
this.ui = { '*': { spanLabelFixed: 100, grid: { span: 8, gutter: 4 } }, };
}
/**
* 初始化数据列表
*/
initST() {
this.columns = [
{ title: '合伙人', index: 'carNo', className: 'text-center', width: 200 },
{ title: '手机号', render: 'carModelLabel', className: 'text-center', width: 150 },
{ title: '网络货运人', render: 'carModelLabel', className: 'text-center', width: 200 },
{ title: '银行类型', render: 'carModelLabel', className: 'text-center', width: 120 },
{ title: '虚拟账户', render: 'carModelLabel', className: 'text-center', width: 180 },
{ title: '可用余额', render: 'approvalStatus1', className: 'text-right', width: 180 },
{ title: '账户总余额', render: 'approvalStatus2', className: 'text-right', width: 180 },
{ title: '可用余额（元）', render: 'approvalStatus3', className: 'text-right', width: 180 },
{ title: '创建时间', index: 'approvalStatus4', className: 'text-center', width: 200 },
{ title: '状态', index: 'approvalStatus4', className: 'text-center', width: 120 },
{
title: '操作',
width: 120,
buttons: [
{
text: '查看明细',
click: (_record) => this.viewDetail(_record)
}
]
}
];
}
resetSF() {
this._$expand = false;
this.sf.reset();
setTimeout(() => {
this.st.reset();
})
}
/**
* 伸缩查询条件
*/
expandToggle() {
this._$expand = !this._$expand;
this.sf?.setValue('/_$expand', this._$expand);
}
add(): void {
// this.modal
// .createStatic(FormEditComponent, { i: { id: 0 } })
// .subscribe(() => this.st.reload());
}
search() {
this.st.load(1);
}
export() { }
/**
*
* @param _record 当前行信息
*/
viewDetail(_record: any) {
}
close() {
this.modalRef.destroy();
}
}

1
src/app/routes/partner/account-management/services/account-managemant.service.ts
View File

@ -6,6 +6,7 @@ import { BaseService } from '@shared';
}) })
export class AccountManagemantService extends BaseService { export class AccountManagemantService extends BaseService {
$api_get_account_management_page = `/api/fcc/ficoBrmH/list/page`;
constructor(public injector: Injector) { constructor(public injector: Injector) {
super(injector) super(injector)
} }

4
src/app/routes/partner/partner-routing.module.ts
View File

@ -22,6 +22,7 @@ import { PartnerSalePartnerDetailComponent } from './business-statistics/compone
import { PartnerPartnerCustomOrderDetailComponent } from './business-statistics/components/partner-custom-order-detail/partner-custom-order-detail.component'; import { PartnerPartnerCustomOrderDetailComponent } from './business-statistics/components/partner-custom-order-detail/partner-custom-order-detail.component';
import { PartnerPartnerOrderDetailComponent } from './business-statistics/components/partner-order-detail/partner-order-detail.component'; import { PartnerPartnerOrderDetailComponent } from './business-statistics/components/partner-order-detail/partner-order-detail.component';
import { PartnerAccountManagementListComponent } from './account-management/components/list/list.component'; import { PartnerAccountManagementListComponent } from './account-management/components/list/list.component';
import { PartnerAccountManagementVirtualAccountDetailComponent } from './account-management/components/virtual-account-detail/virtual-account-detail.component';
const routes: Routes = [ const routes: Routes = [
{ {
@ -63,7 +64,8 @@ const routes: Routes = [
children: [ children: [
{ path: 'list', component: PartnerAccountManagementListComponent }, { path: 'list', component: PartnerAccountManagementListComponent },
] ]
}]; },
];
@NgModule({ @NgModule({
imports: [RouterModule.forChild(routes)], imports: [RouterModule.forChild(routes)],
exports: [RouterModule] exports: [RouterModule]

4
src/app/routes/partner/partner.module.ts
View File

@ -16,6 +16,7 @@ import { PartnerSalePartnerDetailComponent } from './business-statistics/compone
import { PartnerPartnerCustomOrderDetailComponent } from './business-statistics/components/partner-custom-order-detail/partner-custom-order-detail.component'; import { PartnerPartnerCustomOrderDetailComponent } from './business-statistics/components/partner-custom-order-detail/partner-custom-order-detail.component';
import { PartnerPartnerOrderDetailComponent } from './business-statistics/components/partner-order-detail/partner-order-detail.component'; import { PartnerPartnerOrderDetailComponent } from './business-statistics/components/partner-order-detail/partner-order-detail.component';
import { PartnerAccountManagementListComponent } from './account-management/components/list/list.component'; import { PartnerAccountManagementListComponent } from './account-management/components/list/list.component';
import { PartnerAccountManagementVirtualAccountDetailComponent } from './account-management/components/virtual-account-detail/virtual-account-detail.component';
const COMPONENTS: any[] = [ const COMPONENTS: any[] = [
PartnerBusinessStatisticsIndexComponent, PartnerBusinessStatisticsIndexComponent,
@ -32,7 +33,8 @@ const COMPONENTS: any[] = [
PartnerSalePartnerDetailComponent, PartnerSalePartnerDetailComponent,
PartnerPartnerCustomOrderDetailComponent, PartnerPartnerCustomOrderDetailComponent,
PartnerPartnerOrderDetailComponent, PartnerPartnerOrderDetailComponent,
PartnerAccountManagementListComponent]; PartnerAccountManagementListComponent,
PartnerAccountManagementVirtualAccountDetailComponent];
@NgModule({ @NgModule({
declarations: [...COMPONENTS], declarations: [...COMPONENTS],

34
src/app/routes/supply-management/components/bulk/bulk.component.ts
View File

@ -55,8 +55,8 @@ export class SupplyManagementBulkComponent implements OnInit {
* 查询参数 * 查询参数
*/ */
get reqParams() { get reqParams() {
const a:any = {}; const a: any = {};
if(this.resourceStatus) { if (this.resourceStatus) {
a.resourceStatus = this.resourceStatus a.resourceStatus = this.resourceStatus
} }
const params: any = Object.assign({}, this.sf?.value || {}); const params: any = Object.assign({}, this.sf?.value || {});
@ -110,9 +110,9 @@ export class SupplyManagementBulkComponent implements OnInit {
default: '', default: '',
ui: { ui: {
widget: 'dict-select', widget: 'dict-select',
containsAllLable: true, containsAllLabel: true,
params: { dictKey: 'service:type' }, params: { dictKey: 'service:type' },
containAllLable:true, containAllLable: true,
visibleIf: { visibleIf: {
_$expand: (value: boolean) => value, _$expand: (value: boolean) => value,
}, },
@ -123,9 +123,9 @@ export class SupplyManagementBulkComponent implements OnInit {
type: 'string', type: 'string',
ui: { ui: {
widget: 'dict-select', widget: 'dict-select',
containsAllLable: true, containsAllLabel: true,
params: { dictKey: 'goodresource:settlement:type' }, params: { dictKey: 'goodresource:settlement:type' },
containAllLable:true, containAllLable: true,
visibleIf: { visibleIf: {
_$expand: (value: boolean) => value, _$expand: (value: boolean) => value,
}, },
@ -186,7 +186,7 @@ export class SupplyManagementBulkComponent implements OnInit {
console.log(q) console.log(q)
if (!!q) { if (!!q) {
return this.service return this.service
.request(this.service.$api_enterpriceList, { enterpriseName: q}) .request(this.service.$api_enterpriceList, { enterpriseName: q })
.pipe(map((res: any) => (res as any[]).map((i) => ({ label: i.enterpriseName, value: i.id } as SFSchemaEnum)))) .pipe(map((res: any) => (res as any[]).map((i) => ({ label: i.enterpriseName, value: i.id } as SFSchemaEnum))))
.toPromise(); .toPromise();
} else { } else {
@ -314,7 +314,7 @@ export class SupplyManagementBulkComponent implements OnInit {
{ {
text: '修改单价', text: '修改单价',
click: (_record) => this.modification(_record), click: (_record) => this.modification(_record),
iif: item => item.resourceStatus == 1 , iif: item => item.resourceStatus == 1,
acl: { ability: ['SUPPLY-INDEX-modificationUnitPrice'] }, acl: { ability: ['SUPPLY-INDEX-modificationUnitPrice'] },
}, },
{ {
@ -397,8 +397,8 @@ export class SupplyManagementBulkComponent implements OnInit {
audit(value: any, status?: any) { audit(value: any, status?: any) {
console.log(value) console.log(value)
console.log(status) console.log(status)
if(status === 2) { if (status === 2) {
if(this.selectedRows.length <= 0) { if (this.selectedRows.length <= 0) {
this.service.msgSrv.error('未选择货源单！'); this.service.msgSrv.error('未选择货源单！');
return return
} }
@ -415,8 +415,8 @@ export class SupplyManagementBulkComponent implements OnInit {
this.isVisible = true; this.isVisible = true;
} }
/** /**
* 审核关闭弹窗 * 审核关闭弹窗
*/ */
handleCancel(type: any) { handleCancel(type: any) {
this.isVisible = false this.isVisible = false
} }
@ -430,12 +430,12 @@ export class SupplyManagementBulkComponent implements OnInit {
* 审核通过按钮 * 审核通过按钮
*/ */
handleOK(value: any) { handleOK(value: any) {
if(this.selectedRows.length <= 0) { if (this.selectedRows.length <= 0) {
const params: any = { const params: any = {
id: this.auditID, id: this.auditID,
remarks: this.sfFre.value.remarks, remarks: this.sfFre.value.remarks,
} }
if(value == 1) { if (value == 1) {
params.auditStatus = 2 params.auditStatus = 2
} else { } else {
params.auditStatus = 3 params.auditStatus = 3
@ -454,7 +454,7 @@ export class SupplyManagementBulkComponent implements OnInit {
ids: this.auditID, ids: this.auditID,
remarks: this.sfFre.value.remarks, remarks: this.sfFre.value.remarks,
} }
if(value == 1) { if (value == 1) {
params.auditStatus = 2 params.auditStatus = 2
} else { } else {
params.auditStatus = 3 params.auditStatus = 3
@ -509,8 +509,8 @@ export class SupplyManagementBulkComponent implements OnInit {
nzTitle: '<b>确定取消货源吗?</b>', nzTitle: '<b>确定取消货源吗?</b>',
nzContent: `<b>取消后不可恢复，谨慎操作</b>`, nzContent: `<b>取消后不可恢复，谨慎操作</b>`,
nzOnOk: () => nzOnOk: () =>
this.service.request(this.service.$api_cancelSource, {id: item.id}).subscribe((res) => { this.service.request(this.service.$api_cancelSource, { id: item.id }).subscribe((res) => {
if(res) { if (res) {
this.service.msgSrv.success('已取消货源！') this.service.msgSrv.success('已取消货源！')
this.st?.reload(); this.st?.reload();
this.getGoodsSourceStatistical(); this.getGoodsSourceStatistical();

84
src/app/routes/supply-management/components/release-publish/release-publish.component.ts
View File

@ -65,10 +65,10 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
this.validateForm1 = fb.group({ this.validateForm1 = fb.group({
loadAddress0: [null, [Validators.required]], loadAddress0: [null, [Validators.required]],
loadName0: [null, [Validators.required]], loadName0: [null, [Validators.required]],
loadPhone0: [null, [Validators.required,Validators.pattern('^[0-9]*$')]], loadPhone0: [null, [Validators.required, Validators.pattern('^[0-9]*$')]],
unloadAddress0: [null, [Validators.required]], unloadAddress0: [null, [Validators.required]],
unloadName0: [null, [Validators.required]], unloadName0: [null, [Validators.required]],
unloadPhone0: [null, [Validators.required,Validators.pattern('^[0-9]*$')]], unloadPhone0: [null, [Validators.required, Validators.pattern('^[0-9]*$')]],
loadingTime: [null, []], loadingTime: [null, []],
unloadingTime: [null, []] unloadingTime: [null, []]
}); });
@ -101,15 +101,15 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
@ViewChild('sf7', { static: false }) sf7!: SFComponent; @ViewChild('sf7', { static: false }) sf7!: SFComponent;
schema7: SFSchema = {}; schema7: SFSchema = {};
ui7!: SFUISchema; ui7!: SFUISchema;
formatterRmb = (value: number): string =>{ formatterRmb = (value: number): string => {
if(value){ if (value) {
let value2 = Number(value).toLocaleString(undefined,{'minimumFractionDigits':2,'maximumFractionDigits':2}); let value2 = Number(value).toLocaleString(undefined, { 'minimumFractionDigits': 2, 'maximumFractionDigits': 2 });
return `￥ ${value2}`; return `￥ ${value2}`;
} }
return `￥ 0.00` return `￥ 0.00`
} ; };
parserRmb = (value: string): string => value.replace('￥ ', '').replace(',',''); parserRmb = (value: string): string => value.replace('￥ ', '').replace(',', '');
// 页面初始化 // 页面初始化
ngOnInit(): void { ngOnInit(): void {
this.initSF1(); this.initSF1();
@ -221,7 +221,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
} as SFSelectWidgetSchema } as SFSelectWidgetSchema
} }
}, },
required: ['shipperAppUserId', 'enterpriseProjectId', 'enterpriseInfoName', ] required: ['shipperAppUserId', 'enterpriseProjectId', 'enterpriseInfoName',]
}; };
this.ui1 = { this.ui1 = {
'*': { '*': {
@ -343,13 +343,13 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
ui: { ui: {
widget: 'select', widget: 'select',
mode: 'multiple', mode: 'multiple',
maxMultipleCount:3, maxMultipleCount: 3,
placeholder: '请选择车型', placeholder: '请选择车型',
errors: { required: '请选择车型' }, errors: { required: '请选择车型' },
asyncData: () => this.service.getDictOptions({ dictKey: 'car:model' }), asyncData: () => this.service.getDictOptions({ dictKey: 'car:model' }),
change:(tag:any , org:any)=>{ change: (tag: any, org: any) => {
if(tag.includes("999")){ if (tag.includes("999")) {
this.sf4.setValue('/carModel',["999"]); this.sf4.setValue('/carModel', ["999"]);
} }
} }
} }
@ -360,13 +360,13 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
ui: { ui: {
widget: 'select', widget: 'select',
mode: 'multiple', mode: 'multiple',
maxMultipleCount:3, maxMultipleCount: 3,
placeholder: '请选择车长', placeholder: '请选择车长',
errors: { required: '请选择车长' }, errors: { required: '请选择车长' },
asyncData: () => this.service.getDictOptions({ dictKey: 'car:length' }), asyncData: () => this.service.getDictOptions({ dictKey: 'car:length' }),
change:(tag:any , org:any)=>{ change: (tag: any, org: any) => {
if(tag.includes("999")){ if (tag.includes("999")) {
this.sf4.setValue('/carModel',["999"]); this.sf4.setValue('/carModel', ["999"]);
} }
} }
} }
@ -443,29 +443,29 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
ui: { ui: {
widget: 'select' widget: 'select'
}, },
default:'0' default: '0'
}, },
type1: { type1: {
type: 'string', type: 'string',
title: '', title: '',
enum: ['车辆实时定位', '轨迹查询', '数据保护','赠送基本险'], enum: ['车辆实时定位', '轨迹查询', '数据保护', '赠送基本险'],
readOnly: true, readOnly: true,
ui: { ui: {
widget: 'checkbox', widget: 'checkbox',
visibleIf: {insuranceType: (value: string) => value ==='1'}, visibleIf: { insuranceType: (value: string) => value === '1' },
} as SFCheckboxWidgetSchema, } as SFCheckboxWidgetSchema,
default: ['车辆实时定位', '轨迹查询', '数据保护','赠送基本险'], default: ['车辆实时定位', '轨迹查询', '数据保护', '赠送基本险'],
}, },
type2: { type2: {
type: 'string', type: 'string',
title: '', title: '',
enum: ['车辆实时定位', '轨迹查询', '数据保护','专属技术服务','赠送综合险'], enum: ['车辆实时定位', '轨迹查询', '数据保护', '专属技术服务', '赠送综合险'],
readOnly: true, readOnly: true,
ui: { ui: {
widget: 'checkbox', widget: 'checkbox',
visibleIf: {insuranceType: (value: string) => value ==='2'}, visibleIf: { insuranceType: (value: string) => value === '2' },
} as SFCheckboxWidgetSchema, } as SFCheckboxWidgetSchema,
default: ['车辆实时定位', '轨迹查询', '数据保护','专属技术服务','赠送综合险'], default: ['车辆实时定位', '轨迹查询', '数据保护', '专属技术服务', '赠送综合险'],
} }
} }
}; };
@ -501,7 +501,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
ui: { ui: {
widget: 'dict-select', widget: 'dict-select',
params: { dictKey: 'receipt:type' }, params: { dictKey: 'receipt:type' },
containsAllLable: false, containsAllLabel: false,
placeholder: '请选择', placeholder: '请选择',
errors: { required: '请选择' }, errors: { required: '请选择' },
visibleIf: { visibleIf: {
@ -573,7 +573,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
} as SFTextareaWidgetSchema } as SFTextareaWidgetSchema
} }
}, },
required: ['stateReceipt', 'receiptType', 'receiptUserName','receiptUserPhone','receiptAddressArea','receiptAddress'] required: ['stateReceipt', 'receiptType', 'receiptUserName', 'receiptUserPhone', 'receiptAddressArea', 'receiptAddress']
}; };
this.ui6 = { this.ui6 = {
'*': { '*': {
@ -589,19 +589,19 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
type: 'number', type: 'number',
title: '预付', title: '预付',
default: 0, default: 0,
ui: {widget: 'custom'} ui: { widget: 'custom' }
}, },
toPay: { toPay: {
type: 'number', type: 'number',
title: '到付', title: '到付',
default: 0, default: 0,
ui: { widget: 'custom'} ui: { widget: 'custom' }
}, },
receiptPay: { receiptPay: {
type: 'number', type: 'number',
title: '回单付', title: '回单付',
default: 0, default: 0,
ui: {widget: 'custom'} ui: { widget: 'custom' }
}, },
subtotal: { type: 'number', title: '小计', default: 0, ui: { widget: 'custom' } as SFNumberWidgetSchema }, subtotal: { type: 'number', title: '小计', default: 0, ui: { widget: 'custom' } as SFNumberWidgetSchema },
appendFee: { type: 'number', title: '附加费', default: 0, ui: { widget: 'custom' } as SFNumberWidgetSchema }, appendFee: { type: 'number', title: '附加费', default: 0, ui: { widget: 'custom' } as SFNumberWidgetSchema },
@ -651,12 +651,12 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
const params = { const params = {
shipperId: this.envCache?.enterpriseId, shipperId: this.envCache?.enterpriseId,
enterpriseInfoId: this.envCache?.networkTransporterId, enterpriseInfoId: this.envCache?.networkTransporterId,
totalFreight:subtotal, totalFreight: subtotal,
fuelCardAmount:oilCardPay, fuelCardAmount: oilCardPay,
resourcetype:'1' resourcetype: '1'
} }
this.service this.service
.request(this.service.$api_getCalculatedSurcharge,params) .request(this.service.$api_getCalculatedSurcharge, params)
.subscribe(res => { .subscribe(res => {
if (res) { if (res) {
this.sf7.setValue('/appendFee', res.surcharge); this.sf7.setValue('/appendFee', res.surcharge);
@ -818,7 +818,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
...this.sf6.value, ...this.sf6.value,
expenseDTOList: expenseList, expenseDTOList: expenseList,
paymentDays: this.sf7.value.paymentDays, paymentDays: this.sf7.value.paymentDays,
insuranceType:this.sf55.value.insuranceType, insuranceType: this.sf55.value.insuranceType,
}; };
let reqUrl = this.service.$api_consignWhole; let reqUrl = this.service.$api_consignWhole;
@ -978,13 +978,13 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
window.history.go(-1); window.history.go(-1);
} }
// 装卸货地址互换 // 装卸货地址互换
swapAddress(){ swapAddress() {
this.startInfo.forEach((element:any, index:any) => { this.startInfo.forEach((element: any, index: any) => {
this.validateForm1.removeControl(`loadAddress${index}`); this.validateForm1.removeControl(`loadAddress${index}`);
this.validateForm1.removeControl(`loadName${index}`); this.validateForm1.removeControl(`loadName${index}`);
this.validateForm1.removeControl(`loadPhone${index}`); this.validateForm1.removeControl(`loadPhone${index}`);
}); });
this.endInfo.forEach((element:any, index:any) => { this.endInfo.forEach((element: any, index: any) => {
this.validateForm1.removeControl(`unloadAddress${index}`); this.validateForm1.removeControl(`unloadAddress${index}`);
this.validateForm1.removeControl(`unloadName${index}`); this.validateForm1.removeControl(`unloadName${index}`);
this.validateForm1.removeControl(`unloadPhone${index}`); this.validateForm1.removeControl(`unloadPhone${index}`);
@ -994,13 +994,13 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
this.startInfo = this.endInfo; this.startInfo = this.endInfo;
this.endInfo = item; this.endInfo = item;
this.startInfo.forEach((element:any,index:any) => { this.startInfo.forEach((element: any, index: any) => {
element.type = '1'; element.type = '1';
this.validateForm1.addControl(`loadAddress${index}`, new FormControl(null, Validators.required)); this.validateForm1.addControl(`loadAddress${index}`, new FormControl(null, Validators.required));
this.validateForm1.addControl(`loadName${index}`, new FormControl(null, Validators.required)); this.validateForm1.addControl(`loadName${index}`, new FormControl(null, Validators.required));
this.validateForm1.addControl(`loadPhone${index}`, new FormControl(null, [Validators.required, Validators.pattern('^[0-9]*$')])); this.validateForm1.addControl(`loadPhone${index}`, new FormControl(null, [Validators.required, Validators.pattern('^[0-9]*$')]));
}); });
this.endInfo.forEach((element:any,index:any) => { this.endInfo.forEach((element: any, index: any) => {
element.type = '2'; element.type = '2';
this.validateForm1.addControl(`unloadAddress${index}`, new FormControl(null, Validators.required)); this.validateForm1.addControl(`unloadAddress${index}`, new FormControl(null, Validators.required));
this.validateForm1.addControl(`unloadName${index}`, new FormControl(null, Validators.required)); this.validateForm1.addControl(`unloadName${index}`, new FormControl(null, Validators.required));
@ -1019,7 +1019,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
console.log(value); console.log(value);
console.log(this.totalDistance); console.log(this.totalDistance);
if(value >= 50000 && this.totalDistance > 0){ if (value >= 50000 && this.totalDistance > 0) {
const params = { const params = {
goodsValue: value, goodsValue: value,
insuranceType: this.sf55.value.insuranceType, insuranceType: this.sf55.value.insuranceType,
@ -1029,9 +1029,9 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
.request(this.service.$api_getWholeInsuranceInfo, params) .request(this.service.$api_getWholeInsuranceInfo, params)
.subscribe(res => { .subscribe(res => {
if (res) { if (res) {
this.sf5.setValue('/insurancePremium',res.insurancePremium); this.sf5.setValue('/insurancePremium', res.insurancePremium);
}else{ } else {
this.sf5.setValue('/insurancePremium',null); this.sf5.setValue('/insurancePremium', null);
} }
}); });
} }

10
src/app/routes/supply-management/components/vehicle/vehicle.component.ts
View File

@ -44,7 +44,7 @@ export class SupplyManagementVehicleComponent implements OnInit {
private router: Router, private router: Router,
private ar: ActivatedRoute, private ar: ActivatedRoute,
public shipperSrv: ShipperBaseService public shipperSrv: ShipperBaseService
) {} ) { }
/** /**
* 查询参数 * 查询参数
@ -147,7 +147,7 @@ export class SupplyManagementVehicleComponent implements OnInit {
/** /**
* 导入货源 * 导入货源
*/ */
importGoodsSource() {} importGoodsSource() { }
/** /**
* 修改运费 * 修改运费
@ -382,7 +382,7 @@ export class SupplyManagementVehicleComponent implements OnInit {
// _$expand: (value: boolean) => value // _$expand: (value: boolean) => value
// }, // },
// allowClear: true, // allowClear: true,
// containsAllLable: true, // containsAllLabel: true,
// asyncData: () => this.shipperSrv.getEnterpriseProject(this.sf.value?.shipperAppUserId) // asyncData: () => this.shipperSrv.getEnterpriseProject(this.sf.value?.shipperAppUserId)
// } as SFSelectWidgetSchema // } as SFSelectWidgetSchema
// }, // },
@ -402,7 +402,7 @@ export class SupplyManagementVehicleComponent implements OnInit {
type: 'string', type: 'string',
ui: { ui: {
widget: 'dict-select', widget: 'dict-select',
containsAllLable: true, containsAllLabel: true,
params: { dictKey: 'service:type' }, params: { dictKey: 'service:type' },
visibleIf: { visibleIf: {
_$expand: (value: boolean) => value _$expand: (value: boolean) => value
@ -416,7 +416,7 @@ export class SupplyManagementVehicleComponent implements OnInit {
ui: { ui: {
widget: 'dict-select', widget: 'dict-select',
allowClear: true, allowClear: true,
containsAllLable: true, containsAllLabel: true,
params: { dictKey: 'goodresource:audit:status' }, params: { dictKey: 'goodresource:audit:status' },
visibleIf: { visibleIf: {
_$expand: (value: boolean) => value _$expand: (value: boolean) => value

12
src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts
View File

@ -30,9 +30,9 @@ export class CancellationInvoiceComponent implements OnInit {
totalCallNo = 0; totalCallNo = 0;
openInfo: any = { invoicedate: null, invoiceno: null }; openInfo: any = { invoicedate: null, invoiceno: null };
constructor(public service: TicketService, private nzModalService: NzModalService, private router: Router) {} constructor(public service: TicketService, private nzModalService: NzModalService, private router: Router) { }
ngOnInit(): void {} ngOnInit(): void { }
beforeReq = (requestOptions: STRequestOptions) => { beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) { if (this.sf) {
@ -113,7 +113,7 @@ export class CancellationInvoiceComponent implements OnInit {
this.nzModalService.warning({ this.nzModalService.warning({
nzTitle: '确定将所选待处理开票申请推送开票？', nzTitle: '确定将所选待处理开票申请推送开票？',
nzContent: '推送开票后发票信息不可修改，待系统开票完成后会自动返回开票结果', nzContent: '推送开票后发票信息不可修改，待系统开票完成后会自动返回开票结果',
nzOnOk: () => {} nzOnOk: () => { }
}); });
} }
@ -130,7 +130,7 @@ export class CancellationInvoiceComponent implements OnInit {
this.nzModalService.warning({ this.nzModalService.warning({
nzTitle: '确定将所选待确认开票申请撤回？', nzTitle: '确定将所选待确认开票申请撤回？',
nzContent: '提交税控后发票信息不可修改，待税控开票完成后返回开票结果', nzContent: '提交税控后发票信息不可修改，待税控开票完成后返回开票结果',
nzOnOk: () => {} nzOnOk: () => { }
}); });
} }
@ -147,7 +147,7 @@ export class CancellationInvoiceComponent implements OnInit {
this.nzModalService.warning({ this.nzModalService.warning({
nzTitle: '确定将所选待确认开票申请撤回？', nzTitle: '确定将所选待确认开票申请撤回？',
nzContent: '提交税控后发票信息不可修改，待税控开票完成后返回开票结果', nzContent: '提交税控后发票信息不可修改，待税控开票完成后返回开票结果',
nzOnOk: () => {} nzOnOk: () => { }
}); });
} }
@ -232,7 +232,7 @@ export class CancellationInvoiceComponent implements OnInit {
type: 'string', type: 'string',
ui: { ui: {
widget: 'dict-select', widget: 'dict-select',
containsAllLable: true, containsAllLabel: true,
params: { dictKey: 'vatinv:status' }, params: { dictKey: 'vatinv:status' },
containAllLable: true, containAllLable: true,
visibleIf: { visibleIf: {

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

@ -22,7 +22,7 @@ export class VehicleComponentsAuditComponent implements OnInit {
@ViewChild('st', { static: false }) st!: STComponent; @ViewChild('st', { static: false }) st!: STComponent;
@ViewChild('sf', { static: false }) sf!: SFComponent; @ViewChild('sf', { static: false }) sf!: SFComponent;
constructor(public service: VehicleService, private modal: NzModalService, private router: Router, private ar: ActivatedRoute, private modalHelper: ModalHelper) {} constructor(public service: VehicleService, private modal: NzModalService, private router: Router, private ar: ActivatedRoute, private modalHelper: ModalHelper) { }
/** /**
* 查询字段个数navigate * 查询字段个数navigate
*/ */
@ -34,12 +34,12 @@ export class VehicleComponentsAuditComponent implements OnInit {
* 查询参数 * 查询参数
*/ */
get reqParams() { get reqParams() {
const a:any = {}; const a: any = {};
if(this.resourceStatus === 1) { if (this.resourceStatus === 1) {
a.approvalStatus = 10 a.approvalStatus = 10
} else if(this.resourceStatus === 2) { } else if (this.resourceStatus === 2) {
a.approvalStatus = 20 a.approvalStatus = 20
} else if(this.resourceStatus === 3) { } else if (this.resourceStatus === 3) {
a.approvalStatus = 30 a.approvalStatus = 30
} }
return { return {
@ -106,7 +106,7 @@ export class VehicleComponentsAuditComponent implements OnInit {
ui: { ui: {
widget: 'dict-select', widget: 'dict-select',
params: { dictKey: 'car:color' }, params: { dictKey: 'car:color' },
containsAllLable: true, containsAllLabel: true,
} }
}, },
isSelf: { isSelf: {
@ -157,17 +157,17 @@ export class VehicleComponentsAuditComponent implements OnInit {
initST() { initST() {
this.columns = [ this.columns = [
// { title: '', type: 'checkbox', className: 'text-center' }, // { title: '', type: 'checkbox', className: 'text-center' },
{ title: '车牌号', width:'180px', className: 'text-center', index: 'carNo' }, { title: '车牌号', width: '180px', className: 'text-center', index: 'carNo' },
{ title: '车牌颜色', width:'180px', className: 'text-center', index: 'carNoColorLabel' }, { title: '车牌颜色', width: '180px', className: 'text-center', index: 'carNoColorLabel' },
{ title: '车型-车长-载重', width:'180px',className: 'text-center', render: 'carLength' }, { title: '车型-车长-载重', width: '180px', className: 'text-center', render: 'carLength' },
{ title: '是否挂靠', width:'180px', className: 'text-center', render: 'isSelf' }, { title: '是否挂靠', width: '180px', className: 'text-center', render: 'isSelf' },
{ title: '所有人', width:'180px', className: 'text-center', index: 'carOwner' }, { title: '所有人', width: '180px', className: 'text-center', index: 'carOwner' },
{ title: '录入人员', width:'180px', className: 'text-center', index: 'saveUser', }, { title: '录入人员', width: '180px', className: 'text-center', index: 'saveUser', },
{ {
title: '审核状态', title: '审核状态',
className: 'text-center', className: 'text-center',
index: 'approvalStatus', index: 'approvalStatus',
width:'180px', width: '180px',
type: 'badge', type: 'badge',
badge: { badge: {
'-1': { text: '未上传', color: 'default' }, '-1': { text: '未上传', color: 'default' },
@ -179,7 +179,7 @@ export class VehicleComponentsAuditComponent implements OnInit {
40: { text: '证件过期', color: 'error' }, 40: { text: '证件过期', color: 'error' },
}, },
}, },
{ title: '申请时间', width:'180px', className: 'text-center', index: 'createTime' }, { title: '申请时间', width: '180px', className: 'text-center', index: 'createTime' },
{ {
title: '操作', title: '操作',
fixed: 'right', fixed: 'right',
@ -190,7 +190,7 @@ export class VehicleComponentsAuditComponent implements OnInit {
text: '查看', text: '查看',
acl: { ability: ['VEHICLE-AUDIT-view'] }, acl: { ability: ['VEHICLE-AUDIT-view'] },
click: (item) => { click: (item) => {
this.router.navigate(['./detail', item.id], { relativeTo: this.ar,queryParams: { carId: item.carId } }); this.router.navigate(['./detail', item.id], { relativeTo: this.ar, queryParams: { carId: item.carId } });
// this.router.navigate(['./view', item.id], { relativeTo: this.ar, queryParams: { tenantId: item.tenantId } }); // this.router.navigate(['./view', item.id], { relativeTo: this.ar, queryParams: { tenantId: item.tenantId } });
}, },
}, },
@ -224,13 +224,13 @@ export class VehicleComponentsAuditComponent implements OnInit {
} }
// 导出 // 导出
exportFire() { exportFire() {
this.service.downloadFile(this.service.$api_carLicenseAudit_export, this.reqParams ); this.service.downloadFile(this.service.$api_carLicenseAudit_export, this.reqParams);
} }
addModal() { addModal() {
const i = { const i = {
appUserId: '', appUserId: '',
} }
this.modalHelper.create(CarSettleCarauthComponent, {i}, { size: 900 }).subscribe((res) => { this.modalHelper.create(CarSettleCarauthComponent, { i }, { size: 900 }).subscribe((res) => {
this.st.load() this.st.load()
}); });
} }

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

@ -19,7 +19,7 @@ export class VehicleComponentsListComponent implements OnInit {
@ViewChild('st', { static: false }) st!: STComponent; @ViewChild('st', { static: false }) st!: STComponent;
@ViewChild('sf', { static: false }) sf!: SFComponent; @ViewChild('sf', { static: false }) sf!: SFComponent;
constructor(public service: VehicleService, private modal: NzModalService, private router: Router, private ar: ActivatedRoute) {} constructor(public service: VehicleService, private modal: NzModalService, private router: Router, private ar: ActivatedRoute) { }
/** /**
* 查询参数 * 查询参数
@ -87,7 +87,7 @@ export class VehicleComponentsListComponent implements OnInit {
title: '车牌颜色', title: '车牌颜色',
ui: { ui: {
widget: 'dict-select', widget: 'dict-select',
containsAllLable: true, containsAllLabel: true,
params: { dictKey: 'car:color' } params: { dictKey: 'car:color' }
} }
}, },
@ -109,7 +109,7 @@ export class VehicleComponentsListComponent implements OnInit {
ui: { ui: {
widget: 'dict-select', widget: 'dict-select',
params: { dictKey: 'car:model' }, params: { dictKey: 'car:model' },
containsAllLable: true, containsAllLabel: true,
visibleIf: { visibleIf: {
expand: (value: boolean) => value expand: (value: boolean) => value
} }
@ -121,7 +121,7 @@ export class VehicleComponentsListComponent implements OnInit {
ui: { ui: {
widget: 'dict-select', widget: 'dict-select',
params: { dictKey: 'car:length' }, params: { dictKey: 'car:length' },
containsAllLable: true, containsAllLabel: true,
visibleIf: { visibleIf: {
expand: (value: boolean) => value expand: (value: boolean) => value
} }

68
src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.ts
View File

@ -24,55 +24,57 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
addSchema: SFSchema = {}; addSchema: SFSchema = {};
_$expand = false; _$expand = false;
editText = ''; editText = '';
formData :any; formData: any;
isVisible = false; isVisible = false;
edit = false; edit = false;
editId = false; editId = false;
selectedIndex = 0; selectedIndex = 0;
columns: STColumn[] = [ columns: STColumn[] = [
{ title: '异常编号', index: 'exceptionCode',width: '180px',className: 'text-left', }, { title: '异常编号', index: 'exceptionCode', width: '180px', className: 'text-left', },
{ title: '关联运单号', index: 'wayBillCode',width: '180px',className: 'text-left', }, { title: '关联运单号', index: 'wayBillCode', width: '180px', className: 'text-left', },
{ title: '网络货运人', index: 'enterpriseInfoName',width: '220px',className: 'text-left', }, { title: '网络货运人', index: 'enterpriseInfoName', width: '220px', className: 'text-left', },
{ title: '货主', index: 'shipperAppUserName' ,width: '220px',className: 'text-left',}, { title: '货主', index: 'shipperAppUserName', width: '220px', className: 'text-left', },
{ title: '装货地', index: 'loadingAddressArr' ,width: '220px',className: 'text-left',}, { title: '装货地', index: 'loadingAddressArr', width: '220px', className: 'text-left', },
{ title: '卸货地', index: 'unloadingAddressArr' ,width: '220px',className: 'text-left',}, { title: '卸货地', index: 'unloadingAddressArr', width: '220px', className: 'text-left', },
{ title: '承运司机', index: 'driver' ,width: '250px',className: 'text-left',}, { title: '承运司机', index: 'driver', width: '250px', className: 'text-left', },
{ title: '异常信息', index: 'exceptionContent',width: '250px',className: 'text-left', }, { title: '异常信息', index: 'exceptionContent', width: '250px', className: 'text-left', },
{ title: '异常图片', render: 'exceptionCertificateFirstFilePath' ,width: '200px',className: 'text-left',}, { title: '异常图片', render: 'exceptionCertificateFirstFilePath', width: '200px', className: 'text-left', },
{ title: '上报时间', index: 'createTime',width: '180px' ,className: 'text-left',}, { title: '上报时间', index: 'createTime', width: '180px', className: 'text-left', },
]; ];
columns2: STColumn[] = [ columns2: STColumn[] = [
{ title: '异常编号', index: 'exceptionCode',width: '180px',className: 'text-left' }, { title: '异常编号', index: 'exceptionCode', width: '180px', className: 'text-left' },
{ title: '关联运单号', index: 'wayBillCode',width: '180px' ,className: 'text-left'}, { title: '关联运单号', index: 'wayBillCode', width: '180px', className: 'text-left' },
{ title: '网络货运人', index: 'enterpriseInfoName',width: '180px',className: 'text-left' }, { title: '网络货运人', index: 'enterpriseInfoName', width: '180px', className: 'text-left' },
{ title: '货主', index: 'shipperAppUserName' ,width: '180px',className: 'text-left'}, { title: '货主', index: 'shipperAppUserName', width: '180px', className: 'text-left' },
{ title: '装货地', index: 'loadingPlace' ,width: '180px',className: 'text-left'}, { title: '装货地', index: 'loadingPlace', width: '180px', className: 'text-left' },
{ title: '卸货地', index: 'dischargePlace' ,width: '180px',className: 'text-left'}, { title: '卸货地', index: 'dischargePlace', width: '180px', className: 'text-left' },
{ title: '承运司机', index: 'driver' ,width: '90px',className: 'text-left'}, { title: '承运司机', index: 'driver', width: '90px', className: 'text-left' },
{ title: '异常信息', index: 'exceptionContent',width: '250px' ,className: 'text-left'}, { title: '异常信息', index: 'exceptionContent', width: '250px', className: 'text-left' },
{ title: '异常图片', render: 'exceptionCertificateFirstFilePath' ,width: '220px',className: 'text-left'}, { title: '异常图片', render: 'exceptionCertificateFirstFilePath', width: '220px', className: 'text-left' },
{ title: '上报时间', index: 'reportingTime',width: '180px' ,className: 'text-left'}, { title: '上报时间', index: 'reportingTime', width: '180px', className: 'text-left' },
{ title: '回复内容', index: 'replyContent',width: '180px' ,className: 'text-left'}, { title: '回复内容', index: 'replyContent', width: '180px', className: 'text-left' },
{ title: '回复人', index: 'replyAppUserName',width: '180px' ,className: 'text-left'}, { title: '回复人', index: 'replyAppUserName', width: '180px', className: 'text-left' },
{ title: '回复时间', index: 'replyTime',width: '180px' ,className: 'text-left'}, { title: '回复时间', index: 'replyTime', width: '180px', className: 'text-left' },
]; ];
get reqParams (){ get reqParams() {
return { return {
...this.sf?.value, ...this.sf?.value,
}}; }
get reqParams2 (){ };
get reqParams2() {
return { return {
...this.sf?.value, ...this.sf?.value,
}}; }
};
constructor( constructor(
public service: WaybillManagementServe, public service: WaybillManagementServe,
private nzModalService: NzModalService, private nzModalService: NzModalService,
public shipperSrv: ShipperBaseService public shipperSrv: ShipperBaseService
) {} ) { }
ngOnInit(): void { ngOnInit(): void {
this.initSF() this.initSF()
@ -91,7 +93,7 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
get queryFieldCount(): number { get queryFieldCount(): number {
return Object.keys(this.schema?.properties || {}).length; return Object.keys(this.schema?.properties || {}).length;
} }
initSF(){ initSF() {
this.schema = { this.schema = {
properties: { properties: {
_$expand: { type: 'boolean', ui: { hidden: true } }, _$expand: { type: 'boolean', ui: { hidden: true } },
@ -110,7 +112,7 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
type: 'string', type: 'string',
ui: { ui: {
widget: 'dict-select', widget: 'dict-select',
containsAllLable: true, containsAllLabel: true,
params: { dictKey: 'exception:report:type' }, params: { dictKey: 'exception:report:type' },
} as SFSelectWidgetSchema } as SFSelectWidgetSchema
}, },
@ -127,7 +129,7 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
console.log(q) console.log(q)
if (!!q) { if (!!q) {
return this.service return this.service
.request(this.service.$api_enterpriceList, { enterpriseName: q}) .request(this.service.$api_enterpriceList, { enterpriseName: q })
.pipe(map((res: any) => (res as any[]).map((i) => ({ label: i.enterpriseName, value: i.id } as SFSchemaEnum)))) .pipe(map((res: any) => (res as any[]).map((i) => ({ label: i.enterpriseName, value: i.id } as SFSchemaEnum))))
.toPromise(); .toPromise();
} else { } else {
@ -203,7 +205,7 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
search() { search() {
console.log(this.selectedIndex) console.log(this.selectedIndex)
if(this.selectedIndex === 0) { if (this.selectedIndex === 0) {
this.st?.load(1) this.st?.load(1)
} else { } else {
this.st2?.load(1) this.st2?.load(1)

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

@ -27,14 +27,14 @@ export class WaybillManagementBulkComponent implements OnInit {
@ViewChild('sf', { static: false }) sf!: SFComponent; @ViewChild('sf', { static: false }) sf!: SFComponent;
columns: STColumn[] = []; columns: STColumn[] = [];
resourceStatus: any; resourceStatus: any;
tabs = { tabs = {
signQuantity: 0, signQuantity: 0,
cancelQuantity: 0, cancelQuantity: 0,
receivedQuantity: 0, receivedQuantity: 0,
totalQuantity: 0, totalQuantity: 0,
compolatelQuantity: 0, compolatelQuantity: 0,
deltQuantity: 0 deltQuantity: 0
}; };
constructor( constructor(
public service: WaybillManagementServe, public service: WaybillManagementServe,
private modal: NzModalService, private modal: NzModalService,
@ -44,8 +44,8 @@ tabs = {
* 查询参数 * 查询参数
*/ */
get reqParams() { get reqParams() {
const a:any = {}; const a: any = {};
if(this.resourceStatus) { if (this.resourceStatus) {
a.wayBillStatus = this.resourceStatus a.wayBillStatus = this.resourceStatus
} }
const params: any = Object.assign({}, this.sf?.value || {}); const params: any = Object.assign({}, this.sf?.value || {});
@ -98,7 +98,7 @@ tabs = {
console.log(q) console.log(q)
if (!!q) { if (!!q) {
return this.service return this.service
.request(this.service.$api_enterpriceList, { enterpriseName: q}) .request(this.service.$api_enterpriceList, { enterpriseName: q })
.pipe(map((res: any) => (res as any[]).map((i) => ({ label: i.enterpriseName, value: i.id } as SFSchemaEnum)))) .pipe(map((res: any) => (res as any[]).map((i) => ({ label: i.enterpriseName, value: i.id } as SFSchemaEnum))))
.toPromise(); .toPromise();
} else { } else {
@ -159,7 +159,7 @@ tabs = {
ui: { ui: {
widget: 'dict-select', widget: 'dict-select',
params: { dictKey: 'overall:payment:status' }, params: { dictKey: 'overall:payment:status' },
containsAllLable: true, containsAllLabel: true,
visibleIf: { visibleIf: {
_$expand: (value: boolean) => value, _$expand: (value: boolean) => value,
}, },
@ -170,7 +170,7 @@ tabs = {
type: 'string', type: 'string',
ui: { ui: {
widget: 'dict-select', widget: 'dict-select',
containsAllLable: true, containsAllLabel: true,
params: { dictKey: 'service:type' }, params: { dictKey: 'service:type' },
visibleIf: { visibleIf: {
_$expand: (value: boolean) => value _$expand: (value: boolean) => value
@ -315,13 +315,13 @@ tabs = {
{ {
text: '确认发车', text: '确认发车',
click: (_record) => this.sureDepart(_record), click: (_record) => this.sureDepart(_record),
iif: item => item.wayBillStatus == '2' , iif: item => item.wayBillStatus == '2',
acl: { ability: ['WAYBILL-BULK-insertBulkStartCarInfo'] }, acl: { ability: ['WAYBILL-BULK-insertBulkStartCarInfo'] },
}, },
{ {
text: '确认到车', text: '确认到车',
click: (_record) => this.sureArrive(_record), click: (_record) => this.sureArrive(_record),
iif: item => item.wayBillStatus == '3' , iif: item => item.wayBillStatus == '3',
acl: { ability: ['WAYBILL-BULK-insertBulkUnloadCarInfo'] }, acl: { ability: ['WAYBILL-BULK-insertBulkUnloadCarInfo'] },
}, },
], ],
@ -357,7 +357,7 @@ tabs = {
} }
selectChange(e: number) { selectChange(e: number) {
console.log(e); console.log(e);
if(e>=1) { if (e >= 1) {
this.resourceStatus = e + 1; this.resourceStatus = e + 1;
} }
this.initST(); this.initST();
@ -375,8 +375,8 @@ tabs = {
console.log(item) console.log(item)
} }
/** /**
* 审核通过按钮 * 审核通过按钮
*/ */
handleOK() { handleOK() {
} }
@ -402,7 +402,7 @@ tabs = {
if (res) { if (res) {
let totalCount = 0; let totalCount = 0;
res.forEach((ele: any) => { res.forEach((ele: any) => {
switch(ele.wayBillStatus) { switch (ele.wayBillStatus) {
case '2': case '2':
this.tabs.receivedQuantity = ele?.count; this.tabs.receivedQuantity = ele?.count;
break; break;

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

@ -38,13 +38,13 @@ export class WaybillManagementVehicleComponent implements OnInit {
constructor( constructor(
public service: WaybillManagementServe, public service: WaybillManagementServe,
private modal: NzModalService, private modal: NzModalService,
public shipperservice: ShipperBaseService) {} public shipperservice: ShipperBaseService) { }
/** /**
* 查询参数 * 查询参数
*/ */
get reqParams() { get reqParams() {
const a:any = {}; const a: any = {};
if (this.resourceStatus) { if (this.resourceStatus) {
a.wayBillStatus = this.resourceStatus; a.wayBillStatus = this.resourceStatus;
} }
@ -96,7 +96,7 @@ export class WaybillManagementVehicleComponent implements OnInit {
console.log(q) console.log(q)
if (!!q) { if (!!q) {
return this.service return this.service
.request(this.service.$api_enterpriceList, { enterpriseName: q}) .request(this.service.$api_enterpriceList, { enterpriseName: q })
.pipe(map((res: any) => (res as any[]).map((i) => ({ label: i.enterpriseName, value: i.id } as SFSchemaEnum)))) .pipe(map((res: any) => (res as any[]).map((i) => ({ label: i.enterpriseName, value: i.id } as SFSchemaEnum))))
.toPromise(); .toPromise();
} else { } else {
@ -171,7 +171,7 @@ export class WaybillManagementVehicleComponent implements OnInit {
ui: { ui: {
widget: 'dict-select', widget: 'dict-select',
params: { dictKey: 'overall:payment:status' }, params: { dictKey: 'overall:payment:status' },
containsAllLable: true, containsAllLabel: true,
visibleIf: { visibleIf: {
_$expand: (value: boolean) => value _$expand: (value: boolean) => value
} }
@ -182,7 +182,7 @@ export class WaybillManagementVehicleComponent implements OnInit {
type: 'string', type: 'string',
ui: { ui: {
widget: 'dict-select', widget: 'dict-select',
containsAllLable: true, containsAllLabel: true,
params: { dictKey: 'service:type' }, params: { dictKey: 'service:type' },
visibleIf: { visibleIf: {
_$expand: (value: boolean) => value _$expand: (value: boolean) => value
@ -258,7 +258,7 @@ export class WaybillManagementVehicleComponent implements OnInit {
// this.sf1.setValue('/enterpriseProjectId', this.enterpriseProjectIds); // this.sf1.setValue('/enterpriseProjectId', this.enterpriseProjectIds);
// } // }
}); });
} }
/** /**
* 初始化数据列表 * 初始化数据列表
@ -391,7 +391,7 @@ export class WaybillManagementVehicleComponent implements OnInit {
/** /**
* 导入货源 * 导入货源
*/ */
importGoodsSource() {} importGoodsSource() { }
/** /**
*查看评价 *查看评价
*/ */

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

@ -27,7 +27,7 @@ export class DictSelectComponent implements OnInit, ControlValueAccessor {
@Input() params = {};// 请求参数 @Input() params = {};// 请求参数
dictList: any[] = []; dictList: any[] = [];
@Input() containsAllLable = true; // 是否包含全部这一选项 @Input() containsAllLabel = true; // 是否包含全部这一选项
@Input() mode: 'multiple' | 'tags' | 'default' = 'default'; @Input() mode: 'multiple' | 'tags' | 'default' = 'default';
@ -55,7 +55,7 @@ export class DictSelectComponent implements OnInit, ControlValueAccessor {
this.service.getDictList(this.url || this.defaultUrl, this.params).subscribe(res => { this.service.getDictList(this.url || this.defaultUrl, this.params).subscribe(res => {
if (res) { if (res) {
this.dictList = res || []; this.dictList = res || [];
if (this.dictList.length > 0 && this.containsAllLable) { if (this.dictList.length > 0 && this.containsAllLabel) {
const obj = { label: '全部', value: '' }; const obj = { label: '全部', value: '' };
this.dictList.unshift(obj); this.dictList.unshift(obj);
} }

2
src/app/shared/widget/dict-select/dict-select.widget.html
View File

@ -8,7 +8,7 @@
--> -->
<sf-item-wrap [id]="id" [schema]="schema" [ui]="ui" [showError]="showError" [error]="error" [showTitle]="schema.title"> <sf-item-wrap [id]="id" [schema]="schema" [ui]="ui" [showError]="showError" [error]="error" [showTitle]="schema.title">
<app-dict-select [url]="ui?.url" [ngModel]="value" [params]="ui?.params" (ngModelChange)="change($event)" <app-dict-select [url]="ui?.url" [ngModel]="value" [params]="ui?.params" (ngModelChange)="change($event)"
[containsAllLable]="ui?.containsAllLable" [mode]="ui?.mode" name="sf.dict.select"> [containsAllLabel]="ui?.containsAllLabel" [mode]="ui?.mode" name="sf.dict.select">
</app-dict-select> </app-dict-select>
</sf-item-wrap> </sf-item-wrap>
<!-- <sf-item-wrap [id]="id" [schema]="schema" [ui]="ui" [showError]="showError" [error]="error" [showTitle]="schema.title"> <!-- <sf-item-wrap [id]="id" [schema]="schema" [ui]="ui" [showError]="showError" [error]="error" [showTitle]="schema.title">