diff --git a/proxy.conf.js b/proxy.conf.js index 2fe9e131..057e4e2c 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-05-07 14:49:15 + * @LastEditTime : 2022-05-07 17:54:06 * @FilePath : \\tms-obc-web\\proxy.conf.js * Copyright (C) 2022 huzhenhong. All rights reserved. */ diff --git a/src/app/routes/account/components/edit-password/edit-password.component.ts b/src/app/routes/account/components/edit-password/edit-password.component.ts index 3f4cd9b7..4410cfa0 100644 --- a/src/app/routes/account/components/edit-password/edit-password.component.ts +++ b/src/app/routes/account/components/edit-password/edit-password.component.ts @@ -1,5 +1,5 @@ /* - * @Description : + * @Description : * @Version : 1.0 * @Author : Shiming * @Date : 2021-12-27 10:30:56 @@ -9,14 +9,11 @@ * Copyright (C) 2022 huzhenhong. All rights reserved. */ -import { Component, Inject, OnInit, ViewChild } from '@angular/core'; -import { FormBuilder, FormControl, FormGroup, ValidatorFn, Validators } from '@angular/forms'; -import { ActivatedRoute, Router } from '@angular/router'; -import { STChange, STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st'; +import { Component, Inject, OnInit } from '@angular/core'; +import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'; +import { Router } from '@angular/router'; import { DA_SERVICE_TOKEN, ITokenService } from '@delon/auth'; -import { SFComponent, SFSchema, SFSelectWidgetSchema, SFUISchema } from '@delon/form'; -import { NzDrawerRef, NzDrawerService } from 'ng-zorro-antd/drawer'; import { NzFormTooltipIcon } from 'ng-zorro-antd/form'; import { NzModalRef } from 'ng-zorro-antd/modal'; import { AccountService } from '../../services/account.service'; @@ -30,14 +27,13 @@ export class AccountComponentsCenterEditComponent implements OnInit { record: any; count = 0; type = 'create'; - isVisibleView = false + isVisibleView = false; passwordVisible = false; passwordVisible2 = false; password: any; password2: any; interval$: any; - confirmationValidator = - (control: FormControl): { [s: string]: boolean } => { + confirmationValidator = (control: FormControl): { [s: string]: boolean } => { if (!control.value) { return { required: true }; } else if (control?.value !== this.validateForm?.value?.passWord) { @@ -51,7 +47,6 @@ export class AccountComponentsCenterEditComponent implements OnInit { }; constructor( public router: Router, - public ar: ActivatedRoute, private modalRef: NzModalRef, private fb: FormBuilder, public service: AccountService, @@ -61,19 +56,21 @@ export class AccountComponentsCenterEditComponent implements OnInit { ngOnInit() { this.initForm(); } - initForm () { - this.validateForm = this.fb.group({ - passWord: [null, - [ - Validators.required, - Validators.maxLength(16), - Validators.minLength(8), - Validators.pattern('^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z-_]{8,16}$') - ]], - passWordTo: [null, [ Validators.required, Validators.maxLength(16), Validators.minLength(8), this.confirmationValidator,]], - smsVerifyCode: [null, [Validators.required]], - }); -} + initForm() { + this.validateForm = this.fb.group({ + passWord: [ + null, + [ + Validators.required, + Validators.maxLength(16), + Validators.minLength(8), + Validators.pattern('^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z-_]{8,16}$') + ] + ], + passWordTo: [null, [Validators.required, Validators.maxLength(16), Validators.minLength(8), this.confirmationValidator]], + smsVerifyCode: [null, [Validators.required]] + }); + } destroyModal(): void { this.modalRef.destroy(); } @@ -84,28 +81,28 @@ export class AccountComponentsCenterEditComponent implements OnInit { this.service.msgSrv.success('发送成功'); e.preventDefault(); this.codeCountDown(); - }else { + } else { this.service.msgSrv.success(res.msg); } }); } save() { - if(!this.validateForm.valid) { - this.service.msgSrv.warning('必填项为空或格式错误，请检查！') + if (!this.validateForm.valid) { + this.service.msgSrv.warning('必填项为空或格式错误，请检查！'); return; } - const params = { + const params = { ...this.validateForm.value }; - this.service.request(this.service.$api_set_phoneUpdatePassword, params).subscribe((res) => { + this.service.request(this.service.$api_set_phoneUpdatePassword, params).subscribe(res => { if (res) { this.service.msgSrv.success('修改密码成功！'); this.isVisibleView = true; setTimeout(() => { this.tokenService.clear(); - this.router.navigate(['/passport/login']) - this.modalRef.close() - }, 3000) + this.router.navigate(['/passport/login']); + this.modalRef.close(); + }, 3000); } }); } @@ -120,11 +117,11 @@ export class AccountComponentsCenterEditComponent implements OnInit { }, 1000); } handleCancel() { - this.isVisibleView = false - } - handleOK() { - this.modalRef.close() - this.tokenService.clear(); - this.router.navigate(['/passport/login']) - } + this.isVisibleView = false; + } + handleOK() { + this.modalRef.close(); + this.tokenService.clear(); + this.router.navigate(['/passport/login']); + } } diff --git a/src/app/routes/commom/less/commom-table.less b/src/app/routes/commom/less/commom-table.less index 43fa7d95..ec058484 100644 --- a/src/app/routes/commom/less/commom-table.less +++ b/src/app/routes/commom/less/commom-table.less @@ -113,9 +113,10 @@ line-height: 21px; } - // .text-truncate { - // white-space: normal; - // } + .text-truncate { + white-space: normal; + } + // 强制头部居中 .ant-table-container table>thead>tr>.options { text-align: center !important; diff --git a/src/app/routes/contract-management/components/contract-frame/contract-frame.component.html b/src/app/routes/contract-management/components/contract-frame/contract-frame.component.html index 37e24dfb..276a8231 100644 --- a/src/app/routes/contract-management/components/contract-frame/contract-frame.component.html +++ b/src/app/routes/contract-management/components/contract-frame/contract-frame.component.html @@ -80,7 +80,8 @@ (change)="stChange($event)" > - {{ item?.contractCode }} + {{ item?.contractCode }} + {{ item?.contractCode }} diff --git a/src/app/routes/contract-management/components/contract-list/contract-list.component.html b/src/app/routes/contract-management/components/contract-list/contract-list.component.html index 0876e5cf..709cfb87 100644 --- a/src/app/routes/contract-management/components/contract-list/contract-list.component.html +++ b/src/app/routes/contract-management/components/contract-list/contract-list.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-07 15:57:49 * @LastEditors : Shiming - * @LastEditTime : 2022-02-23 20:11:50 + * @LastEditTime : 2022-05-07 17:52:57 * @FilePath : \\tms-obc-web\\src\\app\\routes\\contract-management\\components\\contract-list\\contract-list.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -51,8 +51,8 @@ - {{ item?.contractCode }} - + {{ item?.contractCode }} + {{ item?.contractCode }} diff --git a/src/app/routes/contract-management/components/contract-partner/contract-partner.component.html b/src/app/routes/contract-management/components/contract-partner/contract-partner.component.html index 4b5e20cd..d61d5e4d 100644 --- a/src/app/routes/contract-management/components/contract-partner/contract-partner.component.html +++ b/src/app/routes/contract-management/components/contract-partner/contract-partner.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-07 13:29:57 * @LastEditors : Shiming - * @LastEditTime : 2022-02-24 10:08:28 + * @LastEditTime : 2022-05-07 17:56:08 * @FilePath : \\tms-obc-web\\src\\app\\routes\\contract-management\\components\\contract-partner\\contract-partner.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -80,7 +80,8 @@ (change)="stChange($event)" > - {{ item?.contractCode }} + {{ item?.contractCode }} + {{ item?.contractCode }} diff --git a/src/app/routes/datatable/components/operationtable/operationtable.component.ts b/src/app/routes/datatable/components/operationtable/operationtable.component.ts index aa8b8e33..d315545d 100644 --- a/src/app/routes/datatable/components/operationtable/operationtable.component.ts +++ b/src/app/routes/datatable/components/operationtable/operationtable.component.ts @@ -86,6 +86,8 @@ export class DatatableOperationtableComponent implements OnInit { this.service.request(this.service.$api_operationalReportHistogram, params).subscribe(res => { if (res) { this.chartData = res + this.pillar.reRender() + this.curve.reRender() if(flag) { // 除第一次加载外 this.pillar.reRender() this.curve.reRender() diff --git a/src/app/routes/download/components/list/list.component.ts b/src/app/routes/download/components/list/list.component.ts index 05f38c4c..efdbd8d2 100644 --- a/src/app/routes/download/components/list/list.component.ts +++ b/src/app/routes/download/components/list/list.component.ts @@ -1,8 +1,6 @@ import { Component, OnInit, ViewChild } from '@angular/core'; -import { ActivatedRoute, Router } from '@angular/router'; -import { STChange, STColumn, STComponent, STData } from '@delon/abc/st'; +import { STColumn, STComponent, STData } from '@delon/abc/st'; import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form'; -import { _HttpClient } from '@delon/theme'; import { NzModalService } from 'ng-zorro-antd/modal'; import { DownloadService } from '../../services/download.service'; @@ -16,7 +14,7 @@ export class DownloadComponentsListComponent implements OnInit { columns: STColumn[] = []; @ViewChild('st', { static: false }) st!: STComponent; @ViewChild('sf', { static: false }) sf!: SFComponent; - constructor(public service: DownloadService, private modal: NzModalService, private router: Router, private ar: ActivatedRoute) {} + constructor(public service: DownloadService, private modal: NzModalService) {} /** * 查询参数 diff --git a/src/app/routes/financial-management/components/cost-management/cost-management.component.html b/src/app/routes/financial-management/components/cost-management/cost-management.component.html index f9b6560d..36360f29 100644 --- a/src/app/routes/financial-management/components/cost-management/cost-management.component.html +++ b/src/app/routes/financial-management/components/cost-management/cost-management.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-30 19:36:30 * @LastEditors : Shiming - * @LastEditTime : 2022-02-23 16:35:15 + * @LastEditTime : 2022-05-07 17:33:01 * @FilePath : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\cost-management\\cost-management.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -50,11 +50,11 @@ --> - + - {{ item.hrmoney | currency }} + {{ item.armoeny ? (item.armoeny| currency ): '--' }} / {{ item.hrmoney? (item.hrmoney | currency) : '--'}} {{ item.cnoCode }}/{{ item.cnoName }} 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 7c913644..3a064c06 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 @@ -252,8 +252,8 @@ export class CostManagementComponent extends BasicTableComponent implements OnIn { title: '结算客户', render: 'artocode', width: 200, className: 'text-left' }, { title: '应收对象', index: 'artoname', width: 200, className: 'text-left' }, { title: '应付对象', index: 'hrtoname', width: 200, className: 'text-left' }, - { title: '应收金额', render: 'armoeny', width: 150, className: 'text-right' }, - { title: '应付金额', render: 'hrmoney', width: 150, className: 'text-right' }, + { title: '应收/应付金额', render: 'hrmoney', width: 150, className: 'text-right' }, + // { title: '应付金额', render: 'hrmoney', width: 150, className: 'text-right' }, { title: '收/付款金额', render: 'hrpaymoney', width: 150, className: 'text-right' }, { title: '开/收票金额', render: 'hrvatmoney', width: 150, className: 'text-right' }, { title: '创建时间', index: 'createTime', type: 'date', width: 200, className: 'text-center' }, 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 23a987d2..95a07b50 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 @@ -213,7 +213,7 @@ export class PaymentOrderComponent extends BasicTableComponent implements OnInit { title: '收款人', index: 'hrToLabel', width: 150 }, { title: '应付已核销', index: 'ishrhxLabel', width: 150 }, { title: '确认日期', index: 'payDate2', type: 'date', className: 'text-center', width: 150 }, - { title: '创建时间', index: 'payDate', type: 'date', className: 'text-center', width: 150 }, + { title: '创建时间', index: 'createTime', type: 'date', className: 'text-center', width: 150 }, { title: '创建人', index: 'createUserIdLabel', width: 160 }, { title: '付款备注', index: 'payRemarks', width: 200 }, { diff --git a/src/app/routes/financial-management/components/receivable-order/receivable-order.component.html b/src/app/routes/financial-management/components/receivable-order/receivable-order.component.html index ceb5e6f5..8482c148 100644 --- a/src/app/routes/financial-management/components/receivable-order/receivable-order.component.html +++ b/src/app/routes/financial-management/components/receivable-order/receivable-order.component.html @@ -48,6 +48,7 @@
+
diff --git a/src/app/routes/financial-management/components/refund-record/refund-record.component.ts b/src/app/routes/financial-management/components/refund-record/refund-record.component.ts index 18cc037a..6a190102 100644 --- a/src/app/routes/financial-management/components/refund-record/refund-record.component.ts +++ b/src/app/routes/financial-management/components/refund-record/refund-record.component.ts @@ -65,6 +65,7 @@ export class RefundRecordComponent extends BasicTableComponent implements OnInit { label: '拒绝', type: 'default', + loading: () => this.service.http.loading, onClick: () => { if (!this.msg) { this.service.msgSrv.warning('请填写原因'); @@ -88,6 +89,7 @@ export class RefundRecordComponent extends BasicTableComponent implements OnInit { label: '通过', type: 'primary', + loading: () => this.service.http.loading, onClick: () => { this.service .request(this.service.$api_agree_refund_record, { @@ -172,6 +174,13 @@ export class RefundRecordComponent extends BasicTableComponent implements OnInit placeholder: '请输入' } }, + captainName: { + type: 'string', + title: '收款人', + ui: { + placeholder: '请输入' + } + }, enterpriseProjectName: { type: 'string', title: '所属项目', diff --git a/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.html b/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.html index 7380f466..4e14b673 100644 --- a/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.html +++ b/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.html @@ -1,3 +1,13 @@ + @@ -58,7 +58,7 @@ - 添加 + 添加 { this.partnerId.push(ele?.id); }); } else { this.partnerPeopleList = this.partnerPeopleList.concat(res); + this.partnerPeopleList = [...this.setArr(this.partnerPeopleList, 'id')]; this.partnerId.push(res?.id); } } }); } + // 数组去重 + setArr(arr: any[], id: string) { + let obj: any = {}; + const arrays = arr.reduce((setArr, item) => { + obj[item[id]] ? '' : (obj[item[id]] = true && setArr.push(item)); + return setArr; + }, []); + return arrays; + } delete(item: any) { this.partnerPeopleList = this.partnerPeopleList.filter((d: any, i: any) => { return item.id != d.id; }); } save() { - if(!this.configName) { + if (!this.configName) { this.service.msgSrv.warning('请输入配置名称！'); - return + return; } - if(!this.accountingRate) { + if (!this.accountingRate) { this.service.msgSrv.warning('请输入固定结算费率！'); - return + return; } - if(!this.partnerType) { + if (!this.partnerType) { this.service.msgSrv.warning('请选择合伙人范围！'); - return + return; } - if(!this.priority) { + if (!this.priority) { this.service.msgSrv.warning('请选择优先级！'); - return + return; } - if(!this.sf?.value.ruleDescription) { + if (!this.sf?.value.ruleDescription) { this.service.msgSrv.warning('请输入规则说明！'); - return + return; } - if(!this.remark) { + if (!this.remark) { this.service.msgSrv.warning('请输入备注！'); - return + return; } - if(this.partnerType == '3' && this.partnerPeopleList?.length == 0) { + if (this.partnerType == '3' && this.partnerPeopleList?.length == 0) { this.service.msgSrv.warning('请选择合伙人！'); - return + return; } let real = false; - if(this.configType == '2') { - this.table.data.forEach((element: any) => { - if (element.startAmount > element.endAmount) { - real = true; - return; - } - }); - } + if (this.configType == '2') { + this.table.data.forEach((element: any) => { + if (element.startAmount > element.endAmount) { + real = true; + return; + } + }); + } if (real) { this.service.msgSrv.warning('初始业务量不能超过到达业务量！'); return; @@ -197,7 +208,7 @@ export class ParterRebateManageMentAddComponent implements OnInit { partnerType: this.partnerType }; console.log(params); - + this.service.request(this.service.$api_save_rebateConfig, params).subscribe((res: any) => { if (res) { this.service.msgSrv.success('新增成功！'); diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.ts b/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.ts index e769e5da..36035584 100644 --- a/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.ts +++ b/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.ts @@ -1,12 +1,10 @@ -import { ModalHelper } from '@delon/theme'; import { Component, OnInit, ViewChild } from '@angular/core'; -import { ActivatedRoute, Router } from '@angular/router'; -import { STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st'; -import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form'; -import { processSingleSort, ShipperBaseService } from '@shared'; +import { Router } from '@angular/router'; +import { STColumn, STComponent } from '@delon/abc/st'; +import { SFComponent, SFSchema, SFUISchema } from '@delon/form'; +import { ShipperBaseService } from '@shared'; import { NzModalService } from 'ng-zorro-antd/modal'; import { RebateManagementService } from '../../services/rebate-management.service'; -import { ParterRebateManageMenRecordDetailComponent } from '../../model/record-detail/record-detail.component'; import { ParterRebateManageMenAbnormalFeedbackComponent } from '../../model/abnormal-feedback/abnormal-feedback.component'; @Component({ @@ -25,19 +23,18 @@ export class ParterRebateManageMentSettingComponent implements OnInit { _$expand = false; constructor( public router: Router, - public ar: ActivatedRoute, public service: RebateManagementService, private modal: NzModalService, - public shipperservice: ShipperBaseService, + public shipperservice: ShipperBaseService ) {} /** - * 查询参数 - */ - get reqParams() { + * 查询参数 + */ + get reqParams() { const params: any = Object.assign({}, this.sf?.value || {}); - return { - ...params, - }; + return { + ...params + }; } ngOnInit() { this.initSF(); @@ -49,21 +46,20 @@ export class ParterRebateManageMentSettingComponent implements OnInit { properties: { configName: { type: 'string', - title: '模板名称', + title: '模板名称' }, stateLocked: { type: 'string', title: '状态', enum: [ - {label: '全部', value: ''}, - {label: '生效中', value: 1}, - {label: '失效', value: 0}, + { label: '全部', value: '' }, + { label: '生效中', value: 1 }, + { label: '失效', value: 0 } ], ui: { - widget: 'select', - }, - - }, + widget: 'select' + } + } } }; this.ui = { @@ -79,43 +75,42 @@ export class ParterRebateManageMentSettingComponent implements OnInit { { title: '模板名称', index: 'configName', - width: '200px', + width: '200px' }, { title: '等级类型', render: 'configType', - width: '200px', - + width: '200px' }, { title: '备注', index: 'remark', - width: '250px', + width: '250px' }, { title: '合伙人范围', render: 'partnerType', - width: '200px', + width: '200px' }, { title: '创建时间', index: 'enableTime', - width: '200px', + width: '200px' }, { title: '生效时间', index: 'enableTime', - width: '200px', + width: '200px' }, { title: '优先级', index: 'priority', - width: '100px', + width: '100px' }, { title: '状态', render: 'stateLocked', - width: '100px', + width: '100px' }, { title: '操作', @@ -126,20 +121,24 @@ export class ParterRebateManageMentSettingComponent implements OnInit { { text: '查看', acl: { ability: ['REBATE-SETTING-detail'] }, - click: _record => this.configAction(_record), + click: _record => this.configAction(_record) }, { text: '禁用', acl: { ability: ['REBATE-SETTING-forbidden'] }, - iif: (_record) =>{ return _record.stateLocked == true && (_record.partnerType == 3 || _record.partnerType == 2)}, - click: _record => this.viewEvaluate(_record), + iif: _record => { + return _record.stateLocked == true && (_record.partnerType == 3 || _record.partnerType == 2); + }, + click: _record => this.viewEvaluate(_record) }, { text: '启用', acl: { ability: ['REBATE-SETTING-startUseing'] }, - iif: (_record) =>{ return _record.stateLocked == false}, - click: _record => this.viewEvaluate(_record), - }, + iif: _record => { + return _record.stateLocked == false; + }, + click: _record => this.viewEvaluate(_record) + } ] } ]; @@ -147,52 +146,52 @@ export class ParterRebateManageMentSettingComponent implements OnInit { /** *禁用 */ - viewEvaluate(item: any) { - console.log(item.stateLocked); - let title = '' - let stateLocked: boolean; - if(item.stateLocked) { - title = '是否禁用该配置？' - stateLocked = false - } else { - title = '是否启用该配置？' - stateLocked = true - } + viewEvaluate(item: any) { + console.log(item.stateLocked); + let title = ''; + let stateLocked: boolean; + if (item.stateLocked) { + title = '是否禁用该配置？'; + stateLocked = false; + } else { + title = '是否启用该配置？'; + stateLocked = true; + } this.modal.confirm({ nzTitle: title, nzOnOk: () => { const params = { id: item?.id, - stateLocked: stateLocked, - } - this.service.request(this.service.$api_set_updateRebateConfig,params).subscribe((res: any) => { - if(res) { - this.service.msgSrv.success('设置成功！') - this.st.reload(); - } - }) + stateLocked: stateLocked + }; + this.service.request(this.service.$api_set_updateRebateConfig, params).subscribe((res: any) => { + if (res) { + this.service.msgSrv.success('设置成功！'); + this.st.reload(); + } + }); } }); } /** *查看 */ - feedback(item?: any) { - const modal = this.modal.create({ - nzTitle: '查看', - nzWidth: 580, - nzContent: ParterRebateManageMenAbnormalFeedbackComponent, - nzComponentParams: { i: item }, - nzFooter: null - }); - modal.afterClose.subscribe((res: any) => { - if (res) { - } - }); + feedback(item?: any) { + const modal = this.modal.create({ + nzTitle: '查看', + nzWidth: 580, + nzContent: ParterRebateManageMenAbnormalFeedbackComponent, + nzComponentParams: { i: item }, + nzFooter: null + }); + modal.afterClose.subscribe((res: any) => { + if (res) { + } + }); } configAction(value?: any) { - this.router.navigate(['/partner/rebate/setting/add/', '0'], {queryParams: value}) - } + this.router.navigate(['/partner/rebate/setting/add/', '0'], { queryParams: value }); + } /** * 重置表单 */ diff --git a/src/app/routes/partner/rebate-management/model/abnormal-feedback/abnormal-feedback.component.ts b/src/app/routes/partner/rebate-management/model/abnormal-feedback/abnormal-feedback.component.ts index 3d8c1fd4..4c4f36d9 100644 --- a/src/app/routes/partner/rebate-management/model/abnormal-feedback/abnormal-feedback.component.ts +++ b/src/app/routes/partner/rebate-management/model/abnormal-feedback/abnormal-feedback.component.ts @@ -1,5 +1,5 @@ /* - * @Description : + * @Description : * @Version : 1.0 * @Author : Shiming * @Date : 2022-03-10 14:50:45 @@ -8,15 +8,11 @@ * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\model\\abnormal-feedback\\abnormal-feedback.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ -import { ModalHelper } from '@delon/theme'; import { Component, OnInit, ViewChild } from '@angular/core'; -import { ActivatedRoute, Router } from '@angular/router'; -import { STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st'; -import { SFComponent, SFDateWidgetSchema, SFSchema, SFSelectWidgetSchema, SFTextareaWidgetSchema, SFUISchema } from '@delon/form'; -import { processSingleSort, ShipperBaseService } from '@shared'; -import { NzModalService, NzModalRef } from 'ng-zorro-antd/modal'; +import { SFComponent, SFSchema, SFTextareaWidgetSchema, SFUISchema } from '@delon/form'; +import { ShipperBaseService } from '@shared'; +import { NzModalRef } from 'ng-zorro-antd/modal'; import { RebateManagementService } from '../../services/rebate-management.service'; -import { NzButtonSize } from 'ng-zorro-antd/button'; @Component({ selector: 'app-parter-channel-rebate-management-abnormal-feedback', @@ -29,15 +25,7 @@ export class ParterRebateManageMenAbnormalFeedbackComponent implements OnInit { sf!: SFComponent; i!: any; data = [{ name1: 1111 }]; - constructor( - public router: Router, - public ar: ActivatedRoute, - public service: RebateManagementService, - private modalService: NzModalService, - public shipperservice: ShipperBaseService, - public modalRef: NzModalRef, - ) {} - + constructor(public service: RebateManagementService, public shipperservice: ShipperBaseService, public modalRef: NzModalRef) {} ngOnInit() { this.initSF(); @@ -53,20 +41,19 @@ export class ParterRebateManageMenAbnormalFeedbackComponent implements OnInit { ui: { widget: 'textarea', autosize: { minRows: 3, maxRows: 6 }, - placeholder:'请不要超过50个字' - } as SFTextareaWidgetSchema, - }, + placeholder: '请不要超过50个字' + } as SFTextareaWidgetSchema + } } }; this.ui = { '*': { spanLabelFixed: 60, - grid: { span: 16 }, + grid: { span: 16 } } }; } close() { - this.modalRef.destroy() + this.modalRef.destroy(); } } - diff --git a/src/app/routes/partner/rebate-management/model/record-detail/record-detail.component.ts b/src/app/routes/partner/rebate-management/model/record-detail/record-detail.component.ts index 1efde6a2..2af7dbcf 100644 --- a/src/app/routes/partner/rebate-management/model/record-detail/record-detail.component.ts +++ b/src/app/routes/partner/rebate-management/model/record-detail/record-detail.component.ts @@ -1,10 +1,8 @@ -import { ModalHelper } from '@delon/theme'; import { Component, OnInit, ViewChild } from '@angular/core'; -import { ActivatedRoute, Router } from '@angular/router'; -import { STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st'; -import { SFComponent, SFDateWidgetSchema, SFSchema, SFSelectWidgetSchema, SFUISchema } from '@delon/form'; -import { processSingleSort, ShipperBaseService } from '@shared'; -import { NzModalService, NzModalRef } from 'ng-zorro-antd/modal'; +import { STColumn, STComponent } from '@delon/abc/st'; +import { SFComponent, SFSchema, SFSelectWidgetSchema, SFUISchema } from '@delon/form'; +import { ShipperBaseService } from '@shared'; +import { NzModalRef } from 'ng-zorro-antd/modal'; import { RebateManagementService } from '../../services/rebate-management.service'; import { NzButtonSize } from 'ng-zorro-antd/button'; @@ -24,36 +22,29 @@ export class ParterRebateManageMenRecordDetailComponent implements OnInit { size: NzButtonSize = 'large'; _$expand = false; data = [{ name1: 1111 }]; - constructor( - public router: Router, - public ar: ActivatedRoute, - public service: RebateManagementService, - private modalService: NzModalService, - public shipperservice: ShipperBaseService, - public modalRef: NzModalRef, - ) {} + constructor(public service: RebateManagementService, public shipperservice: ShipperBaseService, public modalRef: NzModalRef) {} /** * 查询字段个数 */ get queryFieldCount(): number { return Object.keys(this.schema?.properties || {}).length; } - /** - * 伸缩查询条件 - */ - expandToggle(): void { - this._$expand = !this._$expand; - this.sf?.setValue('/_$expand', this._$expand); - } /** - * 查询参数 - */ - get reqParams() { + * 伸缩查询条件 + */ + expandToggle(): void { + this._$expand = !this._$expand; + this.sf?.setValue('/_$expand', this._$expand); + } + /** + * 查询参数 + */ + get reqParams() { const params: any = Object.assign({}, this.sf?.value || {}); delete params._$expand; - return { - ...params, - }; + return { + ...params + }; } ngOnInit() { this.initSF(); @@ -72,8 +63,8 @@ export class ParterRebateManageMenRecordDetailComponent implements OnInit { allowClear: true, asyncData: () => this.shipperservice.getNetworkFreightForwarder(), change: (value: any) => { - console.log(value) - this.st.reload() + console.log(value); + this.st.reload(); } } }, @@ -85,11 +76,11 @@ export class ParterRebateManageMenRecordDetailComponent implements OnInit { params: { dictKey: 'overall:payment:status' }, containsAllLabel: true, change: (value: any) => { - console.log(value) - this.st.reload() + console.log(value); + this.st.reload(); } } as SFSelectWidgetSchema - }, + } } }; this.ui = { @@ -165,7 +156,6 @@ export class ParterRebateManageMenRecordDetailComponent implements OnInit { this.st.load(1); } close() { - this.modalRef.destroy() + this.modalRef.destroy(); } } - diff --git a/src/app/routes/partner/recorded/components/detail/detail.component.ts b/src/app/routes/partner/recorded/components/detail/detail.component.ts index bbfad88e..08d5e9bc 100644 --- a/src/app/routes/partner/recorded/components/detail/detail.component.ts +++ b/src/app/routes/partner/recorded/components/detail/detail.component.ts @@ -1,7 +1,6 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { NzModalService } from 'ng-zorro-antd/modal'; -import { FreightAccountService } from 'src/app/routes/financial-management/services/freight-account.service'; import { RecordedService } from '../../services/recorded.service'; diff --git a/src/app/routes/supply-management/components/addmodal/addmodal.component.ts b/src/app/routes/supply-management/components/addmodal/addmodal.component.ts index 7497b56a..e157fc0a 100644 --- a/src/app/routes/supply-management/components/addmodal/addmodal.component.ts +++ b/src/app/routes/supply-management/components/addmodal/addmodal.component.ts @@ -1,5 +1,4 @@ import { Component, OnInit, ViewChild } from '@angular/core'; -import { Router, ActivatedRoute } from '@angular/router'; import { cacheConf } from '@conf/cache.conf'; import { STColumn, STComponent, STChange, STData } from '@delon/abc/st'; import { SFUISchema, SFSchema, SFComponent } from '@delon/form'; @@ -28,7 +27,7 @@ export class CarAddmodalComponent implements OnInit { constructor( private modal: NzModalRef, private eaCacheSrv: EACacheService, - public service: SupplyManagementService, private router: Router, private ar: ActivatedRoute, + public service: SupplyManagementService, private modalHelper: ModalHelper ) { } diff --git a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html index 7bd237d5..17924f87 100644 --- a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html +++ b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html @@ -39,7 +39,7 @@ name="loadName{{ idx }}" maxlength="30" placeholder="请输入联系人姓名" /> - @@ -74,7 +74,7 @@ name="unloadAddress{{ idx }}" placeholder="请输入联系人姓名" /> - 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 1229c193..a7ff5c1a 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 @@ -56,6 +56,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit { maxTrainNumber: 99999, maxFreight: 9999999 }; + patternStr = `^((13[0-9])|(14[0-1,4-9])|(15([0-3,5-9]))|(17[0-8])|(18[0-9])|(19[0-3,5-9])|(16[2,5,6,7]))\\d{8}$`; constructor( private http: _HttpClient, fb: FormBuilder, @@ -69,10 +70,10 @@ export class SupplyManagementBulkPublishComponent implements OnInit { this.validateForm1 = fb.group({ loadAddress0: [null, [Validators.required]], loadName0: [null, [Validators.required]], - loadPhone0: [null, [Validators.required, Validators.pattern('^[0-9]*$')]], + loadPhone0: [null, [Validators.required, Validators.pattern(this.patternStr)]], unloadAddress0: [null, [Validators.required]], unloadName0: [null, [Validators.required]], - unloadPhone0: [null, [Validators.required, Validators.pattern('^[0-9]*$')]] + unloadPhone0: [null, [Validators.required, Validators.pattern(this.patternStr)]] }); } @ViewChild('sf1', { static: false }) sf1!: SFComponent; @@ -1170,4 +1171,17 @@ export class SupplyManagementBulkPublishComponent implements OnInit { } }); } + onChangePhone(value: string): void { + console.log(value); + + this.updateValue(value); + } + updateValue(value: string): void { + const reg = /^-?(0|[1-9][0-9]*)(\.[0-9]*)?$/; + // if ((!isNaN(+value) && reg.test(value)) || value === '' || value === '-') { + // this.value = value; + // } + // this.inputElement!.nativeElement.value = this.value; + // this.updateTitle(); + } } diff --git a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html index a9b8a94f..cc8a2fc7 100644 --- a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html +++ b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html @@ -17,7 +17,7 @@
装卸货信息预计公里数：{{ totalDistance }}km，预计行程耗时：{{ totalTime }}小时
-
+
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 655daf5a..18ebcb55 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 @@ -1,6 +1,6 @@ import { Component, OnInit, ViewChild } from '@angular/core'; -import { NgForm } from '@angular/forms'; -import { ActivatedRoute, Router } from '@angular/router'; +import { FormBuilder, FormGroup, Validators, FormControl, NgForm } from '@angular/forms'; +import { Router } from '@angular/router'; import { SFComponent, SFSchema, @@ -9,7 +9,6 @@ import { SFTextareaWidgetSchema, SFUISchema } from '@delon/form'; -import { SettingsService, _HttpClient } from '@delon/theme'; import { ShipperBaseService } from '@shared'; import { NzModalService } from 'ng-zorro-antd/modal'; import { of } from 'rxjs'; @@ -20,7 +19,6 @@ import { PublishGoodsChooseFamifiarComponent } from '../choose-famifiar/choose-f import { PublishAddressListComponent } from '../onecar-publish/address-list/address-list.component'; import { PublishSuccessComponent } from '../onecar-publish/publish-success/publish-success.component'; import { TranAgreementComponent } from '../tran-agreement/tran-agreement.component'; -import differenceInCalendarDays from 'date-fns/differenceInCalendarDays'; import { SupplyManagementQrcodePageComponent } from '../qrcode-page/qrcode-page.component'; @Component({ selector: 'app-publish-goods-bulk-publish', @@ -28,7 +26,7 @@ import { SupplyManagementQrcodePageComponent } from '../qrcode-page/qrcode-page. styleUrls: ['./bulk-release-publish.component.less'] }) export class SupplyManagementBulkReleasePublishComponent implements OnInit { - @ViewChild('ngForm') + validateForm1: FormGroup; ngForm!: NgForm; sf1data: any; // 货源单设置回显 sf3data: any; // 货源单设置回显 @@ -50,6 +48,7 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit { maxFreight: 9999999 } shipperName = ''; + patternStr = `^((13[0-9])|(14[0-1,4-9])|(15([0-3,5-9]))|(17[0-8])|(18[0-9])|(19[0-3,5-9])|(16[2,5,6,7]))\\d{8}$`; // // 单位 startInfo: any[] = []; endInfo: any[] = []; @@ -57,16 +56,21 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit { totalTime = 0.0; //路程总时间 freightTypeOptions: any; constructor( - private http: _HttpClient, + fb: FormBuilder, private modalService: NzModalService, - private settingSrv: SettingsService, private service: SupplyManagementService, private router: Router, - private route: ActivatedRoute, private amapService: AmapService, public shipperSrv: ShipperBaseService ) { - + this.validateForm1 = fb.group({ + loadAddress0: [null, [Validators.required]], + loadName0: [null, [Validators.required]], + loadPhone0: [null, [Validators.required, Validators.pattern(this.patternStr)]], + unloadAddress0: [null, [Validators.required]], + unloadName0: [null, [Validators.required]], + unloadPhone0: [null, [Validators.required, Validators.pattern(this.patternStr)]] + }); } @ViewChild('sf1', { static: false }) sf1!: SFComponent; schema1: SFSchema = {}; 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 aa0b4eae..b914b02d 100644 --- a/src/app/routes/supply-management/components/bulk/bulk.component.ts +++ b/src/app/routes/supply-management/components/bulk/bulk.component.ts @@ -79,7 +79,9 @@ export class SupplyManagementBulkComponent extends BasicTableComponent implement beforeReq = (requestOptions: STRequestOptions) => { const a: any = {}; if (this.resourceStatus) { - a.resourceStatus = this.resourceStatus; + Object.assign(requestOptions.body, { + resourceStatus: this.resourceStatus + }); } const params: any = Object.assign({}, this.sf?.value || {}); delete params._$expand; diff --git a/src/app/routes/supply-management/components/choose-famifiar/add/add.component.ts b/src/app/routes/supply-management/components/choose-famifiar/add/add.component.ts index 383d919d..ed4315a7 100644 --- a/src/app/routes/supply-management/components/choose-famifiar/add/add.component.ts +++ b/src/app/routes/supply-management/components/choose-famifiar/add/add.component.ts @@ -1,9 +1,5 @@ -import { AfterViewInit, ChangeDetectorRef, Component, OnChanges, OnInit, ViewChild } from '@angular/core'; -import { ActivatedRoute } from '@angular/router'; -import { SFComponent, SFSchema, SFSchemaEnumType, SFUISchema } from '@delon/form'; -import { _HttpClient } from '@delon/theme'; -import { NzModalRef } from 'ng-zorro-antd/modal'; -import { map } from 'rxjs/operators'; +import { Component, OnInit, ViewChild } from '@angular/core'; +import { SFComponent, SFSchema, SFUISchema } from '@delon/form'; @Component({ selector: 'app-choose-famifiar-add', @@ -16,7 +12,7 @@ export class PublishchooseFamifiarAddComponent implements OnInit { i: any; - constructor(public http: _HttpClient, private cdr: ChangeDetectorRef, private route: ActivatedRoute) {} + constructor() {} ngOnInit(): void { this.initSF(); diff --git a/src/app/routes/supply-management/components/choose-famifiar/choose-famifiar.component.ts b/src/app/routes/supply-management/components/choose-famifiar/choose-famifiar.component.ts index 3b5ada90..4486fca5 100644 --- a/src/app/routes/supply-management/components/choose-famifiar/choose-famifiar.component.ts +++ b/src/app/routes/supply-management/components/choose-famifiar/choose-famifiar.component.ts @@ -1,10 +1,8 @@ import { Component, Input, OnInit, ViewChild } from '@angular/core'; -import { ActivatedRoute, Router } from '@angular/router'; import { STColumn, STComponent, STData } from '@delon/abc/st'; import { SFComponent, SFSchema, SFUISchema } from '@delon/form'; import { ModalHelper } from '@delon/theme'; import { EAEnvironmentService } from '@shared'; -import { NzDrawerService } from 'ng-zorro-antd/drawer'; import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal'; import { SupplyManagementAddDriversComponent } from 'src/app/routes/supply-management/components/add-drivers/add-drivers.component'; import { SupplyManagementService } from '../../services/supply-management.service'; @@ -39,9 +37,6 @@ export class PublishGoodsChooseFamifiarComponent implements OnInit { constructor( private modal: NzModalRef, - public router: Router, - public ar: ActivatedRoute, - private drawerService: NzDrawerService, public service: SupplyManagementService, private modalService: NzModalService, private modalHelper: ModalHelper, diff --git a/src/app/routes/supply-management/components/choose-famifiar/set-captain/set-captain.component.ts b/src/app/routes/supply-management/components/choose-famifiar/set-captain/set-captain.component.ts index 67562dea..e618d25a 100644 --- a/src/app/routes/supply-management/components/choose-famifiar/set-captain/set-captain.component.ts +++ b/src/app/routes/supply-management/components/choose-famifiar/set-captain/set-captain.component.ts @@ -8,12 +8,9 @@ * @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\choose-famifiar\\set-captain\\set-captain.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ -import { AfterViewInit, ChangeDetectorRef, Component, OnChanges, OnInit, ViewChild } from '@angular/core'; -import { ActivatedRoute } from '@angular/router'; -import { SFComponent, SFSchema, SFSchemaEnumType, SFUISchema } from '@delon/form'; -import { _HttpClient } from '@delon/theme'; +import { Component, OnInit, ViewChild } from '@angular/core'; +import { SFComponent, SFSchema, SFUISchema } from '@delon/form'; import { NzModalRef } from 'ng-zorro-antd/modal'; -import { map } from 'rxjs/operators'; @Component({ selector: 'app-choose-famifiar-set-captain', @@ -26,7 +23,7 @@ export class PublishchooseFamifiarSetCaptainComponent implements OnInit { i: any; - constructor(public http: _HttpClient, private cdr: ChangeDetectorRef, private route: ActivatedRoute, private modal: NzModalRef,) {} + constructor( private modal: NzModalRef,) {} ngOnInit(): void { this.initSF(); diff --git a/src/app/routes/supply-management/components/onecar-publish/address-list/address-list.component.ts b/src/app/routes/supply-management/components/onecar-publish/address-list/address-list.component.ts index 9dcc4ec0..c8def574 100644 --- a/src/app/routes/supply-management/components/onecar-publish/address-list/address-list.component.ts +++ b/src/app/routes/supply-management/components/onecar-publish/address-list/address-list.component.ts @@ -10,11 +10,8 @@ */ import { Component, OnInit, ViewChild } from '@angular/core'; -import { ActivatedRoute, Router } from '@angular/router'; import { STChange, STColumn, STComponent, STRequestOptions } from '@delon/abc/st'; import { processSingleSort } from '@shared'; -import { NzDrawerService } from 'ng-zorro-antd/drawer'; -import { NzModalService } from 'ng-zorro-antd/modal'; import { SupplyManagementService } from '../../../services/supply-management.service'; @Component({ selector: 'app-publish-address-list', @@ -30,11 +27,7 @@ export class PublishAddressListComponent implements OnInit { spuStatus = '1'; // '1'客户地址，'2'收回单地址 constructor( - public router: Router, - public ar: ActivatedRoute, - private drawerService: NzDrawerService, public service: SupplyManagementService, - private modalService: NzModalService ) {} /** 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 9efffd38..06631777 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 @@ -43,6 +43,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { intervalDays: 999, maxTimes: 5 }; + patternStr = `^((13[0-9])|(14[0-1,4-9])|(15([0-3,5-9]))|(17[0-8])|(18[0-9])|(19[0-3,5-9])|(16[2,5,6,7]))\\d{8}$`; sf1data: any; // 货源单设置回显 sf3data: any; // 货源单设置回显 sf4data: any; // 货源单设置回显 @@ -78,7 +79,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { ) { this.validateForm1 = fb.group({ loadingTime: [null, [Validators.required]], - unloadingTime: [null, [Validators.required]] + unloadingTime: [null, [Validators.required]], }); this.envCache = this.eaCacheSrv.get(cacheConf.env); } @@ -806,7 +807,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { }); this.validateForm1.addControl(`loadAddress${controlId}`, new FormControl(null, Validators.required)); this.validateForm1.addControl(`loadName${controlId}`, new FormControl(null, Validators.required)); - this.validateForm1.addControl(`loadPhone${controlId}`, new FormControl(null, [Validators.required, Validators.pattern('^[0-9]*$')])); + this.validateForm1.addControl(`loadPhone${controlId}`, new FormControl(null, [Validators.required, Validators.pattern(this.patternStr)])); } } @@ -862,7 +863,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { this.validateForm1.addControl(`unloadName${controlId}`, new FormControl(null, Validators.required)); this.validateForm1.addControl( `unloadPhone${controlId}`, - new FormControl(null, [Validators.required, Validators.pattern('^[0-9]*$')]) + new FormControl(null, [Validators.required, Validators.pattern(this.patternStr)]) ); } } @@ -1370,6 +1371,15 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { this.sf7.setValue('/toPay', this.sf7data.toPay); this.sf7.setValue('/receiptPay', this.sf7data.receiptPay); this.payChange(); + // console.log('88888'); + + // this.validateForm1.reset(); + // for (const key in this.validateForm1.controls) { + // if (this.validateForm1.controls.hasOwnProperty(key)) { + // this.validateForm1.controls[key].markAsPristine(); + // this.validateForm1.controls[key].updateValueAndValidity(); + // } + // } } // 选择地址 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 a457bfcd..d9ae116f 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 @@ -52,6 +52,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit { totalTime = 0.0; //路程总时间 currentRate = 0; //实时计算的费率 shipperName = ''; + patternStr = `^((13[0-9])|(14[0-1,4-9])|(15([0-3,5-9]))|(17[0-8])|(18[0-9])|(19[0-3,5-9])|(16[2,5,6,7]))\\d{8}$`; constructor( private http: _HttpClient, fb: FormBuilder, @@ -67,10 +68,10 @@ export class SupplyManagementReleasePublishComponent implements OnInit { this.validateForm1 = fb.group({ loadAddress0: [null, [Validators.required]], loadName0: [null, [Validators.required]], - loadPhone0: [null, [Validators.required, Validators.pattern('^[0-9]*$')]], + loadPhone0: [null, [Validators.required, Validators.pattern(this.patternStr)]], unloadAddress0: [null, [Validators.required]], unloadName0: [null, [Validators.required]], - unloadPhone0: [null, [Validators.required, Validators.pattern('^[0-9]*$')]], + unloadPhone0: [null, [Validators.required, Validators.pattern(this.patternStr)]], loadingTime: [null, [Validators.required]], unloadingTime: [null, [Validators.required]] }); @@ -609,7 +610,6 @@ export class SupplyManagementReleasePublishComponent implements OnInit { receiptUserPhone: { type: 'string', title: '联系电话', - format: 'mobile', maxLength: 11, ui: { errors: { @@ -836,7 +836,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit { }); this.validateForm1.addControl(`loadAddress${controlId}`, new FormControl(null, Validators.required)); this.validateForm1.addControl(`loadName${controlId}`, new FormControl(null, Validators.required)); - this.validateForm1.addControl(`loadPhone${controlId}`, new FormControl(null, [Validators.required, Validators.pattern('^[0-9]*$')])); + this.validateForm1.addControl(`loadPhone${controlId}`, new FormControl(null, [Validators.required, Validators.pattern(this.patternStr)])); } } // 添加 删除发货卸货地址 @@ -865,7 +865,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit { this.validateForm1.addControl(`unloadName${controlId}`, new FormControl(null, Validators.required)); this.validateForm1.addControl( `unloadPhone${controlId}`, - new FormControl(null, [Validators.required, Validators.pattern('^[0-9]*$')]) + new FormControl(null, [Validators.required, Validators.pattern(this.patternStr)]) ); } } 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 83354853..9935181c 100644 --- a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts @@ -75,7 +75,9 @@ export class SupplyManagementVehicleComponent extends BasicTableComponent implem ...params }; if (this.resourceStatus) { - a.resourceStatus = this.resourceStatus; + Object.assign(requestOptions.body, { + resourceStatus: this.resourceStatus + }); } if (this.sf) { Object.assign(requestOptions.body, { diff --git a/src/app/routes/ticket-management/components/billing-order/billing-order.component.html b/src/app/routes/ticket-management/components/billing-order/billing-order.component.html index f23247bb..c4db52cd 100644 --- a/src/app/routes/ticket-management/components/billing-order/billing-order.component.html +++ b/src/app/routes/ticket-management/components/billing-order/billing-order.component.html @@ -31,7 +31,7 @@
+ [loading]="false" [scroll]="{ x:'1200px', y: scrollY }"> {{item.billTypeLabel + item.serviceTypeLabel}} diff --git a/src/app/routes/usercenter/components/driver/captain/captain.component.ts b/src/app/routes/usercenter/components/driver/captain/captain.component.ts index d197169b..247bdc96 100644 --- a/src/app/routes/usercenter/components/driver/captain/captain.component.ts +++ b/src/app/routes/usercenter/components/driver/captain/captain.component.ts @@ -58,9 +58,6 @@ export class UserCenterComponentsDriverCaptainComponent extends BasicTableCompon } ngOnInit() { - this.ar.url.subscribe(params => { - this.st?.load(1); - }); } dataProcess(data: STData[]): STData[] { return data.map((i, index) => { diff --git a/src/app/routes/usercenter/components/driver/driver.component.ts b/src/app/routes/usercenter/components/driver/driver.component.ts index d903300b..0b803729 100644 --- a/src/app/routes/usercenter/components/driver/driver.component.ts +++ b/src/app/routes/usercenter/components/driver/driver.component.ts @@ -63,9 +63,6 @@ export class UserCenterComponentsDriverComponent extends BasicTableComponent imp } ngOnInit() { - this.ar.url.subscribe(params => { - this.st?.load(1); - }); } selectChange(e: any) { diff --git a/src/app/routes/usercenter/components/freight/list/detail/detail.component.html b/src/app/routes/usercenter/components/freight/list/detail/detail.component.html index befa6692..5e4d39ca 100644 --- a/src/app/routes/usercenter/components/freight/list/detail/detail.component.html +++ b/src/app/routes/usercenter/components/freight/list/detail/detail.component.html @@ -48,30 +48,31 @@ 保存 @@ -557,4 +558,4 @@
- + \ No newline at end of file diff --git a/src/app/routes/usercenter/components/freight/list/list.component.ts b/src/app/routes/usercenter/components/freight/list/list.component.ts index adb7e904..020eb8c4 100644 --- a/src/app/routes/usercenter/components/freight/list/list.component.ts +++ b/src/app/routes/usercenter/components/freight/list/list.component.ts @@ -25,8 +25,6 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen loadingList = true; - sfValue = { enterpriseName: '', contactName: '' }; - constructor( public service: UsermanageService, private modal: NzModalService, @@ -36,6 +34,7 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen public searchDrawerService: SearchDrawerService ) { super(searchDrawerService); + this.sfValue = { enterpriseName: '', contactName: '' }; } ngOnInit() { @@ -49,23 +48,23 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen beforeReq = (requestOptions: STRequestOptions) => { Object.assign(requestOptions.body, { listSource: 1 }); - if (this.sf) { + if (this.sfValue) { Object.assign(requestOptions.body, { - ...this.sf?.value + ...this.sfValue }); - if (this.sf?.value.createTime) { + if (this.sfValue.createTime) { Object.assign(requestOptions.body, { createTime: { - start: this.sf?.value.createTime[0], - end: this.sf?.value.createTime[1] + start: this.sfValue.createTime[0], + end: this.sfValue.createTime[1] } }); } - if (this.sf?.value.approvalTime) { + if (this.sfValue.approvalTime) { Object.assign(requestOptions.body, { approvalTime: { - start: this.sf?.value.approvalTime[0], - end: this.sf?.value.approvalTime[1] + start: this.sfValue.approvalTime[0], + end: this.sfValue.approvalTime[1] } }); } @@ -518,7 +517,7 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen const params = { listSource: 1, pageSize: -1 }; if (this.sf) { Object.assign(params, { - ...this.sf?.value + ...this.sfValue }); } this.service.downloadFile(this.service.$api_export_enterprise, params); diff --git a/src/app/routes/usercenter/components/freight/user/user.component.ts b/src/app/routes/usercenter/components/freight/user/user.component.ts index 58e2f015..53e29aa0 100644 --- a/src/app/routes/usercenter/components/freight/user/user.component.ts +++ b/src/app/routes/usercenter/components/freight/user/user.component.ts @@ -36,11 +36,7 @@ export class FreightComponentsUserComponent extends BasicTableComponent implemen this.st?.load(1); } - ngOnInit() { - this.ar.url.subscribe(params => { - this.st?.load(1); - }); - } + ngOnInit() {} beforeReq = (requestOptions: STRequestOptions) => { Object.assign(requestOptions.body, { certificationStatus: this.resourceStatus }); diff --git a/src/app/routes/vehicle/components/audit/audit.component.ts b/src/app/routes/vehicle/components/audit/audit.component.ts index bc5fd25f..b6d1a88d 100644 --- a/src/app/routes/vehicle/components/audit/audit.component.ts +++ b/src/app/routes/vehicle/components/audit/audit.component.ts @@ -56,9 +56,6 @@ export class VehicleComponentsAuditComponent extends BasicTableComponent impleme ngOnInit() { this.initSF(); this.initST(); - this.ar.url.subscribe(params => { - this.st?.load(1); - }); } search() { diff --git a/src/app/routes/vehicle/components/list/list.component.ts b/src/app/routes/vehicle/components/list/list.component.ts index 96e68569..3ffe25b9 100644 --- a/src/app/routes/vehicle/components/list/list.component.ts +++ b/src/app/routes/vehicle/components/list/list.component.ts @@ -48,9 +48,6 @@ export class VehicleComponentsListComponent extends BasicTableComponent implemen ngOnInit() { this.initSF(); this.initST(); - this.ar.url.subscribe(params => { - this.st?.load(1); - }); } dataProcess(data: STData[]): STData[] { return data.map((i, index) => {