新增项目导出，新增流程的标题

oa-ui/src/views/flowable/form/settleForm.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-04-30 09:03:14
- * @LastEditors: wrh
- * @LastEditTime: 2024-09-02 15:41:43
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-09-13 10:01:22
 -->
 <template>
   <div class="app-container" v-loading="loading">
@@ -967,7 +967,7 @@ export default {
     },
     calculateSettle(work) {
       let sum = work.workload * work.coefficient * work.price;
-      if (sum < 600) {
+      if (sum < 600 && sum != 0) {
         this.$message.warning('不足600，按600算')
         work.remark = '不足600，按600算'
         sum = 600

oa-ui/src/views/flowable/task/finished/index.vue

@@ -50,7 +50,7 @@
       <!-- <el-table-column label="流程编号" align="center" prop="procInsId" :show-overflow-tooltip="true" />
       <el-table-column label="任务编号" align="center" prop="taskId" :show-overflow-tooltip="true" /> -->
       <el-table-column label="流程名称" align="center" prop="procDefName" :show-overflow-tooltip="true" />
-      <el-table-column label="项目编号" align="center" prop="projectName" :formatter="formatProjectName" />
+      <el-table-column label="标题" align="center" prop="title" />
       <el-table-column label="任务节点" align="center" prop="taskName" />
       <el-table-column label="流程发起人" align="center">
         <template slot-scope="scope">
@@ -342,12 +342,6 @@ export default {
       }).then(response => {
         this.download(response.msg);
       })
-    },
-    formatProjectName(row){
-      if(row.projectNumber && row.projectName)
-        return row.projectNumber + '-' + row.projectName
-      else
-        return '无'
     }
   }
 };

oa-ui/src/views/flowable/task/myProcess/index.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-01-03 09:23:11
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-08-20 10:58:56
+ * @LastEditTime: 2024-09-13 14:47:39
 -->
 <template>
   <div class="app-container">
@@ -40,7 +40,7 @@
       </el-table-column>
       <!-- <el-table-column label="流程编号" align="center" prop="procInsId" :show-overflow-tooltip="true" /> -->
       <el-table-column label="流程名称" align="center" prop="procDefName" :show-overflow-tooltip="true" />
-      <el-table-column label="项目编号" align="center" prop="projectName" :formatter="formatProjectName" />
+      <el-table-column label="标题" align="center" prop="title" />
       <!-- <el-table-column label="流程类别" align="center" prop="category" width="100px" /> -->
       <!-- <el-table-column label="流程版本" align="center" width="80px">
         <template slot-scope="scope">
@@ -490,12 +490,6 @@ export default {
       }).then(response => {
         this.download(response.msg);
       })
-    },
-    formatProjectName(row) {
-      if (row.projectNumber && row.projectName)
-        return row.projectNumber + '-' + row.projectName
-      else
-        return '无'
     }
   }
 };

oa-ui/src/views/flowable/task/todo/index.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="名称" prop="name">
-        <el-input v-model="queryParams.name" placeholder="请输入名称" clearable size="small"
+      <el-form-item label="流程名称" prop="name">
+        <el-input v-model="queryParams.name" placeholder="请输入流程名称" clearable size="small"
           @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="开始时间" prop="deployTime">
@@ -29,7 +29,7 @@
       <el-table-column type="index" label="序号" width="55" align="center" />
       <!-- <el-table-column label="任务编号" align="center" prop="taskId" :show-overflow-tooltip="true" /> -->
       <el-table-column label="流程名称" align="center" prop="procDefName" />
-      <el-table-column label="项目编号" align="center" prop="projectName" :formatter="formatProjectName" />
+      <el-table-column label="标题" align="center" prop="title" min-width="250" />
       <el-table-column label="当前节点" align="center" prop="taskName" />
       <!-- <el-table-column label="流程版本" align="center">
         <template slot-scope="scope">
