Merge branch 'sqy_dev1' into 'main'

联调租户管理员，未完成

See merge request huang/yun-teng-iot-front!19

@@ -98,10 +98,11 @@
       const { createMessage } = useMessage();
       const { createMessage } = useMessage();
       const [tenantAdminFormDrawer, { openDrawer: openTenantAdminFormDrawer }] = useDrawer();
       const [tenantAdminFormDrawer, { openDrawer: openTenantAdminFormDrawer }] = useDrawer();
 
 
+      const tenantId = ref('');
       function handleCreateTenantAdmin() {
       function handleCreateTenantAdmin() {
         openTenantAdminFormDrawer(true, {
         openTenantAdminFormDrawer(true, {
           isUpdate: false,
           isUpdate: false,
-          tenantCode: tenantCode,
+          tenantId: tenantId.value,
         });
         });
       }
       }
 
 
@@ -109,7 +110,7 @@
         openTenantAdminFormDrawer(true, {
         openTenantAdminFormDrawer(true, {
           isUpdate: true,
           isUpdate: true,
           record,
           record,
-          tenantCode: tenantCode,
+          tenantCode: tenantId.value,
         });
         });
       }
       }
 
 
@@ -160,7 +161,6 @@
           slots: { customRender: 'status' },
           slots: { customRender: 'status' },
         },
         },
       ];
       ];
-      const tenantCode = ref('');
       const [tenantAdminTable, { reload }] = useTable({
       const [tenantAdminTable, { reload }] = useTable({
         api: getTenantAdminPage,
         api: getTenantAdminPage,
         columns: tenantAdminColumns as BasicColumn[],
         columns: tenantAdminColumns as BasicColumn[],
@@ -168,7 +168,7 @@
         bordered: true,
         bordered: true,
         showIndexColumn: false,
         showIndexColumn: false,
         searchInfo: {
         searchInfo: {
-          tenantCode: tenantCode,
+          tenantId: tenantId,
           roleType: RoleEnum.ROLE_TENANT_ADMIN,
           roleType: RoleEnum.ROLE_TENANT_ADMIN,
         },
         },
         actionColumn: {
         actionColumn: {
@@ -186,8 +186,8 @@
       });
       });
       //默认传递页面数据
       //默认传递页面数据
       const [tenantAdminDrawer, { closeDrawer }] = useDrawerInner(async (data) => {
       const [tenantAdminDrawer, { closeDrawer }] = useDrawerInner(async (data) => {
-        tenantCode.value = data.record.tenantCode;
-        await reload();
+        tenantId.value = data.record.tenantId;
+        reload();
       });
       });
 
 
       //提交按钮
       //提交按钮
@@ -204,7 +204,7 @@
         handleCreateTenantAdmin,
         handleCreateTenantAdmin,
         handleSubmit,
         handleSubmit,
         tenantAdminTable,
         tenantAdminTable,
-        tenantCode,
+        tenantId,
         tenantAdminFormDrawer,
         tenantAdminFormDrawer,
         handleSuccess,
         handleSuccess,
         handleEdit,
         handleEdit,

@@ -7,7 +7,7 @@
     width="60%"
     width="60%"
     @ok="handleSubmit"
     @ok="handleSubmit"
   >
   >
-    <BasicForm @register="tenantAdminForm"> </BasicForm>
+    <BasicForm @register="tenantAdminForm" />
   </BasicDrawer>
   </BasicDrawer>
 </template>
 </template>
 <script lang="ts">
 <script lang="ts">
@@ -25,7 +25,7 @@
     },
     },
     setup(_, { emit }) {
     setup(_, { emit }) {
       const isUpdate = ref(true);
       const isUpdate = ref(true);
-      const tenantCode = ref('');
+      const tenantId = ref('');
       const formSchema: FormSchema[] = [
       const formSchema: FormSchema[] = [
         {
         {
           field: 'id',
           field: 'id',
@@ -81,7 +81,7 @@
         async (data) => {
         async (data) => {
           await resetFields();
           await resetFields();
           isUpdate.value = !!data?.isUpdate;
           isUpdate.value = !!data?.isUpdate;
-          tenantCode.value = data?.tenantCode;
+          tenantId.value = data?.tenantId;
           await updateSchema({ field: 'title', componentProps: { disabled: false } });
           await updateSchema({ field: 'title', componentProps: { disabled: false } });
           if (unref(isUpdate)) {
           if (unref(isUpdate)) {
             await setFieldsValue({
             await setFieldsValue({
@@ -106,7 +106,7 @@
               typeof values.tenantExpireTime != 'undefined' && values.tenantExpireTime != null
               typeof values.tenantExpireTime != 'undefined' && values.tenantExpireTime != null
                 ? values.tenantExpireTime.format('YYYY-MM-DD HH:mm:ss')
                 ? values.tenantExpireTime.format('YYYY-MM-DD HH:mm:ss')
                 : null,
                 : null,
-            tenantCode: tenantCode.value,
+            tenantId: tenantId.value,
           };
           };
           setDrawerProps({ confirmLoading: true });
           setDrawerProps({ confirmLoading: true });
           saveTenantAdmin(requestParams as any as UserDTO).then(() => {
           saveTenantAdmin(requestParams as any as UserDTO).then(() => {