浏览代码

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

余思翰 8 个月前
父节点
当前提交
70425e763c

+ 3
- 3
oa-ui/src/views/flowable/form/settleForm.vue 查看文件

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

+ 1
- 7
oa-ui/src/views/flowable/task/finished/index.vue 查看文件

50
       <!-- <el-table-column label="流程编号" align="center" prop="procInsId" :show-overflow-tooltip="true" />
50
       <!-- <el-table-column label="流程编号" align="center" prop="procInsId" :show-overflow-tooltip="true" />
51
       <el-table-column label="任务编号" align="center" prop="taskId" :show-overflow-tooltip="true" /> -->
51
       <el-table-column label="任务编号" align="center" prop="taskId" :show-overflow-tooltip="true" /> -->
52
       <el-table-column label="流程名称" align="center" prop="procDefName" :show-overflow-tooltip="true" />
52
       <el-table-column label="流程名称" align="center" prop="procDefName" :show-overflow-tooltip="true" />
53
-      <el-table-column label="项目编号" align="center" prop="projectName" :formatter="formatProjectName" />
53
+      <el-table-column label="标题" align="center" prop="title" />
54
       <el-table-column label="任务节点" align="center" prop="taskName" />
54
       <el-table-column label="任务节点" align="center" prop="taskName" />
55
       <el-table-column label="流程发起人" align="center">
55
       <el-table-column label="流程发起人" align="center">
56
         <template slot-scope="scope">
56
         <template slot-scope="scope">
342
       }).then(response => {
342
       }).then(response => {
343
         this.download(response.msg);
343
         this.download(response.msg);
344
       })
344
       })
345
-    },
346
-    formatProjectName(row){
347
-      if(row.projectNumber && row.projectName)
348
-        return row.projectNumber + '-' + row.projectName
349
-      else
350
-        return '无'
351
     }
345
     }
352
   }
346
   }
353
 };
347
 };

+ 2
- 8
oa-ui/src/views/flowable/task/myProcess/index.vue 查看文件

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

+ 4
- 10
oa-ui/src/views/flowable/task/todo/index.vue 查看文件

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

+ 4
- 10
oa-ui/src/views/index.vue 查看文件

2
  * @Author: ysh
2
  * @Author: ysh
3
  * @Date: 2024-01-03 09:23:11
3
  * @Date: 2024-01-03 09:23:11
4
  * @LastEditors: Please set LastEditors
4
  * @LastEditors: Please set LastEditors
5
- * @LastEditTime: 2024-08-20 11:01:48
5
+ * @LastEditTime: 2024-09-13 14:47:16
6
 -->
6
 -->
7
 
7
 
8
 <template>
8
 <template>
88
           <el-table v-loading="taskLoading" :data="todoList" height="400px">
88
           <el-table v-loading="taskLoading" :data="todoList" height="400px">
89
             <el-table-column type="index" label="序号" width="55" align="center" />
89
             <el-table-column type="index" label="序号" width="55" align="center" />
90
             <el-table-column label="流程名称" align="center" prop="procDefName" />
90
             <el-table-column label="流程名称" align="center" prop="procDefName" />
91
-      <el-table-column label="项目编号" align="center" prop="projectName" :formatter="formatProjectName" show-overflow-tooltip />
91
+            <el-table-column label="标题" align="center" prop="title" show-overflow-tooltip />
92
             <el-table-column label="当前节点" align="center" prop="taskName" />
92
             <el-table-column label="当前节点" align="center" prop="taskName" />
93
             <el-table-column label="流程发起人" align="center">
93
             <el-table-column label="流程发起人" align="center">
94
               <template slot-scope="scope">
94
               <template slot-scope="scope">
346
       }
346
       }
347
       return html;
347
       return html;
348
     },
348
     },
