From 5e440a7dc434c43eb828fa62cf9c12b0078b8565 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 20 一月 2025 11:36:18 +0800
Subject: [PATCH] !173 发布 5.3.0-BETA 公测版本 Merge pull request !173 from 疯狂的狮子Li/dev
---
src/views/system/tenant/index.vue | 42 ++++++++++++++++++++++++++++++++----------
1 files changed, 32 insertions(+), 10 deletions(-)
diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue
index 3a50300..df97b64 100644
--- a/src/views/system/tenant/index.vue
+++ b/src/views/system/tenant/index.vue
@@ -3,18 +3,18 @@
<transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
<div v-show="showSearch" class="mb-[10px]">
<el-card shadow="hover">
- <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="68px">
+ <el-form ref="queryFormRef" :model="queryParams" :inline="true">
<el-form-item label="绉熸埛缂栧彿" prop="tenantId">
- <el-input v-model="queryParams.tenantId" placeholder="璇疯緭鍏ョ鎴风紪鍙�" clearable style="width: 240px" @keyup.enter="handleQuery" />
+ <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 style="width: 240px" @keyup.enter="handleQuery" />
+ <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 style="width: 240px" @keyup.enter="handleQuery" />
+ <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 style="width: 240px" @keyup.enter="handleQuery" />
+ <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>
@@ -44,7 +44,10 @@
<el-col :span="1.5">
<el-button v-hasPermi="['system:tenant:export']" type="warning" plain icon="Download" @click="handleExport">瀵煎嚭</el-button>
</el-col>
- <right-toolbar v-model:showSearch="showSearch" @query-table="getList"></right-toolbar>
+ <el-col :span="1.5">
+ <el-button v-if="userId === 1" type="success" plain icon="Refresh" @click="handleSyncTenantDict">鍚屾绉熸埛瀛楀吀</el-button>
+ </el-col>
+ <right-toolbar v-model:show-search="showSearch" @query-table="getList"></right-toolbar>
</el-row>
</template>
@@ -58,7 +61,7 @@
<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>
+ <span>{{ proxy.parseTime(scope.row.expireTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="绉熸埛鐘舵��" align="center" prop="status">
@@ -103,12 +106,12 @@
<el-input v-model="form.password" type="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: 240px" style="width: 100%">
+ <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 v-model="form.expireTime" clearable style="width: 240px" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="璇烽�夋嫨杩囨湡鏃堕棿">
+ <el-date-picker v-model="form.expireTime" clearable type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="璇烽�夋嫨杩囨湡鏃堕棿">
</el-date-picker>
</el-form-item>
<el-form-item label="鐢ㄦ埛鏁伴噺" prop="accountCount">
@@ -141,13 +144,25 @@
</template>
<script setup name="Tenant" lang="ts">
-import { listTenant, getTenant, delTenant, addTenant, updateTenant, changeTenantStatus, syncTenantPackage } from '@/api/system/tenant';
+import {
+ listTenant,
+ getTenant,
+ delTenant,
+ addTenant,
+ updateTenant,
+ changeTenantStatus,
+ syncTenantPackage,
+ syncTenantDict
+} from '@/api/system/tenant';
import { selectTenantPackage } from '@/api/system/tenantPackage';
+import useUserStore from '@/store/modules/user';
import { TenantForm, TenantQuery, TenantVO } from '@/api/system/tenant/types';
import { TenantPkgVO } from '@/api/system/tenantPackage/types';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const userStore = useUserStore();
+const userId = ref(userStore.userId);
const tenantList = ref<TenantVO[]>([]);
const packageList = ref<TenantPkgVO[]>([]);
const buttonLoading = ref(false);
@@ -343,6 +358,13 @@
);
};
+/**鍚屾绉熸埛瀛楀吀*/
+const handleSyncTenantDict = async () => {
+ await proxy?.$modal.confirm('纭瑕佸悓姝ユ墍鏈夌鎴峰瓧鍏稿悧锛�');
+ let res = await syncTenantDict();
+ proxy?.$modal.msgSuccess(res.msg);
+};
+
onMounted(() => {
getList();
});
--
Gitblit v1.9.3