diff --git a/src/app/routes/account/components/center/center.component.ts b/src/app/routes/account/components/center/center.component.ts index e7040b25..39fbbdf6 100644 --- a/src/app/routes/account/components/center/center.component.ts +++ b/src/app/routes/account/components/center/center.component.ts @@ -172,7 +172,9 @@ export class AccountComponentsCenterComponent implements OnInit { const modalRef = this.modalService.create({ nzTitle: '设置/修改登录密码', nzContent: AccountComponentsCenterEditComponent, - nzComponentParams: { }, + nzComponentParams: { + record: this.infoData + }, }); modalRef.afterClose.subscribe((result: any) => { if (result === true) { diff --git a/src/app/routes/account/components/edit-name/edit-name.component.html b/src/app/routes/account/components/edit-name/edit-name.component.html index 2a32e1fb..dfa08443 100644 --- a/src/app/routes/account/components/edit-name/edit-name.component.html +++ b/src/app/routes/account/components/edit-name/edit-name.component.html @@ -1,7 +1,7 @@ @@ -223,7 +202,7 @@
- +
+
+
@@ -64,7 +66,7 @@
- + 货物信息 @@ -82,14 +84,14 @@ {{i?.goodsInfoList?.[0]?.maxWeightLabel}}/{{i?.goodsInfoList?.[0]?.maxCube}} - + {{i?.driverName}}/{{i?.driverPhone}}/{{i?.carNo}} - {{i?.goodsInfoList?.[0]?.weight}}顿,{{i?.goodsInfoList?.[0]?.volume}}方,{{i?.goodsInfoList?.[0]?.number}}件 + {{i?.carModel}},{{i?.carLength}},{{i?.carLoad ? i?.carLoad +'吨': ''}} -
-

装货卸货信息 +
+

装货卸货信息 ( @@ -135,8 +137,12 @@ -
总计：{{i?.total | currency: '￥'}}（运费￥3500.00，附加运费￥191.98，附加费率3.5%）
-
收款人：
+
+ 总计：{{ totalObj?.price | currency: '￥' }} （运费￥{{ + totalObj?.price - attObj?.price + }}，附加运费￥{{ attObj?.price }}，附加费率{{ (attObj?.price / totalObj?.price) * 100 | number: '0.2-2' }}%） +
+
收款人：{{ i?.payeeName }}/{{ i?.payeePhone }}
@@ -206,7 +212,7 @@ - + diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts index e5f050ae..c53e74f7 100644 --- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts +++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts @@ -2,7 +2,7 @@ import { ViewChild } from '@angular/core'; /* * @Author: your name * @Date: 2021-12-03 15:31:52 - * @LastEditTime: 2021-12-27 21:05:48 + * @LastEditTime: 2021-12-28 16:22:50 * @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\components\vehicle-detail\vehicle-detail.component.ts @@ -29,6 +29,8 @@ export class OrderManagementVehicleDetailComponent implements OnInit { goodsResource: [] }; imges: any; + attObj: any; + totalObj: any; approvalLsit: any; isVisible = false; logColumns: STColumn[] = [ @@ -72,6 +74,8 @@ export class OrderManagementVehicleDetailComponent implements OnInit { if (res) { this.i = res; this.approvalLsit = res.scheduleVOList; + 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.approvalLsit.map((item: any, key: any) => { console.log(item); if (item.displayStatus === 'HIDE') { @@ -108,7 +112,7 @@ export class OrderManagementVehicleDetailComponent implements OnInit { goDistance(elf: NzCardComponent) { if (elf) { - elf['elementRef'].nativeElement.scrollIntoView({ behavior: 'smooth', block: 'start', inline: 'start' }); + elf['elementRef'].nativeElement.scrollIntoView({ behavior: 'smooth', block: 'start', inline: 'start' , yOffset : 400 }); } } } diff --git a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html index 1fbf408f..9cbb9666 100644 --- a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html @@ -22,7 +22,7 @@

- 总费用：{{i?.freightPrice | currency}} + 总费用：{{i?.freightPrice | currency: '¥'}}
@@ -79,8 +79,8 @@

装货卸货信息 ( - - + + )

@@ -129,7 +129,7 @@
- {{item?.freightPrice | currency}} + {{item?.freightPrice | currency: '￥'}} {{freightType[item?.freightType]}}
diff --git a/src/app/routes/supply-management/components/bulk/bulk.component.ts b/src/app/routes/supply-management/components/bulk/bulk.component.ts index 7b733e2d..e78b0689 100644 --- a/src/app/routes/supply-management/components/bulk/bulk.component.ts +++ b/src/app/routes/supply-management/components/bulk/bulk.component.ts @@ -259,22 +259,22 @@ export class SupplyManagementBulkComponent implements OnInit { { text: '货源审核', click: (_record) => this.audit(_record, 1), - // iif: item => item.auditStatus === 1, + iif: item => item.auditStatus == 1, }, { text: '二维码', click: (_record) => this.assignedQrcode(_record), - // iif: item => item.auditStatus === 1 || item.auditStatus === 2, + iif: item => item.auditStatus == 1 || item.auditStatus == 2, }, { text: '修改单价', click: (_record) => this.modification(_record), - // iif: item => item.auditStatus === 1 || item.auditStatus === 2, + iif: item => item.auditStatus == 1 || item.auditStatus == 2, }, { text: '取消货源', click: (_record) => this.delOne(_record), - // iif: item => item.auditStatus === 1 || item.auditStatus === 2, + iif: item => item.auditStatus == 1 || item.auditStatus == 2, }, { text: '再下一单', @@ -282,8 +282,8 @@ export class SupplyManagementBulkComponent implements OnInit { }, { text: '重新指派', - // click: (_record) => this.delOne(_record), - // iif: item => item.auditStatus === 2, + click: (_record) => this.delOne(_record), + iif: item => item.auditStatus == 2, }, ], }, @@ -402,14 +402,31 @@ export class SupplyManagementBulkComponent implements OnInit { handleOK() { } - // 修改货源 + // 修改单价 modification(item: any) { - this.router.navigate(['/supply-management/bulk-amend', item.id], { - queryParams: { - sta: 3 + const modalRef = this.modal.create({ + nzTitle: '修改单价', + nzWidth: '600px', + nzContent: SupplyManagementUpdatePriceComponent, + nzComponentParams: { + record: item, }, + nzFooter: null, + }); + modalRef.afterClose.subscribe(res => { + if (res) { + console.log(res) + // this.getGoodsSourceDetail(); + } }) } + // getGoodsSourceDetail() { + // this.service.request(this.service.$api_get_bulk_detail, { id: this.id }).subscribe(res => { + // this.i = res; + // this.currentStatus = +this.i?.resourceStatus - 1; + // }) + // } + // 再下一单 nextOrder(item: any) { this.router.navigate(['/supply-management/bulk-amend', item.id], { diff --git a/src/app/routes/supply-management/components/qrcode-page/qrcode-page.component.html b/src/app/routes/supply-management/components/qrcode-page/qrcode-page.component.html index d9337a41..537dbbe2 100644 --- a/src/app/routes/supply-management/components/qrcode-page/qrcode-page.component.html +++ b/src/app/routes/supply-management/components/qrcode-page/qrcode-page.component.html @@ -1,14 +1,23 @@ + -
+
-

公司名称:{{i.companyName}}

+

公司名称 : {{i?.enterpriseInfoName}}

-
卸货地:{{i.adddress}}
-
装货地:{{i.adddress}}
-
截止时间:{{i.createdAt}}
-
Tips:二维码用于司机扫码抢单
+
卸货地 : {{address}}
+
装货地 : {{address}}
+
截止时间 : {{i?.deadlineTime}}
+
Tips : 二维码用于司机扫码抢单
-
- -
-
\ No newline at end of file + +
+
+ +
diff --git a/src/app/routes/supply-management/components/qrcode-page/qrcode-page.component.ts b/src/app/routes/supply-management/components/qrcode-page/qrcode-page.component.ts index 475e28dc..03f637d9 100644 --- a/src/app/routes/supply-management/components/qrcode-page/qrcode-page.component.ts +++ b/src/app/routes/supply-management/components/qrcode-page/qrcode-page.component.ts @@ -1,9 +1,14 @@ -import { THIS_EXPR } from '@angular/compiler/src/output/output_ast'; +/* + * @Author: your name + * @Date: 2021-12-03 11:10:14 + * @LastEditTime: 2021-12-28 17:24:54 + * @LastEditors: your name + * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE + * @FilePath: \tms-obc-web\src\app\routes\supply-management\components\qrcode-page\qrcode-page.component.ts + */ import { Component, OnInit, ViewChild } from '@angular/core'; import { QRComponent } from '@delon/abc/qr'; import { SFSchema, SFUISchema } from '@delon/form'; -import { _HttpClient } from '@delon/theme'; -import { NzMessageService } from 'ng-zorro-antd/message'; import { NzModalRef } from 'ng-zorro-antd/modal'; @@ -15,16 +20,7 @@ export class SupplyManagementQrcodePageComponent implements OnInit { @ViewChild('qr') qr!: QRComponent; record: any = {}; i: any; - schema: SFSchema = { - properties: { - no: { type: 'string', title: '编号' }, - owner: { type: 'string', title: '姓名', maxLength: 15 }, - callNo: { type: 'number', title: '调用次数' }, - href: { type: 'string', title: '链接', format: 'uri' }, - description: { type: 'string', title: '描述', maxLength: 140 }, - }, - required: ['owner', 'callNo', 'href', 'description'], - }; + schema: SFSchema = {}; ui: SFUISchema = { '*': { spanLabelFixed: 100, @@ -44,15 +40,13 @@ export class SupplyManagementQrcodePageComponent implements OnInit { constructor( private modal: NzModalRef, - private msgSrv: NzMessageService, - public http: _HttpClient, ) { } ngOnInit(): void { - if (this.record.id > 0) - this.http.get(`/user/${this.record.id}`).subscribe(res => (this.i = res)); + console.log(this.i); } + downLoadQrcode(downloadName: any): void { let aLink = document.createElement('a'); const content = this.qr.dataURL; diff --git a/src/app/routes/supply-management/components/update-price/update-price.component.html b/src/app/routes/supply-management/components/update-price/update-price.component.html index 0323f3a5..dd078c9e 100644 --- a/src/app/routes/supply-management/components/update-price/update-price.component.html +++ b/src/app/routes/supply-management/components/update-price/update-price.component.html @@ -1,14 +1,6 @@ -
- + { - console.log(res) - this.ii = res[0]; - }) + if (this.record?.id) this.getGoodsResourceShipperDeatail(this.record?.id); } initSF() { @@ -64,13 +55,10 @@ export class SupplyManagementUpdatePriceComponent implements OnInit { rule: { type: 'string', title: '取整规则', - enum: [ - { label: '保留小数', value: '1' }, - { label: '抹除小数', value: '2' }, - { label: '抹除个位', value: '3' }, - ], + default: '0', ui: { - widget: 'select', + widget: 'dict-select', + params: { dictKey: 'goodresource:rounding:rules' }, optionalHelp: { text: '例如:付司机运费= 重量*单价 = 999.99;\n 保留小数：即 999.99; \n 抹除小数：即 999.00;\n 抹除个位，即 990.00', } @@ -88,6 +76,13 @@ export class SupplyManagementUpdatePriceComponent implements OnInit { }; } + getGoodsResourceShipperDeatail(id: any) { + this.service.request(this.service.$api_get_goods_resource_shipper, { id }).subscribe(res => { + if (res) { + this.i = res; + } + }) + } /** * 初始化数据列表 */ @@ -99,8 +94,9 @@ export class SupplyManagementUpdatePriceComponent implements OnInit { ]; } save(value: any): void { - console.log(value) - const { id, freightType, freightPrice, resourceCode, rule, resourceId } = value; + console.log(value); + // const { id: resourceId, freightType, freightPrice, resourceCode, rule, goodsID: id } = value; + const { resourceId, freightType, freightPrice, resourceCode, rule, id } = value; this.service.request(this.service.$api_update_price, { id, freightType, freightPrice, resourceCode, rule, resourceId }).subscribe(res => { if (res) { this.msgSrv.success('保存成功'); 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 f105d094..d71990b9 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 @@ @@ -220,7 +203,7 @@
- +
- + - - -
-
- - {{ i?.no }} - {{i?.wayBillStatusLabel}} - - - - + +
+ +

运单号: {{ i?.wayBillCode }}

-
- - - - -
-
- -
- {{ i?.enterpriseProject }} - {{ i?.dispatch?.name }}/{{i?.dispatch?.phone}} - 到货后{{ i?.paymentDays }}天内支付运费 - {{ i?.serviceTypeLabel }} -
- -
-
-
-

装卸货信息

-
-

装货地：{{item?.detailedAddress}}

-

联系人：{{item?.appUserName}}/{{item?.contractTelephone}}

-

发货日期：{{item?.createTime}}

-
-
-

卸货地：{{item?.detailedAddress}}

-

联系人：{{item?.appUserName}}/{{item?.contractTelephone}}

-

卸货日期：{{item?.modifyTime}}

-
-
-
-
-
-

货物信息

-
-

货物名称：{{item?.goodsName}}

-

重量/体积：{{item?.weight}}吨/{{item?.volume}}立方

-

用车需求：{{item?.vehicleDemand}}

-
-
-
-
-
-

托运信息

-

公司名称：{{i?.enterpriseInfoName}}

-

联系人：{{ i?.dispatch?.name }}/{{i?.dispatch?.phone}}

-
-
-
-
-

承运信息

-

司机：{{i?.driverVo?.name}}/{{i?.driverVo?.phone}}

-

车牌号：{{i?.carVO?.carNo}}

-

车型/车长/承重：{{i?.carVO?.carModel}} | {{i?.carVO?.carLength}} | {{i?.carVO?.carLoad}}

-
-
-
-

补充信息

-

协议附件

-

装车附件

-

卸货附件

-

回单附件

-
-
- -
-
-

运费信息

-
-

{{i?.payee?.name}} /{{i?.payee?.phone}} / {{i?.payee?.phone}}

-
-

{{ item?.price| currency: '￥' }}

-
+
+
+ +
-
-
-

{{i?.freight | currency: '￥' }}

-

{{i?.wayBillStatusLabel}}

-
- +
+
+ {{ i?.enterpriseInfoName }} + {{ i?.goodsResource?.shipperAppUserName }} + {{i?.enterpriseProject}} + {{i?.serviceTypeLabel}} + {{i?.dispatch?.name}} /{{i?.dispatch?.phone}} +
+ + + + + + + + + + + + +
+ + + +
+
+   +   +   +  
- -
-
-
-
平台支付
- -
- -
-

{{ item?.price| currency: '￥' }}

+ + + + + + {{i?.goodsInfos?.[0]?.goodsName}} + + + + + {{i?.goodsInfos?.[0]?.weight}}吨,{{i?.goodsInfos?.[0]?.volume}}方,{{i?.goodsInfos?.[0]?.number}}件 + + + {{i?.goodsInfos?.[0]?.maxWeightLabel}}/{{i?.goodsInfos?.[0]?.maxCube}} + + + {{i?.driver?.name}}/{{i?.driver?.phone}} + + + {{i?.goodsInfos?.[0]?.weight}}吨,{{i?.goodsInfos?.[0]?.volume}}方,{{i?.goodsInfos?.[0]?.number}}件 + + + {{i?.loadPlanTime}} + + + {{i?.unloadPlanTime}} + + + {{i?.acceptWeight}}吨,{{i?.acceptVolume}}方,{{i?.acceptNumber}}件 + + + {{i?.acceptWeight}}吨,{{i?.acceptVolume}}方,{{i?.acceptNumber}}件 + + + {{i?.settlementWeight}}吨,{{i?.settlementVolume}}方,{{i?.acceptNumber}}件 + + +
+

装货卸货信息 + ( + + + ) + +

+
+
+
+
+
+
装
+
+

装货地：{{item?.province}}{{item.city}}{{item.area}}{{item.detailedAddress}}

+

联系人：{{item.appUserName}}/{{item.contractTelephone}}

+
-
-
-
货主支付
-
-

{{ item?.price| currency: '￥' }}

+
+
+
+
+
卸
+
+

卸货地：{{item?.province}}{{item.city}}{{item.area}}{{item.detailedAddress}}

+

联系人：{{item.appUserName}}/{{item.contractTelephone}}

+
+
- +
+ + + + +
+ 总计：{{ i?.freight | currency: '￥' }} +
+
收款人：{{ i?.payee?.name }}/{{ i?.payee?.phone }}
+ + + + + + + 查看附件      + 补充协议 + + + + + + + + + + + + + + + + + {{i?.goodsResource?.stateReceipt ?'是':'否'}} + + + {{i?.goodsResource?.receiptTypeLabel}} + + + {{i?.goodsResource?.receiptUserId}} / {{i?.supplementaryInformationVO?.phon}} + + + {{i?.goodsResource?.receiptAddress}} + + + {{i?.goodsResource?.receiptAddress}} + + + + + + + + {{i?.goodsResource?.remarks}} + + + + +
- +
- - +
@@ -149,6 +208,7 @@
+ @@ -157,4 +217,4 @@ - + \ No newline at end of file diff --git a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.less b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.less index 3cd8c1be..b8327013 100644 --- a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.less +++ b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.less @@ -33,4 +33,38 @@ .leftPadding { padding-right: 100px; } + .handling-info { + min-height: 100px; + border: 1px solid #ccc; + + .loading-row { + display: flex; + } + + .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; + } + } + + .info { + flex: 1; + } + + .time-info { + margin-left: 56px; + } + } } \ No newline at end of file diff --git a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.ts b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.ts index feb59366..b73d7a9f 100644 --- a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.ts +++ b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.ts @@ -1,7 +1,7 @@ /* * @Author: your name * @Date: 2021-12-03 15:31:52 - * @LastEditTime: 2021-12-27 15:38:04 + * @LastEditTime: 2021-12-28 17:10:12 * @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\components\vehicle-detail\vehicle-detail.component.ts @@ -10,6 +10,7 @@ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { STColumn } from '@delon/abc/st'; import { _HttpClient } from '@delon/theme'; +import { NzCardComponent } from 'ng-zorro-antd/card'; import { NzMessageService } from 'ng-zorro-antd/message'; import { NzModalService } from 'ng-zorro-antd/modal'; import { WaybillManagementServe } from '../../services/waybill-management.service'; @@ -21,13 +22,29 @@ import { WaybillManagementServe } from '../../services/waybill-management.servic export class WaybillManagementVehicleDetailComponent implements OnInit { id = this.route.snapshot.params.id; - isVisible = false; i: any; - imges: any; + totalObj: any; + attObj: any; + isVisible = false; logColumns: STColumn[] = [ - { title: '时间', index: 'operationUserPhone' }, - { title: '地点', index: ' createTime' }, + { title: '款项', index: 'costName' }, + { title: '运输费（元）', index: 'price' }, + { title: '支付时间', index: ' paymentTime' }, + { + title: '支付状态', + className: 'text-center', + index: 'paymentStatus', + type: 'badge', + width: '120px', + badge: { + '1': { text: '待申请', color: 'warning' }, + '2': { text: '已支付', color: 'success' }, + '3': { text: '已拒绝', color: 'warning' }, + '4': { text: '申请中', color: 'warning' }, + }, + }, ]; + imges: any; unLoadingPlaceVOList: any = []; constructor( @@ -41,6 +58,7 @@ export class WaybillManagementVehicleDetailComponent implements OnInit { ngOnInit(): void { this.initData() + } initData() { const params = { @@ -48,12 +66,12 @@ export class WaybillManagementVehicleDetailComponent implements OnInit { } this.service.request(this.service.$api_get_getWholeDetail, params).subscribe((res) => { console.log(res) - if(res) { - this.unLoadingPlaceVOList.push(...res.loadingPlace) - this.unLoadingPlaceVOList.push(...res?.dischargePlace) - console.log(this.unLoadingPlaceVOList) - this.i = res; - } + this.unLoadingPlaceVOList.push(...res.loadingPlace) + this.unLoadingPlaceVOList.push(...res.dischargePlace) + console.log(this.unLoadingPlaceVOList) + this.i = res; + this.attObj = this.i?.billExpenseDetailVOList?.filter((data: any) => data.expenseCode === 'ATT')[0]; + this.totalObj = this.i?.billExpenseDetailVOList?.filter((data: any) => data.expenseCode === 'TOTAL')[0]; }) } @@ -69,24 +87,29 @@ export class WaybillManagementVehicleDetailComponent implements OnInit { goBack() { window.history.go(-1); } -handleCancel() { + agreement(value: any) { + console.log('123') + console.log(value) + if(value === '1') { + this.imges = this.i?.supplementAgreement + } else if (value === '2') { + this.imges = this.i?.loadingCertificate + } else if (value === '3') { + this.imges = this.i?.unLoadingCertificate + } else if (value === '4') { + this.imges = this.i?.receiptCertificate + } + this.isVisible = true; + } + handleCancel() { this.isVisible = false } handleOK() { this.isVisible = false } -agreement(value: any) { - console.log('123') - console.log(value) - if(value === '1') { - this.imges = this.i?.supplementAgreement - } else if (value === '2') { - this.imges = this.i?.loadingCertificate - } else if (value === '3') { - this.imges = this.i?.unLoadingCertificate - } else if (value === '4') { - this.imges = this.i?.receiptCertificate +goDistance(elf: NzCardComponent) { + if (elf) { + elf['elementRef'].nativeElement.scrollIntoView({ behavior: 'smooth', block: 'start', inline: 'start' }); } - this.isVisible = true; } }