Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem
Showing
2 changed files
with
12 additions
and
3 deletions
| ... | @@ -5,6 +5,7 @@ | ... | @@ -5,6 +5,7 @@ |
| 5 | :visible.sync="isVisible" | 5 | :visible.sync="isVisible" |
| 6 | width="50%" | 6 | width="50%" |
| 7 | @close="close" | 7 | @close="close" |
| 8 | :modal-append-to-body="false" | ||
| 8 | center> | 9 | center> |
| 9 | <div class="search"> | 10 | <div class="search"> |
| 10 | <el-button type="primary" @click="search">查询</el-button> | 11 | <el-button type="primary" @click="search">查询</el-button> |
| ... | @@ -156,6 +157,7 @@ | ... | @@ -156,6 +157,7 @@ |
| 156 | </script> | 157 | </script> |
| 157 | 158 | ||
| 158 | <style scoped lang="less"> | 159 | <style scoped lang="less"> |
| 160 | |||
| 159 | .main { | 161 | .main { |
| 160 | box-sizing: border-box; | 162 | box-sizing: border-box; |
| 161 | padding: 18px; | 163 | padding: 18px; | ... | ... |
| ... | @@ -129,6 +129,7 @@ | ... | @@ -129,6 +129,7 @@ |
| 129 | title="提示" | 129 | title="提示" |
| 130 | :visible.sync="isopenXz" | 130 | :visible.sync="isopenXz" |
| 131 | width="50%" | 131 | width="50%" |
| 132 | :modal-append-to-body="false" | ||
| 132 | center> | 133 | center> |
| 133 | <div class="xz-container"> | 134 | <div class="xz-container"> |
| 134 | <div class="xz-main"> | 135 | <div class="xz-main"> |
| ... | @@ -297,6 +298,7 @@ | ... | @@ -297,6 +298,7 @@ |
| 297 | v-if="fghData.newZdlist.length>0" | 298 | v-if="fghData.newZdlist.length>0" |
| 298 | title="提示" | 299 | title="提示" |
| 299 | :visible.sync="isopenXz" | 300 | :visible.sync="isopenXz" |
| 301 | :modal-append-to-body="false" | ||
| 300 | width="50%" | 302 | width="50%" |
| 301 | center> | 303 | center> |
| 302 | <div class="xz-container"> | 304 | <div class="xz-container"> |
| ... | @@ -466,6 +468,7 @@ | ... | @@ -466,6 +468,7 @@ |
| 466 | v-if="fghData.newZdlist.length>0" | 468 | v-if="fghData.newZdlist.length>0" |
| 467 | title="提示" | 469 | title="提示" |
| 468 | :visible.sync="isopenXz" | 470 | :visible.sync="isopenXz" |
| 471 | :modal-append-to-body="false" | ||
| 469 | width="50%" | 472 | width="50%" |
| 470 | center> | 473 | center> |
| 471 | <div class="xz-container"> | 474 | <div class="xz-container"> |
| ... | @@ -650,7 +653,7 @@ | ... | @@ -650,7 +653,7 @@ |
| 650 | // 用户bsm暂时传空 | 653 | // 用户bsm暂时传空 |
| 651 | this.checkedData.userbsm = '' | 654 | this.checkedData.userbsm = '' |
| 652 | // fwlist 暂时传空 | 655 | // fwlist 暂时传空 |
| 653 | this.checkedData.fwlist = [{zdbsm: '', ztype: ''}] | 656 | this.checkedData.fwlist = [{zbsm: '', ztype: ''}] |
| 654 | }) | 657 | }) |
| 655 | }, | 658 | }, |
| 656 | getzdtzm() { | 659 | getzdtzm() { |
| ... | @@ -719,8 +722,9 @@ | ... | @@ -719,8 +722,9 @@ |
| 719 | } | 722 | } |
| 720 | ] | 723 | ] |
| 721 | }); | 724 | }); |
| 722 | this.fghData.newZdlist[this.fghData.newZdlist.length - 1] = JSON.parse(JSON.stringify(this.checkedData)); | 725 | this.changeXzq(this.checkedData.xzqbsm) |
| 723 | 726 | this.changeDjq(this.checkedData.djqbsm) | |
| 727 | this.$set(this.fghData.newZdlist,this.fghData.newZdlist.length - 1, JSON.parse(JSON.stringify(this.checkedData))) | ||
| 724 | }, | 728 | }, |
| 725 | delRow(index) { | 729 | delRow(index) { |
| 726 | this.fghData.newZdlist.splice(index, 1) | 730 | this.fghData.newZdlist.splice(index, 1) |
| ... | @@ -759,6 +763,9 @@ | ... | @@ -759,6 +763,9 @@ |
| 759 | } | 763 | } |
| 760 | </script> | 764 | </script> |
| 761 | <style scoped lang="less"> | 765 | <style scoped lang="less"> |
| 766 | .v-model{ | ||
| 767 | z-index: 99!important; | ||
| 768 | } | ||
| 762 | .main { | 769 | .main { |
| 763 | box-sizing: border-box; | 770 | box-sizing: border-box; |
| 764 | padding: 18px; | 771 | padding: 18px; | ... | ... |
-
Please register or sign in to post a comment