fix bug
This commit is contained in:
@ -7,6 +7,7 @@ import { map } from 'rxjs/operators';
|
|||||||
import { SupplyManagementService } from '../../services/order-management.service';
|
import { SupplyManagementService } from '../../services/order-management.service';
|
||||||
import { UpdateFreightComponent } from '../../modal/bulk/update-freight/update-freight.component';
|
import { UpdateFreightComponent } from '../../modal/bulk/update-freight/update-freight.component';
|
||||||
import { ConfirReceiptComponent } from '../../modal/bulk/confir-receipt/confir-receipt.component';
|
import { ConfirReceiptComponent } from '../../modal/bulk/confir-receipt/confir-receipt.component';
|
||||||
|
import { SureDepartComponent } from '../../modal/bulk/sure-depart/sure-depart.component';
|
||||||
|
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
@ -406,6 +407,14 @@ export class OrderManagementBulkComponent implements OnInit {
|
|||||||
text: '确认签收',
|
text: '确认签收',
|
||||||
click: (_record) => this.confirmReceipt(_record),
|
click: (_record) => this.confirmReceipt(_record),
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
text: '取消订单',
|
||||||
|
click: (_record) => this.confirmReceipt(_record),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
text: '确认发车',
|
||||||
|
click: (_record) => this.sureDepart(_record),
|
||||||
|
},
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
@ -583,6 +592,19 @@ export class OrderManagementBulkComponent implements OnInit {
|
|||||||
nzFooter: null
|
nzFooter: null
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
// *变更运费
|
||||||
|
|
||||||
|
sureDepart(item: any) {
|
||||||
|
const modalRef = this.modal.create({
|
||||||
|
nzTitle: '确认发车',
|
||||||
|
nzWidth: '50%',
|
||||||
|
nzContent: SureDepartComponent,
|
||||||
|
nzComponentParams: {
|
||||||
|
i: item
|
||||||
|
},
|
||||||
|
nzFooter: null
|
||||||
|
});
|
||||||
|
}
|
||||||
userAction() {
|
userAction() {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -0,0 +1,16 @@
|
|||||||
|
<!--
|
||||||
|
* @Author: your name
|
||||||
|
* @Date: 2021-12-14 15:53:03
|
||||||
|
* @LastEditTime: 2021-12-14 15:57:08
|
||||||
|
* @LastEditors: your name
|
||||||
|
* @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\sure-depart\sure-depart.component.html
|
||||||
|
-->
|
||||||
|
<sf #sf mode="edit" [schema]="schema" [ui]="ui" [formData]="i" button="none"></sf>
|
||||||
|
|
||||||
|
<div class="modal-footer">
|
||||||
|
<button nz-button type="button" (click)="close()">关闭</button>
|
||||||
|
<button nz-button type="submit" nzType="primary" (click)="save(sf.value)" [nzLoading]="http.loading"
|
||||||
|
>确认发车</button
|
||||||
|
>
|
||||||
|
</div>
|
||||||
@ -0,0 +1,7 @@
|
|||||||
|
.left_btn {
|
||||||
|
width: 50px;
|
||||||
|
height: 32px;
|
||||||
|
padding-left: 8px;
|
||||||
|
line-height:32px;
|
||||||
|
background-color: #d7d7d7;
|
||||||
|
}
|
||||||
@ -0,0 +1,139 @@
|
|||||||
|
import { preloaderFinished } from '@delon/theme';
|
||||||
|
/*
|
||||||
|
* @Author: your name
|
||||||
|
* @Date: 2021-12-14 14:03:07
|
||||||
|
* @LastEditTime: 2021-12-14 16:00:05
|
||||||
|
* @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
|
||||||
|
*/
|
||||||
|
import { Component, OnInit, ViewChild } from '@angular/core';
|
||||||
|
import {
|
||||||
|
SFComponent,
|
||||||
|
SFCustomWidgetSchema,
|
||||||
|
SFDateWidgetSchema,
|
||||||
|
SFNumberWidgetSchema,
|
||||||
|
SFRadioWidgetSchema,
|
||||||
|
SFSchema,
|
||||||
|
SFSelectWidgetSchema,
|
||||||
|
SFTextareaWidgetSchema,
|
||||||
|
SFUISchema,
|
||||||
|
SFUploadWidgetSchema
|
||||||
|
} from '@delon/form';
|
||||||
|
import { _HttpClient } from '@delon/theme';
|
||||||
|
import { NzMessageService } from 'ng-zorro-antd/message';
|
||||||
|
import { NzModalRef } from 'ng-zorro-antd/modal';
|
||||||
|
import { SupplyManagementService } from 'src/app/routes/supply-management/services/supply-management.service';
|
||||||
|
import { Observable, Observer } from 'rxjs';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-order-management-sure-depart',
|
||||||
|
templateUrl: './sure-depart.component.html',
|
||||||
|
styleUrls: ['./sure-depart.component.less']
|
||||||
|
})
|
||||||
|
export class SureDepartComponent implements OnInit {
|
||||||
|
record: any = {};
|
||||||
|
i: any;
|
||||||
|
@ViewChild('sf', { static: false }) sf!: SFComponent;
|
||||||
|
schema: SFSchema = {};
|
||||||
|
ui: SFUISchema = {};
|
||||||
|
constructor(private modal: NzModalRef, private msgSrv: NzMessageService, public http: _HttpClient, public service: SupplyManagementService ) {}
|
||||||
|
|
||||||
|
ngOnInit(): void {
|
||||||
|
this.initSF();
|
||||||
|
}
|
||||||
|
initSF() {
|
||||||
|
this.schema = {
|
||||||
|
properties: {
|
||||||
|
createTime: {
|
||||||
|
title: '创建时间',
|
||||||
|
type: 'string',
|
||||||
|
ui: {
|
||||||
|
widget: 'date',
|
||||||
|
mode: 'range',
|
||||||
|
format: 'yyyy-MM-dd',
|
||||||
|
visibleIf: {
|
||||||
|
expand: (value: boolean) => value,
|
||||||
|
},
|
||||||
|
} as SFDateWidgetSchema,
|
||||||
|
},
|
||||||
|
name3: {
|
||||||
|
type: 'string',
|
||||||
|
title: '投诉详情',
|
||||||
|
maxLength: 100,
|
||||||
|
ui: {
|
||||||
|
widget: 'textarea',
|
||||||
|
autosize: { minRows: 4, maxRows: 6 }
|
||||||
|
} as SFTextareaWidgetSchema
|
||||||
|
},
|
||||||
|
avatar: {
|
||||||
|
type: 'string',
|
||||||
|
title: '上传凭证',
|
||||||
|
ui: {
|
||||||
|
action: `/scm/cms/cms/upload/multipartFile/fileModel`,
|
||||||
|
fileType: 'image/png,image/jpeg,image/jpg',
|
||||||
|
limit: 5,
|
||||||
|
limitFileCount: 5,
|
||||||
|
resReName: 'url',
|
||||||
|
urlReName: 'url',
|
||||||
|
widget: 'upload',
|
||||||
|
descriptionI18n: '不超过5张,单张大小不超过5M,支持.jpg、.jpeg和 .png格式',
|
||||||
|
data: {
|
||||||
|
// appId: environment.appId,
|
||||||
|
},
|
||||||
|
name: 'multipartFile',
|
||||||
|
multiple: true,
|
||||||
|
listType: 'picture-card',
|
||||||
|
change: (args: any) => {
|
||||||
|
if (args.type === 'success') {
|
||||||
|
const avatar = [
|
||||||
|
{
|
||||||
|
uid: -1,
|
||||||
|
name: 'LOGO',
|
||||||
|
status: 'done',
|
||||||
|
url: args.fileList[0].response.url,
|
||||||
|
response: {
|
||||||
|
url: args.fileList[0].response.url
|
||||||
|
}
|
||||||
|
}
|
||||||
|
];
|
||||||
|
this.sf?.setValue('/avatar', avatar);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
beforeUpload: (file: any, _fileList: any) => {
|
||||||
|
return new Observable((observer: Observer<boolean>) => {
|
||||||
|
const isLt2M = file.size / 1024 / 1024 < 1;
|
||||||
|
if (!isLt2M) {
|
||||||
|
this.service.msgSrv.warning('图片大小超过5M!');
|
||||||
|
observer.complete();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
observer.next(isLt2M);
|
||||||
|
observer.complete();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
} as SFUploadWidgetSchema
|
||||||
|
}
|
||||||
|
},
|
||||||
|
required: ['reason']
|
||||||
|
};
|
||||||
|
this.ui = {
|
||||||
|
'*': {
|
||||||
|
spanLabelFixed: 100,
|
||||||
|
grid: { span: 20 }
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
save(value: any): void {
|
||||||
|
console.log(value)
|
||||||
|
// this.http.post(`/user/${this.record.id}`, value).subscribe(res => {
|
||||||
|
// this.msgSrv.success('保存成功');
|
||||||
|
// this.modal.close(true);
|
||||||
|
// });
|
||||||
|
}
|
||||||
|
|
||||||
|
close(): void {
|
||||||
|
this.modal.destroy();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* @Author: your name
|
* @Author: your name
|
||||||
* @Date: 2021-12-03 15:31:52
|
* @Date: 2021-12-03 15:31:52
|
||||||
* @LastEditTime: 2021-12-14 15:11:13
|
* @LastEditTime: 2021-12-14 15:55:50
|
||||||
* @LastEditors: Please set LastEditors
|
* @LastEditors: Please set LastEditors
|
||||||
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
|
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
|
||||||
* @FilePath: \tms-obc-web\src\app\routes\order-management\order-management.module.ts
|
* @FilePath: \tms-obc-web\src\app\routes\order-management\order-management.module.ts
|
||||||
@ -20,6 +20,7 @@ import { OrderManagementVehicleDetailComponent } from './components/vehicle-deta
|
|||||||
|
|
||||||
import { OrderManagementVehicleComponent } from './components/vehicle/vehicle.component';
|
import { OrderManagementVehicleComponent } from './components/vehicle/vehicle.component';
|
||||||
import { ConfirReceiptComponent } from './modal/bulk/confir-receipt/confir-receipt.component';
|
import { ConfirReceiptComponent } from './modal/bulk/confir-receipt/confir-receipt.component';
|
||||||
|
import { SureDepartComponent } from './modal/bulk/sure-depart/sure-depart.component';
|
||||||
import { UpdateFreightComponent } from './modal/bulk/update-freight/update-freight.component';
|
import { UpdateFreightComponent } from './modal/bulk/update-freight/update-freight.component';
|
||||||
import { OrderManagementRoutingModule } from './order-management-routing.module';
|
import { OrderManagementRoutingModule } from './order-management-routing.module';
|
||||||
|
|
||||||
@ -35,7 +36,8 @@ const COMPONENTS: Type<void>[] = [
|
|||||||
OrderManagementRiskComponent,
|
OrderManagementRiskComponent,
|
||||||
OrderManagementComplaintComponent,
|
OrderManagementComplaintComponent,
|
||||||
UpdateFreightComponent,
|
UpdateFreightComponent,
|
||||||
ConfirReceiptComponent
|
ConfirReceiptComponent,
|
||||||
|
SureDepartComponent
|
||||||
];
|
];
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
|
|||||||
Reference in New Issue
Block a user