diff --git a/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts b/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts
index e235e937..8999bad0 100644
--- a/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts
+++ b/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts
@@ -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,
diff --git a/src/app/routes/partner/system-config/components/config/config.component.html b/src/app/routes/partner/system-config/components/config/config.component.html
index c57af325..81aff0b8 100644
--- a/src/app/routes/partner/system-config/components/config/config.component.html
+++ b/src/app/routes/partner/system-config/components/config/config.component.html
@@ -1,13 +1,5 @@
-
-
提现手续费配置
@@ -74,37 +66,6 @@
-
-
- 邀请合伙人
-
-
- 邀请客户
-
-
-
- so good
-
-
-
-
-
diff --git a/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.html b/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.html
index 55b7ec3d..7a3c023c 100644
--- a/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.html
+++ b/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.html
@@ -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.
-->
-
-
-
\ No newline at end of file
+
+
+
+
+
diff --git a/src/app/routes/sys-setting/sys-setting.module.ts b/src/app/routes/sys-setting/sys-setting.module.ts
index 9e85ab05..8905be2d 100644
--- a/src/app/routes/sys-setting/sys-setting.module.ts
+++ b/src/app/routes/sys-setting/sys-setting.module.ts
@@ -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 {}
diff --git a/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html b/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html
index 7e86f88f..0f7e8ee2 100644
--- a/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html
+++ b/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html
@@ -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 || ''">
-
+
diff --git a/src/app/shared/index.ts b/src/app/shared/index.ts
index 11bf70b7..68efd6c7 100644
--- a/src/app/shared/index.ts
+++ b/src/app/shared/index.ts
@@ -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
diff --git a/src/app/shared/shared-zorro.module.ts b/src/app/shared/shared-zorro.module.ts
index 602b8c26..ab37e304 100644
--- a/src/app/shared/shared-zorro.module.ts
+++ b/src/app/shared/shared-zorro.module.ts
@@ -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,
];
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index 18f62bd9..1662aafc 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -58,6 +58,7 @@ const MODULES = [
rebateTableModule,
CaptchaModule,
SearchDrawerModule,
+
...PRO_SHARED_MODULES
];
// #endregion