From 3a37e012a662008c035f20e23a2f9e206c3c1abb Mon Sep 17 00:00:00 2001 From: heqinghang Date: Thu, 27 Jan 2022 11:14:59 +0800 Subject: [PATCH 1/7] 666 --- .../components/cost-management/cost-management.component.ts | 2 +- src/app/shared/services/business/shipper-base.service.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/routes/financial-management/components/cost-management/cost-management.component.ts b/src/app/routes/financial-management/components/cost-management/cost-management.component.ts index 756639a0..5eecf4e9 100644 --- a/src/app/routes/financial-management/components/cost-management/cost-management.component.ts +++ b/src/app/routes/financial-management/components/cost-management/cost-management.component.ts @@ -288,7 +288,7 @@ export class CostManagementComponent implements OnInit { { title: '应付金额', render: 'hrmoney', width: 100 ,className: 'text-right',}, { title: '收/付款金额', render: 'hrpaymoney', width: 120 ,className: 'text-right',}, { title: '开/收票金额', render: 'hrvatmoney', width: 120 ,className: 'text-right',}, - { title: '创建时间', index: 'auditTime', type: 'date', width: 200 ,className: 'text-center',}, + { title: '创建时间', index: 'createTime', type: 'date', width: 200 ,className: 'text-center',}, { title: '状态', index: 'stsLabel', width: 90 ,className: 'text-center',}, { title: '操作', diff --git a/src/app/shared/services/business/shipper-base.service.ts b/src/app/shared/services/business/shipper-base.service.ts index 3d7c3305..a824dcad 100644 --- a/src/app/shared/services/business/shipper-base.service.ts +++ b/src/app/shared/services/business/shipper-base.service.ts @@ -75,7 +75,7 @@ export class ShipperBaseService extends BaseService { const list = res.map(((item: any) => { return { label: item.name, - value: item.userId + value: item.appUserId } })) const obj = []; @@ -100,7 +100,7 @@ export class ShipperBaseService extends BaseService { const list = res.map(((item: any) => { return { label: `${item.name}/${item.telephone}`, - value: item.userId + value: item.appUserId } })) return [...list]; From b8e2d21f4b6ab949b524532eb2c6caa1805cd636 Mon Sep 17 00:00:00 2001 From: heqinghang Date: Thu, 27 Jan 2022 17:17:05 +0800 Subject: [PATCH 2/7] 666 --- .../payment-order-detail.component.html | 4 +- .../payment-order/payment-order.component.ts | 49 +++++++++++-------- .../invoice-requested.component.ts | 8 +-- 3 files changed, 34 insertions(+), 27 deletions(-) diff --git a/src/app/routes/financial-management/components/payment-order/payment-order-detail/payment-order-detail.component.html b/src/app/routes/financial-management/components/payment-order/payment-order-detail/payment-order-detail.component.html index 726d7da1..bcea453e 100644 --- a/src/app/routes/financial-management/components/payment-order/payment-order-detail/payment-order-detail.component.html +++ b/src/app/routes/financial-management/components/payment-order/payment-order-detail/payment-order-detail.component.html @@ -32,7 +32,7 @@ {{headerInfo?.payMoney}} -
+
{{headerInfo?.payDate}} @@ -46,7 +46,7 @@ {{headerInfo?.payRemarks}}
-
+
{{headerInfo?.payModeLabel}} 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 7d257c66..95454878 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 @@ -29,9 +29,20 @@ export class PaymentOrderComponent implements OnInit { beforeReq = (requestOptions: STRequestOptions) => { if (this.sf) { - Object.assign(requestOptions.body, { - ...this.sf.value - }); + let params = {...this.sf.value}; + if(params.payDate){ + const payDate = {start:this.sf?.value?.payDate?.[0],end:this.sf?.value?.payDate?.[1]} + params.payDate = payDate; + } + if(params.payDate2){ + const payDate2 = {start:this.sf?.value?.payDate2?.[0],end:this.sf?.value?.payDate2?.[1]} + params.payDate2 = payDate2; + } + if(params.createTime){ + const createTime = {start:this.sf?.value?.createTime?.[0],end:this.sf?.value?.createTime?.[1]} + params.createTime = createTime; + } + Object.assign(requestOptions.body,params ); } return requestOptions; }; @@ -82,7 +93,7 @@ export class PaymentOrderComponent implements OnInit { hidden: true } }, - paycodes: { + paycode: { type: 'string', title: '付款单号', }, @@ -111,9 +122,10 @@ export class PaymentOrderComponent implements OnInit { type: 'string', title: '付款类型', ui: { - widget: 'select', + widget: 'dict-select', + containsAllLable: true, + params: { dictKey: 'pay:type' }, placeholder: '请选择', - allowClear: true, visibleIf: { expand: (value: boolean) => value } @@ -123,9 +135,10 @@ export class PaymentOrderComponent implements OnInit { type: 'string', title: '付款方式', ui: { - widget: 'select', + widget: 'dict-select', + containsAllLable: true, + params: { dictKey: 'pay:mode' }, placeholder: '请选择', - allowClear: true, visibleIf: { expand: (value: boolean) => value } @@ -143,7 +156,7 @@ export class PaymentOrderComponent implements OnInit { } } }, - billHCodes: { + billCode: { type: 'string', title: '订单号', ui: { @@ -155,7 +168,7 @@ export class PaymentOrderComponent implements OnInit { } } }, - paydate: { + payDate: { title: '要求付款日期', type: 'string', ui: { @@ -166,7 +179,7 @@ export class PaymentOrderComponent implements OnInit { } } as SFDateWidgetSchema }, - createTi1me: { + payDate2: { title: '确认日期', type: 'string', ui: { @@ -177,25 +190,19 @@ export class PaymentOrderComponent implements OnInit { } } as SFDateWidgetSchema }, - waybillHCodes: { + waybillCode: { type: 'string', title: '运单号', ui: { - widget: 'select', - placeholder: '请选择', - allowClear: true, visibleIf: { expand: (value: boolean) => value } } }, - feeHCodes: { + feeCode: { type: 'string', title: '费用号', ui: { - widget: 'select', - placeholder: '请选择', - allowClear: true, visibleIf: { expand: (value: boolean) => value } @@ -212,7 +219,7 @@ export class PaymentOrderComponent implements OnInit { } } as SFDateWidgetSchema }, - remarks: { + payRemarks: { type: 'string', title: '付款备注', ui: { @@ -240,7 +247,7 @@ export class PaymentOrderComponent implements OnInit { className: 'text-right', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.payMoney }) } }, - { title: '付款类型', index: 'payType', width: 130 }, + { title: '付款类型', index: 'payTypeLabel', width: 130 }, { title: '付款方式', index: 'payModeLabel', width: 130 }, { title: '结算客户', index: 'cnoName', width: 160 }, { title: '收款人', index: 'hrToLabel', width: 150 }, diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts index c9f22479..84d90f69 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts @@ -252,7 +252,7 @@ export class InvoiceRequestedComponent implements OnInit { placeholder: '请输入' } }, - orderSn3: { + feeHCode: { type: 'string', title: '费用号', ui: { @@ -271,7 +271,7 @@ export class InvoiceRequestedComponent implements OnInit { asyncData: () => this.service.getEnterpriseProject() } }, - ltd: { + ltdId: { type: 'string', title: '网络货运人', ui: { @@ -285,7 +285,7 @@ export class InvoiceRequestedComponent implements OnInit { }, default: '' }, - otherReq: { + otherremarks: { type: 'string', title: '其他需求', enum: [{ label: '全部', value: '' }], @@ -396,7 +396,7 @@ export class InvoiceRequestedComponent implements OnInit { { title: '注册地址', index: 'registerAddr', width: 140 }, { title: '注册电话', index: 'registerPhone', width: 120 }, { title: '服务名称', index: 'vatname', width: 100 }, - { title: '销货清单', index: 'isdetail', width: 100 }, + { title: '销货清单', index: 'isdetail', width: 100,format:(item)=>{return item.isdetail === 0 ? '不需要':'需要'} }, { title: '其他要求', index: 'otherremarks', width: 100 }, { title: '申请人', index: 'applyName', width: 90 }, { title: '申请时间', index: 'applyTime', type: 'date', width: 150 }, From 48d0232eefbc81735da51fd86bc5b08024a950b6 Mon Sep 17 00:00:00 2001 From: heqinghang Date: Thu, 27 Jan 2022 17:24:58 +0800 Subject: [PATCH 3/7] 666 --- .../payment-order-detail/payment-order-detail.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/routes/financial-management/components/payment-order/payment-order-detail/payment-order-detail.component.html b/src/app/routes/financial-management/components/payment-order/payment-order-detail/payment-order-detail.component.html index bcea453e..30887e7d 100644 --- a/src/app/routes/financial-management/components/payment-order/payment-order-detail/payment-order-detail.component.html +++ b/src/app/routes/financial-management/components/payment-order/payment-order-detail/payment-order-detail.component.html @@ -60,7 +60,7 @@
- + \ No newline at end of file From a51249f32c550d37c9e2fe362381dc854b22d27d Mon Sep 17 00:00:00 2001 From: heqinghang Date: Fri, 28 Jan 2022 10:00:52 +0800 Subject: [PATCH 4/7] 666 --- .../bulk-publish/bulk-publish.component.ts | 19 +++++++++++++++++-- .../bulk-release-publish.component.ts | 19 +++++++++++++++++-- 2 files changed, 34 insertions(+), 4 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 2d78ebd2..5347d024 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 @@ -20,6 +20,7 @@ import { of } from 'rxjs'; import { PublishSuccessComponent } from '../onecar-publish/publish-success/publish-success.component'; import { PublishAddressListComponent } from '../onecar-publish/address-list/address-list.component'; import { TranAgreementComponent } from '../tran-agreement/tran-agreement.component'; +import differenceInCalendarDays from 'date-fns/differenceInCalendarDays'; @Component({ selector: 'app-publish-goods-bulk-publish', templateUrl: './bulk-publish.component.html', @@ -141,12 +142,26 @@ export class SupplyManagementBulkPublishComponent implements OnInit { } }, deadlineTime: { - title: '截至日期', + title: '截止日期', type: 'string', format: 'date-time', ui: { placeholder: '请输入', - format: 'yyyy-MM-dd HH:mm:ss' + format: 'yyyy-MM-dd HH:mm:ss', + disabledDate: (current: Date): boolean => { + let d = new Date(); + let year = d.getFullYear(); + let month = d.getMonth(); + let date = d.getDate(); + let mydate = new Date(year, month + 3, date); + return differenceInCalendarDays(current, new Date()) < 0 || differenceInCalendarDays(current, mydate) > 0; + }, + validator: (val) => { + if( new Date(val) { + let d = new Date(); + let year = d.getFullYear(); + let month = d.getMonth(); + let date = d.getDate(); + let mydate = new Date(year, month + 3, date); + return differenceInCalendarDays(current, new Date()) < 0 || differenceInCalendarDays(current, mydate) > 0; + }, + validator: (val) => { + if( new Date(val) Date: Wed, 9 Feb 2022 08:58:18 +0800 Subject: [PATCH 5/7] edit --- proxy.conf.js | 2 +- src/app/routes/vehicle/components/audit/audit.component.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index 4175a8d9..83fc7d0f 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -20,7 +20,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/audit/audit.component.html b/src/app/routes/vehicle/components/audit/audit.component.html index 28136645..f0ee9c1b 100644 --- a/src/app/routes/vehicle/components/audit/audit.component.html +++ b/src/app/routes/vehicle/components/audit/audit.component.html @@ -33,7 +33,7 @@
- +