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

批量审核

Browse Source
This commit is contained in:
wangshiming
2022-01-17 14:31:46 +08:00
parent 3a88615847
commit 2442f6c014
7 changed files with 167 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -168,7 +168,24 @@ tabs = {
},
shipperAppUserId: {
type: 'string',
title: '货主'
title: '货主',
ui: {
widget: 'select',
serverSearch: true,
searchDebounceTime: 300,
searchLoadingText: '搜索中...',
onSearch: (q: any) => {
console.log(q)
if (!!q) {
return this.service
.request(this.service.$api_enterpriceList, { enterpriseName: q})
.pipe(map((res: any) => (res as any[]).map((i) => ({ label: i.enterpriseName, value: i.id } as SFSchemaEnum))))
.toPromise();
} else {
return of([]);
}
},
} as SFSelectWidgetSchema,
},
loadingPlace: {
type: 'string',
@ -200,7 +217,7 @@ tabs = {
if (!!q) {
return this.service
.request(this.service.$api_get_getDriverInfo, { keyword: q, model: 1, type: 1 })
.pipe(map(res => (res as any[]).map(i => ({ label: i.name, value: i.id } as SFSchemaEnum))))
.pipe(map(res => (res as any[]).map(i => ({ label: i.name, value: i.appUserId } as SFSchemaEnum))))
.toPromise();
} else {
return of([]);
@ -301,7 +318,7 @@ tabs = {
},
},
},
enterpriseInfoName: {
enterpriseInfoId: {
type: 'string',
title: '网络货运人',
ui: {
@ -327,7 +344,7 @@ tabs = {
// asyncData: () => this.getCatalogueMember(),
// },
// },
goodsTypeId: {
goodsNameId: {
type: 'string',
title: '货物名称',
ui: {

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

@ -213,7 +213,7 @@ resourceStatus: any;
if (!!q) {
return this.service
.request(this.service.$api_get_getDriverInfo, { keyword: q, model: 1, type: 1 })
.pipe(map(res => (res as any[]).map(i => ({ label: i.name, value: i.id } as SFSchemaEnum))))
.pipe(map(res => (res as any[]).map(i => ({ label: i.name, value: i.appUserId } as SFSchemaEnum))))
.toPromise();
} else {
return of([]);
@ -225,7 +225,7 @@ resourceStatus: any;
} as SFSelectWidgetSchema
},
carNo: {
plateNumber: {
title: '车牌号',
type: 'string',
ui: {
@ -274,12 +274,12 @@ resourceStatus: any;
},
} as SFSelectWidgetSchema,
},
paymentstatus: {
paymentStatus: {
title: '支付状态',
type: 'string',
ui: {
widget: 'dict-select',
params: { dictKey: 'payment:status' },
params: { dictKey: 'bill:payexpense:status' },
containAllLable:true,
visibleIf: {
_$expand: (value: boolean) => value,
@ -327,15 +327,25 @@ resourceStatus: any;
asyncData: () => this.service2.getNetworkFreightForwarder(),
},
},
goodsName: {
goodsNameId: {
type: 'string',
title: '货物名称',
ui: {
widget: 'select',
placeholder: '请选择',
errors: { required: '请选择货物类型' },
visibleIf: {
_$expand: (value: boolean) => value,
},
},
asyncData: () =>
this.service2.loadConfigByKey('goods.name.config.type').pipe(
map((data: any) => {
return data[0].children?.map((m: any) => {
return { label: m.name, value: m.id };
});
})
),
} as SFSelectWidgetSchema
},
serviceType: {
title: '服务类型',

15
src/app/routes/supply-management/components/bulk/bulk.component.html
View File

@ -1,7 +1,7 @@
<!--
* @Author: your name
* @Date: 2021-12-03 11:10:14
* @LastEditTime: 2022-01-13 16:37:16
* @LastEditTime: 2022-01-17 14:29:40
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\supply-management\components\bulk\bulk.component.html
@ -102,12 +102,12 @@
</st>
</div>
</nz-card>
<nz-modal [(nzVisible)]="isVisible" [nzFooter]="nzModalFooter" nzTitle="货源审核" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel('suppliersType')">
<nz-modal [(nzVisible)]="isVisible" [nzFooter]="nzModalFooter" nzTitle="货源审核" (nzOnCancel)="handleCancel('suppliersType')">
<ng-container *nzModalContent>
<div style="position: relative" *ngIf="auditMany">
<nz-alert
nzType="info"
[nzMessage]="'已选择' + 6 + '项'"
[nzMessage]="'已选择' + selectedRows?.length + '项'"
nzShowIcon
[ngStyle]="{ margin: '0 0 1rem 0' }"
>
@ -117,14 +117,13 @@
</sf>
</ng-container>
<ng-template #nzModalFooter>
<button nz-button nzType="primary" (click)="handleOK()" [disabled]="">通过</button>
<button nz-button nzType="default" (click)="handleCancel('suppliersType')">不通过</button>
<button nz-button nzType="primary" (click)="handleOK(1)">通过</button>
<button nz-button nzType="default" (click)="handleOK(2)">不通过</button>
</ng-template>
</nz-modal>
<ng-template #extraTemplate>
<!-- <ng-template #extraTemplate>
<div>
<button (click)="audit('',2)" nz-button nzType="primary">批量审核</button>
<button (click)="audit('')" nz-button nzType="primary">发布货源</button>
</div>
</ng-template>
</ng-template> -->

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

@ -23,6 +23,7 @@ export class SupplyManagementBulkComponent implements OnInit {
schema: SFSchema = {};
auditMany = false;
isVisible = false;
auditID: any;
_$expand = false;
columns: STColumn[] = [];
freightSchema: SFSchema = {};
@ -131,7 +132,7 @@ export class SupplyManagementBulkComponent implements OnInit {
},
} as SFDateWidgetSchema,
},
enterpriseInfoName: {
enterpriseInfoId: {
type: 'string',
title: '网络货运人',
ui: {
@ -411,13 +412,25 @@ export class SupplyManagementBulkComponent implements OnInit {
}
/**
* 审核
* status ： 1 单个 2：批量
* value ： 单个单条数据
*/
audit(value: any, status?: any) {
console.log(value)
console.log(status)
if(status === 2) {
if(this.selectedRows.length <= 0) {
this.service.msgSrv.error('未选择货源单！');
return
}
let list: any[] = [];
this.selectedRows.forEach(item => {
list.push(item.id);
});
this.auditID = list;
this.auditMany = true;
} else {
this.auditID = value.id
this.auditMany = false;
}
this.isVisible = true;
@ -437,8 +450,46 @@ export class SupplyManagementBulkComponent implements OnInit {
/**
* 审核通过按钮
*/
handleOK() {
handleOK(value: any) {
if(this.selectedRows.length <= 0) {
const params: any = {
id: this.auditID,
remarks: this.sfFre.value.remarks,
}
if(value == 1) {
params.auditStatus = 2
} else {
params.auditStatus = 3
}
console.log(params)
this.service.request(this.service.$api_goodsResourceAudit, params).subscribe(res => {
if (res === true) {
this.service.msgSrv.success('审核成功！');
this.isVisible = false;
this.st?.reload();
this.getGoodsSourceStatistical();
}
})
} else {
const params: any = {
ids: this.auditID,
remarks: this.sfFre.value.remarks,
}
if(value == 1) {
params.auditStatus = 2
} else {
params.auditStatus = 3
}
console.log(params)
this.service.request(this.service.$api_batchGoodsResourceAudit, params).subscribe(res => {
if (res === true) {
this.service.msgSrv.success('审核成功！');
this.isVisible = false;
this.st?.reload();
this.getGoodsSourceStatistical();
}
})
}
}
// 修改单价
modification(item: any) {

9
src/app/routes/supply-management/components/vehicle/vehicle.component.html
View File

@ -1,7 +1,7 @@
<!--
* @Author: your name
* @Date: 2021-12-22 11:28:28
* @LastEditTime: 2022-01-13 16:26:00
* @LastEditTime: 2022-01-17 14:14:00
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\supply-management\components\vehicle\vehicle.component.html
@ -98,17 +98,16 @@
[(nzVisible)]="isVisible"
[nzFooter]="nzModalFooter"
nzTitle="货源审核"
(nzOnOk)="handleOK()"
(nzOnCancel)="handleCancel('suppliersType')"
>
<ng-container *nzModalContent>
<div style="position: relative" *ngIf="auditMany">
<nz-alert nzType="info" [nzMessage]="'已选择' + 6 + '项'" nzShowIcon [ngStyle]="{ margin: '0 0 1rem 0' }"> </nz-alert>
<nz-alert nzType="info" [nzMessage]="'已选择' + selectedRows?.length+ '项'" nzShowIcon [ngStyle]="{ margin: '0 0 1rem 0' }"> </nz-alert>
</div>
<sf #sfFre [schema]="freightSchema" [ui]="ui2" [compact]="false" [button]="'none'"> </sf>
</ng-container>
<ng-template #nzModalFooter>
<button nz-button nzType="primary" (click)="handleOK()" [disabled]="">通过</button>
<button nz-button nzType="default" (click)="handleCancel('suppliersType')">不通过</button>
<button nz-button nzType="primary" (click)="handleOK(1)" [disabled]="">通过</button>
<button nz-button nzType="default" (click)="handleOK(2)">不通过</button>
</ng-template>
</nz-modal>

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

@ -24,7 +24,7 @@ export class SupplyManagementVehicleComponent implements OnInit {
auditMany = false;
isVisible = false;
_$expand = false;
@ViewChild('st') private readonly st!: STComponent;
@ViewChild('sf', { static: false }) sf!: SFComponent;
@ViewChild('sfFre', { static: false }) sfFre!: SFComponent;
@ -36,6 +36,7 @@ export class SupplyManagementVehicleComponent implements OnInit {
stayQuantity: 0
};
resourceStatus: any;
auditID: any;
constructor(
public service: SupplyManagementService,
private modal: NzModalService,
@ -67,7 +68,6 @@ export class SupplyManagementVehicleComponent implements OnInit {
this.initSFFre();
this.getGoodsSourceStatistical();
}
/**
* 初始化查询表单
*/
@ -75,7 +75,7 @@ export class SupplyManagementVehicleComponent implements OnInit {
initSFFre() {
this.freightSchema = {
properties: {
roleDescription: {
remarks: {
title: '备注',
type: 'string',
maxLength: 50,
@ -84,7 +84,8 @@ export class SupplyManagementVehicleComponent implements OnInit {
widget: 'textarea'
}
}
}
},
require: ['remarks']
};
this.ui2 = { '*': { spanLabelFixed: 120, grid: { span: 24 } } };
}
@ -191,8 +192,18 @@ export class SupplyManagementVehicleComponent implements OnInit {
console.log(value);
console.log(status);
if (status === 2) {
if(this.selectedRows.length <= 0) {
this.service.msgSrv.error('未选择货源单！');
return
}
let list: any[] = [];
this.selectedRows.forEach(item => {
list.push(item.id);
});
this.auditID = list;
this.auditMany = true;
} else {
this.auditID = value.id
this.auditMany = false;
}
this.isVisible = true;
@ -206,7 +217,50 @@ export class SupplyManagementVehicleComponent implements OnInit {
/**
* 审核通过按钮
*/
handleOK() {}
handleOK(value: any) {
console.log(this.sfFre.valid)
console.log(this.sfFre.value)
if(this.selectedRows.length <= 0) {
const params: any = {
id: this.auditID,
remarks: this.sfFre.value.remarks,
}
if(value == 1) {
params.auditStatus = 2
} else {
params.auditStatus = 3
}
console.log(params)
this.service.request(this.service.$api_goodsResourceAudit, params).subscribe(res => {
if (res === true) {
this.service.msgSrv.success('审核成功！');
this.isVisible = false;
this.st?.reload();
this.getGoodsSourceStatistical();
}
})
} else {
const params: any = {
ids: this.auditID,
remarks: this.sfFre.value.remarks,
}
if(value == 1) {
params.auditStatus = 2
} else {
params.auditStatus = 3
}
console.log(params)
this.service.request(this.service.$api_batchGoodsResourceAudit, params).subscribe(res => {
if (res === true) {
this.service.msgSrv.success('审核成功！');
this.isVisible = false;
this.st?.reload();
this.getGoodsSourceStatistical();
}
})
}
}
/**
* 跳转修改货源
*/

7
src/app/routes/supply-management/services/supply-management.service.ts
View File

@ -1,7 +1,7 @@
/*
* @Author: your name
* @Date: 2021-12-03 11:10:14
* @LastEditTime: 2022-01-10 13:20:04
* @LastEditTime: 2022-01-17 14:19:12
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\supply-management\services\supply-management.service.ts
@ -98,6 +98,11 @@ export class SupplyManagementService extends BaseService {
// 查询系统配置项
public $api_get_config_item_page = '/api/mdc/pbc/sysConfigItem/list/page';
// 货源审核
public $api_goodsResourceAudit = '/api/sdc/goodsResourceOperate/goodsResourceAudit';
// 货源审核【批量】
public $api_batchGoodsResourceAudit = '/api/sdc/goodsResourceOperate/batchGoodsResourceAudit';
constructor(public injector: Injector) {
super(injector)
}