diff --git a/README.md b/README.md
index 531f64b96b6eab984259c5cc1f21942c867b8ebf..ebc088b6b781e51b45729dbb98bb143f8e90293a 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,6 @@
## 平台简介
- 本仓库为前端技术栈 [Vue3](https://v3.cn.vuejs.org) + [TS](https://www.typescriptlang.org/) + [Element Plus](https://element-plus.org/zh-CN) + [Vite](https://cn.vitejs.dev) 版本。
-- 成员项目: 基于 vben(ant-design-vue) 的前端项目 [ruoyi-plus-vben](https://gitee.com/dapppp/ruoyi-plus-vben)
- 成员项目: 基于 vben5(ant-design-vue) 的前端项目 [ruoyi-plus-vben5](https://gitee.com/dapppp/ruoyi-plus-vben5)
- 配套后端代码仓库地址
- [RuoYi-Vue-Plus 5.X(注意版本号)](https://gitee.com/dromara/RuoYi-Vue-Plus)
diff --git a/package.json b/package.json
index caac7c0d6bd29542617884cf882eaf23e3124dc6..26d0862575c71d1fe74f3c3a5501b323f94a3681 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"$schema": "https://json.schemastore.org/tsconfig",
"name": "ruoyi-vue-plus",
- "version": "5.3.0-BETA",
+ "version": "5.3.0",
"description": "RuoYi-Vue-Plus多租户管理系统",
"author": "LionLi",
"license": "MIT",
diff --git a/src/components/Process/submitVerify.vue b/src/components/Process/submitVerify.vue
index 4c2ea884fb2476bddf8b8ff2d42528ea0c83c12a..1c985de34f2e97833ed4d0ad5c3b8d98a7172ec3 100644
--- a/src/components/Process/submitVerify.vue
+++ b/src/components/Process/submitVerify.vue
@@ -71,6 +71,9 @@
短信
+
+
+
diff --git a/src/views/index.vue b/src/views/index.vue
index 8e6b23d4ebde96905adf2001014f89673821fb3a..9168123015ddd84151d7cf5392240a6f289b5f68 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -33,7 +33,7 @@
* 部署方式 Docker 容器编排 一键部署业务集群
* 国际化 SpringMessage Spring标准国际化方案
- 当前版本: v5.3.0-BETA
+ 当前版本: v5.3.0
¥免费开源
@@ -77,7 +77,7 @@
* 分布式监控 Prometheus、Grafana 全方位性能监控
* 其余与 Vue 版本一致
- 当前版本: v2.2.2
+ 当前版本: v2.3.0
¥免费开源
diff --git a/src/views/workflow/leave/leaveEdit.vue b/src/views/workflow/leave/leaveEdit.vue
index 8ef66a5f0886b8dd8ca2eb1aa658d12f6566e0bd..a8c1bfda2c7f75beca425c7f4ccd490a00ff7b34 100644
--- a/src/views/workflow/leave/leaveEdit.vue
+++ b/src/views/workflow/leave/leaveEdit.vue
@@ -242,7 +242,7 @@ const submitFlow = async () => {
dialogVisible.visible = false;
};
//提交申请
-const handleStartWorkFlow = async (data: LeaveVO) => {
+const handleStartWorkFlow = async (data: LeaveForm) => {
try {
submitFormData.value.flowCode = flowCode.value;
submitFormData.value.businessId = data.id;
diff --git a/src/views/workflow/processDefinition/design.vue b/src/views/workflow/processDefinition/design.vue
index 3ec44f767f55a15b68df5d9846f59a0586bf9fd0..05e65380d92f20561f0dc2f871b9e81670c8b122 100644
--- a/src/views/workflow/processDefinition/design.vue
+++ b/src/views/workflow/processDefinition/design.vue
@@ -29,7 +29,7 @@ const open = async (definitionId, disabled) => {
};
/** 关闭按钮 */
function close() {
- const obj = { path: '/workflow/processDefinition' };
+ const obj = { path: '/workflow/processDefinition', query: {activeName: proxy.$route.query.activeName}};
proxy.$tab.closeOpenPage(obj);
}
diff --git a/src/views/workflow/processDefinition/index.vue b/src/views/workflow/processDefinition/index.vue
index a45e4843878097601559c2d2c77956b13ec4fe5b..988889246eb2e63caa8f1fd083f3ff775b743061 100644
--- a/src/views/workflow/processDefinition/index.vue
+++ b/src/views/workflow/processDefinition/index.vue
@@ -56,7 +56,7 @@
导出
-
+
@@ -116,7 +116,7 @@
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
:total="total"
- @pagination="handleQuery"
+ @pagination="getPageList"
/>
@@ -261,7 +261,7 @@ const form = ref({
formPath: ''
});
onMounted(() => {
- handleQuery();
+ getPageList();
getTreeselect();
});
@@ -323,6 +323,18 @@ const handleSelectionChange = (selection: any) => {
multiple.value = !selection.length;
};
//分页
+const getPageList = async () => {
+ console.log(proxy.$route.query.activeName)
+ if (proxy.$route.query.activeName) {
+ activeName.value = proxy.$route.query.activeName;
+ }
+ if (activeName.value === '0') {
+ getList();
+ } else {
+ getUnPublishList();
+ }
+};
+//分页
const getList = async () => {
loading.value = true;
const resp = await listDefinition(queryParams.value);
@@ -422,7 +434,8 @@ const design = async (row: FlowDefinitionVo) => {
path: `/workflow/design/index`,
query: {
definitionId: row.id,
- disabled: false
+ disabled: false,
+ activeName: activeName.value
}
});
};
@@ -436,7 +449,8 @@ const designView = async (row: FlowDefinitionVo) => {
path: `/workflow/design/index`,
query: {
definitionId: row.id,
- disabled: true
+ disabled: true,
+ activeName: activeName.value
}
});
};
diff --git a/src/views/workflow/task/allTaskWaiting.vue b/src/views/workflow/task/allTaskWaiting.vue
index 1a01be2bab92ac68731ed5a13039f6558cf60324..0c6c46ef4351a1c8fa584dd316eda9e5ee8e0725 100644
--- a/src/views/workflow/task/allTaskWaiting.vue
+++ b/src/views/workflow/task/allTaskWaiting.vue
@@ -168,6 +168,7 @@ const resetQuery = () => {
queryParams.value.pageSize = 10;
queryParams.value.createByIds = [];
userSelectCount.value = 0;
+ selectUserIds.value = [];
handleQuery();
};
// 多选框选中数据
diff --git a/src/views/workflow/task/taskFinish.vue b/src/views/workflow/task/taskFinish.vue
index 298ddcf4ab1b49afc3f1a6ffa2e701f8db421bc8..0f5758e410f9165f6404159f4f1d97583842a460 100644
--- a/src/views/workflow/task/taskFinish.vue
+++ b/src/views/workflow/task/taskFinish.vue
@@ -133,6 +133,7 @@ const resetQuery = () => {
queryParams.value.pageSize = 10;
queryParams.value.createByIds = [];
userSelectCount.value = 0;
+ selectUserIds.value = [];
handleQuery();
};
// 多选框选中数据
diff --git a/src/views/workflow/task/taskWaiting.vue b/src/views/workflow/task/taskWaiting.vue
index 876e33593f94012deeb026aafe88c39628ee66ea..339077da0fb7c565ecdbb42cdabbbb09516cf94e 100644
--- a/src/views/workflow/task/taskWaiting.vue
+++ b/src/views/workflow/task/taskWaiting.vue
@@ -134,6 +134,7 @@ const resetQuery = () => {
queryParams.value.pageSize = 10;
queryParams.value.createByIds = [];
userSelectCount.value = 0;
+ selectUserIds.value = [];
handleQuery();
};
// 多选框选中数据