From 78329f292ccb596af1fad0ea2cb9a9f79aa5daa0 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 6 Jan 2022 10:57:01 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../contract-template-detail.component.html | 6 ++-- .../contract-template-detail.component.ts | 28 +++++++++++-------- .../contract-template.component.html | 6 ++-- .../contract-template.component.ts | 14 +++++----- .../services/contract-management.service.ts | 10 ++++++- .../components/vehicle/vehicle.component.ts | 21 ++++++++++++-- .../services/order-management.service.ts | 5 ++-- .../onecar-publish.component.ts | 4 +++ .../release-publish.component.ts | 4 +++ .../update-freight.component.ts | 5 +++- .../vehicle-detail.component.html | 25 ++--------------- .../vehicle-detail.component.ts | 11 ++++++-- 12 files changed, 82 insertions(+), 57 deletions(-) diff --git a/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.html b/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.html index 9722a48a..27b03f7b 100644 --- a/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.html +++ b/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.html @@ -1,7 +1,7 @@
- {{(item.price * item.rate) | currency}} + {{(item.price * item.rate) | currency: '￥'}} (含附加费）
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 7ca0b8d7..da8237a1 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 @@ -63,14 +63,19 @@ export class SupplyManagementVehicleDetailComponent implements OnInit { ngOnInit(): void { this.getGoodsSourceDetail() + console.log('4444') } getGoodsSourceDetail() { this.service.request(this.service.$api_get_getCompleteVehicleDetail, { id: this.id }).subscribe(res => { - const expenseList = res?.expenseList || []; + console.log('888') + console.log(this.i) + const expenseList = res?.expenseVOList || []; this.totalExpensePrice = 0; - this.attObj = this.i?.billExpenseDetails?.filter((data: any) => data.expenseCode === 'ATT')[0]; - this.totalObj = this.i?.billExpenseDetails?.filter((data: any) => data.expenseCode === 'TOTAL')[0]; + this.attObj = res?.expenseVOList?.filter((data: any) => data.expenseCode === 'ATT')[0]; + this.totalObj = res?.expenseVOList?.filter((data: any) => data.expenseCode === 'TOTAL')[0]; + console.log(this.attObj) + console.log(this.totalObj) expenseList.forEach((e: any) => { this.totalExpensePrice += e?.price * e?.rate; }); From c5a15ed78d0aa617398ab57a63574cb7902e33fe Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 6 Jan 2022 11:13:20 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bulk-publish/bulk-publish.component.html | 6 + .../bulk-publish/bulk-publish.component.ts | 45 +++++ .../onecar-publish.component.html | 12 +- .../onecar-publish.component.ts | 45 +++++ .../release-publish.component.html | 175 +++++++++++++----- .../release-publish.component.ts | 2 + 6 files changed, 236 insertions(+), 49 deletions(-) diff --git a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html index d9be3fa8..85a20083 100644 --- a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html +++ b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html @@ -31,6 +31,9 @@ placeholder="请输入装货地" /> + @@ -71,6 +74,9 @@ placeholder="请输入卸货地" /> + diff --git a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts index 5154f830..639709fa 100644 --- a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts +++ b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts @@ -18,6 +18,7 @@ import { SupplyManagementService} from '../../services/supply-management.service import { map } from 'rxjs/operators'; import { of } from 'rxjs'; import { PublishSuccessComponent } from '../onecar-publish/publish-success/publish-success.component'; +import { PublishAddressListComponent } from '../onecar-publish/address-list/address-list.component'; @Component({ selector: 'app-publish-goods-bulk-publish', templateUrl: './bulk-publish.component.html', @@ -804,4 +805,48 @@ export class SupplyManagementBulkPublishComponent implements OnInit { choose(){ window.history.go(-1); } + chooseAddress(index: number, type: string) { + const modalRef = this.modalService.create({ + nzTitle: '选择地址', + nzContent: PublishAddressListComponent, + nzWidth: 900, + nzComponentParams: { spuStatus: '1' }, + nzOnOk: item => { + console.log(item) + console.log(type) + const data = item.seleteData; + if (JSON.stringify(data) === '{}') return; + switch (type) { + case 'start': + this.startInfo[index] = { + detailedAddress: data.detailedAddress, + appUserName: data.contactName, + contractTelephone: data.contactTelephone, + latitude: data.contactTelephone, + longitude: data.latitude, + province: data.province, + city: data.city, + area: data.area, + type: '1' + }; + break; + case 'end': + this.endInfo[index] = { + detailedAddress: data.detailedAddress, + appUserName: data.contactName, + contractTelephone: data.contactTelephone, + latitude: data.contactTelephone, + longitude: data.latitude, + province: data.province, + city: data.city, + area: data.area, + type: '2' + }; + break; + default: + break; + } + } + }); + } } diff --git a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html index 1fcb8d51..10a12bdb 100644 --- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html +++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html @@ -32,8 +32,8 @@ /> + > @@ -81,7 +81,9 @@ placeholder="请输入卸货地" /> - + @@ -254,14 +256,14 @@ ￥{{ i.value }}
-
+
diff --git a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts index cb3e2794..9ae84146 100644 --- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts +++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts @@ -1034,4 +1034,49 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { choose(){ window.history.go(-1); } + chooseAddress(index: number, type: string) { + const modalRef = this.modalService.create({ + nzTitle: '选择地址', + nzContent: PublishAddressListComponent, + nzWidth: 900, + nzComponentParams: { spuStatus: '1' }, + nzOnOk: item => { + console.log(item) + console.log(type) + const data = item.seleteData; + if (JSON.stringify(data) === '{}') return; + switch (type) { + case 'start': + this.startInfo[index] = { + detailedAddress: data.detailedAddress, + appUserName: data.contactName, + contractTelephone: data.contactTelephone, + latitude: data.contactTelephone, + longitude: data.latitude, + province: data.province, + city: data.city, + area: data.area, + type: '1' + }; + break; + case 'end': + this.endInfo[index] = { + detailedAddress: data.detailedAddress, + appUserName: data.contactName, + contractTelephone: data.contactTelephone, + latitude: data.contactTelephone, + longitude: data.latitude, + province: data.province, + city: data.city, + area: data.area, + type: '2' + }; + break; + default: + break; + } + } + }); + } + } diff --git a/src/app/routes/supply-management/components/release-publish/release-publish.component.html b/src/app/routes/supply-management/components/release-publish/release-publish.component.html index 7eaa1c9f..675d8749 100644 --- a/src/app/routes/supply-management/components/release-publish/release-publish.component.html +++ b/src/app/routes/supply-management/components/release-publish/release-publish.component.html @@ -17,7 +17,9 @@ -
装卸货信息预计公里数：{{ totalDistance }}km，预计行程耗时：{{ totalTime }}小时
+
装卸货信息预计公里数：{{ totalDistance }}km，预计行程耗时：{{ totalTime }}小时
@@ -28,13 +30,20 @@
- + - - + +
@@ -42,12 +51,25 @@ 联系人
- + - +
@@ -62,8 +84,7 @@
- +
@@ -73,13 +94,21 @@
- + - - + +
@@ -87,12 +116,25 @@ 联系人
- + - +
@@ -137,20 +179,41 @@ - + - + - + @@ -174,10 +237,17 @@
- - + +

注意事项:

①请仔细阅读《投保告知》

@@ -197,8 +267,13 @@
- +
@@ -210,15 +285,21 @@
- ￥{{i.value}} - ￥{{i.value}}（费率：{{currentRate | number: '0.2-4' }}%） - ￥{{i.value}} + ￥{{ i.value }} + ￥{{ i.value }}（费率：{{ currentRate | number: '0.2-4' }}%） + ￥{{ i.value }}
- +
天内支付运费 @@ -233,10 +314,16 @@
- - + +
diff --git a/src/app/routes/supply-management/components/release-publish/release-publish.component.ts b/src/app/routes/supply-management/components/release-publish/release-publish.component.ts index c40581ba..36eacc95 100644 --- a/src/app/routes/supply-management/components/release-publish/release-publish.component.ts +++ b/src/app/routes/supply-management/components/release-publish/release-publish.component.ts @@ -771,6 +771,8 @@ export class SupplyManagementReleasePublishComponent implements OnInit { nzWidth: 900, nzComponentParams: { spuStatus: '1' }, nzOnOk: item => { + console.log(item) + console.log(type) const data = item.seleteData; if (JSON.stringify(data) === '{}') return; switch (type) { From 76091782954f31a5233a5d769b211c059c8c5f2a Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 6 Jan 2022 13:21:40 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/carload/carload.component.html | 2 +- .../large-amount/large-amount.component.html | 2 +- .../addmodal/addmodal.component.html | 19 ++++++++++++--- .../components/addmodal/addmodal.component.ts | 24 +++++++------------ .../onecar-publish.component.html | 2 +- .../release-publish.component.html | 2 +- 6 files changed, 29 insertions(+), 22 deletions(-) diff --git a/src/app/routes/supply-goods/components/carload/carload.component.html b/src/app/routes/supply-goods/components/carload/carload.component.html index f7871ded..9e61fad1 100644 --- a/src/app/routes/supply-goods/components/carload/carload.component.html +++ b/src/app/routes/supply-goods/components/carload/carload.component.html @@ -145,7 +145,7 @@ diff --git a/src/app/routes/supply-goods/components/large-amount/large-amount.component.html b/src/app/routes/supply-goods/components/large-amount/large-amount.component.html index a0419cce..9353b87e 100644 --- a/src/app/routes/supply-goods/components/large-amount/large-amount.component.html +++ b/src/app/routes/supply-goods/components/large-amount/large-amount.component.html @@ -154,7 +154,7 @@ diff --git a/src/app/routes/supply-management/components/addmodal/addmodal.component.html b/src/app/routes/supply-management/components/addmodal/addmodal.component.html index a5b6c0c4..72932074 100644 --- a/src/app/routes/supply-management/components/addmodal/addmodal.component.html +++ b/src/app/routes/supply-management/components/addmodal/addmodal.component.html @@ -1,5 +1,5 @@
-
新增
+
添加熟车
@@ -30,9 +30,22 @@
- + +
+ 未认证 +
+
+ 待审核 +
+
+ 已成功 +
+
+ 已驳回 +
+ - {{item.carModel}};{{item.carLength}};{{item.carLoad}}; + {{item.carModelLabel}}-{{item.carLengthLabel}}米-{{item.carLoad}}吨
diff --git a/src/app/routes/supply-management/components/addmodal/addmodal.component.ts b/src/app/routes/supply-management/components/addmodal/addmodal.component.ts index 1d8e7646..06101f7b 100644 --- a/src/app/routes/supply-management/components/addmodal/addmodal.component.ts +++ b/src/app/routes/supply-management/components/addmodal/addmodal.component.ts @@ -106,17 +106,10 @@ export class CarAddmodalComponent implements OnInit { { title: '车辆信息', render: 'carModel', className: 'text-center' }, { title: '个人认证状态', - index: 'identityStatus', + render: 'certificationStatus', className: 'text-center', - type: 'enum', - enum: { - 10: '待审核', - 20: '已成功', - 30: '已驳回', - 40: '证件过期', - } }, - { title: '驾驶证类型', index: 'createTime', className: 'text-center' }, + { title: '驾驶证类型', index: 'driverType', className: 'text-center' }, { title: '操作', width: '180px', @@ -129,14 +122,16 @@ export class CarAddmodalComponent implements OnInit { } initData(flag?: any) { if (this.sf?.value.mobile) { - this.flag = flag this.service.request(this.service.$api_getCarCaptainByMobile, { mobile: this.sf?.value.mobile }).subscribe(res => { + this.flag = flag if (res.userId) { this.tableData = [res]; + setTimeout(() => { + this.st.reload() + }) } else { this.tableData = [] } - this.st.reload() }) } } @@ -152,15 +147,14 @@ export class CarAddmodalComponent implements OnInit { */ add(item: any) { const params: any = { - enterpriseId: this.companyData.enterpriseId, - enterpriseProjectId: this.companyData.projectId, source: 1, appUserId: item.appUserId ? item.appUserId : '', mobile: item.mobile } this.service.request(this.service.$api_enterpriseVehicleSave, params).subscribe(res => { - if (res.data) { + if (res) { this.service.msgSrv.success('添加成功') + this.modal.close(true) } }) } @@ -174,6 +168,6 @@ export class CarAddmodalComponent implements OnInit { window.history.go(-1); } close(): void { - this.modal.destroy(); + this.modal.close(true); } } diff --git a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html index 10a12bdb..904c233e 100644 --- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html +++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html @@ -282,7 +282,7 @@
- + diff --git a/src/app/routes/supply-management/components/release-publish/release-publish.component.html b/src/app/routes/supply-management/components/release-publish/release-publish.component.html index 675d8749..8c11ff2d 100644 --- a/src/app/routes/supply-management/components/release-publish/release-publish.component.html +++ b/src/app/routes/supply-management/components/release-publish/release-publish.component.html @@ -313,7 +313,7 @@
- +
diff --git a/src/app/routes/supply-management/components/assigned-car/assigned-car.component.ts b/src/app/routes/supply-management/components/assigned-car/assigned-car.component.ts index 6c73d077..adde5b77 100644 --- a/src/app/routes/supply-management/components/assigned-car/assigned-car.component.ts +++ b/src/app/routes/supply-management/components/assigned-car/assigned-car.component.ts @@ -117,7 +117,7 @@ export class SupplyManagementVehicleAssignedCarComponent implements OnInit { if (this.selectedRows) { const { carId, appUserId: driverId, captainAppUserId: carCaptainId } = this.selectedRows; const params: any = { carId, driverId, carCaptainId }; - this.service.request(this.url, { ...params, ...this.params }).subscribe((res: any) => { + this.service.request(this.service.$api_save_assign_bulk, { ...params, ...this.params }).subscribe((res: any) => { if (res) { this.modal.close(res); } @@ -150,7 +150,11 @@ export class SupplyManagementVehicleAssignedCarComponent implements OnInit { modalOptions: { nzMaskClosable: false, nzTitle: '设置' } } ).subscribe((res) => { - if (res) this.st.reload(); + if (res) { + item.captainName = res?.name; + item.captainPhone = res?.mobile; + item.captainAppUserId = res?.appUserId; + } }); }