Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Taric Xin
2022-05-09 10:40:56 +08:00
parent 07106650d8 1f462ebdfe
commit 2d022b500d
66 changed files with 547 additions and 672 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
proxy.conf.js
View File

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2022-01-18 09:51:21 * @Date : 2022-01-18 09:51:21
* @LastEditors : Shiming * @LastEditors : Shiming
* @LastEditTime : 2022-05-07 14:49:15 * @LastEditTime : 2022-05-07 17:54:06
* @FilePath : \\tms-obc-web\\proxy.conf.js * @FilePath : \\tms-obc-web\\proxy.conf.js
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
*/ */

75
src/app/routes/account/components/edit-password/edit-password.component.ts
View File

@ -1,5 +1,5 @@
/* /*
* @Description : * @Description :
* @Version : 1.0 * @Version : 1.0
* @Author : Shiming * @Author : Shiming
* @Date : 2021-12-27 10:30:56 * @Date : 2021-12-27 10:30:56
@ -9,14 +9,11 @@
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
*/ */
import { Component, Inject, OnInit, ViewChild } from '@angular/core'; import { Component, Inject, OnInit } from '@angular/core';
import { FormBuilder, FormControl, FormGroup, ValidatorFn, Validators } from '@angular/forms'; import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
import { ActivatedRoute, Router } from '@angular/router'; import { Router } from '@angular/router';
import { STChange, STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st';
import { DA_SERVICE_TOKEN, ITokenService } from '@delon/auth'; 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 { NzFormTooltipIcon } from 'ng-zorro-antd/form';
import { NzModalRef } from 'ng-zorro-antd/modal'; import { NzModalRef } from 'ng-zorro-antd/modal';
import { AccountService } from '../../services/account.service'; import { AccountService } from '../../services/account.service';
@ -30,14 +27,13 @@ export class AccountComponentsCenterEditComponent implements OnInit {
record: any; record: any;
count = 0; count = 0;
type = 'create'; type = 'create';
isVisibleView = false isVisibleView = false;
passwordVisible = false; passwordVisible = false;
passwordVisible2 = false; passwordVisible2 = false;
password: any; password: any;
password2: any; password2: any;
interval$: any; interval$: any;
confirmationValidator = confirmationValidator = (control: FormControl): { [s: string]: boolean } => {
(control: FormControl): { [s: string]: boolean } => {
if (!control.value) { if (!control.value) {
return { required: true }; return { required: true };
} else if (control?.value !== this.validateForm?.value?.passWord) { } else if (control?.value !== this.validateForm?.value?.passWord) {
@ -51,7 +47,6 @@ export class AccountComponentsCenterEditComponent implements OnInit {
}; };
constructor( constructor(
public router: Router, public router: Router,
public ar: ActivatedRoute,
private modalRef: NzModalRef, private modalRef: NzModalRef,
private fb: FormBuilder, private fb: FormBuilder,
public service: AccountService, public service: AccountService,
@ -61,19 +56,21 @@ export class AccountComponentsCenterEditComponent implements OnInit {
ngOnInit() { ngOnInit() {
this.initForm(); this.initForm();
} }
initForm () { initForm() {
this.validateForm = this.fb.group({ this.validateForm = this.fb.group({
passWord: [null, passWord: [
[ null,
Validators.required, [
Validators.maxLength(16), Validators.required,
Validators.minLength(8), Validators.maxLength(16),
Validators.pattern('^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z-_]{8,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]], ],
}); passWordTo: [null, [Validators.required, Validators.maxLength(16), Validators.minLength(8), this.confirmationValidator]],
} smsVerifyCode: [null, [Validators.required]]
});
}
destroyModal(): void { destroyModal(): void {
this.modalRef.destroy(); this.modalRef.destroy();
} }
@ -84,28 +81,28 @@ export class AccountComponentsCenterEditComponent implements OnInit {
this.service.msgSrv.success('发送成功'); this.service.msgSrv.success('发送成功');
e.preventDefault(); e.preventDefault();
this.codeCountDown(); this.codeCountDown();
}else { } else {
this.service.msgSrv.success(res.msg); this.service.msgSrv.success(res.msg);
} }
}); });
} }
save() { save() {
if(!this.validateForm.valid) { if (!this.validateForm.valid) {
this.service.msgSrv.warning('必填项为空或格式错误，请检查！') this.service.msgSrv.warning('必填项为空或格式错误，请检查！');
return; return;
} }
const params = { const params = {
...this.validateForm.value ...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) { if (res) {
this.service.msgSrv.success('修改密码成功！'); this.service.msgSrv.success('修改密码成功！');
this.isVisibleView = true; this.isVisibleView = true;
setTimeout(() => { setTimeout(() => {
this.tokenService.clear(); this.tokenService.clear();
this.router.navigate(['/passport/login']) this.router.navigate(['/passport/login']);
this.modalRef.close() this.modalRef.close();
}, 3000) }, 3000);
} }
}); });
} }
@ -120,11 +117,11 @@ export class AccountComponentsCenterEditComponent implements OnInit {
}, 1000); }, 1000);
} }
handleCancel() { handleCancel() {
this.isVisibleView = false this.isVisibleView = false;
} }
handleOK() { handleOK() {
this.modalRef.close() this.modalRef.close();
this.tokenService.clear(); this.tokenService.clear();
this.router.navigate(['/passport/login']) this.router.navigate(['/passport/login']);
} }
} }

7
src/app/routes/commom/less/commom-table.less
View File

