From 0b53292cfa91569befe3a84385ea9446891e21fd Mon Sep 17 00:00:00 2001
From: zhangdaiscott <zhangdaiscott@163.com>
Date: Wed, 15 Mar 2023 11:34:00 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=9F=E6=88=B7=E9=82=80=E8=AF=B7=E4=BA=BA?=
 =?UTF-8?q?=E5=8A=A0=E5=85=A5=E6=94=B9=E6=88=90=E9=87=87=E7=94=A8=E6=89=8B?=
 =?UTF-8?q?=E6=9C=BA=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/tenant/TenantInviteUserModal.vue   | 63 +++++++++++++++++++
 src/views/system/tenant/index.vue             | 16 ++---
 2 files changed, 71 insertions(+), 8 deletions(-)
 create mode 100644 src/views/system/tenant/TenantInviteUserModal.vue

diff --git a/src/views/system/tenant/TenantInviteUserModal.vue b/src/views/system/tenant/TenantInviteUserModal.vue
new file mode 100644
index 0000000..348593c
--- /dev/null
+++ b/src/views/system/tenant/TenantInviteUserModal.vue
@@ -0,0 +1,63 @@
+<template>
+  <BasicModal @register="registerModal" :width="500" :title="title" @ok="handleSubmit">
+    <BasicForm @register="registerForm" />
+  </BasicModal>
+</template>
+
+<script lang="ts">
+import { BasicModal, useModalInner } from '/@/components/Modal';
+import { BasicForm, useForm } from '/@/components/Form/index';
+import { defineComponent, ref } from 'vue';
+export default defineComponent({
+  name: 'TenantInviteUserModal',
+  components: {
+    BasicModal,
+    BasicForm,
+  },
+  setup(props, { emit }) {
+    const title = ref<string>('邀请成员');
+    const [registerForm, { resetFields, validate }] = useForm({
+      schemas: [
+        {
+          label: '手机号',
+          field: 'phone',
+          component: 'Input',
+          dynamicRules: () => {
+            return [
+              { required: true, message: '请填写手机号' },
+              { pattern: /^1[3456789]\d{9}$/, message: '手机号码格式有误' },
+            ];
+          },
+        },
+      ],
+      showActionButtonGroup: false,
+      labelCol: { span: 24 },
+      wrapperCol: { span: 24 },
+    });
+    //表单赋值
+    const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+      //重置表单
+      await resetFields();
+      setModalProps({ minHeight: 100 });
+    });
+
+    /**
+     * 提交，返回给租户list页面
+     */
+    async function handleSubmit() {
+      let values = await validate();
+      emit('inviteOk',values.phone);
+      closeModal();
+    }
+
+    return {
+      title,
+      registerModal,
+      registerForm,
+      handleSubmit,
+    };
+  },
+});
+</script>
+
+<style scoped></style>
diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue
index 2f8d6fd..1a716bf 100644
--- a/src/views/system/tenant/index.vue
+++ b/src/views/system/tenant/index.vue
@@ -40,7 +40,7 @@
       </template>
     </BasicTable>
     <TenantModal @register="registerModal" @success="reload" />
-    <UserSelectModal rowKey="id" @register="registerSelUserModal" @getSelectResult="onSelectOk" />
+    <TenantInviteUserModal @register="registerSelUserModal" @inviteOk="handleInviteUserOk"/>
     <TenantUserModal @register="registerTenUserModal" />
     <!--  产品包  -->
     <TenantPackModal @register="registerPackModal" />
@@ -57,7 +57,7 @@
   import TenantModal from './TenantModal.vue';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useListPage } from '/@/hooks/system/useListPage';
-  import UserSelectModal from '/@/components/Form/src/jeecg/components/modal/UserSelectModal.vue';
+  import TenantInviteUserModal from './TenantInviteUserModal.vue';
   import TenantUserModal from './TenantUserModal.vue';
   import TenantPackModal from './TenantPackModal.vue';
   import TenantRecycleBinModal from './TenantRecycleBinModal.vue';
@@ -156,14 +156,14 @@
   /**
    * 用户选择回调事件
    * @param options
-   * @param values
+   * @param value
    */
-  async function onSelectOk(options, values) {
-    if (values && values.length > 0) {
-      await invitationUserJoin({ ids: selectedRowKeys.value.join(','), userIds: values.join(',') });
-    } else {
-      createMessage.warn('请选择用户!');
+  async function handleInviteUserOk(value) {
+    //update-begin---author:wangshuai ---date:20230314  for：【QQYUN-4605】后台的邀请谁加入租户，没办法选不是租户下的用户------------
+    if (value) {
+      await invitationUserJoin({ ids: selectedRowKeys.value.join(','), phone: value });
     }
+    //update-end---author:wangshuai ---date:20230314  for：【QQYUN-4605】后台的邀请谁加入租户，没办法选不是租户下的用户------------
   }
 
   /**