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

批量审核

Browse Source
This commit is contained in:
wangshiming
2022-01-18 16:36:36 +08:00
parent 924441482f
commit bcad306ae5
18 changed files with 67 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/routes/account/components/edit-password/edit-password.component.ts
View File

@ -1,7 +1,7 @@
/*
* @Author: your name
* @Date: 2021-11-29 13:50:46
* @LastEditTime: 2021-12-28 14:19:32
* @LastEditTime: 2022-01-18 16:34:46
* @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\account\components\edit\edit.component.ts
@ -109,8 +109,6 @@ export class AccountComponentsCenterEditComponent implements OnInit {
this.router.navigate(['/passport/login'])
this.modalRef.close()
}, 3000)
} else {
this.service.msgSrv.error(res.msg);
}
});
}

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

@ -211,78 +211,32 @@ tabs = {
}
}
},
driverId: {
driverName: {
title: '承运司机',
type: 'string',
ui: {
widget: 'select',
serverSearch: true,
searchDebounceTime: 300,
searchLoadingText: '搜索中...',
onSearch: (q: 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.appUserId } as SFSchemaEnum))))
.toPromise();
} else {
return of([]);
}
},
visibleIf: {
_$expand: (value: boolean) => value
}
} as SFSelectWidgetSchema
}
},
carNo: {
title: '车牌号',
type: 'string',
ui: {
widget: 'select',
serverSearch: true,
searchDebounceTime: 300,
searchLoadingText: '搜索中...',
onSearch: (q: any) => {
if (!!q) {
return this.service
.request(this.service.$api_get_getCarLicenseListByCarNo, {
carNo: q
})
.pipe(map((res: any) => (res?.records as any[]).map(i => ({ label: i.carNo, value: i.appUserId } as SFSchemaEnum))))
.toPromise();
} else {
return of([]);
}
},
visibleIf: {
_$expand: (value: boolean) => value
}
} as SFSelectWidgetSchema
}
},
payeeId: {
captainName: {
title: '车队长',
type: 'string',
ui: {
widget: 'select',
serverSearch: true,
searchDebounceTime: 300,
searchLoadingText: '搜索中...',
onSearch: (q: any) => {
if (!!q) {
return this.service
.request(this.service.$api_get_getDriverInfo, { keyword: q,
model: 1, type: 2 })
.pipe(map((res) => (res as any[]).map((i) => ({ label: i.name, value: i.userId } as SFSchemaEnum))))
.toPromise();
} else {
return of([]);
}
},
visibleIf: {
_$expand: (value: boolean) => value,
},
} as SFSelectWidgetSchema,
}
},
paymentstatus: {
title: '支付状态',
@ -765,8 +719,6 @@ tabs = {
if (res) {
this.st.load(1);
this.getGoodsSourceStatistical()
} else {
this.service.msgSrv.error(res.msg);
}
});
}
@ -800,9 +752,7 @@ tabs = {
this.stFloat.reload()
this.st?.reload(1);
this.getGoodsSourceStatistical()
} else {
this.service.msgSrv.error(res.msg)
}
}
})
});
}

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

@ -207,78 +207,56 @@ resourceStatus: any;
}
}
},
driverId: {
// driverId: {
// title: '承运司机',
// type: 'string',
// ui: {
// widget: 'select',
// serverSearch: true,
// searchDebounceTime: 300,
// searchLoadingText: '搜索中...',
// onSearch: (q: 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.appUserId } as SFSchemaEnum))))
// .toPromise();
// } else {
// return of([]);
// }
// },
// visibleIf: {
// _$expand: (value: boolean) => value
// }
// } as SFSelectWidgetSchema
// },
driverName: {
title: '承运司机',
type: 'string',
ui: {
widget: 'select',
serverSearch: true,
searchDebounceTime: 300,
searchLoadingText: '搜索中...',
onSearch: (q: 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.appUserId } as SFSchemaEnum))))
.toPromise();
} else {
return of([]);
}
},
visibleIf: {
_$expand: (value: boolean) => value
}
} as SFSelectWidgetSchema
}
},
CarNo: {
carNo: {
title: '车牌号',
type: 'string',
ui: {
widget: 'select',
serverSearch: true,
searchDebounceTime: 300,
searchLoadingText: '搜索中...',
onSearch: (q: any) => {
if (!!q) {
return this.service
.request(this.service.$api_get_getCarLicenseListByCarNo, {
carNo: q
})
.pipe(map((res: any) => (res?.records as any[]).map(i => ({ label: i.carNo, value: i.id } as SFSchemaEnum))))
.toPromise();
} else {
return of([]);
}
},
visibleIf: {
_$expand: (value: boolean) => value
}
} as SFSelectWidgetSchema
}
},
payeeId: {
captainName: {
title: '车队长',
type: 'string',
ui: {
widget: 'select',
serverSearch: true,
searchDebounceTime: 300,
searchLoadingText: '搜索中...',
onSearch: (q: any) => {
if (!!q) {
return this.service
.request(this.service.$api_get_getDriverInfo, { keyword: q,
model: 1, type: 2 })
.pipe(map((res) => (res as any[]).map((i) => ({ label: i.name, value: i.userId } as SFSchemaEnum))))
.toPromise();
} else {
return of([]);
}
},
visibleIf: {
_$expand: (value: boolean) => value,
},
} as SFSelectWidgetSchema,
}
},
paymentStatus: {
title: '支付状态',
@ -603,7 +581,7 @@ resourceStatus: any;
this.resourceStatus = e;
this.initST();
setTimeout(() => {
this.st.load();
this.st.load(1);
this.getGoodsSourceStatistical()
}, 500);
}
@ -680,7 +658,10 @@ resourceStatus: any;
// return false;
// }
});
modal.afterClose.subscribe(_ => this.st.reload(1));
modal.afterClose.subscribe(_ => {
this.st.load(1);
this.getGoodsSourceStatistical()
});
}
});
}
@ -706,6 +687,7 @@ resourceStatus: any;
modal.afterClose.subscribe((result) => {
if (result) {
this.st.load(1);
this.getGoodsSourceStatistical()
}
});
}
@ -745,6 +727,7 @@ resourceStatus: any;
modal.afterClose.subscribe((result) => {
if (result) {
this.st.load(1);
this.getGoodsSourceStatistical()
}
});
}
@ -780,6 +763,7 @@ resourceStatus: any;
modal.afterClose.subscribe((result) => {
if (result) {
this.st.load(1);
this.getGoodsSourceStatistical()
}
});
}
@ -807,8 +791,6 @@ resourceStatus: any;
if(res) {
this.service.msgSrv.success('撤销成功！')
this.stFloat.reload()
} else {
this.service.msgSrv.error(res.msg)
}
})
});
@ -823,7 +805,8 @@ resourceStatus: any;
this.service.request(this.service.$api_get_cancelAnOrder, {id: item.id}).subscribe((res) => {
if (res === true) {
this.service.msgSrv.success('操作成功！');
this.st?.reload(1);
this.st.load(1);
this.getGoodsSourceStatistical()
this.initST();
}
}),
@ -841,9 +824,8 @@ resourceStatus: any;
this.service.request(this.service.$api_get_batchSignWholeOrder, params).subscribe(res => {
if (res) {
console.log(res);
this.st?.reload(1);
} else {
this.service.msgSrv.error(res.msg);
this.st.load(1);
this.getGoodsSourceStatistical()
}
});
}

4
src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.ts
View File

@ -2,7 +2,7 @@ import { preloaderFinished } from '@delon/theme';
/*
* @Author: your name
* @Date: 2021-12-14 14:03:07
* @LastEditTime: 2022-01-13 16:19:28
* @LastEditTime: 2022-01-18 16:34:59
* @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\order-management\modal\bulk\update-freight\update-freight.component.ts
@ -76,8 +76,6 @@ export class ConfirReceiptComponent implements OnInit {
if(res) {
this.service.msgSrv.success('确认签收成功！')
this.modal.destroy(true);
} else {
this.service.msgSrv.error(res.msg)
}
})
}

6
src/app/routes/order-management/modal/vehicle/cancel/cancel.component.ts
View File

@ -1,7 +1,7 @@
/*
* @Author: your name
* @Date: 2021-12-21 10:14:52
* @LastEditTime: 2021-12-21 10:17:02
* @LastEditTime: 2022-01-18 16:35:03
* @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\order-management\modal\vehicle\cancel\cancel.component.ts
@ -68,8 +68,6 @@ export class OneCarOrderCancelComponent implements OnInit {
this.service.request(this.service.$api_get_cancelAnOrder, { id: this.i?.id, ...this.sf.value }).subscribe(res => {
if (res) {
this.modalRef.close(true);
} else {
this.service.msgSrv.error(res.msg);
}
}),
nzOnCancel: () => this.modalRef.destroy()
@ -78,8 +76,6 @@ export class OneCarOrderCancelComponent implements OnInit {
this.service.request(this.service.$api_get_cancelAnOrder, { id: this.i?.id, ...this.sf.value }).subscribe(res => {
if (res) {
this.modalRef.close(true);
} else {
this.service.msgSrv.error(res.msg);
}
});
}

4
src/app/routes/order-management/modal/vehicle/confir-receipt/confir-receipt.component.ts
View File

@ -1,7 +1,7 @@
/*
* @Author: your name
* @Date: 2021-12-15 13:17:42
* @LastEditTime: 2022-01-12 14:01:00
* @LastEditTime: 2022-01-18 16:35:11
* @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\order-management\modal\vehicle\confir-receipt\confir-receipt.component.ts
@ -79,8 +79,6 @@ export class VehicleConfirReceiptComponent implements OnInit {
if(res) {
this.service.msgSrv.success('确认签收成功！')
this.modal.destroy();
} else {
this.service.msgSrv.error(res.msg)
}
})
}

4
src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.ts
View File

@ -438,8 +438,6 @@ export class VehicleSureArriveComponent implements OnInit {
if(res) {
this.service.msgSrv.success('确认到车成功！')
this.modal.destroy(true);
} else{
this.service.msgSrv.error(res.msg)
}
})
} else {
@ -463,8 +461,6 @@ export class VehicleSureArriveComponent implements OnInit {
if(res) {
this.service.msgSrv.success('确认到车成功！')
this.modal.destroy(true);
} else{
this.service.msgSrv.error(res.msg)
}
})
}

4
src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component.ts
View File

@ -283,8 +283,6 @@ export class VehicleSureDepartComponent implements OnInit {
if(res) {
this.service.msgSrv.success('确认发车成功！')
this.modal.destroy(true);
} else{
this.service.msgSrv.error(res.msg)
}
})
} else {
@ -306,8 +304,6 @@ export class VehicleSureDepartComponent implements OnInit {
if(res) {
this.service.msgSrv.success('确认发车成功！')
this.modal.destroy(true);
} else{
this.service.msgSrv.error(res.msg)
}
})
}

2
src/app/routes/passport/components/retrieve-password/retrieve-password.component.ts
View File

@ -163,8 +163,6 @@ export class UserRetrievePasswordComponent implements OnInit, AfterViewInit {
} else {
this.service.msgSrv.error('获取验证码失败!');
}
} else {
this.service.msgSrv.error(res.msg);
}
});
}

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

@ -672,8 +672,6 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
nzFooter: null,
nzComponentParams: { type: 'onecar', change: change }
});
} else {
this.service.msgSrv.error(res.msg);
}
});
}
@ -700,8 +698,6 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
if(this.sf3data.goodsNameId){
this.sf3.setValue('/goodsNameId',this.sf3data.goodsNameId);
}
} else {
this.service.msgSrv.error(res.msg);
}
});
}

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

@ -748,8 +748,6 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit {
if (this.sf3data?.goodsNameId) {
this.sf3.setValue('/goodsNameId', this.sf3data.goodsNameId);
}
} else {
this.service.msgSrv.error(res.msg);
}
});
}

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

@ -563,8 +563,6 @@ export class SupplyManagementBulkComponent implements OnInit {
this.service.msgSrv.success('已取消货源！')
this.st?.reload();
this.getGoodsSourceStatistical();
} else {
this.service.msgSrv.error(res.msg)
}
})
})

8
src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts
View File

@ -608,12 +608,8 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
.subscribe(res => {
if (res) {
this.currentRate = res.rate * 100;
} else {
this.service.msgSrv.error(res.msg);
}
});
} else {
this.service.msgSrv.error(res.msg);
}
});
}
@ -706,8 +702,6 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
if (this.sf3data.goodsNameId) {
this.sf3.setValue('/goodsNameId', this.sf3data.goodsNameId);
}
} else {
this.service.msgSrv.error(res.msg);
}
});
}
@ -854,8 +848,6 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
nzFooter: null,
nzComponentParams: { type: 'onecar', change: change }
});
} else {
this.service.msgSrv.error(res.msg);
}
});
}

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

@ -603,12 +603,8 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
.subscribe((res: any) => {
if (res) {
this.currentRate = res.rate;
} else {
this.service.msgSrv.error(res.msg);
}
});
} else {
this.service.msgSrv.error(res.msg);
}
});
}
@ -767,8 +763,6 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
this.service.request(reqUrl, params).subscribe((res: any) => {
if (res) {
this.openFinishPage();
} else {
this.service.msgSrv.error(res.msg);
}
});
}
@ -907,8 +901,6 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
if (this.sf3data.goodsNameId) {
this.sf3.setValue('/goodsNameId', this.sf3data.goodsNameId);
}
} else {
this.service.msgSrv.error(res.msg);
}
});
}

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

@ -118,8 +118,6 @@ export class VehicleComponentsListEditComponent implements OnInit {
if(res) {
this.modal.destroy(true);
this.service.msgSrv.success('上传协议成功！')
} else {
this.service.msgSrv.error(res.msg)
}
})
}

6
src/app/routes/vehicle/components/list/img-view/img-view.component.ts
View File

@ -1,7 +1,7 @@
/*
* @Author: your name
* @Date: 2021-12-07 17:30:18
* @LastEditTime: 2022-01-13 11:27:12
* @LastEditTime: 2022-01-18 16:36:27
* @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\vehicle\components\list\img-view\img-view.component.ts
@ -39,8 +39,6 @@ export class VehicleImgViewComponent implements OnInit {
if(res) {
this.modal.destroy(true);
this.service.msgSrv.success('已驳回')
} else {
this.service.msgSrv.error(res.msg)
}
})
}
@ -54,8 +52,6 @@ export class VehicleImgViewComponent implements OnInit {
if(res) {
this.modal.destroy(true);
this.service.msgSrv.success('已通过')
} else {
this.service.msgSrv.error(res.msg)
}
})
}

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

@ -144,78 +144,32 @@ tabs = {
},
}
},
driverId: {
driverName: {
title: '承运司机',
type: 'string',
ui: {
widget: 'select',
serverSearch: true,
searchDebounceTime: 300,
searchLoadingText: '搜索中...',
onSearch: (q: 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))))
.toPromise();
} else {
return of([]);
}
},
visibleIf: {
_$expand: (value: boolean) => value,
},
} as SFSelectWidgetSchema,
_$expand: (value: boolean) => value
}
}
},
carNo: {
title: '车牌号',
type: 'string',
ui: {
widget: 'select',
serverSearch: true,
searchDebounceTime: 300,
searchLoadingText: '搜索中...',
onSearch: (q: any) => {
if (!!q) {
return this.service
.request(this.service.$api_get_getCarLicenseListByCarNo, {
carNo: q
})
.pipe(map((res: any) => (res?.records as any[]).map(i => ({ label: i.carNo, value: i.carNo } as SFSchemaEnum))))
.toPromise();
} else {
return of([]);
}
},
visibleIf: {
_$expand: (value: boolean) => value
}
} as SFSelectWidgetSchema
}
},
payeeId: {
captainName: {
title: '车队长',
type: 'string',
ui: {
widget: 'select',
serverSearch: true,
searchDebounceTime: 300,
searchLoadingText: '搜索中...',
onSearch: (q: any) => {
if (!!q) {
return this.service
.request(this.service.$api_get_getDriverInfo, { keyword: q,
model: 1, type: 2 })
.pipe(map((res) => (res as any[]).map((i) => ({ label: i.name, value: i.id } as SFSchemaEnum))))
.toPromise();
} else {
return of([]);
}
},
visibleIf: {
_$expand: (value: boolean) => value,
},
} as SFSelectWidgetSchema,
}
},
paymentstatus: {
title: '支付状态',

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

@ -144,77 +144,33 @@ export class WaybillManagementVehicleComponent implements OnInit {
}
}
},
driverId: {
driverName: {
title: '承运司机',
type: 'string',
ui: {
widget: 'select',
serverSearch: true,
searchDebounceTime: 300,
searchLoadingText: '搜索中...',
onSearch: (q: 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.appUserId } as SFSchemaEnum))))
.toPromise();
} else {
return of([]);
}
},
visibleIf: {
_$expand: (value: boolean) => value
}
} as SFSelectWidgetSchema
}
},
carNo: {
title: '车牌号',
type: 'string',
ui: {
widget: 'select',
serverSearch: true,
searchDebounceTime: 300,
searchLoadingText: '搜索中...',
onSearch: (q: any) => {
if (!!q) {
return this.service
.request(this.service.$api_get_getCarLicenseListByCarNo, {
carNo: q
})
.pipe(map((res: any) => (res?.records as any[]).map(i => ({ label: i.carNo, value: i.id } as SFSchemaEnum))))
.toPromise();
} else {
return of([]);
}
},
visibleIf: {
_$expand: (value: boolean) => value
}
} as SFSelectWidgetSchema
}
},
payeeId: {
captainName: {
title: '车队长',
type: 'string',
ui: {
widget: 'select',
serverSearch: true,
searchDebounceTime: 300,
searchLoadingText: '搜索中...',
onSearch: (q: any) => {
if (!!q) {
return this.service
.request(this.service.$api_get_getDriverInfo, { keyword: q, model: 1, type: 2 })
.pipe(map(res => (res as any[]).map(i => ({ label: i.name, value: i.userId } as SFSchemaEnum))))
.toPromise();
} else {
return of([]);
}
},
visibleIf: {
_$expand: (value: boolean) => value
}
} as SFSelectWidgetSchema
},
_$expand: (value: boolean) => value,
},
}
},
paymentstatus: {
title: '支付状态',
type: 'string',