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/post/index.vue | 195 ++++++++++++++++++++++++------------------------ 1 files changed, 97 insertions(+), 98 deletions(-) diff --git a/src/views/system/post/index.vue b/src/views/system/post/index.vue index e82cfa2..030f05d 100644 --- a/src/views/system/post/index.vue +++ b/src/views/system/post/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="70"> + <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="70"> <el-form-item label="宀椾綅缂栫爜" prop="postCode"> <el-input v-model="queryParams.postCode" placeholder="璇疯緭鍏ュ矖浣嶇紪鐮�" clearable style="width: 200px" @keyup.enter="handleQuery" /> </el-form-item> @@ -27,26 +27,26 @@ <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:post:add']">鏂板</el-button> + <el-button v-hasPermi="['system:post: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:post:edit']">淇敼</el-button> + <el-button v-hasPermi="['system:post: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:post:remove']"> + <el-button v-hasPermi="['system:post: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:post:export']">瀵煎嚭</el-button> + <el-button v-hasPermi="['system:post:export']" type="warning" plain icon="Download" @click="handleExport">瀵煎嚭</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="postList" @selection-change="handleSelectionChange"> <el-table-column type="selection" width="55" align="center" /> - <el-table-column label="宀椾綅缂栧彿" align="center" prop="postId" v-if="false" /> + <el-table-column v-if="false" label="宀椾綅缂栧彿" align="center" prop="postId" /> <el-table-column label="宀椾綅缂栫爜" align="center" prop="postCode" /> <el-table-column label="宀椾綅鍚嶇О" align="center" prop="postName" /> <el-table-column label="宀椾綅鎺掑簭" align="center" prop="postSort" /> @@ -63,20 +63,20 @@ <el-table-column label="鎿嶄綔" width="180" 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:post:edit']"></el-button> + <el-button v-hasPermi="['system:post: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:post:remove']"></el-button> + <el-button v-hasPermi="['system:post: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="postFormRef" :model="form" :rules="rules" label-width="80px"> <el-form-item label="宀椾綅鍚嶇О" prop="postName"> <el-input v-model="form.postName" placeholder="璇疯緭鍏ュ矖浣嶅悕绉�" /> @@ -107,12 +107,11 @@ </template> <script setup name="Post" lang="ts"> -import { listPost, addPost, delPost, getPost, updatePost } from "@/api/system/post"; -import { PostForm, PostQuery, PostVO } from "@/api/system/post/types"; -import { ComponentInternalInstance } from "vue"; +import { listPost, addPost, delPost, getPost, updatePost } from '@/api/system/post'; +import { PostForm, PostQuery, PostVO } from '@/api/system/post/types'; const { proxy } = getCurrentInstance() as ComponentInternalInstance; -const { sys_normal_disable } = toRefs<any>(proxy?.useDict("sys_normal_disable")); +const { sys_normal_disable } = toRefs<any>(proxy?.useDict('sys_normal_disable')); const postList = ref<PostVO[]>([]); const loading = ref(true); @@ -122,121 +121,121 @@ const multiple = ref(true); const total = ref(0); -const postFormRef = ref(ElForm); -const queryFormRef = ref(ElForm); +const postFormRef = ref<ElFormInstance>(); +const queryFormRef = ref<ElFormInstance>(); const dialog = reactive<DialogOption>({ - visible: false, - title: '' + visible: false, + title: '' }); const initFormData: PostForm = { - postId: undefined, - postCode: '', - postName: '', - postSort: 0, - status: "0", - remark: '' -} + postId: undefined, + postCode: '', + postName: '', + postSort: 0, + status: '0', + remark: '' +}; const data = reactive<PageData<PostForm, PostQuery>>({ - form: {...initFormData}, - queryParams: { - pageNum: 1, - pageSize: 10, - postCode: '', - postName: '', - status: '' - }, - rules: { - postName: [{ required: true, message: "宀椾綅鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }], - postCode: [{ required: true, message: "宀椾綅缂栫爜涓嶈兘涓虹┖", trigger: "blur" }], - postSort: [{ required: true, message: "宀椾綅椤哄簭涓嶈兘涓虹┖", trigger: "blur" }], - } + form: { ...initFormData }, + queryParams: { + pageNum: 1, + pageSize: 10, + postCode: '', + postName: '', + status: '' + }, + rules: { + postName: [{ required: true, message: '宀椾綅鍚嶇О涓嶈兘涓虹┖', trigger: 'blur' }], + postCode: [{ required: true, message: '宀椾綅缂栫爜涓嶈兘涓虹┖', trigger: 'blur' }], + postSort: [{ required: true, message: '宀椾綅椤哄簭涓嶈兘涓虹┖', trigger: 'blur' }] + } }); const { queryParams, form, rules } = toRefs<PageData<PostForm, PostQuery>>(data); /** 鏌ヨ宀椾綅鍒楄〃 */ const getList = async () => { - loading.value = true; - const res = await listPost(queryParams.value); - postList.value = res.rows; - total.value = res.total; - loading.value = false; -} + loading.value = true; + const res = await listPost(queryParams.value); + postList.value = res.rows; + total.value = res.total; + loading.value = false; +}; /** 鍙栨秷鎸夐挳 */ const cancel = () => { - reset(); - dialog.visible = false; -} + reset(); + dialog.visible = false; +}; /** 琛ㄥ崟閲嶇疆 */ const reset = () => { - form.value = {...initFormData}; - postFormRef.value.resetFields(); -} + form.value = { ...initFormData }; + postFormRef.value?.resetFields(); +}; /** 鎼滅储鎸夐挳鎿嶄綔 */ const handleQuery = () => { - queryParams.value.pageNum = 1; - getList(); -} + queryParams.value.pageNum = 1; + getList(); +}; /** 閲嶇疆鎸夐挳鎿嶄綔 */ const resetQuery = () => { - queryFormRef.value.resetFields(); - handleQuery(); -} + queryFormRef.value?.resetFields(); + handleQuery(); +}; /** 澶氶�夋閫変腑鏁版嵁 */ const handleSelectionChange = (selection: PostVO[]) => { - ids.value = selection.map(item => item.postId); - single.value = selection.length != 1; - multiple.value = !selection.length; -} + ids.value = selection.map((item) => item.postId); + single.value = selection.length != 1; + multiple.value = !selection.length; +}; /** 鏂板鎸夐挳鎿嶄綔 */ const handleAdd = () => { - dialog.visible = true; - dialog.title = "娣诲姞宀椾綅"; - nextTick(() => { - reset(); - }) -} + reset(); + dialog.visible = true; + dialog.title = '娣诲姞宀椾綅'; +}; /** 淇敼鎸夐挳鎿嶄綔 */ -const handleUpdate = (row?: PostVO) => { - dialog.visible = true; - dialog.title = "淇敼宀椾綅"; - nextTick(async () => { - reset(); - const postId = row?.postId || ids.value[0]; - const res = await getPost(postId); - form.value = res.data; - }) -} +const handleUpdate = async (row?: PostVO) => { + reset(); + const postId = row?.postId || ids.value[0]; + const res = await getPost(postId); + Object.assign(form.value, res.data); + dialog.visible = true; + dialog.title = '淇敼宀椾綅'; +}; /** 鎻愪氦鎸夐挳 */ const submitForm = () => { - postFormRef.value.validate(async (valid: boolean) => { - if (valid) { - form.value.postId ? await updatePost(form.value) : await addPost(form.value); - proxy?.$modal.msgSuccess("鎿嶄綔鎴愬姛"); - dialog.visible = false; - getList(); - } - }); -} + postFormRef.value?.validate(async (valid: boolean) => { + if (valid) { + form.value.postId ? await updatePost(form.value) : await addPost(form.value); + proxy?.$modal.msgSuccess('鎿嶄綔鎴愬姛'); + dialog.visible = false; + await getList(); + } + }); +}; /** 鍒犻櫎鎸夐挳鎿嶄綔 */ const handleDelete = async (row?: PostVO) => { - const postIds = row?.postId || ids.value; - await proxy?.$modal.confirm('鏄惁纭鍒犻櫎宀椾綅缂栧彿涓�"' + postIds + '"鐨勬暟鎹」锛�'); - await delPost(postIds); - getList(); - proxy?.$modal.msgSuccess("鍒犻櫎鎴愬姛"); -} + const postIds = row?.postId || ids.value; + await proxy?.$modal.confirm('鏄惁纭鍒犻櫎宀椾綅缂栧彿涓�"' + postIds + '"鐨勬暟鎹」锛�'); + await delPost(postIds); + await getList(); + proxy?.$modal.msgSuccess('鍒犻櫎鎴愬姛'); +}; /** 瀵煎嚭鎸夐挳鎿嶄綔 */ const handleExport = () => { - proxy?.download("system/post/export", { - ...queryParams.value - }, `post_${new Date().getTime()}.xlsx`); -} + proxy?.download( + 'system/post/export', + { + ...queryParams.value + }, + `post_${new Date().getTime()}.xlsx` + ); +}; onMounted(() => { - getList(); + getList(); }); </script> -- Gitblit v1.9.3