Merge remote-tracking branch 'origin/develop' into develop

src/components/treeSelect/treeSelectNew.vue

@@ -321,7 +321,7 @@
 //  }
 //}
 .common-tree{
-    height: 100%;
+    height: 87%;
     overflow-y: auto;
 }
 </style>

src/pages/processCenter/pages/creatProcess/bzrk/step3.vue

@@ -268,7 +268,7 @@
             <el-row :gutter="24">
               <el-col :span="12">
                 <el-form-item v-if="form.standInData === '0'" label="修改单" prop="xgdName" class="add-form-item form-item-disabled">
-                  <div  v-if="xgdFileMap.length>0" v-for="(value,index)  in this.xgdFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
+                  <div v-if="xgdFileMap.length>0 && xgdFileMap[0].id" v-for="(value,index)  in this.xgdFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
                     <span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name  }}</span>
                   </div>
                   <div v-else>
@@ -825,6 +825,7 @@ export default {
       submitType: '',
       xgdFileMap: [],
       fbgbjbdFileMap: [],
+      fbgywbdFileMap: [],
       bpgFileMap: [],
       ssgFileMap: [],
       zqyjgFileMap: [],
@@ -1141,8 +1142,8 @@ export default {
 
 
       this.xgdFileMap=this.assemble(processForm.xgd,processForm.xgdName);
-
       this.fbgbjbdFileMap=this.assemble(processForm.fbgbjbd,processForm.fbgbjbdName);
+      this.fbgywbdFileMap=this.assemble(processForm.fbgywbd,processForm.fbgywbdName);
       // fbgbjbdFileMap: {},
       this.bpgFileMap=this.assemble(processForm.bpg,processForm.bpgName);
       // bpgFileMap: {},

src/pages/regulatoryRepository/dataCenter/dataCenterDetail.vue

@@ -252,7 +252,8 @@ export default {
     padding: 0 10% 0 10%;
     background: #ffffff;
     font-size: 16px;
-
+    height: 84%;
+    overflow-y: auto;
     .transition-box-p {
       line-height: 50px;
       border-bottom: 1px solid #E5E5E5;
@@ -266,6 +267,8 @@ export default {
         display: inline-block;
         color: #7e8083;
         width: calc(~'100% - 100px');
+        overflow-y: auto;
+        overflow-y: auto;
         word-break: break-all;
         white-space: pre-wrap;
       }