Merge remote-tracking branch 'origin/master'

src/views/bpm/todo/index.vue

@@ -11,7 +11,10 @@
           <el-row :gutter="15">
             <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
               <el-form-item label="流程分类：" prop="processTypeName">
-                <el-input clearable v-model.trim="params.processTypeName"></el-input>
+                <el-input
+                  clearable
+                  v-model.trim="params.processTypeName"
+                ></el-input>
               </el-form-item>
             </el-col>
             <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
@@ -96,13 +99,13 @@
             @click="handleAudit('audit', row)"
             >处理</el-button
           >
-<!--          <el-button-->
-<!--            size="mini"-->
-<!--            type="text"-->
-<!--            icon="el-icon-edit"-->
-<!--            @click="handleAudit('audit', row)"-->
-<!--          >转派</el-button-->
-<!--          >-->
+          <!--          <el-button-->
+          <!--            size="mini"-->
+          <!--            type="text"-->
+          <!--            icon="el-icon-edit"-->
+          <!--            @click="handleAudit('audit', row)"-->
+          <!--          >转派</el-button-->
+          <!--          >-->
           <!-- <el-button
             size="mini"
             type="text"
@@ -114,7 +117,12 @@
       </ele-pro-table>
     </el-card>
     <handleTask ref="handleTaskRef" @reload="reload"></handleTask>
-    <handleFormParserTask v-if="formParserDialogFlag"  @reload="reload" :formParserDialogFlag.sync="formParserDialogFlag" ref="formParserDialogRef" ></handleFormParserTask>
+    <handleFormParserTask
+      v-if="formParserDialogFlag"
+      @reload="reload"
+      :formParserDialogFlag.sync="formParserDialogFlag"
+      ref="formParserDialogRef"
+    ></handleFormParserTask>
     <detail ref="detailRef"></detail>
 
     <!-- <el-button type="text" @click="dialogVisible = true"
@@ -149,7 +157,7 @@
   };
   export default {
     name: 'BpmDoneTask',
-    components: { handleTask, detail, inOut,handleFormParserTask },
+    components: { handleTask, detail, inOut, handleFormParserTask },
     computed: {
       // 是否开启响应式布局
       styleResponsive() {
@@ -257,11 +265,10 @@
       /** 处理审批按钮 */
 
       handleAudit(type, row) {
-
         if (type == 'audit') {
-          if(Object.keys(row.formJson).length){
-            this.formParserDialogFlag = true
-            this.$nextTick(()=>{
+          if (Object.keys(row.formJson).length) {
+            this.formParserDialogFlag = true;
+            this.$nextTick(() => {
               this.$refs.formParserDialogRef.open({
                 // id: row.processInstance.id,
                 // taskId: row.id,
@@ -270,8 +277,8 @@
                 // valueJsom:row.formJson,
                 ...row
               });
-            })
-          }else {
+            });
+          } else {
             this.$refs.handleTaskRef.open({
               id: row.processInstance.id,
               businessId: row.businessId,
@@ -281,7 +288,6 @@
               pcViewRouter: row.pcViewRouter
             });
           }
-
         } else {
           this.$refs.detailRef.open(row.processInstance.id);
         }

src/views/home/index.vue

@@ -88,7 +88,6 @@
               :columns="columns"
               :need-page="false"
               :toolkit="[]"
-              height="calc(38vh)"
               :datasource="datasource"
               cache-key="systemHomeTable5"
             >
@@ -178,7 +177,10 @@
         </el-card>
       </div>
       <div class="box-container-middl_right">
-        <el-card class="card-cell middle-cell">
+        <el-card
+          v-if="list.length > 0"
+          class="card-cell middle-cell card-cell_top"
+        >
           <div slot="header" class="clearfix">
             <span>统一门户</span>
           </div>
@@ -193,7 +195,7 @@
             </div>
           </div>
         </el-card>
-        <el-card class="card-cell middle-cell">
+        <el-card class="card-cell middle-cell card-cell_bottom">
           <div slot="header" class="clearfix">
             <span>消息提醒</span>
           </div>
@@ -338,7 +340,6 @@
             label: '任务名称',
             align: 'center',
             slot: 'name',
-
             showOverflowTooltip: true,
             minWidth: 200
           },
@@ -692,6 +693,20 @@
         .middle-cell:nth-child(1) {
           flex: 1;
           margin-bottom: 10px;
+          .table-box {
+            height: 100%;
+            display: flex;
+            flex-direction: column;
+            :deep(.el-table) {
+              flex: 1;
+              display: flex;
+              flex-direction: column;
+              .el-table__body-wrapper {
+                flex: 1;
+                overflow-y: auto;
+              }
+            }
+          }
         }
         .middle-cell:nth-child(2) {
           flex: 0 0 130px;
@@ -759,11 +774,13 @@
         min-width: 0;
         .middle-cell:nth-child(1) {
           flex: 4;
-          margin-bottom: 10px;
         }
         .middle-cell:nth-child(2) {
           flex: 3;
         }
+        .card-cell_top {
+          margin-bottom: 10px;
+        }
         :deep(.el-card__body) {
           overflow: auto;
           .list {