@@ -43,7 +43,7 @@
         </template>
       </el-table-column>
       <el-table-column label="接收时间" align="center" prop="createTime" width="180" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="160">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit-outline" @click="handleProcess(scope.row)">处理</el-button>
           <el-button size="mini" type="text" icon="el-icon-share" @click="handleAssign(scope.row)">转办</el-button>
@@ -252,12 +252,6 @@ export default {
         this.getList();
         this.$modal.msgSuccess("删除成功");
       })
-    },
-    formatProjectName(row){
-      if(row.projectNumber && row.projectName)
-        return row.projectNumber + '-' + row.projectName
-      else
-        return '无'
     }
   }
 };

oa-ui/src/views/index.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-01-03 09:23:11
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-08-20 11:01:48
+ * @LastEditTime: 2024-09-13 14:47:16
 -->
 
 <template>
@@ -88,7 +88,7 @@
           <el-table v-loading="taskLoading" :data="todoList" height="400px">
             <el-table-column type="index" label="序号" width="55" align="center" />
             <el-table-column label="流程名称" align="center" prop="procDefName" />
-      <el-table-column label="项目编号" align="center" prop="projectName" :formatter="formatProjectName" show-overflow-tooltip />
+            <el-table-column label="标题" align="center" prop="title" show-overflow-tooltip />
             <el-table-column label="当前节点" align="center" prop="taskName" />
             <el-table-column label="流程发起人" align="center">
               <template slot-scope="scope">
@@ -346,7 +346,7 @@ export default {
       }
       return html;
     },
-    handleProcess(row){
+    handleProcess(row) {
       let path = this.getRoutePath(row);
       getProcessVariables(row.taskId).then(res => {
         this.$router.push({
@@ -375,12 +375,6 @@ export default {
         }
       }
       return path
-    },
-    formatProjectName(row){
-      if(row.projectNumber && row.projectName)
-        return row.projectNumber + '-' + row.projectName
-      else
-        return '无'
     }
   }
 }
@@ -482,7 +476,7 @@ export default {
 }
 
 .calendar-warpper {
-padding: 10px;
+  padding: 10px;
   width: 100%;
   height: 400px;
   background-color: #ffffff;

oa-ui/src/views/oa/project/index.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-02-27 14:49:15
- * @LastEditors: wrh
- * @LastEditTime: 2024-09-03 11:06:11
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-09-13 16:26:08
 -->
 <template>
   <div class="project-wrapper">
@@ -74,6 +74,8 @@
         <div>
           <el-button style="float: right;margin-right: 10px;" type="success" size="mini" icon="el-icon-plus"
             @click="handleRegister">登记项目</el-button>
+          <el-button style="float: right;margin-right: 10px;" type="warning" size="mini" icon="el-icon-download"
+            @click="handleExport">导出项目</el-button>
         </div>
       </div>
       <el-table v-loading="loading" :data="projectList" style="margin-top: 30px;">
@@ -253,7 +255,7 @@ import { todoList, getNextFlowNodeByStart } from "@/api/flowable/todo";
 import { Snowflake } from '@/utils/snowFlake.js'
 
 export default {
-  name:'Project',
+  name: 'Project',
   computed: {
     ...mapGetters(['deptId', 'userId'])
   },
@@ -480,6 +482,14 @@ export default {
         }).catch(() => { });
       }
     },
+    handleExport() {
+      this.queryParams.pageSize = 99999
+      this.download('oa/project/export', {
+        ...this.queryParams
+      }, `project_${new Date().getTime()}.xlsx`).then(() => {
+        this.queryParams.pageSize = 10
+      })
+    },
     handleStartProcess(row) {
       let formId = new Snowflake(1n, 1n, 0n).nextId().toString();
       getNextFlowNodeByStart({ deploymentId: row.deploymentId, variables: { formId: formId } }).then(res => {

oa-ui/src/views/oa/project/info.vue

@@ -914,7 +914,7 @@ export default {
 
 .anchor {
   position: fixed;
-  right: 20px;
+  right: 0px;
   bottom: 0px;
   z-index: 999;