From 1595cb282aab5399862fac6406b5de550863e3b6 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 03 四月 2023 00:05:09 +0800
Subject: [PATCH] update 调整代码格式
---
src/views/system/tenant/index.vue | 560 +++++++++++++++++++++++++------------------------------
1 files changed, 253 insertions(+), 307 deletions(-)
diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue
index 6ba11bd..99d2cb1 100644
--- a/src/views/system/tenant/index.vue
+++ b/src/views/system/tenant/index.vue
@@ -1,129 +1,90 @@
<template>
- <div class="app-container">
- <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" 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 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-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>
+ <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-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:tenant:edit']">淇敼</el-button>
- <el-button link type="primary" icon="Edit" @click="handleSyncTenantPackage(scope.row)" v-hasPermi="['system:tenant:edit']">鍚屾濂楅</el-button>
- <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:tenant:remove']">鍒犻櫎</el-button>
- </template>
- </el-table-column>
- </el-table>
+ <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"
- :page.sync="queryParams.pageNum"
- :limit.sync="queryParams.pageSize"
- @pagination="getList"
- />
-
+ <pagination v-show="total>0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+ </el-card>
<!-- 娣诲姞鎴栦慨鏀圭鎴峰璇濇 -->
- <el-dialog :title="title" v-model="open" width="500px" append-to-body>
- <el-form ref="tenantRef" :model="form" :rules="rules" label-width="80px">
+ <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>
@@ -133,30 +94,29 @@
<el-form-item label="鑱旂郴鐢佃瘽" prop="contactPhone">
<el-input v-model="form.contactPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" />
</el-form-item>
- <el-form-item v-if="form.id == undefined" label="鐢ㄦ埛鍚�" prop="username">
- <el-input v-model="form.username" placeholder="璇疯緭鍏ョ郴缁熺敤鎴峰悕" maxlength="30"/>
+ <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 == undefined" label="鐢ㄦ埛瀵嗙爜" prop="password">
- <el-input type="password" v-model="form.password" placeholder="璇疯緭鍏ョ郴缁熺敤鎴峰瘑鐮�" maxlength="20"/>
+ <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 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 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="address">
- <el-input v-model="form.address" placeholder="璇疯緭鍏ュ湴鍧�" />
+ <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="璇疯緭鍏ョ粺涓�绀句細淇＄敤浠ｇ爜" />
@@ -168,241 +128,227 @@
<el-input v-model="form.remark" placeholder="璇疯緭鍏ュ娉�" />
</el-form-item>
</el-form>
- <div slot="footer" class="dialog-footer">
- <el-button :loading="buttonLoading" type="primary" @click="submitForm">纭� 瀹�</el-button>
- <el-button @click="cancel">鍙� 娑�</el-button>
- </div>
+ <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">
-import { listTenant, getTenant, delTenant, addTenant, updateTenant, changeTenantStatus, syncTenantPackage} from "@/api/system/tenant";
-import { listTenantPackage } from "@/api/system/tenantPackage";
+<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 { 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();
-const tenantList = ref([]);
-const packageList = ref([]);
-const open = ref(false);
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+const tenantList = ref<TenantVO[]>([]);
+const packageList = ref<TenantPkgVO[]>([]);
const buttonLoading = ref(false);
const loading = ref(true);
const showSearch = ref(true);
-const ids = ref([]);
+const ids = ref<Array<string | number>>([]);
const single = ref(true);
const multiple = ref(true);
const total = ref(0);
-const title = ref("");
-const data = reactive({
- form: {},
- packageList: [],
- queryParams: {
- pageNum: 1,
- pageSize: 10,
+const queryFormRef = ref(ElForm);
+const tenantFormRef = ref(ElForm);
+
+const dialog = reactive<DialogOption>({
+ visible: false,
+ title: ''
+});
+
+const initFormData: TenantForm = {
+ id: undefined,
tenantId: undefined,
- contactUserName: undefined,
- contactPhone: undefined,
- companyName: undefined,
- licenseNumber: undefined,
- address: undefined,
- intro: undefined,
- domain: undefined,
- packageId: undefined,
- expireTime: undefined,
- accountCount: undefined,
- status: undefined,
- },
- rules: {
- id: [
- { required: true, message: "id涓嶈兘涓虹┖", trigger: "blur" }
- ],
- tenantId: [
- { required: true, message: "绉熸埛缂栧彿涓嶈兘涓虹┖", trigger: "blur" }
- ],
- contactUserName: [
- { required: true, message: "鑱旂郴浜轰笉鑳戒负绌�", trigger: "blur" }
- ],
- contactPhone: [
- { required: true, message: "鑱旂郴鐢佃瘽涓嶈兘涓虹┖", trigger: "blur" }
- ],
- companyName: [
- { required: true, message: "浼佷笟鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }
- ],
- username: [
- { required: true, message: "鐢ㄦ埛鍚嶄笉鑳戒负绌�", trigger: "blur" },
- { min: 2, max: 20, message: '鐢ㄦ埛鍚嶇О闀垮害蹇呴』浠嬩簬 2 鍜� 20 涔嬮棿', trigger: 'blur' }
- ],
- password: [
- { required: true, message: "瀵嗙爜涓嶈兘涓虹┖", trigger: "blur" },
- { min: 5, max: 20, message: '鐢ㄦ埛瀵嗙爜闀垮害蹇呴』浠嬩簬 5 鍜� 20 涔嬮棿', trigger: 'blur' }
- ]
- }
+ contactUserName: '',
+ contactPhone: '',
+ username: '',
+ password: '',
+ companyName: '',
+ licenseNumber: '',
+ domain: '',
+ address: '',
+ intro: '',
+ remark: '',
+ packageId: '',
+ expireTime: '',
+ accountCount: 0,
+ status: '0',
+}
+const data = reactive<PageData<TenantForm, TenantQuery>>({
+ form: {...initFormData},
+ queryParams: {
+ pageNum: 1,
+ pageSize: 10,
+ tenantId: '',
+ contactUserName: '',
+ contactPhone: '',
+ companyName: ''
+ },
+ rules: {
+ id: [{ required: true, message: "id涓嶈兘涓虹┖", trigger: "blur" }],
+ tenantId: [{ required: true, message: "绉熸埛缂栧彿涓嶈兘涓虹┖", trigger: "blur" }],
+ contactUserName: [{ required: true, message: "鑱旂郴浜轰笉鑳戒负绌�", trigger: "blur" }],
+ contactPhone: [{ required: true, message: "鑱旂郴鐢佃瘽涓嶈兘涓虹┖", trigger: "blur" }],
+ companyName: [{ required: true, message: "浼佷笟鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }],
+ username: [
+ { required: true, message: "鐢ㄦ埛鍚嶄笉鑳戒负绌�", trigger: "blur" },
+ { min: 2, max: 20, message: '鐢ㄦ埛鍚嶇О闀垮害蹇呴』浠嬩簬 2 鍜� 20 涔嬮棿', trigger: 'blur' }
+ ],
+ password: [
+ { required: true, message: "瀵嗙爜涓嶈兘涓虹┖", trigger: "blur" },
+ { min: 5, max: 20, message: '鐢ㄦ埛瀵嗙爜闀垮害蹇呴』浠嬩簬 5 鍜� 20 涔嬮棿', trigger: 'blur' }
+ ]
+ }
});
const { queryParams, form, rules } = toRefs(data);
/** 鏌ヨ鎵�鏈夌鎴峰椁� */
-function getTenantPackage() {
- listTenantPackage().then(res =>{
+const getTenantPackage = async () => {
+ const res = await listTenantPackage()
packageList.value = res.rows;
- })
}
/** 鏌ヨ绉熸埛鍒楄〃 */
-function getList() {
- loading.value = true;
- listTenant(queryParams.value).then(response => {
- tenantList.value = response.rows;
- total.value = response.total;
+const getList = async () => {
+ loading.value = true;
+ const res = await listTenant(queryParams.value);
+ tenantList.value = res.rows;
+ total.value = res.total;
loading.value = false;
- });
}
// 绉熸埛濂楅鐘舵�佷慨鏀�
-function handleStatusChange(row) {
- let text = row.status === "0" ? "鍚敤" : "鍋滅敤";
- proxy.$modal.confirm('纭瑕�"' + text + '""' + row.companyName + '"绉熸埛鍚楋紵').then(function() {
- return changeTenantStatus(row.id, row.tenantId, row.status);
- }).then(() => {
- proxy.$modal.msgSuccess(text + "鎴愬姛");
- }).catch(function() {
- row.status = row.status === "0" ? "1" : "0";
- });
+const handleStatusChange = async (row: TenantVO) => {
+ let text = row.status === "0" ? "鍚敤" : "鍋滅敤";
+ try {
+ await proxy?.$modal.confirm('纭瑕�"' + text + '""' + row.companyName + '"绉熸埛鍚楋紵');
+ await changeTenantStatus(row.id, row.tenantId, row.status);
+ proxy?.$modal.msgSuccess(text + "鎴愬姛");
+ } catch {
+ row.status = row.status === "0" ? "1" : "0";
+ }
+
+
}
// 鍙栨秷鎸夐挳
-function cancel() {
- open.value = false;
- reset();
+const cancel = () => {
+ reset();
+ dialog.visible = false;
}
// 琛ㄥ崟閲嶇疆
-function reset() {
- form.value = {
- id: undefined,
- tenantId: undefined,
- contactUserName: undefined,
- contactPhone: undefined,
- username: undefined,
- password: undefined,
- companyName: undefined,
- licenseNumber: undefined,
- address: undefined,
- intro: undefined,
- remark: undefined,
- packageId: undefined,
- expireTime: undefined,
- accountCount: undefined,
- status: undefined
- };
- proxy.resetForm("tenantRef");
+const reset = () => {
+ form.value = {...initFormData};
+ tenantFormRef.value.resetFields();
}
/** 鎼滅储鎸夐挳鎿嶄綔 */
-function handleQuery() {
- queryParams.value.pageNum = 1;
- getList();
+const handleQuery = () => {
+ queryParams.value.pageNum = 1;
+ getList();
}
/** 閲嶇疆鎸夐挳鎿嶄綔 */
-function resetQuery() {
- proxy.resetForm("queryRef");
- handleQuery();
+const resetQuery = () => {
+ queryFormRef.value.resetFields();
+ handleQuery();
}
// 澶氶�夋閫変腑鏁版嵁
-function handleSelectionChange(selection) {
- ids.value = selection.map(item => item.id);
- single.value = selection.length != 1;
- multiple.value = !selection.length;
+const handleSelectionChange = (selection: TenantVO[]) => {
+ ids.value = selection.map(item => item.id);
+ single.value = selection.length != 1;
+ multiple.value = !selection.length;
}
/** 鏂板鎸夐挳鎿嶄綔 */
-function handleAdd() {
- reset();
- getTenantPackage();
- open.value = true;
- title.value = "娣诲姞绉熸埛";
+const handleAdd = () => {
+ dialog.visible = true;
+ dialog.title = "娣诲姞绉熸埛";
+ nextTick(() => {
+ reset();
+ getTenantPackage();
+ })
}
/** 淇敼鎸夐挳鎿嶄綔 */
-function handleUpdate(row) {
- loading.value = true
- reset();
- getTenantPackage();
- const _id = row.id || ids.value
- getTenant(_id).then(response => {
- loading.value = false;
- form.value = response.data;
- open.value = true;
- title.value = "淇敼绉熸埛";
- });
+const handleUpdate = (row?: TenantVO) => {
+ loading.value = true;
+ 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)
+ })
}
/** 鎻愪氦鎸夐挳 */
-function submitForm() {
- proxy.$refs["tenantRef"].validate(valid => {
- if (valid) {
- buttonLoading.value = true;
- if (form.value.id != null) {
- updateTenant(form.value).then(response => {
- proxy.$modal.msgSuccess("淇敼鎴愬姛");
- open.value = false;
- getList();
- }).finally(() => {
- buttonLoading.value = false;
- });
- } else {
- addTenant(form.value).then(response => {
- proxy.$modal.msgSuccess("鏂板鎴愬姛");
- open.value = false;
- getList();
- }).finally(() => {
- buttonLoading.value = false;
- });
- }
- }
- });
+const submitForm = () => {
+ tenantFormRef.value.validate(async (valid: boolean) => {
+ if (valid) {
+ buttonLoading.value = true;
+ if (form.value.id) {
+ await updateTenant(form.value).finally(() => buttonLoading.value = false);
+ } else {
+ await addTenant(form.value).finally(() => buttonLoading.value = false);
+ }
+ proxy?.$modal.msgSuccess("鎿嶄綔鎴愬姛");
+ dialog.visible = false;
+ getList();
+ }
+ });
}
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
-function handleDelete(row) {
- const _ids = row.id || ids.value;
- proxy.$modal.confirm('鏄惁纭鍒犻櫎绉熸埛缂栧彿涓�"' + _ids + '"鐨勬暟鎹」锛�').then(function() {
+const handleDelete = async (row?: TenantVO) => {
+ const _ids = row?.id || ids.value;
+ await proxy?.$modal.confirm('鏄惁纭鍒犻櫎绉熸埛缂栧彿涓�"' + _ids + '"鐨勬暟鎹」锛�')
loading.value = true;
- return delTenant(_ids);
- }).then(() => {
- loading.value = true;
+ await delTenant(_ids).finally(() => loading.value = false);
getList();
- proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- }).catch(() => {
- }).finally(() => {
- loading.value = false;
- });
+ proxy?.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+
+
}
/** 鍚屾绉熸埛濂楅鎸夐挳鎿嶄綔 */
-function handleSyncTenantPackage(row) {
- proxy.$modal.confirm('鏄惁纭鍚屾绉熸埛濂楅绉熸埛缂栧彿涓�"' + row.tenantId + '"鐨勬暟鎹」锛�').then(() => {
- loading.value = true;
- return syncTenantPackage(row.tenantId, row.packageId);
- }).then(() => {
- loading.value = true;
- getList();
- proxy.$modal.msgSuccess("鍚屾鎴愬姛");
- }).catch(() => {
- }).finally(() => {
- loading.value = false;
- });
+const handleSyncTenantPackage = async (row: TenantVO) => {
+ try {
+ await proxy?.$modal.confirm('鏄惁纭鍚屾绉熸埛濂楅绉熸埛缂栧彿涓�"' + row.tenantId + '"鐨勬暟鎹」锛�');
+ loading.value = true;
+ await syncTenantPackage(row.tenantId, row.packageId);
+ getList();
+ proxy?.$modal.msgSuccess("鍚屾鎴愬姛");
+ } catch {return} finally {
+ loading.value = false;
+ }
}
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
-function handleExport() {
- proxy.download('system/tenant/export', {
- ...queryParams.value
- }, `tenant_${new Date().getTime()}.xlsx`)
+const handleExport = () => {
+ proxy?.download('system/tenant/export', {
+ ...queryParams.value
+ }, `tenant_${new Date().getTime()}.xlsx`)
}
-getList();
+onMounted(() => {
+ getList();
+})
</script>
--
Gitblit v1.9.3