😁增加机构类型及扩展账号常用属性字段

Admin.NET/Admin.NET.Core/SeedData/SysDictDataSeedData.cs

@@ -60,11 +60,11 @@ public class SysDictDataSeedData : ISqlSugarEntitySeedData<SysDictData>
             new SysDictData{ Id=1300000000504, DictTypeId=1300000000105, Value="EntityTenant【租户实体】", Code="EntityTenant", OrderNo=1, Remark="【租户实体】", Status=StatusEnum.Disable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
             new SysDictData{ Id=1300000000505, DictTypeId=1300000000105, Value="EntityBaseData【业务实体】", Code="EntityBaseData", OrderNo=1, Remark="【业务实体】", Status=StatusEnum.Disable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
 
-            new SysDictData{ Id=1300000000601, DictTypeId=1300000000106, Value="总公司", Code="1", OrderNo=1, Remark="总公司", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2023-02-10 00:00:00") },
-            new SysDictData{ Id=1300000000602, DictTypeId=1300000000106, Value="区域分公司", Code="2", OrderNo=2, Remark="区域分公司", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2023-02-10 00:00:00") },
-            new SysDictData{ Id=1300000000603, DictTypeId=1300000000106, Value="直营门店", Code="3", OrderNo=3, Remark="直营门店", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2023-02-10 00:00:00") },
-            new SysDictData{ Id=1300000000604, DictTypeId=1300000000106, Value="加盟门店", Code="4", OrderNo=4, Remark="加盟门店", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2023-02-10 00:00:00") },
-            new SysDictData{ Id=1300000000605, DictTypeId=1300000000106, Value="代理商", Code="5", OrderNo=5, Remark="代理商", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2023-02-10 00:00:00") },
+            new SysDictData{ Id=1300000000601, DictTypeId=1300000000106, Value="总公司", Code="101", OrderNo=100, Remark="总公司", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2023-02-10 00:00:00") },
+            new SysDictData{ Id=1300000000602, DictTypeId=1300000000106, Value="区域分公司", Code="201", OrderNo=101, Remark="区域分公司", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2023-02-10 00:00:00") },
+            new SysDictData{ Id=1300000000603, DictTypeId=1300000000106, Value="直营门店", Code="301", OrderNo=102, Remark="直营门店", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2023-02-10 00:00:00") },
+            new SysDictData{ Id=1300000000604, DictTypeId=1300000000106, Value="加盟门店", Code="401", OrderNo=103, Remark="加盟门店", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2023-02-10 00:00:00") },
+            new SysDictData{ Id=1300000000605, DictTypeId=1300000000106, Value="代理商", Code="501", OrderNo=104, Remark="代理商", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2023-02-10 00:00:00") },
         };
     }
 }

Admin.NET/Admin.NET.Core/SeedData/SysDictTypeSeedData.cs

@@ -15,11 +15,11 @@ public class SysDictTypeSeedData : ISqlSugarEntitySeedData<SysDictType>
         return new[]
         {
             new SysDictType{ Id=1300000000101, Name="代码生成控件类型", Code="code_gen_effect_type", OrderNo=100, Remark="代码生成控件类型", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-            new SysDictType{ Id=1300000000102, Name="代码生成查询类型", Code="code_gen_query_type", OrderNo=100, Remark="代码生成查询类型", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-            new SysDictType{ Id=1300000000103, Name="代码生成.NET类型", Code="code_gen_net_type", OrderNo=100, Remark="代码生成.NET类型", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-            new SysDictType{ Id=1300000000104, Name="代码生成方式", Code="code_gen_create_type", OrderNo=100, Remark="代码生成方式", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-            new SysDictType{ Id=1300000000105, Name="代码生成基类", Code="code_gen_base_class", OrderNo=100, Remark="代码生成基类", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-            new SysDictType{ Id=1300000000106, Name="机构类型", Code="org_type", OrderNo=100, Remark="机构类型", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2023-02-10 00:00:00") },
+            new SysDictType{ Id=1300000000102, Name="代码生成查询类型", Code="code_gen_query_type", OrderNo=101, Remark="代码生成查询类型", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictType{ Id=1300000000103, Name="代码生成.NET类型", Code="code_gen_net_type", OrderNo=102, Remark="代码生成.NET类型", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictType{ Id=1300000000104, Name="代码生成方式", Code="code_gen_create_type", OrderNo=103, Remark="代码生成方式", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictType{ Id=1300000000105, Name="代码生成基类", Code="code_gen_base_class", OrderNo=104, Remark="代码生成基类", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictType{ Id=1300000000106, Name="机构类型", Code="org_type", OrderNo=105, Remark="机构类型", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2023-02-10 00:00:00") },
         };
     }
 }

Admin.NET/Admin.NET.Core/SeedData/SysOrgSeedData.cs

@@ -14,19 +14,19 @@ public class SysOrgSeedData : ISqlSugarEntitySeedData<SysOrg>
     {
         return new[]
         {
-            new SysOrg{ Id=1300000000101, Pid=0, Name="大名科技", Code="1001", OrgType = "1", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="大名科技", TenantId=1300000000001 },
+            new SysOrg{ Id=1300000000101, Pid=0, Name="大名科技", Code="1001", OrgType = "101", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="大名科技", TenantId=1300000000001 },
             new SysOrg{ Id=1300000000102, Pid=1300000000101, Name="市场部", Code="100101", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="市场部", TenantId=1300000000001 },
             new SysOrg{ Id=1300000000103, Pid=1300000000101, Name="研发部", Code="100102", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="研发部", TenantId=1300000000001 },
             new SysOrg{ Id=1300000000104, Pid=1300000000101, Name="财务部", Code="100103", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="财务部", TenantId=1300000000001 },
             new SysOrg{ Id=1300000000105, Pid=1300000000104, Name="财务部1", Code="10010301", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="财务部1", TenantId=1300000000001 },
             new SysOrg{ Id=1300000000106, Pid=1300000000104, Name="财务部2", Code="10010302", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="财务部2", TenantId=1300000000001 },
 
-            new SysOrg{ Id=1300000000201, Pid=0, Name="分公司1", Code="1002", OrgType = "2", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="分公司1", TenantId=1300000000001 },
+            new SysOrg{ Id=1300000000201, Pid=0, Name="分公司1", Code="1002", OrgType = "201", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="分公司1", TenantId=1300000000001 },
             new SysOrg{ Id=1300000000202, Pid=1300000000201, Name="市场部", Code="100201", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="市场部", TenantId=1300000000001 },
             new SysOrg{ Id=1300000000203, Pid=1300000000201, Name="研发部", Code="100202", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="研发部", TenantId=1300000000001 },
             new SysOrg{ Id=1300000000204, Pid=1300000000201, Name="财务部", Code="100203", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="财务部", TenantId=1300000000001 },
 
-            new SysOrg{ Id=1300000000301, Pid=0, Name="分公司2", Code="1003", OrgType = "2", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="分公司2", TenantId=1300000000001 },
+            new SysOrg{ Id=1300000000301, Pid=0, Name="分公司2", Code="1003", OrgType = "201", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="分公司2", TenantId=1300000000001 },
             new SysOrg{ Id=1300000000302, Pid=1300000000301, Name="市场部", Code="100301", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="市场部", TenantId=1300000000001 },
             new SysOrg{ Id=1300000000303, Pid=1300000000301, Name="研发部", Code="100302", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="市场部", TenantId=1300000000001 },
             new SysOrg{ Id=1300000000304, Pid=1300000000301, Name="财务部", Code="100303", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="市场部", TenantId=1300000000001 },

Web/src/views/system/org/component/editOrg.vue

@@ -74,7 +74,7 @@
 </template>
 
 <script lang="ts" setup name="sysEditOrg">
-import {onMounted, reactive, ref } from 'vue';
+import { onMounted, reactive, ref } from 'vue';
 import mittBus from '/@/utils/mitt';
 
 import { getAPI } from '/@/utils/axios-utils';

Web/src/views/system/org/index.vue

@@ -89,15 +89,15 @@ const state = reactive({
 onMounted(async () => {
 	handleQuery();
 
+	let resDicData = await getAPI(SysDictDataApi).apiSysDictDataDataListCodeGet('org_type');
+	state.orgTypeList = resDicData.data.result;
+
 	mittBus.on('submitRefresh', async () => {
 		handleQuery();
 
 		// 编辑删除后更新机构数据
 		orgTreeRef.value?.initTreeData();
 	});
-
-	let resDicData = await getAPI(SysDictDataApi).apiSysDictDataDataListCodeGet('org_type');
-	state.orgTypeList = resDicData.data.result;
 });
 
 onUnmounted(() => {
@@ -160,15 +160,8 @@ const nodeClick = async (node: any) => {
 	handleQuery();
 };
 
-//字典转换
+// 字典转换
 const dictFormatter = (row: any, column: any, cellValue: any) => {
-	var ret = "";
-      state.orgTypeList.forEach(function (item: any, index: any) {
-        if (cellValue == item.code) {
-          ret = item.value;
-        }
-      });
-      return ret;
-}
-
+	return state.orgTypeList.find((u: any) => u.code == cellValue)?.value;
+};
 </script>