@ -113,9 +113,10 @@
line-height: 21px; line-height: 21px;
} }
// .text-truncate { .text-truncate {
// white-space: normal; white-space: normal;
// } }
// 强制头部居中 // 强制头部居中
.ant-table-container table>thead>tr>.options { .ant-table-container table>thead>tr>.options {
text-align: center !important; text-align: center !important;

3
src/app/routes/contract-management/components/contract-frame/contract-frame.component.html
View File

@ -80,7 +80,8 @@
(change)="stChange($event)" (change)="stChange($event)"
> >
<ng-template st-row="contractCode" let-item let-index="index"> <ng-template st-row="contractCode" let-item let-index="index">
<a [routerLink]="'/contract-management/index/detail/' + item.id">{{ item?.contractCode }}</a> <a *ngIf="item.esignFlowStatus == '2'" (click)="service.openURL(item?.contractFilePath)">{{ item?.contractCode }}</a>
<a *ngIf="item.esignFlowStatus !== '2'" [routerLink]="'/contract-management/index/detail/' + item.id">{{ item?.contractCode }}</a>
</ng-template> </ng-template>
</st> </st>
</nz-card> </nz-card>

6
src/app/routes/contract-management/components/contract-list/contract-list.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2021-12-07 15:57:49 * @Date : 2021-12-07 15:57:49
* @LastEditors : Shiming * @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 * @FilePath : \\tms-obc-web\\src\\app\\routes\\contract-management\\components\\contract-list\\contract-list.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
--> -->
@ -51,8 +51,8 @@
<st #st [data]="service.$api_listDetailed_page" [columns]="columns" [req]="{ params: reqParams }" [loading]="false" <st #st [data]="service.$api_listDetailed_page" [columns]="columns" [req]="{ params: reqParams }" [loading]="false"
[scroll]="{ x: '1200px', y: '370px' }" (change)="stChange($event)"> [scroll]="{ x: '1200px', y: '370px' }" (change)="stChange($event)">
<ng-template st-row="contractCode" let-item let-index="index"> <ng-template st-row="contractCode" let-item let-index="index">
<a (click)="service.openURL(item?.contractFilePath)">{{ item?.contractCode }}</a> <a *ngIf="item.esignFlowStatus == '2'" (click)="service.openURL(item?.contractFilePath)">{{ item?.contractCode }}</a>
<!-- <a [routerLink]="'/contract-management/index/detail/' + item.id">{{ item?.contractCode }}</a> --> <a *ngIf="item.esignFlowStatus !== '2'" [routerLink]="'/contract-management/index/detail/' + item.id">{{ item?.contractCode }}</a>
</ng-template> </ng-template>
<ng-template st-row="signingObject" let-item let-index="index"> <ng-template st-row="signingObject" let-item let-index="index">
<span *ngIf="item.signingObject == 0"></span> <span *ngIf="item.signingObject == 0"></span>

5
src/app/routes/contract-management/components/contract-partner/contract-partner.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2022-01-07 13:29:57 * @Date : 2022-01-07 13:29:57
* @LastEditors : Shiming * @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 * @FilePath : \\tms-obc-web\\src\\app\\routes\\contract-management\\components\\contract-partner\\contract-partner.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
--> -->
@ -80,7 +80,8 @@
(change)="stChange($event)" (change)="stChange($event)"
> >
<ng-template st-row="contractCode" let-item let-index="index"> <ng-template st-row="contractCode" let-item let-index="index">
<a [routerLink]="'/contract-management/index/detail/' + item.id">{{ item?.contractCode }}</a> <a *ngIf="item.esignFlowStatus == '2'" (click)="service.openURL(item?.contractFilePath)">{{ item?.contractCode }}</a>
<a *ngIf="item.esignFlowStatus !== '2'" [routerLink]="'/contract-management/index/detail/' + item.id">{{ item?.contractCode }}</a>
</ng-template> </ng-template>
</st> </st>
</nz-card> </nz-card>

2
src/app/routes/datatable/components/operationtable/operationtable.component.ts
View File

@ -86,6 +86,8 @@ export class DatatableOperationtableComponent implements OnInit {
this.service.request(this.service.$api_operationalReportHistogram, params).subscribe(res => { this.service.request(this.service.$api_operationalReportHistogram, params).subscribe(res => {
if (res) { if (res) {
this.chartData = res this.chartData = res
this.pillar.reRender()
this.curve.reRender()
if(flag) { // 除第一次加载外 if(flag) { // 除第一次加载外
this.pillar.reRender() this.pillar.reRender()
this.curve.reRender() this.curve.reRender()

6
src/app/routes/download/components/list/list.component.ts
View File

@ -1,8 +1,6 @@
import { Component, OnInit, ViewChild } from '@angular/core'; import { Component, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router'; import { STColumn, STComponent, STData } from '@delon/abc/st';
import { STChange, STColumn, STComponent, STData } from '@delon/abc/st';
import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form'; import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
import { _HttpClient } from '@delon/theme';
import { NzModalService } from 'ng-zorro-antd/modal'; import { NzModalService } from 'ng-zorro-antd/modal';
import { DownloadService } from '../../services/download.service'; import { DownloadService } from '../../services/download.service';
@ -16,7 +14,7 @@ export class DownloadComponentsListComponent implements OnInit {
columns: STColumn[] = []; columns: STColumn[] = [];
@ViewChild('st', { static: false }) st!: STComponent; @ViewChild('st', { static: false }) st!: STComponent;
@ViewChild('sf', { static: false }) sf!: SFComponent; @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) {}
/** /**
* 查询参数 * 查询参数

8
src/app/routes/financial-management/components/cost-management/cost-management.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2021-12-30 19:36:30 * @Date : 2021-12-30 19:36:30
* @LastEditors : Shiming * @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 * @FilePath : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\cost-management\\cost-management.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
--> -->
@ -50,11 +50,11 @@
</div> --> </div> -->
<st #st [data]="service.$api_get_cost_page" [columns]="columns" [req]="{ process: beforeReq }" [page]="{}" <st #st [data]="service.$api_get_cost_page" [columns]="columns" [req]="{ process: beforeReq }" [page]="{}"
[loading]="false" [scroll]="{ x: '2000px',y:scrollY }"> [loading]="false" [scroll]="{ x: '2000px',y:scrollY }">
<ng-template st-row="armoeny" let-item let-index="index"> <!-- <ng-template st-row="armoeny" let-item let-index="index">
{{ item.armoeny | currency }} {{ item.armoeny | currency }}
</ng-template> </ng-template> -->
<ng-template st-row="hrmoney" let-item let-index="index"> <ng-template st-row="hrmoney" let-item let-index="index">
{{ item.hrmoney | currency }} {{ item.armoeny ? (item.armoeny| currency ): '--' }} / {{ item.hrmoney? (item.hrmoney | currency) : '--'}}
</ng-template> </ng-template>
<ng-template st-row="artocode" let-item let-index="index"> {{ item.cnoCode }}/{{ item.cnoName }} </ng-template> <ng-template st-row="artocode" let-item let-index="index"> {{ item.cnoCode }}/{{ item.cnoName }} </ng-template>
<ng-template st-row="hrpaymoney" let-item let-index="index"> <ng-template st-row="hrpaymoney" let-item let-index="index">

4
src/app/routes/financial-management/components/cost-management/cost-management.component.ts
View File

@ -252,8 +252,8 @@ export class CostManagementComponent extends BasicTableComponent implements OnIn
{ title: '结算客户', render: 'artocode', width: 200, className: 'text-left' }, { title: '结算客户', render: 'artocode', width: 200, className: 'text-left' },
{ title: '应收对象', index: 'artoname', width: 200, className: 'text-left' }, { title: '应收对象', index: 'artoname', width: 200, className: 'text-left' },
{ title: '应付对象', index: 'hrtoname', 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: 'hrpaymoney', width: 150, className: 'text-right' },
{ title: '开/收票金额', render: 'hrvatmoney', width: 150, className: 'text-right' }, { title: '开/收票金额', render: 'hrvatmoney', width: 150, className: 'text-right' },
{ title: '创建时间', index: 'createTime', type: 'date', width: 200, className: 'text-center' }, { title: '创建时间', index: 'createTime', type: 'date', width: 200, className: 'text-center' },

2
src/app/routes/financial-management/components/payment-order/payment-order.component.ts
View File

@ -213,7 +213,7 @@ export class PaymentOrderComponent extends BasicTableComponent implements OnInit
{ title: '收款人', index: 'hrToLabel', width: 150 }, { title: '收款人', index: 'hrToLabel', width: 150 },
{ title: '应付已核销', index: 'ishrhxLabel', width: 150 }, { title: '应付已核销', index: 'ishrhxLabel', width: 150 },
{ title: '确认日期', index: 'payDate2', type: 'date', className: 'text-center', 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: 'createUserIdLabel', width: 160 },
{ title: '付款备注', index: 'payRemarks', width: 200 }, { title: '付款备注', index: 'payRemarks', width: 200 },
{ {

1
src/app/routes/financial-management/components/receivable-order/receivable-order.component.html
View File

@ -48,6 +48,7 @@
<div></div> <div></div>
<div class="mr-sm"> <div class="mr-sm">
<button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()">筛选</button> <button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()">筛选</button>
<button nz-button nzDanger> 导出</button>
</div> </div>
</div> </div>

9
src/app/routes/financial-management/components/refund-record/refund-record.component.ts
View File

@ -65,6 +65,7 @@ export class RefundRecordComponent extends BasicTableComponent implements OnInit
{ {
label: '拒绝', label: '拒绝',
type: 'default', type: 'default',
loading: () => this.service.http.loading,
onClick: () => { onClick: () => {
if (!this.msg) { if (!this.msg) {
this.service.msgSrv.warning('请填写原因'); this.service.msgSrv.warning('请填写原因');
@ -88,6 +89,7 @@ export class RefundRecordComponent extends BasicTableComponent implements OnInit
{ {
label: '通过', label: '通过',
type: 'primary', type: 'primary',
loading: () => this.service.http.loading,
onClick: () => { onClick: () => {
this.service this.service
.request(this.service.$api_agree_refund_record, { .request(this.service.$api_agree_refund_record, {
@ -172,6 +174,13 @@ export class RefundRecordComponent extends BasicTableComponent implements OnInit
placeholder: '请输入' placeholder: '请输入'
} }
}, },
captainName: {
type: 'string',
title: '收款人',
ui: {
placeholder: '请输入'
}
},
enterpriseProjectName: { enterpriseProjectName: {
type: 'string', type: 'string',
title: '所属项目', title: '所属项目',

13
src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.html
View File

@ -1,3 +1,13 @@
<!--
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-04-28 20:27:07
* @LastEditors : Shiming
* @LastEditTime : 2022-05-07 16:22:32
* @FilePath : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\voucher-summary\\voucher-summary.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<!-- <page-header-wrapper [title]="'凭证汇总'"> <!-- <page-header-wrapper [title]="'凭证汇总'">
</page-header-wrapper> </page-header-wrapper>
@ -29,7 +39,8 @@
<div class="mr-sm"> <div class="mr-sm">
<button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()" acl <button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()" acl
[acl-ability]="['FINANCIAL-VOUCHER-list']">筛选</button> [acl-ability]="['FINANCIAL-VOUCHER-list']">筛选</button>
<button nz-button nzDanger (click)='exportList()'> 导出</button> <button nz-button nzDanger acl
[acl-ability]="['FINANCIAL-VOUCHER-SUMMARY-export']" (click)='exportList()'> 导出</button>
</div> </div>
</div> </div>
<st #st [data]="service.$api_get_fico_vch_page" [columns]="columns" [req]="{ process: beforeReq }" [page]="{}" <st #st [data]="service.$api_get_fico_vch_page" [columns]="columns" [req]="{ process: beforeReq }" [page]="{}"

14
src/app/routes/insurance-management/components/set/set.component.ts
View File

@ -8,15 +8,7 @@
* @FilePath : \\tms-obc-web\\src\\app\\routes\\insurance-management\\components\\set\\set.component.ts * @FilePath : \\tms-obc-web\\src\\app\\routes\\insurance-management\\components\\set\\set.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
*/ */
import { Router } from '@angular/router';
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { ActivatedRoute } from '@angular/router';
import { STColumn } from '@delon/abc/st';
import { _HttpClient } from '@delon/theme';
import { NzMessageService } from 'ng-zorro-antd/message';
import { NzModalService } from 'ng-zorro-antd/modal';
import { InsuranceManagementService } from '../../services/insurance-management.service';
import { NzCardComponent } from 'ng-zorro-antd/card';
@Component({ @Component({
selector: 'app-insurance-management-set', selector: 'app-insurance-management-set',
templateUrl: './set.component.html', templateUrl: './set.component.html',
@ -24,11 +16,7 @@ import { NzCardComponent } from 'ng-zorro-antd/card';
}) })
export class insuranceManagementSetComponent implements OnInit { export class insuranceManagementSetComponent implements OnInit {
constructor( constructor() {
private route: ActivatedRoute,
private msgSrv: NzMessageService,
private service: InsuranceManagementService,
) {
} }

19
src/app/routes/interface-docking/components/set/set.component.ts
View File

@ -9,32 +9,19 @@
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
*/ */
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { ActivatedRoute } from '@angular/router';
import { NzMessageService } from 'ng-zorro-antd/message';
import {InterfaceDockingService} from '../../services/interface-docking.service';
@Component({ @Component({
selector: 'app-interface-docking-set', selector: 'app-interface-docking-set',
templateUrl: './set.component.html', templateUrl: './set.component.html',
styleUrls: ['./set.component.less'] styleUrls: ['./set.component.less']
}) })
export class interfaceDockingSetComponent implements OnInit { export class interfaceDockingSetComponent implements OnInit {
constructor() {}
constructor(
private route: ActivatedRoute,
private msgSrv: NzMessageService,
private service: InterfaceDockingService,
) {
}
ngOnInit(): void { ngOnInit(): void {
this.initData() this.initData();
}
initData() {
} }
initData() {}
goBack() { goBack() {
window.history.go(-1); window.history.go(-1);
} }
} }

1
src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts
View File

@ -112,7 +112,6 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit {
public shipperservice: ShipperBaseService, public shipperservice: ShipperBaseService,
fb: FormBuilder, fb: FormBuilder,
private envSrv: EAEnvironmentService, private envSrv: EAEnvironmentService,
private ar: ActivatedRoute
) { ) {
this.validateForm1 = fb.group({ this.validateForm1 = fb.group({
loadTime: [null, []], loadTime: [null, []],

1
src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts
View File

@ -88,7 +88,6 @@ export class OrderManagementBulkeDetailComponent implements OnInit {
) {} ) {}
ngOnInit(): void { ngOnInit(): void {
console.log(this.route?.snapshot?.queryParams?.sts);
this.initData(); this.initData();
this.getTrajectory(); this.getTrajectory();
} }

2
src/app/routes/order-management/components/complaint-detail/complaint-detail.component.ts
View File

@ -37,8 +37,6 @@ export class OrderManagementComplaintDetailComponent implements OnInit {
if (this.id) if (this.id)
{ {
this.getDetail(this.id); this.getDetail(this.id);
console.log(this.ar.snapshot.queryParams.sts);
this.initSF(); this.initSF();
this.initSTAudit() this.initSTAudit()
} }

3
src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts
View File

@ -101,7 +101,6 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
private modalService: NzModalService, private modalService: NzModalService,
private amapService: AmapService, private amapService: AmapService,
public shipperservice: ShipperBaseService, public shipperservice: ShipperBaseService,
private ar: ActivatedRoute,
fb: FormBuilder, fb: FormBuilder,
private envSrv: EAEnvironmentService private envSrv: EAEnvironmentService
) { ) {
@ -566,7 +565,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
this.service.request(this.service.$api_set_modifyWholeOrder, params).subscribe((res: any) => { this.service.request(this.service.$api_set_modifyWholeOrder, params).subscribe((res: any) => {
if (res) { if (res) {
this.service.msgSrv.success('修改成功！'); this.service.msgSrv.success('修改成功！');
this.router.navigate(['/order-management/vehicle/vehicle-detail/', this.id], { relativeTo: this.ar }); this.router.navigate(['/order-management/vehicle/vehicle-detail/', this.id], { relativeTo: this.route });
} else { } else {
this.service.msgSrv.error(res?.msg); this.service.msgSrv.error(res?.msg);
} }

1
src/app/routes/order-management/components/vehicle/vehicle.component.ts
View File

@ -72,7 +72,6 @@ export class OrderManagementVehicleComponent extends BasicTableComponent impleme
private modal: NzModalService, private modal: NzModalService,
public shipperservice: ShipperBaseService, public shipperservice: ShipperBaseService,
public router: Router, public router: Router,
public ar: ActivatedRoute,
public searchDrawerService: SearchDrawerService public searchDrawerService: SearchDrawerService
) { ) {
super(searchDrawerService); super(searchDrawerService);

59
src/app/routes/partner/advice-feedback/components/list/list.component.ts
View File

@ -1,9 +1,7 @@
import { Component, OnInit, ViewChild } from '@angular/core'; import { Component, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router'; import { Router } from '@angular/router';
import { STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st'; import { STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st';
import { SFComponent, SFSchema, SFUISchema } from '@delon/form'; import { SFComponent, SFSchema, SFUISchema } from '@delon/form';
import { processSingleSort } from '@shared';
import { NzModalService } from 'ng-zorro-antd/modal';
import { AdviceFeedbackService } from '../../services/advice-feedback.service'; import { AdviceFeedbackService } from '../../services/advice-feedback.service';
@Component({ @Component({
@ -20,15 +18,10 @@ export class ParterAdviceFeedbackListComponent implements OnInit {
@ViewChild('sf', { static: false }) @ViewChild('sf', { static: false })
sf!: SFComponent; sf!: SFComponent;
_$expand = false; _$expand = false;
selectedIndex = 0; selectedIndex = 0;
data=[{name1:1111}] data = [{ name1: 1111 }];
constructor( constructor(public router: Router, public service: AdviceFeedbackService) {}
public router: Router,
public ar: ActivatedRoute,
public service: AdviceFeedbackService,
private modalService: NzModalService
) {}
/** /**
* 查询参数 * 查询参数
@ -36,19 +29,19 @@ export class ParterAdviceFeedbackListComponent implements OnInit {
get reqParams() { get reqParams() {
return { ...this.sf?.value }; return { ...this.sf?.value };
} }
/** /**
* 查询字段个数 * 查询字段个数
*/ */
get queryFieldCount(): number { get queryFieldCount(): number {
return Object.keys(this.schema?.properties || {}).length; return Object.keys(this.schema?.properties || {}).length;
} }
/** /**
* 伸缩查询条件 * 伸缩查询条件
*/ */
expandToggle(): void { expandToggle(): void {
this._$expand = !this._$expand; this._$expand = !this._$expand;
this.sf?.setValue('/_$expand', this._$expand); this.sf?.setValue('/_$expand', this._$expand);
} }
ngOnInit() { ngOnInit() {
this.initSF(); this.initSF();
@ -89,7 +82,7 @@ export class ParterAdviceFeedbackListComponent implements OnInit {
_$expand: (value: boolean) => value _$expand: (value: boolean) => value
} }
} }
}, }
} }
}; };
this.ui = { this.ui = {
@ -139,12 +132,12 @@ export class ParterAdviceFeedbackListComponent implements OnInit {
buttons: [ buttons: [
{ {
text: '详情', text: '详情',
click: (_record, _modal, _instance) => this.partnerView(_record), click: (_record, _modal, _instance) => this.partnerView(_record)
}, },
{ {
text: '处理', text: '处理',
click: (_record, _modal, _instance) => this.partnerView(_record), click: (_record, _modal, _instance) => this.partnerView(_record)
}, }
] ]
} }
]; ];
@ -182,13 +175,12 @@ export class ParterAdviceFeedbackListComponent implements OnInit {
buttons: [ buttons: [
{ {
text: '详情', text: '详情',
click: (_record, _modal, _instance) => this.channelView(_record), click: (_record, _modal, _instance) => this.channelView(_record)
}, },
{ {
text: '审核', text: '审核',
click: (_record, _modal, _instance) => this.channelView(_record), click: (_record, _modal, _instance) => this.channelView(_record)
}, }
] ]
} }
]; ];
@ -197,7 +189,7 @@ export class ParterAdviceFeedbackListComponent implements OnInit {
partnerView(record: STData) { partnerView(record: STData) {
this.router.navigate(['/partner/advice-feedback/detail'], { queryParams: {} }); this.router.navigate(['/partner/advice-feedback/detail'], { queryParams: {} });
} }
channelView(record: STData) { channelView(record: STData) {
this.router.navigate(['/partner/advice-feedback/detail'], { queryParams: {} }); this.router.navigate(['/partner/advice-feedback/detail'], { queryParams: {} });
} }
@ -211,8 +203,8 @@ export class ParterAdviceFeedbackListComponent implements OnInit {
// this.st1?.load(1); // this.st1?.load(1);
} }
tabChange(index:any){ tabChange(index: any) {
console.log(index) console.log(index);
switch (index) { switch (index) {
case 0: case 0:
this.initST1(); this.initST1();
@ -224,5 +216,4 @@ export class ParterAdviceFeedbackListComponent implements OnInit {
break; break;
} }
} }
} }

64
src/app/routes/partner/article-management/components/edit/edit.component.ts
View File

@ -1,11 +1,15 @@
import { AfterViewInit, ChangeDetectorRef, Component, OnChanges, OnInit, ViewChild } from '@angular/core'; import { Component, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute } from '@angular/router';
import { apiConf } from '@conf/api.conf'; import { apiConf } from '@conf/api.conf';
import { SFComponent, SFRadioWidgetSchema, SFSchema, SFSchemaEnumType, SFSelectWidgetSchema, SFTextareaWidgetSchema, SFUISchema, SFUploadWidgetSchema } from '@delon/form'; import {
import { _HttpClient } from '@delon/theme'; SFComponent,
SFRadioWidgetSchema,
SFSchema,
SFSelectWidgetSchema,
SFTextareaWidgetSchema,
SFUISchema,
SFUploadWidgetSchema
} from '@delon/form';
import { Observable, Observer } from 'rxjs'; import { Observable, Observer } from 'rxjs';
import { map } from 'rxjs/operators';
import { AmapPoiPickerComponent } from 'src/app/shared/components/amap';
import { ChannelSalesService } from '../../services/channel-sales.service'; import { ChannelSalesService } from '../../services/channel-sales.service';
@Component({ @Component({
@ -19,12 +23,7 @@ export class ParterArticleManagementEditComponent implements OnInit {
i: any; i: any;
type: any; type: any;
constructor( constructor(public service: ChannelSalesService) {}
public http: _HttpClient,
private cdr: ChangeDetectorRef,
private route: ActivatedRoute,
public service: ChannelSalesService,
) {}
ngOnInit(): void { ngOnInit(): void {
this.initSF(); this.initSF();
@ -44,8 +43,8 @@ export class ParterArticleManagementEditComponent implements OnInit {
ui: { ui: {
widget: 'textarea', widget: 'textarea',
autosize: { minRows: 3, maxRows: 6 }, autosize: { minRows: 3, maxRows: 6 },
placeholder:'请输入50字符' placeholder: '请输入50字符'
} as SFTextareaWidgetSchema, } as SFTextareaWidgetSchema
}, },
name2: { name2: {
type: 'string', type: 'string',
@ -54,8 +53,8 @@ export class ParterArticleManagementEditComponent implements OnInit {
ui: { ui: {
widget: 'textarea', widget: 'textarea',
autosize: { minRows: 3, maxRows: 6 }, autosize: { minRows: 3, maxRows: 6 },
placeholder:'请输入50字符' placeholder: '请输入50字符'
} as SFTextareaWidgetSchema, } as SFTextareaWidgetSchema
}, },
name3: { name3: {
type: 'string', type: 'string',
@ -89,12 +88,10 @@ export class ParterArticleManagementEditComponent implements OnInit {
name: { name: {
title: '分类', title: '分类',
type: 'string', type: 'string',
enum: [ enum: [{ label: '管理员', value: '1' }],
{ label: '管理员', value: '1'},
],
ui: { ui: {
widget: 'select', widget: 'select'
} as SFSelectWidgetSchema, } as SFSelectWidgetSchema
}, },
name4: { name4: {
type: 'number', type: 'number',
@ -102,21 +99,21 @@ export class ParterArticleManagementEditComponent implements OnInit {
minimum: 0, minimum: 0,
maximum: 99, maximum: 99,
ui: { ui: {
widgetWidth: 300 , widgetWidth: 300,
placeholder:'请输入0~99，数字越大，排序越靠前' placeholder: '请输入0~99，数字越大，排序越靠前'
} }
}, },
name5: { name5: {
type: 'string', type: 'string',
title: '跳转路径', title: '跳转路径',
enum: [ enum: [
{ label: '图文', value: '1'}, { label: '图文', value: '1' },
{ label: '视频', value: '2'}, { label: '视频', value: '2' }
], ],
ui: { ui: {
widget: 'radio', widget: 'radio'
} as SFRadioWidgetSchema, } as SFRadioWidgetSchema,
default: '1', default: '1'
}, },
content: { content: {
type: 'string', type: 'string',
@ -128,7 +125,7 @@ export class ParterArticleManagementEditComponent implements OnInit {
height: 450 height: 450
}, },
visibleIf: { name5: (value: string) => value === '1' } visibleIf: { name5: (value: string) => value === '1' }
}, }
}, },
name6: { name6: {
type: 'string', type: 'string',
@ -159,7 +156,7 @@ export class ParterArticleManagementEditComponent implements OnInit {
}, },
visibleIf: { name5: (value: string) => value === '2' } visibleIf: { name5: (value: string) => value === '2' }
} as SFUploadWidgetSchema } as SFUploadWidgetSchema
}, }
}, },
required: ['name1', 'name2'] required: ['name1', 'name2']
}; };
@ -167,17 +164,14 @@ export class ParterArticleManagementEditComponent implements OnInit {
'*': { '*': {
spanLabelFixed: 150, spanLabelFixed: 150,
grid: { span: 20 } grid: { span: 20 }
}, }
}; };
} }
close() { close() {}
}
save() { save() {
this.sf.validator({ emitError: true }); this.sf.validator({ emitError: true });
if(!this.sf.valid) return; if (!this.sf.valid) return;
// this.service.request('', { ...this.sf?.value }).subscribe(res => { // this.service.request('', { ...this.sf?.value }).subscribe(res => {
// if (res) { // if (res) {
// this.modalRef.destroy(true); // this.modalRef.destroy(true);

58
src/app/routes/partner/article-management/components/list/list.component.ts
View File

@ -1,11 +1,9 @@
import { Component, OnInit, ViewChild } from '@angular/core'; import { Component, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router'; import { Router } from '@angular/router';
import { STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st'; import { STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st';
import { SFComponent, SFSchema, SFUISchema } from '@delon/form'; import { SFComponent, SFSchema, SFUISchema } from '@delon/form';
import { processSingleSort } from '@shared';
import { NzModalService } from 'ng-zorro-antd/modal'; import { NzModalService } from 'ng-zorro-antd/modal';
import { ChannelSalesService } from '../../services/channel-sales.service'; import { ChannelSalesService } from '../../services/channel-sales.service';
import { ParterArticleManagementEditComponent } from '../edit/edit.component';
@Component({ @Component({
selector: 'app-parter-article-management-list', selector: 'app-parter-article-management-list',
@ -22,13 +20,8 @@ export class ParterArticleManagementListComponent implements OnInit {
spuStatus = '1'; spuStatus = '1';
_$expand = false; _$expand = false;
data=[{name1:1111}] data = [{ name1: 1111 }];
constructor( constructor(public router: Router, public service: ChannelSalesService, private modalService: NzModalService) {}
public router: Router,
public ar: ActivatedRoute,
public service: ChannelSalesService,
private modalService: NzModalService
) {}
/** /**
* 查询参数 * 查询参数
@ -40,7 +33,7 @@ export class ParterArticleManagementListComponent implements OnInit {
/** /**
* 重置表单 * 重置表单
*/ */
resetSF() { resetSF() {
this.sf.reset(); this.sf.reset();
this.st.load(1); this.st.load(1);
} }
@ -49,19 +42,19 @@ export class ParterArticleManagementListComponent implements OnInit {
// this.st1?.load(1); // this.st1?.load(1);
} }
/** /**
* 查询字段个数 * 查询字段个数
*/ */
get queryFieldCount(): number { get queryFieldCount(): number {
return Object.keys(this.schema?.properties || {}).length; return Object.keys(this.schema?.properties || {}).length;
} }
/** /**
* 伸缩查询条件 * 伸缩查询条件
*/ */
expandToggle(): void { expandToggle(): void {
this._$expand = !this._$expand; this._$expand = !this._$expand;
this.sf?.setValue('/_$expand', this._$expand); this.sf?.setValue('/_$expand', this._$expand);
} }
ngOnInit() { ngOnInit() {
this.initSF(); this.initSF();
this.initST(); this.initST();
@ -91,8 +84,7 @@ export class ParterArticleManagementListComponent implements OnInit {
_$expand: (value: boolean) => value _$expand: (value: boolean) => value
} }
} }
}, }
} }
}; };
this.ui = { this.ui = {
@ -138,19 +130,19 @@ export class ParterArticleManagementListComponent implements OnInit {
buttons: [ buttons: [
{ {
text: '修改', text: '修改',
click: (_record, _modal, _instance) => this.edit(_record), click: (_record, _modal, _instance) => this.edit(_record)
}, },
{ {
text: '禁用', text: '禁用',
click: (_record, _modal, _instance) => this.stop(_record), click: (_record, _modal, _instance) => this.stop(_record)
}, },
{ {
text: '启用', text: '启用',
click: (_record, _modal, _instance) => this.start(_record.id), click: (_record, _modal, _instance) => this.start(_record.id)
}, },
{ {
text: '推荐到首页', text: '推荐到首页',
click: (_record, _modal, _instance) => this.recommend(_record.id), click: (_record, _modal, _instance) => this.recommend(_record.id)
} }
] ]
} }
@ -166,11 +158,10 @@ export class ParterArticleManagementListComponent implements OnInit {
this.router.navigate(['/partner/knowledge/article-management-edit'], { queryParams: {} }); this.router.navigate(['/partner/knowledge/article-management-edit'], { queryParams: {} });
} }
stop(record: STData) { stop(record: STData) {
this.modalService.confirm({ this.modalService.confirm({
nzTitle: '<i>禁用确认</i>', nzTitle: '<i>禁用确认</i>',
nzContent: `<b>确定禁用此文章吗？</br>`, nzContent: `<b>确定禁用此文章吗？</br>`
// nzOnOk: () => // nzOnOk: () =>
// this.service.request('', '').subscribe(res => { // this.service.request('', '').subscribe(res => {
// if (res) { // if (res) {
@ -183,7 +174,7 @@ export class ParterArticleManagementListComponent implements OnInit {
start(record: STData) { start(record: STData) {
this.modalService.confirm({ this.modalService.confirm({
nzTitle: '<i>启用确认</i>', nzTitle: '<i>启用确认</i>',
nzContent: `<b>确定启用此文章吗？</br>`, nzContent: `<b>确定启用此文章吗？</br>`
// nzOnOk: () => // nzOnOk: () =>
// this.service.request('', '').subscribe(res => { // this.service.request('', '').subscribe(res => {
// if (res) { // if (res) {
@ -193,8 +184,5 @@ export class ParterArticleManagementListComponent implements OnInit {
// }) // })
}); });
} }
recommend(record: STData) { recommend(record: STData) {}
}
} }

6
src/app/routes/partner/channel-sales/components/list/list.component.ts
View File

@ -1,8 +1,7 @@
import { Component, OnInit, ViewChild } from '@angular/core'; import { Component, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router'; import { Router } from '@angular/router';
import { STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st'; import { STColumn, STComponent, STData } from '@delon/abc/st';
import { SFComponent, SFSchema, SFUISchema } from '@delon/form'; import { SFComponent, SFSchema, SFUISchema } from '@delon/form';
import { processSingleSort } from '@shared';
import { NzModalService } from 'ng-zorro-antd/modal'; import { NzModalService } from 'ng-zorro-antd/modal';
import { ChannelSalesService } from '../../services/channel-sales.service'; import { ChannelSalesService } from '../../services/channel-sales.service';
import { ParterChannelSalesEditComponent } from '../edit/edit.component'; import { ParterChannelSalesEditComponent } from '../edit/edit.component';
@ -24,7 +23,6 @@ export class ParterChannelSalesListComponent implements OnInit {
data = [{ name1: 1111 }] data = [{ name1: 1111 }]
constructor( constructor(
public router: Router, public router: Router,
public ar: ActivatedRoute,
public service: ChannelSalesService, public service: ChannelSalesService,
private modalService: NzModalService private modalService: NzModalService
) { } ) { }

42
src/app/routes/partner/claim-audit/components/channel-approve/channel-approve.component.ts
View File

@ -1,13 +1,8 @@
import { AfterViewInit, ChangeDetectorRef, Component, OnChanges, OnInit, ViewChild } from '@angular/core'; import { Component, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute } from '@angular/router'; import { SFComponent, SFSchema, SFTextareaWidgetSchema, SFUISchema } from '@delon/form';
import { SFComponent, SFRadioWidgetSchema, SFSchema, SFSchemaEnumType, SFSelectWidgetSchema, SFTextareaWidgetSchema, SFUISchema } from '@delon/form'; import { NzModalRef } from 'ng-zorro-antd/modal';
import { _HttpClient } from '@delon/theme';
import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal';
import { map } from 'rxjs/operators';
import { AmapPoiPickerComponent } from 'src/app/shared/components/amap';
import { ClaimAuditService } from '../../services/claim-audit.service'; import { ClaimAuditService } from '../../services/claim-audit.service';
@Component({ @Component({
selector: 'app-parter-claim-audit-channel-approve', selector: 'app-parter-claim-audit-channel-approve',
templateUrl: './channel-approve.component.html' templateUrl: './channel-approve.component.html'
@ -19,14 +14,7 @@ export class ParterClaimAuditListChannelApproveComponent implements OnInit {
i: any; i: any;
type: any; type: any;
constructor( constructor(public service: ClaimAuditService, private modalRef: NzModalRef) {}
public http: _HttpClient,
private cdr: ChangeDetectorRef,
private route: ActivatedRoute,
private modalService: NzModalService,
public service: ClaimAuditService,
private modalRef: NzModalRef
) {}
ngOnInit(): void { ngOnInit(): void {
this.initSF(); this.initSF();
@ -43,20 +31,20 @@ export class ParterClaimAuditListChannelApproveComponent implements OnInit {
title: '合伙人(认领人)', title: '合伙人(认领人)',
type: 'string', type: 'string',
ui: { ui: {
widget: 'text', widget: 'text'
} , }
}, },
name2: { name2: {
title: '认领客户名称', title: '认领客户名称',
type: 'string', type: 'string',
ui: { ui: {
widget: 'text', widget: 'text'
} , }
}, },
data: { data: {
title: '结算起算日期', title: '结算起算日期',
type: 'string', type: 'string',
format: 'date', format: 'date'
}, },
name3: { name3: {
type: 'string', type: 'string',
@ -65,9 +53,9 @@ export class ParterClaimAuditListChannelApproveComponent implements OnInit {
ui: { ui: {
widget: 'textarea', widget: 'textarea',
autosize: { minRows: 3, maxRows: 6 }, autosize: { minRows: 3, maxRows: 6 },
placeholder:'请不要超过50个字' placeholder: '请不要超过50个字'
} as SFTextareaWidgetSchema, } as SFTextareaWidgetSchema
}, }
}, },
required: ['name3'] required: ['name3']
}; };
@ -75,7 +63,7 @@ export class ParterClaimAuditListChannelApproveComponent implements OnInit {
'*': { '*': {
spanLabelFixed: 120, spanLabelFixed: 120,
grid: { span: 24 } grid: { span: 24 }
}, }
}; };
} }
@ -84,7 +72,7 @@ export class ParterClaimAuditListChannelApproveComponent implements OnInit {
} }
save() { save() {
this.sf.validator({ emitError: true }); this.sf.validator({ emitError: true });
if(!this.sf.valid) return; if (!this.sf.valid) return;
// this.service.request('', { ...this.sf?.value }).subscribe(res => { // this.service.request('', { ...this.sf?.value }).subscribe(res => {
// if (res) { // if (res) {
// this.modalRef.destroy(true); // this.modalRef.destroy(true);
@ -93,6 +81,4 @@ export class ParterClaimAuditListChannelApproveComponent implements OnInit {
// } // }
// }); // });
} }
} }

6
src/app/routes/partner/claim-audit/components/channel-detail/channel-detail.component.ts
View File

@ -2,11 +2,7 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router'; import { ActivatedRoute, Router } from '@angular/router';
import { STColumn } from '@delon/abc/st'; import { STColumn } from '@delon/abc/st';
import { _HttpClient } from '@delon/theme';
import { NzCardComponent } from 'ng-zorro-antd/card';
import { NzMessageService } from 'ng-zorro-antd/message';
import { NzModalService } from 'ng-zorro-antd/modal'; import { NzModalService } from 'ng-zorro-antd/modal';
import format from 'date-fns/format';
import { ClaimAuditService } from '../../services/claim-audit.service'; import { ClaimAuditService } from '../../services/claim-audit.service';
import { ParterClaimAuditListChannelApproveComponent } from '../channel-approve/channel-approve.component'; import { ParterClaimAuditListChannelApproveComponent } from '../channel-approve/channel-approve.component';
@ -34,10 +30,8 @@ export class ParterClaimAuditListChannelDetailComponent implements OnInit {
constructor( constructor(
private route: ActivatedRoute, private route: ActivatedRoute,
private msgSrv: NzMessageService,
private service: ClaimAuditService, private service: ClaimAuditService,
private modalService: NzModalService, private modalService: NzModalService,
private router: Router
) {} ) {}
ngOnInit(): void { ngOnInit(): void {

42
src/app/routes/partner/claim-audit/components/channel-reject/channel-reject.component.ts
View File

@ -1,13 +1,8 @@
import { AfterViewInit, ChangeDetectorRef, Component, OnChanges, OnInit, ViewChild } from '@angular/core'; import { Component, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute } from '@angular/router'; import { SFComponent, SFSchema, SFTextareaWidgetSchema, SFUISchema } from '@delon/form';
import { SFComponent, SFRadioWidgetSchema, SFSchema, SFSchemaEnumType, SFSelectWidgetSchema, SFTextareaWidgetSchema, SFUISchema } from '@delon/form'; import { NzModalRef } from 'ng-zorro-antd/modal';
import { _HttpClient } from '@delon/theme';
import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal';
import { map } from 'rxjs/operators';
import { AmapPoiPickerComponent } from 'src/app/shared/components/amap';
import { ClaimAuditService } from '../../services/claim-audit.service'; import { ClaimAuditService } from '../../services/claim-audit.service';
@Component({ @Component({
selector: 'app-parter-claim-audit-channel-reject', selector: 'app-parter-claim-audit-channel-reject',
templateUrl: './channel-reject.component.html' templateUrl: './channel-reject.component.html'
@ -19,14 +14,7 @@ export class ParterClaimAuditListChannelRejectComponent implements OnInit {
i: any; i: any;
type: any; type: any;
constructor( constructor(public service: ClaimAuditService, private modalRef: NzModalRef) {}
public http: _HttpClient,
private cdr: ChangeDetectorRef,
private route: ActivatedRoute,
private modalService: NzModalService,
public service: ClaimAuditService,
private modalRef: NzModalRef
) {}
ngOnInit(): void { ngOnInit(): void {
this.initSF(); this.initSF();
@ -43,20 +31,20 @@ export class ParterClaimAuditListChannelRejectComponent implements OnInit {
title: '合伙人(认领人)', title: '合伙人(认领人)',
type: 'string', type: 'string',
ui: { ui: {
widget: 'text', widget: 'text'
} , }
}, },
name2: { name2: {
title: '认领客户名称', title: '认领客户名称',
type: 'string', type: 'string',
ui: { ui: {
widget: 'text', widget: 'text'
} , }
}, },
data: { data: {
title: '结算起算日期', title: '结算起算日期',
type: 'string', type: 'string',
format: 'date', format: 'date'
}, },
name3: { name3: {
type: 'string', type: 'string',
@ -65,9 +53,9 @@ export class ParterClaimAuditListChannelRejectComponent implements OnInit {
ui: { ui: {
widget: 'textarea', widget: 'textarea',
autosize: { minRows: 3, maxRows: 6 }, autosize: { minRows: 3, maxRows: 6 },
placeholder:'请不要超过50个字' placeholder: '请不要超过50个字'
} as SFTextareaWidgetSchema, } as SFTextareaWidgetSchema
}, }
}, },
required: ['name3'] required: ['name3']
}; };
@ -75,7 +63,7 @@ export class ParterClaimAuditListChannelRejectComponent implements OnInit {
'*': { '*': {
spanLabelFixed: 120, spanLabelFixed: 120,
grid: { span: 24 } grid: { span: 24 }
}, }
}; };
} }
@ -84,7 +72,7 @@ export class ParterClaimAuditListChannelRejectComponent implements OnInit {
} }
save() { save() {
this.sf.validator({ emitError: true }); this.sf.validator({ emitError: true });
if(!this.sf.valid) return; if (!this.sf.valid) return;
// this.service.request('', { ...this.sf?.value }).subscribe(res => { // this.service.request('', { ...this.sf?.value }).subscribe(res => {
// if (res) { // if (res) {
// this.modalRef.destroy(true); // this.modalRef.destroy(true);
@ -93,6 +81,4 @@ export class ParterClaimAuditListChannelRejectComponent implements OnInit {
// } // }
// }); // });
} }
} }

61
src/app/routes/partner/claim-audit/components/list/list.component.ts
View File

@ -1,9 +1,7 @@
import { Component, OnInit, ViewChild } from '@angular/core'; import { Component, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router'; import { Router } from '@angular/router';
import { STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st'; import { STColumn, STComponent, STData } from '@delon/abc/st';
import { SFComponent, SFSchema, SFUISchema } from '@delon/form'; import { SFComponent, SFSchema, SFUISchema } from '@delon/form';
import { processSingleSort } from '@shared';
import { NzModalService } from 'ng-zorro-antd/modal';
import { ClaimAuditService } from '../../services/claim-audit.service'; import { ClaimAuditService } from '../../services/claim-audit.service';
@Component({ @Component({
@ -22,15 +20,10 @@ export class ParterClaimAuditListComponent implements OnInit {
@ViewChild('sf', { static: false }) @ViewChild('sf', { static: false })
sf!: SFComponent; sf!: SFComponent;
_$expand = false; _$expand = false;
selectedIndex = 0; selectedIndex = 0;
data=[{name1:1111}] data = [{ name1: 1111 }];
constructor( constructor(public router: Router, public service: ClaimAuditService) {}
public router: Router,
public ar: ActivatedRoute,
public service: ClaimAuditService,
private modalService: NzModalService
) {}
/** /**
* 查询参数 * 查询参数
@ -38,19 +31,19 @@ export class ParterClaimAuditListComponent implements OnInit {
get reqParams() { get reqParams() {
return { ...this.sf?.value }; return { ...this.sf?.value };
} }
/** /**
* 查询字段个数 * 查询字段个数
*/ */
get queryFieldCount(): number { get queryFieldCount(): number {
return Object.keys(this.schema?.properties || {}).length; return Object.keys(this.schema?.properties || {}).length;
} }
/** /**
* 伸缩查询条件 * 伸缩查询条件
*/ */
expandToggle(): void { expandToggle(): void {
this._$expand = !this._$expand; this._$expand = !this._$expand;
this.sf?.setValue('/_$expand', this._$expand); this.sf?.setValue('/_$expand', this._$expand);
} }
ngOnInit() { ngOnInit() {
this.initSF(); this.initSF();
@ -91,7 +84,7 @@ export class ParterClaimAuditListComponent implements OnInit {
_$expand: (value: boolean) => value _$expand: (value: boolean) => value
} }
} }
}, }
} }
}; };
this.ui = { this.ui = {
@ -141,12 +134,12 @@ export class ParterClaimAuditListComponent implements OnInit {
buttons: [ buttons: [
{ {
text: '详情', text: '详情',
click: (_record, _modal, _instance) => this.partnerView(_record), click: (_record, _modal, _instance) => this.partnerView(_record)
}, },
{ {
text: '审核', text: '审核',
click: (_record, _modal, _instance) => this.partnerView(_record), click: (_record, _modal, _instance) => this.partnerView(_record)
}, }
] ]
} }
]; ];
@ -184,13 +177,12 @@ export class ParterClaimAuditListComponent implements OnInit {
buttons: [ buttons: [
{ {
text: '详情', text: '详情',
click: (_record, _modal, _instance) => this.channelView(_record), click: (_record, _modal, _instance) => this.channelView(_record)
}, },
{ {
text: '审核', text: '审核',
click: (_record, _modal, _instance) => this.channelView(_record), click: (_record, _modal, _instance) => this.channelView(_record)
}, }
] ]
} }
]; ];
@ -199,7 +191,7 @@ export class ParterClaimAuditListComponent implements OnInit {
partnerView(record: STData) { partnerView(record: STData) {
this.router.navigate(['/partner/claim-audit/partner-detail'], { queryParams: {} }); this.router.navigate(['/partner/claim-audit/partner-detail'], { queryParams: {} });
} }
channelView(record: STData) { channelView(record: STData) {
this.router.navigate(['/partner/claim-audit/channel-detail'], { queryParams: {} }); this.router.navigate(['/partner/claim-audit/channel-detail'], { queryParams: {} });
} }
@ -213,8 +205,8 @@ export class ParterClaimAuditListComponent implements OnInit {
// this.st1?.load(1); // this.st1?.load(1);
} }
tabChange(index:any){ tabChange(index: any) {
console.log(index) console.log(index);
switch (index) { switch (index) {
case 0: case 0:
this.initST1(); this.initST1();
@ -226,5 +218,4 @@ export class ParterClaimAuditListComponent implements OnInit {
break; break;
} }
} }
} }

41
src/app/routes/partner/claim-audit/components/partner-approve/partner-approve.component.ts
View File

@ -1,13 +1,9 @@
import { AfterViewInit, ChangeDetectorRef, Component, OnChanges, OnInit, ViewChild } from '@angular/core'; import { Component, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute } from '@angular/router'; import { SFComponent, SFSchema, SFTextareaWidgetSchema, SFUISchema } from '@delon/form';
import { SFComponent, SFRadioWidgetSchema, SFSchema, SFSchemaEnumType, SFSelectWidgetSchema, SFTextareaWidgetSchema, SFUISchema } from '@delon/form';
import { _HttpClient } from '@delon/theme'; import { _HttpClient } from '@delon/theme';
import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal'; import { NzModalRef } from 'ng-zorro-antd/modal';
import { map } from 'rxjs/operators';
import { AmapPoiPickerComponent } from 'src/app/shared/components/amap';
import { ClaimAuditService } from '../../services/claim-audit.service'; import { ClaimAuditService } from '../../services/claim-audit.service';
@Component({ @Component({
selector: 'app-parter-claim-audit-partner-approve', selector: 'app-parter-claim-audit-partner-approve',
templateUrl: './partner-approve.component.html' templateUrl: './partner-approve.component.html'
@ -19,14 +15,7 @@ export class ParterClaimAuditListPartnerApproveComponent implements OnInit {
i: any; i: any;
type: any; type: any;
constructor( constructor(public service: ClaimAuditService, private modalRef: NzModalRef) {}
public http: _HttpClient,
private cdr: ChangeDetectorRef,
private route: ActivatedRoute,
private modalService: NzModalService,
public service: ClaimAuditService,
private modalRef: NzModalRef
) {}
ngOnInit(): void { ngOnInit(): void {
this.initSF(); this.initSF();
@ -43,20 +32,20 @@ export class ParterClaimAuditListPartnerApproveComponent implements OnInit {
title: '合伙人(认领人)', title: '合伙人(认领人)',
type: 'string', type: 'string',
ui: { ui: {
widget: 'text', widget: 'text'
} , }
}, },
name2: { name2: {
title: '认领客户名称', title: '认领客户名称',
type: 'string', type: 'string',
ui: { ui: {
widget: 'text', widget: 'text'
} , }
}, },
data: { data: {
title: '结算起算日期', title: '结算起算日期',
type: 'string', type: 'string',
format: 'date', format: 'date'
}, },
name3: { name3: {
type: 'string', type: 'string',
@ -65,9 +54,9 @@ export class ParterClaimAuditListPartnerApproveComponent implements OnInit {
ui: { ui: {
widget: 'textarea', widget: 'textarea',
autosize: { minRows: 3, maxRows: 6 }, autosize: { minRows: 3, maxRows: 6 },
placeholder:'请不要超过50个字' placeholder: '请不要超过50个字'
} as SFTextareaWidgetSchema, } as SFTextareaWidgetSchema
}, }
}, },
required: ['name3'] required: ['name3']
}; };
@ -75,7 +64,7 @@ export class ParterClaimAuditListPartnerApproveComponent implements OnInit {
'*': { '*': {
spanLabelFixed: 120, spanLabelFixed: 120,
grid: { span: 24 } grid: { span: 24 }
}, }
}; };
} }
@ -84,7 +73,7 @@ export class ParterClaimAuditListPartnerApproveComponent implements OnInit {
} }
save() { save() {
this.sf.validator({ emitError: true }); this.sf.validator({ emitError: true });
if(!this.sf.valid) return; if (!this.sf.valid) return;
// this.service.request('', { ...this.sf?.value }).subscribe(res => { // this.service.request('', { ...this.sf?.value }).subscribe(res => {
// if (res) { // if (res) {
// this.modalRef.destroy(true); // this.modalRef.destroy(true);
@ -93,6 +82,4 @@ export class ParterClaimAuditListPartnerApproveComponent implements OnInit {
// } // }
// }); // });
} }
} }

26
src/app/routes/partner/claim-audit/components/partner-detail/partner-detail.component.ts
View File

@ -1,15 +1,9 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router'; import { ActivatedRoute } from '@angular/router';
import { STColumn } from '@delon/abc/st'; import { STColumn } from '@delon/abc/st';
import { _HttpClient } from '@delon/theme';
import { NzCardComponent } from 'ng-zorro-antd/card';
import { NzMessageService } from 'ng-zorro-antd/message';
import { NzModalService } from 'ng-zorro-antd/modal'; import { NzModalService } from 'ng-zorro-antd/modal';
import format from 'date-fns/format';
import { ClaimAuditService } from '../../services/claim-audit.service';
import { ParterClaimAuditListPartnerRejectComponent } from '../partner-reject/partner-reject.component'; import { ParterClaimAuditListPartnerRejectComponent } from '../partner-reject/partner-reject.component';
import { ParterClaimAuditListPartnerApproveComponent } from '../partner-approve/partner-approve.component'; import { ParterClaimAuditListPartnerApproveComponent } from '../partner-approve/partner-approve.component';
@Component({ @Component({
selector: 'app-parter-claim-audit-partner-detail', selector: 'app-parter-claim-audit-partner-detail',
@ -23,21 +17,15 @@ export class ParterClaimAuditListPartnerDetailComponent implements OnInit {
isVisible = false; isVisible = false;
columns: STColumn[] = [ columns: STColumn[] = [
{ title: '操作时间', index: 'id', width: 120 }, { title: '操作时间', index: 'id', width: 120 },
{ title: '操作人', type: 'img', width: 120, }, { title: '操作人', type: 'img', width: 120 },
{ title: '操作人手机号', index: 'email', width: 120 }, { title: '操作人手机号', index: 'email', width: 120 },
{ title: '操作页面', index: 'phone' }, { title: '操作页面', index: 'phone' },
{ title: '操作内容', index: 'registered' } { title: '操作内容', index: 'registered' }
]; ];
data=[{id:11111}] data = [{ id: 11111 }];
constructor( constructor(private route: ActivatedRoute, private modalService: NzModalService) {}
private route: ActivatedRoute,
private msgSrv: NzMessageService,
private service: ClaimAuditService,
private modalService: NzModalService,
private router: Router
) {}
ngOnInit(): void { ngOnInit(): void {
this.initData(); this.initData();
@ -47,7 +35,7 @@ export class ParterClaimAuditListPartnerDetailComponent implements OnInit {
// this.service.request(this.service.$api_getBulkBillDetail, { id: this.id }).subscribe(res => { // this.service.request(this.service.$api_getBulkBillDetail, { id: this.id }).subscribe(res => {
// if (res) { // if (res) {
// this.i = res; // this.i = res;
// //
// } // }
// }); // });
} }
@ -77,6 +65,4 @@ export class ParterClaimAuditListPartnerDetailComponent implements OnInit {
goBack() { goBack() {
window.history.go(-1); window.history.go(-1);
} }
} }

42
src/app/routes/partner/claim-audit/components/partner-reject/partner-reject.component.ts
View File

@ -1,13 +1,8 @@
import { AfterViewInit, ChangeDetectorRef, Component, OnChanges, OnInit, ViewChild } from '@angular/core'; import { Component, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute } from '@angular/router'; import { SFComponent, SFSchema, SFTextareaWidgetSchema, SFUISchema } from '@delon/form';
import { SFComponent, SFRadioWidgetSchema, SFSchema, SFSchemaEnumType, SFSelectWidgetSchema, SFTextareaWidgetSchema, SFUISchema } from '@delon/form'; import { NzModalRef } from 'ng-zorro-antd/modal';
import { _HttpClient } from '@delon/theme';
import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal';
import { map } from 'rxjs/operators';
import { AmapPoiPickerComponent } from 'src/app/shared/components/amap';
import { ClaimAuditService } from '../../services/claim-audit.service'; import { ClaimAuditService } from '../../services/claim-audit.service';
@Component({ @Component({
selector: 'app-parter-claim-audit-partner-reject', selector: 'app-parter-claim-audit-partner-reject',
templateUrl: './partner-reject.component.html' templateUrl: './partner-reject.component.html'
@ -19,14 +14,7 @@ export class ParterClaimAuditListPartnerRejectComponent implements OnInit {
i: any; i: any;
type: any; type: any;
constructor( constructor(public service: ClaimAuditService, private modalRef: NzModalRef) {}
public http: _HttpClient,
private cdr: ChangeDetectorRef,
private route: ActivatedRoute,
private modalService: NzModalService,
public service: ClaimAuditService,
private modalRef: NzModalRef
) {}
ngOnInit(): void { ngOnInit(): void {
this.initSF(); this.initSF();
@ -43,20 +31,20 @@ export class ParterClaimAuditListPartnerRejectComponent implements OnInit {
title: '合伙人(认领人)', title: '合伙人(认领人)',
type: 'string', type: 'string',
ui: { ui: {
widget: 'text', widget: 'text'
} , }
}, },
name2: { name2: {
title: '认领客户名称', title: '认领客户名称',
type: 'string', type: 'string',
ui: { ui: {
widget: 'text', widget: 'text'
} , }
}, },
data: { data: {
title: '结算起算日期', title: '结算起算日期',
type: 'string', type: 'string',
format: 'date', format: 'date'
}, },
name3: { name3: {
type: 'string', type: 'string',
@ -65,9 +53,9 @@ export class ParterClaimAuditListPartnerRejectComponent implements OnInit {
ui: { ui: {
widget: 'textarea', widget: 'textarea',
autosize: { minRows: 3, maxRows: 6 }, autosize: { minRows: 3, maxRows: 6 },
placeholder:'请不要超过50个字' placeholder: '请不要超过50个字'
} as SFTextareaWidgetSchema, } as SFTextareaWidgetSchema
}, }
}, },
required: ['name3'] required: ['name3']
}; };
@ -75,7 +63,7 @@ export class ParterClaimAuditListPartnerRejectComponent implements OnInit {
'*': { '*': {
spanLabelFixed: 120, spanLabelFixed: 120,
grid: { span: 24 } grid: { span: 24 }
}, }
}; };
} }
@ -84,7 +72,7 @@ export class ParterClaimAuditListPartnerRejectComponent implements OnInit {
} }
save() { save() {
this.sf.validator({ emitError: true }); this.sf.validator({ emitError: true });
if(!this.sf.valid) return; if (!this.sf.valid) return;
// this.service.request('', { ...this.sf?.value }).subscribe(res => { // this.service.request('', { ...this.sf?.value }).subscribe(res => {
// if (res) { // if (res) {
// this.modalRef.destroy(true); // this.modalRef.destroy(true);
@ -93,6 +81,4 @@ export class ParterClaimAuditListPartnerRejectComponent implements OnInit {
// } // }
// }); // });
} }
} }

56
src/app/routes/partner/knowledge/banner/components/list/list.component.ts
View File

@ -12,7 +12,6 @@ import { BannerService } from '../../services/banner.service';
templateUrl: './list.component.html', templateUrl: './list.component.html',
styleUrls: ['./list.component.less'] styleUrls: ['./list.component.less']
}) })
export class BannerComponentsListComponent implements OnInit { export class BannerComponentsListComponent implements OnInit {
schema: SFSchema = {}; schema: SFSchema = {};
columns: STColumn[] = []; columns: STColumn[] = [];
@ -27,7 +26,14 @@ export class BannerComponentsListComponent implements OnInit {
@ViewChild('st', { static: false }) st!: STComponent; @ViewChild('st', { static: false }) st!: STComponent;
@ViewChild('sf', { static: false }) sf!: SFComponent; @ViewChild('sf', { static: false }) sf!: SFComponent;
constructor(public service: BannerService, private modal: ModalHelper, private msg: NzMessageService, private router: Router, private modalSrv: NzModalService, private ar: ActivatedRoute) { } constructor(
public service: BannerService,
private modal: ModalHelper,
private msg: NzMessageService,
private router: Router,
private modalSrv: NzModalService,
private ar: ActivatedRoute
) {}
/** /**
* 查询字段个数 * 查询字段个数
@ -51,14 +57,14 @@ export class BannerComponentsListComponent implements OnInit {
if (params.navigationId === '') { if (params.navigationId === '') {
delete params.navigationId; delete params.navigationId;
} }
return { ...params}; return { ...params };
} }
/** /**
* 选中行 * 选中行
*/ */
get selectedRows() { get selectedRows() {
return this.st?.list.filter((item) => item.checked) || []; return this.st?.list.filter(item => item.checked) || [];
} }
ngOnInit() { ngOnInit() {
this.initSF(); this.initSF();
@ -80,8 +86,8 @@ export class BannerComponentsListComponent implements OnInit {
_$expand: { _$expand: {
type: 'boolean', type: 'boolean',
ui: { ui: {
hidden: true, hidden: true
}, }
}, },
name: { name: {
type: 'string', type: 'string',
@ -89,7 +95,7 @@ export class BannerComponentsListComponent implements OnInit {
maxLength: 10, maxLength: 10,
ui: { ui: {
widget: '', widget: '',
placeholder: '请输入', placeholder: '请输入'
} }
}, },
status: { status: {
@ -98,21 +104,21 @@ export class BannerComponentsListComponent implements OnInit {
ui: { ui: {
widget: 'select', widget: 'select',
placeholder: '请选择', placeholder: '请选择',
allowClear: true, allowClear: true
} as SFSelectWidgetSchema, } as SFSelectWidgetSchema,
enum: [ enum: [
{ label: '全部', value: 1 }, { label: '全部', value: 1 },
{ label: '正常', value: 2 }, { label: '正常', value: 2 },
{ label: '禁用', value: 3 } { label: '禁用', value: 3 }
] ]
}, }
}, }
}; };
this.ui = { this.ui = {
'*': { '*': {
spanLabelFixed: 110, spanLabelFixed: 110,
grid: { span: 8 }, grid: { span: 8 }
}, }
}; };
} }
@ -138,9 +144,9 @@ export class BannerComponentsListComponent implements OnInit {
index: 'style', index: 'style',
className: 'text-center', className: 'text-center',
type: 'enum', type: 'enum',
enum: { enum: {
1: '正常', 1: '正常',
2: '禁用', 2: '禁用'
} }
}, },
{ {
@ -157,7 +163,7 @@ export class BannerComponentsListComponent implements OnInit {
{ {
text: '修改', text: '修改',
acl: { ability: ['banner-change'] }, acl: { ability: ['banner-change'] },
click: (item) => { click: item => {
this.router.navigate(['../detail'], { queryParams: { id: item.id, type: 'edit' }, relativeTo: this.ar }); this.router.navigate(['../detail'], { queryParams: { id: item.id, type: 'edit' }, relativeTo: this.ar });
} }
}, },
@ -167,12 +173,12 @@ export class BannerComponentsListComponent implements OnInit {
pop: { pop: {
title: `确定禁用此banner图吗？？`, title: `确定禁用此banner图吗？？`,
okType: 'danger', okType: 'danger',
icon: 'alert', icon: 'alert'
}, },
click: (item) => { click: item => {
this.changeStatus(item.id); this.changeStatus(item.id);
}, },
iif: (item) => item.status === 1 iif: item => item.status === 1
}, },
{ {
text: '启用', text: '启用',
@ -180,15 +186,15 @@ export class BannerComponentsListComponent implements OnInit {
pop: { pop: {
title: `确定启用此banner图吗？`, title: `确定启用此banner图吗？`,
okType: 'danger', okType: 'danger',
icon: 'success', icon: 'success'
}, },
click: (item) => { click: item => {
this.changeStatus(item); this.changeStatus(item);
}, },
iif: (item) => item.status === 2 iif: item => item.status === 2
}, }
], ]
}, }
]; ];
} }
changeStatus(item: any) { changeStatus(item: any) {
@ -216,7 +222,7 @@ export class BannerComponentsListComponent implements OnInit {
resetSF() { resetSF() {
this.sf.reset(); this.sf.reset();
this._$expand = false; this._$expand = false;
this.isLoading = true this.isLoading = true;
} }
/** /**

32
src/app/routes/partner/level-config/components/edit/edit.component.ts
View File

@ -1,10 +1,17 @@
import { AfterViewInit, ChangeDetectorRef, Component, OnChanges, OnInit, ViewChild } from '@angular/core'; /*
import { ActivatedRoute } from '@angular/router'; * @Description :
import { SFComponent, SFRadioWidgetSchema, SFSchema, SFSchemaEnumType, SFSelectWidgetSchema, SFTextareaWidgetSchema, SFUISchema } from '@delon/form'; * @Version : 1.0
* @Author : Shiming
* @Date : 2022-04-28 20:27:22
* @LastEditors : Shiming
* @LastEditTime : 2022-05-07 18:04:15
* @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\level-config\\components\\edit\\edit.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { Component, OnInit, ViewChild } from '@angular/core';
import { SFComponent, SFSchema, SFTextareaWidgetSchema, SFUISchema } from '@delon/form';
import { _HttpClient } from '@delon/theme'; import { _HttpClient } from '@delon/theme';
import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal'; import { NzModalRef } from 'ng-zorro-antd/modal';
import { map } from 'rxjs/operators';
import { AmapPoiPickerComponent } from 'src/app/shared/components/amap';
import { ChannelSalesService } from '../../services/level-config.service'; import { ChannelSalesService } from '../../services/level-config.service';
@Component({ @Component({
@ -19,10 +26,6 @@ export class ParterLevelConfigEditComponent implements OnInit {
type: any; type: any;
constructor( constructor(
public http: _HttpClient,
private cdr: ChangeDetectorRef,
private route: ActivatedRoute,
private modalService: NzModalService,
public service: ChannelSalesService, public service: ChannelSalesService,
private modalRef: NzModalRef private modalRef: NzModalRef
) {} ) {}
@ -41,10 +44,17 @@ export class ParterLevelConfigEditComponent implements OnInit {
gradeName: { gradeName: {
title: '等级名称', title: '等级名称',
type: 'string', type: 'string',
maxLength: 12
}, },
sortId: { sortId: {
title: '排序', title: '排序',
type: 'string', minimum: 0,
type:"number",
ui: {
change: (item: any) => {
this.sf.setValue('/sortId', item?.toFixed(0))
}
}
}, },
remark: { remark: {
type: 'string', type: 'string',

4
src/app/routes/partner/level-config/components/list/list.component.ts
View File

@ -1,8 +1,6 @@
import { Component, OnInit, ViewChild } from '@angular/core'; import { Component, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st'; import { STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st';
import { SFComponent, SFSchema, SFUISchema } from '@delon/form'; import { SFComponent, SFSchema, SFUISchema } from '@delon/form';
import { processSingleSort } from '@shared';
import { NzModalService } from 'ng-zorro-antd/modal'; import { NzModalService } from 'ng-zorro-antd/modal';
import { ChannelSalesService } from '../../services/level-config.service'; import { ChannelSalesService } from '../../services/level-config.service';
import { ParterLevelConfigEditComponent } from '../edit/edit.component'; import { ParterLevelConfigEditComponent } from '../edit/edit.component';
@ -23,8 +21,6 @@ export class ParterLevelConfigListComponent implements OnInit {
data = [{ name1: 1111 }]; data = [{ name1: 1111 }];
constructor( constructor(
public router: Router,
public ar: ActivatedRoute,
public service: ChannelSalesService, public service: ChannelSalesService,
private modalService: NzModalService private modalService: NzModalService
) {} ) {}

3
src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.ts
View File

@ -1,5 +1,4 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { ActivatedRoute } from '@angular/router';
import { STColumn } from '@delon/abc/st'; import { STColumn } from '@delon/abc/st';
import { PartnerListService } from '../../services/partner-list.service'; import { PartnerListService } from '../../services/partner-list.service';
@ -10,7 +9,7 @@ import { PartnerListService } from '../../services/partner-list.service';
export class ChannelLogModalComponent implements OnInit { export class ChannelLogModalComponent implements OnInit {
columns: { changeColumn: STColumn[]; beChangeColumn: STColumn[] } = this.initST(); columns: { changeColumn: STColumn[]; beChangeColumn: STColumn[] } = this.initST();
id = ''; id = '';
constructor(public service: PartnerListService, public route: ActivatedRoute) {} constructor(public service: PartnerListService) {}
ngOnInit(): void {} ngOnInit(): void {}

9
src/app/routes/partner/rebate-management/components/particulars/particulars.component.ts
View File

@ -1,9 +1,7 @@
import { Component, OnInit, ViewChild } from '@angular/core'; import { Component, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router'; import { STColumn, STComponent } from '@delon/abc/st';
import { STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st';
import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form'; import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
import { processSingleSort, ShipperBaseService } from '@shared'; import { ShipperBaseService } from '@shared';
import { NzModalService } from 'ng-zorro-antd/modal';
import { RebateManagementService } from '../../services/rebate-management.service'; import { RebateManagementService } from '../../services/rebate-management.service';
@Component({ @Component({
@ -27,10 +25,7 @@ export class ParterRebateManageMentParticularsComponent implements OnInit {
resourceStatus: any; resourceStatus: any;
data = this.service.$api_get_searchPageList; data = this.service.$api_get_searchPageList;
constructor( constructor(
public router: Router,
public ar: ActivatedRoute,
public service: RebateManagementService, public service: RebateManagementService,
private modalService: NzModalService,
public shipperservice: ShipperBaseService public shipperservice: ShipperBaseService
) {} ) {}
/** /**

4
src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.ts
View File

@ -1,6 +1,4 @@
import { ModalHelper } from '@delon/theme';
import { Component, OnInit, ViewChild } from '@angular/core'; import { Component, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st'; import { STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st';
import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form'; import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
import { processSingleSort, ShipperBaseService } from '@shared'; import { processSingleSort, ShipperBaseService } from '@shared';
@ -25,8 +23,6 @@ export class ParterRebateManageMentRecordComponent implements OnInit {
_$expand = false; _$expand = false;
data = [{ name1: 1111 }]; data = [{ name1: 1111 }];
constructor( constructor(
public router: Router,
public ar: ActivatedRoute,
public service: RebateManagementService, public service: RebateManagementService,
private modal: NzModalService, private modal: NzModalService,
public shipperservice: ShipperBaseService, public shipperservice: ShipperBaseService,

16
src/app/routes/partner/rebate-management/components/rebate-setting/add-partnerlist/add-partnerlist.component.ts
View File

@ -54,12 +54,24 @@ export class ParterRebateManageMentAddPartnerListComponent implements OnInit {
buttons: [ buttons: [
{ {
text: '添加', text: '添加',
iifBehavior: 'disabled',
iif: (item:any) => {
return this.filterArr(item)
},
click: _record => this.add(_record), click: _record => this.add(_record),
} }
] ]
} }
]; ];
filterArr (item: { id: any; }) {
let real = true
this.i.forEach((element:any) => {
if(element.id == item.id) {
real = false
}
});
return real
}
get reqParams() { get reqParams() {
// signStatus固定传20 代表签约完成 signStatus: 20 // signStatus固定传20 代表签约完成 signStatus: 20
let params: any = { ...this.sf?.value, }; let params: any = { ...this.sf?.value, };
@ -78,6 +90,8 @@ export class ParterRebateManageMentAddPartnerListComponent implements OnInit {
) {} ) {}
ngOnInit(): void { ngOnInit(): void {
console.log(this.i);
this.initSF(); this.initSF();
} }
initSF() { initSF() {

4
src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2022-02-24 20:09:49 * @Date : 2022-02-24 20:09:49
* @LastEditors : Shiming * @LastEditors : Shiming
* @LastEditTime : 2022-05-05 17:04:31 * @LastEditTime : 2022-05-07 15:42:10
* @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add\\add.component.html * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add\\add.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
--> -->
@ -58,7 +58,7 @@
<nz-option nzValue="2" nzLabel="新注册合伙人"></nz-option> <nz-option nzValue="2" nzLabel="新注册合伙人"></nz-option>
<nz-option nzValue="3" nzLabel="自定义合伙人"></nz-option> <nz-option nzValue="3" nzLabel="自定义合伙人"></nz-option>
</nz-select> </nz-select>
<span *ngIf="addStatus" style="padding-left: 15px; color: #0000ff" (click)="add()">添加</span> <span *ngIf="addStatus" style="padding-left: 15px; color: #0000ff" (click)="add(this.partnerPeopleList)">添加</span>
<st <st
*ngIf="partnerPeopleList?.length > 0" *ngIf="partnerPeopleList?.length > 0"
#st #st

59
src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts
View File

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2022-03-21 09:26:45 * @Date : 2022-03-21 09:26:45
* @LastEditors : Shiming * @LastEditors : Shiming
* @LastEditTime : 2022-05-05 14:04:53 * @LastEditTime : 2022-05-07 15:38:49
* @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add\\add.component.ts * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add\\add.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
*/ */
@ -127,59 +127,70 @@ export class ParterRebateManageMentAddComponent implements OnInit {
if (res) { if (res) {
if (Array.isArray(res)) { if (Array.isArray(res)) {
this.partnerPeopleList = this.partnerPeopleList.concat(res); this.partnerPeopleList = this.partnerPeopleList.concat(res);
this.partnerPeopleList = [...this.setArr(this.partnerPeopleList, 'id')];
res.forEach((ele: any) => { res.forEach((ele: any) => {
this.partnerId.push(ele?.id); this.partnerId.push(ele?.id);
}); });
} else { } else {
this.partnerPeopleList = this.partnerPeopleList.concat(res); this.partnerPeopleList = this.partnerPeopleList.concat(res);
this.partnerPeopleList = [...this.setArr(this.partnerPeopleList, 'id')];
this.partnerId.push(res?.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) { delete(item: any) {
this.partnerPeopleList = this.partnerPeopleList.filter((d: any, i: any) => { this.partnerPeopleList = this.partnerPeopleList.filter((d: any, i: any) => {
return item.id != d.id; return item.id != d.id;
}); });
} }
save() { save() {
if(!this.configName) { if (!this.configName) {
this.service.msgSrv.warning('请输入配置名称！'); this.service.msgSrv.warning('请输入配置名称！');
return return;
} }
if(!this.accountingRate) { if (!this.accountingRate) {
this.service.msgSrv.warning('请输入固定结算费率！'); this.service.msgSrv.warning('请输入固定结算费率！');
return return;
} }
if(!this.partnerType) { if (!this.partnerType) {
this.service.msgSrv.warning('请选择合伙人范围！'); this.service.msgSrv.warning('请选择合伙人范围！');
return return;
} }
if(!this.priority) { if (!this.priority) {
this.service.msgSrv.warning('请选择优先级！'); this.service.msgSrv.warning('请选择优先级！');
return return;
} }
if(!this.sf?.value.ruleDescription) { if (!this.sf?.value.ruleDescription) {
this.service.msgSrv.warning('请输入规则说明！'); this.service.msgSrv.warning('请输入规则说明！');
return return;
} }
if(!this.remark) { if (!this.remark) {
this.service.msgSrv.warning('请输入备注！'); 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('请选择合伙人！'); this.service.msgSrv.warning('请选择合伙人！');
return return;
} }
let real = false; let real = false;
if(this.configType == '2') { if (this.configType == '2') {
this.table.data.forEach((element: any) => { this.table.data.forEach((element: any) => {
if (element.startAmount > element.endAmount) { if (element.startAmount > element.endAmount) {
real = true; real = true;
return; return;
} }
}); });
} }
if (real) { if (real) {
this.service.msgSrv.warning('初始业务量不能超过到达业务量！'); this.service.msgSrv.warning('初始业务量不能超过到达业务量！');
return; return;
@ -197,7 +208,7 @@ export class ParterRebateManageMentAddComponent implements OnInit {
partnerType: this.partnerType partnerType: this.partnerType
}; };
console.log(params); console.log(params);
this.service.request(this.service.$api_save_rebateConfig, params).subscribe((res: any) => { this.service.request(this.service.$api_save_rebateConfig, params).subscribe((res: any) => {
if (res) { if (res) {
this.service.msgSrv.success('新增成功！'); this.service.msgSrv.success('新增成功！');

139
src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.ts
View File

@ -1,12 +1,10 @@
import { ModalHelper } from '@delon/theme';
import { Component, OnInit, ViewChild } from '@angular/core'; import { Component, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router'; import { Router } from '@angular/router';
import { STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st'; import { STColumn, STComponent } from '@delon/abc/st';
import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form'; import { SFComponent, SFSchema, SFUISchema } from '@delon/form';
import { processSingleSort, ShipperBaseService } from '@shared'; import { ShipperBaseService } from '@shared';
import { NzModalService } from 'ng-zorro-antd/modal'; import { NzModalService } from 'ng-zorro-antd/modal';
import { RebateManagementService } from '../../services/rebate-management.service'; 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'; import { ParterRebateManageMenAbnormalFeedbackComponent } from '../../model/abnormal-feedback/abnormal-feedback.component';
@Component({ @Component({
@ -25,19 +23,18 @@ export class ParterRebateManageMentSettingComponent implements OnInit {
_$expand = false; _$expand = false;
constructor( constructor(
public router: Router, public router: Router,
public ar: ActivatedRoute,
public service: RebateManagementService, public service: RebateManagementService,
private modal: NzModalService, private modal: NzModalService,
public shipperservice: ShipperBaseService, public shipperservice: ShipperBaseService
) {} ) {}
/** /**
* 查询参数 * 查询参数
*/ */
get reqParams() { get reqParams() {
const params: any = Object.assign({}, this.sf?.value || {}); const params: any = Object.assign({}, this.sf?.value || {});
return { return {
...params, ...params
}; };
} }
ngOnInit() { ngOnInit() {
this.initSF(); this.initSF();
@ -49,21 +46,20 @@ export class ParterRebateManageMentSettingComponent implements OnInit {
properties: { properties: {
configName: { configName: {
type: 'string', type: 'string',
title: '模板名称', title: '模板名称'
}, },
stateLocked: { stateLocked: {
type: 'string', type: 'string',
title: '状态', title: '状态',
enum: [ enum: [
{label: '全部', value: ''}, { label: '全部', value: '' },
{label: '生效中', value: 1}, { label: '生效中', value: 1 },
{label: '失效', value: 0}, { label: '失效', value: 0 }
], ],
ui: { ui: {
widget: 'select', widget: 'select'
}, }
}
},
} }
}; };
this.ui = { this.ui = {
@ -79,43 +75,42 @@ export class ParterRebateManageMentSettingComponent implements OnInit {
{ {
title: '模板名称', title: '模板名称',
index: 'configName', index: 'configName',
width: '200px', width: '200px'
}, },
{ {
title: '等级类型', title: '等级类型',
render: 'configType', render: 'configType',
width: '200px', width: '200px'
}, },
{ {
title: '备注', title: '备注',
index: 'remark', index: 'remark',
width: '250px', width: '250px'
}, },
{ {
title: '合伙人范围', title: '合伙人范围',
render: 'partnerType', render: 'partnerType',
width: '200px', width: '200px'
}, },
{ {
title: '创建时间', title: '创建时间',
index: 'enableTime', index: 'enableTime',
width: '200px', width: '200px'
}, },
{ {
title: '生效时间', title: '生效时间',
index: 'enableTime', index: 'enableTime',
width: '200px', width: '200px'
}, },
{ {
title: '优先级', title: '优先级',
index: 'priority', index: 'priority',
width: '100px', width: '100px'
}, },
{ {
title: '状态', title: '状态',
render: 'stateLocked', render: 'stateLocked',
width: '100px', width: '100px'
}, },
{ {
title: '操作', title: '操作',
@ -126,20 +121,24 @@ export class ParterRebateManageMentSettingComponent implements OnInit {
{ {
text: '查看', text: '查看',
acl: { ability: ['REBATE-SETTING-detail'] }, acl: { ability: ['REBATE-SETTING-detail'] },
click: _record => this.configAction(_record), click: _record => this.configAction(_record)
}, },
{ {
text: '禁用', text: '禁用',
acl: { ability: ['REBATE-SETTING-forbidden'] }, acl: { ability: ['REBATE-SETTING-forbidden'] },
iif: (_record) =>{ return _record.stateLocked == true && (_record.partnerType == 3 || _record.partnerType == 2)}, iif: _record => {
click: _record => this.viewEvaluate(_record), return _record.stateLocked == true && (_record.partnerType == 3 || _record.partnerType == 2);
},
click: _record => this.viewEvaluate(_record)
}, },
{ {
text: '启用', text: '启用',
acl: { ability: ['REBATE-SETTING-startUseing'] }, acl: { ability: ['REBATE-SETTING-startUseing'] },
iif: (_record) =>{ return _record.stateLocked == false}, iif: _record => {
click: _record => this.viewEvaluate(_record), return _record.stateLocked == false;
}, },
click: _record => this.viewEvaluate(_record)
}
] ]
} }
]; ];
@ -147,52 +146,52 @@ export class ParterRebateManageMentSettingComponent implements OnInit {
/** /**
*禁用 *禁用
*/ */
viewEvaluate(item: any) { viewEvaluate(item: any) {
console.log(item.stateLocked); console.log(item.stateLocked);
let title = '' let title = '';
let stateLocked: boolean; let stateLocked: boolean;
if(item.stateLocked) { if (item.stateLocked) {
title = '是否禁用该配置？' title = '是否禁用该配置？';
stateLocked = false stateLocked = false;
} else { } else {
title = '是否启用该配置？' title = '是否启用该配置？';
stateLocked = true stateLocked = true;
} }
this.modal.confirm({ this.modal.confirm({
nzTitle: title, nzTitle: title,
nzOnOk: () => { nzOnOk: () => {
const params = { const params = {
id: item?.id, id: item?.id,
stateLocked: stateLocked, stateLocked: stateLocked
} };
this.service.request(this.service.$api_set_updateRebateConfig,params).subscribe((res: any) => { this.service.request(this.service.$api_set_updateRebateConfig, params).subscribe((res: any) => {
if(res) { if (res) {
this.service.msgSrv.success('设置成功！') this.service.msgSrv.success('设置成功！');
this.st.reload(); this.st.reload();
} }
}) });
} }
}); });
} }
/** /**
*查看 *查看
*/ */
feedback(item?: any) { feedback(item?: any) {
const modal = this.modal.create({ const modal = this.modal.create({
nzTitle: '查看', nzTitle: '查看',
nzWidth: 580, nzWidth: 580,
nzContent: ParterRebateManageMenAbnormalFeedbackComponent, nzContent: ParterRebateManageMenAbnormalFeedbackComponent,
nzComponentParams: { i: item }, nzComponentParams: { i: item },
nzFooter: null nzFooter: null
}); });
modal.afterClose.subscribe((res: any) => { modal.afterClose.subscribe((res: any) => {
if (res) { if (res) {
} }
}); });
} }
configAction(value?: any) { configAction(value?: any) {
this.router.navigate(['/partner/rebate/setting/add/', '0'], {queryParams: value}) this.router.navigate(['/partner/rebate/setting/add/', '0'], { queryParams: value });
} }
/** /**
* 重置表单 * 重置表单
*/ */

33
src/app/routes/partner/rebate-management/model/abnormal-feedback/abnormal-feedback.component.ts
View File

@ -1,5 +1,5 @@
/* /*
* @Description : * @Description :
* @Version : 1.0 * @Version : 1.0
* @Author : Shiming * @Author : Shiming
* @Date : 2022-03-10 14:50:45 * @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 * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\model\\abnormal-feedback\\abnormal-feedback.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
*/ */
import { ModalHelper } from '@delon/theme';
import { Component, OnInit, ViewChild } from '@angular/core'; import { Component, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router'; import { SFComponent, SFSchema, SFTextareaWidgetSchema, SFUISchema } from '@delon/form';
import { STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st'; import { ShipperBaseService } from '@shared';
import { SFComponent, SFDateWidgetSchema, SFSchema, SFSelectWidgetSchema, SFTextareaWidgetSchema, SFUISchema } from '@delon/form'; import { NzModalRef } from 'ng-zorro-antd/modal';
import { processSingleSort, ShipperBaseService } from '@shared';
import { NzModalService, NzModalRef } from 'ng-zorro-antd/modal';
import { RebateManagementService } from '../../services/rebate-management.service'; import { RebateManagementService } from '../../services/rebate-management.service';
import { NzButtonSize } from 'ng-zorro-antd/button';
@Component({ @Component({
selector: 'app-parter-channel-rebate-management-abnormal-feedback', selector: 'app-parter-channel-rebate-management-abnormal-feedback',
@ -29,15 +25,7 @@ export class ParterRebateManageMenAbnormalFeedbackComponent implements OnInit {
sf!: SFComponent; sf!: SFComponent;
i!: any; i!: any;
data = [{ name1: 1111 }]; data = [{ name1: 1111 }];
constructor( constructor(public service: RebateManagementService, public shipperservice: ShipperBaseService, public modalRef: NzModalRef) {}
public router: Router,
public ar: ActivatedRoute,
public service: RebateManagementService,
private modalService: NzModalService,
public shipperservice: ShipperBaseService,
public modalRef: NzModalRef,
) {}
ngOnInit() { ngOnInit() {
this.initSF(); this.initSF();
@ -53,20 +41,19 @@ export class ParterRebateManageMenAbnormalFeedbackComponent implements OnInit {
ui: { ui: {
widget: 'textarea', widget: 'textarea',
autosize: { minRows: 3, maxRows: 6 }, autosize: { minRows: 3, maxRows: 6 },
placeholder:'请不要超过50个字' placeholder: '请不要超过50个字'
} as SFTextareaWidgetSchema, } as SFTextareaWidgetSchema
}, }
} }
}; };
this.ui = { this.ui = {
'*': { '*': {
spanLabelFixed: 60, spanLabelFixed: 60,
grid: { span: 16 }, grid: { span: 16 }
} }
}; };
} }
close() { close() {
this.modalRef.destroy() this.modalRef.destroy();
} }
} }

58
src/app/routes/partner/rebate-management/model/record-detail/record-detail.component.ts
View File

@ -1,10 +1,8 @@
import { ModalHelper } from '@delon/theme';
import { Component, OnInit, ViewChild } from '@angular/core'; import { Component, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router'; import { STColumn, STComponent } from '@delon/abc/st';
import { STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st'; import { SFComponent, SFSchema, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
import { SFComponent, SFDateWidgetSchema, SFSchema, SFSelectWidgetSchema, SFUISchema } from '@delon/form'; import { ShipperBaseService } from '@shared';
import { processSingleSort, ShipperBaseService } from '@shared'; import { NzModalRef } from 'ng-zorro-antd/modal';
import { NzModalService, NzModalRef } from 'ng-zorro-antd/modal';
import { RebateManagementService } from '../../services/rebate-management.service'; import { RebateManagementService } from '../../services/rebate-management.service';
import { NzButtonSize } from 'ng-zorro-antd/button'; import { NzButtonSize } from 'ng-zorro-antd/button';
@ -24,36 +22,29 @@ export class ParterRebateManageMenRecordDetailComponent implements OnInit {
size: NzButtonSize = 'large'; size: NzButtonSize = 'large';
_$expand = false; _$expand = false;
data = [{ name1: 1111 }]; data = [{ name1: 1111 }];
constructor( constructor(public service: RebateManagementService, public shipperservice: ShipperBaseService, public modalRef: NzModalRef) {}
public router: Router,
public ar: ActivatedRoute,
public service: RebateManagementService,
private modalService: NzModalService,
public shipperservice: ShipperBaseService,
public modalRef: NzModalRef,
) {}
/** /**
* 查询字段个数 * 查询字段个数
*/ */
get queryFieldCount(): number { get queryFieldCount(): number {
return Object.keys(this.schema?.properties || {}).length; 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 || {}); const params: any = Object.assign({}, this.sf?.value || {});
delete params._$expand; delete params._$expand;
return { return {
...params, ...params
}; };
} }
ngOnInit() { ngOnInit() {
this.initSF(); this.initSF();
@ -72,8 +63,8 @@ export class ParterRebateManageMenRecordDetailComponent implements OnInit {
allowClear: true, allowClear: true,
asyncData: () => this.shipperservice.getNetworkFreightForwarder(), asyncData: () => this.shipperservice.getNetworkFreightForwarder(),
change: (value: any) => { change: (value: any) => {
console.log(value) console.log(value);
this.st.reload() this.st.reload();
} }
} }
}, },
@ -85,11 +76,11 @@ export class ParterRebateManageMenRecordDetailComponent implements OnInit {
params: { dictKey: 'overall:payment:status' }, params: { dictKey: 'overall:payment:status' },
containsAllLabel: true, containsAllLabel: true,
change: (value: any) => { change: (value: any) => {
console.log(value) console.log(value);
this.st.reload() this.st.reload();
} }
} as SFSelectWidgetSchema } as SFSelectWidgetSchema
}, }
} }
}; };
this.ui = { this.ui = {
@ -165,7 +156,6 @@ export class ParterRebateManageMenRecordDetailComponent implements OnInit {
this.st.load(1); this.st.load(1);
} }
close() { close() {
this.modalRef.destroy() this.modalRef.destroy();
} }
} }

1
src/app/routes/partner/recorded/components/detail/detail.component.ts
View File

@ -1,7 +1,6 @@
import { Component, OnInit, ViewChild } from '@angular/core'; import { Component, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute } from '@angular/router'; import { ActivatedRoute } from '@angular/router';
import { NzModalService } from 'ng-zorro-antd/modal'; 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'; import { RecordedService } from '../../services/recorded.service';

3
src/app/routes/supply-management/components/addmodal/addmodal.component.ts
View File

@ -1,5 +1,4 @@
import { Component, OnInit, ViewChild } from '@angular/core'; import { Component, OnInit, ViewChild } from '@angular/core';
import { Router, ActivatedRoute } from '@angular/router';
import { cacheConf } from '@conf/cache.conf'; import { cacheConf } from '@conf/cache.conf';
import { STColumn, STComponent, STChange, STData } from '@delon/abc/st'; import { STColumn, STComponent, STChange, STData } from '@delon/abc/st';
import { SFUISchema, SFSchema, SFComponent } from '@delon/form'; import { SFUISchema, SFSchema, SFComponent } from '@delon/form';
@ -28,7 +27,7 @@ export class CarAddmodalComponent implements OnInit {
constructor( constructor(
private modal: NzModalRef, private modal: NzModalRef,
private eaCacheSrv: EACacheService, private eaCacheSrv: EACacheService,
public service: SupplyManagementService, private router: Router, private ar: ActivatedRoute, public service: SupplyManagementService,
private modalHelper: ModalHelper private modalHelper: ModalHelper
) { } ) { }

4
src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html
View File

@ -39,7 +39,7 @@
name="loadName{{ idx }}" maxlength="30" placeholder="请输入联系人姓名" /> name="loadName{{ idx }}" maxlength="30" placeholder="请输入联系人姓名" />
</nz-form-control> </nz-form-control>
<nz-form-control [nzSpan]="12" [nzErrorTip]="'请输入联系人电话'"> <nz-form-control [nzSpan]="12" [nzErrorTip]="'请输入联系人电话'">
<input nz-input [(ngModel)]="data1.contractTelephone" maxlength="11" <input nz-input [(ngModel)]="data1.contractTelephone" maxlength="11" (ngModelChange)="onChangePhone(data1.contractTelephone)"
formControlName="loadPhone{{ idx }}" name="loadPhone{{ idx }}" placeholder="请输入联系人电话" /> formControlName="loadPhone{{ idx }}" name="loadPhone{{ idx }}" placeholder="请输入联系人电话" />
</nz-form-control> </nz-form-control>
</div> </div>
@ -74,7 +74,7 @@
name="unloadAddress{{ idx }}" placeholder="请输入联系人姓名" /> name="unloadAddress{{ idx }}" placeholder="请输入联系人姓名" />
</nz-form-control> </nz-form-control>
<nz-form-control [nzSpan]="12" [nzErrorTip]="'请输入联系人电话'"> <nz-form-control [nzSpan]="12" [nzErrorTip]="'请输入联系人电话'">
<input nz-input [(ngModel)]="data2.contractTelephone" <input nz-input [(ngModel)]="data2.contractTelephone" (ngModelChange)="onChangePhone(data2.contractTelephone)"
formControlName="unloadPhone{{ idx }}" name="unloadAddress{{ idx }}" maxlength="11" formControlName="unloadPhone{{ idx }}" name="unloadAddress{{ idx }}" maxlength="11"
placeholder="请输入联系人电话" /> placeholder="请输入联系人电话" />
</nz-form-control> </nz-form-control>

18
src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts
View File

@ -56,6 +56,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
maxTrainNumber: 99999, maxTrainNumber: 99999,
maxFreight: 9999999 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( constructor(
private http: _HttpClient, private http: _HttpClient,
fb: FormBuilder, fb: FormBuilder,
@ -69,10 +70,10 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
this.validateForm1 = fb.group({ this.validateForm1 = fb.group({
loadAddress0: [null, [Validators.required]], loadAddress0: [null, [Validators.required]],
loadName0: [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]], unloadAddress0: [null, [Validators.required]],
unloadName0: [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; @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();
}
} }

2
src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html
View File

@ -17,7 +17,7 @@
<div class="card-title">装卸货信息<span class="tip-font">预计公里数：<em>{{ totalDistance }}km</em>，预计行程耗时：<em>{{ totalTime }}小时</em></span> <div class="card-title">装卸货信息<span class="tip-font">预计公里数：<em>{{ totalDistance }}km</em>，预计行程耗时：<em>{{ totalTime }}小时</em></span>
</div> </div>
<form #ngForm="ngForm" nz-form role="form"> <form #ngForm="ngForm" [formGroup]="validateForm1" nz-form role="form">
<div nz-row [nzGutter]="24"> <div nz-row [nzGutter]="24">
<div nz-col [nzSpan]="10"> <div nz-col [nzSpan]="10">
<div *ngFor="let data1 of startInfo; let idx = index"> <div *ngFor="let data1 of startInfo; let idx = index">

22
src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts
View File

@ -1,6 +1,6 @@
import { Component, OnInit, ViewChild } from '@angular/core'; import { Component, OnInit, ViewChild } from '@angular/core';
import { NgForm } from '@angular/forms'; import { FormBuilder, FormGroup, Validators, FormControl, NgForm } from '@angular/forms';
import { ActivatedRoute, Router } from '@angular/router'; import { Router } from '@angular/router';
import { import {
SFComponent, SFComponent,
SFSchema, SFSchema,
@ -9,7 +9,6 @@ import {
SFTextareaWidgetSchema, SFTextareaWidgetSchema,
SFUISchema SFUISchema
} from '@delon/form'; } from '@delon/form';
import { SettingsService, _HttpClient } from '@delon/theme';
import { ShipperBaseService } from '@shared'; import { ShipperBaseService } from '@shared';
import { NzModalService } from 'ng-zorro-antd/modal'; import { NzModalService } from 'ng-zorro-antd/modal';
import { of } from 'rxjs'; 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 { PublishAddressListComponent } from '../onecar-publish/address-list/address-list.component';
import { PublishSuccessComponent } from '../onecar-publish/publish-success/publish-success.component'; import { PublishSuccessComponent } from '../onecar-publish/publish-success/publish-success.component';
import { TranAgreementComponent } from '../tran-agreement/tran-agreement.component'; import { TranAgreementComponent } from '../tran-agreement/tran-agreement.component';
import differenceInCalendarDays from 'date-fns/differenceInCalendarDays';
import { SupplyManagementQrcodePageComponent } from '../qrcode-page/qrcode-page.component'; import { SupplyManagementQrcodePageComponent } from '../qrcode-page/qrcode-page.component';
@Component({ @Component({
selector: 'app-publish-goods-bulk-publish', selector: 'app-publish-goods-bulk-publish',
@ -28,7 +26,7 @@ import { SupplyManagementQrcodePageComponent } from '../qrcode-page/qrcode-page.
styleUrls: ['./bulk-release-publish.component.less'] styleUrls: ['./bulk-release-publish.component.less']
}) })
export class SupplyManagementBulkReleasePublishComponent implements OnInit { export class SupplyManagementBulkReleasePublishComponent implements OnInit {
@ViewChild('ngForm') validateForm1: FormGroup;
ngForm!: NgForm; ngForm!: NgForm;
sf1data: any; // 货源单设置回显 sf1data: any; // 货源单设置回显
sf3data: any; // 货源单设置回显 sf3data: any; // 货源单设置回显
@ -50,6 +48,7 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit {
maxFreight: 9999999 maxFreight: 9999999
} }
shipperName = ''; 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[] = []; startInfo: any[] = [];
endInfo: any[] = []; endInfo: any[] = [];
@ -57,16 +56,21 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit {
totalTime = 0.0; //路程总时间 totalTime = 0.0; //路程总时间
freightTypeOptions: any; freightTypeOptions: any;
constructor( constructor(
private http: _HttpClient, fb: FormBuilder,
private modalService: NzModalService, private modalService: NzModalService,
private settingSrv: SettingsService,
private service: SupplyManagementService, private service: SupplyManagementService,
private router: Router, private router: Router,
private route: ActivatedRoute,
private amapService: AmapService, private amapService: AmapService,
public shipperSrv: ShipperBaseService 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; @ViewChild('sf1', { static: false }) sf1!: SFComponent;
schema1: SFSchema = {}; schema1: SFSchema = {};

4
src/app/routes/supply-management/components/bulk/bulk.component.ts
View File

@ -79,7 +79,9 @@ export class SupplyManagementBulkComponent extends BasicTableComponent implement
beforeReq = (requestOptions: STRequestOptions) => { beforeReq = (requestOptions: STRequestOptions) => {
const a: any = {}; const a: any = {};
if (this.resourceStatus) { if (this.resourceStatus) {
a.resourceStatus = this.resourceStatus; Object.assign(requestOptions.body, {
resourceStatus: this.resourceStatus
});
} }
const params: any = Object.assign({}, this.sf?.value || {}); const params: any = Object.assign({}, this.sf?.value || {});
delete params._$expand; delete params._$expand;

10
src/app/routes/supply-management/components/choose-famifiar/add/add.component.ts
View File

@ -1,9 +1,5 @@
import { AfterViewInit, ChangeDetectorRef, Component, OnChanges, OnInit, ViewChild } from '@angular/core'; import { Component, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute } from '@angular/router'; import { SFComponent, SFSchema, SFUISchema } from '@delon/form';
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';
@Component({ @Component({
selector: 'app-choose-famifiar-add', selector: 'app-choose-famifiar-add',
@ -16,7 +12,7 @@ export class PublishchooseFamifiarAddComponent implements OnInit {
i: any; i: any;
constructor(public http: _HttpClient, private cdr: ChangeDetectorRef, private route: ActivatedRoute) {} constructor() {}
ngOnInit(): void { ngOnInit(): void {
this.initSF(); this.initSF();

5
src/app/routes/supply-management/components/choose-famifiar/choose-famifiar.component.ts
View File

@ -1,10 +1,8 @@
import { Component, Input, OnInit, ViewChild } from '@angular/core'; import { Component, Input, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { STColumn, STComponent, STData } from '@delon/abc/st'; import { STColumn, STComponent, STData } from '@delon/abc/st';
import { SFComponent, SFSchema, SFUISchema } from '@delon/form'; import { SFComponent, SFSchema, SFUISchema } from '@delon/form';
import { ModalHelper } from '@delon/theme'; import { ModalHelper } from '@delon/theme';
import { EAEnvironmentService } from '@shared'; import { EAEnvironmentService } from '@shared';
import { NzDrawerService } from 'ng-zorro-antd/drawer';
import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal'; import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal';
import { SupplyManagementAddDriversComponent } from 'src/app/routes/supply-management/components/add-drivers/add-drivers.component'; import { SupplyManagementAddDriversComponent } from 'src/app/routes/supply-management/components/add-drivers/add-drivers.component';
import { SupplyManagementService } from '../../services/supply-management.service'; import { SupplyManagementService } from '../../services/supply-management.service';
@ -39,9 +37,6 @@ export class PublishGoodsChooseFamifiarComponent implements OnInit {
constructor( constructor(
private modal: NzModalRef, private modal: NzModalRef,
public router: Router,
public ar: ActivatedRoute,
private drawerService: NzDrawerService,
public service: SupplyManagementService, public service: SupplyManagementService,
private modalService: NzModalService, private modalService: NzModalService,
private modalHelper: ModalHelper, private modalHelper: ModalHelper,

9
src/app/routes/supply-management/components/choose-famifiar/set-captain/set-captain.component.ts
View File

@ -8,12 +8,9 @@
* @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\choose-famifiar\\set-captain\\set-captain.component.ts * @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. * Copyright (C) 2022 huzhenhong. All rights reserved.
*/ */
import { AfterViewInit, ChangeDetectorRef, Component, OnChanges, OnInit, ViewChild } from '@angular/core'; import { Component, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute } from '@angular/router'; import { SFComponent, SFSchema, SFUISchema } from '@delon/form';
import { SFComponent, SFSchema, SFSchemaEnumType, SFUISchema } from '@delon/form';
import { _HttpClient } from '@delon/theme';
import { NzModalRef } from 'ng-zorro-antd/modal'; import { NzModalRef } from 'ng-zorro-antd/modal';
import { map } from 'rxjs/operators';
@Component({ @Component({
selector: 'app-choose-famifiar-set-captain', selector: 'app-choose-famifiar-set-captain',
@ -26,7 +23,7 @@ export class PublishchooseFamifiarSetCaptainComponent implements OnInit {
i: any; i: any;
constructor(public http: _HttpClient, private cdr: ChangeDetectorRef, private route: ActivatedRoute, private modal: NzModalRef,) {} constructor( private modal: NzModalRef,) {}
ngOnInit(): void { ngOnInit(): void {
this.initSF(); this.initSF();

7
src/app/routes/supply-management/components/onecar-publish/address-list/address-list.component.ts
View File

@ -10,11 +10,8 @@
*/ */
import { Component, OnInit, ViewChild } from '@angular/core'; import { Component, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { STChange, STColumn, STComponent, STRequestOptions } from '@delon/abc/st'; import { STChange, STColumn, STComponent, STRequestOptions } from '@delon/abc/st';
import { processSingleSort } from '@shared'; 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'; import { SupplyManagementService } from '../../../services/supply-management.service';
@Component({ @Component({
selector: 'app-publish-address-list', selector: 'app-publish-address-list',
@ -30,11 +27,7 @@ export class PublishAddressListComponent implements OnInit {
spuStatus = '1'; // '1'客户地址，'2'收回单地址 spuStatus = '1'; // '1'客户地址，'2'收回单地址
constructor( constructor(
public router: Router,
public ar: ActivatedRoute,
private drawerService: NzDrawerService,
public service: SupplyManagementService, public service: SupplyManagementService,
private modalService: NzModalService
) {} ) {}
/** /**

16
src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts
View File

@ -43,6 +43,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
intervalDays: 999, intervalDays: 999,
maxTimes: 5 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; // 货源单设置回显 sf1data: any; // 货源单设置回显
sf3data: any; // 货源单设置回显 sf3data: any; // 货源单设置回显
sf4data: any; // 货源单设置回显 sf4data: any; // 货源单设置回显
@ -78,7 +79,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
) { ) {
this.validateForm1 = fb.group({ this.validateForm1 = fb.group({
loadingTime: [null, [Validators.required]], loadingTime: [null, [Validators.required]],
unloadingTime: [null, [Validators.required]] unloadingTime: [null, [Validators.required]],
}); });
this.envCache = this.eaCacheSrv.get(cacheConf.env); 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(`loadAddress${controlId}`, new FormControl(null, Validators.required));
this.validateForm1.addControl(`loadName${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(`unloadName${controlId}`, new FormControl(null, Validators.required));
this.validateForm1.addControl( this.validateForm1.addControl(
`unloadPhone${controlId}`, `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('/toPay', this.sf7data.toPay);
this.sf7.setValue('/receiptPay', this.sf7data.receiptPay); this.sf7.setValue('/receiptPay', this.sf7data.receiptPay);
this.payChange(); 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();
// }
// }
} }
// 选择地址 // 选择地址

10
src/app/routes/supply-management/components/release-publish/release-publish.component.ts
View File

@ -52,6 +52,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
totalTime = 0.0; //路程总时间 totalTime = 0.0; //路程总时间
currentRate = 0; //实时计算的费率 currentRate = 0; //实时计算的费率
shipperName = ''; 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( constructor(
private http: _HttpClient, private http: _HttpClient,
fb: FormBuilder, fb: FormBuilder,
@ -67,10 +68,10 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
this.validateForm1 = fb.group({ this.validateForm1 = fb.group({
loadAddress0: [null, [Validators.required]], loadAddress0: [null, [Validators.required]],
loadName0: [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]], unloadAddress0: [null, [Validators.required]],
unloadName0: [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]], loadingTime: [null, [Validators.required]],
unloadingTime: [null, [Validators.required]] unloadingTime: [null, [Validators.required]]
}); });
@ -609,7 +610,6 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
receiptUserPhone: { receiptUserPhone: {
type: 'string', type: 'string',
title: '联系电话', title: '联系电话',
format: 'mobile',
maxLength: 11, maxLength: 11,
ui: { ui: {
errors: { errors: {
@ -836,7 +836,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
}); });
this.validateForm1.addControl(`loadAddress${controlId}`, new FormControl(null, Validators.required)); this.validateForm1.addControl(`loadAddress${controlId}`, new FormControl(null, Validators.required));
this.validateForm1.addControl(`loadName${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(`unloadName${controlId}`, new FormControl(null, Validators.required));
this.validateForm1.addControl( this.validateForm1.addControl(
`unloadPhone${controlId}`, `unloadPhone${controlId}`,
new FormControl(null, [Validators.required, Validators.pattern('^[0-9]*$')]) new FormControl(null, [Validators.required, Validators.pattern(this.patternStr)])
); );
} }
} }

4
src/app/routes/supply-management/components/vehicle/vehicle.component.ts
View File

@ -75,7 +75,9 @@ export class SupplyManagementVehicleComponent extends BasicTableComponent implem
...params ...params
}; };
if (this.resourceStatus) { if (this.resourceStatus) {
a.resourceStatus = this.resourceStatus; Object.assign(requestOptions.body, {
resourceStatus: this.resourceStatus
});
} }
if (this.sf) { if (this.sf) {
Object.assign(requestOptions.body, { Object.assign(requestOptions.body, {

2
src/app/routes/ticket-management/components/billing-order/billing-order.component.html
View File

@ -31,7 +31,7 @@
</div> </div>
</div> </div>
<st #st [data]="service.$api_invoicedBillInfo_page" [columns]="columns" [req]="{ process: beforeReq }" [page]="{}" <st #st [data]="service.$api_invoicedBillInfo_page" [columns]="columns" [req]="{ process: beforeReq }" [page]="{}"
[loading]="false" [scroll]="{ x:'1200px' }"> [loading]="false" [scroll]="{ x:'1200px', y: scrollY }">
<ng-template st-row="serviceType" let-item let-index="index"> <ng-template st-row="serviceType" let-item let-index="index">
<span>{{item.billTypeLabel + item.serviceTypeLabel}}</span> <span>{{item.billTypeLabel + item.serviceTypeLabel}}</span>
</ng-template> </ng-template>

3
src/app/routes/usercenter/components/driver/captain/captain.component.ts
View File

@ -58,9 +58,6 @@ export class UserCenterComponentsDriverCaptainComponent extends BasicTableCompon
} }
ngOnInit() { ngOnInit() {
this.ar.url.subscribe(params => {
this.st?.load(1);
});
} }
dataProcess(data: STData[]): STData[] { dataProcess(data: STData[]): STData[] {
return data.map((i, index) => { return data.map((i, index) => {

3
src/app/routes/usercenter/components/driver/driver.component.ts
View File

@ -63,9 +63,6 @@ export class UserCenterComponentsDriverComponent extends BasicTableComponent imp
} }
ngOnInit() { ngOnInit() {
this.ar.url.subscribe(params => {
this.st?.load(1);
});
} }
selectChange(e: any) { selectChange(e: any) {

15
src/app/routes/usercenter/components/freight/list/detail/detail.component.html
View File

@ -48,30 +48,31 @@
保存 保存
</button> </button>
<button [disabled]="false" nz-button nzDanger (click)="auditPass(true)" <button [disabled]="false" nz-button nzDanger (click)="auditPass(true)"
*ngIf="detailData?.approvalStatus===10" acl [acl-ability]="['USERCENTER-FREIGHT-LIST-DETAIL-pass']"> *ngIf="detailData?.approvalStatus===10" acl
[acl-ability]="['USERCENTER-FREIGHT-LIST-DETAIL-pass','USERCENTER-FREIGHT-ENTERPRISE-D-audit']">
通过 通过
</button> </button>
</ng-container> </ng-container>
<ng-template #editButton> <ng-template #editButton>
<ng-container *ngIf="detailData?.approvalStatus===10"> <ng-container *ngIf="detailData?.approvalStatus===10">
<button [disabled]="false" nz-button nzDanger (click)="auditPass(false)" acl <button [disabled]="false" nz-button nzDanger (click)="auditPass(false)" acl
[acl-ability]="['USERCENTER-FREIGHT-LIST-DETAIL-pass']"> [acl-ability]="['USERCENTER-FREIGHT-LIST-DETAIL-pass','USERCENTER-FREIGHT-ENTERPRISE-D-audit']">
通过 通过
</button> </button>
<button [disabled]="false" nz-button nzDanger (click)="auditNo()" acl <button [disabled]="false" nz-button nzDanger (click)="auditNo()" acl
[acl-ability]="['USERCENTER-FREIGHT-LIST-DETAIL-pass']"> [acl-ability]="['USERCENTER-FREIGHT-LIST-DETAIL-pass','USERCENTER-FREIGHT-ENTERPRISE-D-audit']">
驳回 驳回
</button> </button>
</ng-container> </ng-container>
<ng-container *ngIf="detailData?.approvalStatus!=10"> <ng-container *ngIf="detailData?.approvalStatus!=10">
<button [disabled]="false" nz-button nzDanger nz-popconfirm [nzPopconfirmTitle]="enable" <button [disabled]="false" nz-button nzDanger nz-popconfirm [nzPopconfirmTitle]="enable"
(nzOnConfirm)="freezeOrResume(0)" nzPopconfirmPlacement="bottomRight" *ngIf="detailData?.stateLocked" (nzOnConfirm)="freezeOrResume(0)" nzPopconfirmPlacement="bottomRight" *ngIf="detailData?.stateLocked"
acl [acl-ability]="['USERCENTER-FREIGHT-LIST-DETAIL-lock']"> acl [acl-ability]="['USERCENTER-FREIGHT-LIST-DETAIL-lock','USERCENTER-FREIGHT-ENTERPRISE-D-lock']">
启用 启用
</button> </button>
<button [disabled]="false" nz-button nzDanger nz-popconfirm [nzPopconfirmTitle]="frozen" <button [disabled]="false" nz-button nzDanger nz-popconfirm [nzPopconfirmTitle]="frozen"
(nzOnConfirm)="freezeOrResume(1)" nzPopconfirmPlacement="bottomRight" *ngIf="!detailData?.stateLocked" (nzOnConfirm)="freezeOrResume(1)" nzPopconfirmPlacement="bottomRight" *ngIf="!detailData?.stateLocked"
acl [acl-ability]="['USERCENTER-FREIGHT-LIST-DETAIL-lock']"> acl [acl-ability]="['USERCENTER-FREIGHT-LIST-DETAIL-lock','USERCENTER-FREIGHT-ENTERPRISE-D-lock']">
冻结 冻结
</button> </button>
<button [disabled]="false" nz-button nzDanger nz-popconfirm [nzPopconfirmTitle]="Payfrozen" <button [disabled]="false" nz-button nzDanger nz-popconfirm [nzPopconfirmTitle]="Payfrozen"
@ -84,7 +85,7 @@
</button> </button>
</ng-container> </ng-container>
<button [disabled]="false" nz-button nzDanger (click)="ratify()" acl <button [disabled]="false" nz-button nzDanger (click)="ratify()" acl
[acl-ability]="['USERCENTER-FREIGHT-LIST-DETAIL-save']"> [acl-ability]="['USERCENTER-FREIGHT-LIST-DETAIL-save','USERCENTER-FREIGHT-ENTERPRISE-D-save']">
修改 修改
</button> </button>
</ng-template> </ng-template>
@ -557,4 +558,4 @@
</div> </div>
</div> </div>
</nz-upload> </nz-upload>
</ng-template> </ng-template>

21
src/app/routes/usercenter/components/freight/list/list.component.ts
View File

@ -25,8 +25,6 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen
loadingList = true; loadingList = true;
sfValue = { enterpriseName: '', contactName: '' };
constructor( constructor(
public service: UsermanageService, public service: UsermanageService,
private modal: NzModalService, private modal: NzModalService,
@ -36,6 +34,7 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen
public searchDrawerService: SearchDrawerService public searchDrawerService: SearchDrawerService
) { ) {
super(searchDrawerService); super(searchDrawerService);
this.sfValue = { enterpriseName: '', contactName: '' };
} }
ngOnInit() { ngOnInit() {
@ -49,23 +48,23 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen
beforeReq = (requestOptions: STRequestOptions) => { beforeReq = (requestOptions: STRequestOptions) => {
Object.assign(requestOptions.body, { listSource: 1 }); Object.assign(requestOptions.body, { listSource: 1 });
if (this.sf) { if (this.sfValue) {
Object.assign(requestOptions.body, { Object.assign(requestOptions.body, {
...this.sf?.value ...this.sfValue
}); });
if (this.sf?.value.createTime) { if (this.sfValue.createTime) {
Object.assign(requestOptions.body, { Object.assign(requestOptions.body, {
createTime: { createTime: {
start: this.sf?.value.createTime[0], start: this.sfValue.createTime[0],
end: this.sf?.value.createTime[1] end: this.sfValue.createTime[1]
} }
}); });
} }
if (this.sf?.value.approvalTime) { if (this.sfValue.approvalTime) {
Object.assign(requestOptions.body, { Object.assign(requestOptions.body, {
approvalTime: { approvalTime: {
start: this.sf?.value.approvalTime[0], start: this.sfValue.approvalTime[0],
end: this.sf?.value.approvalTime[1] end: this.sfValue.approvalTime[1]
} }
}); });
} }
@ -518,7 +517,7 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen
const params = { listSource: 1, pageSize: -1 }; const params = { listSource: 1, pageSize: -1 };
if (this.sf) { if (this.sf) {
Object.assign(params, { Object.assign(params, {
...this.sf?.value ...this.sfValue
}); });
} }
this.service.downloadFile(this.service.$api_export_enterprise, params); this.service.downloadFile(this.service.$api_export_enterprise, params);

6
src/app/routes/usercenter/components/freight/user/user.component.ts
View File

@ -36,11 +36,7 @@ export class FreightComponentsUserComponent extends BasicTableComponent implemen
this.st?.load(1); this.st?.load(1);
} }
ngOnInit() { ngOnInit() {}
this.ar.url.subscribe(params => {
this.st?.load(1);
});
}
beforeReq = (requestOptions: STRequestOptions) => { beforeReq = (requestOptions: STRequestOptions) => {
Object.assign(requestOptions.body, { certificationStatus: this.resourceStatus }); Object.assign(requestOptions.body, { certificationStatus: this.resourceStatus });

3
src/app/routes/vehicle/components/audit/audit.component.ts
View File

@ -56,9 +56,6 @@ export class VehicleComponentsAuditComponent extends BasicTableComponent impleme
ngOnInit() { ngOnInit() {
this.initSF(); this.initSF();
this.initST(); this.initST();
this.ar.url.subscribe(params => {
this.st?.load(1);
});
} }
search() { search() {

3
src/app/routes/vehicle/components/list/list.component.ts
View File

@ -48,9 +48,6 @@ export class VehicleComponentsListComponent extends BasicTableComponent implemen
ngOnInit() { ngOnInit() {
this.initSF(); this.initSF();
this.initST(); this.initST();
this.ar.url.subscribe(params => {
this.st?.load(1);
});
} }
dataProcess(data: STData[]): STData[] { dataProcess(data: STData[]): STData[] {
return data.map((i, index) => { return data.map((i, index) => {