diff --git a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html index fb7fc2e7..0dd45250 100644 --- a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html +++ b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-24 16:58:02 * @LastEditors : Shiming - * @LastEditTime : 2022-01-18 17:18:29 + * @LastEditTime : 2022-01-20 20:22:48 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail-change\\bulk-detail-change.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -30,12 +30,12 @@
- {{ i?.goodsResource?.[0]?.enterpriseInfoName }} - {{ i?.goodsResource?.[0]?.shipperAppUserName }} - {{i?.goodsResource?.[0]?.enterpriseProjectName}} - {{i?.goodsResource?.[0]?.serviceTypeLabel}} - {{i?.createUserNameLabel}} - {{i?.goodsResource?.[0]?.dispatchName}} + {{ i?.goodsResource?.enterpriseInfoName }} + {{ i?.goodsResource?.shipperAppUserName }} + {{i?.goodsResource?.enterpriseProjectName}} + {{i?.goodsResource?.serviceTypeLabel}} + {{i?.goodsResource?.createUserName}} /{{i?.goodsResource?.createUserPhone}} + {{i?.goodsResource?.dispatchName}}/{{i?.goodsResource?.dispatchPhone}}
@@ -52,18 +52,18 @@
- +
- - - - - - - +   +   +   +  
@@ -204,15 +204,13 @@ - {{i?.goodsInfoList?.[0]?.maxWeightLabel}}/{{i?.goodsInfoList?.[0]?.maxCubeLabel}} + {{ i?.carModel }}/{{ i?.carLength }} - - {{i?.driverId}} - - - - {{i?.goodsInfoList?.[0]?.weight}}顿,{{i?.goodsInfoList?.[0]?.volume}}方,{{i?.goodsInfoList?.[0]?.number}}件 + {{i?.driverName}}/{{i?.driverPhone}}/{{i?.carNo}} + + + {{ i?.driverCarModelLabel }},{{ i?.driverCarLengthLabel }}米,{{ i?.driverCarWeight }}吨 @@ -228,28 +226,21 @@ - - -

{{i?.freightPrice}}{{i?.freightTypeLabel}}（以发货为准，保留小数）

+

{{i?.goodsInfoList?.[0]?.freightPrice}}{{i?.goodsInfoList?.[0]?.freightTypeLabel}}（以发货为准，保留小数）

