Merge remote-tracking branch 'origin/master'

src/views/quality/checkTypeProject/MaterialGroupAdd.vue

@@ -25,6 +25,7 @@
           default-expand-all
           highlight-current
           @node-click="handleNodeClick"
+          class="tree-style"
         >
         <span class="custom-tree-node" slot-scope="{ node, data }">
           <span style="width:220px; display:block; word-break:keep-all; white-space:nowrap; overflow:hidden; text-overflow:ellipsis"
@@ -346,4 +347,8 @@ export default {
   font-size: 20px;
   font: bolder;
 }
+.tree-style {
+  height: 500px; /* 设置一个固定高度 */
+  overflow-y: auto; /* 滚动条只在垂直方向显示 */
+}
 </style>

src/views/quality/produceReport/index.vue

@@ -466,7 +466,7 @@
 								</el-table-column>
 								<el-table-column label="附件" align="center" prop="files" width="200">
 									<template slot-scope="scope">
-									    <el-image v-for="(item,index) in scope.row.files" 
+									    <el-image v-for="(item,index) in scope.row.files" :key="index"
 										:src="item.fileAddress" 
 										style="width: 100px; height: 100px" 
 										:fit="fit" />