Merge remote-tracking branch 'origin/master'

@@ -31,6 +31,7 @@
 			:data="tableData"
 			:data="tableData"
 			style="width: 100%"
 			style="width: 100%"
 			@selection-change="handleSelectionChange"
 			@selection-change="handleSelectionChange"
+			@row-dblclick="rowDbclick"
 			border
 			border
 		>
 		>
 			<el-table-column type="selection" width="40" align="center">
 			<el-table-column type="selection" width="40" align="center">
@@ -453,6 +454,15 @@
 				});
 				});
 			}
 			}
 		},
 		},
+		//行双击事件
+		rowDbclick(row){
+			this.dialogVisible = true;
+			this.update=true;
+			this.formData=row;
+			if(row.frList.length>0){
+				this.formData.fr=row.frList[0];
+			}
+		},
 		//删除行数据
 		//删除行数据
 		delRow() {
 		delRow() {
 			if (this.multipleSelection.length > 0) {
 			if (this.multipleSelection.length > 0) {