Merge branch 'dev'

@@ -99,7 +99,7 @@ export default {
               finishedInfo: {
                 finishedTaskSet: result.finishedActivityIds,
                 unfinishedTaskSet: result.runningActivityIds,
-                rejectedTaskSet: {},
+                rejectedTaskSet: result.rejectedActivityIds,
                 finishedSequenceFlowSet: result.finishedSequenceFlowIds
               },
               handlinglist: result.runningTasks,

@@ -59,7 +59,7 @@
     </div>
     <!-- 表格 -->
     <div class="from-clues-content">
-      <lb-table :page-size="pageData.size" :heightNum="305" class="loadingtext" @sort-change="handleSort"
+      <lb-table :page-size="pageData.size" :heightNum="315" class="loadingtext" @sort-change="handleSort"
         :current-page.sync="pageData.current" :total="tableData.total" @size-change="handleSizeChange"
         @p-current-change="handleCurrentChange" :column="tableData.columns" :data="tableData.data">
       </lb-table>

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-19 10:23:27
+ * @LastEditTime: 2023-08-08 15:32:24
 -->
 <template>
   <div>
@@ -364,7 +364,7 @@
   }
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
-  @import "~@/styles/dialogBoxheader.scss";
+  // @import "~@/styles/dialogBoxheader.scss";
   /deep/.el-radio-group {
     display: flex;
     justify-content: center;

@@ -255,6 +255,7 @@
 
   .card_padding {
     padding-top: 8px;
+    font-size: 16px;
   }
 
   .invalid-diglog {

@@ -91,7 +91,7 @@ export default {
               finishedInfo: {
                 finishedTaskSet: result.finishedActivityIds,
                 unfinishedTaskSet: result.runningActivityIds,
-                rejectedTaskSet: {},
+                rejectedTaskSet: result.rejectedActivityIds,
                 finishedSequenceFlowSet: result.finishedSequenceFlowIds
               },
               handlinglist: result.runningTasks,

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-19 14:07:38
+ * @LastEditTime: 2023-08-08 15:23:32
 -->
 <template>
   <div class="from-clues">
@@ -37,7 +37,7 @@
           <el-col :span="4" class="btnColRight">
             <el-form-item>
               <el-button type="primary" native-type="submit" @click="handleSearch">查询</el-button>
-              <el-button @click="moreQueryClick()">高级查询</el-button>
+              <!-- <el-button @click="moreQueryClick()">高级查询</el-button> -->
             </el-form-item>
           </el-col>
         </el-row>
@@ -83,7 +83,6 @@
       this.queryClick();
     },
     methods: {
-      // 查询
       /**
        * @description: 查询
        * @author: renchao

@@ -31,7 +31,7 @@
           <el-col :span="3" class="btnColRight">
             <el-form-item>
               <el-button type="primary" native-type="submit" icon="el-icon-search" @click="handleSearch">查询</el-button>
-              <el-button @click="moreQueryClick()">高级查询</el-button>
+              <!-- <el-button @click="moreQueryClick()">高级查询</el-button> -->
             </el-form-item>
           </el-col>
         </el-row>