From b12e7b7049b496e310c39058b36be81fa801f0b9 Mon Sep 17 00:00:00 2001
From: MaxKey <shimingxy@qq.com>
Date: Sun, 17 Jul 2022 20:52:03 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=B1=BB=E5=9E=8B=E5=85=AC?=
 =?UTF-8?q?=E5=8F=B8=E3=80=81=E5=88=86=E6=94=AF=E6=9C=BA=E6=9E=84=E3=80=81?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organization-editer.component.html                    | 3 +++
 .../app/routes/organizations/organizations.component.html | 8 +++++---
 .../maxkey-web-mgt-app/src/assets/i18n/en-US.json         | 3 +++
 .../maxkey-web-mgt-app/src/assets/i18n/zh-CN.json         | 3 +++
 .../maxkey-web-mgt-app/src/assets/i18n/zh-TW.json         | 3 +++
 5 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/organizations/organization-editer/organization-editer.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/organizations/organization-editer/organization-editer.component.html
index 95200e434..d6058c66a 100644
--- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/organizations/organization-editer/organization-editer.component.html
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/organizations/organization-editer/organization-editer.component.html
@@ -40,6 +40,9 @@
           </nz-form-label>
           <nz-form-control [nzSm]="18" [nzMd]="18" [nzXs]="36" [nzXl]="48" nzErrorTip="The input is not valid type!">
             <nz-select name="type" [(ngModel)]="form.model.type" [ngModelOptions]="{ standalone: true }">
+              <nz-option nzValue="company" nzLabel="{{ 'mxk.organizations.type.company' | i18n }}"></nz-option>
+              <nz-option nzValue="division" nzLabel="{{ 'mxk.organizations.type.division' | i18n }}"></nz-option>
+              <nz-option nzValue="department" nzLabel="{{ 'mxk.organizations.type.department' | i18n }}"></nz-option>
               <nz-option nzValue="entity" nzLabel="{{ 'mxk.organizations.type.entity' | i18n }}"></nz-option>
               <nz-option nzValue="virtual" nzLabel="{{ 'mxk.organizations.type.virtual' | i18n }}"></nz-option>
             </nz-select>
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/organizations/organizations.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/organizations/organizations.component.html
index 4a3411630..de7d92837 100644
--- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/organizations/organizations.component.html
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/organizations/organizations.component.html
@@ -78,9 +78,11 @@
               <span>{{ data.id }}</span>
             </td>
             <td nzAlign="left"> {{ data.orgName }}</td>
-            <td nzAlign="left">
-              {{ data.type == 'entity' ? ('mxk.organizations.type.entity' | i18n) : ('mxk.organizations.type.virtual' |
-              i18n) }}</td>
+            <td nzAlign="left" *ngIf="data.type == 'company'"> {{ 'mxk.organizations.type.company' | i18n }}</td>
+            <td nzAlign="left" *ngIf="data.type == 'division'"> {{ 'mxk.organizations.type.division' | i18n }}</td>
+            <td nzAlign="left" *ngIf="data.type == 'department'"> {{ 'mxk.organizations.type.department' | i18n }}</td>
+            <td nzAlign="left" *ngIf="data.type == 'entity'"> {{ 'mxk.organizations.type.entity' | i18n }}</td>
+            <td nzAlign="left" *ngIf="data.type == 'virtual'"> {{ 'mxk.organizations.type.virtual' | i18n }}</td>
             <td nzAlign="center"> {{ data.sortIndex }}</td>
             <td nzAlign="center"> <i *ngIf="data.status == 1" nz-icon nzType="check-circle" nzTheme="fill"
                 style="color: green"></i></td>
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/en-US.json b/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/en-US.json
index d69f2c028..ea59b2cb1 100644
--- a/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/en-US.json
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/en-US.json
@@ -190,6 +190,9 @@
 			"parentCode": "Parent Code",
 			"parentName": "Parent Name",
 			"type": "Type",
+			"type.company": "Company",
+			"type.division": "Division",
+			"type.department": "Department",
 			"type.entity": "Entity",
 			"type.virtual": "Virtual",
 			"codePath": "Code Path",
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/zh-CN.json b/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/zh-CN.json
index 1500bf2a3..bd4e82d3a 100644
--- a/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/zh-CN.json
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/zh-CN.json
@@ -191,6 +191,9 @@
 			"parentCode": "父级编码",
 			"parentName": "父级名称",
 			"type": "类型",
+			"type.company": "公司",
+			"type.division": "分支机构",
+			"type.department": "部门",
 			"type.entity": "实体",
 			"type.virtual": "虚拟",
 			"codePath": "编码路径",
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/zh-TW.json b/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/zh-TW.json
index 0b62a4480..58528ae86 100644
--- a/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/zh-TW.json
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/zh-TW.json
@@ -192,6 +192,9 @@
 			"parentCode": "父級編碼",
 			"parentName": "父級名稱",
 			"type": "類型",
+			"type.company": "公司",
+			"type.division": "分支機搆",
+			"type.department": "部門",
 			"type.entity": "實體",
 			"type.virtual": "虛擬",
 			"codePath": "編碼路徑",