From cc9b67d4676dd51a6b2d88e92607aca2629ee54d Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 22 十二月 2023 13:26:26 +0800
Subject: [PATCH] !72 发布 vue 版本 5.1.2 与 cloud 版本 2.1.2 Merge pull request !72 from 疯狂的狮子Li/temp
---
src/views/system/tenant/index.vue | 337 +++++++++++++++++++++++++++----------------------------
1 files changed, 165 insertions(+), 172 deletions(-)
diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue
index 8feddb8..9a7fdf3 100644
--- a/src/views/system/tenant/index.vue
+++ b/src/views/system/tenant/index.vue
@@ -1,11 +1,150 @@
+<template>
+ <div class="p-2">
+ <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+ <div class="mb-[10px]" v-show="showSearch">
+ <el-card shadow="hover">
+ <el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+ <el-form-item label="绉熸埛缂栧彿" prop="tenantId">
+ <el-input v-model="queryParams.tenantId" placeholder="璇疯緭鍏ョ鎴风紪鍙�" clearable style="width: 240px" @keyup.enter="handleQuery" />
+ </el-form-item>
+ <el-form-item label="鑱旂郴浜�" prop="contactUserName">
+ <el-input v-model="queryParams.contactUserName" placeholder="璇疯緭鍏ヨ仈绯讳汉" clearable style="width: 240px" @keyup.enter="handleQuery" />
+ </el-form-item>
+ <el-form-item label="鑱旂郴鐢佃瘽" prop="contactPhone">
+ <el-input v-model="queryParams.contactPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" clearable style="width: 240px" @keyup.enter="handleQuery" />
+ </el-form-item>
+ <el-form-item label="浼佷笟鍚嶇О" prop="companyName">
+ <el-input v-model="queryParams.companyName" placeholder="璇疯緭鍏ヤ紒涓氬悕绉�" clearable style="width: 240px" @keyup.enter="handleQuery" />
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
+ <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
+ </el-form-item>
+ </el-form>
+ </el-card>
+ </div>
+ </transition>
+
+ <el-card shadow="hover">
+ <template #header>
+ <el-row :gutter="10" class="mb8">
+ <el-col :span="1.5">
+ <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:tenant:add']">鏂板</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['system:tenant:edit']"
+ >淇敼</el-button
+ >
+ </el-col>
+ <el-col :span="1.5">
+ <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:tenant:remove']">
+ 鍒犻櫎
+ </el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:tenant:export']">瀵煎嚭</el-button>
+ </el-col>
+ <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+ </el-row>
+ </template>
+
+ <el-table v-loading="loading" :data="tenantList" @selection-change="handleSelectionChange">
+ <el-table-column type="selection" width="55" align="center" />
+ <el-table-column label="id" align="center" prop="id" v-if="false" />
+ <el-table-column label="绉熸埛缂栧彿" align="center" prop="tenantId" />
+ <el-table-column label="鑱旂郴浜�" align="center" prop="contactUserName" />
+ <el-table-column label="鑱旂郴鐢佃瘽" align="center" prop="contactPhone" />
+ <el-table-column label="浼佷笟鍚嶇О" align="center" prop="companyName" />
+ <el-table-column label="绀句細淇＄敤浠ｇ爜" align="center" prop="licenseNumber" />
+ <el-table-column label="杩囨湡鏃堕棿" align="center" prop="expireTime" width="180">
+ <template #default="scope">
+ <span>{{ parseTime(scope.row.expireTime, '{y}-{m}-{d}') }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="绉熸埛鐘舵��" align="center" prop="status">
+ <template #default="scope">
+ <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
+ </template>
+ </el-table-column>
+ <el-table-column width="150" label="鎿嶄綔" align="center" fixed="right" class-name="small-padding fixed-width">
+ <template #default="scope">
+ <el-tooltip content="淇敼" placement="top">
+ <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:tenant:edit']"></el-button>
+ </el-tooltip>
+ <el-tooltip content="鍚屾濂楅" placement="top">
+ <el-button link type="primary" icon="Refresh" @click="handleSyncTenantPackage(scope.row)" v-hasPermi="['system:tenant:edit']">
+ </el-button>
+ </el-tooltip>
+ <el-tooltip content="鍒犻櫎" placement="top">
+ <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:tenant:remove']"></el-button>
+ </el-tooltip>
+ </template>
+ </el-table-column>
+ </el-table>
+
+ <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+ </el-card>
+ <!-- 娣诲姞鎴栦慨鏀圭鎴峰璇濇 -->
+ <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+ <el-form ref="tenantFormRef" :model="form" :rules="rules" label-width="80px">
+ <el-form-item label="浼佷笟鍚嶇О" prop="companyName">
+ <el-input v-model="form.companyName" placeholder="璇疯緭鍏ヤ紒涓氬悕绉�" />
+ </el-form-item>
+ <el-form-item label="鑱旂郴浜�" prop="contactUserName">
+ <el-input v-model="form.contactUserName" placeholder="璇疯緭鍏ヨ仈绯讳汉" />
+ </el-form-item>
+ <el-form-item label="鑱旂郴鐢佃瘽" prop="contactPhone">
+ <el-input v-model="form.contactPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" />
+ </el-form-item>
+ <el-form-item v-if="!form.id" label="鐢ㄦ埛鍚�" prop="username">
+ <el-input v-model="form.username" placeholder="璇疯緭鍏ョ郴缁熺敤鎴峰悕" maxlength="30" />
+ </el-form-item>
+ <el-form-item v-if="!form.id" label="鐢ㄦ埛瀵嗙爜" prop="password">
+ <el-input type="password" v-model="form.password" placeholder="璇疯緭鍏ョ郴缁熺敤鎴峰瘑鐮�" maxlength="20" />
+ </el-form-item>
+ <el-form-item label="绉熸埛濂楅" prop="packageId">
+ <el-select v-model="form.packageId" :disabled="!!form.tenantId" placeholder="璇烽�夋嫨绉熸埛濂楅" clearable style="width: 100%">
+ <el-option v-for="item in packageList" :key="item.packageId" :label="item.packageName" :value="item.packageId" />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="杩囨湡鏃堕棿" prop="expireTime">
+ <el-date-picker clearable v-model="form.expireTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="璇烽�夋嫨杩囨湡鏃堕棿">
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item label="鐢ㄦ埛鏁伴噺" prop="accountCount">
+ <el-input v-model="form.accountCount" placeholder="璇疯緭鍏ョ敤鎴锋暟閲�" />
+ </el-form-item>
+ <el-form-item label="缁戝畾鍩熷悕" prop="domain">
+ <el-input v-model="form.domain" placeholder="璇疯緭鍏ョ粦瀹氬煙鍚�" />
+ </el-form-item>
+ <el-form-item label="浼佷笟鍦板潃" prop="address">
+ <el-input v-model="form.address" placeholder="璇疯緭鍏ヤ紒涓氬湴鍧�" />
+ </el-form-item>
+ <el-form-item label="浼佷笟浠ｇ爜" prop="licenseNumber">
+ <el-input v-model="form.licenseNumber" placeholder="璇疯緭鍏ョ粺涓�绀句細淇＄敤浠ｇ爜" />
+ </el-form-item>
+ <el-form-item label="浼佷笟绠�浠�" prop="intro">
+ <el-input type="textarea" v-model="form.intro" placeholder="璇疯緭鍏ヤ紒涓氱畝浠�" />
+ </el-form-item>
+ <el-form-item label="澶囨敞" prop="remark">
+ <el-input v-model="form.remark" placeholder="璇疯緭鍏ュ娉�" />
+ </el-form-item>
+ </el-form>
+ <template #footer>
+ <div class="dialog-footer">
+ <el-button :loading="buttonLoading" type="primary" @click="submitForm">纭� 瀹�</el-button>
+ <el-button @click="cancel">鍙� 娑�</el-button>
+ </div>
+ </template>
+ </el-dialog>
+ </div>
+</template>
+
<script setup name="Tenant" lang="ts">
-import { listTenant, getTenant, delTenant, addTenant, updateTenant, changeTenantStatus, syncTenantPackage} from '@/api/system/tenant';
-import { listTenantPackage } from '@/api/system/tenantPackage';
+import { listTenant, getTenant, delTenant, addTenant, updateTenant, changeTenantStatus, syncTenantPackage } from '@/api/system/tenant';
+import { selectTenantPackage } from '@/api/system/tenantPackage';
import { TenantForm, TenantQuery, TenantVO } from '@/api/system/tenant/types';
import { TenantPkgVO } from '@/api/system/tenantPackage/types';
-import { ComponentInternalInstance } from 'vue';
-import to from 'await-to-js';
-
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -19,8 +158,8 @@
const multiple = ref(true);
const total = ref(0);
-const queryFormRef = ref(ElForm);
-const tenantFormRef = ref(ElForm);
+const queryFormRef = ref<ElFormInstance>();
+const tenantFormRef = ref<ElFormInstance>();
const dialog = reactive<DialogOption>({
visible: false,
@@ -46,7 +185,7 @@
status: '0',
}
const data = reactive<PageData<TenantForm, TenantQuery>>({
- form: {...initFormData},
+ form: { ...initFormData },
queryParams: {
pageNum: 1,
pageSize: 10,
@@ -76,8 +215,8 @@
/** 鏌ヨ鎵�鏈夌鎴峰椁� */
const getTenantPackage = async () => {
- const res = await listTenantPackage()
- packageList.value = res.rows;
+ const res = await selectTenantPackage()
+ packageList.value = res.data;
}
/** 鏌ヨ绉熸埛鍒楄〃 */
@@ -111,8 +250,8 @@
// 琛ㄥ崟閲嶇疆
const reset = () => {
- form.value = {...initFormData};
- tenantFormRef.value.resetFields();
+ form.value = { ...initFormData };
+ tenantFormRef.value?.resetFields();
}
/** 鎼滅储鎸夐挳鎿嶄綔 */
@@ -123,7 +262,7 @@
/** 閲嶇疆鎸夐挳鎿嶄綔 */
const resetQuery = () => {
- queryFormRef.value.resetFields();
+ queryFormRef.value?.resetFields();
handleQuery();
}
@@ -136,32 +275,26 @@
/** 鏂板鎸夐挳鎿嶄綔 */
const handleAdd = () => {
+ reset();
+ getTenantPackage();
dialog.visible = true;
dialog.title = "娣诲姞绉熸埛";
- nextTick(() => {
- reset();
- getTenantPackage();
- })
}
/** 淇敼鎸夐挳鎿嶄綔 */
-const handleUpdate = (row?: TenantVO) => {
- loading.value = true;
+const handleUpdate = async (row?: TenantVO) => {
+ reset();
+ await getTenantPackage();
+ const _id = row?.id || ids.value[0];
+ const res = await getTenant(_id);
+ Object.assign(form.value, res.data)
dialog.visible = true;
dialog.title = "淇敼绉熸埛";
- nextTick(async () => {
- reset();
- getTenantPackage();
- const _id = row?.id || ids.value[0];
- const res = await getTenant(_id);
- loading.value = false;
- Object.assign(form.value, res.data)
- })
}
/** 鎻愪氦鎸夐挳 */
const submitForm = () => {
- tenantFormRef.value.validate(async (valid: boolean) => {
+ tenantFormRef.value?.validate(async (valid: boolean) => {
if (valid) {
buttonLoading.value = true;
if (form.value.id) {
@@ -171,7 +304,7 @@
}
proxy?.$modal.msgSuccess("鎿嶄綔鎴愬姛");
dialog.visible = false;
- getList();
+ await getList();
}
});
}
@@ -182,7 +315,7 @@
await proxy?.$modal.confirm('鏄惁纭鍒犻櫎绉熸埛缂栧彿涓�"' + _ids + '"鐨勬暟鎹」锛�')
loading.value = true;
await delTenant(_ids).finally(() => loading.value = false);
- getList();
+ await getList();
proxy?.$modal.msgSuccess("鍒犻櫎鎴愬姛");
@@ -194,9 +327,9 @@
await proxy?.$modal.confirm('鏄惁纭鍚屾绉熸埛濂楅绉熸埛缂栧彿涓�"' + row.tenantId + '"鐨勬暟鎹」锛�');
loading.value = true;
await syncTenantPackage(row.tenantId, row.packageId);
- getList();
+ await getList();
proxy?.$modal.msgSuccess("鍚屾鎴愬姛");
- } catch {return} finally {
+ } catch { return } finally {
loading.value = false;
}
}
@@ -212,143 +345,3 @@
getList();
})
</script>
-
-<template>
- <div class="p-2">
- <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
- <div class="search" v-show="showSearch">
- <el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
- <el-form-item label="绉熸埛缂栧彿" prop="tenantId">
- <el-input v-model="queryParams.tenantId" placeholder="璇疯緭鍏ョ鎴风紪鍙�" clearable @keyup.enter="handleQuery" />
- </el-form-item>
- <el-form-item label="鑱旂郴浜�" prop="contactUserName">
- <el-input v-model="queryParams.contactUserName" placeholder="璇疯緭鍏ヨ仈绯讳汉" clearable @keyup.enter="handleQuery" />
- </el-form-item>
- <el-form-item label="鑱旂郴鐢佃瘽" prop="contactPhone">
- <el-input v-model="queryParams.contactPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" clearable @keyup.enter="handleQuery" />
- </el-form-item>
- <el-form-item label="浼佷笟鍚嶇О" prop="companyName">
- <el-input v-model="queryParams.companyName" placeholder="璇疯緭鍏ヤ紒涓氬悕绉�" clearable @keyup.enter="handleQuery" />
- </el-form-item>
- <el-form-item>
- <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
- </el-form-item>
- </el-form>
- </div>
- </transition>
-
- <el-card shadow="never">
- <template #header>
- <el-row :gutter="10" class="mb8">
- <el-col :span="1.5">
- <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:tenant:add']">鏂板</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['system:tenant:edit']"
- >淇敼</el-button
- >
- </el-col>
- <el-col :span="1.5">
- <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:tenant:remove']">
- 鍒犻櫎
- </el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:tenant:export']">瀵煎嚭</el-button>
- </el-col>
- <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
- </el-row>
- </template>
-
- <el-table v-loading="loading" :data="tenantList" @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="55" align="center" />
- <el-table-column label="id" align="center" prop="id" v-if="false" />
- <el-table-column label="绉熸埛缂栧彿" align="center" prop="tenantId" />
- <el-table-column label="鑱旂郴浜�" align="center" prop="contactUserName" />
- <el-table-column label="鑱旂郴鐢佃瘽" align="center" prop="contactPhone" />
- <el-table-column label="浼佷笟鍚嶇О" align="center" prop="companyName" />
- <el-table-column label="绀句細淇＄敤浠ｇ爜" align="center" prop="licenseNumber" />
- <el-table-column label="杩囨湡鏃堕棿" align="center" prop="expireTime" width="180">
- <template #default="scope">
- <span>{{ parseTime(scope.row.expireTime, '{y}-{m}-{d}') }}</span>
- </template>
- </el-table-column>
- <el-table-column label="绉熸埛鐘舵��" align="center" prop="status">
- <template #default="scope">
- <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
- </template>
- </el-table-column>
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
- <template #default="scope">
- <el-tooltip content="淇敼" placement="top">
- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:tenant:edit']"></el-button>
- </el-tooltip>
- <el-tooltip content="鍚屾濂楅" placement="top">
- <el-button link type="primary" icon="Refresh" @click="handleSyncTenantPackage(scope.row)" v-hasPermi="['system:tenant:edit']">
- </el-button>
- </el-tooltip>
- <el-tooltip content="鍒犻櫎" placement="top">
- <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:tenant:remove']"></el-button>
- </el-tooltip>
- </template>
- </el-table-column>
- </el-table>
-
- <pagination v-show="total>0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
- </el-card>
- <!-- 娣诲姞鎴栦慨鏀圭鎴峰璇濇 -->
- <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
- <el-form ref="tenantFormRef" :model="form" :rules="rules" label-width="80px">
- <el-form-item label="浼佷笟鍚嶇О" prop="companyName">
- <el-input v-model="form.companyName" placeholder="璇疯緭鍏ヤ紒涓氬悕绉�" />
- </el-form-item>
- <el-form-item label="鑱旂郴浜�" prop="contactUserName">
- <el-input v-model="form.contactUserName" placeholder="璇疯緭鍏ヨ仈绯讳汉" />
- </el-form-item>
- <el-form-item label="鑱旂郴鐢佃瘽" prop="contactPhone">
- <el-input v-model="form.contactPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" />
- </el-form-item>
- <el-form-item v-if="!form.id" label="鐢ㄦ埛鍚�" prop="username">
- <el-input v-model="form.username" placeholder="璇疯緭鍏ョ郴缁熺敤鎴峰悕" maxlength="30" />
- </el-form-item>
- <el-form-item v-if="!form.id" label="鐢ㄦ埛瀵嗙爜" prop="password">
- <el-input type="password" v-model="form.password" placeholder="璇疯緭鍏ョ郴缁熺敤鎴峰瘑鐮�" maxlength="20" />
- </el-form-item>
- <el-form-item label="绉熸埛濂楅" prop="packageId">
- <el-select v-model="form.packageId" :disabled="!!form.tenantId" placeholder="璇烽�夋嫨绉熸埛濂楅" clearable style="width: 100%">
- <el-option v-for="item in packageList" :key="item.packageId" :label="item.packageName" :value="item.packageId" />
- </el-select>
- </el-form-item>
- <el-form-item label="杩囨湡鏃堕棿" prop="expireTime">
- <el-date-picker clearable v-model="form.expireTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="璇烽�夋嫨杩囨湡鏃堕棿">
- </el-date-picker>
- </el-form-item>
- <el-form-item label="鐢ㄦ埛鏁伴噺" prop="accountCount">
- <el-input v-model="form.accountCount" placeholder="璇疯緭鍏ョ敤鎴锋暟閲�" />
- </el-form-item>
- <el-form-item label="缁戝畾鍩熷悕" prop="domain">
- <el-input v-model="form.domain" placeholder="璇疯緭鍏ョ粦瀹氬煙鍚�" />
- </el-form-item>
- <el-form-item label="浼佷笟鍦板潃" prop="address">
- <el-input v-model="form.address" placeholder="璇疯緭鍏ヤ紒涓氬湴鍧�" />
- </el-form-item>
- <el-form-item label="浼佷笟浠ｇ爜" prop="licenseNumber">
- <el-input v-model="form.licenseNumber" placeholder="璇疯緭鍏ョ粺涓�绀句細淇＄敤浠ｇ爜" />
- </el-form-item>
- <el-form-item label="浼佷笟绠�浠�" prop="intro">
- <el-input type="textarea" v-model="form.intro" placeholder="璇疯緭鍏ヤ紒涓氱畝浠�" />
- </el-form-item>
- <el-form-item label="澶囨敞" prop="remark">
- <el-input v-model="form.remark" placeholder="璇疯緭鍏ュ娉�" />
- </el-form-item>
- </el-form>
- <template #footer>
- <div class="dialog-footer">
- <el-button :loading="buttonLoading" type="primary" @click="submitForm">纭� 瀹�</el-button>
- <el-button @click="cancel">鍙� 娑�</el-button>
- </div>
- </template>
- </el-dialog>
- </div>
-</template>
--
Gitblit v1.9.3