Prechádzať zdrojové kódy

组织类型公司、分支机构、部门

MaxKey 3 rokov pred
rodič
commit
b12e7b7049

+ 3 - 0
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>

+ 5 - 3
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>

+ 3 - 0
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",

+ 3 - 0
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": "编码路径",

+ 3 - 0
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": "編碼路徑",