From e423d8afcf5b9666e166565d0509b621ebab17e7 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 13 一月 2025 14:11:00 +0800
Subject: [PATCH] !172 合并 warmflow 功能分支 * update 优化 流程定义页面 点击复制之后跳转到未发布列表 * update 优化 流程定义页面 增加加载loading层 * fix: v-model处理有延迟 需要手动处理 * update 调整流程定义查询 * Merge remote-tracking branch 'origin/dev' into warm-flw-future * update 调整可驳回的节点 * update: 调整文案 * update: 激活/挂起改为switch操作 * update 优化 代码删除无用输出 * update 统一抄送人使用昵称展示 * update 调整分类接口 * update 统一业务id参数 * update 删除默认顶节点 * !168 优化流程分类 * update 恢复误删除代码 * update 优化流程分类 * update 修复 路由跳转未改全 * [update] * fix 修复一些问题 * update 重构流程分类表 * update 流程定义增加表单路径与编辑功能 修复一些其他bug * fix 修复 一些问题 * update 变量统一命名 * add 增加示例 * Merge branch 'warm-flw-future' of https://gitee.com/JavaLionLi/plus-ui… * update 调整办理人 * Merge remote-tracking branch 'origin/dev' into warm-flw-future * add 增加示例 * update 调整审批记录 添加流程导出 * remove 删除无用代码 * remove 删除无用代码 * [update] * [fix] * 流程干预删除委托 * 增加附件 * 附件修改 * 申请人查询修改 * 1.修改查询条件 * !167 fix 修复 import路径修改不全问题 * fix 修复 import路径修改不全问题 * !166 update 清除 ProcessPreview 引用 * update 清除 ProcessPreview 引用 * remove 删除 bpmn.js 设计器 * remove 删除 bpmn.js 设计器 * remove 删除 bpmn.js 设计器 * remove 删除 bpmn.js 设计器 * fix 修复 前端路径修改不全问题 * update 优化接口请求路径 * add 添加作废 * add 添加流程干预 * update 调整加签，减签 * update 调整加签，减签 * add 增加流程查看 * update 调整委托，转办 * update 调整流程变量显示 * update 调整办理人修改 * update 调整流程实例状态页面 * update 调整已办页面 * add 添加流程撤销 * update 调整任务，流程实例 ，流程定义页面 * Merge branch 'dev' into warm-flw-future * update 调整流程定义页面 * add 添加流程变量查看 * update 调整设计器路由名称 * update 调整办理人 * update 调整设计器uri * update 调整设计器请求uri 调整待办状态 * update 调整办理 驳回 终止等状态 * add 添加模型新增 * add 添加warm-ui设计器,删除无用代码 * Merge remote-tracking branch 'origin/dev' into warm-flw-future * add 添加流程设计 * update 调整驳回 * update 调整视图类型错误 * Merge branch 'warm-flw-future' of https://gitee.com/JavaLionLi/plus-ui… * 添加已办，未办 * Merge remote-tracking branch 'origin/dev' into warm-flw-future * update 调整流程实例，待办查询 * add 添加代办人，调整提交按钮校验 * update 调整流程定义查询 * add添加流程定义激活 挂起 * add 添加流程文件部署 调整流程发布 * update 优化 时间搜索组件统一 * Merge remote-tracking branch 'origin/dev' into warm-flw-future * fix 修复 用户管理编辑安全权限错误问题 * Merge remote-tracking branch 'origin/dev' into warm-flw-future * update 优化 类型报错问题 * update 优化 切换租户后刷新首页 * update 优化 实现表格行选中切换 * update 优化 使用 vueuse 重构 websocket 实现 * update 优化 使用 vueuse 重构 websocket 实现 * fix 修复 登出后重新登录 sse推送报错问题 * reset 回滚 代码修改 采用其他方案 * fix 修复 登出后重新登录 sse推送报错问题 * update 优化 删除无用代码 * update element-plus 2.7.5 => 2.7.8 * reset 回滚 错误修复 * update 优化 代码生成器编辑页禁用缓存 防止同步后页面不更新问题 * fix 修复 代码生成同步点击取消报错问题 * 初始化添加warm-flow
---
src/views/system/notice/index.vue | 428 ++++++++++++++++++++++++-----------------------------
1 files changed, 194 insertions(+), 234 deletions(-)
diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
index 7e04255..d99b42c 100644
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@@ -1,283 +1,243 @@
<template>
- <div class="app-container">
- <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
- <el-form-item label="鍏憡鏍囬" prop="noticeTitle">
- <el-input
- v-model="queryParams.noticeTitle"
- placeholder="璇疯緭鍏ュ叕鍛婃爣棰�"
- clearable
- style="width: 200px"
- @keyup.enter="handleQuery"
- />
- </el-form-item>
- <el-form-item label="鎿嶄綔浜哄憳" prop="createByName">
- <el-input
- v-model="queryParams.createByName"
- placeholder="璇疯緭鍏ユ搷浣滀汉鍛�"
- clearable
- style="width: 200px"
- @keyup.enter="handleQuery"
- />
- </el-form-item>
- <el-form-item label="绫诲瀷" prop="noticeType">
- <el-select v-model="queryParams.noticeType" placeholder="鍏憡绫诲瀷" clearable style="width: 200px">
- <el-option
- v-for="dict in sys_notice_type"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
- </el-select>
- </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 v-show="showSearch" class="mb-[10px]">
+ <el-card shadow="hover">
+ <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+ <el-form-item label="鍏憡鏍囬" prop="noticeTitle">
+ <el-input v-model="queryParams.noticeTitle" placeholder="璇疯緭鍏ュ叕鍛婃爣棰�" clearable @keyup.enter="handleQuery" />
+ </el-form-item>
+ <el-form-item label="鎿嶄綔浜哄憳" prop="createByName">
+ <el-input v-model="queryParams.createByName" placeholder="璇疯緭鍏ユ搷浣滀汉鍛�" clearable @keyup.enter="handleQuery" />
+ </el-form-item>
+ <el-form-item label="绫诲瀷" prop="noticeType">
+ <el-select v-model="queryParams.noticeType" placeholder="鍏憡绫诲瀷" clearable>
+ <el-option v-for="dict in sys_notice_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+ </el-select>
+ </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-row :gutter="10" class="mb8">
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="Plus"
- @click="handleAdd"
- v-hasPermi="['system:notice:add']"
- >鏂板</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="success"
- plain
- icon="Edit"
- :disabled="single"
- @click="handleUpdate"
- v-hasPermi="['system:notice:edit']"
- >淇敼</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="danger"
- plain
- icon="Delete"
- :disabled="multiple"
- @click="handleDelete"
- v-hasPermi="['system:notice:remove']"
- >鍒犻櫎</el-button>
- </el-col>
- <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
- </el-row>
+ <el-card shadow="hover">
+ <template #header>
+ <el-row :gutter="10" class="mb8">
+ <el-col :span="1.5">
+ <el-button v-hasPermi="['system:notice:add']" type="primary" plain icon="Plus" @click="handleAdd">鏂板</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button v-hasPermi="['system:notice:edit']" type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()"
+ >淇敼</el-button
+ >
+ </el-col>
+ <el-col :span="1.5">
+ <el-button v-hasPermi="['system:notice:remove']" type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()">
+ 鍒犻櫎
+ </el-button>
+ </el-col>
+ <right-toolbar v-model:show-search="showSearch" @query-table="getList"></right-toolbar>
+ </el-row>
+ </template>
<el-table v-loading="loading" :data="noticeList" @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="55" align="center" />
- <el-table-column label="搴忓彿" align="center" prop="noticeId" width="100" v-if="false" />
- <el-table-column
- label="鍏憡鏍囬"
- align="center"
- prop="noticeTitle"
- :show-overflow-tooltip="true"
- />
- <el-table-column label="鍏憡绫诲瀷" align="center" prop="noticeType" width="100">
- <template #default="scope">
- <dict-tag :options="sys_notice_type" :value="scope.row.noticeType" />
- </template>
- </el-table-column>
- <el-table-column label="鐘舵��" align="center" prop="status" width="100">
- <template #default="scope">
- <dict-tag :options="sys_notice_status" :value="scope.row.status" />
- </template>
- </el-table-column>
- <el-table-column label="鍒涘缓鑰�" align="center" prop="createByName" width="100" />
- <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="100">
- <template #default="scope">
- <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
- </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:notice:edit']">淇敼</el-button>
- <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:notice:remove']" >鍒犻櫎</el-button>
- </template>
- </el-table-column>
+ <el-table-column type="selection" width="55" align="center" />
+ <el-table-column v-if="false" label="搴忓彿" align="center" prop="noticeId" width="100" />
+ <el-table-column label="鍏憡鏍囬" align="center" prop="noticeTitle" :show-overflow-tooltip="true" />
+ <el-table-column label="鍏憡绫诲瀷" align="center" prop="noticeType" width="100">
+ <template #default="scope">
+ <dict-tag :options="sys_notice_type" :value="scope.row.noticeType" />
+ </template>
+ </el-table-column>
+ <el-table-column label="鐘舵��" align="center" prop="status" width="100">
+ <template #default="scope">
+ <dict-tag :options="sys_notice_status" :value="scope.row.status" />
+ </template>
+ </el-table-column>
+ <el-table-column label="鍒涘缓鑰�" align="center" prop="createByName" width="100" />
+ <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="100">
+ <template #default="scope">
+ <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+ </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 v-hasPermi="['system:notice:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)"></el-button>
+ </el-tooltip>
+ <el-tooltip content="鍒犻櫎" placement="top">
+ <el-button v-hasPermi="['system:notice: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"
- />
-
- <!-- 娣诲姞鎴栦慨鏀瑰叕鍛婂璇濇 -->
- <el-dialog :title="title" v-model="open" width="780px" append-to-body>
- <el-form ref="noticeRef" :model="form" :rules="rules" label-width="80px">
- <el-row>
- <el-col :span="12">
- <el-form-item label="鍏憡鏍囬" prop="noticeTitle">
- <el-input v-model="form.noticeTitle" placeholder="璇疯緭鍏ュ叕鍛婃爣棰�" />
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="鍏憡绫诲瀷" prop="noticeType">
- <el-select v-model="form.noticeType" placeholder="璇烽�夋嫨">
- <el-option
- v-for="dict in sys_notice_type"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="24">
- <el-form-item label="鐘舵��">
- <el-radio-group v-model="form.status">
- <el-radio
- v-for="dict in sys_notice_status"
- :key="dict.value"
- :label="dict.value"
- >{{ dict.label }}</el-radio>
- </el-radio-group>
- </el-form-item>
- </el-col>
- <el-col :span="24">
- <el-form-item label="鍐呭">
- <editor v-model="form.noticeContent" :min-height="192"/>
- </el-form-item>
- </el-col>
- </el-row>
- </el-form>
- <template #footer>
- <div class="dialog-footer">
- <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
- <el-button @click="cancel">鍙� 娑�</el-button>
- </div>
- </template>
- </el-dialog>
- </div>
+ <pagination v-show="total > 0" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" :total="total" @pagination="getList" />
+ </el-card>
+ <!-- 娣诲姞鎴栦慨鏀瑰叕鍛婂璇濇 -->
+ <el-dialog v-model="dialog.visible" :title="dialog.title" width="780px" append-to-body>
+ <el-form ref="noticeFormRef" :model="form" :rules="rules" label-width="80px">
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="鍏憡鏍囬" prop="noticeTitle">
+ <el-input v-model="form.noticeTitle" placeholder="璇疯緭鍏ュ叕鍛婃爣棰�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鍏憡绫诲瀷" prop="noticeType">
+ <el-select v-model="form.noticeType" placeholder="璇烽�夋嫨">
+ <el-option v-for="dict in sys_notice_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="24">
+ <el-form-item label="鐘舵��">
+ <el-radio-group v-model="form.status">
+ <el-radio v-for="dict in sys_notice_status" :key="dict.value" :value="dict.value">{{ dict.label }}</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ </el-col>
+ <el-col :span="24">
+ <el-form-item label="鍐呭">
+ <editor v-model="form.noticeContent" :min-height="192" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+ <template #footer>
+ <div class="dialog-footer">
+ <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
+ <el-button @click="cancel">鍙� 娑�</el-button>
+ </div>
+ </template>
+ </el-dialog>
+ </div>
</template>
-<script setup name="Notice">
-import { listNotice, getNotice, delNotice, addNotice, updateNotice } from "@/api/system/notice";
+<script setup name="Notice" lang="ts">
+import { listNotice, getNotice, delNotice, addNotice, updateNotice } from '@/api/system/notice';
+import { NoticeForm, NoticeQuery, NoticeVO } from '@/api/system/notice/types';
-const { proxy } = getCurrentInstance();
-const { sys_notice_status, sys_notice_type } = proxy.useDict("sys_notice_status", "sys_notice_type");
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { sys_notice_status, sys_notice_type } = toRefs<any>(proxy?.useDict('sys_notice_status', 'sys_notice_type'));
-const noticeList = ref([]);
-const open = ref(false);
+const noticeList = ref<NoticeVO[]>([]);
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: {},
+const queryFormRef = ref<ElFormInstance>();
+const noticeFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+ visible: false,
+ title: ''
+});
+
+const initFormData: NoticeForm = {
+ noticeId: undefined,
+ noticeTitle: '',
+ noticeType: '',
+ noticeContent: '',
+ status: '0',
+ remark: '',
+ createByName: ''
+};
+const data = reactive<PageData<NoticeForm, NoticeQuery>>({
+ form: { ...initFormData },
queryParams: {
pageNum: 1,
pageSize: 10,
- noticeTitle: undefined,
- createByName: undefined,
- status: undefined
+ noticeTitle: '',
+ createByName: '',
+ status: '',
+ noticeType: ''
},
rules: {
- noticeTitle: [{ required: true, message: "鍏憡鏍囬涓嶈兘涓虹┖", trigger: "blur" }],
- noticeType: [{ required: true, message: "鍏憡绫诲瀷涓嶈兘涓虹┖", trigger: "change" }]
- },
+ noticeTitle: [{ required: true, message: '鍏憡鏍囬涓嶈兘涓虹┖', trigger: 'blur' }],
+ noticeType: [{ required: true, message: '鍏憡绫诲瀷涓嶈兘涓虹┖', trigger: 'change' }]
+ }
});
const { queryParams, form, rules } = toRefs(data);
/** 鏌ヨ鍏憡鍒楄〃 */
-function getList() {
+const getList = async () => {
loading.value = true;
- listNotice(queryParams.value).then(response => {
- noticeList.value = response.rows;
- total.value = response.total;
- loading.value = false;
- });
-}
+ const res = await listNotice(queryParams.value);
+ noticeList.value = res.rows;
+ total.value = res.total;
+ loading.value = false;
+};
/** 鍙栨秷鎸夐挳 */
-function cancel() {
- open.value = false;
+const cancel = () => {
reset();
-}
+ dialog.visible = false;
+};
/** 琛ㄥ崟閲嶇疆 */
-function reset() {
- form.value = {
- noticeId: undefined,
- noticeTitle: undefined,
- noticeType: undefined,
- noticeContent: undefined,
- status: "0"
- };
- proxy.resetForm("noticeRef");
-}
+const reset = () => {
+ form.value = { ...initFormData };
+ noticeFormRef.value?.resetFields();
+};
/** 鎼滅储鎸夐挳鎿嶄綔 */
-function handleQuery() {
+const handleQuery = () => {
queryParams.value.pageNum = 1;
getList();
-}
+};
/** 閲嶇疆鎸夐挳鎿嶄綔 */
-function resetQuery() {
- proxy.resetForm("queryRef");
+const resetQuery = () => {
+ queryFormRef.value?.resetFields();
handleQuery();
-}
+};
/** 澶氶�夋閫変腑鏁版嵁 */
-function handleSelectionChange(selection) {
- ids.value = selection.map(item => item.noticeId);
+const handleSelectionChange = (selection: NoticeVO[]) => {
+ ids.value = selection.map((item) => item.noticeId);
single.value = selection.length != 1;
multiple.value = !selection.length;
-}
+};
/** 鏂板鎸夐挳鎿嶄綔 */
-function handleAdd() {
+const handleAdd = () => {
reset();
- open.value = true;
- title.value = "娣诲姞鍏憡";
-}
+ dialog.visible = true;
+ dialog.title = '娣诲姞鍏憡';
+};
/**淇敼鎸夐挳鎿嶄綔 */
-function handleUpdate(row) {
+const handleUpdate = async (row?: NoticeVO) => {
reset();
- const noticeId = row.noticeId || ids.value;
- getNotice(noticeId).then(response => {
- form.value = response.data;
- open.value = true;
- title.value = "淇敼鍏憡";
- });
-}
+ const noticeId = row?.noticeId || ids.value[0];
+ const { data } = await getNotice(noticeId);
+ Object.assign(form.value, data);
+ dialog.visible = true;
+ dialog.title = '淇敼鍏憡';
+};
/** 鎻愪氦鎸夐挳 */
-function submitForm() {
- proxy.$refs["noticeRef"].validate(valid => {
+const submitForm = () => {
+ noticeFormRef.value?.validate(async (valid: boolean) => {
if (valid) {
- if (form.value.noticeId != undefined) {
- updateNotice(form.value).then(response => {
- proxy.$modal.msgSuccess("淇敼鎴愬姛");
- open.value = false;
- getList();
- });
- } else {
- addNotice(form.value).then(response => {
- proxy.$modal.msgSuccess("鏂板鎴愬姛");
- open.value = false;
- getList();
- });
- }
+ form.value.noticeId ? await updateNotice(form.value) : await addNotice(form.value);
+ proxy?.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+ dialog.visible = false;
+ await getList();
}
});
-}
+};
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
-function handleDelete(row) {
- const noticeIds = row.noticeId || ids.value
- proxy.$modal.confirm('鏄惁纭鍒犻櫎鍏憡缂栧彿涓�"' + noticeIds + '"鐨勬暟鎹」锛�').then(function() {
- return delNotice(noticeIds);
- }).then(() => {
- getList();
- proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- }).catch(() => {});
-}
+const handleDelete = async (row?: NoticeVO) => {
+ const noticeIds = row?.noticeId || ids.value;
+ await proxy?.$modal.confirm('鏄惁纭鍒犻櫎鍏憡缂栧彿涓�"' + noticeIds + '"鐨勬暟鎹」锛�');
+ await delNotice(noticeIds);
+ await getList();
+ proxy?.$modal.msgSuccess('鍒犻櫎鎴愬姛');
+};
-getList();
+onMounted(() => {
+ getList();
+});
</script>
--
Gitblit v1.9.3