【修改bug】修改高度自适应

src/views/Report/ReportManager.vue

@@ -45,6 +45,7 @@
             <el-col :span="4"  class="treeList">
                 <el-input placeholder="输入关键字进行过滤" v-model="filterText">
                     </el-input>
+                  <el-scrollbar wrap-class="scroll-wrap" view-class="scroll-view">
                     <el-tree
                     class="filter-tree"
                     :data="treeData"
@@ -64,6 +65,7 @@
                         </el-tooltip>
                       </template>
                     </el-tree>
+                   </el-scrollbar>
             </el-col>
             <el-col :span="19 ">
                 <div class="table">
@@ -157,6 +159,7 @@
                 </el-input>
                 <el-button type="primary" class="btn" @click="add">新增</el-button>
             </div>
+          <el-scrollbar wrap-class="scroll-wrap" view-class="scroll-view">
             <div class="tree">
                 <el-tree class="filter-tree" :data="treeData" default-expand-all :filter-node-method="filterNode" ref="tree">
                     <span class="custom-tree-node" slot-scope="{ node,data}">
@@ -171,6 +174,7 @@
                     </span>
                 </el-tree>
             </div>
+          </el-scrollbar>
         </el-dialog>
         <labelModalVue ref="labelModalVue" @updateList="updateList"></labelModalVue>
         <!--报告上传-->
@@ -946,15 +950,14 @@ export default {
     .filter-tree{
         margin-top: 20px;
         height: calc(100vh - 320px);
-        overflow: auto;
     }
 
 }
 .tree{
-  height: 500px;
-  overflow: auto;
+  height: 400px;
+  margin: 20px 0;
   .filter-tree{
-    margin-top: 20px;
+
 
   }
 }

src/views/Report/reportManager/labelModal.vue

@@ -207,5 +207,8 @@ export default {
     line-height: 40px !important;
     width: 100%;
 }
-
+::v-deep .el-popper  .el-cascader-menu  .el-cascader-node__label{
+  width: 160px !important;
+  overflow: hidden;
+}
 </style>

src/views/permissionApplication/launch.vue

@@ -201,13 +201,17 @@ export default {
       // }
       this.handleReset()
     }
-    if (this.$store.getters.handleProcess.taskDefinitionKey == 'aid4') {
+    // 如果是从草稿进入的
+    // if (this.$route.query.isDraft) {
+    //
+    // }
+    if (this.$store.getters.handleProcess.taskDefinitionKey == 'aid4' || this.$route.query.isDraft) {
       this.taskId = this.$store.getters.handleProcess.taskId
       this.prcNum = this.$store.getters.handleProcess.prcNum
       this.prcId = this.$store.getters.handleProcess.prcId
       this.prcName = this.$store.getters.handleProcess.prcName
       this.initShow = true
-      this.formControlname = true
+      // this.formControlname = true
 
       this.getProcessDetail().then(res => {
         //基础信息