From b2a415728547d5aa0fa77f5653ddb7b8e6a5a8a2 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 24 一月 2025 13:08:48 +0800
Subject: [PATCH] !175 发布 5.3.0 新春版 祝大家新年快乐 Merge pull request !175 from 疯狂的狮子Li/dev
---
src/components/Process/submitVerify.vue | 3 +++
src/views/index.vue | 4 ++--
src/views/workflow/task/allTaskWaiting.vue | 1 +
src/views/workflow/task/taskFinish.vue | 1 +
src/views/workflow/task/taskWaiting.vue | 1 +
src/views/workflow/leave/leaveEdit.vue | 2 +-
package.json | 2 +-
src/views/workflow/processDefinition/design.vue | 2 +-
src/views/workflow/processDefinition/index.vue | 24 +++++++++++++++++++-----
README.md | 1 -
10 files changed, 30 insertions(+), 11 deletions(-)
diff --git a/README.md b/README.md
index 531f64b..ebc088b 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 caac7c0..26d0862 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 4c2ea88..1c985de 100644
--- a/src/components/Process/submitVerify.vue
+++ b/src/components/Process/submitVerify.vue
@@ -71,6 +71,9 @@
<el-checkbox label="3" name="type">鐭俊</el-checkbox>
</el-checkbox-group>
</el-form-item>
+ <el-form-item v-if="task.flowStatus === 'waiting'" label="闄勪欢">
+ <fileUpload v-model="backForm.fileId" :file-type="['png', 'jpg', 'jpeg', 'doc', 'docx', 'xlsx', 'xls', 'ppt', 'txt', 'pdf']" :file-size="20" />
+ </el-form-item>
<el-form-item label="瀹℃壒鎰忚">
<el-input v-model="backForm.message" type="textarea" resize="none" />
</el-form-item>
diff --git a/src/views/index.vue b/src/views/index.vue
index 8e6b23d..9168123 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -33,7 +33,7 @@
* 閮ㄧ讲鏂瑰紡 Docker 瀹瑰櫒缂栨帓 涓�閿儴缃蹭笟鍔￠泦缇�<br />
* 鍥介檯鍖� SpringMessage Spring鏍囧噯鍥介檯鍖栨柟妗�<br />
</p>
- <p><b>褰撳墠鐗堟湰:</b> <span>v5.3.0-BETA</span></p>
+ <p><b>褰撳墠鐗堟湰:</b> <span>v5.3.0</span></p>
<p>
<el-tag type="danger">¥鍏嶈垂寮�婧�</el-tag>
</p>
@@ -77,7 +77,7 @@
* 鍒嗗竷寮忕洃鎺� Prometheus銆丟rafana 鍏ㄦ柟浣嶆�ц兘鐩戞帶<br />
* 鍏朵綑涓� Vue 鐗堟湰涓�鑷�<br />
</p>
- <p><b>褰撳墠鐗堟湰:</b> <span>v2.2.2</span></p>
+ <p><b>褰撳墠鐗堟湰:</b> <span>v2.3.0</span></p>
<p>
<el-tag type="danger">¥鍏嶈垂寮�婧�</el-tag>
</p>
diff --git a/src/views/workflow/leave/leaveEdit.vue b/src/views/workflow/leave/leaveEdit.vue
index 8ef66a5..a8c1bfd 100644
--- a/src/views/workflow/leave/leaveEdit.vue
+++ b/src/views/workflow/leave/leaveEdit.vue
@@ -242,7 +242,7 @@
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 3ec44f7..05e6538 100644
--- a/src/views/workflow/processDefinition/design.vue
+++ b/src/views/workflow/processDefinition/design.vue
@@ -29,7 +29,7 @@
};
/** 鍏抽棴鎸夐挳 */
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 a45e484..9888892 100644
--- a/src/views/workflow/processDefinition/index.vue
+++ b/src/views/workflow/processDefinition/index.vue
@@ -56,7 +56,7 @@
<el-col :span="1.5">
<el-button type="warning" icon="Download" :disabled="single" @click="handleExportDef">瀵煎嚭</el-button>
</el-col>
- <right-toolbar v-model:show-search="showSearch" @query-table="getList"></right-toolbar>
+ <right-toolbar v-model:show-search="showSearch" @query-table="handleQuery"></right-toolbar>
</el-row>
</template>
<el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
@@ -116,7 +116,7 @@
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
:total="total"
- @pagination="handleQuery"
+ @pagination="getPageList"
/>
</el-tabs>
</el-card>
@@ -261,7 +261,7 @@
formPath: ''
});
onMounted(() => {
- handleQuery();
+ getPageList();
getTreeselect();
});
@@ -321,6 +321,18 @@
flowCodeList.value = selection.map((item: any) => item.flowCode);
single.value = selection.length !== 1;
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 () => {
@@ -422,7 +434,8 @@
path: `/workflow/design/index`,
query: {
definitionId: row.id,
- disabled: false
+ disabled: false,
+ activeName: activeName.value
}
});
};
@@ -436,7 +449,8 @@
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 1a01be2..0c6c46e 100644
--- a/src/views/workflow/task/allTaskWaiting.vue
+++ b/src/views/workflow/task/allTaskWaiting.vue
@@ -168,6 +168,7 @@
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 298ddcf..0f5758e 100644
--- a/src/views/workflow/task/taskFinish.vue
+++ b/src/views/workflow/task/taskFinish.vue
@@ -133,6 +133,7 @@
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 876e335..339077d 100644
--- a/src/views/workflow/task/taskWaiting.vue
+++ b/src/views/workflow/task/taskWaiting.vue
@@ -134,6 +134,7 @@
queryParams.value.pageSize = 10;
queryParams.value.createByIds = [];
userSelectCount.value = 0;
+ selectUserIds.value = [];
handleQuery();
};
// 澶氶�夋閫変腑鏁版嵁
--
Gitblit v1.9.3