-
-
-
-
装卸货信息
-
-
装货地：{{item?.detailedAddress}}
-
联系人：{{item?.appUserName}}/{{item?.contractTelephone}}
-
发货日期：{{item?.createTime}}
+
-
-
-
卸货地：{{item?.detailedAddress}}
-
联系人：{{item?.appUserName}}/{{item?.contractTelephone}}
-
卸货日期：{{item?.modifyTime}}
+
+
+ 货物信息
+
+
+ {{item.goodsName}}
+
+
+ {{item.weight}}顿,{{item.volume}}方,{{item.number}}件
+
+
+
+
+ 承运信息
+
+ {{i?.carrierInformationVO?.driverName}}
+
+
+ {{i?.carrierInformationVO?.driverTelephone}}
+
+
+ {{i?.carrierInformationVO?.driverLicensePlate}}
+
+
+
+
+
+
+
+ {{i?.carrierInformationVO?.serviceTypeLabel}}
+
+
+ {{i?.goodsValue}}
+
+
+ {{i?.insuranceAmount |currency}} 元
+
+
+
+
+
+
+
+ {{(item.price * item.rate) | currency}}
+ (含附加费）
-
-
-
-
-
-
-
货物信息
-
货物名称：{{item?.goodsName}}
-
货物数量：{{item?.weight}}吨/{{item?.volume}}立方
-
用车需求：{{item?.vehicleDemand}}
-
-
-
-
-
-
承运信息
-
网络货运人：{{dataList?.carrierInformationVO?.enterpriseInfoName}}
-
服务类型：{{dataList?.carrierInformationVO?.serviceType === 1 ? '抢单' : '指派'}}
-
司机姓名：{{dataList?.carrierInformationVO?.driverName}}
-
手机号：{{dataList?.carrierInformationVO?.driverTelephone}}
-
车牌号：{{dataList?.carrierInformationVO?.driverLicensePlate}}
-
-
-
-
-
服务信息
-
货物价值：{{dataList?.goodsInfoList?.goodsName}}
-
保价费金额：{{dataList?.goodsInfoList?.goodsName}}
-
-
-
-
补充信息
-
{{dataList?.supplementaryInformationVO?.stateReceipt === 2 ? '不需要回单' : '需要回单'}}
-
联系人：{{dataList?.supplementaryInformationVO?.receiptUserId}}
-
联系电话：{{dataList?.supplementaryInformationVO?.remarks}}
-
所在地区：{{dataList?.supplementaryInformationVO?.remarks}}
-
详细地址：{{dataList?.supplementaryInformationVO?.receiptAddress}}
-
备注：{{dataList?.supplementaryInformationVO?.remarks}}
-
-
-
-
-
-
运费信息
-
-
预付：{{dataList?.shippingInformationVO?.prePay | currency: '￥' }}
-
油卡：{{dataList?.shippingInformationVO?.oilCardPay | currency: '￥'}}
-
到付：{{dataList?.shippingInformationVO?.toPay | currency: '￥'}}
-
回单付：{{dataList?.shippingInformationVO?.receiptPay | currency: '￥'}}
-
保险费：{{dataList?.shippingInformationVO?.insuranceFee | currency: '￥'}}
-
附加费保险费：{{dataList?.shippingInformationVO?.appendFee | currency: '￥'}}
-
-
-
-
+
+
+
-
{{dataList?.shippingInformationVO?.totalFee | currency: '￥' }}
+
+
+
+ {{totalExpensePrice | currency}}
+
+ （运费￥3500.00含附加运费￥191.98）
+
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
+
+
+
+ {{i?.supplementaryInformationVO?.stateReceipt?'是':'否'}}
+
+
+ {{i?.supplementaryInformationVO?.receiptTypeLabel}}
+
+
+ {{i?.supplementaryInformationVO?.area}}
+
+
+ {{i?.supplementaryInformationVO?.address}}
+
+
+ {{i?.supplementaryInformationVO?.remarks}}
+
+
+
+
+
+
+
+
diff --git a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.less b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.less
index a1566606..e963d1b7 100644
--- a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.less
+++ b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.less
@@ -1,37 +1,84 @@
-:host{
- .btn-size{
- font-size: 14px;
+:host {
+ .source-info {
+ min-height: 210px;
+
+ p {
+ margin-bottom: .5em;
}
- .bdr{
- border-right: 1px solid #ccc;
+ }
+
+ .btn-size {
+ font-size: 14px;
+ }
+
+ .bdr {
+ border-right: 1px solid #ccc;
+ }
+
+ .bdl {
+ border-left: 1px solid #ccc;
+ }
+
+ .title {
+ font-weight: bold;
+ font-size: 26;
+ }
+
+ .freight-info-box {
+ width: 95%;
+
+ p {
+ margin-bottom: 5px;
}
- .bdl{
- border-left: 1px solid #ccc;
+ }
+
+ .freigth-label {
+ display: inline-block;
+ width: 50px;
+ text-align: right;
+ }
+
+ ::ng-deep {
+ .approval-status {
+ .ant-steps {
+ width: 70%;
+ margin: 0 auto;
+ }
}
- .title{
- font-size: 26;
- font-weight: bold;
- }
- .source-info{
- p{
- margin-bottom: .5em;
- }
- }
- .freight-info-box{
- width: 95%;
- }
- .freigth-label{
- display: inline-block;
- width: 50px;
- text-align: right;
+ }
+
+ .handling-info {
+ min-height: 176px;
+ border: 1px solid #ccc;
+
+ .loading-row {
+ display: flex;
}
- ::ng-deep{
- .approval-status{
- .ant-steps{
- width: 70%;
- margin: 0 auto;
- }
- }
+ .handling-info-icon {
+ width: 32px;
+ height: 32px;
+ margin-right: 24px;
+ color: #fff;
+ line-height: 32px;
+ text-align: center;
+ border-radius: 50%;
+
+ &.loading-bg {
+ background-color: #50D4AB;
+ }
+
+ &.unloaing-bg {
+ background: #F66F6A;
+ }
}
-}
\ No newline at end of file
+
+ .info {
+ flex: 1;
+ }
+
+ .time-info {
+ margin-left: 56px;
+ }
+ }
+}
diff --git a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.spec.ts b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.spec.ts
index eae95066..cb740ab1 100644
--- a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.spec.ts
+++ b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.spec.ts
@@ -7,9 +7,9 @@ describe('SupplyManagementVehicleDetailComponent', () => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
- declarations: [ SupplyManagementVehicleDetailComponent ]
+ declarations: [SupplyManagementVehicleDetailComponent]
})
- .compileComponents();
+ .compileComponents();
}));
beforeEach(() => {
diff --git a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts
index 93ba23ac..a223044f 100644
--- a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts
+++ b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts
@@ -1,17 +1,12 @@
-/*
- * @Author: your name
- * @Date: 2021-12-03 11:10:14
- * @LastEditTime: 2021-12-09 20:54:28
- * @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-detail\vehicle-detail.component.ts
- */
import { Component, OnInit } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { STColumn } from '@delon/abc/st';
import { _HttpClient } from '@delon/theme';
import { NzMessageService } from 'ng-zorro-antd/message';
+import { NzModalService } from 'ng-zorro-antd/modal';
import { SupplyManagementService } from '../../services/supply-management.service';
+import { SupplyManagementAssignedCarComponent } from '../assigned-car/assigned-car.component';
+import { SupplyManagementUpdateExternalSnComponent } from '../update-external-sn/update-external-sn.component';
@Component({
selector: 'app-supply-management-vehicle-detail',
@@ -22,59 +17,144 @@ export class SupplyManagementVehicleDetailComponent implements OnInit {
id = this.route.snapshot.params.id;
i: any;
- dataList: any;
logColumns: STColumn[] = [
{ title: '内容', index: 'theme' },
{ title: '操作人', index: 'operationUserPhone' },
{ title: '操作时间', index: ' createTime' },
];
+ serviceType: any = {
+ 1: '抢单',
+ 2: '指派'
+ }
+ status: any = { 1: '待接单', 2: '已接单', 3: '已取消' };
+ totalExpensePrice = 0;
+ expenseColumns: STColumn[] = [
+ {
+ title: '款项',
+ width: '150px',
+ className: 'text-center',
+ index: 'expenseName'
+ },
+ {
+ title: '总费用(元)',
+ width: '150px',
+ className: 'text-center',
+ render: 'total'
+ },
+ {
+ title: '协议金额(元)',
+ width: '150px',
+ className: 'text-center',
+ index: 'price'
+ },
+ ];
constructor(
private route: ActivatedRoute,
private msgSrv: NzMessageService,
private service: SupplyManagementService,
- private router: Router,private ar: ActivatedRoute
+ public modal: NzModalService,
+ public router: Router
) {
}
ngOnInit(): void {
- console.log(this.id)
- if(this.id) {
- this.getDetailList(this.id)
- }
+ this.getGoodsSourceDetail()
}
- // 获取录单员
- getDetailList(id: any) {
- const params = {
- id: id
- };
- this.service.request(`${this.service.$api_get_getCompleteVehicleDetail}`, params).subscribe((res) => {
- console.log(res)
- this.dataList = res
+ getGoodsSourceDetail() {
+ this.service.request(this.service.$api_get_getCompleteVehicleDetail, { id: this.id }).subscribe(res => {
+ const expenseList = res?.expenseList || [];
+ this.totalExpensePrice = 0;
+ expenseList.forEach((e: any) => {
+ this.totalExpensePrice += e?.price * e?.rate;
+ });
+ this.i = { ...res, totalExpensePrice: this.totalExpensePrice };
+
})
}
- // 修改货源
- modification() {
- this.router.navigate(['/supply-management/vehicle-amend', this.id], {
+ /**
+ * 修改货源
+ */
+ updateGoodsSource(record: any) {
+ this.router.navigate(['./pbg/onecar-publish'], {
queryParams: {
- sta: 1
- },
+ id: record?.id,
+ type: 'edit'
+ }
})
}
- // 再下一单
- nextOrder() {
- this.router.navigate(['/supply-management/vehicle-amend', this.id], {
+
+ /**
+ * 取消货源
+ */
+ cancleGoodsSource() {
+ this.modal.confirm({
+ nzTitle: '
确定取消货源吗?',
+ nzContent: `
取消后不可恢复，谨慎操作`,
+ nzOnOk: () =>
+ this.service.msgSrv.success('操作成功！')
+ // this.service.request(this.service.$api_cancle_goods_source, { id: this.i.id }).subscribe((res) => {
+ // if (res === true) {
+ // this.service.msgSrv.success('操作成功！');
+ // this.getGoodsSourceDetail();
+ // }
+ // }),
+ })
+ }
+
+ /**
+ *再下一单
+ * @param record
+ */
+ placeOrder(record: any) {
+ this.router.navigate(['./pbg/onecar-publish'], {
queryParams: {
- sta: 2
- },
+ id: record?.id,
+ type: 'add'
+ }
})
}
+ /**
+ * 编辑外部货源号
+ * @param item st当前行对象
+ */
+ editEnternalSn(item: any) {
+ const modalRef = this.modal.create({
+ nzWidth: '400px',
+ nzContent: SupplyManagementUpdateExternalSnComponent,
+ nzComponentParams: {
+ orderObject: item,
+ },
+ nzFooter: null,
+ nzClosable: false
+ });
+ }
+ /**
+ * 重新指派
+ */
+ assignedCar(item: any) {
+ const modalRef = this.modal.create({
+ nzTitle: '指派熟车',
+ nzWidth: '1200px',
+ nzContent: SupplyManagementAssignedCarComponent,
+ nzComponentParams: {
+ i: item,
+ },
+ nzFooter: null,
+ });
+ modalRef.afterClose.subscribe((result) => {
+ if (result) {
+ this.getGoodsSourceDetail();
+ }
+ });
+ }
goBack() {
window.history.go(-1);
}
+
}
diff --git a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts
index 22c6a8d1..1a7f44a1 100644
--- a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts
@@ -83,13 +83,13 @@ export class SupplyManagementVehicleComponent implements OnInit {
} as SFSelectWidgetSchema,
},
goodsName: {
- type: 'string',
title: '货物名称',
-
+ type: 'string',
+ default: '',
ui: {
- widget: 'dict-select',
- // params: { dictKey: 'GoodsName' },
- placeholder: '请选择',
+ widget: 'select',
+ // asyncData: () =>[]
+
} as SFSelectWidgetSchema,
},
loadingPlace: {
@@ -280,7 +280,7 @@ export class SupplyManagementVehicleComponent implements OnInit {
{
text: '取消货源',
// iif: item => item.auditStatus === 1 || item.auditStatus === 2,
- // click: (_record) => this.delOne(_record),
+ click: (_record) => this.cancleGoodsSource(_record),
},
{
text: '再下一单',
@@ -288,7 +288,7 @@ export class SupplyManagementVehicleComponent implements OnInit {
},
{
text: '重新指派',
- click: (_record) => this.assignedCar(_record),
+ // click: (_record) => this.assignedCar(_record),
// iif: item => item.auditStatus === 2,
},
],
@@ -431,6 +431,23 @@ export class SupplyManagementVehicleComponent implements OnInit {
},
})
}
+ /**
+ * 取消货源
+ */
+ cancleGoodsSource(record: any) {
+ this.modal.confirm({
+ nzTitle: '
确定取消货源吗?',
+ nzContent: `
取消后不可恢复，谨慎操作`,
+ nzOnOk: () =>
+ this.service.request(this.service.$api_cancle_goods_source, [record.id]).subscribe((res) => {
+ if (res === true) {
+ this.service.msgSrv.success('操作成功！');
+ this.st?.reload();
+ this.getGoodsSourceStatistical();
+ }
+ }),
+ })
+ }
// 获取货源状态统计
getGoodsSourceStatistical() {
this.service.request(this.service.$api_get_goods_resource_statistical, { resourceType: 1 }).subscribe(res => {
diff --git a/src/app/routes/supply-management/services/supply-management.service.ts b/src/app/routes/supply-management/services/supply-management.service.ts
index 75f53f67..277c0c3c 100644
--- a/src/app/routes/supply-management/services/supply-management.service.ts
+++ b/src/app/routes/supply-management/services/supply-management.service.ts
@@ -1,7 +1,7 @@
/*
* @Author: your name
* @Date: 2021-12-03 11:10:14
- * @LastEditTime: 2021-12-14 20:09:41
+ * @LastEditTime: 2021-12-20 14:26: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\supply-management\services\supply-management.service.ts
@@ -13,6 +13,8 @@ import { BaseService } from 'src/app/shared/services';
providedIn: 'root'
})
export class SupplyManagementService extends BaseService {
+ // 取消货源
+ $api_cancle_goods_source = `/api/sdc/goodsResourceOperate/cancelSource`;
// 整车获取货源表详情
$api_get_getCompleteVehicleDetail = `/api/sdc/goodsResourceOperate/getWholeDetail`;
// 大宗获取货源表详情
diff --git a/src/app/routes/supply-management/supply-management-routing.module.ts b/src/app/routes/supply-management/supply-management-routing.module.ts
index 0f8c3ce9..ba93122e 100644
--- a/src/app/routes/supply-management/supply-management-routing.module.ts
+++ b/src/app/routes/supply-management/supply-management-routing.module.ts
@@ -1,8 +1,8 @@
/*
* @Author: your name
* @Date: 2021-12-03 11:10:14
- * @LastEditTime: 2021-12-06 13:51:59
- * @LastEditors: your name
+ * @LastEditTime: 2021-12-20 13:38:33
+ * @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\supply-management-routing.module.ts
*/
@@ -11,7 +11,6 @@ import { RouterModule, Routes } from '@angular/router';
import { SupplyManagementIndexComponent } from './components/index/index.component';
import { SupplyManagementBulkComponent } from './components/bulk/bulk.component';
import { SupplyManagementVehicleComponent } from './components/vehicle/vehicle.component';
-import { SupplyManagementBulkDetailComponent } from './components/bulk-detail/bulk-detail.component';
import { SupplyManagementVehicleDetailComponent } from './components/vehicle-detail/vehicle-detail.component';
import { SupplyManagementAddDriversComponent } from './components/add-drivers/add-drivers.component';
import { SupplyManagementOnecarPublishComponent } from './components/onecar-publish/onecar-publish.component';
@@ -19,7 +18,7 @@ import { SupplyManagementBulkPublishComponent } from './components/bulk-publish/
const routes: Routes = [
{ path: 'index', component: SupplyManagementIndexComponent },
- { path: 'bulk-detail/:id', component: SupplyManagementBulkDetailComponent },
+ // { path: 'bulk-detail/:id', component: SupplyManagementBulkDetailComponent },
{ path: 'vehicle-detail/:id', component: SupplyManagementVehicleDetailComponent },
{ path: 'add-drivers', component: SupplyManagementAddDriversComponent },
{ path: 'vehicle-amend/:id', component: SupplyManagementOnecarPublishComponent },
diff --git a/src/app/routes/supply-management/supply-management.module.ts b/src/app/routes/supply-management/supply-management.module.ts
index c7d1458d..5d72caf9 100644
--- a/src/app/routes/supply-management/supply-management.module.ts
+++ b/src/app/routes/supply-management/supply-management.module.ts
@@ -1,7 +1,7 @@
/*
* @Author: your name
* @Date: 2021-12-03 11:10:14
- * @LastEditTime: 2021-12-14 20:40:01
+ * @LastEditTime: 2021-12-20 13:38:26
* @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\supply-management.module.ts
@@ -17,7 +17,6 @@ import { SupplyManagementUpdateFreightComponent } from './components/update-frei
import { SupplyManagementAssignedCarComponent } from './components/assigned-car/assigned-car.component';
import { SupplyManagementQrcodePageComponent } from './components/qrcode-page/qrcode-page.component';
import { SupplyManagementUpdateExternalSnComponent } from './components/update-external-sn/update-external-sn.component';
-import { SupplyManagementBulkDetailComponent } from './components/bulk-detail/bulk-detail.component';
import { SupplyManagementVehicleDetailComponent } from './components/vehicle-detail/vehicle-detail.component';
import { SupplyManagementAddDriversComponent } from './components/add-drivers/add-drivers.component';
import { SupplyManagementOnecarPublishComponent } from './components/onecar-publish/onecar-publish.component';
@@ -28,6 +27,7 @@ import { SupplyManagementBulkPublishComponent } from './components/bulk-publish/
import { PublishAddressListComponent } from './components/onecar-publish/address-list/address-list.component';
import { PublishSuccessComponent } from './components/onecar-publish/publish-success/publish-success.component';
+
const COMPONENTS: Type
[] = [
SupplyManagementIndexComponent,
SupplyManagementBulkComponent,
@@ -37,7 +37,6 @@ const COMPONENTS: Type[] = [
SupplyManagementAssignedCarComponent,
SupplyManagementQrcodePageComponent,
SupplyManagementUpdateExternalSnComponent,
- SupplyManagementBulkDetailComponent,
SupplyManagementVehicleDetailComponent,
SupplyManagementAddDriversComponent,
SupplyManagementOnecarPublishComponent,
diff --git a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html
index eb663fcd..9e71aa21 100644
--- a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html
+++ b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html
@@ -1,7 +1,7 @@
+
+
{{ item?.price| currency: '￥' }}
+