From 3bdceea4314cdbe9d05ec02b4d6880f174f5433a Mon Sep 17 00:00:00 2001 From: weiyu Date: Wed, 27 Apr 2022 10:13:32 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../billing-order/billing-order.component.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts b/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts index 6c755377..8ea8540e 100644 --- a/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts +++ b/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts @@ -235,23 +235,23 @@ export class BillingOrderComponent implements OnInit { { title: '服务类型', index: 'serviceTypeLabel', - width: '180px', + width: '120px', className: 'text-center' }, { title: '装货地', index: 'consignor', width: '180px', className: 'text-center' }, { title: '卸货地', index: 'consignee', width: '180px', className: 'text-center' }, - { title: '货物信息', index: 'goodsName', className: 'text-center', width: '180px' }, - { title: '车牌号', index: 'carNo', className: 'text-center', width: '180px' }, + { title: '货物信息', index: 'goodsName', className: 'text-center', width: '140px' }, + { title: '车牌号', index: 'carNo', className: 'text-center', width: '120px' }, { title: '承运司机', index:'driverName', className: 'text-center', - width: '180px', + width: '120px', }, { title: '车队长', className: 'text-center', - width: '180px', + width: '120px', index: 'carCaptainName', }, { title: '业务员', width: '100px', index: 'salesmanName', className: 'text-center', }, @@ -260,9 +260,9 @@ export class BillingOrderComponent implements OnInit { { title: '卸货时间', index: 'unloadTime', type: 'date', width: '150px', className: 'text-center', }, { title: '订单完成时间', index: 'orderReceivingTime', type: 'date', width: 150, className: 'text-center', }, { title: '支付完成时间', index: 'overallPaymentTime', type: 'date', width: 150, className: 'text-center', }, - { title: '开票状态', index: 'sts', render: 'sts', className: 'text-center', width: 180 }, + { title: '开票状态', index: 'sts', render: 'sts', className: 'text-center', width: 120 }, { title: '申请开票时间', index: 'vatappdate', type: 'date', className: 'text-center', width: 180 }, - { title: '申请开票编号', index: 'vatappcode', className: 'text-center', width: 180 }, + { title: '申请开票编号', index: 'vatappcode', className: 'text-center', width: 190 }, { title: '分票编号', index: 'vatinvcode', width: '180px', className: 'text-center', }, { title: '发票号码', index: 'invoiceno', width: 130, className: 'text-center', }, { title: '发票代码', index: 'invoiceno2', width: 130, className: 'text-center' }, From bfa1eba6f5063d36048a1702f881116514910d07 Mon Sep 17 00:00:00 2001 From: weiyu Date: Wed, 27 Apr 2022 14:34:26 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/billing-order/billing-order.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts b/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts index 8ea8540e..08e37c74 100644 --- a/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts +++ b/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts @@ -263,13 +263,13 @@ export class BillingOrderComponent implements OnInit { { title: '开票状态', index: 'sts', render: 'sts', className: 'text-center', width: 120 }, { title: '申请开票时间', index: 'vatappdate', type: 'date', className: 'text-center', width: 180 }, { title: '申请开票编号', index: 'vatappcode', className: 'text-center', width: 190 }, - { title: '分票编号', index: 'vatinvcode', width: '180px', className: 'text-center', }, + { title: '分票编号', index: 'vatinvcode', width: '200px', className: 'text-center', }, { title: '发票号码', index: 'invoiceno', width: 130, className: 'text-center', }, { title: '发票代码', index: 'invoiceno2', width: 130, className: 'text-center' }, { title: '开票日期', index: 'invoicedate', type: 'date', width: 150, className: 'text-center' }, // { title: '作废日期', index: 'invalidTime', type: 'date', width: 150 }, // TODO { - title: 'ETC开票金额', index: 'etcInvoiceMoney', className: 'text-center', width: 200, type: 'widget', + title: 'ETC开票金额', index: 'etcInvoiceMoney', className: 'text-center', width: 120, type: 'widget', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.etcInvoiceMoney }) } } ]; From ad5be2d8449816f19494dedd676c0b9b4dd3d2a2 Mon Sep 17 00:00:00 2001 From: weiyu Date: Wed, 27 Apr 2022 14:45:30 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../invoice-reporting.component.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.ts b/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.ts index cb2c9e06..9ec54f1a 100644 --- a/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.ts +++ b/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.ts @@ -209,12 +209,12 @@ export class TaxManagementInvoiceReportingComponent implements OnInit { this.columns = [ { title: '', type: 'checkbox', className: 'text-center', width: '60px', }, { title: '上传状态', render: 'uploadSts', className: 'text-center', width: '120px', }, - { title: '发票类型', render: 'invoiceType', className: 'text-center', width: '120px', }, + { title: '发票类型', render: 'invoiceType', className: 'text-center', width: '180px', }, { title: '发票号码', index: 'invoiceno', className: 'text-center', - width: '150px', + width: '120px', type: 'link', click: item => { window.open(`/#/ticket/invoice-list/detail/${item.vatinvHId}?type=${item.invoiceType}`, '_blank', 'noopener') @@ -235,17 +235,17 @@ export class TaxManagementInvoiceReportingComponent implements OnInit { }, { title: '购买方统一社会信用代码', index: 'artotaxno', className: 'text-center', width: '200px' }, { - title: '订单号', index: 'billHCode', className: 'text-center', width: '120px', type: 'link', + title: '订单号', index: 'billHCode', className: 'text-center', width: '180px', type: 'link', click: item => { window.open(`/#/order-management/vehicle/vehicle-detail/${item.ltdId}`, '_blank', 'noopener') } }, - { title: '货物名称', index: 'goodsinfo', className: 'text-center', width: '180px' }, - { title: '价税合计', index: 'vatmoney', className: 'text-center', width: '180px' }, + { title: '货物名称', index: 'goodsinfo', className: 'text-center', width: '120px' }, + { title: '价税合计', index: 'vatmoney', className: 'text-center', width: '120px' }, { title: '开票日期', index: 'invoicedate', className: 'text-center', width: '180px' }, - { title: '发票所属月份', index: 'invoicemonth', className: 'text-center', width: '250px' }, - { title: '发票状态', index: 'sts', render: 'sts', className: 'text-center', width: '200px' }, - { title: '上传日期', index: 'uoloadDate', className: 'text-center', width: '200px' }, + { title: '发票所属月份', index: 'invoicemonth', className: 'text-center', width: '140px' }, + { title: '发票状态', index: 'sts', render: 'sts', className: 'text-center', width: '120px' }, + { title: '上传日期', index: 'uoloadDate', className: 'text-center', width: '180px' }, ]; } From 6cb9c468dedb99ed4d96f79c8be99882b609234c Mon Sep 17 00:00:00 2001 From: weiyu Date: Wed, 27 Apr 2022 15:35:22 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0&=E9=9A=90=E8=97=8F=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E5=BC=80=E7=A5=A8=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/order-reporting/order-reporting.component.ts | 2 +- .../routes/tax-management/services/tax-management.service.ts | 2 +- .../cancellation-invoice/cancellation-invoice.component.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts index 4477e8e8..fc07ab75 100644 --- a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts +++ b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts @@ -33,7 +33,7 @@ export class TaxManagementOrderReportingComponent implements OnInit { { name: '异常', value: '2' }, { name: '全部', value: '' } ]; - selectedIndex = ''; //选择的项目 + selectedIndex = '0'; //选择的项目 serviceTel = ''; constructor( public service: TaxManagementService, diff --git a/src/app/routes/tax-management/services/tax-management.service.ts b/src/app/routes/tax-management/services/tax-management.service.ts index ee087615..08bd087e 100644 --- a/src/app/routes/tax-management/services/tax-management.service.ts +++ b/src/app/routes/tax-management/services/tax-management.service.ts @@ -42,7 +42,7 @@ export class TaxManagementService extends ShipperBaseService { // 撤回税务订单 $api_get_recessionTaxOrder = `/api/sdc/tax/recessionTaxOrder`; // 上传税务订单 - $api_get_uploadingTaxOrder = `/api/sdc/tax/uploadingTaxOrder`; + $api_get_uploadingTaxOrder = `/api/sdc/taxOrder/orderUploadDJtax`; // 上传税务订单 $api_get_getTaxFieldCheckList = `/api/sdc/taxFieldCheck/getTaxFieldCheckList`; diff --git a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html index bd28cc3d..e8a60d09 100644 --- a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html +++ b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html @@ -36,7 +36,7 @@ {{totalCallNo }} 清空 - + + - + - - + + diff --git a/src/app/routes/contract-management/components/index/index.component.ts b/src/app/routes/contract-management/components/index/index.component.ts index dfb5474a..4c42914d 100644 --- a/src/app/routes/contract-management/components/index/index.component.ts +++ b/src/app/routes/contract-management/components/index/index.component.ts @@ -1,5 +1,5 @@ /* - * @Description : + * @Description : * @Version : 1.0 * @Author : Shiming * @Date : 2022-01-07 13:27:10 @@ -10,18 +10,25 @@ */ import { Component, OnInit } from '@angular/core'; +import { ACLService } from '@delon/acl'; import { ModalHelper, _HttpClient } from '@delon/theme'; @Component({ selector: 'app-supply-management-index', - templateUrl: './index.component.html', + templateUrl: './index.component.html' }) export class ContractManagementIndexComponent implements OnInit { selectedIndex = 0; - - constructor(private http: _HttpClient, private modal: ModalHelper) { } - - ngOnInit(): void { } + isShowDetail = false; + isShowFrame = false; + constructor(private http: _HttpClient, private modal: ModalHelper, private acl: ACLService) { + const acls = acl.data.abilities || []; + this.isShowDetail = !!acls.find(acl => acl === 'CONTRACT-INDEX-searchDetail'); + this.isShowFrame = !!acls.find(acl => acl === 'CONTRACT-INDEX-listFrame'); + console.log(this.isShowFrame); + + } + ngOnInit(): void {} } From 2a412159bdd4fa179ff2d0f20f3385d1a72631e5 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Wed, 27 Apr 2022 18:04:33 +0800 Subject: [PATCH 08/12] edit --- .../components/payment-order/payment-order.component.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/routes/financial-management/components/payment-order/payment-order.component.ts b/src/app/routes/financial-management/components/payment-order/payment-order.component.ts index f096e39d..1a49a4e9 100644 --- a/src/app/routes/financial-management/components/payment-order/payment-order.component.ts +++ b/src/app/routes/financial-management/components/payment-order/payment-order.component.ts @@ -224,6 +224,7 @@ export class PaymentOrderComponent extends BasicTableComponent implements OnInit buttons: [ { text: '浏览', + acl: { ability: ['FINANCIAL-PAYMENT-ORDER-view'] }, click: item => this.router.navigate(['/financial-management/payment-order/detail/' + item.id]) } // { From 3063478d6939a73d79dc3c3ea3e6f9ef02ce791a Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 27 Apr 2022 19:15:48 +0800 Subject: [PATCH 09/12] fix bug --- proxy.conf.js | 4 +-- .../list/carauth/carauth.component.ts | 29 +++++++++++++++---- 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index 2799a9fa..29173019 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-18 09:51:21 * @LastEditors : Shiming - * @LastEditTime : 2022-04-27 11:21:30 + * @LastEditTime : 2022-04-27 17:26:44 * @FilePath : \\tms-obc-web\\proxy.conf.js * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -30,7 +30,7 @@ module.exports = { // }, '//api': { target: { - host: 'tms-api-test.eascs.com', + host: 'tms-api-dev.eascs.com', protocol: 'https:', port: 443 }, diff --git a/src/app/routes/vehicle/components/list/carauth/carauth.component.ts b/src/app/routes/vehicle/components/list/carauth/carauth.component.ts index 6494a9c4..d9134c20 100644 --- a/src/app/routes/vehicle/components/list/carauth/carauth.component.ts +++ b/src/app/routes/vehicle/components/list/carauth/carauth.component.ts @@ -26,7 +26,9 @@ export class CarSettleCarauthComponent implements OnInit { companyData: any = {}; detailData: any = {}; carNo = '' - + private titles = ` + 根据监管要求：总质量 4.5 吨及以下普通货 运车辆的，可填车籍地 6 位行政
区域代码
000000。 + ` constructor( private modal: NzModalRef, public service: VehicleService, @@ -184,9 +186,11 @@ export class CarSettleCarauthComponent implements OnInit { carEnergyType: { title: '车辆能源类型', type: 'string', - readOnly: true, ui: { - placeholder:'请输入车辆能源类型' + widget: 'dict-select', + params: { dictKey: 'car:energy:type' }, + placeholder: '请选择车辆能源类型', + containsAllLabel:false, }, }, carLength: { @@ -200,7 +204,7 @@ export class CarSettleCarauthComponent implements OnInit { } as SFSelectWidgetSchema, }, carLoad: { - title: '载重', + title: '核定载质量', type: 'string', maxLength: 6, ui: { @@ -480,6 +484,13 @@ export class CarSettleCarauthComponent implements OnInit { placeholder: '请输入', }, }, + carTotalLoad: { + title: '总质量', + type: 'string', + ui: { + placeholder: '请输入', + }, + }, carOwner: { title: '所有人', type: 'string', @@ -493,6 +504,7 @@ export class CarSettleCarauthComponent implements OnInit { type: 'string', ui: { widget: 'text', + }, default: '照片上传后会自动识别文字并填充下列内容栏', }, @@ -564,6 +576,9 @@ export class CarSettleCarauthComponent implements OnInit { ui: { // widget: this.detailData.commitFlag !== 0 ? 'text' : '', placeholder: '请输入', + optionalHelp: { + i18n: this.titles, + }, }, }, roadTransportLicenceNo: { @@ -610,6 +625,8 @@ export class CarSettleCarauthComponent implements OnInit { 'driverLicenseSigningOrg', 'carDistinguishCode', 'useNature', + 'curbWeight', + 'carTotalLoad', 'carOwner' ], }; @@ -687,9 +704,11 @@ export class CarSettleCarauthComponent implements OnInit { this.sf.setValue('/carOwner', res.name); this.sf.setValue('/useNature', res.useCharacter); this.sf.setValue('/carModel', res?.vehicleType); + this.sf.setValue('/carTotalLoad', res?.grossMass.slice(0, -2) % 1000); } else { - this.sf.setValue('/curbWeight', res.unladenMass); + this.sf.setValue('/curbWeight', res.unladenMass.slice(0, -2) % 1000); + this.sf.setValue('/carLoad', res.approvedLoad.slice(0, -2) % 1000); } if(this.carNo === '') { this.carNo = res.number From 07c60aa3b47fb100db7a0f546a092c6f619e7669 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 27 Apr 2022 19:17:06 +0800 Subject: [PATCH 10/12] fix bug --- .../routes/vehicle/components/list/carauth/carauth.component.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/app/routes/vehicle/components/list/carauth/carauth.component.ts b/src/app/routes/vehicle/components/list/carauth/carauth.component.ts index d9134c20..5d379653 100644 --- a/src/app/routes/vehicle/components/list/carauth/carauth.component.ts +++ b/src/app/routes/vehicle/components/list/carauth/carauth.component.ts @@ -482,12 +482,14 @@ export class CarSettleCarauthComponent implements OnInit { type: 'string', ui: { placeholder: '请输入', + addOnAfter: '吨', }, }, carTotalLoad: { title: '总质量', type: 'string', ui: { + addOnAfter: '吨', placeholder: '请输入', }, }, From 63175bd00d7d5e77505f7d4bd3ced9d2ab966ee3 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 27 Apr 2022 19:42:26 +0800 Subject: [PATCH 11/12] fix bug --- .../list/carauth/carauth.component.html | 7 +- .../list/carauth/carauth.component.ts | 315 +++++++++--------- 2 files changed, 165 insertions(+), 157 deletions(-) diff --git a/src/app/routes/vehicle/components/list/carauth/carauth.component.html b/src/app/routes/vehicle/components/list/carauth/carauth.component.html index 9eda46b1..d5804e75 100644 --- a/src/app/routes/vehicle/components/list/carauth/carauth.component.html +++ b/src/app/routes/vehicle/components/list/carauth/carauth.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-03-14 14:17:38 * @LastEditors : Shiming - * @LastEditTime : 2022-03-25 16:22:32 + * @LastEditTime : 2022-04-27 19:39:30 * @FilePath : \\tms-obc-web\\src\\app\\routes\\vehicle\\components\\list\\carauth\\carauth.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -38,9 +38,12 @@ +
+
点击查看行政区域代码
+
- +
diff --git a/src/app/routes/vehicle/components/list/carauth/carauth.component.ts b/src/app/routes/vehicle/components/list/carauth/carauth.component.ts index 5d379653..092c7c90 100644 --- a/src/app/routes/vehicle/components/list/carauth/carauth.component.ts +++ b/src/app/routes/vehicle/components/list/carauth/carauth.component.ts @@ -2,7 +2,7 @@ import { Placeholder } from '@angular/compiler/src/i18n/i18n_ast'; import { Component, OnInit, ViewChild } from '@angular/core'; import { apiConf } from '@conf/api.conf'; import { cacheConf } from '@conf/cache.conf'; -import { SFUISchema, SFSchema, SFUploadWidgetSchema, SFComponent, SFSelectWidgetSchema } from '@delon/form'; +import { SFUISchema, SFSchema, SFUploadWidgetSchema, SFComponent, SFSelectWidgetSchema, SFTextWidgetSchema } from '@delon/form'; import { _HttpClient } from '@delon/theme'; import { EACacheService, EAEnvironmentService } from '@shared'; import { NzModalRef } from 'ng-zorro-antd/modal'; @@ -17,6 +17,7 @@ import { VehicleService } from '../../../services/vehicle.service'; }) export class CarSettleCarauthComponent implements OnInit { @ViewChild('sf', { static: false }) sf!: SFComponent; + @ViewChild('aaa', { static: false }) aaa!:any; record: any = {}; i: any; ui: SFUISchema = {}; @@ -25,39 +26,39 @@ export class CarSettleCarauthComponent implements OnInit { showJopFlag = false; companyData: any = {}; detailData: any = {}; - carNo = '' + carNo = ''; private titles = ` - 根据监管要求：总质量 4.5 吨及以下普通货 运车辆的，可填车籍地 6 位行政
区域代码
000000。 - ` + 根据监管要求：总质量 4.5 吨及以下普通货 运车辆的，可填车籍地 6 位行政区域代码+000000。 + `; constructor( private modal: NzModalRef, public service: VehicleService, private envSrv: EAEnvironmentService, - private eaCacheSrv: EACacheService, - ) { } + private eaCacheSrv: EACacheService + ) {} ngOnInit(): void { - this.initData() - this.initSF() + this.initData(); + this.initSF(); } initData() { if (this.i.id) { - this.companyData = this.eaCacheSrv.get(cacheConf.env) + this.companyData = this.eaCacheSrv.get(cacheConf.env); const params = { - id: this.i.id, - } + id: this.i.id + }; this.service.request(this.service.$api_shipperCarGet, params).subscribe(res => { - this.detailData = res - this.detailData.isSelf = res.isSelf ? 1 : 0 - this.detailData.isTrailer = res.isTrailer ? 1 : 0 + this.detailData = res; + this.detailData.isSelf = res.isSelf ? 1 : 0; + this.detailData.isTrailer = res.isTrailer ? 1 : 0; this.detailData.carFrontPhotoWatermark = [ { uid: -1, name: 'LOGO', status: 'done', url: this.detailData.carFrontPhotoWatermark, - response: this.detailData.carFrontPhotoWatermark, - }, + response: this.detailData.carFrontPhotoWatermark + } ]; this.detailData.carProtocalWatermark = [ { @@ -65,8 +66,8 @@ export class CarSettleCarauthComponent implements OnInit { name: 'LOGO', status: 'done', url: this.detailData.carProtocalWatermark, - response: this.detailData.carProtocalWatermark, - }, + response: this.detailData.carProtocalWatermark + } ]; this.detailData.certificatePhotoFrontWatermark = [ { @@ -74,8 +75,8 @@ export class CarSettleCarauthComponent implements OnInit { name: 'LOGO', status: 'done', url: this.detailData.certificatePhotoFrontWatermark, - response: this.detailData.certificatePhotoFrontWatermark, - }, + response: this.detailData.certificatePhotoFrontWatermark + } ]; this.detailData.certificatePhotoBackWatermark = [ { @@ -83,8 +84,8 @@ export class CarSettleCarauthComponent implements OnInit { name: 'LOGO', status: 'done', url: this.detailData.certificatePhotoBackWatermark, - response: this.detailData.certificatePhotoBackWatermark, - }, + response: this.detailData.certificatePhotoBackWatermark + } ]; this.detailData.roadTransportPhotoWatermark = [ { @@ -92,10 +93,10 @@ export class CarSettleCarauthComponent implements OnInit { name: 'LOGO', status: 'done', url: this.detailData.roadTransportPhotoWatermark, - response: this.detailData.roadTransportPhotoWatermark, - }, + response: this.detailData.roadTransportPhotoWatermark + } ]; - }) + }); } } initSF() { @@ -114,7 +115,7 @@ export class CarSettleCarauthComponent implements OnInit { widget: 'upload', descriptionI18n: '请上传车头照照片，支持JPG、PNG格式，文件小于5M。', data: { - appId: this.envSrv.env.appId, + appId: this.envSrv.env.appId }, name: 'multipartFile', multiple: false, @@ -129,9 +130,9 @@ export class CarSettleCarauthComponent implements OnInit { status: 'done', url: args.file.response.data.fullFileWatermarkPath, response: { - url: args.file.response.data.fullFileWatermarkPath, - }, - }, + url: args.file.response.data.fullFileWatermarkPath + } + } ]; this.sf?.setValue('/carFrontPhotoWatermark', avatar); this.detailData.carFrontPhoto = args.file.response.data.fullFilePath; @@ -146,13 +147,13 @@ export class CarSettleCarauthComponent implements OnInit { observer.complete(); return; } - console.log(_fileList) - + console.log(_fileList); + observer.next(isLt2M); observer.complete(); }); - }, - // previewFile: (file: NzUploadFile) => of( + } + // previewFile: (file: NzUploadFile) => of( // file?.response?.data?.fullFilePath // ), } @@ -162,8 +163,8 @@ export class CarSettleCarauthComponent implements OnInit { maxLength: 9, type: 'string', ui: { - placeholder: '请输入', - }, + placeholder: '请输入' + } }, carNoColor: { title: '车牌颜色', @@ -172,16 +173,16 @@ export class CarSettleCarauthComponent implements OnInit { widget: 'dict-select', params: { dictKey: 'car:color' }, placeholder: '请选择车牌颜色', - containsAllLabel:false, - } as SFSelectWidgetSchema, + containsAllLabel: false + } as SFSelectWidgetSchema }, carModel: { title: '车型', type: 'string', readOnly: true, ui: { - placeholder:'请上传行驶证自动带出' - }, + placeholder: '请上传行驶证自动带出' + } }, carEnergyType: { title: '车辆能源类型', @@ -190,8 +191,8 @@ export class CarSettleCarauthComponent implements OnInit { widget: 'dict-select', params: { dictKey: 'car:energy:type' }, placeholder: '请选择车辆能源类型', - containsAllLabel:false, - }, + containsAllLabel: false + } }, carLength: { title: '车长', @@ -200,8 +201,8 @@ export class CarSettleCarauthComponent implements OnInit { widget: 'dict-select', params: { dictKey: 'car:length' }, placeholder: '请选择车长', - containsAllLabel:false, - } as SFSelectWidgetSchema, + containsAllLabel: false + } as SFSelectWidgetSchema }, carLoad: { title: '核定载质量', @@ -210,10 +211,10 @@ export class CarSettleCarauthComponent implements OnInit { ui: { placeholder: '请输入', addOnAfter: '吨', - change: (val: any) =>{ - const value = val.replace(/\D/g,'') - this.sf.setValue('/carLoad', value) - }, + change: (val: any) => { + const value = val.replace(/\D/g, ''); + this.sf.setValue('/carLoad', value); + } } }, isSelf: { @@ -221,11 +222,11 @@ export class CarSettleCarauthComponent implements OnInit { type: 'string', enum: [ { label: '否', value: 0 }, - { label: '是', value: 1 }, + { label: '是', value: 1 } ], ui: { widget: 'select', - placeholder: '请选择', + placeholder: '请选择' } }, isTrailer: { @@ -233,11 +234,11 @@ export class CarSettleCarauthComponent implements OnInit { type: 'string', enum: [ { label: '否', value: 0 }, - { label: '是', value: 1 }, + { label: '是', value: 1 } ], ui: { widget: 'select', - placeholder: '请选择', + placeholder: '请选择' } }, carProtocalWatermark: { @@ -253,7 +254,7 @@ export class CarSettleCarauthComponent implements OnInit { widget: 'upload', descriptionI18n: '请上传挂靠协议，支持JPG、PNG格式，文件小于5M。', data: { - appId: this.envSrv.env.appId, + appId: this.envSrv.env.appId }, name: 'multipartFile', multiple: false, @@ -267,12 +268,12 @@ export class CarSettleCarauthComponent implements OnInit { status: 'done', url: args.file.response.data.fullFileWatermarkPath, response: { - url: args.file.response.data.fullFileWatermarkPath, - }, - }, + url: args.file.response.data.fullFileWatermarkPath + } + } ]; this.sf?.setValue('/carProtocalWatermark', avatar); - this.detailData.certificatePhotoFront = args.file.response.data.fullFilePath + this.detailData.certificatePhotoFront = args.file.response.data.fullFilePath; } }, beforeUpload: (file: any, _fileList: any) => { @@ -287,7 +288,7 @@ export class CarSettleCarauthComponent implements OnInit { observer.complete(); }); }, - previewFile: (file: NzUploadFile) => of(file.url), + previewFile: (file: NzUploadFile) => of(file.url) } }, agreeImg: { @@ -295,24 +296,24 @@ export class CarSettleCarauthComponent implements OnInit { type: 'boolean', // enum: [{ label: '长期', value: true }], ui: { - widget: 'custom', + widget: 'custom' } }, titleA: { title: '行驶证信息(必填）', type: 'string', ui: { - widget: 'text', + widget: 'text' }, - default: '照片上传后会自动识别文字并填充下列内容栏', + default: '照片上传后会自动识别文字并填充下列内容栏' }, tipsA: { title: '', type: 'string', ui: { widget: 'custom', - offsetControl: 6, - }, + offsetControl: 6 + } }, certificatePhotoFrontWatermark: { type: 'string', @@ -327,7 +328,7 @@ export class CarSettleCarauthComponent implements OnInit { widget: 'upload', descriptionI18n: '请上传行驶证首页照片，支持JPG、PNG格式，文件小于5M。照片信息缺失、拼凑、过度PS、模糊不清，都不会通过审核。', data: { - appId: this.envSrv.env.appId, + appId: this.envSrv.env.appId }, name: 'multipartFile', multiple: false, @@ -341,15 +342,15 @@ export class CarSettleCarauthComponent implements OnInit { status: 'done', url: args.file.response.data.fullFileWatermarkPath, response: { - url: args.file.response.data.fullFileWatermarkPath, - }, - }, + url: args.file.response.data.fullFileWatermarkPath + } + } ]; this.sf?.setValue('/certificatePhotoFrontWatermark', avatar); - this.detailData.certificatePhotoFront = args.file.response.data.fullFilePath + this.detailData.certificatePhotoFront = args.file.response.data.fullFilePath; this.checkCarCard(args.file.response.data.fullFilePath, 'front'); } else { - this.detailData.certificatePhotoFront = '' + this.detailData.certificatePhotoFront = ''; } }, beforeUpload: (file: any, _fileList: any) => { @@ -363,7 +364,7 @@ export class CarSettleCarauthComponent implements OnInit { observer.next(isLt2M); observer.complete(); }); - }, + } // previewFile: (file: NzUploadFile) => of(file.url), } }, @@ -372,8 +373,8 @@ export class CarSettleCarauthComponent implements OnInit { type: 'string', ui: { widget: 'custom', - offsetControl: 6, - }, + offsetControl: 6 + } }, certificatePhotoBackWatermark: { type: 'string', @@ -388,7 +389,7 @@ export class CarSettleCarauthComponent implements OnInit { widget: 'upload', descriptionI18n: '请上传行驶证副业照片，支持JPG、PNG格式，文件小于5M。', data: { - appId: this.envSrv.env.appId, + appId: this.envSrv.env.appId }, name: 'multipartFile', multiple: false, @@ -402,15 +403,15 @@ export class CarSettleCarauthComponent implements OnInit { status: 'done', url: args.file.response.data.fullFileWatermarkPath, response: { - url: args.file.response.data.fullFileWatermarkPath, - }, - }, + url: args.file.response.data.fullFileWatermarkPath + } + } ]; this.sf?.setValue('/certificatePhotoBackWatermark', avatar); - this.detailData.certificatePhotoBack = args.file.response.data.fullFilePath + this.detailData.certificatePhotoBack = args.file.response.data.fullFilePath; this.checkCarCard(args.file.response.data.fullFilePath, 'back'); } else { - this.detailData.certificatePhotoBack = '' + this.detailData.certificatePhotoBack = ''; } }, beforeUpload: (file: any, _fileList: any) => { @@ -424,7 +425,7 @@ export class CarSettleCarauthComponent implements OnInit { observer.next(isLt2M); observer.complete(); }); - }, + } // previewFile: (file: NzUploadFile) => of(file.url), } }, @@ -433,16 +434,16 @@ export class CarSettleCarauthComponent implements OnInit { type: 'string', format: 'date', ui: { - placeholder: '请输入', - }, + placeholder: '请输入' + } }, driverLicenseGetTime: { title: '行驶证发证日期', type: 'string', format: 'date', ui: { - placeholder: '请输入', - }, + placeholder: '请输入' + } }, driverLicenseEndTime: { title: '行驶证到期日期', @@ -450,65 +451,64 @@ export class CarSettleCarauthComponent implements OnInit { format: 'date', maxLength: 30, ui: { - placeholder: '请输入', - }, + placeholder: '请输入' + } }, driverLicenseSigningOrg: { title: '行驶证签发机关', type: 'string', maxLength: 30, ui: { - placeholder: '请输入', - }, + placeholder: '请输入' + } }, carDistinguishCode: { title: '车辆识别代码', type: 'string', maxLength: 30, ui: { - placeholder: '请输入', - }, + placeholder: '请输入' + } }, useNature: { title: '使用性质', type: 'string', maxLength: 30, ui: { - placeholder: '请输入', - }, + placeholder: '请输入' + } }, curbWeight: { title: '整备质量', type: 'string', ui: { placeholder: '请输入', - addOnAfter: '吨', - }, + addOnAfter: '吨' + } }, carTotalLoad: { title: '总质量', type: 'string', ui: { addOnAfter: '吨', - placeholder: '请输入', - }, + placeholder: '请输入' + } }, carOwner: { title: '所有人', type: 'string', maxLength: 30, ui: { - placeholder: '请输入', - }, + placeholder: '请输入' + } }, titleB: { title: '道运证(选填）', type: 'string', ui: { - widget: 'text', - + widget: 'text' }, - default: '照片上传后会自动识别文字并填充下列内容栏', + default: '照片上传后会自动识别文字并填充下列内容栏' }, roadTransportPhotoWatermark: { type: 'string', @@ -523,7 +523,7 @@ export class CarSettleCarauthComponent implements OnInit { widget: 'upload', descriptionI18n: '请上传道运证照片，支持JPG、PNG格式，文件小于5M。蓝牌绿牌车辆，可不用传道运证', data: { - appId: this.envSrv.env.appId, + appId: this.envSrv.env.appId }, name: 'multipartFile', multiple: false, @@ -537,15 +537,15 @@ export class CarSettleCarauthComponent implements OnInit { status: 'done', url: args.file.response.data.fullFileWatermarkPath, response: { - url: args.file.response.data.fullFileWatermarkPath, - }, - }, + url: args.file.response.data.fullFileWatermarkPath + } + } ]; this.sf?.setValue('/roadTransportPhotoWatermark', avatar); - this.detailData.roadTransportPhoto = args.file.response.data.fullFilePath + this.detailData.roadTransportPhoto = args.file.response.data.fullFilePath; this.checkTransCard(args.file.response.data.fullFilePath); } else { - this.detailData.roadTransportPhoto = '' + this.detailData.roadTransportPhoto = ''; } }, beforeUpload: (file: any, _fileList: any) => { @@ -559,7 +559,7 @@ export class CarSettleCarauthComponent implements OnInit { observer.next(isLt2M); observer.complete(); }); - }, + } // previewFile: (file: NzUploadFile) => of(file.url), } }, @@ -568,7 +568,7 @@ export class CarSettleCarauthComponent implements OnInit { type: 'boolean', // enum: [{ label: '长期', value: true }], ui: { - widget: 'custom', + widget: 'custom' } }, roadTransportNo: { @@ -579,35 +579,38 @@ export class CarSettleCarauthComponent implements OnInit { // widget: this.detailData.commitFlag !== 0 ? 'text' : '', placeholder: '请输入', optionalHelp: { - i18n: this.titles, - }, - }, + i18n: this.titles + } + } }, + '': { type: 'number', ui: { widget: 'text', + html: this.aaa, + defaultText: '点击查看行政区域代码' } as SFTextWidgetSchema }, roadTransportLicenceNo: { title: '经营许可证号', type: 'string', maxLength: 30, ui: { // widget: this.detailData.commitFlag !== 0 ? 'text' : '', - placeholder: '请输入', - }, + placeholder: '请输入' + } }, roadTransportStartTime: { title: '发证日期', type: 'string', format: 'date', ui: { - placeholder: '请输入', - }, + placeholder: '请输入' + } }, roadTransportEndTime: { title: '有效期至', type: 'string', format: 'date', ui: { - placeholder: '请输入', - }, - }, + placeholder: '请输入' + } + } }, required: [ 'carFrontPhotoWatermark', @@ -630,61 +633,60 @@ export class CarSettleCarauthComponent implements OnInit { 'curbWeight', 'carTotalLoad', 'carOwner' - ], + ] }; this.ui = { '*': { spanLabelFixed: 180, grid: { span: 18 }, - width: 600, + width: 600 }, $title1: { - spanLabelFixed: 0, + spanLabelFixed: 0 }, $title2: { - spanLabelFixed: 0, + spanLabelFixed: 0 }, $title3: { - spanLabelFixed: 0, + spanLabelFixed: 0 }, - $isTrailer:{ - grid: { span: 24 }, + $isTrailer: { + grid: { span: 24 } }, $carProtocalWatermark: { - grid: { span:12 }, + grid: { span: 12 } }, $agreeImg: { grid: { span: 4 }, class: 'setCustom' }, - $titleB:{ - grid: { span: 24 }, + $titleB: { + grid: { span: 24 } }, $roadTransportPhotoWatermark: { - grid: { span: 12 }, + grid: { span: 12 } }, $roadImg: { grid: { span: 4 }, class: 'setCustom' - }, - + } }; } // 道路运输证识别 checkTransCard(imgurl: any) { const params = { - transportationLicenseUrl: imgurl, + transportationLicenseUrl: imgurl }; this.service.request(this.service.$api_recognizeTransportationLicense, params).subscribe((res: any) => { if (res) { this.sf.setValue('/roadTransportNo', res.number); this.sf.setValue('/roadTransportLicenceNo', res.businessCertificate); this.sf.setValue('/roadTransportStartTime', res.issueDate); - if(this.carNo === '') { - this.carNo = res.number - } else if(this.carNo && res.vehicleNumber.indexOf(this.carNo) === -1) { - this.service.msgSrv.warning('请上传同一认证车辆的相关证件') + if (this.carNo === '') { + this.carNo = res.number; + } else if (this.carNo && res.vehicleNumber.indexOf(this.carNo) === -1) { + this.service.msgSrv.warning('请上传同一认证车辆的相关证件'); } } }); @@ -693,11 +695,12 @@ export class CarSettleCarauthComponent implements OnInit { checkCarCard(imgurl: any, side: any) { const params = { vehicleLicenseUrl: imgurl, - side, + side }; this.service.request(this.service.$api_recognizeVehicleLicense, params).subscribe((res: any) => { if (res) { - if (side === 'front') { // 正面 + if (side === 'front') { + // 正面 this.sf.setValue('/driverLicenseRegisterTime', res.registerDate); this.sf.setValue('/carNo', res.number); this.sf.setValue('/driverLicenseGetTime', res.issueDate); @@ -707,15 +710,14 @@ export class CarSettleCarauthComponent implements OnInit { this.sf.setValue('/useNature', res.useCharacter); this.sf.setValue('/carModel', res?.vehicleType); this.sf.setValue('/carTotalLoad', res?.grossMass.slice(0, -2) % 1000); - } else { this.sf.setValue('/curbWeight', res.unladenMass.slice(0, -2) % 1000); this.sf.setValue('/carLoad', res.approvedLoad.slice(0, -2) % 1000); } - if(this.carNo === '') { - this.carNo = res.number - } else if(this.carNo && this.carNo !== res.number) { - this.service.msgSrv.warning('请上传同一认证车辆的相关证件') + if (this.carNo === '') { + this.carNo = res.number; + } else if (this.carNo && this.carNo !== res.number) { + this.service.msgSrv.warning('请上传同一认证车辆的相关证件'); } } }); @@ -725,10 +727,10 @@ export class CarSettleCarauthComponent implements OnInit { this.modal.close(true); } showExample() { - this.showCardFlag = !this.showCardFlag + this.showCardFlag = !this.showCardFlag; } showJopExample() { - this.showJopFlag = !this.showJopFlag + this.showJopFlag = !this.showJopFlag; } submitForm() { const params: any = { @@ -736,20 +738,23 @@ export class CarSettleCarauthComponent implements OnInit { ...this.sf.value, bindType: this.i.bindType }; - params.carFrontPhoto = this.detailData.carFrontPhoto - params.carProtocal = this.detailData.carProtocal - params.certificatePhotoFront = this.detailData.certificatePhotoFront - params.certificatePhotoBack = this.detailData.certificatePhotoBack - params.roadTransportPhoto = this.detailData.roadTransportPhoto - delete params.titleA - delete params.titleB + params.carFrontPhoto = this.detailData.carFrontPhoto; + params.carProtocal = this.detailData.carProtocal; + params.certificatePhotoFront = this.detailData.certificatePhotoFront; + params.certificatePhotoBack = this.detailData.certificatePhotoBack; + params.roadTransportPhoto = this.detailData.roadTransportPhoto; + delete params.titleA; + delete params.titleB; console.log(params); - + this.service.request(this.service.$api_saveUpdateShipperCar, params).subscribe((res: any) => { if (res) { - this.service.msgSrv.success('添加成功') - this.modal.close(true) + this.service.msgSrv.success('添加成功'); + this.modal.close(true); } - }) + }); + } + view() { + window.open('http://www.mca.gov.cn/article/sj/xzqh/1980/') } } From 944d3830c1612b720a1299eeedf7e0c9ea5f209b Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 27 Apr 2022 19:58:29 +0800 Subject: [PATCH 12/12] fix bug --- .../components/onecar-publish/onecar-publish.component.ts | 5 +++-- .../components/release-publish/release-publish.component.ts | 4 ++-- .../components/tran-agreement/tran-agreement.component.ts | 2 +- 3 files changed, 6 insertions(+), 5 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 0a3c4816..9bed9037 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 @@ -1039,11 +1039,12 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { paymentDays: this.sf7.value.paymentDays, estimatedKilometers: this.totalDistance, estimatedTravelTime: this.totalTime, - subtotal: this.sf7.value.subtotal, - total: this.sf7.value.total, + subtotal: this.sf7.value.subtotal.toFixed(2), + total: this.sf7.value.total.toFixed(2), insurancePackagedGoods: this.sf4.value.insurancePackagedGoods, goodsValue: this.sf4.value.goodsValue }; + console.log(params) const modalRef = this.modalService.create({ nzTitle: '运输协议', nzContent: TranAgreementComponent, 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 c625fdde..8b3c3e3a 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 @@ -986,8 +986,8 @@ export class SupplyManagementReleasePublishComponent implements OnInit { ...this.sf6.value, expenseDTOList: expenseList, paymentDays: this.sf7.value.paymentDays, - subtotal: this.sf7.value.subtotal, - total: this.sf7.value.total, + subtotal: this.sf7.value.subtotal.toFixed(2), + total: this.sf7.value.total.toFixed(2), estimatedKilometers: this.totalDistance, estimatedTravelTime: this.totalTime, insurancePackagedGoods: this.sf4.value.insurancePackagedGoods, 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 d49c407e..d70833ae 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-04-15 15:18:29 + * @LastEditTime : 2022-04-27 19:52:22 * @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\tran-agreement\\tran-agreement.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */