增加组织模块和组织模块翻译以及用户模块的翻译

assets/class_mapping.json

@@ -46,5 +46,11 @@
         "class_name": "HomePageModule",
         "module_name": "homePage",
         "file_name": "home_page"
+    },
+    "organization": {
+        "module_name_cn": "组织",
+        "class_name": "OrganizationModule",
+        "module_name": "organization",
+        "file_name": "organization"
     }
 }

assets/en_US.json

@@ -97,7 +97,9 @@
         "pleaseSelect": "[待翻译]请选择",
         "country": "[待翻译]国家",
         "province": "[待翻译]省份",
-        "city": "[待翻译]城市"
+        "city": "[待翻译]城市",
+        "edit":"Edit",
+        "submit":"Submit"
     },
     "homePage": {
         "homePage": "Home page",
@@ -188,11 +190,64 @@
         "online": "[待翻译]在线",
         "offline": "[待翻译]离线",
         "shareDevice": "[待翻译]分享设备",
-        "notOnline": "[待翻译]不在线"
+        "notOnline": "[待翻译]不在线",
+        "verificationStatus":"审核状态",
+        "refuseReason":"拒绝原因",
+        "idCard":"身份证",
+        "uploadIdCardFrontSide":"上传身份证正面",
+        "uploadIdCardReverseSide":"上传身份证反面",
+        "doctorLicense":"医师执照",
+        "uploaddoctorLicense":"上传医师执照",
+        "verificationApply":"认证申请",
+        "platformRole":"平台角色",
+        "skilledArea":"擅长领域",
+        "unApplyment":"未申请",
+        "underVerification":"待审核",
+        "refused":"已拒绝",
+        "passed":"已通过",
+        "editTip":"修改提示",
+        "useCurrentSelectedRole":"是否使用当前已选角色",
+        "loadApplymentInfoFailed":"加载申请信息失败",
+        "applymentSubmittedFailed":"申请提交失败",
+        "applymentSubmitted":"申请已提交",
+        "uploadIdCardImage":"请上传身份证照片",
+        "uploadIdCardReverseSideVerification":"请上传身份证背面照片",
+        "uplaodDoctorLicenseImage":"请上传医师执照照片"
     },
     "remedical": {
         "patientName": "Patient name",
         "patientFrom": "From",
-        "ultrasoundReport": "Ultrasound report"
+        "ultrasoundReport": "Ultrasound report",
+        "editThesaurus":"编辑词条库",
+        "selfCreatedThesaurus":"自建词条库"
+    },
+    "organization":
+    {
+        "upperOrg":"上级机构",
+        "orgName":"机构名称",
+        "orgLogo":"机构标志",
+        "serveObj":"服务对象",
+        "locatedArea":"所属地区",
+        "avatar":"头像",
+        "nickName":"昵称",
+        "positionIdentity":"岗位身份",
+        "workTitle":"职称",       
+        "orgNameInputTip":"请输入机构名",
+        "areaSelectionTip":"选择地区",
+        "orgSelectionTip":"选择机构",
+        "modifyWorkTitle":"修改职称",
+        "addWorkTitle":"添加职称",
+        "workTitleName":"职称名称",     
+        "basicInfo":"基础信息",
+        "orgStructureInfo":"组织架构信息",
+        "department":"部门",
+        "orgStructure":"组织架构",
+        "editOrgStructure":"修改组织架构",
+        "addOrgStructure":"添加组织架构",
+        "departmentName":"部门名称",
+        "selectDepartmentTip":"请选择部门",
+        "selectWorkPostIdentify":"请选择岗位身份",
+        "workTitleSelectionTip":"请选择职称",
+        "loadOrgInfoFailedTip":"加载组织信息失败！"
     }
 }

assets/zh_CN.json

@@ -97,7 +97,13 @@
         "pleaseSelect": "请选择",
         "country": "国家",
         "province": "省份",
-        "city": "城市"
+        "city": "城市",
+        "operation":"操作",
+        "removeNotification":"确定是否移除",
+        "edit":"编辑",
+        "submit":"提交",
+        "yes":"是",
+        "no":"否"
     },
     "homePage": {
         "homePage": "首页",
@@ -188,11 +194,66 @@
         "online": "在线",
         "offline": "离线",
         "shareDevice": "分享设备",
-        "notOnline": "不在线"
+        "notOnline": "不在线",
+        "verificationStatus":"审核状态",
+        "refuseReason":"拒绝原因",
+        "idCard":"身份证",
+        "uploadIdCardFrontSide":"上传身份证正面",
+        "uploadIdCardReverseSide":"上传身份证反面",
+        "doctorLicense":"医师执照",
+        "uploaddoctorLicense":"上传医师执照",
+        "verificationApply":"认证申请",
+        "platformRole":"平台角色",
+        "skilledArea":"擅长领域",
+        "unApplyment":"未申请",
+        "underVerification":"待审核",
+        "refused":"已拒绝",
+        "passed":"已通过",
+        "editTip":"修改提示",
+        "useCurrentSelectedRole":"是否使用当前已选角色",
+        "loadApplymentInfoFailed":"加载申请信息失败",
+        "applymentSubmittedFailed":"申请提交失败",
+        "applymentSubmitted":"申请已提交",
+        "uploadIdCardImage":"请上传身份证照片",
+        "uploadIdCardReverseSideVerification":"请上传身份证背面照片",
+        "uplaodDoctorLicenseImage":"请上传医师执照照片"
+        
     },
     "remedical": {
         "patientName": "病人名",
         "patientFrom": "来自于",
-        "ultrasoundReport": "超声报告"
+        "ultrasoundReport": "超声报告",
+        "editThesaurus":"编辑词条库",
+        "selfCreatedThesaurus":"自建词条库"
+    },
+    "organization":
+    {
+        "upperOrg":"上级机构",
+        "orgName":"机构名称",
+        "orgLogo":"机构标志",
+        "serveObj":"服务对象",
+        "locatedArea":"所属地区",
+        "avatar":"头像",
+        "nickName":"昵称",
+        "positionIdentity":"岗位身份",
+        "workTitle":"职称",       
+        "orgNameInputTip":"请输入机构名",
+        "areaSelectionTip":"选择地区",
+        "orgSelectionTip":"选择机构",
+        "modifyWorkTitle":"修改职称",
+        "addWorkTitle":"添加职称",
+        "workTitleName":"职称名称",     
+        "basicInfo":"基础信息",
+        "orgStructureInfo":"组织架构信息",
+        "department":"部门",
+        "orgStructure":"组织架构",
+        "editOrgStructure":"修改组织架构",
+        "addOrgStructure":"添加组织架构",
+        "departmentName":"部门名称",
+        "selectDepartmentTip":"请选择部门",
+        "selectWorkPostIdentify":"请选择岗位身份",
+        "workTitleSelectionTip":"请选择职称",
+        "loadOrgInfoFailedTip":"加载组织信息失败！"
     }
+    
 }

lib/key_book.dart

@@ -9,17 +9,16 @@ import 'types.dart' show IPropQueryable, ModuleBase, StringLocaleExtensions;
 
 /// 翻译字典
 class FTrKeybook implements IPropQueryable {
-  FTrKeybook._(
-    this.locale, {
-    required this.auth,
-    required this.bodyParts,
-    required this.common,
-    required this.homePage,
-    required this.remedical,
-    required this.profileComplete,
-    required this.setting,
-    required this.user,
-  });
+  FTrKeybook._(this.locale,
+      {required this.auth,
+      required this.bodyParts,
+      required this.common,
+      required this.homePage,
+      required this.remedical,
+      required this.profileComplete,
+      required this.setting,
+      required this.user,
+      required this.organization});
 
   /// 当前是否中文
   bool get isCurrentChinese => locale.languageCode.toLowerCase() == "zh";
@@ -51,6 +50,9 @@ class FTrKeybook implements IPropQueryable {
   /// 诊断模块
   final RemedicalModule remedical;
 
+  // 组织模块
+  final OrganizationModule organization;
+
   /// 翻译字典 - 通过JsonMap构造
   ///
   /// [locale] 语言
@@ -61,20 +63,20 @@ class FTrKeybook implements IPropQueryable {
       throw ArgumentError(
           "FTrKeybook .ctor: argument-map must be a not null Map<String, dynamic>.");
 
-    return FTrKeybook._(
-      locale,
-      auth: map.pick(AuthModule.ModuleName, (v) => AuthModule(v)),
-      bodyParts:
-          map.pick(BodyPartsModule.ModuleName, (v) => BodyPartsModule(v)),
-      common: map.pick(CommonModule.ModuleName, (v) => CommonModule(v)),
-      homePage: map.pick(HomePageModule.ModuleName, (v) => HomePageModule(v)),
-      profileComplete: map.pick(
-          ProfileCompleteModule.ModuleName, (v) => ProfileCompleteModule(v)),
-      setting: map.pick(SettingModule.ModuleName, (v) => SettingModule(v)),
-      user: map.pick(UserModule.ModuleName, (v) => UserModule(v)),
-      remedical:
-          map.pick(RemedicalModule.ModuleName, (v) => RemedicalModule(v)),
-    );
+    return FTrKeybook._(locale,
+        auth: map.pick(AuthModule.ModuleName, (v) => AuthModule(v)),
+        bodyParts:
+            map.pick(BodyPartsModule.ModuleName, (v) => BodyPartsModule(v)),
+        common: map.pick(CommonModule.ModuleName, (v) => CommonModule(v)),
+        homePage: map.pick(HomePageModule.ModuleName, (v) => HomePageModule(v)),
+        profileComplete: map.pick(
+            ProfileCompleteModule.ModuleName, (v) => ProfileCompleteModule(v)),
+        setting: map.pick(SettingModule.ModuleName, (v) => SettingModule(v)),
+        user: map.pick(UserModule.ModuleName, (v) => UserModule(v)),
+        remedical:
+            map.pick(RemedicalModule.ModuleName, (v) => RemedicalModule(v)),
+        organization: map.pick(
+            OrganizationModule.ModuleName, (v) => OrganizationModule(v)));
   }
 
   /// 通过json字符串构造创建字典

lib/modules/common.dart

@@ -43,6 +43,12 @@ class CommonModule extends ModuleBase {
     required this.country,
     required this.province,
     required this.city,
+    required this.operation,
+    required this.removeNotification,
+    required this.edit,
+    required this.submit,
+    required this.yes,
+    required this.no,
   });
 
   static const ModuleName = "common";
@@ -89,6 +95,12 @@ class CommonModule extends ModuleBase {
       country: map.pick("country"),
       province: map.pick("province"),
       city: map.pick("city"),
+      operation: map.pick("operation"),
+      removeNotification: map.pick("removeNotification"),
+      edit: map.pick("edit"),
+      submit: map.pick("submit"),
+      yes: map.pick("yes"),
+      no: map.pick("no"),
     );
   }
 
