diff --git a/src/app/pages/account/sys-role/sys-role.component.html b/src/app/pages/account/sys-role/sys-role.component.html index e0e3b58..f1b1c68 100644 --- a/src/app/pages/account/sys-role/sys-role.component.html +++ b/src/app/pages/account/sys-role/sys-role.component.html @@ -88,6 +88,7 @@ [nzCheckedKeys]="menuTreeCheckedKeys" [nzShowLine]="true" [nzExpandAll]="true" + [nzCheckStrictly]="true" [nzMultiple]="false" [nzCheckable]="true" nzVirtualHeight="500px" diff --git a/src/app/pages/account/sys-role/sys-role.component.ts b/src/app/pages/account/sys-role/sys-role.component.ts index 7d00a4a..a1c22f1 100644 --- a/src/app/pages/account/sys-role/sys-role.component.ts +++ b/src/app/pages/account/sys-role/sys-role.component.ts @@ -256,9 +256,9 @@ export class SysRoleComponent { const checkedNodeList = this.nzTreeComponent.getCheckedNodeList(); for (let node of checkedNodeList) { menuIds.push(node.origin.key); - if (node.origin.children != null) { + /*if (node.origin.children != null) { menuIds.concat(this.recursionData(node.origin, menuIds)) - } + }*/ }; // 半选状态的菜单 diff --git a/src/app/pages/discount/discount-edit/discount-edit.component.ts b/src/app/pages/discount/discount-edit/discount-edit.component.ts index 20b026d..7c872ea 100644 --- a/src/app/pages/discount/discount-edit/discount-edit.component.ts +++ b/src/app/pages/discount/discount-edit/discount-edit.component.ts @@ -87,7 +87,7 @@ export class DiscountEditComponent { discountNo: [null], discountName: [null, [Validators.required]], discountType: [null, [Validators.required]], - overlayDiscount: [null, [Validators.required]], + overlayDiscount: [false, [Validators.required]], discountPrice: [null, [Validators.required]], discountCondition: [null], useScope: [null], diff --git a/src/environments/environment.ts b/src/environments/environment.ts index debd267..1942a40 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -4,7 +4,7 @@ export const environment = { production: false, - baseUrl: 'https://test-oil.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址) + baseUrl: 'http://localhost:9802/brest/', // 测试环境服务器地址(请求数据地址) imageUrl: 'https://test-oil.dctpay.com/filesystem/', };