Merge remote-tracking branch 'origin/master'

@@ -46,11 +46,12 @@
 		<el-dialog
 			title="权利人信息"
 			:visible.sync="dialogVisible"
+			custom-class="insetDialog"
 			append-to-body
 			width="50%"
 			center
 		>
-			<el-form :model="formData">
+			<el-form :model="formData" class="qlrForm">
 				<table class="zdjbxxTable" cellspacing="0" cellpadding="0" border="1">
 					<tr>
 						<td colspan="2">权利人名称<i class="requisite">*</i></td>
@@ -232,7 +233,7 @@
 							</td>
 						</tr>
 <!--						<tr :key="item.dh">-->
-						<tr :key="'dh'+item.index">
+						<tr :key="'dh'+index">
 							<td>证件号码</td>
 							<td colspan="3">
 								<input type="text" class="formInput" v-model="item.zjh" />
@@ -283,12 +284,12 @@
 					</tr>
 				</table>
 			</el-form>
-			<span slot="footer" class="dialog-footer">
+			<div  class="dialog-footer">
 				<el-button type="primary" @click="addNewQlrInfo"
 					>确 定</el-button
 				>
 				<el-button @click="dialogVisible = false">取 消</el-button>
-			</span>
+			</div>
 		</el-dialog>
 	</div>
 </template>
@@ -494,8 +495,8 @@
 				});
 			} else {
 				this.formData.dlrList.forEach((item, index) => {
-					if (index == ind && this.formData.dlr.length > 1) {
-						this.formData.dlr.splice(ind, 1);
+					if (index == ind && this.formData.dlrList.length > 1) {
+						this.formData.dlrList.splice(ind, 1);
 					}
 				});
 			}
@@ -594,6 +595,12 @@
 			text-align: center;
 		}
 	}
+}
+.insetDialog{
+	.qlrForm{
+		height: 500px;
+		overflow-y: scroll;
+	}
     .zdjbxxTable {
         margin: 10px 0;
         background-color: #fff;
@@ -668,5 +675,9 @@
             width: 100%;
         }
 	}
+	.dialog-footer{
+		width: 160px;
+		margin: 20px auto 0;
+	}
 }
 </style>

@@ -375,7 +375,7 @@
 
 <script>
     import Qlr from "./../../../../../components/formMenu/qlr";
-    import Qlxz from "./../../../../../components/formMenu/qlxz";
+    import Qlxz from "./../../../../../components/formMenu/qlxz_simple";
     export default {
         name:'zrz',
         components:{

@@ -324,9 +324,9 @@ export default {
 				// 双击
 				this.hbsm = this.bsms[this.bsms.length-1];
 				this.hbjVisible = true;
-				setTimeout(() => {
+				this.$nextTick(function () {
 					this.$refs.hbj.getHInfo(this.hbsm); 
-				}, 0);
+				})
 			}else{
 				//单击 TO DO