@@ -212,6 +224,24 @@ class CommonModule extends ModuleBase {
   /// 城市
   final FTrStr city;
 
+  /// 操作
+  final FTrStr operation;
+
+  /// 确定是否移除
+  final FTrStr removeNotification;
+
+  /// 编辑
+  final FTrStr edit;
+
+  /// 提交
+  final FTrStr submit;
+
+  /// 是
+  final FTrStr yes;
+
+  /// 否
+  final FTrStr no;
+
   @override
   getProp(String propName) {
     // TODO: implement getProp

lib/modules/index.dart

@@ -6,3 +6,4 @@ export 'profile_complete.dart';
 export 'setting.dart';
 export 'user.dart';
 export 'remedical.dart';
+export 'organization.dart';

lib/modules/organization.dart

@@ -0,0 +1,150 @@
+import 'package:fis_i18n/types.dart';
+
+/// 组织模块
+class OrganizationModule extends ModuleBase {
+  OrganizationModule._({
+    required this.upperOrg,
+    required this.orgName,
+    required this.orgLogo,
+    required this.serveObj,
+    required this.locatedArea,
+    required this.avatar,
+    required this.nickName,
+    required this.positionIdentity,
+    required this.workTitle,
+    required this.orgNameInputTip,
+    required this.areaSelectionTip,
+    required this.orgSelectionTip,
+    required this.modifyWorkTitle,
+    required this.addWorkTitle,
+    required this.workTitleName,
+    required this.basicInfo,
+    required this.orgStructureInfo,
+    required this.department,
+    required this.orgStructure,
+    required this.editOrgStructure,
+    required this.addOrgStructure,
+    required this.departmentName,
+    required this.selectDepartmentTip,
+    required this.selectWorkPostIdentify,
+    required this.workTitleSelectionTip,
+    required this.loadOrgInfoFailedTip,
+  });
+
+  static const ModuleName = "organization";
+
+  factory OrganizationModule(Map<String, dynamic> map) {
+    return OrganizationModule._(
+      upperOrg: map.pick("upperOrg"),
+      orgName: map.pick("orgName"),
+      orgLogo: map.pick("orgLogo"),
+      serveObj: map.pick("serveObj"),
+      locatedArea: map.pick("locatedArea"),
+      avatar: map.pick("avatar"),
+      nickName: map.pick("nickName"),
+      positionIdentity: map.pick("positionIdentity"),
+      workTitle: map.pick("workTitle"),
+      orgNameInputTip: map.pick("orgNameInputTip"),
+      areaSelectionTip: map.pick("areaSelectionTip"),
+      orgSelectionTip: map.pick("orgSelectionTip"),
+      modifyWorkTitle: map.pick("modifyWorkTitle"),
+      addWorkTitle: map.pick("addWorkTitle"),
+      workTitleName: map.pick("workTitleName"),
+      basicInfo: map.pick("basicInfo"),
+      orgStructureInfo: map.pick("orgStructureInfo"),
+      department: map.pick("department"),
+      orgStructure: map.pick("orgStructure"),
+      editOrgStructure: map.pick("editOrgStructure"),
+      addOrgStructure: map.pick("addOrgStructure"),
+      departmentName: map.pick("departmentName"),
+      selectDepartmentTip: map.pick("selectDepartmentTip"),
+      selectWorkPostIdentify: map.pick("selectWorkPostIdentify"),
+      workTitleSelectionTip: map.pick("workTitleSelectionTip"),
+      loadOrgInfoFailedTip: map.pick("loadOrgInfoFailedTip"),
+    );
+  }
+
+  /// 上级机构
+  final FTrStr upperOrg;
+
+  /// 机构名称
+  final FTrStr orgName;
+
+  /// 机构标志
+  final FTrStr orgLogo;
+
+  /// 服务对象
+  final FTrStr serveObj;
+
+  /// 所属地区
+  final FTrStr locatedArea;
+
+  /// 头像
+  final FTrStr avatar;
+
+  /// 昵称
+  final FTrStr nickName;
+
+  /// 岗位身份
+  final FTrStr positionIdentity;
+
+  /// 职称
+  final FTrStr workTitle;
+
+  /// 请输入机构名
+  final FTrStr orgNameInputTip;
+
+  /// 选择地区
+  final FTrStr areaSelectionTip;
+
+  /// 选择机构
+  final FTrStr orgSelectionTip;
+
+  /// 修改职称
+  final FTrStr modifyWorkTitle;
+
+  /// 添加职称
+  final FTrStr addWorkTitle;
+
+  /// 职称名称
+  final FTrStr workTitleName;
+
+  /// 基础信息
+  final FTrStr basicInfo;
+
+  /// 组织架构信息
+  final FTrStr orgStructureInfo;
+
+  /// 部门
+  final FTrStr department;
+
+  /// 组织架构
+  final FTrStr orgStructure;
+
+  /// 修改组织架构
+  final FTrStr editOrgStructure;
+
+  /// 添加组织架构
+  final FTrStr addOrgStructure;
+
+  /// 部门名称
+  final FTrStr departmentName;
+
+  /// 请选择部门
+  final FTrStr selectDepartmentTip;
+
+  /// 请选择岗位身份
+  final FTrStr selectWorkPostIdentify;
+
+  /// 请选择职称
+  final FTrStr workTitleSelectionTip;
+
+  /// 加载组织信息失败！
+  final FTrStr loadOrgInfoFailedTip;
+
+  @override
+  getProp(String propName) {
+    // TODO: implement getProp
+    throw UnimplementedError();
+  }
+}

lib/modules/remedical.dart

@@ -6,6 +6,8 @@ class RemedicalModule extends ModuleBase {
     required this.patientName,
     required this.patientFrom,
     required this.ultrasoundReport,
+    required this.editThesaurus,
+    required this.selfCreatedThesaurus,
   });
 
   static const ModuleName = "remedical";
@@ -15,6 +17,8 @@ class RemedicalModule extends ModuleBase {
       patientName: map.pick("patientName"),
       patientFrom: map.pick("patientFrom"),
       ultrasoundReport: map.pick("ultrasoundReport"),
+      editThesaurus: map.pick("editThesaurus"),
+      selfCreatedThesaurus: map.pick("selfCreatedThesaurus"),
     );
   }
 
