Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
b5292135 by renchao@pashanhoo.com
Options

Merge branch 'dev'

2 parents 218d1ade 20c23e19
Inline Side-by-side
Showing 7 changed files with 9 additions and 9 deletions
...@@ -99,7 +99,7 @@ export default { ...@@ -99,7 +99,7 @@ export default {
99 finishedInfo: { 99 finishedInfo: {
100 finishedTaskSet: result.finishedActivityIds, 100 finishedTaskSet: result.finishedActivityIds,
101 unfinishedTaskSet: result.runningActivityIds, 101 unfinishedTaskSet: result.runningActivityIds,
102 rejectedTaskSet: {}, 102 rejectedTaskSet: result.rejectedActivityIds,
103 finishedSequenceFlowSet: result.finishedSequenceFlowIds 103 finishedSequenceFlowSet: result.finishedSequenceFlowIds
104 }, 104 },
105 handlinglist: result.runningTasks, 105 handlinglist: result.runningTasks,
......
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
59 </div> 59 </div>
60 <!-- 表格 --> 60 <!-- 表格 -->
61 <div class="from-clues-content"> 61 <div class="from-clues-content">
62 <lb-table :page-size="pageData.size" :heightNum="305" class="loadingtext" @sort-change="handleSort" 62 <lb-table :page-size="pageData.size" :heightNum="315" class="loadingtext" @sort-change="handleSort"
63 :current-page.sync="pageData.current" :total="tableData.total" @size-change="handleSizeChange" 63 :current-page.sync="pageData.current" :total="tableData.total" @size-change="handleSizeChange"
64 @p-current-change="handleCurrentChange" :column="tableData.columns" :data="tableData.data"> 64 @p-current-change="handleCurrentChange" :column="tableData.columns" :data="tableData.data">
65 </lb-table> 65 </lb-table>
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-19 10:23:27 4 * @LastEditTime: 2023-08-08 15:32:24
5 --> 5 -->
6 <template> 6 <template>
7 <div> 7 <div>
...@@ -364,7 +364,7 @@ ...@@ -364,7 +364,7 @@
364 } 364 }
365 </script> 365 </script>
366 <style rel="stylesheet/scss" lang="scss" scoped> 366 <style rel="stylesheet/scss" lang="scss" scoped>
367 @import "~@/styles/dialogBoxheader.scss"; 367 // @import "~@/styles/dialogBoxheader.scss";
368 /deep/.el-radio-group { 368 /deep/.el-radio-group {
369 display: flex; 369 display: flex;
370 justify-content: center; 370 justify-content: center;
......
...@@ -255,6 +255,7 @@ ...@@ -255,6 +255,7 @@
255 255
256 .card_padding { 256 .card_padding {
257 padding-top: 8px; 257 padding-top: 8px;
258 font-size: 16px;
258 } 259 }
259 260
260 .invalid-diglog { 261 .invalid-diglog {
......
...@@ -91,7 +91,7 @@ export default { ...@@ -91,7 +91,7 @@ export default {
91 finishedInfo: { 91 finishedInfo: {
92 finishedTaskSet: result.finishedActivityIds, 92 finishedTaskSet: result.finishedActivityIds,
93 unfinishedTaskSet: result.runningActivityIds, 93 unfinishedTaskSet: result.runningActivityIds,
94 rejectedTaskSet: {}, 94 rejectedTaskSet: result.rejectedActivityIds,
95 finishedSequenceFlowSet: result.finishedSequenceFlowIds 95 finishedSequenceFlowSet: result.finishedSequenceFlowIds
96 }, 96 },
97 handlinglist: result.runningTasks, 97 handlinglist: result.runningTasks,
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-19 14:07:38 4 * @LastEditTime: 2023-08-08 15:23:32
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues"> 7 <div class="from-clues">
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
37 <el-col :span="4" class="btnColRight"> 37 <el-col :span="4" class="btnColRight">
38 <el-form-item> 38 <el-form-item>
39 <el-button type="primary" native-type="submit" @click="handleSearch">查询</el-button> 39 <el-button type="primary" native-type="submit" @click="handleSearch">查询</el-button>
40 <el-button @click="moreQueryClick()">高级查询</el-button> 40 <!-- <el-button @click="moreQueryClick()">高级查询</el-button> -->
41 </el-form-item> 41 </el-form-item>
42 </el-col> 42 </el-col>
43 </el-row> 43 </el-row>
...@@ -83,7 +83,6 @@ ...@@ -83,7 +83,6 @@
83 this.queryClick(); 83 this.queryClick();
84 }, 84 },
85 methods: { 85 methods: {
86 // 查询
87 /** 86 /**
88 * @description: 查询 87 * @description: 查询
89 * @author: renchao 88 * @author: renchao
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
31 <el-col :span="3" class="btnColRight"> 31 <el-col :span="3" class="btnColRight">
32 <el-form-item> 32 <el-form-item>
33 <el-button type="primary" native-type="submit" icon="el-icon-search" @click="handleSearch">查询</el-button> 33 <el-button type="primary" native-type="submit" icon="el-icon-search" @click="handleSearch">查询</el-button>
34 <el-button @click="moreQueryClick()">高级查询</el-button> 34 <!-- <el-button @click="moreQueryClick()">高级查询</el-button> -->
35 </el-form-item> 35 </el-form-item>
36 </el-col> 36 </el-col>
37 </el-row> 37 </el-row>
......