-
+
+
+
+
-
+
\ No newline at end of file
diff --git a/src/app/routes/order-management/components/risk/risk.component.less b/src/app/routes/order-management/components/risk/risk.component.less
index 987664d0..e69de29b 100644
--- a/src/app/routes/order-management/components/risk/risk.component.less
+++ b/src/app/routes/order-management/components/risk/risk.component.less
@@ -1,13 +0,0 @@
-
- :host {
- p{
- margin-bottom: 0
- }
- .left_btn {
- width: 50px;
- height: 32px;
- padding-left: 8px;
- line-height:32px;
- background-color: #d7d7d7;
- }
- }
\ No newline at end of file
diff --git a/src/app/routes/order-management/components/risk/risk.component.ts b/src/app/routes/order-management/components/risk/risk.component.ts
index 400d1fb0..1188e06e 100644
--- a/src/app/routes/order-management/components/risk/risk.component.ts
+++ b/src/app/routes/order-management/components/risk/risk.component.ts
@@ -4,21 +4,20 @@ import { Component, OnInit, ViewChild } from '@angular/core';
import { STColumn, STComponent, STRequestOptions } from '@delon/abc/st';
import { SFComponent, SFDateWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
import { ModalHelper, _HttpClient } from '@delon/theme';
-import { ShipperBaseService } from '@shared';
+import { SearchDrawerService, ShipperBaseService } from '@shared';
import { NzModalService } from 'ng-zorro-antd/modal';
import { of } from 'rxjs';
import { map } from 'rxjs/operators';
import { OrderManagementService } from '../../services/order-management.service';
+import { BasicTableComponent } from 'src/app/routes/commom/components/basic-table/basic-table.component';
@Component({
selector: 'app-supply-management-risk',
templateUrl: './risk.component.html',
- styleUrls: ['./risk.component.less']
+ styleUrls: ['../../../commom/less/commom-table.less', './risk.component.less']
})
-export class OrderManagementRiskComponent implements OnInit {
- ui: SFUISchema = {};
+export class OrderManagementRiskComponent extends BasicTableComponent implements OnInit {
uiView: SFUISchema = {};
- schema: SFSchema = {};
schemaView: SFSchema = {};
auditMany = false;
loading: boolean = true;
@@ -26,7 +25,6 @@ export class OrderManagementRiskComponent implements OnInit {
auditIdR: any;
isVisibleRE = false;
resourceStatus: any;
- _$expand = false;
@ViewChild('st') private readonly st!: STComponent;
@ViewChild('sf', { static: false }) sf!: SFComponent;
@ViewChild('sfView', { static: false }) sfView!: SFComponent;
@@ -41,8 +39,11 @@ export class OrderManagementRiskComponent implements OnInit {
public service: OrderManagementService,
public shipperservice: ShipperBaseService,
private modal: NzModalService,
- public router: Router
- ) { }
+ public router: Router,
+ public searchDrawerService: SearchDrawerService
+ ) {
+ super(searchDrawerService);
+ }
/**
* 查询参数
@@ -50,7 +51,7 @@ export class OrderManagementRiskComponent implements OnInit {
get reqParams() {
const a: any = {};
if (this.resourceStatus) {
- a.representationsStatus = this.resourceStatus
+ a.representationsStatus = this.resourceStatus;
}
const params: any = Object.assign({}, this.sf?.value || {});
delete params._$expand;
@@ -59,14 +60,14 @@ export class OrderManagementRiskComponent implements OnInit {
...params,
createTime: {
start: this.sf?.value?.createTime?.[0] || '',
- end: this.sf?.value?.createTime?.[1] || '',
- },
+ end: this.sf?.value?.createTime?.[1] || ''
+ }
};
}
beforeReq = (requestOptions: STRequestOptions) => {
const a: any = {};
if (this.resourceStatus) {
- a.representationsStatus = this.resourceStatus
+ a.representationsStatus = this.resourceStatus;
}
const params: any = Object.assign({}, this.sf?.value || {});
delete params._$expand;
@@ -76,51 +77,51 @@ export class OrderManagementRiskComponent implements OnInit {
...params,
createTime: {
start: this.sf?.value?.createTime?.[0] || '',
- end: this.sf?.value?.createTime?.[1] || '',
- },
+ end: this.sf?.value?.createTime?.[1] || ''
+ }
});
}
this.loading = true;
return requestOptions;
};
afterRes = (data: any[], rawData?: any) => {
- console.log(data)
- this.loading = false
+ console.log(data);
+ this.loading = false;
return data.map(item => ({
...item,
- disabled: item.representationsStatus !== '2'
+ disabled: item.representationsStatus !== '2'
}));
};
search() {
this.st?.load(1);
- this.getGoodsSourceStatistical()
+ this.getGoodsSourceStatistical();
}
get selectedRows() {
return this.st?.list.filter(item => item.checked) || [];
}
ngOnInit(): void {
- this.getGoodsSourceStatistical()
+ this.getGoodsSourceStatistical();
this.initSF();
this.initST();
}
getGoodsSourceStatistical() {
this.service.request(this.service.$api_get_listStatisticalStatus, this.reqParams).subscribe(res => {
if (res) {
- res.forEach((element: any) => {
- console.log(element.representationsStatus);
- if(element.representationsStatus === '1') {
- this.tabs.stayQuantity = element.quantity
- } else if (element.representationsStatus == '4') {
- this.tabs.cancelQuantity = element.quantity
- } else if (element.representationsStatus == '3') {
- this.tabs.receivedQuantity = element.quantity
- }else if (element.representationsStatus == '2') {
- this.tabs.underwayQuantity = element.quantity
- }
- });
- console.log(this.tabs)
+ res.forEach((element: any) => {
+ console.log(element.representationsStatus);
+ if (element.representationsStatus === '1') {
+ this.tabs.stayQuantity = element.quantity;
+ } else if (element.representationsStatus == '4') {
+ this.tabs.cancelQuantity = element.quantity;
+ } else if (element.representationsStatus == '3') {
+ this.tabs.receivedQuantity = element.quantity;
+ } else if (element.representationsStatus == '2') {
+ this.tabs.underwayQuantity = element.quantity;
+ }
+ });
+ console.log(this.tabs);
}
- })
+ });
}
/**
* 初始化查询表单
@@ -146,48 +147,23 @@ export class OrderManagementRiskComponent implements OnInit {
},
loadingPlace: {
type: 'string',
- title: '装货地',
- ui: {
- visibleIf: {
- _$expand: (value: boolean) => value
- }
- }
+ title: '装货地'
},
dischargePlace: {
type: 'string',
- title: '卸货地',
- ui: {
- visibleIf: {
- _$expand: (value: boolean) => value
- }
- }
+ title: '卸货地'
},
driverName: {
title: '承运司机',
- type: 'string',
- ui: {
- visibleIf: {
- _$expand: (value: boolean) => value
- }
- }
+ type: 'string'
},
carNo: {
title: '车牌号',
- type: 'string',
- ui: {
- visibleIf: {
- _$expand: (value: boolean) => value
- }
- }
+ type: 'string'
},
payeeName: {
type: 'string',
- title: '车队长',
- ui: {
- visibleIf: {
- _$expand: (value: boolean) => value
- }
- }
+ title: '车队长'
},
wayBillType: {
title: '运单类型',
@@ -195,10 +171,7 @@ export class OrderManagementRiskComponent implements OnInit {
ui: {
widget: 'dict-select',
params: { dictKey: 'bill:type' },
- containsAllLabel: true,
- visibleIf: {
- _$expand: (value: boolean) => value
- }
+ containsAllLabel: true
} as SFSelectWidgetSchema
},
shipperAppUserName: {
@@ -210,11 +183,8 @@ export class OrderManagementRiskComponent implements OnInit {
searchDebounceTime: 300,
searchLoadingText: '搜索中...',
allowClear: true,
- visibleIf: {
- _$expand: (value: boolean) => value
- },
onSearch: (q: any) => {
- let str =q.replace(/^\s+|\s+$/g,"");
+ let str = q.replace(/^\s+|\s+$/g, '');
if (str) {
return this.service
.request(this.service.$api_enterpriceList, { enterpriseName: str })
@@ -223,7 +193,7 @@ export class OrderManagementRiskComponent implements OnInit {
} else {
return of([]);
}
- },
+ }
} as SFSelectWidgetSchema
},
enterpriseInfoId: {
@@ -233,11 +203,8 @@ export class OrderManagementRiskComponent implements OnInit {
widget: 'select',
placeholder: '请选择',
allowClear: true,
- visibleIf: {
- _$expand: (value: boolean) => value,
- },
- asyncData: () => this.shipperservice.getNetworkFreightForwarder(),
- },
+ asyncData: () => this.shipperservice.getNetworkFreightForwarder()
+ }
},
createTime: {
title: '创建时间',
@@ -246,16 +213,12 @@ export class OrderManagementRiskComponent implements OnInit {
widget: 'date',
mode: 'range',
format: 'yyyy-MM-dd',
- allowClear: true,
- visibleIf: {
- _$expand: (value: boolean) => value
- }
+ allowClear: true
} as SFDateWidgetSchema
}
},
type: 'object'
};
- this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } };
}
/**
@@ -347,14 +310,14 @@ export class OrderManagementRiskComponent implements OnInit {
{
text: '审核',
click: _record => this.audit(_record),
- iif: item => item.representationsStatus == '2' ,
- acl: { ability: ['ORDER-RISK-audit'] },
+ iif: item => item.representationsStatus == '2',
+ acl: { ability: ['ORDER-RISK-audit'] }
},
{
text: '详情',
click: _record => this.viewEvaluate(_record),
- iif: item => item.representationsStatus !== '1' ,
- acl: { ability: ['ORDER-RISK-riskDetail'] },
+ iif: item => item.representationsStatus !== '1',
+ acl: { ability: ['ORDER-RISK-riskDetail'] }
}
]
}
@@ -419,30 +382,10 @@ export class OrderManagementRiskComponent implements OnInit {
this.uiView = { '*': { spanLabelFixed: 110, grid: { span: 24 } } };
}
- /**
- * 查询字段个数
- */
- get queryFieldCount(): number {
- return Object.keys(this.schema?.properties || {}).length;
- }
- /**
- * 伸缩查询条件
- */
- expandToggle(): void {
- this._$expand = !this._$expand;
- this.sf?.setValue('/_$expand', this._$expand);
- }
+
tabChange(item: any) {
console.log(item);
}
- /**
- * 重置表单
- */
- resetSF(): void {
- this.sf.reset();
- this._$expand = false;
- }
-
selectChange(e: number) {
this.resourceStatus = e;
@@ -454,7 +397,7 @@ export class OrderManagementRiskComponent implements OnInit {
/**
* 导入货源
*/
- importGoodsSource() { }
+ importGoodsSource() {}
/*
* 审核关闭弹窗
@@ -472,20 +415,20 @@ export class OrderManagementRiskComponent implements OnInit {
idList.push(item.id);
});
} else {
- idList.push(this.sfView.value.id)
+ idList.push(this.sfView.value.id);
}
const parms = {
ids: idList,
auditRemark: this.sfView.value.representationsCause,
representationsStatus: 3,
- auditStatus: 2,
+ auditStatus: 2
};
this.service.request(this.service.$api_get_listRisk_audit, parms).subscribe(res => {
if (res) {
this.service.msgSrv.success('审核通过成功！');
this.isVisibleRE = false;
this.st?.load(1);
- this.getGoodsSourceStatistical()
+ this.getGoodsSourceStatistical();
}
});
}
@@ -499,7 +442,7 @@ export class OrderManagementRiskComponent implements OnInit {
idList.push(item.id);
});
} else {
- idList.push(this.sfView.value.id)
+ idList.push(this.sfView.value.id);
}
if (!this.sfView.value.representationsCause) {
this.service.msgSrv.error('拒绝原因为空！');
@@ -509,14 +452,14 @@ export class OrderManagementRiskComponent implements OnInit {
ids: idList,
auditRemark: this.sfView.value.representationsCause,
representationsStatus: 4,
- auditStatus: 3,
+ auditStatus: 3
};
this.service.request(this.service.$api_get_listRisk_audit, parms).subscribe(res => {
if (res) {
this.service.msgSrv.success('审核拒绝成功！');
this.isVisibleRE = false;
this.st?.load(1);
- this.getGoodsSourceStatistical()
+ this.getGoodsSourceStatistical();
}
});
}
@@ -531,7 +474,7 @@ export class OrderManagementRiskComponent implements OnInit {
this.isVisibleRE = true;
} else {
if (this.selectedRows.length <= 0) {
- this.service.msgSrv.error('请选择订单！')
+ this.service.msgSrv.error('请选择订单！');
return;
} else {
this.initSTAudit(2);
@@ -545,8 +488,8 @@ export class OrderManagementRiskComponent implements OnInit {
viewEvaluate(item: any) {
this.router.navigate(['/order-management/risk-detail', item.id]);
}
- // 导出
- exprot() {
- this.service.exportStart({ ...this.reqParams, pageSize: -1 }, this.service.$api_get_asyncExportRiskBillList);
- }
+ // 导出
+ exprot() {
+ this.service.exportStart({ ...this.reqParams, pageSize: -1 }, this.service.$api_get_asyncExportRiskBillList);
+ }
}
diff --git a/src/app/routes/usercenter/components/freight/list/detail/detail.component.html b/src/app/routes/usercenter/components/freight/list/detail/detail.component.html
index cfd71b20..5f8491e0 100644
--- a/src/app/routes/usercenter/components/freight/list/detail/detail.component.html
+++ b/src/app/routes/usercenter/components/freight/list/detail/detail.component.html
@@ -369,7 +369,7 @@
合伙人信息
- {{partnerInfo.partnerEnterpriseName}}
+ {{partnerInfo.partnerContactName}}
{{ item.contacter }}
/{{item.mobile}}
+
+ {{ item.partnerName }}
/{{item.promotersTelephone}}
+
{{ item.promotersTelephone
|| '添加' }}
diff --git a/src/app/routes/usercenter/components/freight/list/list.component.ts b/src/app/routes/usercenter/components/freight/list/list.component.ts
index f85f9951..162ddc2b 100644
--- a/src/app/routes/usercenter/components/freight/list/list.component.ts
+++ b/src/app/routes/usercenter/components/freight/list/list.component.ts
@@ -424,7 +424,7 @@ export class FreightComponentsListComponent implements OnInit {
enum: { 10: '整车发货', 20: '大宗发货' },
width: 140
},
- { title: '业务员', className: 'text-center', render: 'promotersTelephone', width: 150 },
+ { title: '渠道销售', className: 'text-center', render: 'promotersTelephone', width: 150 },
{ title: '合伙人', className: 'text-center', render: 'partnerName', width: 150 },
{ title: '客服人员', className: 'text-center', index: 'customerServiceIdLabel', width: 150 },
{ title: '网络货运人', className: 'text-center', index: 'netTranName', width: 180 },
diff --git a/src/app/shared/components/search-drawer/index.ts b/src/app/shared/components/search-drawer/index.ts
new file mode 100644
index 00000000..7129b4d9
--- /dev/null
+++ b/src/app/shared/components/search-drawer/index.ts
@@ -0,0 +1,3 @@
+export * from './search-drawer.component';
+export * from './search-drawer.module';
+export * from './search-drawer.service';
\ No newline at end of file
diff --git a/src/app/shared/index.ts b/src/app/shared/index.ts
index 7ea8c70d..11bf70b7 100644
--- a/src/app/shared/index.ts
+++ b/src/app/shared/index.ts
@@ -22,6 +22,7 @@ export * from './components/dynamic-setting';
export * from './components/singlepage-setting';
export * from './components/insurance-table/index';
export * from './components/rebate-table/index';
+export * from './components/search-drawer';
// Utils
export * from './utils';