349
-    handleProcess(row){
349
+    handleProcess(row) {
350
       let path = this.getRoutePath(row);
350
       let path = this.getRoutePath(row);
351
       getProcessVariables(row.taskId).then(res => {
351
       getProcessVariables(row.taskId).then(res => {
352
         this.$router.push({
352
         this.$router.push({
375
         }
375
         }
376
       }
376
       }
377
       return path
377
       return path
378
-    },
379
-    formatProjectName(row){
380
-      if(row.projectNumber && row.projectName)
381
-        return row.projectNumber + '-' + row.projectName
382
-      else
383
-        return '无'
384
     }
378
     }
385
   }
379
   }
386
 }
380
 }
482
 }
476
 }
483
 
477
 
484
 .calendar-warpper {
478
 .calendar-warpper {
485
-padding: 10px;
479
+  padding: 10px;
486
   width: 100%;
480
   width: 100%;
487
   height: 400px;
481
   height: 400px;
488
   background-color: #ffffff;
482
   background-color: #ffffff;

+ 13
- 3
oa-ui/src/views/oa/project/index.vue 查看文件

1
 <!--
1
 <!--
2
  * @Author: ysh
2
  * @Author: ysh
3
  * @Date: 2024-02-27 14:49:15
3
  * @Date: 2024-02-27 14:49:15
4
- * @LastEditors: wrh
5
- * @LastEditTime: 2024-09-03 11:06:11
4
+ * @LastEditors: Please set LastEditors
5
+ * @LastEditTime: 2024-09-13 16:26:08
6
 -->
6
 -->
7
 <template>
7
 <template>
8
   <div class="project-wrapper">
8
   <div class="project-wrapper">
74
         <div>
74
         <div>
75
           <el-button style="float: right;margin-right: 10px;" type="success" size="mini" icon="el-icon-plus"
75
           <el-button style="float: right;margin-right: 10px;" type="success" size="mini" icon="el-icon-plus"
76
             @click="handleRegister">登记项目</el-button>
76
             @click="handleRegister">登记项目</el-button>
77
+          <el-button style="float: right;margin-right: 10px;" type="warning" size="mini" icon="el-icon-download"
78
+            @click="handleExport">导出项目</el-button>
77
         </div>
79
         </div>
78
       </div>
80
       </div>
79
       <el-table v-loading="loading" :data="projectList" style="margin-top: 30px;">
81
       <el-table v-loading="loading" :data="projectList" style="margin-top: 30px;">
253
 import { Snowflake } from '@/utils/snowFlake.js'
255
 import { Snowflake } from '@/utils/snowFlake.js'
254
 
256
 
255
 export default {
257
 export default {
256
-  name:'Project',
258
+  name: 'Project',
257
   computed: {
259
   computed: {
258
     ...mapGetters(['deptId', 'userId'])
260
     ...mapGetters(['deptId', 'userId'])
259
   },
261
   },
480
         }).catch(() => { });
482
         }).catch(() => { });
481
       }
483
       }
482
     },
484
     },
485
+    handleExport() {
486
+      this.queryParams.pageSize = 99999
487
+      this.download('oa/project/export', {
488
+        ...this.queryParams
489
+      }, `project_${new Date().getTime()}.xlsx`).then(() => {
490
+        this.queryParams.pageSize = 10
491
+      })
492
+    },
483
     handleStartProcess(row) {
493
     handleStartProcess(row) {
484
       let formId = new Snowflake(1n, 1n, 0n).nextId().toString();
494
       let formId = new Snowflake(1n, 1n, 0n).nextId().toString();
485
       getNextFlowNodeByStart({ deploymentId: row.deploymentId, variables: { formId: formId } }).then(res => {
495
       getNextFlowNodeByStart({ deploymentId: row.deploymentId, variables: { formId: formId } }).then(res => {

+ 1
- 1
oa-ui/src/views/oa/project/info.vue 查看文件

914
 
914
 
915
 .anchor {
915
 .anchor {
916
   position: fixed;
916
   position: fixed;
917
-  right: 20px;
917
+  right: 0px;
918
   bottom: 0px;
918
   bottom: 0px;
919
   z-index: 999;
919
   z-index: 999;
920
 
920
 

正在加载...
取消
保存