Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
e87e646e by zhaoqian
Options

Merge remote-tracking branch 'origin/master'

2 parents e31004b5 4fd24016
Inline Side-by-side
Showing 25 changed files with 794 additions and 327 deletions
...@@ -44,13 +44,13 @@ export function insertChInfo (data) { ...@@ -44,13 +44,13 @@ export function insertChInfo (data) {
44 /** 44 /**
45 * 查询楼盘表数据 45 * 查询楼盘表数据
46 */ 46 */
47 export function getLpb (data) { 47 export function getLpb (data,lx) {
48 return request({ 48 return request({
49 url: 'fw/lpb/getLpb', 49 url: 'fw/lpb/getLpb',
50 method: 'get', 50 method: 'get',
51 params: { 51 params: {
52 zrzbsm:data, 52 zrzbsm:data,
53 syclx:0, 53 syclx:lx,
54 }, 54 },
55 }) 55 })
56 } 56 }
......
...@@ -157,3 +157,52 @@ ol, ul { list-style:none; } ...@@ -157,3 +157,52 @@ ol, ul { list-style:none; }
157 background: #eee; 157 background: #eee;
158 } 158 }
159 // end 159 // end
160 //生成按钮样式
161 .el-button--warning{
162 color: #FFF;
163 background-color: #F79700;
164 border-color: #F79700;
165 }
166 .el-button--warning:focus, .el-button--warning:hover{
167 background-color: rgba(247, 151, 0,.7);
168 border-color: rgba(247, 151, 0,.7);
169 }
170 .percent80{
171 width: 78%;
172 float: left;
173 }
174 .createBtn{
175 position: absolute;
176 width: 50px;
177 padding: 6px 0px;
178 right: 6px;
179 top: 4px;
180 }
181 // 增删操作按钮样式
182 .addMinus{
183 border-radius:50%;
184 width: 30px !important;
185 height: 30px !important;
186 font-size: 22px!important;
187 padding: 4px 6px;
188 }
189 .outAdd,.outAdd:hover:focus{
190 background-color: #2FA5FF!important;
191 border: 1px solid #2FA5FF!important;
192 color: #fff!important;
193 }
194 .inAdd,.inAdd:hover:focus{
195 border: 1px solid #2FA5FF!important;
196 background-color: #fff!important;
197 color: #2FA5FF!important;
198 }
199 .outMinus,.outMinus:hover:focus{
200 background-color: #FA6400!important;
201 border: 1px solid #FA6400!important;
202 color: #fff!important;
203 }
204 .inMinus,.inMinus:hover:focus{
205 border: 1px solid #FA6400!important;
206 background-color: #fff!important;
207 color: #FA6400!important;
208 }
...\ No newline at end of file ...\ No newline at end of file
......

878 Bytes | W: | H:

1.34 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
...@@ -210,13 +210,13 @@ ...@@ -210,13 +210,13 @@
210 <td rowspan="2" class="btnCol"> 210 <td rowspan="2" class="btnCol">
211 <el-button 211 <el-button
212 type="primary" 212 type="primary"
213 class="changeBtn" 213 class="changeBtn outAdd addMinus"
214 @click="handleClick(item, index, 'add')" 214 @click="handleClick(item, index, 'add')"
215 >+</el-button 215 >+</el-button
216 > 216 >
217 <el-button 217 <el-button
218 type="primary" 218 type="primary"
219 class="changeBtn" 219 class="changeBtn outMinus addMinus"
220 @click="handleClick(item, index, 'minus')" 220 @click="handleClick(item, index, 'minus')"
221 >-</el-button 221 >-</el-button
222 > 222 >
...@@ -671,10 +671,6 @@ ...@@ -671,10 +671,6 @@
671 text-align: center; 671 text-align: center;
672 cursor: text; 672 cursor: text;
673 } 673 }
674 .percent78 {
675 width: 78%;
676 float: left;
677 }
678 .percent68 { 674 .percent68 {
679 width: 68% !important; 675 width: 68% !important;
680 float: left; 676 float: left;
...@@ -685,13 +681,6 @@ ...@@ -685,13 +681,6 @@
685 width: 30% !important; 681 width: 30% !important;
686 float: left; 682 float: left;
687 } 683 }
688 .createBtn {
689 position: absolute;
690 width: 50px;
691 padding: 6px 4px;
692 right: 4px;
693 top: 4px;
694 }
695 .el-input__icon { 684 .el-input__icon {
696 line-height: 37px; 685 line-height: 37px;
697 } 686 }
......
...@@ -15,14 +15,14 @@ ...@@ -15,14 +15,14 @@
15 <el-button 15 <el-button
16 v-show="childIndex < 1" 16 v-show="childIndex < 1"
17 type="primary" 17 type="primary"
18 class="changeBtn" 18 class="changeBtn addMinus outAdd"
19 @click="handleClick(index, 'add')" 19 @click="handleClick(index, 'add')"
20 >+</el-button 20 >+</el-button
21 > 21 >
22 <el-button 22 <el-button
23 v-show="childIndex < 1" 23 v-show="childIndex < 1"
24 type="primary" 24 type="primary"
25 class="changeBtn" 25 class="changeBtn addMinus outMinus"
26 @click="handleClick(index, 'minus')" 26 @click="handleClick(index, 'minus')"
27 >-</el-button 27 >-</el-button
28 > 28 >
...@@ -41,13 +41,13 @@ ...@@ -41,13 +41,13 @@
41 <span class="qlxz" v-show="childIndex < 1">权利性质</span><br /> 41 <span class="qlxz" v-show="childIndex < 1">权利性质</span><br />
42 <el-button 42 <el-button
43 type="primary" 43 type="primary"
44 class="changeBtn" 44 class="changeBtn addMinus inAdd"
45 @click="handleInClick(index, childIndex, 'add')" 45 @click="handleInClick(index, childIndex, 'add')"
46 >+</el-button 46 >+</el-button
47 > 47 >
48 <el-button 48 <el-button
49 type="primary" 49 type="primary"
50 class="changeBtn" 50 class="changeBtn addMinus inMinus"
51 @click="handleInClick(index, childIndex, 'minus')" 51 @click="handleInClick(index, childIndex, 'minus')"
52 >-</el-button 52 >-</el-button
53 > 53 >
...@@ -398,7 +398,7 @@ export default { ...@@ -398,7 +398,7 @@ export default {
398 .qlxzModule { 398 .qlxzModule {
399 height: auto; 399 height: auto;
400 position: relative; 400 position: relative;
401 border-bottom: 1px solid grey; 401 border-bottom: 1px solid #E6E6E6;
402 .el-col { 402 .el-col {
403 // height: 100%; 403 // height: 100%;
404 border-right: 1px solid grey; 404 border-right: 1px solid grey;
......
...@@ -289,7 +289,7 @@ export default { ...@@ -289,7 +289,7 @@ export default {
289 .qlxzModule { 289 .qlxzModule {
290 height: auto; 290 height: auto;
291 position: relative; 291 position: relative;
292 border-bottom: 1px solid grey; 292 border-bottom: 1px solid #E6E6E6;
293 .el-col { 293 .el-col {
294 // height: 100%; 294 // height: 100%;
295 border-right: 1px solid grey; 295 border-right: 1px solid grey;
......
...@@ -101,12 +101,16 @@ ...@@ -101,12 +101,16 @@
101 } 101 }
102 }, 102 },
103 methods: { 103 methods: {
104 lodding:function(){
105 this.$emit('lodding')
106 },
104 save: function () { 107 save: function () {
105 this.qlcData['bsms'] = this.bsms 108 this.qlcData['bsms'] = this.bsms
106 updatePlc(this.qlcData).then(res => { 109 updatePlc(this.qlcData).then(res => {
107 console.log(res) 110 console.log(res)
108 if (res.success) { 111 if (res.success) {
109 Message.success("保存成功") 112 Message.success("保存成功")
113 this.lodding()
110 this.close() 114 this.close()
111 } else { 115 } else {
112 Message.error(res.message) 116 Message.error(res.message)
......
...@@ -313,6 +313,9 @@ ...@@ -313,6 +313,9 @@
313 } 313 }
314 }, 314 },
315 methods: { 315 methods: {
316 lodding:function(){
317 this.$emit('lodding')
318 },
316 addYtInfo(){ 319 addYtInfo(){
317 this.form.fwytList.push({ 320 this.form.fwytList.push({
318 glbsm:'', 321 glbsm:'',
...@@ -367,6 +370,7 @@ ...@@ -367,6 +370,7 @@
367 console.log(this.form) 370 console.log(this.form)
368 batchUpdateQjH(this.form).then((res)=>{ 371 batchUpdateQjH(this.form).then((res)=>{
369 if(res.code===200){ 372 if(res.code===200){
373 this.lodding()
370 this.$message.success("保存成功！") 374 this.$message.success("保存成功！")
371 } 375 }
372 }) 376 })
......
...@@ -25,13 +25,13 @@ ...@@ -25,13 +25,13 @@
25 <input type="text" class="inputtitle" v-model="plshData.shqz"/> 25 <input type="text" class="inputtitle" v-model="plshData.shqz"/>
26 </td> 26 </td>
27 <td> 27 <td>
28 <el-checkbox v-model="plshData.isSelectDyh"></el-checkbox> 28 <el-checkbox v-model="plshData.selectDyh"></el-checkbox>
29 </td> 29 </td>
30 <td> 30 <td>
31 <input type="text" class="inputtitle" v-model="plshData.fgfA"/> 31 <input type="text" class="inputtitle" v-model="plshData.fgfA"/>
32 </td> 32 </td>
33 <td> 33 <td>
34 <el-checkbox v-model="plshData.isChqbl"></el-checkbox> 34 <el-checkbox v-model="plshData.chqbl"></el-checkbox>
35 </td> 35 </td>
36 <td> 36 <td>
37 <el-select v-model="plshData.c"> 37 <el-select v-model="plshData.c">
...@@ -112,9 +112,9 @@ ...@@ -112,9 +112,9 @@
112 xlVisible: false, 112 xlVisible: false,
113 plshData: { 113 plshData: {
114 shqz: '', 114 shqz: '',
115 isSelectDyh: false, 115 selectDyh: false,
116 fgfA: '', 116 fgfA: '',
117 isChqbl: false, 117 chqbl: false,
118 c: '', 118 c: '',
119 fgfB: '', 119 fgfB: '',
120 shhz: '' 120 shhz: ''
...@@ -133,6 +133,9 @@ ...@@ -133,6 +133,9 @@
133 } 133 }
134 }, 134 },
135 methods: { 135 methods: {
136 lodding:function(){
137 this.$emit('lodding')
138 },
136 xl: function () { 139 xl: function () {
137 this.xlVisible = true; 140 this.xlVisible = true;
138 }, 141 },
...@@ -144,9 +147,9 @@ ...@@ -144,9 +147,9 @@
144 result: function () { 147 result: function () {
145 this.plshData = { 148 this.plshData = {
146 shqz: '', 149 shqz: '',
147 isSelectDyh: false, 150 selectDyh: false,
148 fgfA: '', 151 fgfA: '',
149 isChqbl: false, 152 chqbl: false,
150 c: '', 153 c: '',
151 fgfB: '', 154 fgfB: '',
152 shhz: '' 155 shhz: ''
...@@ -154,10 +157,11 @@ ...@@ -154,10 +157,11 @@
154 }, 157 },
155 save: function () { 158 save: function () {
156 this.plshData['bsms'] = this.bsms 159 this.plshData['bsms'] = this.bsms
157 console.log(this.plshData)
158 updateSh(this.plshData).then(res => { 160 updateSh(this.plshData).then(res => {
159 if (res.success) { 161 if (res.success) {
162 this.lodding();
160 this.close(); 163 this.close();
164
161 } else { 165 } else {
162 Message.error(res.message) 166 Message.error(res.message)
163 } 167 }
...@@ -173,7 +177,7 @@ ...@@ -173,7 +177,7 @@
173 if (this.plshData.shqz != "") { 177 if (this.plshData.shqz != "") {
174 gz += this.plshData.shqz 178 gz += this.plshData.shqz
175 } 179 }
176 if (this.plshData.isSelectDyh) { 180 if (this.plshData.selectDyh) {
177 gz += "[单元号]" 181 gz += "[单元号]"
178 } 182 }
179 if (this.plshData.fgfA != "") { 183 if (this.plshData.fgfA != "") {
......
...@@ -196,10 +196,14 @@ ...@@ -196,10 +196,14 @@
196 } 196 }
197 }, 197 },
198 methods: { 198 methods: {
199 lodding:function(){
200 this.$emit('lodding')
201 },
199 save: function () { 202 save: function () {
200 this.plzlData['bsms'] = this.bsms; 203 this.plzlData['bsms'] = this.bsms;
201 updateZl(this.plzlData).then(res => { 204 updateZl(this.plzlData).then(res => {
202 if (res.success) { 205 if (res.success) {
206 this.lodding()
203 this.close(); 207 this.close();
204 } else { 208 } else {
205 Message.error(res.message) 209 Message.error(res.message)
......
...@@ -398,7 +398,7 @@ export default { ...@@ -398,7 +398,7 @@ export default {
398 color: #006cff; 398 color: #006cff;
399 border-left: 1px solid #EAEAEA; 399 border-left: 1px solid #EAEAEA;
400 border-right: 1px solid #EAEAEA; 400 border-right: 1px solid #EAEAEA;
401 height: 59px; 401 height: 58px;
402 border-bottom: 1px solid #FFF; 402 border-bottom: 1px solid #FFF;
403 } 403 }
404 } 404 }
......
...@@ -10,22 +10,22 @@ ...@@ -10,22 +10,22 @@
10 <tr height="30"> 10 <tr height="30">
11 <td colspan="2" align="center" >宗地代码</td> 11 <td colspan="2" align="center" >宗地代码</td>
12 <td colspan="4" > 12 <td colspan="4" >
13 <el-input v-model="form.zddm"></el-input> 13 <input class="formInput" v-model="form.zddm">
14 </td> 14 </td>
15 <td colspan="2" align="center" >不动产单元号</td> 15 <td colspan="2" align="center" >不动产单元号</td>
16 <td colspan="4" > 16 <td colspan="4" class="psr">
17 <el-input v-model="form.bdcdyh" style="width: 70%"></el-input> 17 <input class="formInput percent80" v-model="form.bdcdyh">
18 <el-button @click.prevent="generatorCode" size="mini" type="primary" style="width:25%;margin-left:3%">生成</el-button> 18 <el-button @click.prevent="generatorCode" size="mini" class="createBtn" type="warning">生成</el-button>
19 </td> 19 </td>
20 </tr> 20 </tr>
21 <tr height="30"> 21 <tr height="30">
22 <td colspan="2" align="center" >项目名称</td> 22 <td colspan="2" align="center" >项目名称</td>
23 <td colspan="4" > 23 <td colspan="4" >
24 <el-input v-model="form.xmmc"></el-input> 24 <input class="formInput" v-model="form.xmmc">
25 </td> 25 </td>
26 <td colspan="2" align="center" >房屋性质</td> 26 <td colspan="2" align="center" >房屋性质</td>
27 <td colspan="4" > 27 <td colspan="4" >
28 <el-select v-model="form.fwxzbsm" placeholder="请选择" > 28 <el-select class="formSelect" v-model="form.fwxzbsm" placeholder="请选择" >
29 <el-option 29 <el-option
30 v-for="item in $store.state.fwxzOptions" 30 v-for="item in $store.state.fwxzOptions"
31 :key="item.bsm" 31 :key="item.bsm"
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
39 <tr height="30"> 39 <tr height="30">
40 <td colspan="2" align="center" >房屋类型</td> 40 <td colspan="2" align="center" >房屋类型</td>
41 <td colspan="4" > 41 <td colspan="4" >
42 <el-select v-model="form.fwlxbsm" placeholder="请选择" > 42 <el-select class="formSelect" v-model="form.fwlxbsm" placeholder="请选择" >
43 <el-option 43 <el-option
44 v-for="item in $store.state.fwlxList" 44 v-for="item in $store.state.fwlxList"
45 :key="item.bsm" 45 :key="item.bsm"
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
61 <tr height="30"> 61 <tr height="30">
62 <td colspan="2" align="center" >产别</td> 62 <td colspan="2" align="center" >产别</td>
63 <td colspan="4" > 63 <td colspan="4" >
64 <el-select v-model="form.fwcbbsm" placeholder="请选择" > 64 <el-select class="formSelect" v-model="form.fwcbbsm" placeholder="请选择" >
65 <el-option 65 <el-option
66 v-for="item in $store.state.cbOptions" 66 v-for="item in $store.state.cbOptions"
67 :key="item.bsm" 67 :key="item.bsm"
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
72 </td> 72 </td>
73 <td colspan="2" align="center" >产权来源</td> 73 <td colspan="2" align="center" >产权来源</td>
74 <td colspan="4" > 74 <td colspan="4" >
75 <el-select v-model="form.fwcqlybsm" placeholder="请选择" > 75 <el-select class="formSelect" v-model="form.fwcqlybsm" placeholder="请选择" >
76 <el-option 76 <el-option
77 v-for="item in $store.state.cqlyOptions" 77 v-for="item in $store.state.cqlyOptions"
78 :key="item.bsm" 78 :key="item.bsm"
...@@ -127,26 +127,23 @@ ...@@ -127,26 +127,23 @@
127 <tr height="30"> 127 <tr height="30">
128 <td colspan="2" align="center" >共有土地面积（㎡）</td> 128 <td colspan="2" align="center" >共有土地面积（㎡）</td>
129 <td colspan="2" > 129 <td colspan="2" >
130 <el-input v-model="form.zdmj"></el-input> 130 <input class="formInput" v-model="form.zdmj">
131 </td> 131 </td>
132 <td colspan="2" align="center" >分摊土地面积（㎡）</td> 132 <td colspan="2" align="center" >分摊土地面积（㎡）</td>
133 <td colspan="2" > 133 <td colspan="2" >
134 <el-input v-model="form.fttdsymj"></el-input> 134 <input class="formInput" v-model="form.fttdsymj">
135 </td> 135 </td>
136 <td colspan="2" align="center" >多幢独用土地面积（㎡）</td> 136 <td colspan="2" align="center" >多幢独用土地面积（㎡）</td>
137 <td colspan="2" > 137 <td colspan="2" >
138 <el-input v-model="form.dlsytdmj"></el-input> 138 <input class="formInput" v-model="form.dlsytdmj">
139 </td> 139 </td>
140 </tr> 140 </tr>
141 141
142 <tr> 142 <tr>
143 <td colspan="12" rowspan="4" align="center"> 143 <td colspan="12" align="center">
144 <Qlxz ref="qlxzModule"></Qlxz> 144 <Qlxz ref="qlxzModule" :formData="form"></Qlxz>
145 </td> 145 </td>
146 </tr> 146 </tr>
147 <tr></tr>
148 <tr></tr>
149 <tr></tr>
150 147
151 148
152 <tr height="30"> 149 <tr height="30">
...@@ -154,7 +151,7 @@ ...@@ -154,7 +151,7 @@
154 <span>坐落</span> 151 <span>坐落</span>
155 </td> 152 </td>
156 <td colspan="10" > 153 <td colspan="10" >
157 <el-input v-model="form.zl"></el-input> 154 <input class="formInput" v-model="form.zl">
158 </td> 155 </td>
159 </tr> 156 </tr>
160 157
...@@ -163,7 +160,7 @@ ...@@ -163,7 +160,7 @@
163 <span>附加说明</span> 160 <span>附加说明</span>
164 </td> 161 </td>
165 <td colspan="10" rowspan="2" > 162 <td colspan="10" rowspan="2" >
166 <el-input v-model="form.bz" type="textarea"></el-input> 163 <input class="formInput" v-model="form.bz" type="textarea">
167 </td> 164 </td>
168 </tr> 165 </tr>
169 <tr height="30"> 166 <tr height="30">
...@@ -174,7 +171,7 @@ ...@@ -174,7 +171,7 @@
174 <span>调查意见</span> 171 <span>调查意见</span>
175 </td> 172 </td>
176 <td colspan="10" > 173 <td colspan="10" >
177 <el-input v-model="form.name"></el-input> 174 <input class="formInput" v-model="form.name">
178 </td> 175 </td>
179 </tr> 176 </tr>
180 177
...@@ -183,7 +180,7 @@ ...@@ -183,7 +180,7 @@
183 <span>审查员</span> 180 <span>审查员</span>
184 </td> 181 </td>
185 <td colspan="2" > 182 <td colspan="2" >
186 <el-input v-model="form.name"></el-input> 183 <input class="formInput" v-model="form.name">
187 </td> 184 </td>
188 <td colspan="2" rowspan="2" align="right" style="width:8.33%;padding-right:10px"> 185 <td colspan="2" rowspan="2" align="right" style="width:8.33%;padding-right:10px">
189 <span>审查日期</span> 186 <span>审查日期</span>
...@@ -481,10 +478,6 @@ ...@@ -481,10 +478,6 @@
481 box-sizing: border-box; 478 box-sizing: border-box;
482 padding: 18px; 479 padding: 18px;
483 padding-bottom: 0; 480 padding-bottom: 0;
484 /deep/.el-input__inner{
485 width: 100%;
486 border: 0;
487 }
488 481
489 /deep/textarea{ 482 /deep/textarea{
490 width: 100%; 483 width: 100%;
...@@ -503,13 +496,12 @@ ...@@ -503,13 +496,12 @@
503 } 496 }
504 497
505 td{ 498 td{
506 //bgcolor:#F1F4FC; 499 height: 36px;
507 bgcolor:#fff; 500 width:8.33%;
508 width:8.33%
509 } 501 }
510 502
511 .el-select{ 503 .el-select{
512 display:block; 504 width: 100%;
513 } 505 }
514 506
515 table{ 507 table{
...@@ -518,6 +510,15 @@ ...@@ -518,6 +510,15 @@
518 510
519 .dzTable{ 511 .dzTable{
520 margin-top: 10px; 512 margin-top: 10px;
513 /deep/.el-input__inner {
514 margin: 0;
515 height: 36px;
516 outline: none;
517 border: none;
518 color: #606764;
519 overflow: visible;
520 text-align: center;
521 }
521 } 522 }
522 } 523 }
523 </style> 524 </style>
...\ No newline at end of file ...\ No newline at end of file
......
1 <template> 1 <template>
2 <div class="main"> 2 <div class="main">
3 <div class="search"> 3 <div class="search">
4 <el-row>
5 <el-col :span="24">
6 <el-form :inline="true" class="demo-form-inline"> 4 <el-form :inline="true" class="demo-form-inline">
5 <el-row>
6 <el-col :span="8">
7 <el-form-item label="宗地编码"> 7 <el-form-item label="宗地编码">
8 <el-input 8 <el-input
9 v-model="queryData.zddm" 9 v-model="queryData.zddm"
10 placeholder="输入宗地编码" 10 placeholder="输入宗地编码"
11 @change="query"
12 ></el-input> 11 ></el-input>
13 </el-form-item> 12 </el-form-item>
13 </el-col>
14 <el-col :span="8">
14 <el-form-item label="不动产权证号"> 15 <el-form-item label="不动产权证号">
15 <el-input 16 <el-input
16 v-model="queryData.bdcqzh" 17 v-model="queryData.bdcqzh"
17 placeholder="输入坐落地址" 18 placeholder="输入坐落地址"
18 @change="query"
19 ></el-input> 19 ></el-input>
20 </el-form-item> 20 </el-form-item>
21 </el-col>
22 <el-col :span="8">
21 <el-form-item label="不动产单元号"> 23 <el-form-item label="不动产单元号">
22 <el-input 24 <el-input
23 v-model="queryData.bdcdyh" 25 v-model="queryData.bdcdyh"
24 placeholder="输入不动产单元号" 26 placeholder="输入不动产单元号"
25 @change="query"
26 ></el-input> 27 ></el-input>
27 </el-form-item> 28 </el-form-item>
29 </el-col>
30 </el-row>
31 <el-row>
32 <el-col :span="8">
28 <el-form-item label="权利人"> 33 <el-form-item label="权利人">
29 <el-input 34 <el-input
30 v-model="queryData.qlrmc" 35 v-model="queryData.qlrmc"
31 placeholder="输入权利人姓名" 36 placeholder="输入权利人姓名"
32 @change="query"
33 ></el-input> 37 ></el-input>
34 </el-form-item> 38 </el-form-item>
39 </el-col>
40 <el-col :span="8">
35 <el-form-item label="坐落"> 41 <el-form-item label="坐落">
36 <el-input 42 <el-input
37 v-model="queryData.zl" 43 v-model="queryData.zl"
38 placeholder="输入坐落地址" 44 placeholder="输入坐落地址"
39 @change="query"
40 ></el-input> 45 ></el-input>
41 </el-form-item> 46 </el-form-item>
42
43 </el-form>
44 </el-col> 47 </el-col>
45 </el-row> 48 <el-col :span="8">
46 <el-row> 49 <el-button type="primary" @click="search">查询</el-button>
47 <el-col :span="24"> 50 <el-button type="warning" style="margin-left:10px" @click="result">重置</el-button>
48 <el-form :inline="true" :model="queryData" class="demo-form-inline">
49 <el-form-item class="demo-form-inline" label="查询范围">
50 <el-checkbox-group v-model="queryData.dylxs" @change="query">
51 <el-checkbox label="zd" name="type">宗地</el-checkbox>
52 <el-checkbox label="dz" name="type">多幢</el-checkbox>
53 <el-checkbox label="zrz" name="type">自然幢</el-checkbox>
54 <el-checkbox label="h" name="type">户</el-checkbox>
55 <el-checkbox label="gzw" name="type">构筑物</el-checkbox>
56 <el-checkbox label="lq" name="type">林权</el-checkbox>
57 <el-checkbox label="zh" name="type">宗海</el-checkbox>
58 </el-checkbox-group>
59 </el-form-item>
60
61 <el-button type="primary" @click="query">查询</el-button>
62 <el-button type="warning" @click="reset">重置</el-button>
63 </el-form>
64 </el-col>
65 <el-col :span="2">
66 </el-col> 51 </el-col>
67 </el-row> 52 </el-row>
53 </el-form>
68 54
69 <el-table 55 <el-table :data="Data" :height="tableHeight">
70 :data="Data"
71 :height="tableHeight"
72 :row-class-name="tableRowClassName"
73 >
74 <td class="xh">序号</td> 56 <td class="xh">序号</td>
75 <td class="cz">操作</td> 57 <td class="cz">操作</td>
76 <td class="zddm">宗地代码</td> 58 <td class="zddm">宗地代码</td>
...@@ -122,12 +104,12 @@ ...@@ -122,12 +104,12 @@
122 </template> 104 </template>
123 105
124 <script> 106 <script>
125 import {getSearchList} from "./../../../../api/search"; 107 import { getSearchList } from "./../../../../api/search";
126 import cxlzQueryData from "../../../../components/cxlxQueryData/cxlzQueryData"; 108 import cxlzQueryData from "../../../../components/cxlxQueryData/cxlzQueryData";
127 109
128 export default { 110 export default {
129 name: "", 111 name: "",
130 components: {cxlzQueryData}, 112 components: { cxlzQueryData },
131 props: {}, 113 props: {},
132 data() { 114 data() {
133 return { 115 return {
...@@ -148,37 +130,42 @@ ...@@ -148,37 +130,42 @@
148 }, 130 },
149 Data: [], 131 Data: [],
150 dylxs: ["zd"], 132 dylxs: ["zd"],
151 tableHeight:0 133 tableHeight: 0,
152 }; 134 };
153 }, 135 },
154 created() { 136 created() {},
155 },
156 mounted() { 137 mounted() {
157 this.getData(this.queryData); 138 this.getData(this.queryData);
158 if ((document.documentElement.clientWidth || document.body.clientWidth) < 1890) { 139 if (
159 this.$nextTick(()=>{ 140 (document.documentElement.clientWidth || document.body.clientWidth) < 1890
160 this.tableHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 355; 141 ) {
161 }) 142 this.$nextTick(() => {
162 }else{ 143 this.tableHeight =
163 this.$nextTick(()=>{ 144 (document.documentElement.clientHeight ||
164 this.tableHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 304; 145 document.body.clientHeight) - 355;
165 }) 146 });
147 } else {
148 this.$nextTick(() => {
149 this.tableHeight =
150 (document.documentElement.clientHeight ||
151 document.body.clientHeight) - 304;
152 });
166 } 153 }
167 }, 154 },
168 methods: { 155 methods: {
169 currentChange: function (val) { 156 currentChange: function(val) {
170 console.log(`当前页: ${val}`); 157 console.log(`当前页: ${val}`);
171 this.queryData.pageNo = val; 158 this.queryData.pageNo = val;
172 this.getData(this.queryData); 159 this.getData(this.queryData);
173 }, 160 },
174 xzzrz: function (item) { 161 xzzrz: function(item) {
175 this.centerDialogVisible = true; 162 this.centerDialogVisible = true;
176 this.zrzbsm = item.glbsm; 163 this.zrzbsm = item.glbsm;
177 }, 164 },
178 close: function () { 165 close: function() {
179 this.centerDialogVisible = false; 166 this.centerDialogVisible = false;
180 }, 167 },
181 result: function () { 168 result: function() {
182 this.queryData = { 169 this.queryData = {
183 bdcdyh: "", 170 bdcdyh: "",
184 bdcqzh: "", 171 bdcqzh: "",
...@@ -193,37 +180,38 @@ ...@@ -193,37 +180,38 @@
193 }; 180 };
194 this.getData(this.queryData); 181 this.getData(this.queryData);
195 }, 182 },
196 getData: function (data) { 183 getData: function(data) {
197 getSearchList(data).then((res) => { 184 getSearchList(data).then((res) => {
198 this.Data = res.result.records; 185 this.Data = res.result.records;
199 this.total = res.result.total; 186 this.total = res.result.total;
200 }); 187 });
201 }, 188 },
202 search: function () { 189 search: function() {
203 this.getData(this.queryData); 190 this.getData(this.queryData);
204 }, 191 },
205 }, 192 },
206 computed: {}, 193 computed: {},
207 watch: {}, 194 watch: {},
208 }; 195 };
209 </script> 196 </script>
210 <style scoped lang="less"> 197 <style scoped lang="less">
211 .main { 198 .main {
212 box-sizing: border-box; 199 box-sizing: border-box;
213 padding: 18px; 200 padding: 18px;
214 height: auto; 201 height: auto;
215 } 202 }
216 203
217 table { 204 table {
218 margin-top: 10px; 205 margin-top: 10px;
219 background-color: #fff; 206 background-color: #fff;
220 font-size: 14px; 207 font-size: 14px;
221 width: 100%; 208 width: 100%;
222 table-layout: fixed; 209 table-layout: fixed;
223 tr:hover{ 210 tr:hover {
224 background-color: #F5F7FA; 211 background-color: #f5f7fa;
225 } 212 }
226 td, th { 213 td,
214 th {
227 text-align: center; 215 text-align: center;
228 height: 36px; 216 height: 36px;
229 min-width: 50px; 217 min-width: 50px;
...@@ -232,77 +220,88 @@ ...@@ -232,77 +220,88 @@
232 -ms-text-overflow: ellipsis; 220 -ms-text-overflow: ellipsis;
233 text-overflow: ellipsis; 221 text-overflow: ellipsis;
234 } 222 }
235 } 223 }
236 224
237 table:hover { 225 table:hover {
238 cursor: pointer; 226 cursor: pointer;
239 } 227 }
240 228
241 .inputtitle { 229 .inputtitle {
242 line-height: 40px; 230 line-height: 40px;
243 span{ 231 span {
244 display: inline-block; 232 display: inline-block;
245 width: 120px; 233 width: 120px;
246 text-align: left; 234 text-align: left;
247 } 235 }
248 /deep/ .el-input{ 236 /deep/ .el-input {
249 width: calc(100% - 120px); 237 width: calc(100% - 120px);
250 } 238 }
251 } 239 }
252 240
253 .shop { 241 .shop {
254 margin-top: 20px; 242 margin-top: 20px;
255 } 243 }
256 244
257 .xh { 245 .xh {
258 width: 50px; 246 width: 50px;
259 } 247 }
260 248
261 .zddm { 249 .zddm {
262 width: 120px; 250 width: 120px;
263 } 251 }
264 252
265 .bdcdyh { 253 .bdcdyh {
266 width: 180px; 254 width: 180px;
267 } 255 }
268 256
269 .xmmc { 257 .xmmc {
270 width: 100px; 258 width: 100px;
271 } 259 }
272 260
273 .bdcqzh { 261 .bdcqzh {
274 width: 100px; 262 width: 100px;
275 } 263 }
276 264
277 .qlr { 265 .qlr {
278 width: 100px; 266 width: 100px;
279 } 267 }
280 268
281 .zl { 269 .zl {
282 width: 100px; 270 width: 100px;
283 } 271 }
284 272
285 .cz { 273 .cz {
286 width: 50px; 274 width: 50px;
287 span { 275 span {
288 color: blue; 276 color: blue;
289 } 277 }
290 } 278 }
291 279
292 .noData { 280 .noData {
293 color: #b2b2b2; 281 color: #b2b2b2;
294 } 282 }
295 283
296 .page { 284 .page {
297 position: fixed; 285 position: fixed;
298 bottom: 20px; 286 bottom: 20px;
299 width: auto; 287 width: auto;
300 height: auto; 288 height: auto;
301 } 289 }
302 /deep/ .el-form-item__label{ 290 /deep/ .el-form-item__label {
303 width: 96px; 291 width: 96px;
304 } 292 }
305 /deep/ .el-form{ 293 /deep/ .el-form {
306 margin-left: -28px; 294 margin-left: -28px;
295 .el-button{
296 margin: 0 22px;
297 }
298 }
299 .el-form-item{
300 width: 100%;
301 box-sizing: border-box;
302 padding: 0 20px;
303 /deep/.el-form-item__content{
304 width: calc(100% - 96px);
307 } 305 }
306 }
308 </style> 307 </style>
......
...@@ -57,7 +57,15 @@ ...@@ -57,7 +57,15 @@
57 <th class="zxx">幢信息</th> 57 <th class="zxx">幢信息</th>
58 </tr> 58 </tr>
59 <tr v-for="(item,index) in fghData.newZdlist" :key="index"> 59 <tr v-for="(item,index) in fghData.newZdlist" :key="index">
60 <td @click="delRow(index)" class="cz">-</td> 60 <td class="cz">
61 <el-button
62 type="primary"
63 class="changeBtn outMinus addMinus"
64 @click="delRow(index)"
65 >-
66 </el-button
67 >
68 </td>
61 <td class="xzq"> 69 <td class="xzq">
62 <el-select v-model="item.xzqbsm" @change="changeXzq(item.xzqbsm,index)"> 70 <el-select v-model="item.xzqbsm" @change="changeXzq(item.xzqbsm,index)">
63 <el-option 71 <el-option
...@@ -117,7 +125,15 @@ ...@@ -117,7 +125,15 @@
117 </td> 125 </td>
118 </tr> 126 </tr>
119 <tr> 127 <tr>
120 <td @click="addRow">+</td> 128 <td>
129 <el-button
130 type="primary"
131 class="changeBtn outAdd addMinus"
132 @click="addRow"
133 >+
134 </el-button
135 >
136 </td>
121 <td></td> 137 <td></td>
122 <td></td> 138 <td></td>
123 <td></td> 139 <td></td>
...@@ -233,7 +249,15 @@ ...@@ -233,7 +249,15 @@
233 <th class="zxx">幢信息</th> 249 <th class="zxx">幢信息</th>
234 </tr> 250 </tr>
235 <tr v-for="(item,index) in fghData.newZdlist" :key="index"> 251 <tr v-for="(item,index) in fghData.newZdlist" :key="index">
236 <td @click="delRow(index)" class="cz">-</td> 252 <td class="cz">
253 <el-button
254 type="primary"
255 class="changeBtn outMinus addMinus"
256 @click="delRow(index)"
257 >-
258 </el-button
259 >
260 </td>
237 <td class="xzq"> 261 <td class="xzq">
238 <el-select v-model="item.xzqbsm" @change="changeXzq(item.xzqbsm,index)"> 262 <el-select v-model="item.xzqbsm" @change="changeXzq(item.xzqbsm,index)">
239 <el-option 263 <el-option
...@@ -293,7 +317,14 @@ ...@@ -293,7 +317,14 @@
293 </td> 317 </td>
294 </tr> 318 </tr>
295 <tr> 319 <tr>
296 <td @click="addRow">+</td> 320 <td>
321 <el-button
322 type="primary"
323 class="changeBtn outAdd addMinus"
324 @click="addRow"
325 >+
326 </el-button>
327 </td>
297 <td></td> 328 <td></td>
298 <td></td> 329 <td></td>
299 <td></td> 330 <td></td>
...@@ -409,7 +440,16 @@ ...@@ -409,7 +440,16 @@
409 <th class="zxx">幢信息</th> 440 <th class="zxx">幢信息</th>
410 </tr> 441 </tr>
411 <tr v-for="(item,index) in fghData.newZdlist" :key="index"> 442 <tr v-for="(item,index) in fghData.newZdlist" :key="index">
412 <td @click="delRow(index)" class="cz">-</td> 443
444 <td class="cz">
445 <el-button
446 type="primary"
447 class="changeBtn outMinus addMinus"
448 @click="delRow(index)"
449 >-
450 </el-button
451 >
452 </td>
413 <td class="xzq"> 453 <td class="xzq">
414 <el-select v-model="item.xzqbsm" @change="changeXzq(item.xzqbsm,index)"> 454 <el-select v-model="item.xzqbsm" @change="changeXzq(item.xzqbsm,index)">
415 <el-option 455 <el-option
...@@ -469,7 +509,14 @@ ...@@ -469,7 +509,14 @@
469 </td> 509 </td>
470 </tr> 510 </tr>
471 <tr> 511 <tr>
472 <td @click="addRow">+</td> 512 <td>
513 <el-button
514 type="primary"
515 class="changeBtn outAdd addMinus"
516 @click="addRow"
517 >+
518 </el-button>
519 </td>
473 <td></td> 520 <td></td>
474 <td></td> 521 <td></td>
475 <td></td> 522 <td></td>
...@@ -531,19 +578,6 @@ ...@@ -531,19 +578,6 @@
531 </el-tab-pane> 578 </el-tab-pane>
532 </el-tabs> 579 </el-tabs>
533 </div> 580 </div>
534 <!-- <div class="lpb">
535 <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
536 <el-tab-pane label="编辑楼盘" name="edit">
537 <bjlp></bjlp>
538 </el-tab-pane>
539 <el-tab-pane label="预览楼盘" name="preview">
540 <yllp></yllp>
541 </el-tab-pane>
542 <el-tab-pane label="详细信息" name="detail">
543 <xxxx></xxxx>
544 </el-tab-pane>
545 </el-tabs>
546 </div> -->
547 </template> 581 </template>
548 582
549 <script> 583 <script>
...@@ -964,7 +998,7 @@ ...@@ -964,7 +998,7 @@
964 width: 100px; 998 width: 100px;
965 } 999 }
966 1000
967 .xzq, .djq, djzq { 1001 .xzq, .djq, .djzq {
968 width: 150px; 1002 width: 150px;
969 } 1003 }
970 </style> 1004 </style>
......
...@@ -3,14 +3,9 @@ ...@@ -3,14 +3,9 @@
3 <el-tabs v-model="tabName" class="menu" @tab-click="handleClick"> 3 <el-tabs v-model="tabName" class="menu" @tab-click="handleClick">
4 <el-tab-pane label="宗地合并" name="zd"> 4 <el-tab-pane label="宗地合并" name="zd">
5 <div class="hb-tabs"> 5 <div class="hb-tabs">
6
7 <el-button type="primary" class="addBtn" @click="newAdd">新增</el-button> 6 <el-button type="primary" class="addBtn" @click="newAdd">新增</el-button>
8 <div class="header"> 7 <div class="hbq">
9 <span>合并后项目名称</span> 8 <span class="tips">合并前宗地信息</span>
10 <el-input></el-input>
11 </div>
12
13 <div class="table">
14 <table border="1"> 9 <table border="1">
15 <tr> 10 <tr>
16 <td class="xh">序号</td> 11 <td class="xh">序号</td>
...@@ -28,12 +23,90 @@ ...@@ -28,12 +23,90 @@
28 </tr> 23 </tr>
29 <tr v-else v-for="(item,index) in bgqData" :key="index"> 24 <tr v-else v-for="(item,index) in bgqData" :key="index">
30 <td class="xh">{{index+1}}</td> 25 <td class="xh">{{index+1}}</td>
31 <td class="zddm"><input type="text" class="formInput" v-model="item.zddm" readonly="readonly"/></td> 26 <td class="zddm"><input type="text" class="formInput" v-model="item.zddm"
32 <td class="bdcdyh"><input type="text" class="formInput" v-model="item.bdcdyh" readonly="readonly"/></td> 27 readonly="readonly"/></td>
33 <td class="xmmc"><input type="text" class="formInput" v-model="item.xmmc" readonly="readonly"/></td> 28 <td class="bdcdyh"><input type="text" class="formInput" v-model="item.bdcdyh"
34 <td class="bdcqzh"><input type="text" class="formInput" v-model="item.bdcqzh" readonly="readonly"/></td> 29 readonly="readonly"/></td>
35 <td class="qlr"><input type="text" class="formInput" v-model="item.qlr" readonly="readonly"/></td> 30 <td class="xmmc"><input type="text" class="formInput" v-model="item.xmmc"
36 <td class="zl"><input type="text" class="formInput" v-model="item.zl" readonly="readonly"/></td> 31 readonly="readonly"/></td>
32 <td class="bdcqzh"><input type="text" class="formInput" v-model="item.bdcqzh"
33 readonly="readonly"/></td>
34 <td class="qlr"><input type="text" class="formInput" v-model="item.qlr"
35 readonly="readonly"/></td>
36 <td class="zl"><input type="text" class="formInput" v-model="item.zl"
37 readonly="readonly"/></td>
38 </tr>
39 </table>
40 </div>
41 <div class="hbh">
42 <span class="tips">合并后宗地信息</span>
43 <table border="1">
44 <tr>
45 <th class="xzq">行政区</th>
46 <th class="djq">地籍区</th>
47 <th class="djzq">地籍子区</th>
48 <th class="syqlx">所有权类型</th>
49 <th class="tdtzm">土地特征码</th>
50 <th class="xmmc">项目名称</th>
51 <th class="zxx">幢信息</th>
52 </tr>
53 <tr>
54 <td class="xzq">
55 <el-select v-model="hbhData.xzqbsm" @change="changeXzq(hbhData.xzqbsm)">
56 <el-option
57 v-for="i in xzq"
58 :key="i.bsm"
59 :label="i.mc"
60 :value="i.bsm"
61 ></el-option>
62 </el-select>
63 </td>
64 <td class="djq">
65 <el-select v-model="hbhData.djqbsm" @change="changeDjq(hbhData.djqbsm)">
66 <el-option
67 v-for="i in djq"
68 :key="i.bsm"
69 :label="i.mc"
70 :value="i.bsm"
71 ></el-option>
72 </el-select>
73 </td>
74 <td class="syqlx">
75 <el-select v-model="hbhData.djzqbsm">
76 <el-option
77 v-for="i in djzq"
78 :key="i.bsm"
79 :label="i.mc"
80 :value="i.bsm"
81 ></el-option>
82 </el-select>
83 </td>
84 <td class="tdtzm">
85 <el-select v-model="hbhData.syqlxbsm">
86 <el-option
87 v-for="i in syq"
88 :key="i.value"
89 :label="i.label"
90 :value="i.value"
91 ></el-option>
92 </el-select>
93 </td>
94 <td class="syqlx">
95 <el-select v-model="hbhData.zdtzmbsm">
96 <el-option
97 v-for="i in tdtzm"
98 :key="i.bsm"
99 :label="i.mc"
100 :value="i.bsm"
101 ></el-option>
102 </el-select>
103 </td>
104 <td class="xmmc">
105 <input type="text" v-model="hbhData.xmmc" class="formInput"/>
106 </td>
107 <td class="zxx">
108 <span class="xz">选择</span>
109 </td>
37 </tr> 110 </tr>
38 </table> 111 </table>
39 </div> 112 </div>
...@@ -48,11 +121,8 @@ ...@@ -48,11 +121,8 @@
48 <el-tab-pane label="多幢合并" name="dz"> 121 <el-tab-pane label="多幢合并" name="dz">
49 <div class="hb-tabs"> 122 <div class="hb-tabs">
50 <el-button type="primary" class="addBtn" @click="newAdd">新增</el-button> 123 <el-button type="primary" class="addBtn" @click="newAdd">新增</el-button>
51 <div class="header"> 124 <div class="hbq">
52 <span>合并后项目名称</span> 125 <span class="tips">合并前宗地信息</span>
53 <el-input></el-input>
54 </div>
55 <div class="table">
56 <table border="1"> 126 <table border="1">
57 <tr> 127 <tr>
58 <td class="xh">序号</td> 128 <td class="xh">序号</td>
...@@ -70,12 +140,90 @@ ...@@ -70,12 +140,90 @@
70 </tr> 140 </tr>
71 <tr v-else v-for="(item,index) in bgqData" :key="index"> 141 <tr v-else v-for="(item,index) in bgqData" :key="index">
72 <td class="xh">{{index+1}}</td> 142 <td class="xh">{{index+1}}</td>
73 <td class="zddm"><input type="text" class="formInput" v-model="item.zddm" readonly="readonly"/></td> 143 <td class="zddm"><input type="text" class="formInput" v-model="item.zddm"
74 <td class="bdcdyh"><input type="text" class="formInput" v-model="item.bdcdyh" readonly="readonly"/></td> 144 readonly="readonly"/></td>
75 <td class="xmmc"><input type="text" class="formInput" v-model="item.xmmc" readonly="readonly"/></td> 145 <td class="bdcdyh"><input type="text" class="formInput" v-model="item.bdcdyh"
76 <td class="bdcqzh"><input type="text" class="formInput" v-model="item.bdcqzh" readonly="readonly"/></td> 146 readonly="readonly"/></td>
77 <td class="qlr"><input type="text" class="formInput" v-model="item.qlr" readonly="readonly"/></td> 147 <td class="xmmc"><input type="text" class="formInput" v-model="item.xmmc"
78 <td class="zl"><input type="text" class="formInput" v-model="item.zl" readonly="readonly"/></td> 148 readonly="readonly"/></td>
149 <td class="bdcqzh"><input type="text" class="formInput" v-model="item.bdcqzh"
150 readonly="readonly"/></td>
151 <td class="qlr"><input type="text" class="formInput" v-model="item.qlr"
152 readonly="readonly"/></td>
153 <td class="zl"><input type="text" class="formInput" v-model="item.zl"
154 readonly="readonly"/></td>
155 </tr>
156 </table>
157 </div>
158 <div class="hbh">
159 <span class="tips">合并后宗地信息</span>
160 <table border="1">
161 <tr>
162 <th class="xzq">行政区</th>
163 <th class="djq">地籍区</th>
164 <th class="djzq">地籍子区</th>
165 <th class="syqlx">所有权类型</th>
166 <th class="tdtzm">土地特征码</th>
167 <th class="xmmc">项目名称</th>
168 <th class="zxx">幢信息</th>
169 </tr>
170 <tr>
171 <td class="xzq">
172 <el-select v-model="hbhData.xzqbsm" @change="changeXzq(hbhData.xzqbsm)">
173 <el-option
174 v-for="i in xzq"
175 :key="i.bsm"
176 :label="i.mc"
177 :value="i.bsm"
178 ></el-option>
179 </el-select>
180 </td>
181 <td class="djq">
182 <el-select v-model="hbhData.djqbsm" @change="changeDjq(hbhData.djqbsm)">
183 <el-option
184 v-for="i in djq"
185 :key="i.bsm"
186 :label="i.mc"
187 :value="i.bsm"
188 ></el-option>
189 </el-select>
190 </td>
191 <td class="syqlx">
192 <el-select v-model="hbhData.djzqbsm">
193 <el-option
194 v-for="i in djzq"
195 :key="i.bsm"
196 :label="i.mc"
197 :value="i.bsm"
198 ></el-option>
199 </el-select>
200 </td>
201 <td class="tdtzm">
202 <el-select v-model="hbhData.syqlxbsm">
203 <el-option
204 v-for="i in syq"
205 :key="i.value"
206 :label="i.label"
207 :value="i.value"
208 ></el-option>
209 </el-select>
210 </td>
211 <td class="syqlx">
212 <el-select v-model="hbhData.zdtzmbsm">
213 <el-option
214 v-for="i in tdtzm"
215 :key="i.bsm"
216 :label="i.mc"
217 :value="i.bsm"
218 ></el-option>
219 </el-select>
220 </td>
221 <td class="xmmc">
222 <input type="text" v-model="hbhData.xmmc" class="formInput"/>
223 </td>
224 <td class="zxx">
225 <span class="xz">选择</span>
226 </td>
79 </tr> 227 </tr>
80 </table> 228 </table>
81 </div> 229 </div>
...@@ -89,11 +237,8 @@ ...@@ -89,11 +237,8 @@
89 <el-tab-pane label="户合并" name="h"> 237 <el-tab-pane label="户合并" name="h">
90 <div class="hb-tabs"> 238 <div class="hb-tabs">
91 <el-button type="primary" class="addBtn" @click="newAdd">新增</el-button> 239 <el-button type="primary" class="addBtn" @click="newAdd">新增</el-button>
92 <div class="header"> 240 <div class="hbq">
93 <span>合并后项目名称</span> 241 <span class="tips">合并前宗地信息</span>
94 <el-input></el-input>
95 </div>
96 <div class="table">
97 <table border="1"> 242 <table border="1">
98 <tr> 243 <tr>
99 <td class="xh">序号</td> 244 <td class="xh">序号</td>
...@@ -111,12 +256,90 @@ ...@@ -111,12 +256,90 @@
111 </tr> 256 </tr>
112 <tr v-else v-for="(item,index) in bgqData" :key="index"> 257 <tr v-else v-for="(item,index) in bgqData" :key="index">
113 <td class="xh">{{index+1}}</td> 258 <td class="xh">{{index+1}}</td>
114 <td class="zddm"><input type="text" class="formInput" v-model="item.zddm" readonly="readonly"/></td> 259 <td class="zddm"><input type="text" class="formInput" v-model="item.zddm"
115 <td class="bdcdyh"><input type="text" class="formInput" v-model="item.bdcdyh" readonly="readonly"/></td> 260 readonly="readonly"/></td>
116 <td class="xmmc"><input type="text" class="formInput" v-model="item.xmmc" readonly="readonly"/></td> 261 <td class="bdcdyh"><input type="text" class="formInput" v-model="item.bdcdyh"
117 <td class="bdcqzh"><input type="text" class="formInput" v-model="item.bdcqzh" readonly="readonly"/></td> 262 readonly="readonly"/></td>
118 <td class="qlr"><input type="text" class="formInput" v-model="item.qlr" readonly="readonly"/></td> 263 <td class="xmmc"><input type="text" class="formInput" v-model="item.xmmc"
119 <td class="zl"><input type="text" class="formInput" v-model="item.zl" readonly="readonly"/></td> 264 readonly="readonly"/></td>
265 <td class="bdcqzh"><input type="text" class="formInput" v-model="item.bdcqzh"
266 readonly="readonly"/></td>
267 <td class="qlr"><input type="text" class="formInput" v-model="item.qlr"
268 readonly="readonly"/></td>
269 <td class="zl"><input type="text" class="formInput" v-model="item.zl"
270 readonly="readonly"/></td>
271 </tr>
272 </table>
273 </div>
274 <div class="hbh">
275 <span class="tips">合并后宗地信息</span>
276 <table border="1">
277 <tr>
278 <th class="xzq">行政区</th>
279 <th class="djq">地籍区</th>
280 <th class="djzq">地籍子区</th>
281 <th class="syqlx">所有权类型</th>
282 <th class="tdtzm">土地特征码</th>
283 <th class="xmmc">项目名称</th>
284 <th class="zxx">幢信息</th>
285 </tr>
286 <tr>
287 <td class="xzq">
288 <el-select v-model="hbhData.xzqbsm" @change="changeXzq(hbhData.xzqbsm)">
289 <el-option
290 v-for="i in xzq"
291 :key="i.bsm"
292 :label="i.mc"
293 :value="i.bsm"
294 ></el-option>
295 </el-select>
296 </td>
297 <td class="djq">
298 <el-select v-model="hbhData.djqbsm" @change="changeDjq(hbhData.djqbsm)">
299 <el-option
300 v-for="i in djq"
301 :key="i.bsm"
302 :label="i.mc"
303 :value="i.bsm"
304 ></el-option>
305 </el-select>
306 </td>
307 <td class="syqlx">
308 <el-select v-model="hbhData.djzqbsm">
309 <el-option
310 v-for="i in djzq"
311 :key="i.bsm"
312 :label="i.mc"
313 :value="i.bsm"
314 ></el-option>
315 </el-select>
316 </td>
317 <td class="tdtzm">
318 <el-select v-model="hbhData.syqlxbsm">
319 <el-option
320 v-for="i in syq"
321 :key="i.value"
322 :label="i.label"
323 :value="i.value"
324 ></el-option>
325 </el-select>
326 </td>
327 <td class="syqlx">
328 <el-select v-model="hbhData.zdtzmbsm">
329 <el-option
330 v-for="i in tdtzm"
331 :key="i.bsm"
332 :label="i.mc"
333 :value="i.bsm"
334 ></el-option>
335 </el-select>
336 </td>
337 <td class="xmmc">
338 <input type="text" v-model="hbhData.xmmc" class="formInput"/>
339 </td>
340 <td class="zxx">
341 <span class="xz">选择</span>
342 </td>
120 </tr> 343 </tr>
121 </table> 344 </table>
122 </div> 345 </div>
...@@ -132,6 +355,12 @@ ...@@ -132,6 +355,12 @@
132 </template> 355 </template>
133 356
134 <script> 357 <script>
358 import {
359 getAllList,
360 getListByXzqbsm,
361 getListByPbsm,
362 getDdicByMC
363 } from "./../../../../api/common";
135 import QueryData from './../../../../components/queryData/queryData' 364 import QueryData from './../../../../components/queryData/queryData'
136 365
137 export default { 366 export default {
...@@ -143,17 +372,84 @@ ...@@ -143,17 +372,84 @@
143 tabName: 'zd', 372 tabName: 'zd',
144 centerDialogVisible: false, 373 centerDialogVisible: false,
145 bgqData: [], 374 bgqData: [],
146 fgBoxWidth:0 375 hbhData: {},
376 fgBoxWidth: 0,
377 xzq: [],
378 djq: [],
379 djzq: [],
380 tdtzm: [],
381 syq: [
382 {
383 label: "国家所有",
384 value: "G",
385 },
386 {
387 label: "集体所有",
388 value: "J",
389 },
390 {
391 label: "土地所有权未确定或有争议",
392 value: "Z",
393 }
394 ],
147 } 395 }
148 }, 396 },
149 created() { 397 created() {
150 }, 398 },
151 mounted() { 399 mounted() {
152 this.$nextTick(()=>{ 400 this.getXzqList();
401 this.getzdtzm();
402 this.$nextTick(() => {
153 this.fgBoxWidth = this.$refs.hbBox.clientWidth; 403 this.fgBoxWidth = this.$refs.hbBox.clientWidth;
154 }) 404 })
155 }, 405 },
156 methods: { 406 methods: {
407 getzdtzm() {
408 getDdicByMC('宗地（宗海）特征码').then(res => {
409 this.tdtzm = res.result
410 })
411 },
412 getXzqList() {
413 getAllList()
414 .then((res) => {
415 this.xzq = res.result;
416 })
417 .catch((error) => {
418 });
419 },
420 changeXzq(id) {
421 this.djq = [];
422 this.djzq = [];
423 this.hbhData.djqbsm = ''
424 this.hbhData.djzqbsm = ''
425 getListByXzqbsm(id)
426 .then((res) => {
427 if (res.result == null) {
428 this.djq = null;
429 } else {
430 this.djq = res.result;
431 }
432 })
433 .catch((error) => {
434 });
435 },
436 changeDjq(item) {
437 this.djzq = [];
438 this.hbhData.djzqbsm = ''
439 if (item == null) {
440 } else {
441 getListByPbsm(item)
442 .then((res) => {
443 if (res.result == null) {
444 this.djzq = null;
445 } else {
446 this.djzq = res.result;
447 }
448 })
449 .catch((error) => {
450 });
451 }
452 },
157 handleClick(tab, event) { 453 handleClick(tab, event) {
158 console.log(tab, event); 454 console.log(tab, event);
159 }, 455 },
...@@ -177,14 +473,14 @@ ...@@ -177,14 +473,14 @@
177 </script> 473 </script>
178 <style scoped lang="less"> 474 <style scoped lang="less">
179 475
180 .hb{ 476 .hb {
181 .menu{ 477 .menu {
182 /deep/.el-tabs__content{ 478 /deep/ .el-tabs__content {
183 position: unset; 479 position: unset;
184 margin-top: 62px; 480 margin-top: 62px;
185 overflow: visible; 481 overflow: visible;
186 } 482 }
187 /deep/.el-tabs__header{ 483 /deep/ .el-tabs__header {
188 position: -webkit-fixed; 484 position: -webkit-fixed;
189 position: fixed; 485 position: fixed;
190 top: 120px; 486 top: 120px;
...@@ -192,16 +488,16 @@ ...@@ -192,16 +488,16 @@
192 width: 100%; 488 width: 100%;
193 margin-bottom: 0; 489 margin-bottom: 0;
194 border: 0; 490 border: 0;
195 /deep/.el-tabs__nav-scroll{ 491 /deep/ .el-tabs__nav-scroll {
196 height: 50px; 492 height: 50px;
197 box-sizing: border-box; 493 box-sizing: border-box;
198 padding-left: 20px; 494 padding-left: 20px;
199 .el-tabs__active-bar{ 495 .el-tabs__active-bar {
200 display: none; 496 display: none;
201 } 497 }
202 >.el-tabs__nav{ 498 > .el-tabs__nav {
203 border: 0; 499 border: 0;
204 >.el-tabs__item{ 500 > .el-tabs__item {
205 border: 1px solid #DEDEDE; 501 border: 1px solid #DEDEDE;
206 height: 36px; 502 height: 36px;
207 line-height: 36px; 503 line-height: 36px;
...@@ -209,24 +505,25 @@ ...@@ -209,24 +505,25 @@
209 margin: 9px 10px 9px 0; 505 margin: 9px 10px 9px 0;
210 background-color: #ffffff; 506 background-color: #ffffff;
211 } 507 }
212 .is-active{ 508 .is-active {
213 color: #006CFF; 509 color: #006CFF;
214 border: 1px solid #006CFF; 510 border: 1px solid #006CFF;
215 } 511 }
216 } 512 }
217 } 513 }
218 /deep/.el-tabs__nav-wrap::after{ 514 /deep/ .el-tabs__nav-wrap::after {
219 width: 0; 515 width: 0;
220 } 516 }
221 } 517 }
222 } 518 }
223 } 519 }
520
224 .hb-tabs { 521 .hb-tabs {
225 height: auto; 522 height: auto;
226 width: 100%; 523 width: 100%;
227 position: relative; 524 position: relative;
228 525
229 .addBtn{ 526 .addBtn {
230 position: absolute; 527 position: absolute;
231 right: 30px; 528 right: 30px;
232 top: -46px; 529 top: -46px;
...@@ -255,18 +552,14 @@ ...@@ -255,18 +552,14 @@
255 text-align: center; 552 text-align: center;
256 background-color: #ffffff; 553 background-color: #ffffff;
257 } 554 }
258 .table{
259 box-sizing: border-box;
260 padding: 0 18px;
261 }
262 table { 555 table {
263 margin-top: 10px; 556 margin-top: 10px;
264 background-color: #fff; 557 background-color: #fff;
265 font-size: 14px; 558 font-size: 14px;
266 width: 100%; 559 width: 100%;
267 tr:nth-of-type(odd){ 560 tr:nth-of-type(odd) {
268 background: #FAFAFA; 561 background: #FAFAFA;
269 th{ 562 th {
270 height: 36px; 563 height: 36px;
271 } 564 }
272 } 565 }
...@@ -280,7 +573,7 @@ ...@@ -280,7 +573,7 @@
280 text-align: center; 573 text-align: center;
281 cursor: text; 574 cursor: text;
282 } 575 }
283 tr:hover{ 576 tr:hover {
284 background-color: #F5F7FA; 577 background-color: #F5F7FA;
285 } 578 }
286 579
...@@ -299,18 +592,34 @@ ...@@ -299,18 +592,34 @@
299 .noData { 592 .noData {
300 color: #b2b2b2; 593 color: #b2b2b2;
301 } 594 }
302 .saveBtn{ 595 .saveBtn {
303 background-color: #00CACD; 596 background-color: #00CACD;
304 border-color: #00CACD; 597 border-color: #00CACD;
305 padding: 10px 30px; 598 padding: 10px 30px;
306 margin-top: 8px; 599 margin-top: 8px;
307 } 600 }
308 .saveBtn:hover{ 601 .saveBtn:hover {
309 background-color: rgba(0, 202, 205, .8); 602 background-color: rgba(0, 202, 205, .8);
310 border-color: rgba(0, 202, 205, .8); 603 border-color: rgba(0, 202, 205, .8);
311 } 604 }
312 .xh{ 605 .xh {
313 width: 100px; 606 width: 100px;
314 } 607 }
608 .xzq, .djq, .djzq {
609 width: 150px;
610 }
611 .tips {
612 color: #9B9B9B;
613 }
614 .hbq {
615 margin-top: 12px;
616 box-sizing: border-box;
617 padding: 18px;
618 }
619 .hbh {
620 box-sizing: border-box;
621 padding: 0 18px;
622 margin-top: 10px;
623 }
315 } 624 }
316 </style> 625 </style>
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
4 <el-tab-pane label="分割" name="fg"><fg></fg></el-tab-pane> 4 <el-tab-pane label="分割" name="fg"><fg></fg></el-tab-pane>
5 <el-tab-pane label="合并" name="hb"><hb v-if="hbLoad"></hb></el-tab-pane> 5 <el-tab-pane label="合并" name="hb"><hb v-if="hbLoad"></hb></el-tab-pane>
6 <el-tab-pane label="范围属性变更" name="fwsxbg"><fwsxbg v-if="fwsxbgLoad"></fwsxbg></el-tab-pane> 6 <el-tab-pane label="范围属性变更" name="fwsxbg"><fwsxbg v-if="fwsxbgLoad"></fwsxbg></el-tab-pane>
7 <el-tab-pane label="重新落宗" name="cxlz"><cxlz></cxlz></el-tab-pane> 7 <el-tab-pane label="重新落宗" name="cxlz"><cxlz v-if="cxlzLoad"></cxlz></el-tab-pane>
8 </el-tabs> 8 </el-tabs>
9 </div> 9 </div>
10 </template> 10 </template>
...@@ -25,6 +25,7 @@ export default { ...@@ -25,6 +25,7 @@ export default {
25 activeName: "fg", 25 activeName: "fg",
26 hbLoad:false, //默认不加载合并tab 26 hbLoad:false, //默认不加载合并tab
27 fwsxbgLoad:false, //默认不加载范围属性变更tab 27 fwsxbgLoad:false, //默认不加载范围属性变更tab
28 cxlzLoad:false, //默认不加载重新落宗tab
28 }; 29 };
29 }, 30 },
30 methods: { 31 methods: {
...@@ -36,6 +37,9 @@ export default { ...@@ -36,6 +37,9 @@ export default {
36 if(!this.fwsxbgLoad){ 37 if(!this.fwsxbgLoad){
37 this.fwsxbgLoad = tab.name == 'fwsxbg' ? true : false 38 this.fwsxbgLoad = tab.name == 'fwsxbg' ? true : false
38 } 39 }
40 if(!this.cxlzLoad){
41 this.cxlzLoad = tab.name == 'cxlz' ? true : false
42 }
39 }, 43 },
40 }, 44 },
41 created() {}, 45 created() {},
......
...@@ -106,7 +106,7 @@ export default { ...@@ -106,7 +106,7 @@ export default {
106 }, 106 },
107 mounted() { 107 mounted() {
108 this.$nextTick(() => { 108 this.$nextTick(() => {
109 this.tableHeight = this.$refs.notice.offsetHeight - 53; 109 this.tableHeight = this.$refs.notice.offsetHeight - 54;
110 }); 110 });
111 }, 111 },
112 methods: { 112 methods: {
...@@ -228,13 +228,13 @@ export default { ...@@ -228,13 +228,13 @@ export default {
228 } 228 }
229 } 229 }
230 } 230 }
231 .el-card__body { 231 /deep/ .el-card__body {
232 padding: 40px; 232 padding: 50px 20px;
233 } 233 }
234 } 234 }
235 .notice { 235 .notice {
236 padding: 0; 236 padding: 0;
237 height: calc(100% - 225px); 237 height: calc(100% - 285px);
238 @flex(); 238 @flex();
239 .news { 239 .news {
240 float: left; 240 float: left;
......
...@@ -22,20 +22,41 @@ ...@@ -22,20 +22,41 @@
22 </table> 22 </table>
23 <table border="1"> 23 <table border="1">
24 <tr> 24 <tr>
25 <td @click="addRow" class="cz">+</td> 25 <td class="cz"><el-button
26 type="primary"
27 class="changeBtn outAdd addMinus"
28 @click="addRow"
29 >+</el-button
30 ></td>
26 <td class="dzwdm">定着物代码</td> 31 <td class="dzwdm">定着物代码</td>
27 <td class="syqmj">土地所有权/使用权面积(㎡)</td> 32 <td class="syqmj">土地所有权/使用权面积(㎡)</td>
28 <td class="dytdmj">独有独用土地面积(㎡)</td> 33 <td class="dytdmj">独有独用土地面积(㎡)</td>
29 <td class="fttjmj">分摊土地面积(㎡)</td> 34 <td class="fttjmj">分摊土地面积(㎡)</td>
30 </tr> 35 </tr>
31 <tr v-for="(item,i) in mjftData.list" :key="i"> 36 <tr v-for="(item,i) in mjftData.list" :key="i">
32 <td @click="delRow(i)" class="cz">-</td> 37 <td class="cz">
33 <td class="dzwdm"><input type="text" class="formInput" v-model="item.dzwdm"/></td> 38 <el-button
34 <td class="syqmj"><input type="number" class="formInput" v-model="item.tdsyqsyqmj" @keydown="oninput"/> 39 type="primary"
40 class="changeBtn outMinus addMinus"
41 @click="delRow(i)"
42 >-</el-button
43 >
35 </td> 44 </td>
36 <td class="dytdmj"><input type="number" class="formInput" v-model="item.dydytdmj" @keydown="oninput"/> 45 <td class="dzwdm">
46 <el-input v-model="item.dzwdm" placeholder="请输入定着物代码">
47 </el-input>
37 </td> 48 </td>
38 <td class="fttjmj"><input type="number" class="formInput" v-model="item.fttdmj" @keydown="oninput"/> 49 <td class="syqmj">
50 <el-input placeholder="请输入使用所有权面积" style="ime-mode:inactive"
51 oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"
52 v-model="item.tdsyqsyqmj"
53 ></el-input>
54 </td>
55 <td class="dytdmj">
56 <el-input v-model="item.dydytdmj" style="ime-mode:inactive" placeholder="请输入独有独用土地面积" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
57 </td>
58 <td class="fttjmj">
59 <el-input v-model="item.fttdmj" style="ime-mode:inactive" placeholder="请输入分摊土地面积" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
39 </td> 60 </td>
40 </tr> 61 </tr>
41 <tr> 62 <tr>
...@@ -110,9 +131,6 @@ ...@@ -110,9 +131,6 @@
110 console.log(error) 131 console.log(error)
111 }) 132 })
112 }, 133 },
113 oninput(e) {
114 e.target.value = (e.target.value.match(/^\d*(\.?\d{0,2})/g)[0]) || null
115 },
116 addRow() { 134 addRow() {
117 this.mjftData.list.push({ 135 this.mjftData.list.push({
118 dydytdmj: '', 136 dydytdmj: '',
......
...@@ -113,10 +113,10 @@ ...@@ -113,10 +113,10 @@
113 <td colspan="4" class="psr"> 113 <td colspan="4" class="psr">
114 <input :disabled="formData.qszt!='0'" 114 <input :disabled="formData.qszt!='0'"
115 type="text" placeholder="请输入" 115 type="text" placeholder="请输入"
116 class="formInput percent78" 116 class="formInput percent80"
117 v-model="formData.zddm" 117 v-model="formData.zddm"
118 /> 118 />
119 <el-button type="primary" class="createBtn" @click="generatorCode" 119 <el-button type="warning" class="createBtn" @click="generatorCode"
120 >生成 120 >生成
121 </el-button> 121 </el-button>
122 </td> 122 </td>
...@@ -131,10 +131,10 @@ ...@@ -131,10 +131,10 @@
131 <td colspan="4" class="psr"> 131 <td colspan="4" class="psr">
132 <input 132 <input
133 type="text" :disabled="formData.qszt!='0'" 133 type="text" :disabled="formData.qszt!='0'"
134 class="formInput percent78" 134 class="formInput percent80"
135 v-model="formData.bdcdyh" 135 v-model="formData.bdcdyh"
136 /> 136 />
137 <el-button type="primary" class="createBtn">生成</el-button> 137 <el-button type="warning" class="createBtn">生成</el-button>
138 </td> 138 </td>
139 </tr> 139 </tr>
140 <tr> 140 <tr>
...@@ -708,10 +708,6 @@ export default { ...@@ -708,10 +708,6 @@ export default {
708 overflow: visible; 708 overflow: visible;
709 text-align: center; 709 text-align: center;
710 } 710 }
711 .percent78 {
712 width: 78%;
713 float: left;
714 }
715 .percent68 { 711 .percent68 {
716 width: 68% !important; 712 width: 68% !important;
717 float: left; 713 float: left;
...@@ -732,13 +728,6 @@ export default { ...@@ -732,13 +728,6 @@ export default {
732 width: 30% !important; 728 width: 30% !important;
733 float: left; 729 float: left;
734 } 730 }
735 .createBtn {
736 position: absolute;
737 width: 50px;
738 padding: 6px 4px;
739 right: 4px;
740 top: 4px;
741 }
742 .el-input__icon { 731 .el-input__icon {
743 line-height: 37px; 732 line-height: 37px;
744 } 733 }
......
...@@ -20,9 +20,9 @@ ...@@ -20,9 +20,9 @@
20 <tr height="30"> 20 <tr height="30">
21 <td colspan="2" align="center" >不动产单元号<i class="requisite">*</i></td> 21 <td colspan="2" align="center" >不动产单元号<i class="requisite">*</i></td>
22 <!-- todo 此处暂时存放的是不动产单元号标识码，而不是不动产单元号--> 22 <!-- todo 此处暂时存放的是不动产单元号标识码，而不是不动产单元号-->
23 <td colspan="4" > 23 <td colspan="4" class="psr">
24 <el-input v-model="form.bdcdyh" style="width: 82%" disabled></el-input> 24 <el-input v-model="form.bdcdyh" class="percent80" disabled></el-input>
25 <el-button @click.prevent="generatorCode" size="mini" type="primary" style="width:17%;margin-left:1%">生成</el-button> 25 <el-button @click.prevent="generatorCode" size="mini" class="createBtn" type="warning">生成</el-button>
26 </td> 26 </td>
27 <td colspan="2" align="center" >原不动产单元</td> 27 <td colspan="2" align="center" >原不动产单元</td>
28 <td colspan="4" > 28 <td colspan="4" >
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
3 <div class="tab-header"> 3 <div class="tab-header">
4 <el-row class="searchContent"> 4 <el-row class="searchContent">
5 <el-col :span="8"> 5 <el-col :span="8">
6 <el-radio-group v-model="tabPosition"> 6 <el-radio-group v-model="syclx">
7 <el-radio-button label="1">实测</el-radio-button> 7 <el-radio-button label="1">实测</el-radio-button>
8 <el-radio-button label="0">预测</el-radio-button> 8 <el-radio-button label="0">预测</el-radio-button>
9 </el-radio-group> 9 </el-radio-group>
...@@ -34,28 +34,28 @@ ...@@ -34,28 +34,28 @@
34 class="radioBtn" 34 class="radioBtn"
35 label="3" 35 label="3"
36 border 36 border
37 @click="plhVisible = true" 37 @click="openPl('h')"
38 >批量户</el-button 38 >批量户</el-button
39 > 39 >
40 <el-button 40 <el-button
41 class="radioBtn" 41 class="radioBtn"
42 label="4" 42 label="4"
43 border 43 border
44 @click="plcVisible = true" 44 @click="openPlC"
45 >批量层</el-button 45 >批量层</el-button
46 > 46 >
47 <el-button 47 <el-button
48 class="radioBtn" 48 class="radioBtn"
49 label="5" 49 label="5"
50 border 50 border
51 @click="plShVisible = true" 51 @click="openPl('sh')"
52 >批量室号</el-button 52 >批量室号</el-button
53 > 53 >
54 <el-button 54 <el-button
55 class="radioBtn" 55 class="radioBtn"
56 label="6" 56 label="6"
57 border 57 border
58 @click="plzlVisible = true" 58 @click="openPl('zl')"
59 >批量坐落</el-button 59 >批量坐落</el-button
60 > 60 >
61 <el-button class="radioBtn" label="7" border @click="addBdcdyh" 61 <el-button class="radioBtn" label="7" border @click="addBdcdyh"
...@@ -236,10 +236,10 @@ ...@@ -236,10 +236,10 @@
236 </div> 236 </div>
237 </el-dialog> 237 </el-dialog>
238 <!-- 批量操作弹出框 --> 238 <!-- 批量操作弹出框 -->
239 <pl-h :plh-visible="plhVisible" :bsms="bsms" @close="plhClose"></pl-h> 239 <pl-h :plh-visible="plhVisible" :bsms="bsms" @close="plhClose" @lodding="lodding"></pl-h>
240 <pl-zl :pl-zl-visible="plzlVisible" :bsms="bsms" @close="plZlClose"></pl-zl> 240 <pl-zl :pl-zl-visible="plzlVisible" :bsms="bsms" @close="plZlClose" @lodding="lodding"></pl-zl>
241 <pl-c :plc-visible="plcVisible" :bsms="bsms" @close="plcClose"></pl-c> 241 <pl-c :plc-visible="plcVisible" :bsms="cbsmList" @close="plcClose" @lodding="lodding"></pl-c>
242 <pl-sh :plShVisible="plShVisible" :bsms="bsms" @close="plshClose"></pl-sh> 242 <pl-sh :plShVisible="plShVisible" :bsms="bsms" @close="plshClose" @lodding="lodding"></pl-sh>
243 <h-cxlz 243 <h-cxlz
244 :h-cxlz-visble="hcxlzVisible" 244 :h-cxlz-visble="hcxlzVisible"
245 :bsms="bsms" 245 :bsms="bsms"
...@@ -258,6 +258,7 @@ ...@@ -258,6 +258,7 @@
258 </template> 258 </template>
259 259
260 <script> 260 <script>
261 import {Message} from "element-ui"
261 import HCxlz from "./../../../../components/hCxlz/hCxlz"; 262 import HCxlz from "./../../../../components/hCxlz/hCxlz";
262 import PlC from "./../../../../components/plc/plC"; 263 import PlC from "./../../../../components/plc/plC";
263 import PlSh from "./../../../../components/plsh/plSh"; 264 import PlSh from "./../../../../components/plsh/plSh";
...@@ -289,7 +290,7 @@ export default { ...@@ -289,7 +290,7 @@ export default {
289 props: {}, 290 props: {},
290 data() { 291 data() {
291 return { 292 return {
292 bsms: ["123", "321", "231"], 293 bsms: [],
293 hbsm: "", 294 hbsm: "",
294 dialogVisible: false, 295 dialogVisible: false,
295 plcVisible: false, 296 plcVisible: false,
...@@ -298,7 +299,7 @@ export default { ...@@ -298,7 +299,7 @@ export default {
298 plzlVisible: false, 299 plzlVisible: false,
299 hbjVisible: false, 300 hbjVisible: false,
300 hcxlzVisible:false, 301 hcxlzVisible:false,
301 tabPosition: "1", //1是实测 0是预测 302 syclx: "1", //1是实测 0是预测
302 radio1: "", 303 radio1: "",
303 radio2: "", 304 radio2: "",
304 createFlag: false, 305 createFlag: false,
...@@ -372,6 +373,7 @@ export default { ...@@ -372,6 +373,7 @@ export default {
372 lpbContentwidth: "", 373 lpbContentwidth: "",
373 time: "", 374 time: "",
374 dyztBsmList: {}, //单元状态bsmList 375 dyztBsmList: {}, //单元状态bsmList
376 cbsmList:[], // 层bsmlist
375 }; 377 };
376 }, 378 },
377 created() { 379 created() {
...@@ -391,6 +393,35 @@ export default { ...@@ -391,6 +393,35 @@ export default {
391 }, 100); 393 }, 100);
392 }, 394 },
393 methods: { 395 methods: {
396 openPlC(){
397 if (this.cbsmList.length <= 0) {
398 Message.warning("请选择层")
399 return
400 }
401 this.plcVisible=true
402 },
403 openPl(val){
404 if (this.bsms.length <= 0) {
405 Message.warning("请选择操作户")
406 return
407 }
408 switch (val) {
409 case 'h':
410 this.plhVisible=true;
411 break;
412 case 'zl':
413 this.plzlVisible=true;
414 break;
415 case 'sh':
416 this.plShVisible=true;
417 break;
418 default:
419 break;
420 }
421 },
422 lodding(){
423 this.getlpbData();
424 },
394 hcxlzClose() { 425 hcxlzClose() {
395 this.hcxlzVisible = false; 426 this.hcxlzVisible = false;
396 }, 427 },
...@@ -484,6 +515,11 @@ export default { ...@@ -484,6 +515,11 @@ export default {
484 } 515 }
485 console.log(this.bsms); 516 console.log(this.bsms);
486 }, 517 },
518 //获取选中层bsmlist
519 getCbsm(data){
520 this.cbsmList = data;
521 console.log(this.cbsmList);
522 },
487 //不动产单元号输入框事件 523 //不动产单元号输入框事件
488 inputFocus() { 524 inputFocus() {
489 this.inputWidth = 200; 525 this.inputWidth = 200;
......
...@@ -30,13 +30,13 @@ ...@@ -30,13 +30,13 @@
30 <el-input v-model="form.ljzmc"></el-input> 30 <el-input v-model="form.ljzmc"></el-input>
31 </td> 31 </td>
32 <td colspan="2" align="center">不动产单元号</td> 32 <td colspan="2" align="center">不动产单元号</td>
33 <td colspan="4"> 33 <td colspan="4" class="psr">
34 <el-input v-model="form.bdcdyh" style="width: 70%"></el-input> 34 <el-input v-model="form.bdcdyh" class="percent80"></el-input>
35 <el-button 35 <el-button
36 @click.prevent="" 36 @click.prevent=""
37 size="mini" 37 size="mini"
38 type="primary" 38 type="warning"
39 style="width:25%;margin-left:3%" 39 class="createBtn"
40 >生成</el-button 40 >生成</el-button
41 > 41 >
42 </td> 42 </td>
......
...@@ -9,10 +9,10 @@ ...@@ -9,10 +9,10 @@
9 <div class="ljz-zdy" :style="{'min-height':ljzzdyHeight+40+'px'}" ref="ljzzdy" v-show="ljzs.zdys.length>0" v-for="(zdys,zdyIndex) in ljzs.zdys" :key="zdyIndex" > 9 <div class="ljz-zdy" :style="{'min-height':ljzzdyHeight+40+'px'}" ref="ljzzdy" v-show="ljzs.zdys.length>0" v-for="(zdys,zdyIndex) in ljzs.zdys" :key="zdyIndex" >
10 <!-- 循环幢单元下的层户 --> 10 <!-- 循环幢单元下的层户 -->
11 <!-- <div class="chTable-wrap"> --> 11 <!-- <div class="chTable-wrap"> -->
12 <table class="chTable" :style="{'top':(ljzzdyHeight-1-zdys.cs.length*65)+'px'}" border="1" cellspacing="0" cellpadding="0" v-show="zdys.cs.length>0"> 12 <table class="chTable" border="1" cellspacing="0" cellpadding="0" v-show="zdys.cs.length>0">
13 <tr v-for="(cs,csIndex) in zdys.cs" :key="csIndex"> 13 <tr v-for="(cs,csIndex) in zdys.cs" :key="csIndex">
14 <!-- 显示层数 --> 14 <!-- 显示层数 -->
15 <td class="floor" @contextmenu.prevent="openMenu($event, cs,'c')">{{cs.sjc}}层</td> 15 <td class="floor" @contextmenu.prevent="openMenu($event, cs,'c')" @click="handleClickC($event,cs)">{{cs.sjc}}层</td>
16 <!-- 显示户 --> 16 <!-- 显示户 -->
17 <td v-for="(hs,hsIndex) in cs.hs" :data-bsm="hs.bsm" ref="hBsm" :key="hsIndex" :class="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? 'tdSelect':''" @click="handleTdClick($event,hs.bsm)" @dblclick="dbclick(hs.bsm)" @contextmenu.prevent="openMenu($event, hs,'h')">{{hs.shbw}}</td> 17 <td v-for="(hs,hsIndex) in cs.hs" :data-bsm="hs.bsm" ref="hBsm" :key="hsIndex" :class="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? 'tdSelect':''" @click="handleTdClick($event,hs.bsm)" @dblclick="dbclick(hs.bsm)" @contextmenu.prevent="openMenu($event, hs,'h')">{{hs.shbw}}</td>
18 </tr> 18 </tr>
...@@ -25,10 +25,10 @@ ...@@ -25,10 +25,10 @@
25 </div> 25 </div>
26 <!-- 循环逻辑幢下的层户 --> 26 <!-- 循环逻辑幢下的层户 -->
27 <div class="ljz-ch" :style="{'min-height':ljzzdyHeight+40+'px'}" v-if="ljzs.cs.length>0"> 27 <div class="ljz-ch" :style="{'min-height':ljzzdyHeight+40+'px'}" v-if="ljzs.cs.length>0">
28 <table class="chTable" :style="{'top':(ljzzdyHeight+40-1-ljzs.cs.length*65)+'px'}" border="1" cellspacing="0" cellpadding="0"> 28 <table class="chTable" border="1" cellspacing="0" cellpadding="0">
29 <tr v-for="(cs) in ljzs.cs" :key="cs.bsm"> 29 <tr v-for="(cs) in ljzs.cs" :key="cs.bsm">
30 <!-- 显示层数 --> 30 <!-- 显示层数 -->
31 <td class="floor" @contextmenu.prevent="openMenu($event, cs,'c')">{{cs.sjc}}层</td> 31 <td class="floor" @contextmenu.prevent="openMenu($event, cs,'c')" @click="handleClickC($event,cs)">{{cs.sjc}}层</td>
32 <!-- 显示户 --> 32 <!-- 显示户 -->
33 <td v-for="(hs,hsIndex) in cs.hs" :data-bsm="hs.bsm" ref="hBsm" :key="hsIndex" :class="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? 'tdSelect':''" @click="handleTdClick($event,hs.bsm)" @dblclick="dbclick(hs.bsm)" @contextmenu.prevent="openMenu($event, hs,'h')">{{hs.shbw}}</td> 33 <td v-for="(hs,hsIndex) in cs.hs" :data-bsm="hs.bsm" ref="hBsm" :key="hsIndex" :class="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? 'tdSelect':''" @click="handleTdClick($event,hs.bsm)" @dblclick="dbclick(hs.bsm)" @contextmenu.prevent="openMenu($event, hs,'h')">{{hs.shbw}}</td>
34 </tr> 34 </tr>
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
53 <table class="chTable" border="1" cellspacing="0" cellpadding="0" v-show="zdys.cs.length>0"> 53 <table class="chTable" border="1" cellspacing="0" cellpadding="0" v-show="zdys.cs.length>0">
54 <tr v-for="(cs,csIndex) in zdys.cs" :key="csIndex"> 54 <tr v-for="(cs,csIndex) in zdys.cs" :key="csIndex">
55 <!-- 显示层数 --> 55 <!-- 显示层数 -->
56 <td class="floor" @contextmenu.prevent="openMenu($event, cs,'c')">{{cs.sjc}}层</td> 56 <td class="floor" @contextmenu.prevent="openMenu($event, cs,'c')" @click="handleClickC($event,cs)">{{cs.sjc}}层</td>
57 <!-- 显示户 --> 57 <!-- 显示户 -->
58 <td v-for="(hs,hsIndex) in cs.hs" :data-bsm="hs.bsm" ref="hBsm" :key="hsIndex" :class="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? 'tdSelect':''" @click="handleTdClick($event,hs.bsm)" @dblclick="dbclick(hs.bsm)" @contextmenu.prevent="openMenu($event, hs,'h')">{{hs.shbw}}</td> 58 <td v-for="(hs,hsIndex) in cs.hs" :data-bsm="hs.bsm" ref="hBsm" :key="hsIndex" :class="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? 'tdSelect':''" @click="handleTdClick($event,hs.bsm)" @dblclick="dbclick(hs.bsm)" @contextmenu.prevent="openMenu($event, hs,'h')">{{hs.shbw}}</td>
59 </tr> 59 </tr>
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
65 <table class="chTable" ref="ch" border="1" cellspacing="0" cellpadding="0" v-show="lpbData.cs != null && lpbData.cs.length>0" > 65 <table class="chTable" ref="ch" border="1" cellspacing="0" cellpadding="0" v-show="lpbData.cs != null && lpbData.cs.length>0" >
66 <tr v-for="(cs,csIndex) in lpbData.cs" :key="csIndex"> 66 <tr v-for="(cs,csIndex) in lpbData.cs" :key="csIndex">
67 <!-- 显示层数 --> 67 <!-- 显示层数 -->
68 <td class="floor" @contextmenu.prevent="openMenu($event, cs,'c')">{{cs.sjc}}层</td> 68 <td class="floor" @contextmenu.prevent="openMenu($event, cs,'c')" @click="handleClickC($event,cs)">{{cs.sjc}}层</td>
69 <!-- 显示户 --> 69 <!-- 显示户 -->
70 <td v-for="(hs,hsIndex) in cs.hs" :data-bsm="hs.bsm" ref="hBsm" :key="hsIndex" :class="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? 'tdSelect':''" @click="handleTdClick($event,hs.bsm)" @dblclick="dbclick(hs.bsm)" @contextmenu.prevent="openMenu($event, hs,'h')">{{hs.shbw}}</td> 70 <td v-for="(hs,hsIndex) in cs.hs" :data-bsm="hs.bsm" ref="hBsm" :key="hsIndex" :class="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? 'tdSelect':''" @click="handleTdClick($event,hs.bsm)" @dblclick="dbclick(hs.bsm)" @contextmenu.prevent="openMenu($event, hs,'h')">{{hs.shbw}}</td>
71 </tr> 71 </tr>
...@@ -117,6 +117,7 @@ export default { ...@@ -117,6 +117,7 @@ export default {
117 ljzzdyHeight: 0, //逻辑幢下幢单元的div高度 117 ljzzdyHeight: 0, //逻辑幢下幢单元的div高度
118 loading: true, 118 loading: true,
119 hbsmList: [], 119 hbsmList: [],
120 cbsmList:[],
120 time: null, //区分单双击事件的定时器 121 time: null, //区分单双击事件的定时器
121 searchNum: Math.random(), 122 searchNum: Math.random(),
122 //接收父组件传入的根据单元状态/房屋性质/房屋用途筛选的户bsmList 123 //接收父组件传入的根据单元状态/房屋性质/房屋用途筛选的户bsmList
...@@ -131,7 +132,7 @@ export default { ...@@ -131,7 +132,7 @@ export default {
131 }, 132 },
132 created() {}, 133 created() {},
133 mounted() { 134 mounted() {
134 this.getLpb(this.$store.state.zrzbsm); 135 this.getLpb(this.$store.state.zrzbsm,this.$parent.syclx);
135 setTimeout(() => { 136 setTimeout(() => {
136 //tab-content宽度 - 右侧图例宽度 - lp-overview滚动条宽度 - lpbContent的pandingRight 137 //tab-content宽度 - 右侧图例宽度 - lp-overview滚动条宽度 - lpbContent的pandingRight
137 this.lpbContentWidth = this.$store.state.contentWidth - 34 - 20; 138 this.lpbContentWidth = this.$store.state.contentWidth - 34 - 20;
...@@ -144,15 +145,15 @@ export default { ...@@ -144,15 +145,15 @@ export default {
144 }, 145 },
145 methods: { 146 methods: {
146 //获取楼盘表数据 147 //获取楼盘表数据
147 getLpb(zrzbsm) { 148 getLpb(zrzbsm,syclx) {
148 getLpb(zrzbsm).then((res) => { 149 getLpb(zrzbsm,syclx).then((res) => {
149 if (res.code == 200) { 150 if (res.code == 200) {
150 this.loading = false; 151 this.loading = false;
151 this.lpbData = res.result == null ? this.lpbData : res.result; 152 this.lpbData = res.result == null ? this.lpbData : res.result;
152 setTimeout(() => { 153 this.$nextTick(()=>{
153 //渲染楼盘表 154 //渲染楼盘表
154 this.dataChange(); 155 this.dataChange();
155 }, 200); 156 })
156 } else { 157 } else {
157 this.$message({ 158 this.$message({
158 message: res.message, 159 message: res.message,
...@@ -171,12 +172,13 @@ export default { ...@@ -171,12 +172,13 @@ export default {
171 //自然幢下元素高度宽度计算 172 //自然幢下元素高度宽度计算
172 dataChange() { 173 dataChange() {
173 //计算逻辑幢宽度 20为marginRight值 174 //计算逻辑幢宽度 20为marginRight值
174 this.ljzWidth -= 9980; 175 this.ljzWidth = 20;
175 if (this.$refs.ljz != undefined) { 176 if (this.$refs.ljz != undefined) {
176 this.$refs.ljz.forEach((item) => { 177 this.$refs.ljz.forEach((item) => {
177 this.ljzWidth += item.offsetWidth + 20; 178 this.ljzWidth += item.offsetWidth + 20;
178 }); 179 });
179 } else { 180 } else {
181
180 } 182 }
181 //计算独立幢单元和独立层户宽度 183 //计算独立幢单元和独立层户宽度
182 //考虑this.$refs.zdy的length为0的情况，即自然幢下没有独立幢单元 184 //考虑this.$refs.zdy的length为0的情况，即自然幢下没有独立幢单元
...@@ -185,7 +187,7 @@ export default { ...@@ -185,7 +187,7 @@ export default {
185 let higher = true; 187 let higher = true;
186 //记录最高的幢单元高度 默认为第一个幢单元高度 188 //记录最高的幢单元高度 默认为第一个幢单元高度
187 let highest = this.$refs.zdy[0].offsetHeight; 189 let highest = this.$refs.zdy[0].offsetHeight;
188 this.zdyWidth -= 980; 190 this.zdyWidth = 20;
189 this.$refs.zdy.forEach((item) => { 191 this.$refs.zdy.forEach((item) => {
190 this.zdyWidth += item.offsetWidth + 21; 192 this.zdyWidth += item.offsetWidth + 21;
191 this.cHeight = 193 this.cHeight =
...@@ -278,6 +280,7 @@ export default { ...@@ -278,6 +280,7 @@ export default {
278 }, 280 },
279 //户右键点击事件 281 //户右键点击事件
280 openMenu(e,item,type){ 282 openMenu(e,item,type){
283 debugger
281 console.log(e,'e'); 284 console.log(e,'e');
282 this.lpbChLeft = e.pageX; 285 this.lpbChLeft = e.pageX;
283 this.lpbChTop = e.pageY; 286 this.lpbChTop = e.pageY;
...@@ -285,6 +288,20 @@ export default { ...@@ -285,6 +288,20 @@ export default {
285 this.rightClickFlag = type; 288 this.rightClickFlag = type;
286 this.lpbChVisible = true; 289 this.lpbChVisible = true;
287 }, 290 },
291 // 层选中事件
292 handleClickC(e,item){
293 //判断点击的层是否选中
294 if (e.target.className.indexOf("tdSelect") == -1) {
295 //未选中→选中
296 e.target.className += " tdSelect"; //加边框
297 this.cbsmList.push(item.bsm); // 将户bsm放进hbsmList
298 } else {
299 //选中→未选中
300 e.target.className = "floor";
301 this.deleteArrOption(this.cbsmList,item.bsm);
302 }
303 this.$parent.getCbsm(this.cbsmList);
304 },
288 //关闭右键菜单 305 //关闭右键菜单
289 closeMenu(){ 306 closeMenu(){
290 this.lpbChVisible = false 307 this.lpbChVisible = false
...@@ -319,8 +336,14 @@ export default { ...@@ -319,8 +336,14 @@ export default {
319 legendToggleFlagChange() { 336 legendToggleFlagChange() {
320 return this.$parent.legendToggleFlag; 337 return this.$parent.legendToggleFlag;
321 }, 338 },
339 syclx(){
340 return this.$parent.syclx
341 }
322 }, 342 },
323 watch: { 343 watch: {
344 syclx(n){
345 this.getLpb(this.$store.state.zrzbsm,n)
346 },
324 createFlagChange: function(val) { 347 createFlagChange: function(val) {
325 setTimeout(() => { 348 setTimeout(() => {
326 this.lpbContentWidth = this.$refs.lpbContent.offsetWidth - 6; 349 this.lpbContentWidth = this.$refs.lpbContent.offsetWidth - 6;
...@@ -485,12 +508,14 @@ export default { ...@@ -485,12 +508,14 @@ export default {
485 background-image: url("../../../../../assets/tdSelect.png"); 508 background-image: url("../../../../../assets/tdSelect.png");
486 background-repeat: no-repeat; 509 background-repeat: no-repeat;
487 background-position: right top; 510 background-position: right top;
511 background-size: 30px;
488 } 512 }
489 } 513 }
490 } 514 }
491 .name { 515 .name {
492 line-height: 40px; 516 line-height: 40px;
493 text-align: center; 517 text-align: center;
518 display: inline-block;
494 } 519 }
495 // end 520 // end
496 } 521 }
......
...@@ -13,7 +13,14 @@ ...@@ -13,7 +13,14 @@
13 </table> 13 </table>
14 <table border="1"> 14 <table border="1">
15 <tr> 15 <tr>
16 <td @click="addRow">+</td> 16 <td>
17 <el-button
18 type="primary"
19 class="changeBtn outAdd addMinus"
20 @click="addRow"
21 >+</el-button
22 >
23 </td>
17 <td>建(构)筑物编号</td> 24 <td>建(构)筑物编号</td>
18 <td>建(构)筑物数量</td> 25 <td>建(构)筑物数量</td>
19 <td>建(构)筑物面积(㎡)</td> 26 <td>建(构)筑物面积(㎡)</td>
...@@ -22,13 +29,20 @@ ...@@ -22,13 +29,20 @@
22 <td>附记</td> 29 <td>附记</td>
23 </tr> 30 </tr>
24 <tr v-for="(item,i) in Data.list" :key="i"> 31 <tr v-for="(item,i) in Data.list" :key="i">
25 <td @click="delRow(i)">-</td> 32 <td>
26 <td><input type="text" class="formInput" v-model="item.jgzwbh"/></td> 33 <el-button
27 <td><input type="number" class="formInput" v-model="item.jgzsl" @keydown="oninput"/></td> 34 type="primary"
28 <td><input type="number" class="formInput" v-model.number="item.jgzmj" @keydown="oninput"/></td> 35 class="changeBtn outMinus addMinus"
29 <td><input type="number" class="formInput" v-model.number="item.zdmj" @keydown="oninput"/></td> 36 @click="delRow(i)"
30 <td><input type="number" class="formInput" v-model.number="item.fttdmj" @keydown="oninput"/></td> 37 >-</el-button
31 <td><input type="text" class="formInput" v-model="item.fj"/></td> 38 >
39 </td>
40 <td><el-input v-model="item.jgzwbh" placeholder="请输入建(构)筑物编号"></el-input></td>
41 <td><el-input v-model="item.jgzsl" oninput="value = (value.match(/^\d*/g)) || null" placeholder="请输入建(构)筑物数量"></el-input></td>
42 <td><el-input v-model="item.jgzmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="请输入建(构)筑物面积(㎡)"></el-input></td>
43 <td><el-input v-model="item.zdmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="请输入占地面积(㎡)"></el-input></td>
44 <td><el-input v-model="item.fttdmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="请输入分摊土地面积(㎡)"></el-input></td>
45 <td><el-input v-model="item.fj" placeholder="请输入附记"></el-input></td>
32 </tr> 46 </tr>
33 <!-- <tr> 47 <!-- <tr>
34 <td>统计</td> 48 <td>统计</td>
...@@ -94,9 +108,6 @@ ...@@ -94,9 +108,6 @@
94 } 108 }
95 }) 109 })
96 }, 110 },
97 oninput(e) {
98 e.target.value = (e.target.value.match(/^\d*(\.?\d{0,2})/g)[0]) || null
99 },
100 addRow() { 111 addRow() {
101 this.Data.list.push({ 112 this.Data.list.push({
102 jgzwbh: '', // 建(构)筑物编号 113 jgzwbh: '', // 建(构)筑物编号
......
...@@ -23,9 +23,9 @@ ...@@ -23,9 +23,9 @@
23 <input class="formInput" :disabled="form.qszt!='0'" v-model="form.xmmc"> 23 <input class="formInput" :disabled="form.qszt!='0'" v-model="form.xmmc">
24 </td> 24 </td>
25 <td colspan="2" >不动产单元号<i class="requisite">*</i></td> 25 <td colspan="2" >不动产单元号<i class="requisite">*</i></td>
26 <td colspan="4" > 26 <td colspan="4" class="psr">
27 <input class="formInput percent78" :disabled="form.qszt!='0'" v-model="form.bdcdyh" style="width: 70%"> 27 <input class="formInput percent80" :disabled="form.qszt!='0'" v-model="form.bdcdyh">
28 <el-button @click.prevent="generatorCode" type="primary" size="mini" style="width:25%;margin-left:3%">生成</el-button> 28 <el-button @click.prevent="generatorCode" type="warning" class="createBtn" size="mini">生成</el-button>
29 </td> 29 </td>
30 </tr> 30 </tr>
31 31
...@@ -145,12 +145,12 @@ ...@@ -145,12 +145,12 @@
145 145
146 <tr v-for="(item1,index) in form.fwytList" :key="index"> 146 <tr v-for="(item1,index) in form.fwytList" :key="index">
147 <td colspan="2" v-if="index===0" :rowspan="ytTitleRowspan" id="ytTitle"> 147 <td colspan="2" v-if="index===0" :rowspan="ytTitleRowspan" id="ytTitle">
148 <el-button type="primary" size="mini" style="margin-right: 10px" @click="addYtInfo">添加</el-button> 148 <el-button type="primary" class="outAdd addMinus" size="mini" style="margin-right: 10px" @click="addYtInfo">+</el-button>
149 <span>用途<i class="requisite">*</i></span> 149 <span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;用途<i class="requisite">*</i></span>
150 </td> 150 </td>
151 151
152 <td colspan="1" style="min-width:120px"> 152 <td colspan="1" style="min-width:120px">
153 <el-button type="info" size="mini" style="" @click="deleteYtInfo(index)" circle>删除</el-button> 153 <el-button type="info" class="outMinus addMinus" size="mini" style="" @click="deleteYtInfo(index)" circle>-</el-button>
154 规划用途 154 规划用途
155 </td> 155 </td>
156 <td colspan="3" > 156 <td colspan="3" >
...@@ -186,11 +186,12 @@ ...@@ -186,11 +186,12 @@
186 186
187 <tr v-for="(item1,index) in form.fwjgList" :key="'jg'+index"> 187 <tr v-for="(item1,index) in form.fwjgList" :key="'jg'+index">
188 <td colspan="2" v-if="index===0" :rowspan="fwjgTitleRowspan" > 188 <td colspan="2" v-if="index===0" :rowspan="fwjgTitleRowspan" >
189 <el-button type="primary" size="mini" style="margin-right: 10px" @click="addFwjgInfo">添加</el-button> 189 <el-button type="primary" class="outAdd addMinus" size="mini" style="margin-right: 10px" @click="addFwjgInfo">+</el-button>
190 <span>房屋结构<i class="requisite">*</i></span> 190 <span>房屋结构<i class="requisite">*</i></span>
191 </td> 191 </td>
192 <td colspan="1" > 192 <td colspan="1" >
193 <span @click="deleteFwjgInfo(index)">删除</span> 193 <el-button type="primary" class="outMinus addMinus" size="mini" style="margin-right: 10px" @click="deleteFwjgInfo(index)">-</el-button>
194 <span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;删除</span>
194 </td> 195 </td>
195 <td colspan="9" > 196 <td colspan="9" >
196 <el-select class="persent78" :disabled="form.qszt!='0'" v-model="item1.fwjgzdbsm" placeholder="请选择" > 197 <el-select class="persent78" :disabled="form.qszt!='0'" v-model="item1.fwjgzdbsm" placeholder="请选择" >
...@@ -205,13 +206,10 @@ ...@@ -205,13 +206,10 @@
205 </tr> 206 </tr>
206 207
207 <tr> 208 <tr>
208 <td colspan="12" rowspan="4" align="center"> 209 <td colspan="12" align="center">
209 <Qlxz ref="qlxzModule" :formData="form"></Qlxz> 210 <Qlxz ref="qlxzModule" :formData="form"></Qlxz>
210 </td> 211 </td>
211 </tr> 212 </tr>
212 <tr></tr>
213 <tr></tr>
214 <tr></tr>
215 213
216 <tr> 214 <tr>
217 <td colspan="2" > 215 <td colspan="2" >
...@@ -605,10 +603,6 @@ ...@@ -605,10 +603,6 @@
605 text-align: center; 603 text-align: center;
606 cursor: text; 604 cursor: text;
607 } 605 }
608 .percent78 {
609 width: 78%;
610 float: left;
611 }
612 .percent68 { 606 .percent68 {
613 width: 68% !important; 607 width: 68% !important;
614 float: left; 608 float: left;
...@@ -629,13 +623,6 @@ ...@@ -629,13 +623,6 @@
629 width: 30% !important; 623 width: 30% !important;
630 float: left; 624 float: left;
631 } 625 }
632 .createBtn {
633 position: absolute;
634 width: 50px;
635 padding: 6px 4px;
636 right: 4px;
637 top: 4px;
638 }
639 .el-input__icon { 626 .el-input__icon {
640 line-height: 37px; 627 line-height: 37px;
641 } 628 }
......