-
总计：{{i?.total | currency: '￥'}}（运费￥3500.00，附加运费￥191.98，附加费率3.5%）
-
收款人：
+
+
+ 总计：{{ totalObj?.price | currency }} （运费￥{{ + totalObj?.price - attObj?.price | currency}}，附加费￥{{ attObj?.price | currency }}，附加费率{{i?.attPercent }}%） +
+
+
收款人：{{ i?.payeeName }}/{{ i?.payeePhone }}
 + @@ -265,20 +256,19 @@ - {{i?.goodsResource?.stateReceipt ?'是':'否'}} + {{ i?.supplementaryInformationVO?.stateReceipt ? '是' : '否' }} - {{i?.goodsResource?.receiptTypeLabel}} - - - {{i?.goodsResource?.receiptUserId}} / {{i?.supplementaryInformationVO?.phon}} + {{ i?.supplementaryInformationVO?.receiptType === '1' ? '电子回单' : '纸质回单' }} + {{ i?.supplementaryInformationVO?.receiptUserName }} / {{ i?.supplementaryInformationVO?.phon }} - {{i?.goodsResource?.receiptAddress}} + {{ i?.supplementaryInformationVO?.area }} - {{i?.goodsResource?.receiptAddress}} + {{ i?.supplementaryInformationVO?.address }} + diff --git a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts index 09869b53..0fb5d16d 100644 --- a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts +++ b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-24 16:58:02 * @LastEditors : Shiming - * @LastEditTime : 2022-01-18 17:18:37 + * @LastEditTime : 2022-01-20 20:21:35 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail-change\\bulk-detail-change.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -23,6 +23,7 @@ import { Observable, Observer } from 'rxjs'; import { apiConf } from '@conf/api.conf'; import { OrderManagementService } from '../../services/order-management.service'; import { NzCardComponent } from 'ng-zorro-antd/card'; +import { map } from 'rxjs/operators'; function getBase64(file: File): Promise { return new Promise((resolve, reject) => { const reader = new FileReader(); @@ -41,7 +42,6 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit { id = this.route.snapshot.params.id; @ViewChild('distannce3', { static: false }) i: any= {unLoadingPlaceList:[]}; - logColumns: STColumn[] =[] totalDistance = 0.0; //总里程 totalTime = 0.0; //路程总时间 startInfo: any = []; // 装货信息 @@ -55,6 +55,8 @@ loadTime: any; // 货源单设置回显 listImagUrls: any[] = []; // 货源单设置回显 dirvingMessage = []; imges: any; + totalObj: any; + attObj: any; previewImage1 = ''; previewVisible1 = false; @ViewChild('sf3', { static: false }) sf3!: SFComponent; @@ -69,6 +71,25 @@ loadTime: any; // 货源单设置回显 @ViewChild('sf', { static: false }) sf!: SFComponent; schema: SFSchema = {}; ui: SFUISchema = {}; + logColumns: STColumn[] = [ + { title: '款项', index: 'expenseName' }, + { title: '运输费（元）', index: 'price' }, + { title: '附加费（元）', index: 'surcharge' }, + { 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' }, + }, + }, + ]; constructor( private route: ActivatedRoute, private router: Router, @@ -87,7 +108,6 @@ loadTime: any; // 货源单设置回显 } ngOnInit(): void { - this.initST(); this.initSF(); this.initSF3(); this.initSF4(); @@ -288,9 +308,11 @@ loadTime: any; // 货源单设置回显 }; } initData() { - this.service.request(this.service.$api_set_getBulkOrderDetail, {id: this.id}).subscribe(res => { + this.service.request(this.service.$api_getBulkBillDetail, {id: this.id}).subscribe(res => { if (res) { this.i = res; + this.attObj = this.i?.billExpenseDetails?.filter((data: any) => data.expenseCode === 'ATT')[0]; + this.totalObj = this.i?.billExpenseDetails?.filter((data: any) => data.expenseCode === 'TOTAL')[0]; // 对装货凭证进行初始化 let arr : any= [] res?.receiptFilePath.forEach((element: any, index: any) => { @@ -307,6 +329,16 @@ loadTime: any; // 货源单设置回显 ...res, ...res?.goodsInfoList?.[0] } + this.sf3data = { + goodsTypeId: res?.goodsInfoList[0]?.goodsTypeId || '', + goodsTypeName: res?.goodsInfoList[0]?.goodsTypeName || '', + goodsNameId: res?.goodsInfoList[0]?.goodsNameId || '', + goodsName: res?.goodsInfoList[0]?.goodsName || '' + }; + if (this.sf3data.goodsTypeName === '其它') { + this.sf3data.goodsName1 = res?.goodsInfoList[0]?.goodsName || ''; + } + this.changeGoodsType(this.sf3data.goodsTypeId, { label: this.sf3data.goodsTypeName, value: this.sf3data.goodsTypeId }); // 对装卸货信息进行初始化 res?.unLoadingPlaceList.forEach((element: any) => { if(element.type === 1 || element.type === '1') { @@ -519,38 +551,71 @@ loadTime: any; // 货源单设置回显 initSF3() { this.schema3 = { properties: { - // enterpriseInfoId: { - // title: '网络货运人', - // type: 'string', - // ui: { - // placeholder: '请选择', - // widget: 'select', - // asyncData: () => this.shipperservice.getNetworkFreightForwarder(), - // visibleIf: { - // _$expand: (value: boolean) => value, - // }, - // } - // }, - goodsName: { + goodsTypeId: { type: 'string', title: '货物名称', ui: { - widget: 'dict-select', - params: { dictKey: 'GoodsName' }, - placeholder: '请选择' - } + widget: 'select', + placeholder: '请选择', + errors: { required: '请选择货物类型' }, + asyncData: () => + this.shipperservice.loadConfigByKey('goods.name.config.type').pipe( + map((data: any) => { + return data[0].children?.map((m: any) => { + return { label: m.name, value: m.id }; + }); + }) + ), + change: (value: any, data: any) => { + this.changeGoodsType(value, data); + this.sf3.setValue('/goodsTypeName', data.label); + } + } as SFSelectWidgetSchema }, - qita: { + goodsTypeName: { type: 'string', title: '', ui: { + hidden: true + } + }, + goodsNameId: { + type: 'string', + title: '', + ui: { + widget: 'select', + placeholder: '请选择', + errors: { required: '请填写货物名称' }, + change: (_value: any, data: any) => { + this.sf3.setValue('/goodsName', data.label); + }, visibleIf: { - goodsName: value => value === '3' + goodsTypeName: (value: any) => value && value !== '其它' + } + } + }, + goodsName: { + type: 'string', + title: '', + ui: { + hidden: true, + visibleIf: { + goodsTypeName: (value: any) => value && value !== '其它' + } + } + }, + goodsName1: { + type: 'string', + title: '', + ui: { + errors: { required: '请填写货物名称' }, + visibleIf: { + goodsTypeName: (value: any) => value && value === '其它' } } } }, - required: ['goodsName',] + required: ['goodsTypeId', 'goodsName', 'goodsNameId'] }; this.ui3 = { '*': { @@ -565,28 +630,31 @@ initSF3() { } }; } -initST() { - this.logColumns = [ - { title: '款项', index: 'costName' }, - { title: '总费用（元）', index: 'price' }, - { title: '协议金额（元）', render: 'price' }, - { title: '附加费（元）', index: 'surcharge' }, - { title: '附加费率（%）', render: 'paymentMethodRate' }, - { 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' }, - }, - }, - ]; +changeGoodsType(value: string, data: any) { + if (data.label === '其它') return; + const params = { + pageIndex: 1, + pageSize: 100, + configId: value + }; + this.service + .request(this.service.$api_get_config_item_page, params) + .pipe( + map(data => { + return data.records?.map((m: any) => { + return { label: m.name, value: m.id }; + }); + }) + ) + .subscribe(res => { + if (res) { + this.sf3.getProperty('/goodsNameId')!.schema.enum = res; + this.sf3.getProperty('/goodsNameId')!.widget?.reset(res); + if (this.sf3data.goodsNameId) { + this.sf3.setValue('/goodsNameId', this.sf3data.goodsNameId); + } + } + }); } initSF4() { this.schema4 = { diff --git a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html index 81ce05e2..3b69e65e 100644 --- a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html +++ b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-23 13:39:58 * @LastEditors : Shiming - * @LastEditTime : 2022-01-20 19:28:44 + * @LastEditTime : 2022-01-20 20:23:52 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail-change\\vehicle-detail-change.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -47,26 +47,14 @@ - +
- - - - - - - +   +   +   +  
@@ -217,10 +205,6 @@ {{ i?.carModel }}/{{ i?.carLength }} - {{i?.driverName}}/{{i?.driverPhone}}/{{i?.carNo}} @@ -242,8 +226,12 @@ -
总计：{{ i?.total | currency: '￥' }}（运费￥3500.00，附加运费￥191.98，附加费率3.5%）
-
收款人：
+
+ 总计：{{ totalObj?.price | currency }} + （运费{{totalObj?.price - attObj?.price | currency}}， + 附加费{{ attObj?.price | currency }}，附加费率{{i?.attPercent }}%） +
+
收款人：{{ i?.payeeName }}{{ i?.payeePhone }}
 @@ -261,18 +249,19 @@ - {{ i?.goodsResource?.stateReceipt ? '是' : '否' }} + {{ i?.supplementaryInformationVO?.stateReceipt ? '是' : '否' }} - {{ i?.goodsResource?.receiptTypeLabel }} + {{ i?.supplementaryInformationVO?.receiptType === '1' ? '电子回单' : '纸质回单' }} - {{ i?.goodsResource?.receiptUserId }} / {{ i?.supplementaryInformationVO?.phon }} + {{ i?.supplementaryInformationVO?.receiptUserName }} / {{ i?.supplementaryInformationVO?.phon }} - {{ i?.goodsResource?.receiptAddress }} + {{ i?.supplementaryInformationVO?.area }} - {{ i?.goodsResource?.receiptAddress }} + {{ i?.supplementaryInformationVO?.address }} + diff --git a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts index dc5b435e..37e34e8c 100644 --- a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts +++ b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-23 13:39:58 * @LastEditors : Shiming - * @LastEditTime : 2022-01-20 19:29:05 + * @LastEditTime : 2022-01-20 20:11:43 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail-change\\vehicle-detail-change.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -40,7 +40,6 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit { id = this.route.snapshot.params.id; @ViewChild('distannce3', { static: false }) i: any = { unLoadingPlaceList: [] }; - logColumns: STColumn[] = []; totalDistance = 0.0; //总里程 totalTime = 0.0; //路程总时间 startInfo: any = []; // 装货信息 @@ -53,6 +52,9 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit { dirverBankCard: any; // 货源单设置回显 listImagUrls: any[] = []; // 货源单设置回显 dirvingMessage = []; + attObj: any; + totalObj: any; + approvalLsit: any; imges: any; previewImage1 = ''; previewVisible1 = false; @@ -68,6 +70,26 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit { @ViewChild('sf', { static: false }) sf!: SFComponent; schema: SFSchema = {}; ui: SFUISchema = {}; + logColumns: STColumn[] = [ + { title: '款项', index: 'expenseCodeLabel' }, + { title: '小计（元）', index: 'price' }, + { title: '运输费（元）', index: 'price' }, + { title: '附加费（元）', index: 'surcharge' }, + { 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' } + } + } + ]; constructor( private route: ActivatedRoute, private router: Router, @@ -87,7 +109,6 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit { ngOnInit(): void { console.log(this.id); - this.initST(); this.initSF(); this.initSF3(); this.initSF4(); @@ -292,6 +313,15 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit { console.log(res); 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') { + delete this.approvalLsit[key]; + } + }); // 对装货凭证进行初始化 let arr: any = []; res?.receiptFilePath.forEach((element: any, index: any) => { @@ -664,29 +694,6 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit { } }); } - initST() { - this.logColumns = [ - { title: '款项', index: 'costName' }, - { title: '总费用（元）', index: 'price' }, - { title: '协议金额（元）', render: 'price' }, - { title: '附加费（元）', index: 'surcharge' }, - { title: '附加费率（%）', render: 'paymentMethodRate' }, - { 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' } - } - } - ]; - } initSF4() { this.schema4 = { properties: { 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 4134075b..b9bc3418 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 @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-28 14:42:03 * @LastEditors : Shiming - * @LastEditTime : 2022-01-20 19:07:33 + * @LastEditTime : 2022-01-20 20:09:13 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -127,21 +127,14 @@ - - - - {{ item.price | currency}} - - - {{ item.surcharge | currency}} - - + +
- 总计：{{ totalObj?.price | currency }} （运费{{ - totalObj?.price - attObj?.price | currency - }}，附加运费{{ attObj?.price | currency}}，附加费率{{ (attObj?.price / totalObj?.price) * 100 | number: '0.2-2' }}%） + 总计：{{ totalObj?.price | currency }} + （运费{{totalObj?.price - attObj?.price | currency}}， + 附加费{{ attObj?.price | currency }}，附加费率{{i?.attPercent }}%）
-
收款人：{{ i?.payeeName }}/{{ i?.payeePhone }}
+
收款人：{{ i?.payeeName }}{{ i?.payeePhone }}
 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 77dcda60..44155165 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 @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-28 14:42:03 * @LastEditors : Shiming - * @LastEditTime : 2022-01-18 17:20:08 + * @LastEditTime : 2022-01-20 20:09:47 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -34,12 +34,11 @@ export class OrderManagementVehicleDetailComponent implements OnInit { approvalLsit: any; isVisible = false; logColumns: STColumn[] = [ - { title: '款项', index: 'costName' }, - { title: '总费用（元）', index: 'price',render: 'price' }, - { title: '协议金额（元）', index: 'price',render: 'price' }, - { title: '附加费（元）', index: 'surcharge', render: 'surcharge'}, - { title: '附加费率（%）', index: 'paymentMethodRate' }, - { title: '支付时间', index: ' paymentTime' }, + { title: '款项', index: 'expenseCodeLabel' }, + { title: '小计（元）', index: 'price' }, + { title: '运输费（元）', index: 'price' }, + { title: '附加费（元）', index: 'surcharge' }, + { title: '支付时间', index: 'paymentTime' }, { title: '支付状态', className: 'text-center',