@@ -27,6 +31,12 @@ class RemedicalModule extends ModuleBase {
   /// 超声报告
   final FTrStr ultrasoundReport;
 
+  /// 编辑词条库
+  final FTrStr editThesaurus;
+
+  /// 自建词条库
+  final FTrStr selfCreatedThesaurus;
+
   @override
   getProp(String propName) {
     // TODO: implement getProp

lib/modules/user.dart

@@ -46,6 +46,28 @@ class UserModule extends ModuleBase {
     required this.offline,
     required this.shareDevice,
     required this.notOnline,
+    required this.verificationStatus,
+    required this.refuseReason,
+    required this.idCard,
+    required this.uploadIdCardFrontSide,
+    required this.uploadIdCardReverseSide,
+    required this.doctorLicense,
+    required this.uploaddoctorLicense,
+    required this.verificationApply,
+    required this.platformRole,
+    required this.skilledArea,
+    required this.unApplyment,
+    required this.underVerification,
+    required this.refused,
+    required this.passed,
+    required this.editTip,
+    required this.useCurrentSelectedRole,
+    required this.loadApplymentInfoFailed,
+    required this.applymentSubmittedFailed,
+    required this.applymentSubmitted,
+    required this.uploadIdCardImage,
+    required this.uploadIdCardReverseSideVerification,
+    required this.uplaodDoctorLicenseImage,
   });
 
   static const ModuleName = "user";
@@ -95,6 +117,29 @@ class UserModule extends ModuleBase {
       offline: map.pick("offline"),
       shareDevice: map.pick("shareDevice"),
       notOnline: map.pick("notOnline"),
+      verificationStatus: map.pick("verificationStatus"),
+      refuseReason: map.pick("refuseReason"),
+      idCard: map.pick("idCard"),
+      uploadIdCardFrontSide: map.pick("uploadIdCardFrontSide"),
+      uploadIdCardReverseSide: map.pick("uploadIdCardReverseSide"),
+      doctorLicense: map.pick("doctorLicense"),
+      uploaddoctorLicense: map.pick("uploaddoctorLicense"),
+      verificationApply: map.pick("verificationApply"),
+      platformRole: map.pick("platformRole"),
+      skilledArea: map.pick("skilledArea"),
+      unApplyment: map.pick("unApplyment"),
+      underVerification: map.pick("underVerification"),
+      refused: map.pick("refused"),
+      passed: map.pick("passed"),
+      editTip: map.pick("editTip"),
+      useCurrentSelectedRole: map.pick("useCurrentSelectedRole"),
+      loadApplymentInfoFailed: map.pick("loadApplymentInfoFailed"),
+      applymentSubmittedFailed: map.pick("applymentSubmittedFailed"),
+      applymentSubmitted: map.pick("applymentSubmitted"),
+      uploadIdCardImage: map.pick("uploadIdCardImage"),
+      uploadIdCardReverseSideVerification:
+          map.pick("uploadIdCardReverseSideVerification"),
+      uplaodDoctorLicenseImage: map.pick("uplaodDoctorLicenseImage"),
     );
   }
 
@@ -227,6 +272,72 @@ class UserModule extends ModuleBase {
   /// 不在线
   final FTrStr notOnline;
 
+  /// 审核状态
+  final FTrStr verificationStatus;
+
+  /// 拒绝原因
+  final FTrStr refuseReason;
+
+  /// 身份证
+  final FTrStr idCard;
+
+  /// 上传身份证正面
+  final FTrStr uploadIdCardFrontSide;
+
+  /// 上传身份证反面
+  final FTrStr uploadIdCardReverseSide;
+
+  /// 医师执照
+  final FTrStr doctorLicense;
+
+  /// 上传医师执照
+  final FTrStr uploaddoctorLicense;
+
+  /// 认证申请
+  final FTrStr verificationApply;
+
+  /// 平台角色
+  final FTrStr platformRole;
+
+  /// 擅长领域
+  final FTrStr skilledArea;
+
+  /// 未申请
+  final FTrStr unApplyment;
+
+  /// 待审核
+  final FTrStr underVerification;
+
+  /// 已拒绝
+  final FTrStr refused;
+
+  /// 已通过
+  final FTrStr passed;
+
+  /// 修改提示
+  final FTrStr editTip;
+
+  /// 是否使用当前已选角色
+  final FTrStr useCurrentSelectedRole;
+
+  /// 加载申请信息失败
+  final FTrStr loadApplymentInfoFailed;
+
+  /// 申请提交失败
+  final FTrStr applymentSubmittedFailed;
+
+  /// 申请已提交
+  final FTrStr applymentSubmitted;
+
+  /// 请上传身份证照片
+  final FTrStr uploadIdCardImage;
+
+  /// 请上传身份证背面照片
+  final FTrStr uploadIdCardReverseSideVerification;
+
+  /// 请上传医师执照照片
+  final FTrStr uplaodDoctorLicenseImage;
+
   @override
   getProp(String propName) {
     // TODO: implement getProp