From d840353041b9adcf936bc44f0d284aaf2ce39898 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 3 Mar 2022 11:25:03 +0800 Subject: [PATCH 01/42] edit --- .../components/payment-record/payment-record.component.html | 2 +- .../components/payment-record/payment-record.component.ts | 1 + src/app/routes/usercenter/usercenter-routing.module.ts | 4 +--- src/app/routes/usercenter/usercenter.module.ts | 6 ++---- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/app/routes/financial-management/components/payment-record/payment-record.component.html b/src/app/routes/financial-management/components/payment-record/payment-record.component.html index 38aa1e2f..5d57d415 100644 --- a/src/app/routes/financial-management/components/payment-record/payment-record.component.html +++ b/src/app/routes/financial-management/components/payment-record/payment-record.component.html @@ -36,7 +36,7 @@ {{ item.orderPaymentCode }}
{{ item.paymentStatusLabel }} - 预付:{{ item.price | currency }}
+ {{item.costName}}:{{ item.price | currency }}
附加费: {{ item.surcharge| currency }} diff --git a/src/app/routes/financial-management/components/payment-record/payment-record.component.ts b/src/app/routes/financial-management/components/payment-record/payment-record.component.ts index a6383c75..39524123 100644 --- a/src/app/routes/financial-management/components/payment-record/payment-record.component.ts +++ b/src/app/routes/financial-management/components/payment-record/payment-record.component.ts @@ -258,6 +258,7 @@ export class PaymentRecordComponent implements OnInit { }); item.surcharge = surcharge.toFixed(2); item.price = item.amountDetails?.[0]?.price || 0; + item.costName = item.amountDetails?.[0]?.costName; return ''; } }, diff --git a/src/app/routes/usercenter/usercenter-routing.module.ts b/src/app/routes/usercenter/usercenter-routing.module.ts index 3f11ed47..9754d2e4 100644 --- a/src/app/routes/usercenter/usercenter-routing.module.ts +++ b/src/app/routes/usercenter/usercenter-routing.module.ts @@ -14,19 +14,17 @@ import { UserCenterComponentsDriverDetailComponent } from './components/driver/d import { UserCenterComponentsDriverConfigComponent } from './components/driver/driver-config/driver-config.component'; import { UserCenterComponentsDriverComponent } from './components/driver/driver.component'; import { FreightComponentsEnterpriseAuditComponent } from './components/freight/enterprise-audit/enterprise-audit.component'; -import { FreightComponentsEnterpriseAuditViewComponent } from './components/freight/enterprise-audit/view/view.component'; import { FreightConfigComponent } from './components/freight/freight-config/freight-config.component'; import { FreightComponentsListDetailComponent } from './components/freight/list/detail/detail.component'; import { FreightComponentsListComponent } from './components/freight/list/list.component'; import { FreightComponentsListNewComponent } from './components/freight/list/new/new.component'; -import { FreightComponentsListViewComponent } from './components/freight/list/view/view.component'; import { FreightComponentsUserDetailComponent } from './components/freight/user/detail/detail.component'; import { FreightComponentsUserComponent } from './components/freight/user/user.component'; const routes: Routes = [ { path: 'freight/list', component: FreightComponentsListComponent, data: { guard: { ability: ['USERCENTER-FREIGHT-LIST-list'] } } }, - { path: 'freight/list/view/:id', component: FreightComponentsListViewComponent }, + // { path: 'freight/list/view/:id', component: FreightComponentsListViewComponent }, { path: 'freight/list/new', component: FreightComponentsListNewComponent, data: { guard: { ability: ['USERCENTER-FREIGHT-NEW-save'] } } }, { path: 'freight/list/detail/:id', diff --git a/src/app/routes/usercenter/usercenter.module.ts b/src/app/routes/usercenter/usercenter.module.ts index 3a0ea35c..1cc35d5b 100644 --- a/src/app/routes/usercenter/usercenter.module.ts +++ b/src/app/routes/usercenter/usercenter.module.ts @@ -12,11 +12,9 @@ import { UserCenterComponentsDriverCaptainComponent } from './components/driver/ import { UserCenterComponentsDriverDetailComponent } from './components/driver/detail/detail.component'; import { UserCenterComponentsDriverComponent } from './components/driver/driver.component'; import { FreightComponentsEnterpriseAuditComponent } from './components/freight/enterprise-audit/enterprise-audit.component'; -import { FreightComponentsEnterpriseAuditViewComponent } from './components/freight/enterprise-audit/view/view.component'; import { FreightComponentsListDetailComponent } from './components/freight/list/detail/detail.component'; import { FreightComponentsListComponent } from './components/freight/list/list.component'; import { FreightComponentsListNewComponent } from './components/freight/list/new/new.component'; -import { FreightComponentsListViewComponent } from './components/freight/list/view/view.component'; import { FreightComponentsUserDetailComponent } from './components/freight/user/detail/detail.component'; import { FreightComponentsUserComponent } from './components/freight/user/user.component'; import { UsercenterRoutingModule } from './usercenter-routing.module'; @@ -29,11 +27,11 @@ import { UserCenterComponentsDriverConfigComponent } from './components/driver/d const COMPONENTS = [ FreightComponentsListComponent, - FreightComponentsListViewComponent, + // FreightComponentsListViewComponent, FreightComponentsListNewComponent, FreightComponentsListDetailComponent, FreightComponentsEnterpriseAuditComponent, - FreightComponentsEnterpriseAuditViewComponent, + // FreightComponentsEnterpriseAuditViewComponent, FreightComponentsUserComponent, FreightComponentsUserDetailComponent, UserCenterComponentsDriverComponent, From 21cef66d34a13e19ead0b2f8b089e89480b1c9a2 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 3 Mar 2022 13:52:32 +0800 Subject: [PATCH 02/42] edit --- .../components/role-management/edit/edit.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/routes/sys-setting/components/role-management/edit/edit.component.ts b/src/app/routes/sys-setting/components/role-management/edit/edit.component.ts index 683be185..14fd9ca1 100644 --- a/src/app/routes/sys-setting/components/role-management/edit/edit.component.ts +++ b/src/app/routes/sys-setting/components/role-management/edit/edit.component.ts @@ -80,7 +80,7 @@ export class SettingRoleEditComponent implements OnInit { } sure() { if (!this.sf?.valid) { - this.service.msgSrv.warning('校验错误'); + this.service.msgSrv.warning('角色名称不能为空'); return; } const auths = this.menu?.washTree(); From d1fa642b83444b6f97b9e5a28480dbb97bdabec1 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 3 Mar 2022 14:13:13 +0800 Subject: [PATCH 03/42] fix bug --- .../onecar-publish.component.ts | 8 ++-- .../release-publish.component.ts | 7 ++- .../tran-agreement.component.ts | 47 ++++++++++++------- 3 files changed, 41 insertions(+), 21 deletions(-) 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 9af7b78f..1d6b1d28 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 @@ -58,10 +58,10 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { totalTime = 0.0; //路程总时间 currentRate = 0; //实时计算的费率 id = this.route.snapshot.params.id; - // // 单位 startInfo: any = []; // 发货地数据 endInfo: any = []; // 卸货地数据 PageStatus = ''; + shipperName = ''; changeSub = new Subject(); envCache: any; enterpriseProjectIds: any; @@ -163,10 +163,11 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { return of([]); } }, - change: (q: any) => { + change: (q: any, qs: any) => { let str = q.replace(/^\s+|\s+$/g, ''); if (str) { this.getRegionCode(str); + this.shipperName = qs?.label; this.payChange(); } } @@ -1003,7 +1004,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { nzContent: TranAgreementComponent, nzWidth: 900, nzFooter: null, - nzComponentParams: { Object: params } + nzComponentParams: { object: params, shipperName: this.shipperName } }); modalRef.afterClose.subscribe(result => { if (result) { @@ -1102,6 +1103,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { // 初始化赋值信息函数 dataR(res: any) { if (res?.shipperAppUserName) { + this.shipperName = res?.shipperAppUserName; const List: any = []; this.service.request(this.service.$api_enterpriceList, { enterpriseName: res?.shipperAppUserName }).subscribe(rs => { rs?.forEach((element: any) => { 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 41616ab9..ba50f7e1 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 @@ -51,6 +51,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit { totalDistance = 0.0; //总里程 totalTime = 0.0; //路程总时间 currentRate = 0; //实时计算的费率 + shipperAppName = ''; constructor( private http: _HttpClient, fb: FormBuilder, @@ -156,10 +157,12 @@ export class SupplyManagementReleasePublishComponent implements OnInit { return of([]); } }, - change: (q: any) => { + change: (q: any, qq: any) => { let str = q.replace(/^\s+|\s+$/g, ''); if (str) { + console.log(qq) this.getRegionCode(str); + this.shipperAppName = qq; this.payChange(); } } @@ -977,7 +980,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit { nzContent: TranAgreementComponent, nzWidth: 900, nzFooter: null, - nzComponentParams: { Object: params } + nzComponentParams: { object: params } }); modalRef.afterClose.subscribe(result => { if (result) { diff --git a/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.ts b/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.ts index 05977ab4..c2e2fb8f 100644 --- a/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.ts +++ b/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-02-24 20:19:51 * @LastEditors : Shiming - * @LastEditTime : 2022-02-28 20:55:59 + * @LastEditTime : 2022-03-03 14:08:28 * @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\tran-agreement\\tran-agreement.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -28,33 +28,48 @@ import { SupplyManagementService } from '../../services/supply-management.servic styleUrls: ['./tran-agreement.component.less'] }) export class TranAgreementComponent { - Object: any; + object: any; agreement:any; + envCache:any; + shipperName:any; constructor(private modal: NzModalRef,public service: SupplyManagementService,) { } ngOnInit() { - console.log(Object) + console.log(this.object) const params = { contractType:'1', - parametersDTO: { - // 回单付 - back: 'dsfgffdsg', - // 发货地址 - consignorAddress: 'gfdgdfdg', - // 发货时间 - consignorDate: 'dsggdsgsfgds', - // 发货时间 - // consignorDate: '', - - }, resourceType: '1', signingObject: '1', templateType: 'MX', - } + parametersDTO: { + contractCode:'', + shipperName:this?.shipperName, //托运人 + carrierName:this.object?.enterpriseInfoName, //承运人 + consignorInfo: `${this.object?.unLoadingPlaceDTOList[0].appUserName} ${this.object?.unLoadingPlaceDTOList[0].contractTelephone}`, // 发货信息 + consignorAddress: this.object?.unLoadingPlaceDTOList[0].detailedAddress, // 发货地址 + consignorDate: this.object?.loadingTime, // 发货时间 + consigneeInfo: `${this.object?.unLoadingPlaceDTOList[this.object?.unLoadingPlaceDTOList.length-1].appUserName} ${this.object?.unLoadingPlaceDTOList[this.object?.unLoadingPlaceDTOList.length-1].contractTelephone}`, // 收货信息 + consigneeDate: this.object?.unloadingTime, // 收货时间 + consigneeAddress: this.object?.unLoadingPlaceDTOList[this.object?.unLoadingPlaceDTOList.length-1].detailedAddress, // 收货地址 + goodsName:this.object?.goodsInfoDTOList[0].goodsName, // 货物名称 + shippingType:'整车运输', + consignmentVolume:`${this.object?.goodsInfoDTOList[0].weight}吨/${this.object?.goodsInfoDTOList[0].volume}方/${this.object?.goodsInfoDTOList[0].number}件`, //托运量 + transporterInfo:'', //运输方信息 + freightAmount:this.object?.total, // 订单运费金额（元) + pre:this.object?.expenseDTOList.filter((item:any) => item.expenseCode === 'PRE')[0].price, //预付 + rece:this.object?.expenseDTOList.filter((item:any) => item.expenseCode === 'RECE')[0].price,// 到付 + back:this.object?.expenseDTOList.filter((item:any) => item.expenseCode === 'BACK')[0].price,// 回单付 + lunarKnot:0, + total:this.object?.subtotal, // 合计（元) + paymentTime:`到货后${this.object?.paymentDays}天`, // 承诺支付运费时间 + year:new Date().getFullYear(), // 签约年份 + month:new Date().getMonth()+1, // 签约月份 + day:new Date().getDate(), // 签约日期 + } + } console.log(params) - this.service.request(this.service.$api_getContractContent,params).subscribe((res) => { if (res) { From 23b0512e9cbe7d1c277237ba988b86dcde8ce39e Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 3 Mar 2022 14:27:42 +0800 Subject: [PATCH 04/42] fix bug --- .../bulk-publish/bulk-publish.component.ts | 202 ++++++++++-------- .../release-publish.component.ts | 11 +- .../tran-agreement.component.ts | 8 +- 3 files changed, 123 insertions(+), 98 deletions(-) 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 727e0e7c..0bf4285d 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 @@ -46,13 +46,14 @@ export class SupplyManagementBulkPublishComponent implements OnInit { startInfo: any = []; endInfo: any = []; PageStatus = ''; + shipperName = ''; limitValues = { maxMonth: 99, maxWeight: 99999, maxVolume: 99999, maxTrainNumber: 99999, maxFreight: 9999999 - } + }; constructor( private http: _HttpClient, fb: FormBuilder, @@ -118,7 +119,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit { searchDebounceTime: 300, searchLoadingText: '搜索中...', onSearch: (q: any) => { - let str =q.replace(/^\s+|\s+$/g,""); + let str = q.replace(/^\s+|\s+$/g, ''); if (str) { return this.service .request(this.service.$api_enterpriceList, { enterpriseName: str }) @@ -128,12 +129,13 @@ export class SupplyManagementBulkPublishComponent implements OnInit { return of([]); } }, - change: (q: any) => { - let str =q.replace(/^\s+|\s+$/g,""); + change: (q: any, qs: any) => { + let str = q.replace(/^\s+|\s+$/g, ''); if (str) { - this.getRegionCode(str); + this.getRegionCode(str); + this.shipperName = qs?.label; } - }, + } } as SFSelectWidgetSchema }, enterpriseProjectId: { @@ -158,7 +160,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit { ui: { placeholder: '请输入', format: 'yyyy-MM-dd HH:mm:ss', - validator: (val) => { + validator: val => { let d = new Date(); let year = d.getFullYear(); let month = d.getMonth(); @@ -171,7 +173,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit { return [{ keyword: 'validTime2', message: `有效期最长为${this.limitValues.maxMonth}个月` }]; } return []; - }, + } } }, dispatchPhone: { @@ -369,13 +371,13 @@ export class SupplyManagementBulkPublishComponent implements OnInit { ui: { widget: 'select', mode: 'multiple', - maxMultipleCount:3, + maxMultipleCount: 3, placeholder: '请选择车型', errors: { required: '请选择车型' }, asyncData: () => this.service.getDictOptions({ dictKey: 'car:model' }), - change:(tag:any , org:any)=>{ - if(tag.includes("999")){ - this.sf4.setValue('/carModel',["999"]); + change: (tag: any, org: any) => { + if (tag.includes('999')) { + this.sf4.setValue('/carModel', ['999']); } } } @@ -386,17 +388,17 @@ export class SupplyManagementBulkPublishComponent implements OnInit { ui: { widget: 'select', mode: 'multiple', - maxMultipleCount:3, + maxMultipleCount: 3, placeholder: '请选择车长', errors: { required: '请选择车长' }, asyncData: () => this.service.getDictOptions({ dictKey: 'car:length' }), - change:(tag:any , org:any)=>{ - if(tag.includes("999")){ - this.sf4.setValue('/carModel',["999"]); + change: (tag: any, org: any) => { + if (tag.includes('999')) { + this.sf4.setValue('/carModel', ['999']); } } } - }, + } }, required: ['weight', 'carModel', 'carLength', 'freightPrice', 'rule', 'settlementBasis'] }; @@ -483,7 +485,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit { visibleIf: { receiptType: value => value === '2' } - }, + } }, receiptUserPhone: { type: 'string', @@ -493,7 +495,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit { visibleIf: { receiptType: value => value === '2' } - }, + } }, receiptAddressArea: { type: 'string', @@ -503,7 +505,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit { visibleIf: { receiptType: value => value === '2' } - }, + } }, receiptAddress: { type: 'string', @@ -513,7 +515,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit { visibleIf: { receiptType: value => value === '2' } - }, + } }, paymentDays: { type: 'string', @@ -535,7 +537,15 @@ export class SupplyManagementBulkPublishComponent implements OnInit { } as SFTextareaWidgetSchema } }, - required: ['stateReceipt', 'receiptType', 'receiptUserName','receiptUserPhone','receiptAddressArea','receiptAddress','paymentDays'] + required: [ + 'stateReceipt', + 'receiptType', + 'receiptUserName', + 'receiptUserPhone', + 'receiptAddressArea', + 'receiptAddress', + 'paymentDays' + ] }; this.ui7 = { '*': { @@ -664,13 +674,19 @@ export class SupplyManagementBulkPublishComponent implements OnInit { this.sf1.validator({ emitError: true }); this.sf3.validator({ emitError: true }); this.sf4.validator({ emitError: true }); - if (this.validateForm1.invalid || !this.sf1.valid || !this.sf3.valid || !this.sf4.valid ) { + if (this.validateForm1.invalid || !this.sf1.valid || !this.sf3.valid || !this.sf4.valid) { this.service.msgSrv.warning('请完善必填项！'); return; } // 校验各个输入限定值 - if (this.sf4.value.weight > this.limitValues.maxWeight || this.sf4.value.volume > this.limitValues.maxVolume || this.sf4.value.number > this.limitValues.maxTrainNumber) { - this.service.msgSrv.error(`当前货物核载信息已超出限定值【${this.limitValues.maxWeight}吨、${this.limitValues.maxVolume}方、${this.limitValues.maxTrainNumber}车】`); + if ( + this.sf4.value.weight > this.limitValues.maxWeight || + this.sf4.value.volume > this.limitValues.maxVolume || + this.sf4.value.number > this.limitValues.maxTrainNumber + ) { + this.service.msgSrv.error( + `当前货物核载信息已超出限定值【${this.limitValues.maxWeight}吨、${this.limitValues.maxVolume}方、${this.limitValues.maxTrainNumber}车】` + ); return; } @@ -679,58 +695,67 @@ export class SupplyManagementBulkPublishComponent implements OnInit { return; } + // //装卸货信息 + const LoadingList = this.startInfo.concat(this.endInfo); + // 货物信息 + const sf3Values = { ...this.sf3.value }; + if (sf3Values.goodsTypeName === '其它') { + sf3Values.goodsName = sf3Values.goodsName1; + delete sf3Values.goodsName1; + } + if (this.sf4.value.carModel.includes('999')) { + this.sf4.value.carModel = ['999']; + } + if (this.sf4.value.carLength.includes('999')) { + this.sf4.value.carLength = ['999']; + } + const goodsInfoDTOList = [ + { + ...this.sf4.value, + ...this.sf3.value, + carModel: this.sf4.value.carModel.join(','), + carLength: this.sf4.value.carLength.join(',') + } + ]; + // 从“再下一单”过来，将所有的子参数内的id都删除 + if ((this.PageStatus = '大宗下一单')) { + LoadingList.forEach((ele: any) => { + delete ele.id; + }); + goodsInfoDTOList.forEach((ele: any) => { + delete ele.id; + }); + } + const params: any = { + ...this.sf1.value, + ...this.sf7.value, + unLoadingPlaceDTOList: LoadingList, + goodsInfoDTOList: goodsInfoDTOList + }; + params.freightPrice = this.totalFees; const modalRef = this.modalService.create({ nzTitle: '运输协议', nzContent: TranAgreementComponent, nzWidth: 900, - nzFooter: null + nzFooter: null, + nzComponentParams: { object: params, shipperName: this.shipperName } }); modalRef.afterClose.subscribe(result => { if (result) { - this.submit(submitType); + this.submit(submitType, params); } }); } // 确认提交 - submit(submitType?: string): void { - // //装卸货信息 - const LoadingList = this.startInfo.concat(this.endInfo); - - // 货物信息 - const sf3Values = { ...this.sf3.value }; - if (sf3Values.goodsTypeName === '其它') { - sf3Values.goodsName = sf3Values.goodsName1; - delete sf3Values.goodsName1; - } - if (this.sf4.value.carModel.includes('999')) { - this.sf4.value.carModel = ['999'] - } - if (this.sf4.value.carLength.includes('999')) { - this.sf4.value.carLength = ['999'] - } - - const params: any = { - ...this.sf1.value, - ...this.sf7.value, - unLoadingPlaceDTOList: [...this.startInfo, ...this.endInfo], - goodsInfoDTOList: [ - { - ...this.sf4.value, - ...this.sf3.value, - carModel: this.sf4.value.carModel.join(','), - carLength: this.sf4.value.carLength.join(',') - } - ] - }; - params.freightPrice = this.totalFees; + submit(submitType?: string, params?: any): void { if (submitType) { if (submitType == 'assign') { this.chooseFamifiar(params); return; - }else if(submitType === 'qrcode'){ + } else if (submitType === 'qrcode') { this.service.request(this.service.$api_saveAnotherBulkOrderQRCode, params).subscribe(res => { if (res) { - this.assignedQrcode( res, params ) + this.assignedQrcode(res, params); } }); return; @@ -742,28 +767,28 @@ export class SupplyManagementBulkPublishComponent implements OnInit { this.requests(this.service.$api_set_saveAnotherBulkOrder, params, 2); } } - // 生成二维码 - assignedQrcode(id:string,parms:any ) { - const item = { - id, - enterpriseInfoName: parms.enterpriseInfoName, - loadingAddressArr: this.startInfo.map((ele: any)=>ele.detailedAddress), - unloadingAddressArr: this.endInfo.map((ele: any)=>ele.detailedAddress), - deadlineTime: parms.deadlineTime, - } - const modalRef = this.modalService.create({ - nzTitle: '二维码', - nzWidth: '468px', - nzContent: SupplyManagementQrcodePageComponent, - nzComponentParams: { - i: item, - }, - nzFooter: null, - }); - modalRef.afterClose.subscribe(() => { - this.router.navigate(['/supply-management/index'], { queryParams: { type: 'bulk' } }); - }); - } + // 生成二维码 + assignedQrcode(id: string, parms: any) { + const item = { + id, + enterpriseInfoName: parms.enterpriseInfoName, + loadingAddressArr: this.startInfo.map((ele: any) => ele.detailedAddress), + unloadingAddressArr: this.endInfo.map((ele: any) => ele.detailedAddress), + deadlineTime: parms.deadlineTime + }; + const modalRef = this.modalService.create({ + nzTitle: '二维码', + nzWidth: '468px', + nzContent: SupplyManagementQrcodePageComponent, + nzComponentParams: { + i: item + }, + nzFooter: null + }); + modalRef.afterClose.subscribe(() => { + this.router.navigate(['/supply-management/index'], { queryParams: { type: 'bulk' } }); + }); + } requests(url: any, params: any, change?: any) { this.service.request(url, params).subscribe((res: any) => { if (res) { @@ -875,6 +900,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit { dataR(res: any) { // 注：区分编辑和下一单 区别是初始化的时候加不加ID if (res?.shipperAppUserName) { + this.shipperName = res?.shipperAppUserName; const List: any = []; this.service.request(this.service.$api_enterpriceList, { enterpriseName: res?.shipperAppUserName }).subscribe(rs => { rs?.forEach((element: any) => { @@ -1057,8 +1083,8 @@ export class SupplyManagementBulkPublishComponent implements OnInit { } }); } - // 装卸货地址互换 - swapAddress(){ + // 装卸货地址互换 + swapAddress() { let item = this.startInfo; this.startInfo = this.endInfo; this.endInfo = item; @@ -1084,9 +1110,9 @@ export class SupplyManagementBulkPublishComponent implements OnInit { this.service.limitKeys2.weight, this.service.limitKeys2.volume, this.service.limitKeys2.trainNumber, - this.service.limitKeys2.freight, + this.service.limitKeys2.freight ]; - this.service.request(this.service.$api_findItemValueByItemKeys, getlimitvaluesParms).subscribe((res) => { + this.service.request(this.service.$api_findItemValueByItemKeys, getlimitvaluesParms).subscribe(res => { const maxMonth = res.filter((item: any) => item.itemKey === this.service.limitKeys2.month)[0].itemValue; const maxWeight = res.filter((item: any) => item.itemKey === this.service.limitKeys2.weight)[0].itemValue; const maxVolume = res.filter((item: any) => item.itemKey === this.service.limitKeys2.volume)[0].itemValue; @@ -1098,7 +1124,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit { maxVolume: Number(maxVolume), maxTrainNumber: Number(maxTrainNumber), maxFreight: Number(maxFreight) - } - }) + }; + }); } } 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 ba50f7e1..69b40452 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 @@ -51,7 +51,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit { totalDistance = 0.0; //总里程 totalTime = 0.0; //路程总时间 currentRate = 0; //实时计算的费率 - shipperAppName = ''; + shipperName = ''; constructor( private http: _HttpClient, fb: FormBuilder, @@ -157,12 +157,11 @@ export class SupplyManagementReleasePublishComponent implements OnInit { return of([]); } }, - change: (q: any, qq: any) => { + change: (q: any, qs: any) => { let str = q.replace(/^\s+|\s+$/g, ''); if (str) { - console.log(qq) this.getRegionCode(str); - this.shipperAppName = qq; + this.shipperName = qs?.label; this.payChange(); } } @@ -980,11 +979,11 @@ export class SupplyManagementReleasePublishComponent implements OnInit { nzContent: TranAgreementComponent, nzWidth: 900, nzFooter: null, - nzComponentParams: { object: params } + nzComponentParams: { object: params ,shipperName: this.shipperName} }); modalRef.afterClose.subscribe(result => { if (result) { - this.submit(submitType, params); + this.submit(submitType, params, ); } }); } diff --git a/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.ts b/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.ts index c2e2fb8f..b3b65bcf 100644 --- a/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.ts +++ b/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-02-24 20:19:51 * @LastEditors : Shiming - * @LastEditTime : 2022-03-03 14:08:28 + * @LastEditTime : 2022-03-03 14:24:51 * @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\tran-agreement\\tran-agreement.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -58,9 +58,9 @@ export class TranAgreementComponent { consignmentVolume:`${this.object?.goodsInfoDTOList[0].weight}吨/${this.object?.goodsInfoDTOList[0].volume}方/${this.object?.goodsInfoDTOList[0].number}件`, //托运量 transporterInfo:'', //运输方信息 freightAmount:this.object?.total, // 订单运费金额（元) - pre:this.object?.expenseDTOList.filter((item:any) => item.expenseCode === 'PRE')[0].price, //预付 - rece:this.object?.expenseDTOList.filter((item:any) => item.expenseCode === 'RECE')[0].price,// 到付 - back:this.object?.expenseDTOList.filter((item:any) => item.expenseCode === 'BACK')[0].price,// 回单付 + pre:this.object?.expenseDTOList?.filter((item:any) => item.expenseCode === 'PRE')[0].price, //预付 + rece:this.object?.expenseDTOList?.filter((item:any) => item.expenseCode === 'RECE')[0].price,// 到付 + back:this.object?.expenseDTOList?.filter((item:any) => item.expenseCode === 'BACK')[0].price,// 回单付 lunarKnot:0, total:this.object?.subtotal, // 合计（元) paymentTime:`到货后${this.object?.paymentDays}天`, // 承诺支付运费时间 From d57d14668913e76875bac325c9961780f8c6ed61 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 3 Mar 2022 14:43:10 +0800 Subject: [PATCH 05/42] edit --- .../cost-management-detail.component.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/app/routes/financial-management/components/cost-management/cost-management-detail/cost-management-detail.component.html b/src/app/routes/financial-management/components/cost-management/cost-management-detail/cost-management-detail.component.html index f1b614cb..5f082c34 100644 --- a/src/app/routes/financial-management/components/cost-management/cost-management-detail/cost-management-detail.component.html +++ b/src/app/routes/financial-management/components/cost-management/cost-management-detail/cost-management-detail.component.html @@ -61,7 +61,7 @@ {{ (costInfo?.hrvatmoney || 0) | currency }} - {{ costInfo?.hrpaymoney | currency }} + {{ costInfo?.hrmoney | currency}} @@ -84,7 +84,9 @@ {{ item.hrmoney | currency}} - {{ item.armoney | currency}} + + {{ item.armoney | currency}} + {{ item.hrmoney | currency}} {{ item.arkpmoney | currency}} From 73c3ce6c4fbb7fc6e50e0894dfaceadabf9e3eeb Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 3 Mar 2022 15:12:48 +0800 Subject: [PATCH 06/42] fix bug --- .../driver/detail/detail.component.html | 57 ++++++++++++++----- 1 file changed, 44 insertions(+), 13 deletions(-) diff --git a/src/app/routes/usercenter/components/driver/detail/detail.component.html b/src/app/routes/usercenter/components/driver/detail/detail.component.html index b70f5df7..f4e3885c 100644 --- a/src/app/routes/usercenter/components/driver/detail/detail.component.html +++ b/src/app/routes/usercenter/components/driver/detail/detail.component.html @@ -94,16 +94,23 @@ - - - - - + + + + - + + + + + + + + +
- + + + + - + + + + + + + + + + @@ -201,6 +224,14 @@ + + + + + + + @@ -262,10 +293,10 @@ 银行结算信息 - {{ detailData?.name }} + {{ userIdentityDetail?.name }} - {{ detailData?.certificateNumber }} + {{ userIdentityDetail?.certificateNumber }} From fc83ed140f46c790ebf2340806913ea767e817d6 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 3 Mar 2022 15:20:48 +0800 Subject: [PATCH 07/42] edit --- .../driver/detail/detail.component.ts | 51 ++++++++++--------- 1 file changed, 28 insertions(+), 23 deletions(-) diff --git a/src/app/routes/usercenter/components/driver/detail/detail.component.ts b/src/app/routes/usercenter/components/driver/detail/detail.component.ts index df824556..bb13924b 100644 --- a/src/app/routes/usercenter/components/driver/detail/detail.component.ts +++ b/src/app/routes/usercenter/components/driver/detail/detail.component.ts @@ -312,6 +312,11 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit { return; } } + if (!licenseDetail.licenseNo || !licenseDetail.regionCode || !licenseDetail.validStartTime) { + this.service.msgSrv.warning('请完善从业资格证信息'); + return; + } + const params: any = { userId: this.route.snapshot.params.id, mobile: this.userDetail?.phone, @@ -332,27 +337,8 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit { driverDetail.validStartTime?.length === 10 ? driverDetail.validStartTime : this.datePipe.transform(driverDetail.validStartTime, 'yyyy-MM-dd') - } - // userPracticeSeniorityDTO: { - // appUserId: licenseDetail.appUserId || this.route.snapshot.params.id, - // approvalStatus: licenseDetail.approvalStatus, - // certificatePhoto: licenseDetail.certificatePhoto, - // certificatePhotoWatermark: licenseDetail.certificatePhotoWatermark, - // id: licenseDetail.id, - // licenseNo: licenseDetail.licenseNo, - // regionCode: licenseDetail.regionCode, - // validEndTime: - // licenseDetail.validEndTime?.length === 10 - // ? licenseDetail.validEndTime - // : this.datePipe.transform(licenseDetail.validEndTime, 'yyyy-MM-dd'), - // validStartTime: - // licenseDetail.validStartTime?.length === 10 - // ? licenseDetail.validStartTime - // : this.datePipe.transform(licenseDetail.validStartTime, 'yyyy-MM-dd') - // } - }; - if (licenseDetail.approvalStatus && licenseDetail.licenseNo && licenseDetail.regionCode) { - params.userPracticeSeniorityDTO = { + }, + userPracticeSeniorityDTO: { appUserId: licenseDetail.appUserId || this.route.snapshot.params.id, approvalStatus: licenseDetail.approvalStatus, certificatePhoto: licenseDetail.certificatePhoto, @@ -368,8 +354,27 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit { licenseDetail.validStartTime?.length === 10 ? licenseDetail.validStartTime : this.datePipe.transform(licenseDetail.validStartTime, 'yyyy-MM-dd') - }; - } + } + }; + // if (licenseDetail.approvalStatus && licenseDetail.licenseNo && licenseDetail.regionCode) { + // params.userPracticeSeniorityDTO = { + // appUserId: licenseDetail.appUserId || this.route.snapshot.params.id, + // approvalStatus: licenseDetail.approvalStatus, + // certificatePhoto: licenseDetail.certificatePhoto, + // certificatePhotoWatermark: licenseDetail.certificatePhotoWatermark, + // id: licenseDetail.id, + // licenseNo: licenseDetail.licenseNo, + // regionCode: licenseDetail.regionCode, + // validEndTime: + // licenseDetail.validEndTime?.length === 10 + // ? licenseDetail.validEndTime + // : this.datePipe.transform(licenseDetail.validEndTime, 'yyyy-MM-dd'), + // validStartTime: + // licenseDetail.validStartTime?.length === 10 + // ? licenseDetail.validStartTime + // : this.datePipe.transform(licenseDetail.validStartTime, 'yyyy-MM-dd') + // }; + // } console.log(params); this.service.request(this.service.$api_update_driver_license, params).subscribe(res => { if (res) { From 691567904be96d28d2949797b51dae3aaade4c1f Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 3 Mar 2022 15:36:54 +0800 Subject: [PATCH 08/42] fix bug --- .../components/driver/detail/detail.component.html | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/app/routes/usercenter/components/driver/detail/detail.component.html b/src/app/routes/usercenter/components/driver/detail/detail.component.html index f4e3885c..07687f6e 100644 --- a/src/app/routes/usercenter/components/driver/detail/detail.component.html +++ b/src/app/routes/usercenter/components/driver/detail/detail.component.html @@ -95,9 +95,12 @@ [nzBorderless]="!isEditUser" [placeholder]="isEditUser?'':'-'"> - - + --> + + - From df1bcf46548b6c38ed043b47892222205a869008 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 3 Mar 2022 15:45:44 +0800 Subject: [PATCH 09/42] fix bug --- .../driver/detail/detail.component.html | 41 +++++++++---------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/src/app/routes/usercenter/components/driver/detail/detail.component.html b/src/app/routes/usercenter/components/driver/detail/detail.component.html index 07687f6e..53d25019 100644 --- a/src/app/routes/usercenter/components/driver/detail/detail.component.html +++ b/src/app/routes/usercenter/components/driver/detail/detail.component.html @@ -95,9 +95,6 @@ [nzBorderless]="!isEditUser" [placeholder]="isEditUser?'':'-'"> - @@ -218,25 +215,7 @@ - - - - - - - - - - - - - - + @@ -248,6 +227,24 @@ {{licenseDetail?.regionCodeName }} + + + + - + + + + + + + + + + + From 2296944130a7beec3c5f917143e3241669a310c8 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 3 Mar 2022 16:02:27 +0800 Subject: [PATCH 10/42] fix bug --- .../tran-agreement/tran-agreement.component.html | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.html b/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.html index 025765ab..3d17366e 100644 --- a/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.html +++ b/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.html @@ -1,6 +1,9 @@ -

+ + +
+
\ No newline at end of file From ad9ee653df39f343ba3273aaf98518fa6dcaa214 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 3 Mar 2022 16:33:01 +0800 Subject: [PATCH 11/42] fix bug --- .../components/tran-agreement/tran-agreement.component.html | 3 --- .../supply-management/components/vehicle/vehicle.component.ts | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.html b/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.html index 3d17366e..bbe21f8f 100644 --- a/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.html +++ b/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.html @@ -1,6 +1,3 @@ -
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 d3c00b09..b5ac320a 100644 --- a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts @@ -549,10 +549,9 @@ export class SupplyManagementVehicleComponent implements OnInit { }, { title: '创建时间', - width: '170px', + width: '200px', index: 'createTime', className: 'text-left', - type: 'date' }, { title: '审核状态', From 46227ebd480ba8d3b0e24e948aa182970cf564d0 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 3 Mar 2022 16:34:33 +0800 Subject: [PATCH 12/42] fix bug --- .../components/vehicle/vehicle.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/routes/supply-management/components/vehicle/vehicle.component.html b/src/app/routes/supply-management/components/vehicle/vehicle.component.html index 7baaf88d..752c19a3 100644 --- a/src/app/routes/supply-management/components/vehicle/vehicle.component.html +++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-12 10:52:50 * @LastEditors : Shiming - * @LastEditTime : 2022-03-01 13:12:12 + * @LastEditTime : 2022-03-03 16:34:12 * @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\vehicle\\vehicle.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -90,7 +90,7 @@
车型: {{ item?.carModelLabel }}
-
车长: {{ item?.expand }} 米
+
车长: {{ item?.carLenghtLabel }} 米

From 2d7f75d90c60c4d68ef799c3dab7297f7240b4b8 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 4 Mar 2022 09:34:35 +0800 Subject: [PATCH 13/42] fix bug --- .../confir-receipt/confir-receipt.component.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.html b/src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.html index b1289919..8022eb52 100644 --- a/src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.html +++ b/src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-14 15:02:52 * @LastEditors : Shiming - * @LastEditTime : 2022-03-02 13:43:55 + * @LastEditTime : 2022-03-04 09:34:13 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\bulk\\confir-receipt\\confir-receipt.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -34,18 +34,18 @@ nzMessage="签收后不可再修改运费，请确保运费等信息准确无误 -
{{detailList?.goodsInfoVO?.weight}}吨
+
{{ detailList?.acceptWeight }}吨
 -
{{detailList?.goodsInfoVO?.volume}}方
+
{{ detailList?.acceptVolume }}方
 - + -
{{detailList?.goodsInfoVO?.volume}}吨
+
{{ detailList?.settlementWeight }}吨
 -
{{detailList?.settlementVolume}}方
+
{{ detailList?.settlementVolume }}方
 From 43a9d48930e32d484d9a9ebd8d6a482685c06b9b Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 4 Mar 2022 09:38:49 +0800 Subject: [PATCH 14/42] fix bug --- .../modal/bulk/confir-receipt/confir-receipt.component.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.html b/src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.html index 8022eb52..bd2b7f0e 100644 --- a/src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.html +++ b/src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-14 15:02:52 * @LastEditors : Shiming - * @LastEditTime : 2022-03-04 09:34:13 + * @LastEditTime : 2022-03-04 09:38:45 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\bulk\\confir-receipt\\confir-receipt.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -34,10 +34,10 @@ nzMessage="签收后不可再修改运费，请确保运费等信息准确无误 -
{{ detailList?.acceptWeight }}吨
+
{{ detailList?.loadWeight }}吨
 -
{{ detailList?.acceptVolume }}方
+
{{ detailList?.loadVolume }}方
 From 1f806432d109767ab19b687f7ddd596d4ad9804a Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 4 Mar 2022 09:47:58 +0800 Subject: [PATCH 15/42] fix bug --- .../vehicle/sure-arrive/sure-arrive.component.ts | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.ts b/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.ts index e0e8f6e3..eee67218 100644 --- a/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.ts +++ b/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.ts @@ -422,7 +422,10 @@ export class VehicleSureArriveComponent implements OnInit { }; } save(value: any): void { + console.log('444'); if(this.Status === 1) { + console.log('555'); + if(!value.time) { this.service.msgSrv.warning('必填项为空！') return; @@ -449,11 +452,11 @@ export class VehicleSureArriveComponent implements OnInit { console.log(this.i) const params = { id: this.i?.id, - imgUrl1: value.imgUrl1.data.fullFilePath, - imgUrl2: value.imgUrl2.data.fullFilePath, - time: value.time, - volume: this.data.volume, - weight: this.data.weight + imgUrl1: value?.imgUrl1?.data?.fullFilePath, + imgUrl2: value?.imgUrl2?.data?.fullFilePath, + time: value?.time, + volume: this.data?.volume, + weight: this.data?.weight } params.time = this.datePipe.transform(value.time, 'yyyy-MM-dd HH:mm:ss ') console.log(params) From 3274d6b5b089e7c91d680a7eb348d34aad826d29 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 4 Mar 2022 09:48:16 +0800 Subject: [PATCH 16/42] fix bug --- .../modal/vehicle/sure-arrive/sure-arrive.component.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.html b/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.html index 47ab667b..16cdb712 100644 --- a/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.html +++ b/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-15 13:17:42 * @LastEditors : Shiming - * @LastEditTime : 2022-01-18 17:23:52 + * @LastEditTime : 2022-03-04 09:48:12 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\sure-arrive\\sure-arrive.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -12,13 +12,13 @@
- +
吨
- +
方
 From a44a4412037f7fe29de6d47e78757daf7b5b7968 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 4 Mar 2022 09:57:44 +0800 Subject: [PATCH 17/42] fix bug --- .../components/vehicle/vehicle.component.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/routes/supply-management/components/vehicle/vehicle.component.html b/src/app/routes/supply-management/components/vehicle/vehicle.component.html index 752c19a3..34c8614b 100644 --- a/src/app/routes/supply-management/components/vehicle/vehicle.component.html +++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-12 10:52:50 * @LastEditors : Shiming - * @LastEditTime : 2022-03-03 16:34:12 + * @LastEditTime : 2022-03-04 09:57:16 * @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\vehicle\\vehicle.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -80,10 +80,10 @@

{{ item?.resourceStatusLabel }}

 -
{{ item?.totalAmount + item?.surcharge | currency }}
+
{{ item?.totalAmount | currency }}
-
{{ item?.totalAmount | currency }}
+
{{ item?.freight | currency }}
{{ item?.surcharge | currency }}
From 82dc8255c105baa69ff6ad113ea80987e63b0649 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 4 Mar 2022 10:00:04 +0800 Subject: [PATCH 18/42] fix bug --- .../components/vehicle-detail/vehicle-detail.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html index 28c6636e..0d9643ed 100644 --- a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html +++ b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html @@ -159,10 +159,10 @@ {{ i?.insuranceTypeLabel }} - + {{ i?.goodsValue | currency }} - {{ i?.insurancePremium | currency }} 元 + {{ i?.insurancePremium | currency }} 元 From ff9a59a759ea0ba979d3d6c50cd2bc50dc7d276e Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 4 Mar 2022 10:04:21 +0800 Subject: [PATCH 19/42] fix bug --- .../components/bulk-detail/bulk-detail.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html index 3fa12800..2380b6c0 100644 --- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-06 20:20:26 * @LastEditors : Shiming - * @LastEditTime : 2022-03-02 11:14:37 + * @LastEditTime : 2022-03-04 10:04:11 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -135,7 +135,7 @@ -

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

+

{{i?.goodsInfoList?.[0]?.freightPrice}}{{i?.goodsInfoList?.[0]?.freightTypeLabel}}（{{ i?.goodsInfoList?.[0]?.settlementBasisLabel ? i?.goodsInfoList?.[0]?.settlementBasisLabel + '，' :' ' }}{{i?.goodsInfoList?.[0]?.ruleLabel}}）

到付 From 51e7ebf4d329640ceca12ae19c2ec5a32bad94ea Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Fri, 4 Mar 2022 10:45:05 +0800 Subject: [PATCH 20/42] edit --- .../payable-order-detail.component.ts | 8 ++++---- .../components/payable-order/payable-order.component.ts | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/app/routes/financial-management/components/payable-order/payable-order-detail/payable-order-detail.component.ts b/src/app/routes/financial-management/components/payable-order/payable-order-detail/payable-order-detail.component.ts index 25e72be4..939ea639 100644 --- a/src/app/routes/financial-management/components/payable-order/payable-order-detail/payable-order-detail.component.ts +++ b/src/app/routes/financial-management/components/payable-order/payable-order-detail/payable-order-detail.component.ts @@ -41,7 +41,7 @@ export class PayableOrderDetailComponent implements OnInit { } beforeReq = (requestOptions: STRequestOptions) => { - Object.assign(requestOptions.body, { billHId: this.billHId }); + Object.assign(requestOptions.body, { phxHId: this.billHId }); if (this.sf) { Object.assign(requestOptions.body, { ...this.sf.value, @@ -159,14 +159,14 @@ export class PayableOrderDetailComponent implements OnInit { private initST(): STColumn[] { return [ { title: '序号', render: 'no', width: 80 }, - { title: '费用号', index: 'feeHCode', width: 100 }, + { title: '费用号', index: 'feeHCode', width: 140 }, { title: '费用日期', index: 'feedate', type: 'date', width: 150 }, - { title: '订单号', index: 'billHCode', width: 100 }, + { title: '订单号', index: 'billHCode', width: 140 }, { title: '订单日期', index: 'billTime', width: 150 }, { title: '费用类型', index: 'feetype', width: 90 }, { title: '订单费用科目', index: 'billLTypeLabel', width: 100 }, { title: '费用科目', index: 'feeSubIdName', width: 140 }, - { title: '结算客户', index: 'cnoName', width: 100 }, + { title: '结算客户', index: 'cnoName', width: 140 }, { title: '已收金额', index: 'phxmoney', diff --git a/src/app/routes/financial-management/components/payable-order/payable-order.component.ts b/src/app/routes/financial-management/components/payable-order/payable-order.component.ts index 66ceac3b..65872e27 100644 --- a/src/app/routes/financial-management/components/payable-order/payable-order.component.ts +++ b/src/app/routes/financial-management/components/payable-order/payable-order.component.ts @@ -263,7 +263,7 @@ export class PayableOrderComponent implements OnInit { { text: '浏览', click: item => - this.router.navigate(['/financial-management/payable-order/detail/' + item.id], { queryParams: { billHId: item.billHId } }) + this.router.navigate(['/financial-management/payable-order/detail/' + item.id], { queryParams: { billHId: item.id } }) } ] } From 3ae4aa04e22a20f0f80d22295a4ea8ed04421c32 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 4 Mar 2022 10:46:57 +0800 Subject: [PATCH 21/42] fix bug --- .../vehicle-detail-change.component.html | 5 +-- .../vehicle-detail-change.component.ts | 38 ++++++++++++------- .../onecar-publish.component.ts | 2 + 3 files changed, 27 insertions(+), 18 deletions(-) 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 55731648..2b0a8b4a 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-03-01 13:41:57 + * @LastEditTime : 2022-03-04 10:42:33 * @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. --> @@ -81,9 +81,6 @@ readonly="true" /> - 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 4df2dd3f..85026bb9 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-02-28 11:53:31 + * @LastEditTime : 2022-03-04 10:45:54 * @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. */ @@ -14,7 +14,7 @@ import { ActivatedRoute, Router } from '@angular/router'; import { apiConf } from '@conf/api.conf'; import { STColumn, STComponent } from '@delon/abc/st'; import { SFComponent, SFSchema, SFSelectWidgetSchema, SFUISchema, SFUploadWidgetSchema } from '@delon/form'; -import { AmapPoiPickerComponent, AmapService, EAEnvironmentService, ShipperBaseService } from '@shared'; +import { AmapPoiPickerComponent, AmapService, EACacheService, EAEnvironmentService, ShipperBaseService } from '@shared'; import { NzCardComponent } from 'ng-zorro-antd/card'; import { NzMessageService } from 'ng-zorro-antd/message'; import { NzModalService } from 'ng-zorro-antd/modal'; @@ -443,6 +443,13 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit { this.loadTime = res.loadTime; this.unloadTime = res.unloadTime; this.dirvingMessage = res.billExpenseDetails; + // 计算里程，时间 + if (this.startInfo?.[0]?.area && this.endInfo?.[0]?.area) { + this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => { + this.totalDistance = res.distance; + this.totalTime = res.time; + }); + } } }); } @@ -554,31 +561,34 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit { // -------------------装卸货信息处理 // 打开地图 openMap(type: string, index: number) { + console.log(type); + console.log(index); + const modalRef = this.modalService.create({ nzTitle: '', nzContent: AmapPoiPickerComponent, nzWidth: 900, nzOnOk: item => { const poi = item.poi; - const locList = poi.location.toString().split(','); + const locList = poi.pois; switch (type) { case 'start': - this.startInfo[index].detailedAddress = poi.district + poi.name; + this.startInfo[index].detailedAddress = poi.formattedAddress; this.startInfo[index].longitude = locList[0]; this.startInfo[index].latitude = locList[1]; - this.startInfo[index].province = poi.cityInfo.province; - this.startInfo[index].city = poi.cityInfo.city; - this.startInfo[index].area = poi.cityInfo.district; - this.startInfo[index].address = poi.name; + this.startInfo[index].province = poi.addressComponent.province; + this.startInfo[index].city = poi.addressComponent.city; + this.startInfo[index].area = poi.addressComponent.district; + this.startInfo[index].address = poi.formattedAddress; break; case 'end': - this.endInfo[index].detailedAddress = poi.district + poi.name; + this.endInfo[index].detailedAddress = poi.formattedAddress; this.endInfo[index].longitude = locList[0]; this.endInfo[index].latitude = locList[1]; - this.endInfo[index].province = poi.cityInfo.province; - this.endInfo[index].city = poi.cityInfo.city; - this.endInfo[index].area = poi.cityInfo.district; - this.endInfo[index].address = poi.name; + this.endInfo[index].province = poi.addressComponent.province; + this.endInfo[index].city = poi.addressComponent.city; + this.endInfo[index].area = poi.addressComponent.district; + this.endInfo[index].address = poi.formattedAddress; break; default: break; @@ -593,7 +603,6 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit { } }); } - initSF3() { this.schema3 = { properties: { @@ -874,4 +883,5 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit { } console.log(elf); } + } 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 1d6b1d28..bb53ace9 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 @@ -1050,6 +1050,8 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { } // 打开地图 openMap(type: string, index: number) { + console.log(type); + console.log(index); const modalRef = this.modalService.create({ nzTitle: '', nzContent: AmapPoiPickerComponent, From 2a3a59737c99bcaa99ad0fa928520b8de00a70b8 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Fri, 4 Mar 2022 11:03:26 +0800 Subject: [PATCH 22/42] edit --- .../components/invoice-detail/invoice-detail.component.ts | 2 +- .../invoice-requested-detail.component.html | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts index 91cc8573..6aaf5fb1 100644 --- a/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts +++ b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts @@ -209,7 +209,7 @@ export class InvoiceDetailComponent implements OnInit { private initCostST(): STColumn[] { return [ { title: '费用号', index: 'feeHId' }, - { title: '订单号', index: 'billHId' }, + { title: '订单号', index: 'billHCode' }, { title: '订单日期', index: 'createTime', type: 'date' }, { title: '计费日期', index: 'feeDate', type: 'date' }, { title: '税率', index: 'vatrate', format: item => `${item.vatrate ? ((item.vatrate as number) * 100).toFixed(2) : 0}%` }, diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.html b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.html index 04e52e6a..daf75994 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.html +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.html @@ -16,10 +16,10 @@ {{headerInfo?.vatappcode}} - {{headerInfo?.vatinvBillNum}} / {{headerInfo?.ordlines}} + {{headerInfo?.ordlines}} / {{headerInfo?.vatinvBillNum}} - {{headerInfo?.vatinvHAmount}} / {{headerInfo?.vatinvHAmount}} + {{headerInfo?.vatinvHAmount}} / {{headerInfo?.vatinvHNumAmount}} {{headerInfo?.vatinvHNum}} @@ -96,7 +96,7 @@
- +
已选择 {{ selectedRows.length }} 条数据   开票金额总计 Date: Fri, 4 Mar 2022 13:34:13 +0800 Subject: [PATCH 23/42] fix bug --- .../bulk-detail-change.component.html | 24 +- .../bulk-detail-change.component.ts | 439 +++++++----------- .../vehicle-detail-change.component.html | 3 +- .../vehicle-detail-change.component.ts | 40 +- .../bulk-publish/bulk-publish.component.ts | 7 + 5 files changed, 233 insertions(+), 280 deletions(-) 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 b7d92a6a..0e98b137 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-03-01 13:42:44 + * @LastEditTime : 2022-03-04 13:33:51 * @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. --> @@ -34,7 +34,7 @@ {{ i?.goodsResource?.shipperAppUserName }} {{i?.goodsResource?.enterpriseProjectName}} {{i?.goodsResource?.serviceTypeLabel}} - {{i?.goodsResource?.createUserName}} /{{i?.goodsResource?.createUserPhone}} + {{i?.createUserName}} /{{i?.createUserPhone}} {{i?.goodsResource?.dispatchName}}/{{i?.goodsResource?.dispatchPhone}}
@@ -125,7 +125,8 @@
- +
@@ -177,7 +178,7 @@
-
+ @@ -205,18 +206,7 @@ - - - + {{i?.goodsInfoList?.[0]?.weight}}吨,{{i?.goodsInfoList?.[0]?.volume}}方,{{i?.goodsInfoList?.[0]?.number}}件 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 86d1ae0f..8569a071 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-02-28 12:01:57 + * @LastEditTime : 2022-03-04 13:26:50 * @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. */ @@ -438,7 +438,13 @@ loadTime: any; // 货源单设置回显 this.loadTime = res.loadTime this.unloadTime = res.unloadTime this.dirvingMessage = res.billExpenseDetails; - + // 计算里程，时间 + if (this.startInfo[0]?.area && this.endInfo[0]?.area) { + this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => { + this.totalDistance = res.distance; + this.totalTime = res.time; + }); + } } }) } @@ -516,6 +522,7 @@ loadTime: any; // 货源单设置回显 // -------------------装卸货信息处理 // 打开地图 // 打开地图 + // 打开地图 openMap(type: string, index: number) { const modalRef = this.modalService.create({ nzTitle: '', @@ -523,30 +530,32 @@ loadTime: any; // 货源单设置回显 nzWidth: 900, nzOnOk: item => { const poi = item.poi; - const locList = poi.pois; + const locList = poi.location.toString().split(','); switch (type) { case 'start': - this.startInfo[index].detailedAddress = poi.formattedAddress; + this.startInfo[index].detailedAddress = poi.district + poi.name; this.startInfo[index].longitude = locList[0]; this.startInfo[index].latitude = locList[1]; - this.startInfo[index].province = poi.addressComponent.province; - this.startInfo[index].city = poi.addressComponent.city; - this.startInfo[index].area = poi.addressComponent.district; + this.startInfo[index].province = poi.cityInfo.province; + this.startInfo[index].city = poi.cityInfo.city; + this.startInfo[index].area = poi.cityInfo.district; + this.startInfo[index].address = poi.name; break; case 'end': - this.endInfo[index].detailedAddress = poi.formattedAddress; + this.endInfo[index].detailedAddress = poi.district + poi.name; this.endInfo[index].longitude = locList[0]; this.endInfo[index].latitude = locList[1]; - this.endInfo[index].province = poi.addressComponent.province; - this.endInfo[index].city = poi.addressComponent.city; - this.endInfo[index].area = poi.addressComponent.district; + this.endInfo[index].province = poi.cityInfo.province; + this.endInfo[index].city = poi.cityInfo.city; + this.endInfo[index].area = poi.cityInfo.district; + this.endInfo[index].address = poi.name; break; default: break; } if (this.startInfo[0]?.area && this.endInfo[0]?.area) { - this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => { + this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe((res: any) => { this.totalDistance = res.distance; this.totalTime = res.time; }); @@ -554,7 +563,6 @@ loadTime: any; // 货源单设置回显 } }); } - initSF3() { this.schema3 = { properties: { @@ -631,94 +639,6 @@ loadTime: any; // 货源单设置回显 } }; } - initSF4() { - this.schema4 = { - properties: { - weight: { - type: 'string', - title: '货物数量', - ui: { - widget: 'custom', - placeholder: '请输入', - errors: { required: '必填项' } - } - }, - volume: { - type: 'string', - title: '', - ui: { - widget: 'custom', - placeholder: '请输入' - } - }, - number: { - type: 'string', - title: '', - ui: { - widget: 'custom', - placeholder: '请输入' - } - }, - carModel: { - type: 'string', - title: '车型/车长', - ui: { - widget: 'select', - mode: 'multiple', - maxMultipleCount:3, - placeholder: '请选择车型', - errors: { required: '请选择车型' }, - asyncData: () => this.service.getDictOptions({ dictKey: 'car:model' }), - change:(tag:any , org:any)=>{ - if(tag.includes("999")){ - this.sf4.setValue('/carModel',["999"]); - } - } - } - }, - carLength: { - type: 'string', - title: '', - ui: { - widget: 'select', - mode: 'multiple', - maxMultipleCount:3, - placeholder: '请选择车长', - errors: { required: '请选择车长' }, - asyncData: () => this.service.getDictOptions({ dictKey: 'car:length' }), - change:(tag:any , org:any)=>{ - if(tag.includes("999")){ - this.sf4.setValue('/carModel',["999"]); - } - } - } - }, - }, - required: ['weight', 'carModel', 'carLength'] - }; - this.ui4 = { - '*': { - spanLabelFixed: 90, - grid: { span: 24 } - }, - $weight: { - grid: { lg: 8, md: 12, sm: 12, xs: 24 } - }, - $volume: { - grid: { lg: 8, md: 12, sm: 12, xs: 24 } - }, - $number: { - grid: { lg: 8, md: 12, sm: 12, xs: 24 } - }, - $carModel: { - spanLabelFixed: 100, - grid: { span: 8 } - }, - $carLength: { - grid: { span: 8 } - } - }; - } changeGoodsType(value: string, data: any) { if (data.label === '其它') return; const params = { @@ -745,165 +665,143 @@ changeGoodsType(value: string, data: any) { } }); } -// initSF4() { -// this.schema4 = { -// properties: { -// weight: { -// type: 'string', -// title: '货物数量', -// ui: { -// widget: 'custom', -// placeholder: '请输入', -// errors: { required: '必填项' } -// } -// }, -// volume: { -// type: 'string', -// title: '', -// ui: { -// widget: 'custom', -// placeholder: '请输入' -// } -// }, -// number: { -// type: 'string', -// title: '', -// ui: { -// widget: 'custom', -// placeholder: '请输入' -// } -// }, -// carmand: { -// type: 'string', -// title: '用车需求', -// ui: { -// widget: 'custom', -// placeholder: '请输入' -// } -// }, -// drivers: { -// type: 'string', -// title: '承运司机', -// ui: { -// widget: 'custom', -// placeholder: '请输入' -// } -// }, -// weightModel: { -// type: 'string', -// title: '车型车长承重', -// ui: { -// widget: 'custom', -// placeholder: '请输入' -// } -// }, -// loadTime: { -// type: 'string', -// title: '发车时间', -// ui: { -// widget: 'custom', -// placeholder: '请输入' -// } -// }, -// unloadTime: { -// type: 'string', -// title: '到车时间', -// ui: { -// widget: 'custom', -// placeholder: '请输入' -// } -// }, -// acceptWeight: { -// type: 'number', -// title: '装货重量', -// minimum:0, -// maximum:99999, -// ui: { -// unit: '吨', -// placeholder: '请输入', -// grid: { -// span: 12 -// }, -// hideStep: true, -// } as SFNumberWidgetSchema -// }, -// acceptVolume: { -// type: 'number', -// title: '装货体积', -// minimum:0, -// maximum:99999, -// ui: { -// unit: '吨', -// placeholder: '请输入', -// grid: { -// span: 12 -// }, -// hideStep: true, -// } as SFNumberWidgetSchema -// }, -// settlementWeight: { -// type: 'number', -// title: '卸货重量', -// minimum:0, -// maximum:99999, -// ui: { -// unit: '吨', -// placeholder: '请输入', -// grid: { -// span: 12 -// }, -// hideStep: true, -// } as SFNumberWidgetSchema -// }, -// settlementVolume: { -// type: 'number', -// title: '卸货体积', -// minimum:0, -// maximum:99999, -// ui: { -// unit: '吨', -// placeholder: '请输入', -// grid: { -// span: 12 -// }, -// hideStep: true, -// } as SFNumberWidgetSchema -// } -// }, -// required: ['weight','loadTime','unloadTime'] -// }; -// this.ui4 = { -// '*': { -// spanLabelFixed: 90, -// grid: { span: 24 } -// }, -// $weight: { -// grid: { span: 8 } -// }, -// $volume: { -// grid: { span: 8 } -// }, -// $number: { -// grid: { span: 8 } -// }, -// $carmand: { -// grid: { span: 24 } -// }, -// $weightModel: { -// spanLabelFixed: 120, -// grid: { span: 12 } -// }, -// $drivers: { -// grid: { span: 12 } -// }, -// $loadTime: { -// grid: { span: 12 } -// }, -// $unloadTime: { -// grid: { span: 12 } -// }, -// }; -// } +initSF4() { + this.schema4 = { + properties: { + weight: { + type: 'string', + title: '货物数量', + ui: { + widget: 'custom', + placeholder: '请输入', + errors: { required: '必填项' } + } + }, + carmand: { + type: 'string', + title: '用车需求', + ui: { + widget: 'custom', + placeholder: '请输入' + } + }, + drivers: { + type: 'string', + title: '承运司机', + ui: { + widget: 'custom', + placeholder: '请输入' + } + }, + weightModel: { + type: 'string', + title: '车型车长承重', + ui: { + widget: 'custom', + placeholder: '请输入' + } + }, + loadTime: { + type: 'string', + title: '发车时间', + ui: { + widget: 'custom', + placeholder: '请输入' + } + }, + unloadTime: { + type: 'string', + title: '到车时间', + ui: { + widget: 'custom', + placeholder: '请输入' + } + }, + acceptWeight: { + type: 'number', + title: '装货重量', + minimum:0, + maximum:99999, + ui: { + unit: '吨', + placeholder: '请输入', + grid: { + span: 12 + }, + hideStep: true, + } as SFNumberWidgetSchema + }, + acceptVolume: { + type: 'number', + title: '装货体积', + minimum:0, + maximum:99999, + ui: { + unit: '吨', + placeholder: '请输入', + grid: { + span: 12 + }, + hideStep: true, + } as SFNumberWidgetSchema + }, + settlementWeight: { + type: 'number', + title: '卸货重量', + minimum:0, + maximum:99999, + ui: { + unit: '吨', + placeholder: '请输入', + grid: { + span: 12 + }, + hideStep: true, + } as SFNumberWidgetSchema + }, + settlementVolume: { + type: 'number', + title: '卸货体积', + minimum:0, + maximum:99999, + ui: { + unit: '吨', + placeholder: '请输入', + grid: { + span: 12 + }, + hideStep: true, + } as SFNumberWidgetSchema + } + }, + required: ['loadTime','unloadTime'] + }; + this.ui4 = { + '*': { + spanLabelFixed: 90, + grid: { span: 24 } + }, + $weight: { + grid: { span: 24 } + }, + $carmand: { + grid: { span: 24 } + }, + $weightModel: { + spanLabelFixed: 120, + grid: { span: 12 } + }, + $drivers: { + grid: { span: 12 } + }, + $loadTime: { + grid: { span: 12 } + }, + $unloadTime: { + grid: { span: 12 } + }, + }; +} // 处理上传图片 handlePreview1 = async (file: NzUploadFile) => { if (!file.url && !file.preview) { @@ -970,4 +868,25 @@ goDistance(elf: NzCardComponent) { elf['elementRef'].nativeElement.scrollIntoView({ behavior: 'smooth', block: 'start', inline: 'start' }); } } + // 装卸货地址互换 + swapAddress() { + let item = this.startInfo; + this.startInfo = this.endInfo; + this.endInfo = item; + + this.startInfo.forEach((element: any) => { + element.type = '1'; + }); + this.endInfo.forEach((element: any) => { + element.type = '2'; + }); + + // 计算里程，时间 + if (this.startInfo[0]?.area && this.endInfo[0]?.area) { + this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => { + this.totalDistance = res.distance; + this.totalTime = res.time; + }); + } + } } 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 2b0a8b4a..1901a4c1 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 @@ -112,7 +112,8 @@
- +
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 85026bb9..364de33d 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-03-04 10:45:54 + * @LastEditTime : 2022-03-04 10:48:50 * @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. */ @@ -883,5 +883,41 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit { } console.log(elf); } - + // 装卸货地址互换 + swapAddress() { + this.startInfo.forEach((element: any, index: any) => { + this.validateForm1.removeControl(`loadAddress${index}`); + this.validateForm1.removeControl(`loadName${index}`); + this.validateForm1.removeControl(`loadPhone${index}`); + }); + this.endInfo.forEach((element: any, index: any) => { + this.validateForm1.removeControl(`unloadAddress${index}`); + this.validateForm1.removeControl(`unloadName${index}`); + this.validateForm1.removeControl(`unloadPhone${index}`); + }); + + let item = this.startInfo; + this.startInfo = this.endInfo; + this.endInfo = item; + + this.startInfo.forEach((element: any, index: any) => { + element.type = '1'; + this.validateForm1.addControl(`loadAddress${index}`, new FormControl(null, Validators.required)); + this.validateForm1.addControl(`loadName${index}`, new FormControl(null, Validators.required)); + this.validateForm1.addControl(`loadPhone${index}`, new FormControl(null, [Validators.required, Validators.pattern('^[0-9]*$')])); + }); + this.endInfo.forEach((element: any, index: any) => { + element.type = '2'; + this.validateForm1.addControl(`unloadAddress${index}`, new FormControl(null, Validators.required)); + this.validateForm1.addControl(`unloadName${index}`, new FormControl(null, Validators.required)); + this.validateForm1.addControl(`unloadPhone${index}`, new FormControl(null, [Validators.required, Validators.pattern('^[0-9]*$')])); + }); + // 计算里程，时间 + if (this.startInfo[0]?.area && this.endInfo[0]?.area) { + this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => { + this.totalDistance = res.distance; + this.totalTime = res.time; + }); + } + } } 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 0bf4285d..89fc5b4b 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 @@ -1024,6 +1024,13 @@ export class SupplyManagementBulkPublishComponent implements OnInit { if (this.PageStatus === '大宗修改') { this.sf4data.id = res?.goodsInfoVOList[0]?.id; } + // 计算里程，时间 + if (this.startInfo[0]?.area && this.endInfo[0]?.area) { + this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => { + this.totalDistance = res.distance; + this.totalTime = res.time; + }); + } this.totalFees = res?.freightPrice || '0'; this.sf7data = { stateReceipt: res?.stateReceipt, From b721df986abe9a2b58a174dc333ca8d530defa92 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 4 Mar 2022 13:36:29 +0800 Subject: [PATCH 24/42] fix bug --- .../components/bulk-detail/bulk-detail.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html index 2380b6c0..d6f322e9 100644 --- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-06 20:20:26 * @LastEditors : Shiming - * @LastEditTime : 2022-03-04 10:04:11 + * @LastEditTime : 2022-03-04 13:36:21 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -44,7 +44,7 @@ {{ i?.goodsResource?.shipperAppUserName }} {{ i?.goodsResource?.enterpriseProjectName }} {{ i?.goodsResource?.serviceTypeLabel }} - {{ i?.goodsResource?.createUserName }} /{{ i?.goodsResource?.createUserPhone }} + {{ i?.createUserName }} /{{ i?.createUserPhone }} {{ i?.goodsResource?.dispatchName }}/{{ i?.goodsResource?.dispatchPhone }}
From 52f0f576acc91b8ae0223e4cc12107478d0631c7 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 4 Mar 2022 13:37:44 +0800 Subject: [PATCH 25/42] fix bug --- .../components/bulk-detail/bulk-detail.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html index d6f322e9..c57e1b44 100644 --- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-06 20:20:26 * @LastEditors : Shiming - * @LastEditTime : 2022-03-04 13:36:21 + * @LastEditTime : 2022-03-04 13:37:32 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -90,7 +90,7 @@ {{ i?.unloadPlanTime }} - {{ i?.acceptWeight }}吨,{{ i?.acceptVolume }}方,{{ i?.acceptNumber }}件 + {{ i?.acceptWeight }}吨,{{ i?.acceptVolume }}方 {{ i?.acceptWeight }}吨,{{ i?.acceptVolume }}方,{{ i?.acceptNumber }}件 {{ i?.settlementWeight }}吨,{{ i?.settlementVolume }}方,{{ i?.acceptNumber }}件 From 0270e41c4a2300897667180bcd1b00067145bfe7 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 4 Mar 2022 13:40:25 +0800 Subject: [PATCH 26/42] fix bug --- .../components/bulk-detail/bulk-detail.component.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html index c57e1b44..c6d790fb 100644 --- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-06 20:20:26 * @LastEditors : Shiming - * @LastEditTime : 2022-03-04 13:37:32 + * @LastEditTime : 2022-03-04 13:40:09 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -164,10 +164,10 @@ - + - + From 9bc65559a10a47bbf29b9dea042c0acac5c5929b Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 4 Mar 2022 13:53:09 +0800 Subject: [PATCH 27/42] fix bug --- .../bulk-detail-change/bulk-detail-change.component.html | 7 ++++--- .../bulk-detail-change/bulk-detail-change.component.ts | 6 +++--- .../components/bulk-detail/bulk-detail.component.ts | 2 -- 3 files changed, 7 insertions(+), 8 deletions(-) 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 0e98b137..f2a6e57e 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-03-04 13:33:51 + * @LastEditTime : 2022-03-04 13:53:06 * @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. --> @@ -262,8 +262,9 @@ -

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

- +

{{i?.goodsInfoList?.[0]?.freightPrice}}{{i?.goodsInfoList?.[0]?.freightTypeLabel}}（{{ i?.goodsInfoList?.[0]?.settlementBasisLabel ? i?.goodsInfoList?.[0]?.settlementBasisLabel + '，' :' ' }}{{i?.goodsInfoList?.[0]?.ruleLabel}}）

+ + 到付 {{ item.price | currency }} 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 8569a071..ffe86843 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-03-04 13:26:50 + * @LastEditTime : 2022-03-04 13:53:04 * @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. */ @@ -66,6 +66,7 @@ loadTime: any; // 货源单设置回显 @ViewChild('sf4', { static: false }) sf4!: SFComponent; schema4: SFSchema = {}; isVisible = false; + billExpenses: any[] = []; //运费信息表格信息 ui4!: SFUISchema; formData: any; @ViewChild('sf', { static: false }) sf!: SFComponent; @@ -319,8 +320,7 @@ loadTime: any; // 货源单设置回显 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]; + this.billExpenses = this.i?.billExpenseDetails?.filter((data: any) => data.expenseCode === 'TRA'); // 对装货凭证进行初始化 let arr : any= [] res?.receiptFilePath.forEach((element: any, index: any) => { diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts index 69355b52..56d51e8b 100644 --- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts +++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts @@ -71,9 +71,7 @@ export class OrderManagementBulkeDetailComponent implements OnInit { this.service.request(this.service.$api_getBulkBillDetail, { id: this.id }).subscribe(res => { if (res) { this.i = res; - console.log(this.i.billExpenseDetails ) this.billExpenses = this.i?.billExpenseDetails?.filter((data: any) => data.expenseCode === 'TRA'); - console.log(this.billExpenses ) this.i.scheduleVOList = this.i?.scheduleVOList?.filter((data:any)=>data.displayStatus !=="HIDE"); } }); From 7463eb642530566f666ca0c3c29b33f49961b762 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 4 Mar 2022 14:07:58 +0800 Subject: [PATCH 28/42] fix bug --- .../bulk-detail-change/bulk-detail-change.component.html | 8 +++++--- .../components/bulk-detail/bulk-detail.component.html | 4 +++- 2 files changed, 8 insertions(+), 4 deletions(-) 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 f2a6e57e..d21d0098 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-03-04 13:53:06 + * @LastEditTime : 2022-03-04 14:06:28 * @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. --> @@ -42,7 +42,7 @@ - + @@ -261,7 +261,8 @@ - + +

{{i?.goodsInfoList?.[0]?.freightPrice}}{{i?.goodsInfoList?.[0]?.freightTypeLabel}}（{{ i?.goodsInfoList?.[0]?.settlementBasisLabel ? i?.goodsInfoList?.[0]?.settlementBasisLabel + '，' :' ' }}{{i?.goodsInfoList?.[0]?.ruleLabel}}）

到付 @@ -279,6 +280,7 @@
收款人：{{ i?.payeeName }}/{{ i?.payeePhone }}
+ diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html index c6d790fb..7dd7c9c7 100644 --- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-06 20:20:26 * @LastEditors : Shiming - * @LastEditTime : 2022-03-04 13:40:09 + * @LastEditTime : 2022-03-04 14:07:44 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -135,6 +135,7 @@ +

{{i?.goodsInfoList?.[0]?.freightPrice}}{{i?.goodsInfoList?.[0]?.freightTypeLabel}}（{{ i?.goodsInfoList?.[0]?.settlementBasisLabel ? i?.goodsInfoList?.[0]?.settlementBasisLabel + '，' :' ' }}{{i?.goodsInfoList?.[0]?.ruleLabel}}）

到付 @@ -152,6 +153,7 @@
收款人：{{ i?.payeeName }}/{{ i?.payeePhone }}
+ From 3387c37e6a865b6ae698f91777c90d070cbaec70 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 4 Mar 2022 14:15:33 +0800 Subject: [PATCH 29/42] fix bug --- .../bulk-detail-change.component.html | 28 ++++++---- .../bulk-detail-change.component.ts | 51 ++++++++++++------- .../bulk-detail/bulk-detail.component.ts | 19 +------ 3 files changed, 52 insertions(+), 46 deletions(-) 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 d21d0098..de563b7b 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-03-04 14:06:28 + * @LastEditTime : 2022-03-04 14:15:24 * @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. --> @@ -345,17 +345,23 @@
- -
-
- -
-
- -
-
+ +
+
+ + +
+
+ +
+
+ + + + + +
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 ffe86843..8de03795 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-03-04 13:53:04 + * @LastEditTime : 2022-03-04 14:15:21 * @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. */ @@ -22,6 +22,7 @@ import { NzUploadChangeParam, NzUploadFile } from 'ng-zorro-antd/upload'; import { Observable, Observer } from 'rxjs'; import { apiConf } from '@conf/api.conf'; import { OrderManagementService } from '../../services/order-management.service'; +import format from 'date-fns/format'; import { NzCardComponent } from 'ng-zorro-antd/card'; import { map } from 'rxjs/operators'; function getBase64(file: File): Promise { @@ -40,7 +41,9 @@ function getBase64(file: File): Promise { export class OrderManagementBulkDetailChangeComponent implements OnInit { validateForm1: FormGroup; id = this.route.snapshot.params.id; + trajectory = 'car'; @ViewChild('distannce3', { static: false }) + MapList: any[]=[]; i: any= {unLoadingPlaceList:[]}; totalDistance = 0.0; //总里程 totalTime = 0.0; //路程总时间 @@ -67,29 +70,15 @@ loadTime: any; // 货源单设置回显 schema4: SFSchema = {}; isVisible = false; billExpenses: any[] = []; //运费信息表格信息 + addressItems: any[] = []; //打点地址数据组 ui4!: SFUISchema; formData: any; @ViewChild('sf', { static: false }) sf!: SFComponent; schema: SFSchema = {}; ui: SFUISchema = {}; logColumns: STColumn[] = [ - { title: '款项', index: 'expenseName' }, - { title: '运输费（元）', render: 'price' }, - { title: '附加费（元）', render: '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' } - } - } + { title: '时间', index: 'vinOutTime' }, + { title: '地点', index: 'cityName' }, ]; constructor( private route: ActivatedRoute, @@ -889,4 +878,30 @@ goDistance(elf: NzCardComponent) { }); } } + // 获取轨迹 + MapInit() { + this.service.request(this.service.$api_get_getTrajectory, { id: this.id }).subscribe(res => { + if (res) { + const points = res.trackArray; + let list :any[] = []; + points?.forEach((item: any) => { + list.push({ + name: item.hgt, + lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))] + }); + }); + this.MapList = list; + this.addressItems = res.parkArray; + if(this.addressItems && this.addressItems.length > 0){ + this.addressItems.forEach(item => { + item.vinOutTime = this.getLocalTime(item.vinOutTime); + }); + } + } + }); + } + + getLocalTime(time: any) { + return format(new Date(parseInt(time)), 'yyyy-MM-dd HH:mm:ss'); + } } diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts index 56d51e8b..ff871426 100644 --- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts +++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts @@ -34,23 +34,8 @@ export class OrderManagementBulkeDetailComponent implements OnInit { attObj: any; isVisible = false; logColumns: STColumn[] = [ - { title: '款项', index: 'costName', render: 'PriceType' }, - { title: '运输费（元）', render: 'price' }, - { title: '附加费（元）', render: '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' } - } - } + { title: '时间', index: 'vinOutTime' }, + { title: '地点', index: 'cityName' }, ]; trajectory = 'car'; addressItems: any[] = []; //打点地址数据组 From 021ce61aca1db6af2a67337b39e757cbcce6d8a5 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 4 Mar 2022 14:24:40 +0800 Subject: [PATCH 30/42] fix bug --- .../routes/order-management/components/bulk/bulk.component.ts | 2 +- .../order-management/components/vehicle/vehicle.component.ts | 2 +- .../usercenter/components/driver/detail/detail.component.ts | 2 +- .../components/freight/list/detail/detail.component.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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 4652ed26..5e54ff7d 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.ts +++ b/src/app/routes/order-management/components/bulk/bulk.component.ts @@ -690,7 +690,7 @@ export class OrderManagementBulkComponent implements OnInit { }; const params2 = { businessCode: item.billCode, - passiveUserId: item.shipperAppUserId + evaluateUserId: item.shipperAppUserId }; this.service.request(this.service.$api_getBillEvaluateByShipper, params).subscribe(res => { console.log(res); diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.ts b/src/app/routes/order-management/components/vehicle/vehicle.component.ts index 69ef767a..7e4d5bbf 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts @@ -664,7 +664,7 @@ resourceStatus: any; } const params2 = { businessCode: item.billCode, - passiveUserId: item.shipperAppUserId, + evaluateUserId: item.shipperAppUserId, } this.service.request(this.service.$api_getBillEvaluateByShipper, params).subscribe(res => { console.log(res) diff --git a/src/app/routes/usercenter/components/driver/detail/detail.component.ts b/src/app/routes/usercenter/components/driver/detail/detail.component.ts index bb13924b..5f3ef903 100644 --- a/src/app/routes/usercenter/components/driver/detail/detail.component.ts +++ b/src/app/routes/usercenter/components/driver/detail/detail.component.ts @@ -126,7 +126,7 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit { }); // 获取评价信息 this.service - .request(this.service.$api_get_driver_billEvaluate, { passiveUserId: this.route.snapshot.params.id }, 'POST', false) + .request(this.service.$api_get_driver_billEvaluate, { evaluateUserId: this.route.snapshot.params.id }, 'POST', false) .subscribe(res => { if (res) { this.billEvaluateList = res; diff --git a/src/app/routes/usercenter/components/freight/list/detail/detail.component.ts b/src/app/routes/usercenter/components/freight/list/detail/detail.component.ts index 685c46ab..50d6da03 100644 --- a/src/app/routes/usercenter/components/freight/list/detail/detail.component.ts +++ b/src/app/routes/usercenter/components/freight/list/detail/detail.component.ts @@ -109,7 +109,7 @@ export class FreightComponentsListDetailComponent implements OnInit, OnDestroy { // 获取评价信息 this.service - .request(this.service.$api_get_driver_billEvaluate, { passiveUserId: this.route.snapshot.params.id }, 'POST', false) + .request(this.service.$api_get_driver_billEvaluate, { evaluateUserId: this.route.snapshot.params.id }, 'POST', false) .subscribe(res => { if (res?.length > 0) { this.service.request(this.service.$api_get_freight_billEvaluate, res).subscribe(billEvaluate => { From c32f0ea95be578e0c0a7dad43184a5169464a259 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 4 Mar 2022 14:25:43 +0800 Subject: [PATCH 31/42] fix bug --- .../usercenter/components/driver/detail/detail.component.ts | 2 +- .../components/freight/list/detail/detail.component.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/routes/usercenter/components/driver/detail/detail.component.ts b/src/app/routes/usercenter/components/driver/detail/detail.component.ts index 5f3ef903..bb13924b 100644 --- a/src/app/routes/usercenter/components/driver/detail/detail.component.ts +++ b/src/app/routes/usercenter/components/driver/detail/detail.component.ts @@ -126,7 +126,7 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit { }); // 获取评价信息 this.service - .request(this.service.$api_get_driver_billEvaluate, { evaluateUserId: this.route.snapshot.params.id }, 'POST', false) + .request(this.service.$api_get_driver_billEvaluate, { passiveUserId: this.route.snapshot.params.id }, 'POST', false) .subscribe(res => { if (res) { this.billEvaluateList = res; diff --git a/src/app/routes/usercenter/components/freight/list/detail/detail.component.ts b/src/app/routes/usercenter/components/freight/list/detail/detail.component.ts index 50d6da03..685c46ab 100644 --- a/src/app/routes/usercenter/components/freight/list/detail/detail.component.ts +++ b/src/app/routes/usercenter/components/freight/list/detail/detail.component.ts @@ -109,7 +109,7 @@ export class FreightComponentsListDetailComponent implements OnInit, OnDestroy { // 获取评价信息 this.service - .request(this.service.$api_get_driver_billEvaluate, { evaluateUserId: this.route.snapshot.params.id }, 'POST', false) + .request(this.service.$api_get_driver_billEvaluate, { passiveUserId: this.route.snapshot.params.id }, 'POST', false) .subscribe(res => { if (res?.length > 0) { this.service.request(this.service.$api_get_freight_billEvaluate, res).subscribe(billEvaluate => { From 05b878ddcd04160fe31ccd83dcf529e8f711592a Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 4 Mar 2022 14:35:32 +0800 Subject: [PATCH 32/42] fix bug --- .../update-price/update-price.component.html | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) 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 43523177..34fbb438 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 @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-03 11:10:14 * @LastEditors : Shiming - * @LastEditTime : 2022-02-16 15:02:33 + * @LastEditTime : 2022-03-04 14:34:57 * @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\update-price\\update-price.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -25,12 +25,22 @@

变更日志

- + + + + + {{item?.operator}}/{{item.telephone}} + +
{{ freightType[i?.freightType] }} From 07553918d0fc0abac06210f8c5c52f8a0ca391b0 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Fri, 4 Mar 2022 14:56:56 +0800 Subject: [PATCH 33/42] edit --- .../vehicle-detail-change.component.html | 4 +-- .../vehicle-detail-change.component.ts | 23 +++++++------- .../amap-poi-picker.component.ts | 30 ++++++++++++++----- 3 files changed, 36 insertions(+), 21 deletions(-) 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 1901a4c1..37eae198 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 @@ -75,7 +75,7 @@ { - this.totalDistance = res.distance; - this.totalTime = res.time; - }); - } + // 计算里程，时间 + if (this.startInfo?.[0]?.area && this.endInfo?.[0]?.area) { + this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => { + this.totalDistance = res.distance; + this.totalTime = res.time; + }); + } } }); } @@ -560,12 +560,13 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit { } // -------------------装卸货信息处理 // 打开地图 - openMap(type: string, index: number) { + openMap(type: string, index: number, address: string) { console.log(type); console.log(index); - + const modalRef = this.modalService.create({ nzTitle: '', + nzComponentParams: { selectedAddress: address }, nzContent: AmapPoiPickerComponent, nzWidth: 900, nzOnOk: item => { @@ -883,8 +884,8 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit { } console.log(elf); } - // 装卸货地址互换 - swapAddress() { + // 装卸货地址互换 + swapAddress() { this.startInfo.forEach((element: any, index: any) => { this.validateForm1.removeControl(`loadAddress${index}`); this.validateForm1.removeControl(`loadName${index}`); diff --git a/src/app/shared/components/amap/amap-poi-picker/amap-poi-picker.component.ts b/src/app/shared/components/amap/amap-poi-picker/amap-poi-picker.component.ts index fb9441d3..1394a6ca 100644 --- a/src/app/shared/components/amap/amap-poi-picker/amap-poi-picker.component.ts +++ b/src/app/shared/components/amap/amap-poi-picker/amap-poi-picker.component.ts @@ -1,5 +1,5 @@ import AMapLoader from '@amap/amap-jsapi-loader'; -import { Component, OnInit, ViewChild } from '@angular/core'; +import { ChangeDetectorRef, Component, Input, OnInit, ViewChild } from '@angular/core'; import { amapConf } from '@conf/amap.config'; import { NzModalRef } from 'ng-zorro-antd/modal'; import { throwError } from 'rxjs'; @@ -27,7 +27,10 @@ export class AmapPoiPickerComponent implements OnInit { infoWindow: any; geocoder: any; - constructor(private modalRef: NzModalRef, private service: AmapService) {} + @Input() + selectedAddress!: string; + + constructor(private modalRef: NzModalRef, private service: AmapService, private cdr: ChangeDetectorRef) {} ngOnInit(): void { this.mapInit(); // this.PoiPicker(); @@ -77,6 +80,8 @@ export class AmapPoiPickerComponent implements OnInit { // 地图创建成功 this.aMap.on('complete', () => { + console.log('地图创建成功'); + this.cdr.detectChanges(); this.poiPickerReady(poiPicker); }); @@ -113,12 +118,21 @@ export class AmapPoiPickerComponent implements OnInit { radius: 1000 //范围，默认：500 }); - // 获取当前定位 - this.service.getCurrentPosition().subscribe(res => { - if (res) { - this.selectedPOI(res.position); - } - }); + if (this.selectedAddress) { + this.geocoder.getLocation(this.selectedAddress, (status: any, result: any) => { + if (status === 'complete' && result.info === 'OK') { + // result中对应详细地理坐标信息 + this.selectedPOI(result.geocodes?.[0].location); + } + }); + } else { + // 获取当前定位 + this.service.getCurrentPosition().subscribe(res => { + if (res) { + this.selectedPOI(res.position); + } + }); + } //选取了某个POI poiPicker.on('poiPicked', (poiResult: any) => { From 2c46fd77bd2956f7c929082ac8c887ac0aa8e1af Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 4 Mar 2022 15:08:30 +0800 Subject: [PATCH 34/42] fix bug --- .../modify-rate/modify-rate.component.html | 10 +++ .../modify-rate/modify-rate.component.ts | 15 +++- .../bulk-detail/bulk-detail.component.html | 2 +- .../onecar-publish.component.html | 17 ++-- .../onecar-publish.component.ts | 90 +++++++++++-------- .../release-publish.component.html | 16 ++-- .../release-publish.component.ts | 73 +++++++++------ .../update-price/update-price.component.html | 9 +- .../vehicle-detail.component.html | 2 +- 9 files changed, 143 insertions(+), 91 deletions(-) diff --git a/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.html b/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.html index fb348ad7..fa6106e2 100644 --- a/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.html +++ b/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.html @@ -10,6 +10,16 @@ --> + + + + {{item?.operator}}/{{item.telephone}} + +
diff --git a/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.ts b/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.ts index cf23c82c..2a3c201b 100644 --- a/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.ts +++ b/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.ts @@ -4,12 +4,13 @@ * @Author : Shiming * @Date : 2021-12-29 14:51:07 * @LastEditors : Shiming - * @LastEditTime : 2022-02-24 11:10:33 + * @LastEditTime : 2022-03-04 14:45:58 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\modify-rate\\modify-rate.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ import { Component, Input, OnInit, ViewChild } from '@angular/core'; +import { STColumn } from '@delon/abc/st'; import { SFComponent, SFNumberWidgetSchema, SFSchema, SFUISchema } from '@delon/form'; import { NzMessageService } from 'ng-zorro-antd/message'; import { NzModalRef } from 'ng-zorro-antd/modal'; @@ -24,7 +25,11 @@ export class VehicleModifyRateComponent implements OnInit { @ViewChild('sf', { static: false }) sf!: SFComponent; schema: SFSchema = {}; ui: SFUISchema = {}; - + columns: STColumn[] = [ + { title: '内容', index: 'operationContent' }, + { title: '操作人', index: 'operator' }, + { title: '操作时间', index: 'operatorTimestamp' }, + ]; aggreechecked = false; @Input() @@ -36,6 +41,12 @@ export class VehicleModifyRateComponent implements OnInit { console.log(this.data); this.initSF(); } + get reqParams() { + return { + // operateObject: this.i?.resourceCode, + // operateType: 4, + }; + } initSF() { this.schema = { properties: { 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 5d118b1f..21a1b485 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 @@ -171,7 +171,7 @@ 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 ee5b6177..a3fc1b2d 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 @@ -228,13 +228,15 @@ -
服务信息
- + + + + 推荐投保，填写货值自动估保费，司机接单后不可退保。详见《投保告知》 @@ -243,10 +245,10 @@
@@ -258,9 +260,10 @@ >

注意事项:

-

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

-

②港澳台、西藏不在投保范围内，不予承保

-

③保价费最低收费2元，请按真实货值填写，录入的所有信息必须确保真实，不如实录入的内容，不承担对应赔偿责任。

+

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

+

②香港、澳门、台湾、西藏、新疆不在投保范围内，不予承保；

+

③最低保费12元/每单；单次运输保额仅限200万元以内；

+

④本保险只限于货物起运前投保，起运后投保无效，保险人不负赔偿责任;
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 bb53ace9..b2ee178e 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 @@ -411,7 +411,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { properties: { insuranceType: { type: 'string', - title: '增值服务套餐', + title: '服务包', ui: { widget: 'select', asyncData: () => { @@ -419,10 +419,15 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { map((res: any) => { return [...res]; }) - ); + ) }, change: (tag: any, org: any) => { - this.getInsurersPrice(tag); + if(tag === '3'){ + this.sf5.setValue('/insurancePremium', null); + this.sf5.setValue('/insuranceRate', null); + }else { + this.getInsurersPrice(tag); + } } }, default: '3' @@ -430,31 +435,39 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { type1: { type: 'string', title: '', - enum: ['车辆实时定位', '轨迹查询', '数据保护', '赠送基本险'], + enum: ['资源曝光率 +10', '车源匹配率 +10'], + readOnly: true, + ui: { + widget: 'checkbox', + visibleIf: { insuranceType: (value: string) => value === '0' } + } as SFCheckboxWidgetSchema, + default: ['资源曝光率 +10', '车源匹配率 +10'] + }, + type2: { + type: 'string', + title: '', + enum: ['资源曝光率 +20', '车源匹配率 +20'], readOnly: true, ui: { widget: 'checkbox', visibleIf: { insuranceType: (value: string) => value === '1' } } as SFCheckboxWidgetSchema, - default: ['车辆实时定位', '轨迹查询', '数据保护', '赠送基本险'] + default: ['资源曝光率 +20', '车源匹配率 +20'] }, - type2: { + freeInsurance1: { type: 'string', - title: '', - enum: ['车辆实时定位', '轨迹查询', '数据保护', '专属技术服务', '赠送综合险'], - readOnly: true, - ui: { - widget: 'checkbox', - visibleIf: { insuranceType: (value: string) => value === '2' } - } as SFCheckboxWidgetSchema, - default: ['车辆实时定位', '轨迹查询', '数据保护', '专属技术服务', '赠送综合险'] - }, - freeInsurance: { - type: 'string', - title: '赠送保险', + title: '赠送基本险', ui: { widget: 'custom', - visibleIf: { insuranceType: (value: string) => value !== '3' } + visibleIf: { insuranceType: (value: string) => value === '0' } + } + }, + freeInsurance2: { + type: 'string', + title: '赠送综合险', + ui: { + widget: 'custom', + visibleIf: { insuranceType: (value: string) => value === '1' } } }, insurancePackagedGoods: { @@ -480,7 +493,6 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { title: '货物价值', ui: { widget: 'custom', - descriptionI18n: '输入50000-3000000之间数值', visibleIf: { insuranceType: (value: string) => value !== '3' } } }, @@ -514,7 +526,10 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { $type2: { grid: { span: 24 } }, - $freeInsurance: { + $freeInsurance1: { + grid: { span: 24 } + }, + $freeInsurance2: { grid: { span: 24 } } }; @@ -1199,13 +1214,14 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { this.validateForm1.addControl(`unloadPhone${controlId}`, new FormControl(null, Validators.required)); } - // 计算里程，时间 - if (this.startInfo?.[0]?.area && this.endInfo?.[0]?.area) { - this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => { - this.totalDistance = res.distance; - this.totalTime = res.time; - }); - } + // 计算里程，时间 + if (this.startInfo[0]?.detailedAddress && this.endInfo[0]?.detailedAddress) { + this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => { + this.totalDistance = res.distance; + this.totalTime = res.time; + this.getInsurersPrice(); //计算保费金额 + }); + } }); this.sf3data = { @@ -1314,14 +1330,14 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { default: break; } - // 计算里程，时间 - if (this.startInfo[0]?.area && this.endInfo[0]?.area) { - this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => { - this.totalDistance = res.distance; - this.totalTime = res.time; - this.getInsurersPrice(); //计算保费金额 - }); - } + // 计算里程，时间 + if (this.startInfo[0]?.detailedAddress && this.endInfo[0]?.detailedAddress) { + this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => { + this.totalDistance = res.distance; + this.totalTime = res.time; + this.getInsurersPrice(); //计算保费金额 + }); + } } }); } @@ -1365,7 +1381,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { this.validateForm1.addControl(`unloadPhone${index}`, new FormControl(null, [Validators.required, Validators.pattern('^[0-9]*$')])); }); // 计算里程，时间 - if (this.startInfo[0]?.area && this.endInfo[0]?.area) { + if (this.startInfo[0]?.detailedAddress && this.endInfo[0]?.detailedAddress) { this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => { this.totalDistance = res.distance; this.totalTime = res.time; 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 0a0bbca3..5981b49e 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 @@ -238,7 +238,10 @@
- + + + + 推荐投保，填写货值自动估保费，司机接单后不可退保。详见《投保告知》 @@ -247,10 +250,10 @@
@@ -262,9 +265,10 @@ >

注意事项:

-

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

-

②港澳台、西藏不在投保范围内，不予承保

-

③保价费最低收费2元，请按真实货值填写，录入的所有信息必须确保真实，不如实录入的内容，不承担对应赔偿责任。

+

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

+

②香港、澳门、台湾、西藏、新疆不在投保范围内，不予承保；

+

③最低保费12元/每单；单次运输保额仅限200万元以内；

+

④本保险只限于货物起运前投保，起运后投保无效，保险人不负赔偿责任;
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 69b40452..6db5bdf8 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 @@ -411,7 +411,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit { properties: { insuranceType: { type: 'string', - title: '增值服务套餐', + title: '服务包', ui: { widget: 'select', asyncData: () => { @@ -419,10 +419,15 @@ export class SupplyManagementReleasePublishComponent implements OnInit { map((res: any) => { return [...res]; }) - ); + ) }, change: (tag: any, org: any) => { - this.getInsurersPrice(tag); + if(tag === '3'){ + this.sf5.setValue('/insurancePremium', null); + this.sf5.setValue('/insuranceRate', null); + }else { + this.getInsurersPrice(tag); + } } }, default: '3' @@ -430,31 +435,39 @@ export class SupplyManagementReleasePublishComponent implements OnInit { type1: { type: 'string', title: '', - enum: ['车辆实时定位', '轨迹查询', '数据保护', '赠送基本险'], + enum: ['资源曝光率 +10', '车源匹配率 +10'], + readOnly: true, + ui: { + widget: 'checkbox', + visibleIf: { insuranceType: (value: string) => value === '0' } + } as SFCheckboxWidgetSchema, + default: ['资源曝光率 +10', '车源匹配率 +10'] + }, + type2: { + type: 'string', + title: '', + enum: ['资源曝光率 +20', '车源匹配率 +20'], readOnly: true, ui: { widget: 'checkbox', visibleIf: { insuranceType: (value: string) => value === '1' } } as SFCheckboxWidgetSchema, - default: ['车辆实时定位', '轨迹查询', '数据保护', '赠送基本险'] + default: ['资源曝光率 +20', '车源匹配率 +20'] }, - type2: { + freeInsurance1: { type: 'string', - title: '', - enum: ['车辆实时定位', '轨迹查询', '数据保护', '专属技术服务', '赠送综合险'], - readOnly: true, - ui: { - widget: 'checkbox', - visibleIf: { insuranceType: (value: string) => value === '2' } - } as SFCheckboxWidgetSchema, - default: ['车辆实时定位', '轨迹查询', '数据保护', '专属技术服务', '赠送综合险'] - }, - freeInsurance: { - type: 'string', - title: '赠送保险', + title: '赠送基本险', ui: { widget: 'custom', - visibleIf: { insuranceType: (value: string) => value !== '3' } + visibleIf: { insuranceType: (value: string) => value === '0' } + } + }, + freeInsurance2: { + type: 'string', + title: '赠送综合险', + ui: { + widget: 'custom', + visibleIf: { insuranceType: (value: string) => value === '1' } } }, insurancePackagedGoods: { @@ -480,7 +493,6 @@ export class SupplyManagementReleasePublishComponent implements OnInit { title: '货物价值', ui: { widget: 'custom', - descriptionI18n: '输入50000-3000000之间数值', visibleIf: { insuranceType: (value: string) => value !== '3' } } }, @@ -514,7 +526,10 @@ export class SupplyManagementReleasePublishComponent implements OnInit { $type2: { grid: { span: 24 } }, - $freeInsurance: { + $freeInsurance1: { + grid: { span: 24 } + }, + $freeInsurance2: { grid: { span: 24 } } }; @@ -1176,14 +1191,14 @@ export class SupplyManagementReleasePublishComponent implements OnInit { this.validateForm1.addControl(`unloadName${index}`, new FormControl(null, Validators.required)); this.validateForm1.addControl(`unloadPhone${index}`, new FormControl(null, [Validators.required, Validators.pattern('^[0-9]*$')])); }); - // 计算里程，时间 - if (this.startInfo[0]?.area && this.endInfo[0]?.area) { - this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => { - this.totalDistance = res.distance; - this.totalTime = res.time; - this.getInsurersPrice(); //计算保费金额 - }); - } + // 计算里程，时间 + if (this.startInfo[0]?.detailedAddress && this.endInfo[0]?.detailedAddress) { + this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => { + this.totalDistance = res.distance; + this.totalTime = res.time; + this.getInsurersPrice(); //计算保费金额 + }); + } } // 计算保价费金额 getInsurersPrice(insuranceType = this.sf5.value.insuranceType) { 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 34fbb438..490015a8 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 @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-03 11:10:14 * @LastEditors : Shiming - * @LastEditTime : 2022-03-04 14:34:57 + * @LastEditTime : 2022-03-04 14:37:19 * @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\update-price\\update-price.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -25,18 +25,11 @@

变更日志

- - {{item?.operator}}/{{item.telephone}} diff --git a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html index 0d9643ed..9429b4ee 100644 --- a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html +++ b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html @@ -213,7 +213,7 @@ From ea95821644aa9aada1030c422a09ed1a19eb0c88 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 4 Mar 2022 15:12:13 +0800 Subject: [PATCH 35/42] fix bug --- .../bulk-publish/bulk-publish.component.ts | 18 +++++++++--------- .../bulk-release-publish.component.ts | 14 +++++++------- 2 files changed, 16 insertions(+), 16 deletions(-) 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 89fc5b4b..07b45ea3 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 @@ -1024,8 +1024,8 @@ export class SupplyManagementBulkPublishComponent implements OnInit { if (this.PageStatus === '大宗修改') { this.sf4data.id = res?.goodsInfoVOList[0]?.id; } - // 计算里程，时间 - if (this.startInfo[0]?.area && this.endInfo[0]?.area) { + // 计算里程，时间 + if (this.startInfo[0]?.detailedAddress && this.endInfo[0]?.detailedAddress) { this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => { this.totalDistance = res.distance; this.totalTime = res.time; @@ -1103,13 +1103,13 @@ export class SupplyManagementBulkPublishComponent implements OnInit { element.type = '2'; }); - // 计算里程，时间 - if (this.startInfo[0]?.area && this.endInfo[0]?.area) { - this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => { - this.totalDistance = res.distance; - this.totalTime = res.time; - }); - } + // 计算里程，时间 + if (this.startInfo[0]?.detailedAddress && this.endInfo[0]?.detailedAddress) { + this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => { + this.totalDistance = res.distance; + this.totalTime = res.time; + }); + } } getLimitvalue() { const getlimitvaluesParms = [ diff --git a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts index 53858ad0..9804987e 100644 --- a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts +++ b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts @@ -839,13 +839,13 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit { element.type = '2'; }); - // 计算里程，时间 - if (this.startInfo[0]?.area && this.endInfo[0]?.area) { - this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => { - this.totalDistance = res.distance; - this.totalTime = res.time; - }); - } + // 计算里程，时间 + if (this.startInfo[0]?.detailedAddress && this.endInfo[0]?.detailedAddress) { + this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => { + this.totalDistance = res.distance; + this.totalTime = res.time; + }); + } } getLimitvalue() { const getlimitvaluesParms = [ From 17ce3dd48137edc42003a7d409b9d4da94493d5b Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Fri, 4 Mar 2022 15:14:03 +0800 Subject: [PATCH 36/42] edit --- .../invoice-detail/invoice-detail.component.ts | 4 +++- .../invoiced-list/invoiced-list.component.ts | 2 +- .../freight-config/freight-config.component.ts | 18 +++++++++--------- .../amap-poi-picker.component.ts | 2 -- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts index 6aaf5fb1..43a99ec8 100644 --- a/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts +++ b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts @@ -38,9 +38,11 @@ export class InvoiceDetailComponent implements OnInit { routes: [] }; id: any = null; + type: any = 1; constructor(public service: TicketService, private route: ActivatedRoute) { this.isCanEdit = !!route.snapshot.queryParams.type; const expressno = route.snapshot.queryParams.expressno; + this.type = route.snapshot.queryParams.type; this.id = route.snapshot.params.id; this.loadInvoiceHeader(this.id); if (expressno) { @@ -156,7 +158,7 @@ export class InvoiceDetailComponent implements OnInit { width: 120, type: 'widget', className: 'text-right', - widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.billkpnotax }) } + widget: { type: 'currency-chy', params: ({ record }) => ({ value: this.type ==='2'?record.billkpmoney: record.billkpnotax }) } }, { title: '运输费', diff --git a/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts b/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts index 72b2c26b..9d4c337e 100644 --- a/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts +++ b/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts @@ -242,7 +242,7 @@ export class InvoicedListComponent implements OnInit { text: '查看明细', click: item => this.router.navigate(['/ticket/invoice-list/detail/' + item.id], { - queryParams: { expressno: item.expressno } + queryParams: { expressno: item.expressno, type: 2 } }) }, { diff --git a/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts b/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts index 6f115213..c9fa67f7 100644 --- a/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts +++ b/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts @@ -270,21 +270,21 @@ export class FreightConfigComponent implements OnInit { { title: '货源单费率', className: 'text-right', - index: 'contractSurchargeRatio', - width: 130, - format: item => `${item.contractSurchargeRatio}%` - }, - { - title: '合同单费率', - className: 'text-right', index: 'goodsSurchargeRatio', width: 130, format: item => `${item.goodsSurchargeRatio}%` }, + { + title: '合同单费率', + className: 'text-right', + index: 'contractSurchargeRatio', + width: 130, + format: item => `${item.contractSurchargeRatio}%` + }, { title: '合同单业务量（元）', index: 'contractQuota', - width: 160, + width: 170, type: 'widget', className: 'text-right', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.contractQuota }) } @@ -292,7 +292,7 @@ export class FreightConfigComponent implements OnInit { { title: '货源单业务量（元）', index: 'goodsQuota', - width: 160, + width: 170, type: 'widget', className: 'text-right', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.goodsQuota }) } diff --git a/src/app/shared/components/amap/amap-poi-picker/amap-poi-picker.component.ts b/src/app/shared/components/amap/amap-poi-picker/amap-poi-picker.component.ts index 1394a6ca..3dd17484 100644 --- a/src/app/shared/components/amap/amap-poi-picker/amap-poi-picker.component.ts +++ b/src/app/shared/components/amap/amap-poi-picker/amap-poi-picker.component.ts @@ -86,8 +86,6 @@ export class AmapPoiPickerComponent implements OnInit { }); this.aMap.on('click', (e: any) => { - console.log(e); - this.selectedPOI(e.lnglat); }); }) From dabe8ba00ed2d4fd60821e75f24898cd8df374f9 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Fri, 4 Mar 2022 15:17:31 +0800 Subject: [PATCH 37/42] edit --- .../invoice-requested-detail.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.html b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.html index daf75994..024dfdb5 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.html +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.html @@ -16,7 +16,7 @@ {{headerInfo?.vatappcode}} - {{headerInfo?.ordlines}} / {{headerInfo?.vatinvBillNum}} + {{headerInfo?.vatinvHNum}} / {{headerInfo?.vatinvBillNum}} {{headerInfo?.vatinvHAmount}} / {{headerInfo?.vatinvHNumAmount}} From d4dd453308fcdf19d388d38fc8630b96f90b28a3 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 4 Mar 2022 15:21:52 +0800 Subject: [PATCH 38/42] fix bug --- .../sure-arrive/sure-arrive.component.ts | 18 ++++-------- .../sure-depart/sure-depart.component.ts | 28 ++++++++----------- 2 files changed, 18 insertions(+), 28 deletions(-) diff --git a/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.ts b/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.ts index eee67218..b99aa290 100644 --- a/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.ts +++ b/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.ts @@ -44,7 +44,7 @@ export class VehicleSureArriveComponent implements OnInit { ngOnInit(): void { console.log(this.i) this.initData() - this.i.time = this.i.loadingTime; + this.i.time = this.i?.loadingTime; this.initSF(); } initSF() { @@ -407,7 +407,7 @@ export class VehicleSureArriveComponent implements OnInit { } as SFUploadWidgetSchema, } }, - required: ['time', 'weight' ] + required: ['time' ] }; } this.ui = { @@ -422,19 +422,16 @@ export class VehicleSureArriveComponent implements OnInit { }; } save(value: any): void { - console.log('444'); if(this.Status === 1) { - console.log('555'); - if(!value.time) { this.service.msgSrv.warning('必填项为空！') return; } const params = { id: this.i.id, - imgUrl1: value.imgUrl1.data.fullFilePath, - imgUrl2: value.imgUrl2.data.fullFilePath, - time: value.time, + imgUrl1: value?.imgUrl1?.data?.fullFilePath, + imgUrl2: value?.imgUrl2?.data?.fullFilePath, + time: value?.time, } params.time = this.datePipe.transform(value.time, 'yyyy-MM-dd HH:mm:ss ') this.service.request(this.service.$api_get_insertWholeUnloadCarInfo, params).subscribe((res) => { @@ -444,12 +441,10 @@ export class VehicleSureArriveComponent implements OnInit { } }) } else { - if(!value.time || !this.data.weight) { + if(!value.time ) { this.service.msgSrv.warning('必填项为空！') return; } - console.log(value) - console.log(this.i) const params = { id: this.i?.id, imgUrl1: value?.imgUrl1?.data?.fullFilePath, @@ -459,7 +454,6 @@ export class VehicleSureArriveComponent implements OnInit { weight: this.data?.weight } params.time = this.datePipe.transform(value.time, 'yyyy-MM-dd HH:mm:ss ') - console.log(params) this.service.request(this.service.$api_get_insertBulkUnloadCarInfo, params).subscribe((res) => { if(res) { this.service.msgSrv.success('确认到车成功！') diff --git a/src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component.ts b/src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component.ts index 31f94dd1..975f559d 100644 --- a/src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component.ts +++ b/src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component.ts @@ -99,7 +99,6 @@ export class VehicleSureDepartComponent implements OnInit { }, multiple: false, listType: 'picture-card', - showRequired: true, } as SFUploadWidgetSchema, }, imgUrl2: { @@ -138,11 +137,10 @@ export class VehicleSureDepartComponent implements OnInit { }, multiple: false, listType: 'picture-card', - showRequired: true, } as SFUploadWidgetSchema, } }, - required: ['reason'] + required: ['time'] }; } else { this.schema = { @@ -210,7 +208,6 @@ export class VehicleSureDepartComponent implements OnInit { }, multiple: false, listType: 'picture-card', - showRequired: true, } as SFUploadWidgetSchema, }, imgUrl2: { @@ -249,11 +246,10 @@ export class VehicleSureDepartComponent implements OnInit { }, multiple: false, listType: 'picture-card', - showRequired: true, } as SFUploadWidgetSchema, } }, - required: ['time', 'weight'] + required: ['time'] }; } @@ -268,15 +264,15 @@ export class VehicleSureDepartComponent implements OnInit { } save(value: any): void { if(this.Status === 1) { - if(!value.time) { + if(!value?.time) { this.service.msgSrv.warning('必填项为空！') return; } const params = { id: this.i.id, - imgUrl1: value.imgUrl1.data.fullFilePath, - imgUrl2: value.imgUrl2.data.fullFilePath, - time: value.time, + imgUrl1: value?.imgUrl1?.data?.fullFilePath, + imgUrl2: value?.imgUrl2?.data?.fullFilePath, + time: value?.time, } params.time = this.datePipe.transform(value.time, 'yyyy-MM-dd HH:mm:ss ') this.service.request(this.service.$api_get_insertWholeStartCarInfo, params).subscribe((res) => { @@ -286,18 +282,18 @@ export class VehicleSureDepartComponent implements OnInit { } }) } else { - if(!value.time || !this.data.weight) { + if(!value?.time) { this.service.msgSrv.warning('必填项为空！') return; } console.log(value) const params = { id: this.i.id, - imgUrl1: value.imgUrl1.data.fullFilePath, - imgUrl2: value.imgUrl2.data.fullFilePath, - time: value.time, - volume: this.data.volume, - weight: this.data.weight + imgUrl1: value?.imgUrl1?.data?.fullFilePath, + imgUrl2: value?.imgUrl2?.data?.fullFilePath, + time: value?.time, + volume: this.data?.volume, + weight: this.data?.weight } params.time = this.datePipe.transform(value.time, 'yyyy-MM-dd HH:mm:ss ') this.service.request(this.service.$api_get_insertBulkStartCarInfo, params).subscribe((res) => { From 99d00bafa88f4fe556b1e2c3618f09f3c40ec857 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 4 Mar 2022 15:36:26 +0800 Subject: [PATCH 39/42] fix bug --- .../onecar-publish.component.ts | 46 ++++++------------- .../release-publish.component.html | 9 ---- .../release-publish.component.ts | 46 ++++++------------- 3 files changed, 26 insertions(+), 75 deletions(-) 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 b2ee178e..fcfcf8c4 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 @@ -581,65 +581,45 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { } } }, - receiptAddress: { - type: 'string', - title: '回单收件人信息', - ui: { - widget: 'custom', - placeholder: '请点击选择回单收件人信息', - // validator: val => (this.sf6?.value?.receiptType === '2' ? [{ keyword: 'required', message: '请点击选择收回单地址' }] : []), - visibleIf: { - receiptType: value => value === '2' - } - }, - default: '' - }, - receiptAddressId: { - type: 'string', - title: '', - ui: { - hidden: true - } - }, receiptUserName: { type: 'string', title: '联系人', + maxLength: 15, ui: { visibleIf: { receiptType: value => value === '2' } - }, - readOnly: true + } }, - phon: { + receiptUserPhone: { type: 'string', title: '联系电话', + maxLength: 11, ui: { visibleIf: { receiptType: value => value === '2' } - }, - readOnly: true + } }, - area: { + receiptAddressArea: { type: 'string', title: '所在地区', + maxLength: 30, ui: { visibleIf: { receiptType: value => value === '2' } - }, - readOnly: true + } }, - address: { + receiptAddress: { type: 'string', title: '详细地址', + maxLength: 30, ui: { visibleIf: { receiptType: value => value === '2' } - }, - readOnly: true + } }, remarks: { type: 'string', @@ -652,11 +632,11 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { } as SFTextareaWidgetSchema } }, - required: ['stateReceipt', 'receiptType', 'receiptAddress'] + required: ['stateReceipt', 'receiptType', 'receiptUserName', 'receiptUserPhone', 'receiptAddressArea', 'receiptAddress'] }; this.ui6 = { '*': { - spanLabelFixed: 115, + spanLabelFixed: 90, grid: { span: 24 } } }; 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 5981b49e..e8897d62 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 @@ -281,15 +281,6 @@
-
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 6db5bdf8..6421e36f 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 @@ -565,65 +565,45 @@ export class SupplyManagementReleasePublishComponent implements OnInit { } } }, - receiptAddress: { - type: 'string', - title: '回单收件人信息', - ui: { - widget: 'custom', - placeholder: '请点击选择回单收件人信息', - // validator: val => (this.sf6?.value?.receiptType === '2' ? [{ keyword: 'required', message: '请点击选择收回单地址' }] : []), - visibleIf: { - receiptType: value => value === '2' - } - }, - default: '' - }, - receiptAddressId: { - type: 'string', - title: '', - ui: { - hidden: true - } - }, receiptUserName: { type: 'string', title: '联系人', + maxLength: 15, ui: { visibleIf: { receiptType: value => value === '2' } - }, - readOnly: true + } }, - phon: { + receiptUserPhone: { type: 'string', title: '联系电话', + maxLength: 11, ui: { visibleIf: { receiptType: value => value === '2' } - }, - readOnly: true + } }, - area: { + receiptAddressArea: { type: 'string', title: '所在地区', + maxLength: 30, ui: { visibleIf: { receiptType: value => value === '2' } - }, - readOnly: true + } }, - address: { + receiptAddress: { type: 'string', title: '详细地址', + maxLength: 30, ui: { visibleIf: { receiptType: value => value === '2' } - }, - readOnly: true + } }, remarks: { type: 'string', @@ -636,11 +616,11 @@ export class SupplyManagementReleasePublishComponent implements OnInit { } as SFTextareaWidgetSchema } }, - required: ['stateReceipt', 'receiptType', 'receiptAddress'] + required: ['stateReceipt', 'receiptType', 'receiptUserName', 'receiptUserPhone', 'receiptAddressArea', 'receiptAddress'] }; this.ui6 = { '*': { - spanLabelFixed: 115, + spanLabelFixed: 90, grid: { span: 24 } } }; From 855615d1ff002f2506cd6df33a648a3c9a0fed20 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 4 Mar 2022 16:14:22 +0800 Subject: [PATCH 40/42] fix bug --- .../bulk-detail/bulk-detail.component.ts | 2 +- .../bulk-publish/bulk-publish.component.ts | 13 ------ .../components/bulk/bulk.component.html | 4 +- .../components/bulk/bulk.component.ts | 11 +++-- .../vehicle-detail.component.ts | 2 +- .../components/vehicle/vehicle.component.html | 2 +- .../components/vehicle/vehicle.component.ts | 8 ++++ .../services/supply-management.service.ts | 40 ++++++++++--------- 8 files changed, 43 insertions(+), 39 deletions(-) diff --git a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.ts b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.ts index 235faf6f..75b71007 100644 --- a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.ts +++ b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.ts @@ -65,7 +65,7 @@ export class SupplyManagementBulkDetailComponent implements OnInit { get reqParams() { return { operateObject: this.i?.resourceCode, - operateType: 4, + operateTypeList: [4,7], }; } currentStatus = 0; 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 07b45ea3..ae2a93c3 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 @@ -464,19 +464,6 @@ export class SupplyManagementBulkPublishComponent implements OnInit { } } }, - // receiptAddressId: { - // type: 'string', - // title: '选择地址', - // ui: { - // widget: 'custom', - // placeholder: '请点击选择收回单地址', - // // validator: val => (this.sf6?.value?.receiptType === '2' ? [{ keyword: 'required', message: '请点击选择收回单地址' }] : []), - // visibleIf: { - // receiptType: value => value === '2' - // } - // }, - // default: '' - // }, receiptUserName: { type: 'string', title: '联系人', diff --git a/src/app/routes/supply-management/components/bulk/bulk.component.html b/src/app/routes/supply-management/components/bulk/bulk.component.html index ad472530..27c00112 100644 --- a/src/app/routes/supply-management/components/bulk/bulk.component.html +++ b/src/app/routes/supply-management/components/bulk/bulk.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-12 10:52:50 * @LastEditors : Shiming - * @LastEditTime : 2022-03-02 18:09:01 + * @LastEditTime : 2022-03-04 15:45:58 * @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\bulk\\bulk.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -32,7 +32,7 @@
- + - +