This commit is contained in:
wangshiming
2021-12-15 15:54:10 +08:00
parent 3ff0fef50e
commit a82c732e59
12 changed files with 141 additions and 124 deletions

View File

@ -1,7 +1,7 @@
<!--
* @Author: your name
* @Date: 2021-12-03 11:10:14
* @LastEditTime: 2021-12-14 15:47:08
* @LastEditTime: 2021-12-15 14:25:34
* @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
@ -84,7 +84,6 @@
<ng-container *nzModalContent>
<st
#stFloat
multiSort
size="small"
[bordered]="true"
[data]="datass"

View File

@ -613,7 +613,7 @@ export class OrderManagementBulkComponent implements OnInit {
});
}
// *变更运费
// *确认签收
confirmReceipt(item: any) {
const modalRef = this.modal.create({
@ -626,7 +626,7 @@ export class OrderManagementBulkComponent implements OnInit {
nzFooter: null
});
}
// *变更运费
// *确认发车
sureDepart(item: any) {
const modalRef = this.modal.create({
@ -639,7 +639,7 @@ export class OrderManagementBulkComponent implements OnInit {
nzFooter: null
});
}
// *变更运费
// *确认到车
sureArrive(item: any) {
const modalRef = this.modal.create({

View File

@ -5,6 +5,10 @@ import { ModalHelper, _HttpClient } from '@delon/theme';
import { NzModalService } from 'ng-zorro-antd/modal';
import { of } from 'rxjs';
import { map } from 'rxjs/operators';
import { VehicleConfirReceiptComponent } from '../../modal/vehicle/confir-receipt/confir-receipt.component';
import { VehicleSureArriveComponent } from '../../modal/vehicle/sure-arrive/sure-arrive.component';
import { VehicleSureDepartComponent } from '../../modal/vehicle/sure-depart/sure-depart.component';
import { VehicleUpdateFreightComponent } from '../../modal/vehicle/update-freight/update-freight.component';
import { SupplyManagementService } from '../../services/order-management.service';
@ -354,6 +358,7 @@ export class OrderManagementVehicleComponent implements OnInit {
title: '操作',
fixed: 'right',
width: '200px',
className: 'text-left',
buttons: [
{
text: '查看评价',
@ -363,6 +368,26 @@ export class OrderManagementVehicleComponent implements OnInit {
text: '运费变更记录',
click: (_record) => this.OpenPrice(),
},
{
text: '变更运费',
click: (_record) => this.updateFreight(_record),
},
{
text: '确认签收',
click: (_record) => this.confirmReceipt(_record),
},
{
text: '取消订单',
click: (_record) => this.confirmReceipt(_record),
},
{
text: '确认发车',
click: (_record) => this.sureDepart(_record),
},
{
text: '确认到车',
click: (_record) => this.sureArrive(_record),
},
],
},
];
@ -512,4 +537,57 @@ export class OrderManagementVehicleComponent implements OnInit {
console.log(item)
this.isVisibleEvaluate = true
}
/**
*变更运费
*/
updateFreight(item: any) {
const modalRef = this.modal.create({
nzTitle: '变更运费',
nzWidth: '50%',
nzContent: VehicleUpdateFreightComponent,
nzComponentParams: {
i: item
},
nzFooter: null
});
}
// *确认签收
confirmReceipt(item: any) {
const modalRef = this.modal.create({
nzTitle: '确认签收',
nzWidth: '50%',
nzContent: VehicleConfirReceiptComponent,
nzComponentParams: {
i: item
},
nzFooter: null
});
}
// *确认发车
sureDepart(item: any) {
const modalRef = this.modal.create({
nzTitle: '确认发车',
nzWidth: '50%',
nzContent: VehicleSureDepartComponent,
nzComponentParams: {
i: item
},
nzFooter: null
});
}
// 确认到车
sureArrive(item: any) {
const modalRef = this.modal.create({
nzTitle: '确认到车',
nzWidth: '50%',
nzContent: VehicleSureArriveComponent,
nzComponentParams: {
i: item
},
nzFooter: null
});
}
}