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

车辆对接

Browse Source
This commit is contained in:
wangshiming
2021-12-21 10:52:28 +08:00
parent 4aad1e6a47
commit f27a6bddbc
20 changed files with 1021 additions and 477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.html
View File

@ -1,7 +1,7 @@
<!--
* @Author: your name
* @Date: 2021-12-14 14:03:07
* @LastEditTime: 2021-12-14 15:43:01
* @LastEditTime: 2021-12-20 20:26:52
* @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.html
@ -15,29 +15,31 @@ nzMessage="签收后不可再修改运费，请确保运费等信息准确无误
<sv-container col="1">
<sv label="货物单价">
<span>
100元/吨
100元/方
100元/车</span>
{{detailList?.goodsInfoVO?.freightPrice}} {{detailList?.goodsInfoVO?.freightType}}
</span>
</sv>
<sv label="结算依据">
<div style="display: flex; justify-content: space-between;">
<div>以发货为准 / 以收货为准</div>
<div>保留小数/抹除小数/抹除个数</div>
<div>
<div *ngIf="detailList?.goodsInfoVO?.settlementBasis === '1'">以收货为准</div>
<div *ngIf="detailList?.goodsInfoVO?.settlementBasis === '2'">以发货为准 </div>
<div *ngIf="detailList?.goodsInfoVO?.rule === '1'">保留小数 </div>
<div *ngIf="detailList?.goodsInfoVO?.rule === '2'">抹除小数 </div>
<div *ngIf="detailList?.goodsInfoVO?.rule === '3'">抹除个数 </div>
</div>
</sv>
</sv-container>
<sv-container col="2">
<sv label="装货重量">
<div>xx吨</div>
<div>{{detailList?.goodsInfoVO?.weight}}吨</div>
</sv>
<sv label="装货体积">
<div>xx吨</div>
<div>{{detailList?.goodsInfoVO?.volume}}吨</div>
</sv>
</sv-container>
<sv-container col="2">
<sv label="卸货重量">
<div>xx吨</div>
<div>{{detailList?.goodsInfoVO?.volume}}吨</div>
</sv>
<sv label="卸货体积">
<div>xx吨</div>
@ -45,7 +47,7 @@ nzMessage="签收后不可再修改运费，请确保运费等信息准确无误
</sv-container>
<sv-container col="1">
<sv label="总运费">
<div>1000元 </div>
<div>{{detailList?.goodsInfoVO?.freightPrice ? detailList?.goodsInfoVO?.freightPrice + '元' : ''}} </div>
</sv>
<sv label="司机车辆">
<div>张三 / 18888888888 / 粤GJ401</div>

39
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: 2021-12-14 15:43:12
* @LastEditTime: 2021-12-21 09:42:54
* @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
@ -21,6 +21,7 @@ import {
import { _HttpClient } from '@delon/theme';
import { NzMessageService } from 'ng-zorro-antd/message';
import { NzModalRef } from 'ng-zorro-antd/modal';
import { OrderManagementService } from '../../../services/order-management.service';
@Component({
selector: 'app-order-management-confir-receipt',
@ -28,21 +29,43 @@ import { NzModalRef } from 'ng-zorro-antd/modal';
styleUrls: ['./confir-receipt.component.less']
})
export class ConfirReceiptComponent implements OnInit {
record: any = {};
i:any;
Status:any;
detailList:any;
data: any = {};
constructor(private modal: NzModalRef, private msgSrv: NzMessageService, public http: _HttpClient) {}
constructor(private modal: NzModalRef, private msgSrv: NzMessageService, public http: _HttpClient, public service: OrderManagementService) {}
ngOnInit(): void {
this.initData()
}
save(): void {
// this.http.post(`/user/${this.record.id}`, value).subscribe(res => {
// this.msgSrv.success('保存成功');
// this.modal.close(true);
// });
// 大宗
this.service.request(this.service.$api_get_signBulkOrder, {id: this.i?.id}).subscribe((res: any) => {
console.log(res)
if(res) {
this.service.msgSrv.success('确认签收成功！')
} else {
this.service.msgSrv.error(res.msg)
}
})
}
initData() {
// 大宗
this.service.request(this.service.$api_get_getBulkSignForDetail, {id: this.i?.id}).subscribe((res: any) => {
console.log(res)
this.detailList = res;
this.service.request(this.service.$api_getUserDetailByAppUserId, {id: this.detailList?.id}).subscribe((res: any) => {
console.log(res)
})
this.service.request(this.service.$api_getCarLicenseByIds, {id: this.detailList?.carId}).subscribe((res: any) => {
console.log(res)
})
})
}
close(): void {
this.modal.destroy();
}