!175 发布 5.3.0 新春版 祝大家新年快乐

Merge pull request !175 from 疯狂的狮子Li/dev

Author: JavaLionLi

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)

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",

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>

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">&yen;免费开源</el-tag>
         </p>
@@ -77,7 +77,7 @@
           * 分布式监控 Prometheus、Grafana 全方位性能监控<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">&yen;免费开源</el-tag>
         </p>

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;

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);
 }
 

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 @@ const form = ref<FlowDefinitionForm>({
   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
     }
   });
 };

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();
 };
 // 多选框选中数据

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();
 };
 // 多选框选中数据

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();
 };
 // 多选框选中数据