From b06f6a316b6a8293bb8aba6bfff33336b66c032a Mon Sep 17 00:00:00 2001
From: ahaos <8406649+lhailgl@user.noreply.gitee.com>
Date: 星期三, 13 十二月 2023 09:01:52 +0800
Subject: [PATCH] !64 版本升级 * Merge branch 'dev' of gitee.com:JavaLionLi/plus-ui into ts * 升级依赖 * !61 fix: 删除重复环境变量ElUploadInstance * fix: 删除重复环境变量ElUploadInstance
---
src/views/system/dict/index.vue | 91 +++++++++++++++++++++++----------------------
1 files changed, 47 insertions(+), 44 deletions(-)
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index f3b0051..c87cf46 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -1,9 +1,9 @@
<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">
+ <div v-show="showSearch" class="mb-[10px]">
<el-card shadow="hover">
- <el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+ <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="68px">
<el-form-item label="瀛楀吀鍚嶇О" prop="dictName">
<el-input v-model="queryParams.dictName" placeholder="璇疯緭鍏ュ瓧鍏稿悕绉�" clearable style="width: 240px" @keyup.enter="handleQuery" />
</el-form-item>
@@ -33,29 +33,29 @@
<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:dict:add']">鏂板</el-button>
+ <el-button v-hasPermi="['system:dict:add']" type="primary" plain icon="Plus" @click="handleAdd">鏂板</el-button>
</el-col>
<el-col :span="1.5">
- <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['system:dict:edit']">淇敼</el-button>
+ <el-button v-hasPermi="['system:dict:edit']" type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()">淇敼</el-button>
</el-col>
<el-col :span="1.5">
- <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:dict:remove']">
+ <el-button v-hasPermi="['system:dict:remove']" type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()">
鍒犻櫎
</el-button>
</el-col>
<el-col :span="1.5">
- <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:dict:export']">瀵煎嚭</el-button>
+ <el-button v-hasPermi="['system:dict:export']" type="warning" plain icon="Download" @click="handleExport">瀵煎嚭</el-button>
</el-col>
<el-col :span="1.5">
- <el-button type="danger" plain icon="Refresh" @click="handleRefreshCache" v-hasPermi="['system:dict:remove']">鍒锋柊缂撳瓨</el-button>
+ <el-button v-hasPermi="['system:dict:remove']" type="danger" plain icon="Refresh" @click="handleRefreshCache">鍒锋柊缂撳瓨</el-button>
</el-col>
- <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+ <right-toolbar v-model:showSearch="showSearch" @query-table="getList"></right-toolbar>
</el-row>
</template>
<el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
- <el-table-column label="瀛楀吀缂栧彿" align="center" prop="dictId" v-if="false" />
+ <el-table-column v-if="false" label="瀛楀吀缂栧彿" align="center" prop="dictId" />
<el-table-column label="瀛楀吀鍚嶇О" align="center" prop="dictName" :show-overflow-tooltip="true" />
<el-table-column label="瀛楀吀绫诲瀷" align="center" :show-overflow-tooltip="true">
<template #default="scope">
@@ -73,19 +73,19 @@
<el-table-column label="鎿嶄綔" align="center" width="160" 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:dict:edit']"></el-button>
+ <el-button v-hasPermi="['system:dict:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)"></el-button>
</el-tooltip>
<el-tooltip content="鍒犻櫎" placement="top">
- <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:dict:remove']"></el-button>
+ <el-button v-hasPermi="['system:dict:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)"></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" />
+ <pagination v-show="total > 0" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" :total="total" @pagination="getList" />
</el-card>
<!-- 娣诲姞鎴栦慨鏀瑰弬鏁伴厤缃璇濇 -->
- <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+ <el-dialog v-model="dialog.visible" :title="dialog.title" width="500px" append-to-body>
<el-form ref="dictFormRef" :model="form" :rules="rules" label-width="80px">
<el-form-item label="瀛楀吀鍚嶇О" prop="dictName">
<el-input v-model="form.dictName" placeholder="璇疯緭鍏ュ瓧鍏稿悕绉�" />
@@ -108,9 +108,9 @@
</template>
<script setup name="Dict" lang="ts">
-import useDictStore from '@/store/modules/dict'
-import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
-import { DictTypeForm, DictTypeQuery, DictTypeVO } from "@/api/system/dict/type/types";
+import useDictStore from '@/store/modules/dict';
+import { listType, getType, delType, addType, updateType, refreshCache } from '@/api/system/dict/type';
+import { DictTypeForm, DictTypeQuery, DictTypeVO } from '@/api/system/dict/type/types';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -126,7 +126,6 @@
const dictFormRef = ref<ElFormInstance>();
const queryFormRef = ref<ElFormInstance>();
-
const dialog = reactive<DialogOption>({
visible: false,
title: ''
@@ -137,7 +136,7 @@
dictName: '',
dictType: '',
remark: ''
-}
+};
const data = reactive<PageData<DictTypeForm, DictTypeQuery>>({
form: { ...initFormData },
queryParams: {
@@ -147,9 +146,9 @@
dictType: ''
},
rules: {
- dictName: [{ required: true, message: "瀛楀吀鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }],
- dictType: [{ required: true, message: "瀛楀吀绫诲瀷涓嶈兘涓虹┖", trigger: "blur" }]
- },
+ dictName: [{ required: true, message: '瀛楀吀鍚嶇О涓嶈兘涓虹┖', trigger: 'blur' }],
+ dictType: [{ required: true, message: '瀛楀吀绫诲瀷涓嶈兘涓虹┖', trigger: 'blur' }]
+ }
});
const { queryParams, form, rules } = toRefs(data);
@@ -157,45 +156,45 @@
/** 鏌ヨ瀛楀吀绫诲瀷鍒楄〃 */
const getList = () => {
loading.value = true;
- listType(proxy?.addDateRange(queryParams.value, dateRange.value)).then(res => {
+ listType(proxy?.addDateRange(queryParams.value, dateRange.value)).then((res) => {
typeList.value = res.rows;
total.value = res.total;
loading.value = false;
});
-}
+};
/** 鍙栨秷鎸夐挳 */
const cancel = () => {
reset();
dialog.visible = false;
-}
+};
/** 琛ㄥ崟閲嶇疆 */
const reset = () => {
form.value = { ...initFormData };
dictFormRef.value?.resetFields();
-}
+};
/** 鎼滅储鎸夐挳鎿嶄綔 */
const handleQuery = () => {
queryParams.value.pageNum = 1;
getList();
-}
+};
/** 閲嶇疆鎸夐挳鎿嶄綔 */
const resetQuery = () => {
dateRange.value = ['', ''];
queryFormRef.value?.resetFields();
handleQuery();
-}
+};
/** 鏂板鎸夐挳鎿嶄綔 */
const handleAdd = () => {
reset();
dialog.visible = true;
- dialog.title = "娣诲姞瀛楀吀绫诲瀷";
-}
+ dialog.title = '娣诲姞瀛楀吀绫诲瀷';
+};
/** 澶氶�夋閫変腑鏁版嵁 */
const handleSelectionChange = (selection: DictTypeVO[]) => {
- ids.value = selection.map(item => item.dictId);
+ ids.value = selection.map((item) => item.dictId);
single.value = selection.length != 1;
multiple.value = !selection.length;
-}
+};
/** 淇敼鎸夐挳鎿嶄綔 */
const handleUpdate = async (row?: DictTypeVO) => {
reset();
@@ -203,41 +202,45 @@
const res = await getType(dictId);
Object.assign(form.value, res.data);
dialog.visible = true;
- dialog.title = "淇敼瀛楀吀绫诲瀷";
-}
+ dialog.title = '淇敼瀛楀吀绫诲瀷';
+};
/** 鎻愪氦鎸夐挳 */
const submitForm = () => {
dictFormRef.value?.validate(async (valid: boolean) => {
if (valid) {
form.value.dictId ? await updateType(form.value) : await addType(form.value);
- proxy?.$modal.msgSuccess("鎿嶄綔鎴愬姛");
+ proxy?.$modal.msgSuccess('鎿嶄綔鎴愬姛');
dialog.visible = false;
getList();
}
});
-}
+};
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
const handleDelete = async (row?: DictTypeVO) => {
const dictIds = row?.dictId || ids.value;
await proxy?.$modal.confirm('鏄惁纭鍒犻櫎瀛楀吀缂栧彿涓�"' + dictIds + '"鐨勬暟鎹」锛�');
await delType(dictIds);
getList();
- proxy?.$modal.msgSuccess("鍒犻櫎鎴愬姛");
-}
+ proxy?.$modal.msgSuccess('鍒犻櫎鎴愬姛');
+};
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
const handleExport = () => {
- proxy?.download("system/dict/type/export", {
- ...queryParams.value
- }, `dict_${new Date().getTime()}.xlsx`);
-}
+ proxy?.download(
+ 'system/dict/type/export',
+ {
+ ...queryParams.value
+ },
+ `dict_${new Date().getTime()}.xlsx`
+ );
+};
/** 鍒锋柊缂撳瓨鎸夐挳鎿嶄綔 */
const handleRefreshCache = async () => {
await refreshCache();
- proxy?.$modal.msgSuccess("鍒锋柊鎴愬姛");
+ proxy?.$modal.msgSuccess('鍒锋柊鎴愬姛');
useDictStore().cleanDict();
-}
+};
onMounted(() => {
getList();
-})
+});
</script>
--
Gitblit v1.9.3