Merge remote-tracking branch 'origin/master'
Showing
3 changed files
with
94 additions
and
83 deletions
| ... | @@ -46,11 +46,12 @@ | ... | @@ -46,11 +46,12 @@ |
| 46 | <el-dialog | 46 | <el-dialog |
| 47 | title="权利人信息" | 47 | title="权利人信息" |
| 48 | :visible.sync="dialogVisible" | 48 | :visible.sync="dialogVisible" |
| 49 | custom-class="insetDialog" | ||
| 49 | append-to-body | 50 | append-to-body |
| 50 | width="50%" | 51 | width="50%" |
| 51 | center | 52 | center |
| 52 | > | 53 | > |
| 53 | <el-form :model="formData"> | 54 | <el-form :model="formData" class="qlrForm"> |
| 54 | <table class="zdjbxxTable" cellspacing="0" cellpadding="0" border="1"> | 55 | <table class="zdjbxxTable" cellspacing="0" cellpadding="0" border="1"> |
| 55 | <tr> | 56 | <tr> |
| 56 | <td colspan="2">权利人名称<i class="requisite">*</i></td> | 57 | <td colspan="2">权利人名称<i class="requisite">*</i></td> |
| ... | @@ -232,7 +233,7 @@ | ... | @@ -232,7 +233,7 @@ |
| 232 | </td> | 233 | </td> |
| 233 | </tr> | 234 | </tr> |
| 234 | <!-- <tr :key="item.dh">--> | 235 | <!-- <tr :key="item.dh">--> |
| 235 | <tr :key="'dh'+item.index"> | 236 | <tr :key="'dh'+index"> |
| 236 | <td>证件号码</td> | 237 | <td>证件号码</td> |
| 237 | <td colspan="3"> | 238 | <td colspan="3"> |
| 238 | <input type="text" class="formInput" v-model="item.zjh" /> | 239 | <input type="text" class="formInput" v-model="item.zjh" /> |
| ... | @@ -283,12 +284,12 @@ | ... | @@ -283,12 +284,12 @@ |
| 283 | </tr> | 284 | </tr> |
| 284 | </table> | 285 | </table> |
| 285 | </el-form> | 286 | </el-form> |
| 286 | <span slot="footer" class="dialog-footer"> | 287 | <div class="dialog-footer"> |
| 287 | <el-button type="primary" @click="addNewQlrInfo" | 288 | <el-button type="primary" @click="addNewQlrInfo" |
| 288 | >确 定</el-button | 289 | >确 定</el-button |
| 289 | > | 290 | > |
| 290 | <el-button @click="dialogVisible = false">取 消</el-button> | 291 | <el-button @click="dialogVisible = false">取 消</el-button> |
| 291 | </span> | 292 | </div> |
| 292 | </el-dialog> | 293 | </el-dialog> |
| 293 | </div> | 294 | </div> |
| 294 | </template> | 295 | </template> |
| ... | @@ -494,8 +495,8 @@ | ... | @@ -494,8 +495,8 @@ |
| 494 | }); | 495 | }); |
| 495 | } else { | 496 | } else { |
| 496 | this.formData.dlrList.forEach((item, index) => { | 497 | this.formData.dlrList.forEach((item, index) => { |
| 497 | if (index == ind && this.formData.dlr.length > 1) { | 498 | if (index == ind && this.formData.dlrList.length > 1) { |
| 498 | this.formData.dlr.splice(ind, 1); | 499 | this.formData.dlrList.splice(ind, 1); |
| 499 | } | 500 | } |
| 500 | }); | 501 | }); |
| 501 | } | 502 | } |
| ... | @@ -525,7 +526,7 @@ | ... | @@ -525,7 +526,7 @@ |
| 525 | }, | 526 | }, |
| 526 | }; | 527 | }; |
| 527 | </script> | 528 | </script> |
| 528 | <style lang="less"> | 529 | <style lang="less"> |
| 529 | .temp { | 530 | .temp { |
| 530 | width: 100%; | 531 | width: 100%; |
| 531 | table { | 532 | table { |
| ... | @@ -594,79 +595,89 @@ | ... | @@ -594,79 +595,89 @@ |
| 594 | text-align: center; | 595 | text-align: center; |
| 595 | } | 596 | } |
| 596 | } | 597 | } |
| 597 | .zdjbxxTable { | 598 | } |
| 598 | margin: 10px 0; | 599 | .insetDialog{ |
| 599 | background-color: #fff; | 600 | .qlrForm{ |
| 600 | font-size: 14px; | 601 | height: 500px; |
| 601 | width: 100%; | 602 | overflow-y: scroll; |
| 602 | border-bottom: 1px solid #000; | 603 | } |
| 604 | .zdjbxxTable { | ||
| 605 | margin: 10px 0; | ||
| 606 | background-color: #fff; | ||
| 607 | font-size: 14px; | ||
| 608 | width: 100%; | ||
| 609 | border-bottom: 1px solid #000; | ||
| 603 | 610 | ||
| 604 | .btnCol { | 611 | .btnCol { |
| 605 | position: relative; | 612 | position: relative; |
| 606 | width: 60px; | 613 | width: 60px; |
| 607 | .changeBtn { | 614 | .changeBtn { |
| 608 | width: 30px; | 615 | width: 30px; |
| 609 | height: 30px; | 616 | height: 30px; |
| 610 | font-size: 25px; | 617 | font-size: 25px; |
| 611 | padding: 0px 0px; | 618 | padding: 0px 0px; |
| 612 | position: absolute; | 619 | position: absolute; |
| 613 | top: 50%; | 620 | top: 50%; |
| 614 | left: 50%; | 621 | left: 50%; |
| 615 | margin-top: -32px; | 622 | margin-top: -32px; |
| 616 | margin-left: -15px; | 623 | margin-left: -15px; |
| 617 | } | 624 | } |
| 618 | .el-button + .el-button { | 625 | .el-button + .el-button { |
| 619 | margin-left: -15px; | 626 | margin-left: -15px; |
| 620 | margin-top: 2px; | 627 | margin-top: 2px; |
| 621 | } | 628 | } |
| 622 | } | 629 | } |
| 623 | th { | 630 | th { |
| 624 | height: 36px; | 631 | height: 36px; |
| 625 | line-height: 36px; | 632 | line-height: 36px; |
| 626 | font-size: 16px; | 633 | font-size: 16px; |
| 627 | } | 634 | } |
| 628 | td { | 635 | td { |
| 629 | text-align: center; | 636 | text-align: center; |
| 630 | height: 36px; | 637 | height: 36px; |
| 631 | padding: 0; | 638 | padding: 0; |
| 632 | } | 639 | } |
| 633 | /deep/.el-input__inner { | 640 | /deep/.el-input__inner { |
| 634 | margin: 0; | 641 | margin: 0; |
| 635 | height: 36px; | 642 | height: 36px; |
| 636 | outline: none; | 643 | outline: none; |
| 637 | border: none; | 644 | border: none; |
| 638 | color: #606764; | 645 | color: #606764; |
| 639 | overflow: visible; | 646 | overflow: visible; |
| 640 | text-align: center; | 647 | text-align: center; |
| 641 | cursor: text; | 648 | cursor: text; |
| 642 | } | 649 | } |
| 643 | .percent78 { | 650 | .percent78 { |
| 644 | width: 78%; | 651 | width: 78%; |
| 645 | float: left; | 652 | float: left; |
| 646 | } | 653 | } |
| 647 | .percent68 { | 654 | .percent68 { |
| 648 | width: 68% !important; | 655 | width: 68% !important; |
| 649 | float: left; | 656 | float: left; |
| 650 | position: relative; | 657 | position: relative; |
| 651 | top: 7px; | 658 | top: 7px; |
| 652 | } | 659 | } |
| 653 | .percent30 { | 660 | .percent30 { |
| 654 | width: 30% !important; | 661 | width: 30% !important; |
| 655 | float: left; | 662 | float: left; |
| 656 | } | 663 | } |
| 657 | .createBtn { | 664 | .createBtn { |
| 658 | position: absolute; | 665 | position: absolute; |
| 659 | width: 50px; | 666 | width: 50px; |
| 660 | padding: 6px 4px; | 667 | padding: 6px 4px; |
| 661 | right: 4px; | 668 | right: 4px; |
| 662 | top: 4px; | 669 | top: 4px; |
| 663 | } | 670 | } |
| 664 | .el-input__icon { | 671 | .el-input__icon { |
| 665 | line-height: 37px; | 672 | line-height: 37px; |
| 666 | } | 673 | } |
| 667 | .el-select { | 674 | .el-select { |
| 668 | width: 100%; | 675 | width: 100%; |
| 669 | } | 676 | } |
| 677 | } | ||
| 678 | .dialog-footer{ | ||
| 679 | width: 160px; | ||
| 680 | margin: 20px auto 0; | ||
| 670 | } | 681 | } |
| 671 | } | 682 | } |
| 672 | </style> | 683 | </style> | ... | ... |
| ... | @@ -375,7 +375,7 @@ | ... | @@ -375,7 +375,7 @@ |
| 375 | 375 | ||
| 376 | <script> | 376 | <script> |
| 377 | import Qlr from "./../../../../../components/formMenu/qlr"; | 377 | import Qlr from "./../../../../../components/formMenu/qlr"; |
| 378 | import Qlxz from "./../../../../../components/formMenu/qlxz"; | 378 | import Qlxz from "./../../../../../components/formMenu/qlxz_simple"; |
| 379 | export default { | 379 | export default { |
| 380 | name:'zrz', | 380 | name:'zrz', |
| 381 | components:{ | 381 | components:{ | ... | ... |
| ... | @@ -324,9 +324,9 @@ export default { | ... | @@ -324,9 +324,9 @@ export default { |
| 324 | // 双击 | 324 | // 双击 |
| 325 | this.hbsm = this.bsms[this.bsms.length-1]; | 325 | this.hbsm = this.bsms[this.bsms.length-1]; |
| 326 | this.hbjVisible = true; | 326 | this.hbjVisible = true; |
| 327 | setTimeout(() => { | 327 | this.$nextTick(function () { |
| 328 | this.$refs.hbj.getHInfo(this.hbsm); | 328 | this.$refs.hbj.getHInfo(this.hbsm); |
| 329 | }, 0); | 329 | }) |
| 330 | }else{ | 330 | }else{ |
| 331 | //单击 TO DO | 331 | //单击 TO DO |
| 332 | 332 | ... | ... |
-
Please register or sign in to post a comment