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

Merge branch 'develop'

Browse Source
This commit is contained in:
wangshiming
2022-04-27 11:13:37 +08:00
parent 621920b712 20c1c2e4f4
commit b675f8958b
8 changed files with 41 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts
View File

@ -5,7 +5,7 @@ import { OnChanges } from '@angular/core';
* @Author : Shiming
* @Date : 2022-01-05 11:01:55
* @LastEditors : Shiming
* @LastEditTime : 2022-04-25 10:28:10
* @LastEditTime : 2022-04-27 11:13:07
* @FilePath : \\tms-obc-web\\src\\app\\routes\\contract-management\\components\\contract-template-detail\\contract-template-detail.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@ -220,16 +220,22 @@ export class ContractManagementTemplateTextComponent implements OnInit {
}
save() {
// if (!this.sf.value.templateName || !this.sf.value.templateType || !this.sf2.value.templateContent || !this.title) {
// this.service.msgSrv.error('必填参数为空，请检查再重新保存！');
// return;
// }
// if (this.sf.value.templateType == 'MX') {
// if (this.sf.value.contractType == '') {
// this.service.msgSrv.error('必填参数为空，请检查再重新保存！');
// return;
// }
// }
console.log(this.sf.value.templateName);
console.log(this.sf.value.templateType);
console.log(this.sf2.value.templateContent);
console.log(this.title);
console.log(this.title || this.detailList.templateName);
if (!this.sf.value.templateName || !this.sf.value.templateType || !this.sf2.value.templateContent || !(this.title || this.detailList.templateName)) {
this.service.msgSrv.error('必填参数为空，请检查再重新保存！');
return;
}
if (this.sf.value.templateType == 'MX') {
if (this.sf.value.contractType == '') {
this.service.msgSrv.error('必填参数为空，请检查再重新保存！');
return;
}
}
const params = {
...this.sf.value,
...this.sf2.value,

39
src/app/routes/partner/system-config/components/config/config.component.html
View File

@ -1,13 +1,5 @@
<nz-card>
<div nz-row [nzGutter]="8">
<div nz-col nzSpan="4">
<ul nz-menu nzMode="inline" class="card-height">
<li nz-menu-item [nzSelected]="idx === 0" (click)="changeType(idx)" *ngFor="let item of tabs; let idx = index">
{{ item.name }}
</li>
</ul>
</div>
<div nz-col nzSpan="20" style="overflow: scroll">
<nz-card class="card-height" [nzBordered]="null" nzSize="small" *ngIf="selectedTab === 0">
<h3 style="font-weight: 600">提现手续费配置</h3>
@ -74,37 +66,6 @@
</div>
</div>
</nz-card>
<nz-card class="card-height" [nzBordered]="null" nzSize="small" *ngIf="selectedTab === 1">
<h3 style="font-weight: 600;">邀请合伙人</h3>
<sf
style="margin-left: 14px"
#sf
mode="default"
[formData]="i"
[schema]="schema"
[ui]="{ '*': { spanLabelFixed: 200, grid: { span: 24 } } }"
button="none"
>
</sf>
<h3 style="font-weight: 600;">邀请客户</h3>
<sf
style="margin-left: 14px"
#sf2
mode="default"
[formData]="i"
[schema]="schema2"
[ui]="{ '*': { spanLabelFixed: 200, grid: { span: 24 } } }"
button="none"
>
<ng-template sf-template="start" let-me let-ui="ui" let-schema="schema"> </ng-template>
<template id="tpl">
<span>so good </span>
</template>
</sf>
</nz-card>
<div class="mb-md save-btn">
<button class="ml-lg" nz-button nzSize="large" nzType="primary">保存</button>
<button class="ml-lg" nz-button nzSize="large">取消</button>

19
src/app/routes/sys-setting/components/basic-setting/basic-setting.component.html
View File

@ -4,12 +4,19 @@
* @Author : Shiming
* @Date : 2022-04-21 13:49:22
* @LastEditors : Shiming
* @LastEditTime : 2022-04-27 10:36:59
* @LastEditTime : 2022-04-27 10:56:40
* @FilePath : \\tms-obc-web\\src\\app\\routes\\sys-setting\\components\\basic-setting\\basic-setting.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<app-dynamic-setting-h5 [tabs]="tabs" [configList]="configList" [selectedTab]="selectedTab" (selectedEvent)="getConfigList($event)" (saveEvent)="saveAction($event)" [labelWidth]="labelWidth">
<!-- <custom-element>
</custom-element> -->
</app-dynamic-setting-h5>
<app-dynamic-setting-h5
[tabs]="tabs"
[configList]="configList"
[selectedTab]="selectedTab"
(selectedEvent)="getConfigList($event)"
(saveEvent)="saveAction($event)"
[labelWidth]="labelWidth"
>
<custom-element>
<app-parterl-config></app-parterl-config>
</custom-element>
</app-dynamic-setting-h5>

5
src/app/routes/sys-setting/sys-setting.module.ts
View File

@ -6,7 +6,7 @@
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath : \\tms-obc-web\\src\\app\\routes\\sys-setting\\sys-setting.module.ts
*/
import { NgModule } from '@angular/core';
import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { DynamicSettingModule, SharedModule } from '@shared';
import { StaffManagementComponent } from './components/staff-management/staff-management.component';
@ -73,6 +73,7 @@ const NOTROUTECOMPONENTS = [
];
@NgModule({
declarations: [...COMPONENTS, ...NOTROUTECOMPONENTS],
imports: [CommonModule, SysSettingRoutingModule, SharedModule, DynamicSettingModule]
imports: [CommonModule, SysSettingRoutingModule, SharedModule, DynamicSettingModule],
schemas: [CUSTOM_ELEMENTS_SCHEMA]
})
export class SysSettingModule {}

4
src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-01-25 16:03:45
* @LastEditors : Shiming
* @LastEditTime : 2022-03-30 16:50:35
* @LastEditTime : 2022-04-27 10:58:30
* @FilePath : \\tms-obc-web\\src\\app\\shared\\components\\dynamic-setting\\dynamic-setting-h5\\dynamic-setting-h5.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@ -143,7 +143,7 @@
[maxlength]="item.remark?.maxLength"
[placeholder]="item.remark?.placeholder || ''"></textarea>
</ng-container>
<!-- 开关选项 -->
<!-- 自定义选项 -->
<ng-container *ngSwitchCase="999">
<ng-content select="custom-element"></ng-content>
</ng-container>

2
src/app/shared/index.ts
View File

@ -1,7 +1,7 @@
/*
* @Author: your name
* @Date: 2021-11-29 10:04:12
* @LastEditTime : 2022-03-11 15:12:20
* @LastEditTime : 2022-04-27 10:38:54
* @LastEditors : Shiming
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath : \\tms-obc-web\\src\\app\\shared\\index.ts

8
src/app/shared/shared-zorro.module.ts
View File

@ -1,10 +1,10 @@
/*
* @Author: your name
* @Date: 2021-11-29 10:20:33
* @LastEditTime: 2022-01-12 13:38:38
* @LastEditors: Please set LastEditors
* @LastEditTime : 2022-04-27 10:40:36
* @LastEditors : Shiming
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\shared\shared-zorro.module.ts
* @FilePath : \\tms-obc-web\\src\\app\\shared\\shared-zorro.module.ts
*/
import { NzInputNumberModule } from 'ng-zorro-antd/input-number';
import { NzTreeModule } from 'ng-zorro-antd/tree';
@ -94,5 +94,5 @@ export const SHARED_ZORRO_MODULES = [
NzImageModule,
NzDrawerModule,
NzTreeSelectModule,
NzAvatarModule
NzAvatarModule,
];

1
src/app/shared/shared.module.ts
View File

@ -58,6 +58,7 @@ const MODULES = [
rebateTableModule,
CaptchaModule,
SearchDrawerModule,
...PRO_SHARED_MODULES
];
// #endregion