diff --git a/src/app/routes/order-management/components/bulk/bulk.component.ts b/src/app/routes/order-management/components/bulk/bulk.component.ts index 4bbbaee6..5c6ffe4f 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.ts +++ b/src/app/routes/order-management/components/bulk/bulk.component.ts @@ -599,14 +599,25 @@ tabs = { *变更运费 */ updateFreight(item: any) { - const modalRef = this.modal.create({ - nzTitle: '变更运费', - nzWidth: '50%', - nzContent: UpdateFreightComponent, - nzComponentParams: { - i: item - }, - nzFooter: null + this.service.request(this.service.$api_getFreightChangeBulkDetail, { id: item.id }).subscribe(data => { + if (data) { + const modal = this.modal.create({ + nzTitle: '变更运费', + nzWidth: 580, + nzContent: UpdateFreightComponent, + nzComponentParams: { data }, + nzOnOk: sin => { + this.service.request(this.service.$api_insertFreightChangeBulk, { billId: item.id, ...sin.sf.value }).subscribe(res => { + if (res) { + this.service.msgSrv.success('变更运费成功'); + modal.destroy(); + this.st.reload(); + } + }); + return false; + } + }); + } }); } diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html index 47128d08..30c587fa 100644 --- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html +++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html @@ -1,138 +1,165 @@ - + - - - -
-
- - {{ i?.no }} - 待接单 - - - - + +
+

订单号: {{ i?.billCode }}

-
- - - +
+
+ + + + +
+
+
+ {{ i?.goodsInfoList[0].shipperAppUserName }} + {{i?.enterpriseProjectId}} + {{i?.createUserId}} + {{i?.dispatchName}} 18100000000 + {{i?.serviceTypeLabel}} +
+ + + +
+
+ + + +
- -
- {{ i?.owner }} - 32943898021309809423 - 3321944288191034921 - 18112345678 -
- -
-
-
-

装卸货信息

-

装货地：广东省深圳市龙岗区怡亚通大厦

-

联系人：奥利给/13680058545

-

卸货地：广东省深圳市福田区岗厦村9巷8号405（新村）

-

联系人：花花世界/13680058545

-

发货日期：广东省深圳市福田区岗厦村9巷8号405（新村）

-

卸货日期：花花世界/13680058545

-
-
-
-
-

货物信息

-

货物名称：广东省深圳市龙岗区怡亚通大厦

-

重量/体积：广东省深圳市福田区岗厦村9巷8号405（新村）

-

车型/车长：花花世界/13680058545

-
-
-
-
-

托运信息

-

公司名称：广东省深圳市龙岗区怡亚通大厦

-

联系人：广东省深圳市福田区岗厦村9巷8号405（新村）

-
-
-
-
-

承运信息

-

司机：广东省深圳市龙岗区怡亚通大厦

-

车牌号：广东省深圳市福田区岗厦村9巷8号405（新村）

-

车型/车长/承重：{{'拖车'}} | {{'4.5米'}} | {{'15吨'}}

-
-
-
-

补充信息

-

协议附件

-

装车附件

-

卸货附件

-

回单附件

-
-
- -
-
-

运费信息

-
-

{{400 | currency }}

-

{{400 | currency }}

-

{{400 | currency }}

-

{{400 | currency }}

-

{{400 | currency}}

-

{{400 | currency }}

-
-
- -
-
-

{{400 | currency }}

-

未支付

-
+ -
-
- -
-
-
- 司机运输费 - 1000.00 - 未支付 + +
+
+
+
+
+
+
装
+
+

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

+

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

+
+
+
+

装货时间：{{i?.loadingTime}}

+
-
-
-
- 司机运输费 - 1000.00 - 未支付 -
-
- 附加费 - 1000.00 - 未支付 +
+
+
+
+
卸
+
+

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

+

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

+
+
+
+

卸货时间：{{i?.unloadingTime}}

+
- - + + + + + {{i?.goodsName}} + + + {{i?.weight}}顿,{{i?.volume}}方,{{i?.number}}件 + + + + + {{i?.goodsName}} + + + {{i?.weight}}顿,{{i?.volume}}方,{{i?.number}}件 + + + {{i?.weight}}顿,{{i?.volume}}方,{{i?.number}}件 + + + {{i?.weight}}顿,{{i?.volume}}方,{{i?.number}}件 + + + + + + + + + + + + +
总计：{{i?.total | currency: '￥'}}（运费￥3500.00，附加运费￥191.98，附加费率3.5%）
+
收款人：
+ + + + + + {{i?.supplementaryInformationVO?.stateReceipt?'是':'否'}} + + + + + {{i?.supplementaryInformationVO?.remarks}} + + + {{i?.supplementaryInformationVO?.remarks}} + + + + + + + {{i?.supplementaryInformationVO?.stateReceipt?'是':'否'}} + + + {{i?.supplementaryInformationVO?.receiptTypeLabel}} + + + {{i?.supplementaryInformationVO?.receiptUserName}} / {{i?.supplementaryInformationVO?.phon}} + + + {{i?.supplementaryInformationVO?.area}} + + + {{i?.supplementaryInformationVO?.address}} + + + + + {{i?.supplementaryInformationVO?.remarks}} + + + + +
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 6e0b70e7..3245c4e0 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 @@ -1,7 +1,7 @@ /* * @Author: your name * @Date: 2021-12-03 15:31:52 - * @LastEditTime: 2021-12-20 09:35:33 + * @LastEditTime: 2021-12-21 11:22:23 * @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 @@ -37,13 +37,18 @@ export class OrderManagementVehicleDetailComponent implements OnInit { } ngOnInit(): void { - this.service.http.get(`/user/${this.id}?_allow_anonymous=true&_allow_badcode=true`).subscribe(res => { - console.log(res); - this.i = res - }); + console.log(this.id) + this.initData() } - + initData() { + this.service.request(this.service.$api_get_getWholeBillDetail, {id: this.id}).subscribe(res => { + console.log(res) + if (res) { + this.i =res; + } + }) + } hand() { this.modalService.create({ diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.html b/src/app/routes/order-management/components/vehicle/vehicle.component.html index d696ebfe..b81ab436 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.html +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.html @@ -1,7 +1,7 @@ - - - -
- -
元/吨
-
- - -
- -
吨
-
- - -
- -
吨
-
- - -
- -
吨
-
- - -
- -
吨
-
- + - +
-

总运费：￥900.00

-

运输费：￥800.00，附加费：￥100.00

-
- -
- - -
+

+ 总运费：￥{{ data.totalFreight }} +

+

运输费：￥{{ data.freight }}，附加费：￥{{ data.surcharge }}

+
\ No newline at end of file diff --git a/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.ts b/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.ts index afad8c66..8cfab1a7 100644 --- a/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.ts +++ b/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.ts @@ -1,4 +1,3 @@ -import { preloaderFinished } from '@delon/theme'; /* * @Author: your name * @Date: 2021-12-14 14:03:07 @@ -7,20 +6,12 @@ import { preloaderFinished } from '@delon/theme'; * @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 { Component, Input, OnInit, ViewChild } from '@angular/core'; import { - SFComponent, - SFCustomWidgetSchema, - SFNumberWidgetSchema, - SFRadioWidgetSchema, - SFSchema, + SFComponent, SFNumberWidgetSchema, SFSchema, SFSelectWidgetSchema, - SFTextareaWidgetSchema, - SFUISchema + SFStringWidgetSchema, SFTextWidgetSchema } from '@delon/form'; -import { _HttpClient } from '@delon/theme'; -import { NzMessageService } from 'ng-zorro-antd/message'; -import { NzModalRef } from 'ng-zorro-antd/modal'; @Component({ selector: 'app-order-management-update-freight', @@ -28,116 +19,154 @@ import { NzModalRef } from 'ng-zorro-antd/modal'; styleUrls: ['./update-freight.component.less'] }) export class UpdateFreightComponent implements OnInit { - record: any = {}; - i: any; @ViewChild('sf', { static: false }) sf!: SFComponent; - schema: SFSchema = {}; - ui: SFUISchema = {}; - data: any = {}; - constructor(private modal: NzModalRef, private msgSrv: NzMessageService, public http: _HttpClient) {} + schema!: SFSchema; + + @Input() + data: any; + + constructor() {} ngOnInit(): void { - this.initSF(); - - if (this.record.id > 0) this.http.get(`/user/${this.record.id}`).subscribe(res => (this.i = res)); - } - initSF() { - this.schema= { - properties: { - no: { - type: 'string', - title: '运费单价', - ui: { - widget: 'custom', - } - }, - sex: { - title: '', - type: 'string', - enum: [ - { label: '保留小数', value: 0 }, - { label: '男', value: 1 }, - { label: '女', value: 2 }, - { label: '保密', value: 3 }, - ], - ui: { - widget: 'select', - } as SFSelectWidgetSchema, - }, - appId: { - type: 'string', - title: '结算依据', - ui: { - width: 300, - grid: { span: 24 }, - widget: 'select', - placeholder: '请选择', - allowClear: true, - // asyncData: () => this.getCatalogueMember(), - }, - }, - no2: { - type: 'string', - title: '装货重量', - ui: { - widget: 'custom', - } - }, - no3: { - type: 'string', - title: '装货体积', - ui: { - widget: 'custom', - } - }, - no4: { - type: 'string', - title: '卸货重量', - ui: { - widget: 'custom', - } - }, - no5: { - type: 'string', - title: '卸货体积', - ui: { - widget: 'custom', - } - }, - name3: { - type: 'string', - title: '变更原因', - maxLength: 100, - ui: { - width: 300, - placeholder:"选填，最多不超过100字", - widget: 'textarea', - autosize: { minRows: 3, maxRows: 6 } - } as SFTextareaWidgetSchema - }, - }, - required: ['no', 'appId'], - type: 'object', - }; - this.ui = { '*': { spanLabelFixed: 100, grid: { span: 12, gutter: 4 } } - }; - } - save(value: any): void { - console.log(value) - console.log(this.data) - this.http.post(`/user/${this.record.id}`, value).subscribe(res => { - this.msgSrv.success('保存成功'); - this.modal.close(true); - }); + this.schema = this.initSF(this.data); } - close(): void { - this.modal.destroy(); - } /** - * 更新数字框 - * @param value - * @param type + * 初始化表单 */ - changeNumVal(value: any, type: number) {} + private initSF(data: any): SFSchema { + return { + properties: { + dto: { + type: 'object', + properties: { + freightPrice: { + type: 'string', + title: '运费单价', + ui: { + addOnAfter: data.freightTypeLabel, + placeholder: '请输入', + grid: { + span: 12 + } + } as SFStringWidgetSchema, + default: data.freightPrice + }, + rule: { + title: '', + type: 'string', + default: data.rule, + enum: [ + { label: '保留小数', value: '1' }, + { label: '抹除小数', value: '2' }, + { label: '抹除个数', value: '3' } + ], + ui: { + widget: 'select', + spanLabelFixed: 10, + grid: { + span: 10 + } + } as SFSelectWidgetSchema + }, + settlementBasis: { + title: '结算依据', + type: 'string', + default: data.settlementBasis, + enum: [ + { label: '以收货为准', value: '1' }, + { label: '以发货为准', value: '2' } + ], + ui: { + widget: 'select', + grid: { + span: 12 + } + } as SFSelectWidgetSchema + }, + blank1: { + title: '', + type: 'string', + ui: { widget: 'text', grid: { span: 12 }, class: 'input-back' }, + default: ' ' + }, + freightType: { + title: '', + type: 'string', + ui: { hidden: true }, + default: data.freightType + }, + acceptWeight: { + type: 'number', + title: '装货重量', + default: data.acceptWeight, + ui: { + unit: '吨', + placeholder: '请输入', + grid: { + span: 12 + }, + hideStep: true + } as SFNumberWidgetSchema + }, + acceptVolume: { + type: 'number', + title: '装货体积', + default: data.acceptVolume, + ui: { + unit: '吨', + placeholder: '请输入', + grid: { + span: 12 + }, + hideStep: true + } as SFNumberWidgetSchema + }, + settlementWeight: { + type: 'number', + title: '卸货重量', + default: data.settlementWeight, + ui: { + unit: '吨', + placeholder: '请输入', + grid: { + span: 12 + }, + hideStep: true + } as SFNumberWidgetSchema + }, + settlementVolume: { + type: 'number', + title: '卸货体积', + default: data.settlementVolume, + ui: { + unit: '吨', + placeholder: '请输入', + grid: { + span: 12 + }, + hideStep: true + } as SFNumberWidgetSchema + } + }, + required: ['freightPrice', 'settlementBasis'] + }, + changeCause: { + title: '审核备注', + type: 'string', + maxLength: 100, + default: data.changeCause, + ui: { + widget: 'textarea', + span: 24, + placeholder: '选填，最多不超过100字', + autosize: { + minRows: 3, + maxRows: 5 + } + } as SFTextWidgetSchema + } + } + }; + } } diff --git a/src/app/routes/order-management/modal/vehicle/confir-receipt/confir-receipt.component.html b/src/app/routes/order-management/modal/vehicle/confir-receipt/confir-receipt.component.html index ce767c15..72dbeece 100644 --- a/src/app/routes/order-management/modal/vehicle/confir-receipt/confir-receipt.component.html +++ b/src/app/routes/order-management/modal/vehicle/confir-receipt/confir-receipt.component.html @@ -1,8 +1,8 @@ @@ -15,13 +15,13 @@ - + -
{{ i.driverName }} / {{ i.driverTelephone }} / {{ i.carNo }}
+
{{driverList?.nickName}} / {{driverList?.telephone}}/ {{carList?.carNo}}
 -
{{ i.payeeName }} / {{ i.payeePhone }}
+
{{payeeList?.nickName}} / {{payeeList?.telephone}}
 data.expenseCode === 'PRE')[0]?.price || 0, - // toPay: this.i?.mybidDetailInfo?.filter((data: any) => data.expenseCode === 'RECE')[0]?.price || 0, - // receiptPay: this.i?.mybidDetailInfo?.filter((data: any) => data.expenseCode === 'OIL')[0]?.price || 0, - // traiPrice: this.i?.mybidDetailInfo?.filter((data: any) => data.expenseName === '运输费')[0]?.price || 0 - // } - // ]; // if (this.i?.receiptCertificate?.length > 0) { // this.i?.receiptCertificate.forEach((element: any) => { // const image = { @@ -118,6 +115,34 @@ export class VehicleConfirReceiptComponent implements OnInit { this.service.request(this.service.$api_get_getWholeSignForDetail, {id: this.i?.id}).subscribe((res: any) => { console.log(res) this.dataInfo = res; + const cost: any = {} + res.mybidDetailInfo.forEach((element: any) => { + if(element.expenseName === "预付" || element.expenseCode === 'PRE') { + cost.PRE = element.price + } else if(element.expenseName === "到付" || element.expenseCode === 'RECE') { + cost.RECE = element.price + } else if(element.expenseName === "回单付" || element.expenseCode === 'BACK') { + cost.BACK = element.price + } else if(element.expenseName === "油卡" || element.expenseCode === 'OIL') { + cost.OIL = element.price + } else if(element.expenseName === "总费用") { + cost.traiPrice = element.price + } + }); + this.service.request(this.service.$api_getUserDetailByAppUserId, {id: this.dataInfo?.payeeId}).subscribe((res: any) => { + console.log(res) + this.payeeList = res; + }) + this.service.request(this.service.$api_getUserDetailByAppUserId, {id: this.dataInfo?.driverId}).subscribe((res: any) => { + console.log(res) + this.driverList = res; + }) + this.service.request(this.service.$api_getCarLicenseByIds, {id: this.dataInfo?.carId}).subscribe((res: any) => { + console.log(res) + this.carList = res; + }) + console.log(cost) + this.costDetail = [cost]; }) } @@ -125,19 +150,19 @@ export class VehicleConfirReceiptComponent implements OnInit { this.columns = [ { title: '预付', - index: 'prePay' + index: 'PRE' }, { title: '到付', - index: 'toPay' + index: 'RECE' + }, + { + title: '油卡', + index: 'OIL' }, - // { - // title: '油卡', - // index: 'name3' - // }, { title: '回单付', - index: 'receiptPay' + index: 'BACK' }, { title: '总运费', diff --git a/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.html b/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.html index 0270c2e9..e6625551 100644 --- a/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.html +++ b/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.html @@ -1,20 +1,11 @@ - - - +

总运费：￥{{ totalPrice }}总运费：￥{{ data.totalFreight }} - （运输费：￥{{ tranPrice }}，附加费：￥{{ otherPrice }}） + （运输费：￥{{ data.freight }}，附加费：￥{{ data.surcharge }}）

diff --git a/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.ts b/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.ts index b1e0ac37..bf167aaa 100644 --- a/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.ts +++ b/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.ts @@ -2,12 +2,12 @@ import { preloaderFinished } from '@delon/theme'; /* * @Author: your name * @Date: 2021-12-14 14:03:07 - * @LastEditTime: 2021-12-20 17:57:19 + * @LastEditTime: 2021-12-21 14:56: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\order-management\modal\bulk\update-freight\update-freight.component.ts */ -import { Component, OnInit, ViewChild } from '@angular/core'; +import { Component, Input, OnInit, ViewChild } from '@angular/core'; import { SFComponent, SFCustomWidgetSchema, @@ -29,53 +29,33 @@ import { OrderManagementService } from '../../../services/order-management.servi styleUrls: ['./update-freight.component.less'] }) export class VehicleUpdateFreightComponent implements OnInit { - record: any; - i: any; @ViewChild('sf', { static: false }) sf!: SFComponent; schema: SFSchema = {}; ui: SFUISchema = {}; - totalPrice = 0; - tranPrice = 0; - otherPrice = 0; - aggreechecked = false; + + @Input() + data: any; + constructor(private modal: NzModalRef, private msgSrv: NzMessageService, public service: OrderManagementService) {} ngOnInit(): void { - console.log(this.record) - this.i = { - prePay: this.record?.mybidDetailInfo?.filter((data: any) => data.expenseCode === 'PRE')[0]?.price || 0, - toPay: this.record?.mybidDetailInfo?.filter((data: any) => data.expenseCode === 'RECE')[0]?.price || 0, - oilCardPay: this.record?.mybidDetailInfo?.filter((data: any) => data.expenseCode === 'OIL')[0]?.price || 0, - receiptPay: this.record?.mybidDetailInfo?.filter((data: any) => data.expenseCode === 'BACK')[0]?.price || 0, - prePayStatus: this.record?.mybidDetailInfo?.filter((data: any) => data.expenseCode === 'PRE')[0]?.paymentStatus, - toPayStatus: this.record?.mybidDetailInfo?.filter((data: any) => data.expenseCode === 'RECE')[0]?.paymentStatus, - oilCardPayStatus: this.record?.mybidDetailInfo?.filter((data: any) => data.expenseCode === 'OIL')[0]?.paymentStatus, - receiptPayStatus: this.record?.mybidDetailInfo?.filter((data: any) => data.expenseCode === 'BACK')[0]?.paymentStatus - }; - this.record.list.forEach((element: any) => { - if(element.costCode === 'PRE') { - - } - }); - this.tranPrice = this.i.prePay + this.i.toPay + this.i.oilCardPay + this.i.receiptPay; - this.totalPrice = this.i.prePay + this.i.toPay + this.i.oilCardPay + this.i.receiptPay + this.otherPrice; - this.initSF(); - this.service.request(this.service.$api_get_getFreightChangeWholeDetail, { id: this.record.id}).subscribe((res) => { - console.log(res) - console.log(this.i) - console.log(this.tranPrice) - }) + this.initSF(this.data); } - initSF() { + initSF(data: any) { + const info = { + prePay: data.list?.filter((item: any) => item.costCode === 'PRE')[0], + toPay: data.list?.filter((item: any) => item.costCode === 'RECE')[0], + receiptPay: data.list?.filter((item: any) => item.costCode === 'BACK')[0] + }; this.schema = { properties: { prePay: { type: 'number', title: '预付', - default: 0.0, - readOnly: this.i.prePayStatus === '2', + default: info.prePay?.price || 0, + readOnly: info.prePay?.paymentStatus === '2' || info.prePay?.paymentStatus === '4', ui: { prefix: '￥', widgetWidth: 200, @@ -86,20 +66,8 @@ export class VehicleUpdateFreightComponent implements OnInit { toPay: { type: 'number', title: '到付', - default: 0.0, - readOnly: this.i.toPayStatus === '2', - ui: { - prefix: '￥', - widgetWidth: 200, - precision: 2, - change: (val: any) => this.changeNumVal() - } as SFNumberWidgetSchema - }, - oilCardPay: { - type: 'number', - title: '油卡', - default: 0.0, - readOnly: this.i.oilCardPayStatus === '1' || this.i.oilCardPayStatus === '3', + default: info.toPay?.price || 0, + readOnly: info.toPay?.paymentStatus === '2' || info.toPay?.paymentStatus === '4', ui: { prefix: '￥', widgetWidth: 200, @@ -107,11 +75,23 @@ export class VehicleUpdateFreightComponent implements OnInit { change: (val: any) => this.changeNumVal() } as SFNumberWidgetSchema }, + // oilCardPay: { + // type: 'number', + // title: '油卡', + // default: 0.0, + // readOnly: this.i.oilCardPayStatus === '1' || this.i.oilCardPayStatus === '3', + // ui: { + // prefix: '￥', + // widgetWidth: 200, + // precision: 2, + // change: (val: any) => this.changeNumVal() + // } as SFNumberWidgetSchema + // }, receiptPay: { type: 'number', title: '回单付', - default: 0.0, - readOnly: this.i.receiptPayStatus === '2', + default: info.receiptPay?.price || 0, + readOnly: info.receiptPay?.paymentStatus === '2' || info.receiptPay?.paymentStatus === '4', ui: { prefix: '￥', widgetWidth: 200, @@ -138,12 +118,11 @@ export class VehicleUpdateFreightComponent implements OnInit { } }; } + save(value: any): void { - console.log(this.record?.mybidDetailInfo) - console.log(this.sf.value) - const editItems = this.record?.mybidDetailInfo.filter((data: any) => data.receiptPayStatus !== '2'); + const editItems = this.data.list?.filter((info: any) => info.toPay?.paymentStatus !== '2' && info.toPay?.paymentStatus !== '4'); editItems.forEach((item: any) => { - switch (item.expenseName) { + switch (item.costName) { case '预付': item.price = this.sf.value.prePay; break; @@ -159,16 +138,15 @@ export class VehicleUpdateFreightComponent implements OnInit { }); const params = { - id: this.record?.id, + billId: this.data.id, dtos: editItems, changeCause: this.sf.value.changeCause }; - console.log(params) + this.service.request(this.service.$api_get_insertFreightChangeWhole, params).subscribe((res: any) => { if (res) { this.modal.destroy(); - } else { - this.service.msgSrv.error(res.msg); + this.service.msgSrv.success('变更运费成功'); } }); } @@ -181,7 +159,7 @@ export class VehicleUpdateFreightComponent implements OnInit { * */ changeNumVal() { - this.tranPrice = this.sf.value.prePay + this.sf.value.toPay + this.sf.value.oilCardPay + this.sf.value.receiptPay; - this.totalPrice = this.sf.value.prePay + this.sf.value.toPay + this.sf.value.oilCardPay + this.sf.value.receiptPay + this.otherPrice; + // this.tranPrice = this.sf.value.prePay + this.sf.value.toPay + this.sf.value.oilCardPay + this.sf.value.receiptPay; + // this.totalPrice = this.sf.value.prePay + this.sf.value.toPay + this.sf.value.oilCardPay + this.sf.value.receiptPay + this.otherPrice; } } diff --git a/src/app/routes/order-management/services/order-management.service.ts b/src/app/routes/order-management/services/order-management.service.ts index 5b466c31..a3279c53 100644 --- a/src/app/routes/order-management/services/order-management.service.ts +++ b/src/app/routes/order-management/services/order-management.service.ts @@ -1,7 +1,7 @@ /* * @Author: your name * @Date: 2021-12-03 15:31:52 - * @LastEditTime: 2021-12-21 11:13:19 + * @LastEditTime: 2021-12-21 13:17:37 * @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\services\order-management.service.ts @@ -64,13 +64,17 @@ export class OrderManagementService extends BaseService { // 上传图片 public $api_upload_url = `/api/mdc/pbc/upload/multipartFile/file`; // 根据用户id查用户信息（注意：nickName才是用户名称） - public $api_getUserDetailByAppUserId = `/cuc/user/getUserDetailByAppUserId`; + public $api_getUserDetailByAppUserId = `/api/mdc/cuc/userBasicInfo/get`; // 根据车辆id查车辆信息 - public $api_getCarLicenseByIds = `/cuc/carLicense/getCarLicenseByIds`; + public $api_getCarLicenseByIds = `/api/mdc/cuc/carLicense/getCarLicenseByIds`; // 统计【整车】订单状态数量 public $api_statisticalStatus = `/api/sdc/billOperate/getWholeStatistical`; // 统计【大宗】订单状态数量 public $api_getBulkStatistical = `/api/sdc/billOperate/getBulkStatistical`; + // 变更运费页面-大宗 + public $api_getFreightChangeBulkDetail = `/api/sdc/billFreightChangeApplication/getFreightChangeBulkDetail`; + // 变更运费页面-大宗 + public $api_insertFreightChangeBulk = `/api/sdc/billFreightChangeApplication/insertFreightChangeBulk`; constructor(public injector: Injector) { super(injector) }