From b22ef9805669d4df8616cdb94cd931fd9dc79b98 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 28 Feb 2022 20:03:30 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../contract-frame.component.ts | 6 ++-- .../contract-template.component.ts | 6 ++-- .../components/bulk/bulk.component.ts | 2 +- .../qrcode-page/qrcode-page.component.html | 29 ++++++++++--------- .../qrcode-page/qrcode-page.component.spec.ts | 10 +++++++ .../qrcode-page/qrcode-page.component.ts | 26 ++++++++++------- .../tran-agreement.component.ts | 11 +++++-- 7 files changed, 58 insertions(+), 32 deletions(-) diff --git a/src/app/routes/contract-management/components/contract-frame/contract-frame.component.ts b/src/app/routes/contract-management/components/contract-frame/contract-frame.component.ts index 626112ec..86bee964 100644 --- a/src/app/routes/contract-management/components/contract-frame/contract-frame.component.ts +++ b/src/app/routes/contract-management/components/contract-frame/contract-frame.component.ts @@ -78,19 +78,19 @@ export class ContractManagementFrameComponent implements OnInit { title: '签约对象', width: '100px', className: 'text-center', - index: 'signingObject' + index: 'signingObjectLabel' }, { title: '合同类型', width: '100px', className: 'text-center', - index: 'contractType' + index: 'contractTypeLabel' }, { title: '合同名称', width: '100px', className: 'text-center', - index: 'contractName' + index: 'templateName' }, { title: '网络货运人', index: 'enterpriseInfoName', width: '120px', className: 'text-center' }, { title: '合同对象', index: 'contractObjectName', width: '120px', className: 'text-center' }, diff --git a/src/app/routes/contract-management/components/contract-template/contract-template.component.ts b/src/app/routes/contract-management/components/contract-template/contract-template.component.ts index 751e3787..e9649bd1 100644 --- a/src/app/routes/contract-management/components/contract-template/contract-template.component.ts +++ b/src/app/routes/contract-management/components/contract-template/contract-template.component.ts @@ -131,19 +131,19 @@ export class ContractManagementTemplateDetailComponent implements OnInit { title: '签约对象', width: '100px', className: 'text-center', - index: 'signingObject' + index: 'signingObjectLabel' }, { title: '合同类型', width: '100px', className: 'text-center', - index: 'contractType' + index: 'contractTypeLabel' }, { title: '货源类型', width: '100px', className: 'text-center', - index: 'resourceType' + index: 'resourceTypeLabel' }, { title: '创建人', index: 'createUserId', width: '120px', className: 'text-center' }, { diff --git a/src/app/routes/supply-management/components/bulk/bulk.component.ts b/src/app/routes/supply-management/components/bulk/bulk.component.ts index a406f526..a7360ee6 100644 --- a/src/app/routes/supply-management/components/bulk/bulk.component.ts +++ b/src/app/routes/supply-management/components/bulk/bulk.component.ts @@ -406,7 +406,7 @@ export class SupplyManagementBulkComponent implements OnInit { assignedQrcode(item: any) { const modalRef = this.modal.create({ nzTitle: '二维码', - nzWidth: '600px', + nzWidth: '468px', nzContent: SupplyManagementQrcodePageComponent, nzComponentParams: { i: item, diff --git a/src/app/routes/supply-management/components/qrcode-page/qrcode-page.component.html b/src/app/routes/supply-management/components/qrcode-page/qrcode-page.component.html index 99ab2bbe..8515e77e 100644 --- a/src/app/routes/supply-management/components/qrcode-page/qrcode-page.component.html +++ b/src/app/routes/supply-management/components/qrcode-page/qrcode-page.component.html @@ -4,22 +4,25 @@ * @Author : Shiming * @Date : 2021-12-03 11:10:14 * @LastEditors : Shiming - * @LastEditTime : 2022-01-18 17:28:37 + * @LastEditTime : 2022-02-28 20:00:13 * @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\qrcode-page\\qrcode-page.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> - -
-
-

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

- -
卸货地 : {{ address }}
-
装货地 : {{ address }}
-
截止时间 : {{ i?.deadlineTime }}
-
Tips : 二维码用于司机扫码抢单
+
+ +
+
+ +

{{i?.enterpriseInfoName}}

+ +
卸货地 : {{address}}
+
装货地 : {{address}}
+
截止时间 : {{i?.deadlineTime}}
+
+ +
+
+
-
- -
diff --git a/src/app/routes/supply-management/components/qrcode-page/qrcode-page.component.spec.ts b/src/app/routes/supply-management/components/qrcode-page/qrcode-page.component.spec.ts index 3896c10c..fc268d02 100644 --- a/src/app/routes/supply-management/components/qrcode-page/qrcode-page.component.spec.ts +++ b/src/app/routes/supply-management/components/qrcode-page/qrcode-page.component.spec.ts @@ -1,3 +1,13 @@ +/* + * @Description : + * @Version : 1.0 + * @Author : Shiming + * @Date : 2021-12-03 11:10:14 + * @LastEditors : Shiming + * @LastEditTime : 2022-02-28 20:00:20 + * @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\qrcode-page\\qrcode-page.component.spec.ts + * Copyright (C) 2022 huzhenhong. All rights reserved. + */ import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; import { SupplyManagementQrcodePageComponent } from './qrcode-page.component'; diff --git a/src/app/routes/supply-management/components/qrcode-page/qrcode-page.component.ts b/src/app/routes/supply-management/components/qrcode-page/qrcode-page.component.ts index a9567d27..275b522b 100644 --- a/src/app/routes/supply-management/components/qrcode-page/qrcode-page.component.ts +++ b/src/app/routes/supply-management/components/qrcode-page/qrcode-page.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-03 11:10:14 * @LastEditors : Shiming - * @LastEditTime : 2022-01-18 17:28:46 + * @LastEditTime : 2022-02-28 20:00:06 * @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\qrcode-page\\qrcode-page.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -23,39 +23,44 @@ export class SupplyManagementQrcodePageComponent implements OnInit { record: any = {}; i: any; schema: SFSchema = {}; + qrCodeValue = ''; ui: SFUISchema = { '*': { spanLabelFixed: 100, - grid: { span: 12 } + grid: { span: 12 }, }, $no: { widget: 'text' }, $href: { - widget: 'string' + widget: 'string', }, $description: { widget: 'textarea', - grid: { span: 24 } - } + grid: { span: 24 }, + }, }; - constructor(private modal: NzModalRef) {} + constructor( + private modal: NzModalRef, + ) { } ngOnInit(): void { - console.log(this.i); + this.qrCodeValue = `rid:${this.i?.id}`; } + downLoadQrcode(downloadName: any): void { let aLink = document.createElement('a'); const content = this.qr.dataURL; let blob = this.base64ToBlob(content); //new Blob([content]); - let evt = document.createEvent('HTMLEvents'); - evt.initEvent('click', true, true); //initEvent 不加后两个参数在IE下会报错 事件类型，是否冒泡，是否阻止浏览器的默认行为 + let evt = document.createEvent("HTMLEvents"); + evt.initEvent("click", true, true);//initEvent 不加后两个参数在IE下会报错 事件类型，是否冒泡，是否阻止浏览器的默认行为 aLink.download = downloadName; aLink.href = URL.createObjectURL(blob); // aLink.dispatchEvent(evt); - aLink.click(); + aLink.click() + } //base64转blob @@ -74,4 +79,5 @@ export class SupplyManagementQrcodePageComponent implements OnInit { close(): void { this.modal.destroy(); } + } 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 9d66c432..f3e75308 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-01-06 15:01:40 * @LastEditors : Shiming - * @LastEditTime : 2022-02-28 19:34:38 + * @LastEditTime : 2022-02-28 19:58:01 * @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\tran-agreement\\tran-agreement.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -25,7 +25,14 @@ export class TranAgreementComponent { } ngOnInit() { - this.service.request(this.service.$api_getContractContent,{type:'6'}).subscribe((res) => { + const params = { + contractType:'1', + enterpriseInfoId: '', + parametersDTO: {} + } + + + this.service.request(this.service.$api_getContractContent,params).subscribe((res) => { if (res) { this.agreement = res; } From 57d567a8f5d8e9d3d34775013ee75eae87936ae5 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 28 Feb 2022 20:23:19 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../contract-template-detail.component.ts | 84 ++++++++++++++----- 1 file changed, 62 insertions(+), 22 deletions(-) diff --git a/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts b/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts index cf3bdeca..f74c02e8 100644 --- a/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts +++ b/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts @@ -1,10 +1,11 @@ +import { OnChanges } from '@angular/core'; /* - * @Description : + * @Description : * @Version : 1.0 * @Author : Shiming * @Date : 2022-01-05 11:01:55 * @LastEditors : Shiming - * @LastEditTime : 2022-02-24 20:06:26 + * @LastEditTime : 2022-02-28 20:22:46 * @FilePath : \\tms-obc-web\\src\\app\\routes\\contract-management\\components\\contract-template-detail\\contract-template-detail.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -29,7 +30,7 @@ export class ContractManagementTemplateTextComponent implements OnInit { public route: ActivatedRoute, private datePipe: DatePipe, private router: Router, - public shipperservice: ShipperBaseService, + public shipperservice: ShipperBaseService ) {} textStatus = '新建模板'; @ViewChild('sf', { static: false }) sf!: SFComponent; @@ -40,6 +41,7 @@ export class ContractManagementTemplateTextComponent implements OnInit { sfdata: any; sfdata2: any; title: any; + Types: any; templateHTML: any; detailList: any = { templateName: '' @@ -76,17 +78,57 @@ export class ContractManagementTemplateTextComponent implements OnInit { templateType: { title: '模板类型', type: 'string', - default: '', + enum: [ + { label: '框架合同', value: 'KJ' }, + { label: '明细合同', value: 'MX' }, + { label: '合伙人合同', value: 'HHR' } + ], ui: { - widget: 'dict-select', - params: { dictKey: 'contract:template:type' }, - containAllLable: true, - visibleIf: { - _$expand: (value: boolean) => value + widget: 'select', + placeholder: '请选择', + change: (tag: any, org: any) => { + console.log(tag); + switch (tag) { + case 'MX': + this.Types = [ + { label: '订单合同', value: '1' }, + { label: '订单补充协议', value: '2' }, + { label: '运单合同', value: '3' }, + { label: '运单补充协议', value: '4' }, + { label: '委托代收合同', value: '5' } + ]; + this.sf.getProperty('/contractType')!.schema.enum = this.Types; + this.sf.getProperty('/contractType')!.widget.reset(this.Types); + this.sf.setValue('/contractType', this.Types); + return; + break; + case 'KJ': + this.Types = [ + { label: '网络货物运输服务合同', value: '6' }, + { label: '运输服务承揽合同', value: '7' } + ]; + this.sf.getProperty('/contractType')!.schema.enum = this.Types; + this.sf.getProperty('/contractType')!.widget.reset(this.Types); + this.sf.setValue('/contractType', this.Types); + return; + break; + case 'HHR': + this.Types = [ + { label: '企业合伙人入驻合同', value: '8' }, + { label: '个人合伙人入驻合同', value: '9' } + ]; + this.sf.getProperty('/contractType')!.schema.enum = this.Types; + this.sf.getProperty('/contractType')!.widget.reset(this.Types); + this.sf.setValue('/contractType', this.Types); + return; + break; + default: + break; + } } - } as SFSelectWidgetSchema + } }, - signingObject: { + signingObject: { type: 'string', title: '承包商对象', enum: [ @@ -101,13 +143,11 @@ export class ContractManagementTemplateTextComponent implements OnInit { contractType: { title: '合同类型', type: 'string', - default: '', + enum: this.Types, ui: { - widget: 'dict-select', - containsAllLable: true, - params: { dictKey: 'contract:type' }, - containAllLable: true, - } as SFSelectWidgetSchema + widget: 'select', + placeholder: '请选择' + } }, resourceType: { title: '货源类型', @@ -120,7 +160,7 @@ export class ContractManagementTemplateTextComponent implements OnInit { visibleIf: { templateType: value => value === 'MX' } - } as SFSelectWidgetSchema, + } as SFSelectWidgetSchema }, enterpriseInfoId: { type: 'string', @@ -134,7 +174,7 @@ export class ContractManagementTemplateTextComponent implements OnInit { }, asyncData: () => this.shipperservice.getNetworkFreightForwarder() } - }, + } }, required: ['templateName', 'templateType'] }; @@ -165,11 +205,11 @@ export class ContractManagementTemplateTextComponent implements OnInit { } initData(url: string) { console.log('编辑'); - + this.service.request(url, { id: this.route.snapshot.params.id }).subscribe(res => { if (res) { this.detailList = res; - this.title = this.detailList?.templateName + this.title = this.detailList?.templateName; this.sfdata = res; this.sfdata2 = res; } @@ -195,7 +235,7 @@ export class ContractManagementTemplateTextComponent implements OnInit { ...this.sf2.value, templateTitle: this.title || this.detailList.templateName }; - console.log(params) + console.log(params); this.service.request(this.service.$api_save_contractTemplate, params).subscribe((res: any) => { if (res) { this.service.msgSrv.success('保存成功！'); From 28f4c8077c3805011895f7ce6734afc27af6bb06 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 28 Feb 2022 20:34:01 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../onecar-publish.component.ts | 31 ++++++++++--------- .../tran-agreement.component.ts | 16 ++++++++-- 2 files changed, 30 insertions(+), 17 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 edebb36b..8587663e 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 @@ -927,20 +927,6 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { } // 提交前协议弹窗 agreementConfirm(submitType?: string) { - const modalRef = this.modalService.create({ - nzTitle: '运输协议', - nzContent: TranAgreementComponent, - nzWidth: 900, - nzFooter: null - }); - modalRef.afterClose.subscribe(result => { - if (result) { - this.submit(submitType); - } - }); - } - // 提交 - submit(submitType?: string): void { //装卸货信息 const LoadingList = this.startInfo.concat(this.endInfo); @@ -995,6 +981,23 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { expenseDTOList: expenseList, paymentDays: this.sf7.value.paymentDays }; + + const modalRef = this.modalService.create({ + nzTitle: '运输协议', + nzContent: TranAgreementComponent, + nzWidth: 900, + nzFooter: null, + nzComponentParams: {Object: params,} + }); + modalRef.afterClose.subscribe(result => { + if (result) { + this.submit(submitType, params); + } + }); + } + // 提交 + submit(submitType?: string,params?: any): void { + // const params: any = { // ...this.sf1.value, // ...this.sf5.value, 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 f3e75308..8cb5db21 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-01-06 15:01:40 * @LastEditors : Shiming - * @LastEditTime : 2022-02-28 19:58:01 + * @LastEditTime : 2022-02-28 20:33:56 * @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\tran-agreement\\tran-agreement.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -18,17 +18,27 @@ import { SupplyManagementService } from '../../services/supply-management.servic styleUrls: ['./tran-agreement.component.less'] }) export class TranAgreementComponent { - + Object: any; agreement:any; constructor(private modal: NzModalRef,public service: SupplyManagementService,) { } ngOnInit() { + console.log(Object) const params = { contractType:'1', enterpriseInfoId: '', - parametersDTO: {} + parametersDTO: { + // 回单付 + back: '', + // 发货地址 + consignorAddress: '', + // 发货时间 + consignorDate: '', + // 发货时间 + // consignorDate: '', + } }