租户管理

src/views/system/modules/tenant/package-data.vue

@@ -199,7 +199,7 @@ const dialogSubmit = async () => {
     const form = formModel.value
     form.menuId = form.menuIds?.join(',') ?? ''
     //发起请求
-    const { error, code, msg } = await mainApi.submit(formModel.value)
+    const { error, code, msg } = await mainApi.submit(form)
     if (!error && code === 200) {
         submitLoading.value = false
         dialogClose()

src/views/system/modules/tenant/package.vue

@@ -0,0 +1,136 @@
+<template>
+    <hc-new-dialog v-model="isShow" title="租户授权配置" widths="400px" is-footer-center @close="dialogClose">
+        <el-form ref="formRef" :model="formModel" :rules="formRules" label-position="left" label-width="auto">
+            <el-form-item label="产品包：">
+                <el-select v-model="formModel.packageId" placeholder="选择搜索类型" filterable block @change="packageChange">
+                    <el-option v-for="item in packageData" :key="item.id" :label="item.packageName" :value="item.id" />
+                </el-select>
+            </el-form-item>
+            <el-form-item label="菜单列表：" prop="menuIds">
+                <el-tree-select
+                    v-model="formModel.menuIds" :data="menuData" :render-after-expand="false" node-key="id"
+                    :props="menuTreeProps" multiple show-checkbox clearable block placeholder="请选择菜单列表"
+                />
+            </el-form-item>
+        </el-form>
+        <template #footer>
+            <el-button hc-btn @click="dialogClose">取消</el-button>
+            <el-button hc-btn type="primary" :loading="submitLoading" @click="dialogSubmit">提交</el-button>
+        </template>
+    </hc-new-dialog>
+</template>
+
+<script setup>
+import { ref, watch } from 'vue'
+import { getArrValue, getObjValue } from 'js-fast-way'
+import mainApi from '~api/system/tenant'
+import menuApi from '~api/system/menu'
+import { get } from '~api'
+
+const props = defineProps({
+    info: {
+        type: Object,
+        default: () => ({}),
+    },
+})
+
+//事件
+const emit = defineEmits(['finish'])
+
+//双向绑定
+// eslint-disable-next-line no-undef
+const isShow = defineModel('modelValue', {
+    default: false,
+})
+
+//监听可否编辑
+const dataInfo = ref(props.info)
+watch(() => props.info, (data) => {
+    dataInfo.value = data
+}, { immediate: true, deep: true })
+
+//监听显示
+watch(isShow, (val) => {
+    if (val) {
+        initFormData()
+    }
+})
+
+//菜单表单
+const formRef = ref(null)
+const formModel = ref({})
+const formRules = {}
+
+//初始化表单
+const initFormData = () => {
+    submitLoading.value = false
+    getMenuTreeApi()
+    getPackageList()
+    getPackageInfo()
+    formModel.value = {
+        tenantId: dataInfo.value.id,
+    }
+}
+
+//菜单列表
+const menuData = ref([])
+const getMenuTreeApi = async () => {
+    const { data } = await menuApi.getMenuTree()
+    menuData.value = getArrValue(data)
+}
+//菜单树
+const menuTreeProps = {
+    label: 'title',
+}
+
+//获取产品包信息
+const getPackageInfo = async () => {
+    const { data } = await mainApi.packageInfo(dataInfo.value.id)
+    let res = getObjValue(data)
+    res.packageId = res.id
+    res.menuIds = res.menuId?.split(',') ?? []
+    formModel.value = res
+}
+
+//获取产品包列表
+const packageData = ref([])
+const getPackageList = async () => {
+    const { data } = await get({
+        url: '/api/blade-system/tenant-package/select',
+    })
+    packageData.value = getArrValue(data)
+}
+
+//产品包改变
+const packageChange = (val) => {
+    const item = packageData.value.find((item) => item.id === val)
+    const menuId = item ? item.menuId : ''
+    formModel.value.menuIds = menuId.split(',') ?? []
+}
+
+//提交表单
+const submitLoading = ref(false)
+const dialogSubmit = async () => {
+    submitLoading.value = true
+    //处理数据
+    const form = formModel.value
+    form.menuId = form.menuIds?.join(',') ?? ''
+    //发起请求
+    const { error, code, msg } = await mainApi.packageSetting(form)
+    if (!error && code === 200) {
+        submitLoading.value = false
+        window?.$message?.success('操作成功')
+        emit('finish')
+        dialogClose()
+    } else {
+        window?.$message?.error(msg ?? '操作失败')
+    }
+}
+
+//关闭弹窗
+const dialogClose = () => {
+    isShow.value = false
+    submitLoading.value = false
+    formModel.value = {}
+}
+</script>

src/views/system/tenant.vue

@@ -101,6 +101,9 @@
         <!-- 数据源配置 -->
         <HcDataSource v-model="isSourceShow" :info="sourceInfo" @finish="sourceFinish" />
 
+        <!-- 产品包配置 -->
+        <HcPackage v-model="isPackageShow" :info="packageInfo" @finish="packageFinish" />
+
         <!-- 产品包管理 -->
         <HcPackageData v-model="isPackageDataShow" />
 
@@ -115,6 +118,7 @@ import { arrToId, formValidate, getArrValue } from 'js-fast-way'
 import HcSettingVue from './modules/tenant/setting.vue'
 import HcDataSource from './modules/tenant/data-source.vue'
 import HcPackageData from './modules/tenant/package-data.vue'
+import HcPackage from './modules/tenant/package.vue'
 import { delMessage } from '~uti/tools'
 import { getHeader } from 'hc-vue3-ui'
 import mainApi from '~api/system/tenant'
@@ -219,7 +223,7 @@ const formRules = {
 
 //新增
 const addClick = () => {
-    dialogTitle.value = '新增岗位'
+    dialogTitle.value = '新增租户'
     formModel.value = { sort: 1 }
     //显示表单弹窗
     nextTick(() => {
@@ -230,7 +234,7 @@ const addClick = () => {
 //修改菜单
 const editRowClick = (row) => {
     formModel.value = {}
-    dialogTitle.value = '修改岗位'
+    dialogTitle.value = '修改租户'
     formModel.value = { ...row }
     //显示表单弹窗
     nextTick(() => {
@@ -391,6 +395,8 @@ const sourceFinish = () => {
 
 
 //产品包配置
+const isPackageShow = ref(false)
+const packageInfo = ref({})
 const handlePackage = () => {
     const rows = tableCheckKeys.value
     if (rows.length <= 0) {
@@ -401,6 +407,17 @@ const handlePackage = () => {
         window.$message.warning('只能选择一个租户')
         return false
     }
+    //处理数据
+    packageInfo.value = { id: rows[0].id }
+    //显示表单弹窗
+    nextTick(() => {
+        isPackageShow.value = true
+    })
+}
+//产品包配置完成
+const packageFinish = () => {
+    isPackageShow.value = false
+    getTableData()
 }
 
 //产品包管理