Merge remote-tracking branch 'origin/master'

@@ -7,10 +7,10 @@
 				<td colspan="8">
 					<el-row>
 						<el-col :span="12" class="fl">
-							<el-radio v-model="radio" label="1">单独所有</el-radio>
-							<el-radio v-model="radio" label="2">共同所有</el-radio>
-							<el-radio v-model="radio" label="3">按份共有</el-radio>
-							<el-radio v-model="radio" label="4">其他共有</el-radio>
+							<el-radio v-model="gyfs" label="1">单独所有</el-radio>
+							<el-radio v-model="gyfs" label="2">共同所有</el-radio>
+							<el-radio v-model="gyfs" label="3">按份共有</el-radio>
+							<el-radio v-model="gyfs" label="4">其他共有</el-radio>
 						</el-col>
 						<el-col :span="4" class="fr">
 							<span class="span" @click="addRow">新增</span>
@@ -32,34 +32,16 @@
 			<el-table-column type="selection" width="40" align="center">
 			</el-table-column>
 			<el-table-column prop="qlrmc" label="权利人名称" align="center">
-				<template slot-scope="scope">
-					<el-input size="small" v-model="scope.row.qlrmc"></el-input>
-				</template>
 			</el-table-column>
 			<el-table-column prop="qlrlx" label="权利人类型" align="center">
-				<template slot-scope="scope">
-					<el-input size="small" v-model="scope.row.qlrlx"></el-input>
-				</template>
 			</el-table-column>
 			<el-table-column prop="zjzl" label="证件种类" align="center">
-				<template slot-scope="scope">
-					<el-input size="small" v-model="scope.row.zjzl"></el-input>
-				</template>
 			</el-table-column>
 			<el-table-column prop="zjh" label="证件号" align="center">
-				<template slot-scope="scope">
-					<el-input size="small" v-model="scope.row.zjh"></el-input>
-				</template>
 			</el-table-column>
 			<el-table-column prop="txdz" label="通讯地址" align="center">
-				<template slot-scope="scope">
-					<el-input size="small" v-model="scope.row.txdz"></el-input>
-				</template>
 			</el-table-column>
 			<el-table-column prop="lxdh" label="联系电话" align="center">
-				<template slot-scope="scope">
-					<el-input size="small" v-model="scope.row.lxdh"></el-input>
-				</template>
 			</el-table-column>
 		</el-table>
 		<el-dialog
@@ -259,7 +241,7 @@ export default {
 	},
 	data() {
 		return {
-			radio: "1",
+			gyfs: "1",
 			tableData: [],
 			//表格选中项
 			multipleSelection: {},
@@ -269,7 +251,7 @@ export default {
 				djq: "",
 				djzq: "",
 				qllx: "",
-				zdtzm:"",
+				zdtzm: "",
 				qlsdfs: "",
 				zddm: "",
 				djh: "",
@@ -303,16 +285,38 @@ export default {
 	methods: {
 		//新增行数据
 		addRow() {
-			this.dialogVisible = true;
+			if (this.gyfs == "1") {
+				this.$message({
+					message: "当前共有方式不可新增权利人",
+					type: "warning",
+				});
+			} else {
+				this.dialogVisible = true;
+			}
 		},
 		//修改行数据
 		changeRow() {
-			this.dialogVisible = this.multipleSelection.length == 1 ? true : false;
+			if (this.multipleSelection.length == 1) {
+				this.dialogVisible = true;
+			} else {
+				this.$message({
+					message: "请选择一条信息后继续操作",
+					type: "warning",
+				});
+			}
 		},
 		//删除行数据
 		delRow() {
-			for (var i = 0; i < this.multipleSelection.length; i++) {
-				this.deleteArrOption(this.tableData, this.multipleSelection[i].id);
+			if (this.multipleSelection.length > 0) {
+				for (var i = 0; i < this.multipleSelection.length; i++) {
+					this.deleteArrOption(this.tableData, this.multipleSelection[i].id);
+				}
+				//调用删除接口  TO DO
+			} else {
+				this.$message({
+					message: "请至少选择一条信息后继续操作",
+					type: "warning",
+				});
 			}
 		},
 		//选中表格某一项
@@ -331,7 +335,7 @@ export default {
 
 		//供父组件调用来获取共有方式
 		getQlgyfsData() {
-			return this.radio;
+			return this.gyfs;
 		},
 		//供父组件调用来获取权利人表格数据
 		getQlrxxData() {
@@ -437,13 +441,13 @@ export default {
 			float: left;
 		}
 		.percent68 {
-			width: 68%!important;
+			width: 68% !important;
 			float: left;
 			position: relative;
 			top: 7px;
 		}
 		.percent30 {
-			width: 30%!important;
+			width: 30% !important;
 			float: left;
 		}
 		.createBtn {
@@ -457,7 +461,7 @@ export default {
 			line-height: 37px;
 		}
 		.el-select {
-			width: 100% ;
+			width: 100%;
 		}
 	}
 }