9eaddfbb by zhaoqian

Merge remote-tracking branch 'origin/master'

2 parents 663be839 41c6af56
...@@ -7,10 +7,10 @@ ...@@ -7,10 +7,10 @@
7 <td colspan="8"> 7 <td colspan="8">
8 <el-row> 8 <el-row>
9 <el-col :span="12" class="fl"> 9 <el-col :span="12" class="fl">
10 <el-radio v-model="radio" label="1">单独所有</el-radio> 10 <el-radio v-model="gyfs" label="1">单独所有</el-radio>
11 <el-radio v-model="radio" label="2">共同所有</el-radio> 11 <el-radio v-model="gyfs" label="2">共同所有</el-radio>
12 <el-radio v-model="radio" label="3">按份共有</el-radio> 12 <el-radio v-model="gyfs" label="3">按份共有</el-radio>
13 <el-radio v-model="radio" label="4">其他共有</el-radio> 13 <el-radio v-model="gyfs" label="4">其他共有</el-radio>
14 </el-col> 14 </el-col>
15 <el-col :span="4" class="fr"> 15 <el-col :span="4" class="fr">
16 <span class="span" @click="addRow">新增</span> 16 <span class="span" @click="addRow">新增</span>
...@@ -32,34 +32,16 @@ ...@@ -32,34 +32,16 @@
32 <el-table-column type="selection" width="40" align="center"> 32 <el-table-column type="selection" width="40" align="center">
33 </el-table-column> 33 </el-table-column>
34 <el-table-column prop="qlrmc" label="权利人名称" align="center"> 34 <el-table-column prop="qlrmc" label="权利人名称" align="center">
35 <template slot-scope="scope">
36 <el-input size="small" v-model="scope.row.qlrmc"></el-input>
37 </template>
38 </el-table-column> 35 </el-table-column>
39 <el-table-column prop="qlrlx" label="权利人类型" align="center"> 36 <el-table-column prop="qlrlx" label="权利人类型" align="center">
40 <template slot-scope="scope">
41 <el-input size="small" v-model="scope.row.qlrlx"></el-input>
42 </template>
43 </el-table-column> 37 </el-table-column>
44 <el-table-column prop="zjzl" label="证件种类" align="center"> 38 <el-table-column prop="zjzl" label="证件种类" align="center">
45 <template slot-scope="scope">
46 <el-input size="small" v-model="scope.row.zjzl"></el-input>
47 </template>
48 </el-table-column> 39 </el-table-column>
49 <el-table-column prop="zjh" label="证件号" align="center"> 40 <el-table-column prop="zjh" label="证件号" align="center">
50 <template slot-scope="scope">
51 <el-input size="small" v-model="scope.row.zjh"></el-input>
52 </template>
53 </el-table-column> 41 </el-table-column>
54 <el-table-column prop="txdz" label="通讯地址" align="center"> 42 <el-table-column prop="txdz" label="通讯地址" align="center">
55 <template slot-scope="scope">
56 <el-input size="small" v-model="scope.row.txdz"></el-input>
57 </template>
58 </el-table-column> 43 </el-table-column>
59 <el-table-column prop="lxdh" label="联系电话" align="center"> 44 <el-table-column prop="lxdh" label="联系电话" align="center">
60 <template slot-scope="scope">
61 <el-input size="small" v-model="scope.row.lxdh"></el-input>
62 </template>
63 </el-table-column> 45 </el-table-column>
64 </el-table> 46 </el-table>
65 <el-dialog 47 <el-dialog
...@@ -259,7 +241,7 @@ export default { ...@@ -259,7 +241,7 @@ export default {
259 }, 241 },
260 data() { 242 data() {
261 return { 243 return {
262 radio: "1", 244 gyfs: "1",
263 tableData: [], 245 tableData: [],
264 //表格选中项 246 //表格选中项
265 multipleSelection: {}, 247 multipleSelection: {},
...@@ -269,7 +251,7 @@ export default { ...@@ -269,7 +251,7 @@ export default {
269 djq: "", 251 djq: "",
270 djzq: "", 252 djzq: "",
271 qllx: "", 253 qllx: "",
272 zdtzm:"", 254 zdtzm: "",
273 qlsdfs: "", 255 qlsdfs: "",
274 zddm: "", 256 zddm: "",
275 djh: "", 257 djh: "",
...@@ -303,17 +285,39 @@ export default { ...@@ -303,17 +285,39 @@ export default {
303 methods: { 285 methods: {
304 //新增行数据 286 //新增行数据
305 addRow() { 287 addRow() {
288 if (this.gyfs == "1") {
289 this.$message({
290 message: "当前共有方式不可新增权利人",
291 type: "warning",
292 });
293 } else {
306 this.dialogVisible = true; 294 this.dialogVisible = true;
295 }
307 }, 296 },
308 //修改行数据 297 //修改行数据
309 changeRow() { 298 changeRow() {
310 this.dialogVisible = this.multipleSelection.length == 1 ? true : false; 299 if (this.multipleSelection.length == 1) {
300 this.dialogVisible = true;
301 } else {
302 this.$message({
303 message: "请选择一条信息后继续操作",
304 type: "warning",
305 });
306 }
311 }, 307 },
312 //删除行数据 308 //删除行数据
313 delRow() { 309 delRow() {
310 if (this.multipleSelection.length > 0) {
314 for (var i = 0; i < this.multipleSelection.length; i++) { 311 for (var i = 0; i < this.multipleSelection.length; i++) {
315 this.deleteArrOption(this.tableData, this.multipleSelection[i].id); 312 this.deleteArrOption(this.tableData, this.multipleSelection[i].id);
316 } 313 }
314 //调用删除接口 TO DO
315 } else {
316 this.$message({
317 message: "请至少选择一条信息后继续操作",
318 type: "warning",
319 });
320 }
317 }, 321 },
318 //选中表格某一项 322 //选中表格某一项
319 handleSelectionChange(val) { 323 handleSelectionChange(val) {
...@@ -331,7 +335,7 @@ export default { ...@@ -331,7 +335,7 @@ export default {
331 335
332 //供父组件调用来获取共有方式 336 //供父组件调用来获取共有方式
333 getQlgyfsData() { 337 getQlgyfsData() {
334 return this.radio; 338 return this.gyfs;
335 }, 339 },
336 //供父组件调用来获取权利人表格数据 340 //供父组件调用来获取权利人表格数据
337 getQlrxxData() { 341 getQlrxxData() {
...@@ -437,13 +441,13 @@ export default { ...@@ -437,13 +441,13 @@ export default {
437 float: left; 441 float: left;
438 } 442 }
439 .percent68 { 443 .percent68 {
440 width: 68%!important; 444 width: 68% !important;
441 float: left; 445 float: left;
442 position: relative; 446 position: relative;
443 top: 7px; 447 top: 7px;
444 } 448 }
445 .percent30 { 449 .percent30 {
446 width: 30%!important; 450 width: 30% !important;
447 float: left; 451 float: left;
448 } 452 }
449 .createBtn { 453 .createBtn {
...@@ -457,7 +461,7 @@ export default { ...@@ -457,7 +461,7 @@ export default {
457 line-height: 37px; 461 line-height: 37px;
458 } 462 }
459 .el-select { 463 .el-select {
460 width: 100% ; 464 width: 100%;
461 } 465 }
462 } 466 }
463 } 467 }
......