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

src/assets/css/common.scss

@@ -49,3 +49,17 @@
   width: 160px !important;
   overflow: hidden;
 }
+/* 自定义滚动条的样式 */
+.scroll-wrap {
+  background-color: #fff;
+}
+
+.scroll-view::-webkit-scrollbar {
+  width: 3px;
+}
+
+.scroll-view::-webkit-scrollbar-thumb {
+  border-radius: 10px;
+  background-color: red;
+}
+

src/views/Report/ReportList.vue

@@ -104,6 +104,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"
@@ -115,9 +116,12 @@
               @check="getHalfCheckedNode"
             >
             </el-tree>
+          </el-scrollbar>
         </el-col>
+
         <el-col :span="19">
-            <vxe-table ref="xTable" :data="tableData" :empty-render="{name: 'NotData'}" align="center" border stripe v-table-min-height="'calc(100vh - 320px)'"
+          <vxe-table ref="xTable" :data="tableData" :empty-render="{name: 'NotData'}" align="center" border stripe
+                     v-table-min-height="'calc(100vh - 320px)'"
                      @checkbox-all="selectAllEvent" @checkbox-change="selectChangeEvent">
             <vxe-column type="checkbox" width="60"></vxe-column>
             <vxe-column show-overflow show-header-overflow type="seq" title="序号" width="77">
@@ -190,7 +194,8 @@
                :close-on-press-escape="false" :fullscreen="fullscreen">
       <div slot="title" class="dialog-title">
         <span>预览</span>
-                <img v-if="!fullscreen" class="full-screen" src="@/assets/imgs/icon-full.png" alt="" @click="fullscreen = !fullscreen">
+        <img v-if="!fullscreen" class="full-screen" src="@/assets/imgs/icon-full.png" alt=""
+             @click="fullscreen = !fullscreen">
         <img v-else class="full-screen" src="@/assets/imgs/icon-small.png" alt="" @click="fullscreen = !fullscreen">
       </div>
       <div class="preview-dialog-body" :class="{'active': fullscreen}">
@@ -253,8 +258,7 @@ export default {
       dialogPreview: false, // 预览
       content: '',
       filterText: '',
-      treeData: [
+      treeData: [],
-            ],
       checkIds: [],
       checkList: [],
       checkedKeys: [],
@@ -472,18 +476,34 @@ export default {
   text-overflow: ellipsis;
   white-space: nowrap;
 }
+
 .treeList {
-    padding: 20px;
+  padding: 20px 20px 0;
   box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04);
   margin-right: 20px;
+
   .filter-tree {
     margin-top: 20px;
+    height: calc(100vh - 320px);
+    //overflow: scroll;
   }
 
 }
+
+.tree {
+  height: 500px;
+  //overflow: auto;
+  .filter-tree {
+    margin-top: 20px;
+
+  }
+}
+
+
 .report-name {
   cursor: pointer;
 }
+
 .report-list {
   .title {
     border-bottom: 1px solid #EBEEF5;
@@ -497,9 +517,11 @@ export default {
       color: #262626;
     }
   }
+
   .tag-btn {
     padding: 18px 13px 11px;
   }
+
   .tag-search {
     padding-top: 9px;
 
@@ -651,6 +673,7 @@ export default {
     display: inline-flex;
     justify-content: center;
     align-items: center;
+
     .full-screen {
       cursor: pointer;
       width: 24px;
@@ -664,9 +687,11 @@ export default {
     padding: 9px 25px 17px 22px;
     height: 60vh;
     position: relative;
+
     &.active {
       height: calc(100vh - 52px);
     }
+
     .full-screen {
       cursor: pointer;
       position: absolute;
@@ -682,6 +707,7 @@ export default {
 
     ::v-deep .el-scrollbar {
       height: 100%;
+
       .el-scrollbar__wrap {
         overflow-x: auto;
       }
@@ -693,6 +719,7 @@ export default {
           img {
             max-width: 100% !important;
           }
+
           table {
             margin: 0 auto;
           }

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;
+  height: 400px;
-  overflow: auto;
+  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 => {
         //基础信息