Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem
Showing
17 changed files
with
200 additions
and
139 deletions
... | @@ -116,7 +116,7 @@ ol, ul { list-style:none; } | ... | @@ -116,7 +116,7 @@ ol, ul { list-style:none; } |
116 | >.el-tabs__item{ | 116 | >.el-tabs__item{ |
117 | border: 1px solid #DEDEDE; | 117 | border: 1px solid #DEDEDE; |
118 | height: 30px; | 118 | height: 30px; |
119 | line-height: 30px; | 119 | line-height: 28px; |
120 | padding: 0 20px; | 120 | padding: 0 20px; |
121 | margin: 9px 10px 9px 0; | 121 | margin: 9px 10px 9px 0; |
122 | } | 122 | } |
... | @@ -128,6 +128,9 @@ ol, ul { list-style:none; } | ... | @@ -128,6 +128,9 @@ ol, ul { list-style:none; } |
128 | } | 128 | } |
129 | } | 129 | } |
130 | } | 130 | } |
131 | .el-tabs__item{ | ||
132 | font-size: 16px; | ||
133 | } | ||
131 | //弹框遮罩层样式 | 134 | //弹框遮罩层样式 |
132 | .v-modal{ | 135 | .v-modal{ |
133 | opacity: .2; | 136 | opacity: .2; | ... | ... |
... | @@ -720,6 +720,8 @@ export default { | ... | @@ -720,6 +720,8 @@ export default { |
720 | // height: 100%; | 720 | // height: 100%; |
721 | border-right: 1px solid #E6E6E6; | 721 | border-right: 1px solid #E6E6E6; |
722 | position: relative; | 722 | position: relative; |
723 | text-align: right; | ||
724 | padding-right: 10px; | ||
723 | .qlxz { | 725 | .qlxz { |
724 | line-height: 34px; | 726 | line-height: 34px; |
725 | } | 727 | } | ... | ... |
... | @@ -373,6 +373,8 @@ export default { | ... | @@ -373,6 +373,8 @@ export default { |
373 | // height: 100%; | 373 | // height: 100%; |
374 | border-right: 1px solid #E6E6E6; | 374 | border-right: 1px solid #E6E6E6; |
375 | position: relative; | 375 | position: relative; |
376 | text-align: right; | ||
377 | padding-right: 10px; | ||
376 | .qlxz { | 378 | .qlxz { |
377 | line-height: 34px; | 379 | line-height: 34px; |
378 | } | 380 | } | ... | ... |
... | @@ -24,8 +24,8 @@ | ... | @@ -24,8 +24,8 @@ |
24 | v-if="item.children" | 24 | v-if="item.children" |
25 | class="reTree_icon" | 25 | class="reTree_icon" |
26 | :style="{ | 26 | :style="{ |
27 | height: (size || 14 * 1.2) + 'px', | 27 | height: (size || 16 * 1.2) + 'px', |
28 | width: (size || 14 * 1.2) + 'px', | 28 | width: (size || 16 * 1.2) + 'px', |
29 | }" | 29 | }" |
30 | :class="{ | 30 | :class="{ |
31 | reTree_default_icon: item.children.length === 0, | 31 | reTree_default_icon: item.children.length === 0, |
... | @@ -37,8 +37,8 @@ | ... | @@ -37,8 +37,8 @@ |
37 | v-if="item.children==null" | 37 | v-if="item.children==null" |
38 | class="reTree_icon reTree_expand_icon" | 38 | class="reTree_icon reTree_expand_icon" |
39 | :style="{ | 39 | :style="{ |
40 | height: (size || 14 * 1.2) + 'px', | 40 | height: (size || 16 * 1.2) + 'px', |
41 | width: (size || 14 * 1.2) + 'px', | 41 | width: (size || 16 * 1.2) + 'px', |
42 | }" | 42 | }" |
43 | ></div> | 43 | ></div> |
44 | <div | 44 | <div |
... | @@ -46,7 +46,7 @@ | ... | @@ -46,7 +46,7 @@ |
46 | @contextmenu.prevent="openMenu($event, item,list)" | 46 | @contextmenu.prevent="openMenu($event, item,list)" |
47 | :class="{ | 47 | :class="{ |
48 | active_color: item.expand, | 48 | active_color: item.expand, |
49 | curPage:$route.query.bsm==item.bsm | 49 | curPage:$route.query.bsm && $route.query.bsm==item.bsm |
50 | }" | 50 | }" |
51 | > | 51 | > |
52 | <img class="qsztImg" v-if="item.qszt=='0'" :src="linshi"/> | 52 | <img class="qsztImg" v-if="item.qszt=='0'" :src="linshi"/> |
... | @@ -83,7 +83,7 @@ export default { | ... | @@ -83,7 +83,7 @@ export default { |
83 | }, | 83 | }, |
84 | size: { | 84 | size: { |
85 | type: Number, | 85 | type: Number, |
86 | default: 14, | 86 | default: 16, |
87 | }, | 87 | }, |
88 | visible: { | 88 | visible: { |
89 | type: Boolean, | 89 | type: Boolean, |
... | @@ -174,7 +174,7 @@ export default { | ... | @@ -174,7 +174,7 @@ export default { |
174 | } | 174 | } |
175 | }, | 175 | }, |
176 | // 左键双击事件 | 176 | // 左键双击事件 |
177 | dbclick(item) { | 177 | dbclick(item,) { |
178 | clearTimeout(this.time); | 178 | clearTimeout(this.time); |
179 | //此处不要将$router移到if的外面,因为可能是双击行政区,就不知道去哪儿了 | 179 | //此处不要将$router移到if的外面,因为可能是双击行政区,就不知道去哪儿了 |
180 | if (item.type == 'zd') { | 180 | if (item.type == 'zd') { |
... | @@ -342,8 +342,8 @@ export default { | ... | @@ -342,8 +342,8 @@ export default { |
342 | content: ""; | 342 | content: ""; |
343 | position: absolute; | 343 | position: absolute; |
344 | /* 为了触顶 */ | 344 | /* 为了触顶 */ |
345 | top: -14px; | 345 | top: -16px; |
346 | height: calc(100% + 14px); | 346 | height: calc(100% + 16px); |
347 | width: 1px; | 347 | width: 1px; |
348 | left: 7px; | 348 | left: 7px; |
349 | opacity: .5; | 349 | opacity: .5; |
... | @@ -355,7 +355,7 @@ export default { | ... | @@ -355,7 +355,7 @@ export default { |
355 | content: ""; | 355 | content: ""; |
356 | position: absolute; | 356 | position: absolute; |
357 | height: 23px; | 357 | height: 23px; |
358 | top: -14px; | 358 | top: -16px; |
359 | width: 1px; | 359 | width: 1px; |
360 | left: 7px; | 360 | left: 7px; |
361 | opacity: .5; | 361 | opacity: .5; |
... | @@ -401,7 +401,7 @@ export default { | ... | @@ -401,7 +401,7 @@ export default { |
401 | background-size: contain; | 401 | background-size: contain; |
402 | } | 402 | } |
403 | .qsztImg{ | 403 | .qsztImg{ |
404 | width: 14px; | 404 | width: 16px; |
405 | position: relative; | 405 | position: relative; |
406 | top: 1px; | 406 | top: 1px; |
407 | } | 407 | } | ... | ... |
1 | <template> | 1 | <template> |
2 | <div | 2 | <div |
3 | class="content column-start-center reTree_box" | 3 | class="content column-start-center reTree_box" |
4 | :style="{ fontSize: (size || 14) + 'px', lineHeight: (size || 14) + 'px', width: (islpb ? '200':'374') + 'px' }" | 4 | :style="{ fontSize: (size || 16) + 'px', lineHeight: (size || 16) + 'px', width: (islpb ? '200':'374') + 'px' }" |
5 | > | 5 | > |
6 | <div | 6 | <div |
7 | class="column-start-center basic_layer" | 7 | class="column-start-center basic_layer" |
... | @@ -19,8 +19,8 @@ | ... | @@ -19,8 +19,8 @@ |
19 | <div | 19 | <div |
20 | class="reTree_icon" | 20 | class="reTree_icon" |
21 | :style="{ | 21 | :style="{ |
22 | height: (size || 14 * 1.2) + 'px', | 22 | height: (size || 16 * 1.2) + 'px', |
23 | width: (size || 14 * 1.2) + 'px', | 23 | width: (size || 16 * 1.2) + 'px', |
24 | }" | 24 | }" |
25 | :class="{ | 25 | :class="{ |
26 | reTree_default_icon: item.children.length === 0, | 26 | reTree_default_icon: item.children.length === 0, |
... | @@ -129,7 +129,7 @@ export default { | ... | @@ -129,7 +129,7 @@ export default { |
129 | pd: {}, | 129 | pd: {}, |
130 | size: { | 130 | size: { |
131 | type: Number, | 131 | type: Number, |
132 | default: 14, | 132 | default: 16, |
133 | }, | 133 | }, |
134 | islpb:{ | 134 | islpb:{ |
135 | type: Boolean, | 135 | type: Boolean, |
... | @@ -730,8 +730,8 @@ export default { | ... | @@ -730,8 +730,8 @@ export default { |
730 | content: ""; | 730 | content: ""; |
731 | position: absolute; | 731 | position: absolute; |
732 | /* 为了触顶 */ | 732 | /* 为了触顶 */ |
733 | top: -14px; | 733 | top: -16px; |
734 | height: calc(100% + 14px); | 734 | height: calc(100% + 16px); |
735 | width: 1px; | 735 | width: 1px; |
736 | left: 9px; | 736 | left: 9px; |
737 | background: #c3c5c8; | 737 | background: #c3c5c8; |
... | @@ -741,7 +741,7 @@ export default { | ... | @@ -741,7 +741,7 @@ export default { |
741 | content: ""; | 741 | content: ""; |
742 | position: absolute; | 742 | position: absolute; |
743 | height: 23px; | 743 | height: 23px; |
744 | top: -14px; | 744 | top: -16px; |
745 | width: 1px; | 745 | width: 1px; |
746 | left: 9px; | 746 | left: 9px; |
747 | background: #c3c5c8; | 747 | background: #c3c5c8; | ... | ... |
... | @@ -287,7 +287,7 @@ export default { | ... | @@ -287,7 +287,7 @@ export default { |
287 | } | 287 | } |
288 | }, | 288 | }, |
289 | cadFileSuccess(response, file, fileList){ | 289 | cadFileSuccess(response, file, fileList){ |
290 | debugger | 290 | |
291 | }, | 291 | }, |
292 | excelFileSuccess(response, file, fileList){ | 292 | excelFileSuccess(response, file, fileList){ |
293 | var self = this; | 293 | var self = this; | ... | ... |
... | @@ -248,6 +248,8 @@ export default { | ... | @@ -248,6 +248,8 @@ export default { |
248 | this.getRightTreeByZrzbsm(this.$store.state.zrzbsm) | 248 | this.getRightTreeByZrzbsm(this.$store.state.zrzbsm) |
249 | }else if(this.$route.path == '/zd'){ | 249 | }else if(this.$route.path == '/zd'){ |
250 | this.getRightTree(this.$store.state.zdbsm) | 250 | this.getRightTree(this.$store.state.zdbsm) |
251 | }else if(this.$route.path == '/dz'){ | ||
252 | this.getRightTreeByDzbsm(this.$store.state.dzbsm) | ||
251 | }else{ | 253 | }else{ |
252 | this.getTreeList(); | 254 | this.getTreeList(); |
253 | } | 255 | } |
... | @@ -468,7 +470,7 @@ export default { | ... | @@ -468,7 +470,7 @@ export default { |
468 | cursor: pointer; | 470 | cursor: pointer; |
469 | height: 60px; | 471 | height: 60px; |
470 | padding: 0 30px; | 472 | padding: 0 30px; |
471 | font-size: 16px; | 473 | font-size: 18px; |
472 | line-height: 60px; | 474 | line-height: 60px; |
473 | float: left; | 475 | float: left; |
474 | position: relative; | 476 | position: relative; | ... | ... |
... | @@ -37,16 +37,9 @@ | ... | @@ -37,16 +37,9 @@ |
37 | </tr> | 37 | </tr> |
38 | 38 | ||
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 class="formSelect" v-model="form.fwlxbsm" placeholder="请选择" > | 42 | <input class="formInput" v-model="form.zdmj"> |
43 | <el-option | ||
44 | v-for="item in $store.state.fwlxList" | ||
45 | :key="item.bsm" | ||
46 | :label="item.mc" | ||
47 | :value="item.bsm"> | ||
48 | </el-option> | ||
49 | </el-select> | ||
50 | </td> | 43 | </td> |
51 | <td colspan="2" align="center" >竣工日期</td> | 44 | <td colspan="2" align="center" >竣工日期</td> |
52 | <td colspan="4" > | 45 | <td colspan="4" > |
... | @@ -59,6 +52,10 @@ | ... | @@ -59,6 +52,10 @@ |
59 | </tr> | 52 | </tr> |
60 | 53 | ||
61 | <tr height="30"> | 54 | <tr height="30"> |
55 | <td colspan="2" align="center" >分摊土地面积(㎡)</td> | ||
56 | <td colspan="4" > | ||
57 | <input class="formInput" v-model="form.fttdsymj"> | ||
58 | </td> | ||
62 | <td colspan="2" align="center" >产别</td> | 59 | <td colspan="2" align="center" >产别</td> |
63 | <td colspan="4" > | 60 | <td colspan="4" > |
64 | <el-select class="formSelect" v-model="form.fwcbbsm" placeholder="请选择" > | 61 | <el-select class="formSelect" v-model="form.fwcbbsm" placeholder="请选择" > |
... | @@ -70,6 +67,13 @@ | ... | @@ -70,6 +67,13 @@ |
70 | </el-option> | 67 | </el-option> |
71 | </el-select> | 68 | </el-select> |
72 | </td> | 69 | </td> |
70 | </tr> | ||
71 | |||
72 | <tr height="30"> | ||
73 | <td colspan="2" align="center" >多幢独用土地面积(㎡)</td> | ||
74 | <td colspan="4" > | ||
75 | <input class="formInput" v-model="form.dlsytdmj"> | ||
76 | </td> | ||
73 | <td colspan="2" align="center" >产权来源</td> | 77 | <td colspan="2" align="center" >产权来源</td> |
74 | <td colspan="4" > | 78 | <td colspan="4" > |
75 | <el-select class="formSelect" v-model="form.fwcqlybsm" placeholder="请选择" > | 79 | <el-select class="formSelect" v-model="form.fwcqlybsm" placeholder="请选择" > |
... | @@ -96,6 +100,7 @@ | ... | @@ -96,6 +100,7 @@ |
96 | <td colspan="3" align="center" > | 100 | <td colspan="3" align="center" > |
97 | <el-select-tree style="width:100%" | 101 | <el-select-tree style="width:100%" |
98 | v-if="show" | 102 | v-if="show" |
103 | @change="updateSjfyyt(item1)" | ||
99 | :default-expand-all="defaultExpandAll" | 104 | :default-expand-all="defaultExpandAll" |
100 | :multiple="multiple" | 105 | :multiple="multiple" |
101 | :placeholder="placeholder" | 106 | :placeholder="placeholder" |
... | @@ -124,21 +129,6 @@ | ... | @@ -124,21 +129,6 @@ |
124 | </td> | 129 | </td> |
125 | </tr> | 130 | </tr> |
126 | 131 | ||
127 | <tr height="30"> | ||
128 | <td colspan="2" align="center" >共有土地面积(㎡)</td> | ||
129 | <td colspan="2" > | ||
130 | <input class="formInput" v-model="form.zdmj"> | ||
131 | </td> | ||
132 | <td colspan="2" align="center" >分摊土地面积(㎡)</td> | ||
133 | <td colspan="2" > | ||
134 | <input class="formInput" v-model="form.fttdsymj"> | ||
135 | </td> | ||
136 | <td colspan="2" align="center" >多幢独用土地面积(㎡)</td> | ||
137 | <td colspan="2" > | ||
138 | <input class="formInput" v-model="form.dlsytdmj"> | ||
139 | </td> | ||
140 | </tr> | ||
141 | |||
142 | <tr> | 132 | <tr> |
143 | <td colspan="12" align="center"> | 133 | <td colspan="12" align="center"> |
144 | <Qlxz ref="qlxzModule" :hasSyqx='false' :formData="form"></Qlxz> | 134 | <Qlxz ref="qlxzModule" :hasSyqx='false' :formData="form"></Qlxz> |
... | @@ -450,6 +440,11 @@ | ... | @@ -450,6 +440,11 @@ |
450 | } | 440 | } |
451 | }) | 441 | }) |
452 | }, | 442 | }, |
443 | |||
444 | updateSjfyyt(data){ | ||
445 | data.fwsjytbsm = data.fwytzdbsm; | ||
446 | }, | ||
447 | |||
453 | open() { | 448 | open() { |
454 | this.$confirm('已经存在不动产单元号或者自然幢号, 是否继续?', '提示', { | 449 | this.$confirm('已经存在不动产单元号或者自然幢号, 是否继续?', '提示', { |
455 | confirmButtonText: '确定', | 450 | confirmButtonText: '确定', |
... | @@ -497,7 +492,17 @@ | ... | @@ -497,7 +492,17 @@ |
497 | this.getDzDetailByBsm(this.$route.query.bsm) | 492 | this.getDzDetailByBsm(this.$route.query.bsm) |
498 | } | 493 | } |
499 | }, | 494 | }, |
495 | computed: { | ||
496 | dzbsm() { | ||
497 | return this.$route.query.bsm; | ||
498 | }, | ||
499 | }, | ||
500 | watch:{ | 500 | watch:{ |
501 | |||
502 | dzbsm:function (val) { | ||
503 | this.getDzDetailByBsm(val) | ||
504 | }, | ||
505 | |||
501 | "$store.state.sxdrType": { | 506 | "$store.state.sxdrType": { |
502 | handler(n) { | 507 | handler(n) { |
503 | this.$nextTick(()=>{ | 508 | this.$nextTick(()=>{ | ... | ... |
... | @@ -64,8 +64,8 @@ | ... | @@ -64,8 +64,8 @@ |
64 | <!-- <th class="xzzxx">幢信息</th> --> | 64 | <!-- <th class="xzzxx">幢信息</th> --> |
65 | <!-- <th class="">选择</th> --> | 65 | <!-- <th class="">选择</th> --> |
66 | </tr> | 66 | </tr> |
67 | <template v-for="(item,index) in zdFghData.newZdlist"> | 67 | <template v-for="(item,index) in zdFghData.newZdlist" > |
68 | <tr :key="item.xzqbsm"> | 68 | <tr :key="index"> |
69 | <td class="cz" rowspan="2"> | 69 | <td class="cz" rowspan="2"> |
70 | <el-button | 70 | <el-button |
71 | type="primary" | 71 | type="primary" |
... | @@ -129,7 +129,7 @@ | ... | @@ -129,7 +129,7 @@ |
129 | <input type="text" v-model="item.xmmc" class="formInput"/> | 129 | <input type="text" v-model="item.xmmc" class="formInput"/> |
130 | </td> | 130 | </td> |
131 | </tr> | 131 | </tr> |
132 | <tr :key="index"> | 132 | <tr :key="index+100"> |
133 | <td colspan="6"> | 133 | <td colspan="6"> |
134 | <div class="fghzxx"> | 134 | <div class="fghzxx"> |
135 | <div class="choosedZxx"> | 135 | <div class="choosedZxx"> |
... | @@ -699,11 +699,6 @@ | ... | @@ -699,11 +699,6 @@ |
699 | changeXzq(id, index) { | 699 | changeXzq(id, index) { |
700 | this.djq = []; | 700 | this.djq = []; |
701 | this.djzq = []; | 701 | this.djzq = []; |
702 | if (index !== undefined) { | ||
703 | switch (this.tabName) { | ||
704 | case "zd": | ||
705 | this.zdFghData.newZdlist[index].djqbsm = ''; | ||
706 | this.zdFghData.newZdlist[index].djzqbsm = ''; | ||
707 | getListByXzqbsm(id) | 702 | getListByXzqbsm(id) |
708 | .then((res) => { | 703 | .then((res) => { |
709 | if (res.result == null) { | 704 | if (res.result == null) { |
... | @@ -714,6 +709,11 @@ | ... | @@ -714,6 +709,11 @@ |
714 | }) | 709 | }) |
715 | .catch((error) => { | 710 | .catch((error) => { |
716 | }); | 711 | }); |
712 | if (index !== undefined) { | ||
713 | switch (this.tabName) { | ||
714 | case "zd": | ||
715 | this.zdFghData.newZdlist[index].djqbsm = ''; | ||
716 | this.zdFghData.newZdlist[index].djzqbsm = ''; | ||
717 | break; | 717 | break; |
718 | case "dz": | 718 | case "dz": |
719 | //to do | 719 | //to do |
... | @@ -900,7 +900,7 @@ | ... | @@ -900,7 +900,7 @@ |
900 | > .el-tabs__item { | 900 | > .el-tabs__item { |
901 | border: 1px solid #DEDEDE; | 901 | border: 1px solid #DEDEDE; |
902 | height: 36px; | 902 | height: 36px; |
903 | line-height: 36px; | 903 | line-height: 32px; |
904 | padding: 0 20px; | 904 | padding: 0 20px; |
905 | margin: 9px 10px 9px 0; | 905 | margin: 9px 10px 9px 0; |
906 | background-color: #ffffff; | 906 | background-color: #ffffff; | ... | ... |
... | @@ -497,7 +497,7 @@ | ... | @@ -497,7 +497,7 @@ |
497 | > .el-tabs__item { | 497 | > .el-tabs__item { |
498 | border: 1px solid #DEDEDE; | 498 | border: 1px solid #DEDEDE; |
499 | height: 36px; | 499 | height: 36px; |
500 | line-height: 36px; | 500 | line-height: 32px; |
501 | padding: 0 20px; | 501 | padding: 0 20px; |
502 | margin: 9px 10px 9px 0; | 502 | margin: 9px 10px 9px 0; |
503 | background-color: #ffffff; | 503 | background-color: #ffffff; | ... | ... |
... | @@ -318,7 +318,7 @@ export default { | ... | @@ -318,7 +318,7 @@ export default { |
318 | xmmc:'测试自然幢', | 318 | xmmc:'测试自然幢', |
319 | bdcqzh:'A12111111111111111', | 319 | bdcqzh:'A12111111111111111', |
320 | dylx:'zrz', | 320 | dylx:'zrz', |
321 | zrzbsm:'b7162d97848b0d31d301f8d4a5b4596b' | 321 | zrzbsm:'1a94f3ab0f95ecc7137c5c3e51c15ac6' |
322 | } | 322 | } |
323 | ] | 323 | ] |
324 | }, | 324 | }, | ... | ... |
1 | <template> | 1 | <template> |
2 | <div class="content_box"> | 2 | <div class="content_box"> |
3 | <el-tabs v-model="activeName" class="tabs" @tab-click="handleClick"> | 3 | <el-tabs v-model="activeName" class="tabs" @tab-click="handleClick"> |
4 | <el-tab-pane label="分割" name="fg"><fg></fg></el-tab-pane> | 4 | <el-tab-pane label="分割" name="fg"><fg ref="fg" v-if="fgLoad"></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 ref="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 v-if="cxlzLoad"></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> |
... | @@ -23,6 +23,7 @@ export default { | ... | @@ -23,6 +23,7 @@ export default { |
23 | data() { | 23 | data() { |
24 | return { | 24 | return { |
25 | activeName: "fg", | 25 | activeName: "fg", |
26 | fgLoad:true, | ||
26 | hbLoad:false, //默认不加载合并tab | 27 | hbLoad:false, //默认不加载合并tab |
27 | fwsxbgLoad:false, //默认不加载范围属性变更tab | 28 | fwsxbgLoad:false, //默认不加载范围属性变更tab |
28 | cxlzLoad:false, //默认不加载重新落宗tab | 29 | cxlzLoad:false, //默认不加载重新落宗tab |
... | @@ -30,10 +31,19 @@ export default { | ... | @@ -30,10 +31,19 @@ export default { |
30 | }, | 31 | }, |
31 | methods: { | 32 | methods: { |
32 | handleClick(tab, event) { | 33 | handleClick(tab, event) { |
33 | console.log(tab.name); | 34 | // this.$refs.fg.$refs.isSearch = true; |
35 | if (tab.name != 'fg') { | ||
36 | this.fgLoad = false; | ||
37 | } | ||
38 | if (tab.name != 'hb') { | ||
39 | this.hbLoad = false; | ||
40 | } | ||
34 | if(!this.hbLoad){ | 41 | if(!this.hbLoad){ |
35 | this.hbLoad = tab.name == 'hb' ? true : false | 42 | this.hbLoad = tab.name == 'hb' ? true : false |
36 | } | 43 | } |
44 | if(!this.fgLoad){ | ||
45 | this.fgLoad = tab.name == 'fg' ? true : false | ||
46 | } | ||
37 | if(!this.fwsxbgLoad){ | 47 | if(!this.fwsxbgLoad){ |
38 | this.fwsxbgLoad = tab.name == 'fwsxbg' ? true : false | 48 | this.fwsxbgLoad = tab.name == 'fwsxbg' ? true : false |
39 | } | 49 | } | ... | ... |
... | @@ -189,7 +189,7 @@ export default { | ... | @@ -189,7 +189,7 @@ export default { |
189 | getLshsData(){ | 189 | getLshsData(){ |
190 | let _this = this; | 190 | let _this = this; |
191 | const data = { | 191 | const data = { |
192 | "bsm": "d85a274a332ad2d35c922a3a95eb154f", | 192 | "bsm": this.$store.state.zdbsm, |
193 | "type": "zd" | 193 | "type": "zd" |
194 | }; | 194 | }; |
195 | getLshs(data).then((res)=>{ | 195 | getLshs(data).then((res)=>{ | ... | ... |
... | @@ -19,7 +19,7 @@ | ... | @@ -19,7 +19,7 @@ |
19 | <th colspan="12">宗地基本信息</th> | 19 | <th colspan="12">宗地基本信息</th> |
20 | </tr> | 20 | </tr> |
21 | <tr> | 21 | <tr> |
22 | <td colspan="2">行政区</td> | 22 | <td colspan="2" class="tdright">行政区</td> |
23 | <td colspan="2"> | 23 | <td colspan="2"> |
24 | <el-select | 24 | <el-select |
25 | :disabled="formData.qszt!='0'" | 25 | :disabled="formData.qszt!='0'" |
... | @@ -36,7 +36,7 @@ | ... | @@ -36,7 +36,7 @@ |
36 | </el-option> | 36 | </el-option> |
37 | </el-select> | 37 | </el-select> |
38 | </td> | 38 | </td> |
39 | <td colspan="2">地籍区</td> | 39 | <td colspan="2" class="tdright">地籍区</td> |
40 | <td colspan="2"> | 40 | <td colspan="2"> |
41 | <el-select | 41 | <el-select |
42 | class="formSelect" | 42 | class="formSelect" |
... | @@ -53,7 +53,7 @@ | ... | @@ -53,7 +53,7 @@ |
53 | </el-option> | 53 | </el-option> |
54 | </el-select> | 54 | </el-select> |
55 | </td> | 55 | </td> |
56 | <td colspan="2">地籍子区</td> | 56 | <td colspan="2" class="tdright">地籍子区</td> |
57 | <td colspan="2"> | 57 | <td colspan="2"> |
58 | <el-select class="formSelect" :disabled="formData.qszt!='0'" v-model="formData.djzqbsm"> | 58 | <el-select class="formSelect" :disabled="formData.qszt!='0'" v-model="formData.djzqbsm"> |
59 | <el-option | 59 | <el-option |
... | @@ -67,7 +67,7 @@ | ... | @@ -67,7 +67,7 @@ |
67 | </td> | 67 | </td> |
68 | </tr> | 68 | </tr> |
69 | <tr> | 69 | <tr> |
70 | <td colspan="2">权利类型</td> | 70 | <td colspan="2" class="tdright">权利类型</td> |
71 | <td colspan="4"> | 71 | <td colspan="4"> |
72 | <el-select class="formSelect" :disabled="formData.qszt!='0'" v-model="formData.qllxbsm"> | 72 | <el-select class="formSelect" :disabled="formData.qszt!='0'" v-model="formData.qllxbsm"> |
73 | <el-option | 73 | <el-option |
... | @@ -79,7 +79,7 @@ | ... | @@ -79,7 +79,7 @@ |
79 | </el-option> | 79 | </el-option> |
80 | </el-select> | 80 | </el-select> |
81 | </td> | 81 | </td> |
82 | <td colspan="2">宗地特征码<i class="requisite">*</i></td> | 82 | <td colspan="2" class="tdright">宗地特征码<i class="requisite">*</i></td> |
83 | <td colspan="4"> | 83 | <td colspan="4"> |
84 | <el-select class="formSelect" ref="zdtzm" :disabled="formData.qszt!='0'" | 84 | <el-select class="formSelect" ref="zdtzm" :disabled="formData.qszt!='0'" |
85 | v-model="formData.zdtzmbsm"> | 85 | v-model="formData.zdtzmbsm"> |
... | @@ -94,7 +94,7 @@ | ... | @@ -94,7 +94,7 @@ |
94 | </td> | 94 | </td> |
95 | </tr> | 95 | </tr> |
96 | <tr> | 96 | <tr> |
97 | <td colspan="2">权利设定方式</td> | 97 | <td colspan="2" class="tdright">权利设定方式</td> |
98 | <td colspan="4"> | 98 | <td colspan="4"> |
99 | <el-select class="formSelect" :disabled="formData.qszt!='0'" v-model="formData.qlsdfs"> | 99 | <el-select class="formSelect" :disabled="formData.qszt!='0'" v-model="formData.qlsdfs"> |
100 | <el-option | 100 | <el-option |
... | @@ -106,7 +106,7 @@ | ... | @@ -106,7 +106,7 @@ |
106 | </el-option> | 106 | </el-option> |
107 | </el-select> | 107 | </el-select> |
108 | </td> | 108 | </td> |
109 | <td colspan="2">宗地代码<i class="requisite">*</i></td> | 109 | <td colspan="2" class="tdright">宗地代码<i class="requisite">*</i></td> |
110 | <td colspan="4" class="psr"> | 110 | <td colspan="4" class="psr"> |
111 | <input :disabled="formData.qszt!='0'" @blur="inputBlur($event)" ref="zddm" on maxlength="19" | 111 | <input :disabled="formData.qszt!='0'" @blur="inputBlur($event)" ref="zddm" on maxlength="19" |
112 | type="text" | 112 | type="text" |
... | @@ -120,12 +120,12 @@ | ... | @@ -120,12 +120,12 @@ |
120 | </td> | 120 | </td> |
121 | </tr> | 121 | </tr> |
122 | <tr> | 122 | <tr> |
123 | <td colspan="2">地籍号</td> | 123 | <td colspan="2" class="tdright">地籍号</td> |
124 | <td colspan="4"> | 124 | <td colspan="4"> |
125 | <input type="text" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.djh"/> | 125 | <input type="text" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.djh"/> |
126 | </td> | 126 | </td> |
127 | 127 | ||
128 | <td colspan="2">不动产单元号<i class="requisite">*</i></td> | 128 | <td colspan="2" class="tdright">不动产单元号<i class="requisite">*</i></td> |
129 | <td colspan="4" class="psr"> | 129 | <td colspan="4" class="psr"> |
130 | <input | 130 | <input |
131 | type="text" :disabled="formData.qszt!='0'" @blur="inputBlur($event)" ref="bdcdyh" | 131 | type="text" :disabled="formData.qszt!='0'" @blur="inputBlur($event)" ref="bdcdyh" |
... | @@ -137,12 +137,12 @@ | ... | @@ -137,12 +137,12 @@ |
137 | </td> | 137 | </td> |
138 | </tr> | 138 | </tr> |
139 | <tr> | 139 | <tr> |
140 | <td colspan="2">坐落<i class="requisite">*</i></td> | 140 | <td colspan="2" class="tdright">坐落<i class="requisite">*</i></td> |
141 | <td colspan="4"> | 141 | <td colspan="4"> |
142 | <input type="text" :disabled="formData.qszt!='0'" @blur="inputBlur($event)" ref="zl" | 142 | <input type="text" :disabled="formData.qszt!='0'" @blur="inputBlur($event)" ref="zl" |
143 | class="formInput" v-model="formData.zl"/> | 143 | class="formInput" v-model="formData.zl"/> |
144 | </td> | 144 | </td> |
145 | <td colspan="2">项目名称</td> | 145 | <td colspan="2" class="tdright">项目名称</td> |
146 | <td colspan="4" class="psr"> | 146 | <td colspan="4" class="psr"> |
147 | <input :disabled="formData.qszt!='0'" | 147 | <input :disabled="formData.qszt!='0'" |
148 | type="text" | 148 | type="text" |
... | @@ -152,7 +152,7 @@ | ... | @@ -152,7 +152,7 @@ |
152 | </td> | 152 | </td> |
153 | </tr> | 153 | </tr> |
154 | <tr> | 154 | <tr> |
155 | <td colspan="2">国民经济行业分类</td> | 155 | <td colspan="2" class="tdright">国民经济行业分类</td> |
156 | <td colspan="4"> | 156 | <td colspan="4"> |
157 | <!-- <el-select class="formSelect" :disabled="formData.qszt!='0'" v-model="formData.gmjjhyflbsm">--> | 157 | <!-- <el-select class="formSelect" :disabled="formData.qszt!='0'" v-model="formData.gmjjhyflbsm">--> |
158 | <!-- <el-option--> | 158 | <!-- <el-option--> |
... | @@ -176,13 +176,13 @@ | ... | @@ -176,13 +176,13 @@ |
176 | v-model="formData.gmjjhyflbsm" | 176 | v-model="formData.gmjjhyflbsm" |
177 | ></el-select-tree> | 177 | ></el-select-tree> |
178 | </td> | 178 | </td> |
179 | <td colspan="2">价格(元)</td> | 179 | <td colspan="2" class="tdright">价格(元)</td> |
180 | <td colspan="4" class="psr"> | 180 | <td colspan="4" class="psr"> |
181 | <input type="text" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.jg"/> | 181 | <input type="text" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.jg"/> |
182 | </td> | 182 | </td> |
183 | </tr> | 183 | </tr> |
184 | <tr> | 184 | <tr> |
185 | <td colspan="2">容积率</td> | 185 | <td colspan="2" class="tdright">容积率</td> |
186 | <td colspan="2"> | 186 | <td colspan="2"> |
187 | <el-select class="formSelect" :disabled="formData.qszt!='0'" v-model="formData.jyrjl"> | 187 | <el-select class="formSelect" :disabled="formData.qszt!='0'" v-model="formData.jyrjl"> |
188 | <el-option | 188 | <el-option |
... | @@ -208,13 +208,13 @@ | ... | @@ -208,13 +208,13 @@ |
208 | :class="isInterval(formData.jyrjl) ? 'formInput percent47' : 'formInput'" | 208 | :class="isInterval(formData.jyrjl) ? 'formInput percent47' : 'formInput'" |
209 | /> | 209 | /> |
210 | </td> | 210 | </td> |
211 | <td colspan="2">容积说明</td> | 211 | <td colspan="2" class="tdright">容积说明</td> |
212 | <td colspan="4" class="psr"> | 212 | <td colspan="4" class="psr"> |
213 | <input type="text" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.rjlsm"/> | 213 | <input type="text" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.rjlsm"/> |
214 | </td> | 214 | </td> |
215 | </tr> | 215 | </tr> |
216 | <tr> | 216 | <tr> |
217 | <td colspan="2">建筑密度</td> | 217 | <td colspan="2" class="tdright">建筑密度</td> |
218 | <td colspan="2"> | 218 | <td colspan="2"> |
219 | <el-select class="formSelect" :disabled="formData.qszt!='0'" v-model="formData.jyjzmd"> | 219 | <el-select class="formSelect" :disabled="formData.qszt!='0'" v-model="formData.jyjzmd"> |
220 | <el-option | 220 | <el-option |
... | @@ -240,13 +240,13 @@ | ... | @@ -240,13 +240,13 @@ |
240 | :class="isInterval(formData.jyjzmd) ? 'formInput percent47' : 'formInput'" | 240 | :class="isInterval(formData.jyjzmd) ? 'formInput percent47' : 'formInput'" |
241 | /> | 241 | /> |
242 | </td> | 242 | </td> |
243 | <td colspan="2">建筑密度说明</td> | 243 | <td colspan="2" class="tdright">建筑密度说明</td> |
244 | <td colspan="4" class="psr"> | 244 | <td colspan="4" class="psr"> |
245 | <input type="text" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.jzmdsm"/> | 245 | <input type="text" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.jzmdsm"/> |
246 | </td> | 246 | </td> |
247 | </tr> | 247 | </tr> |
248 | <tr> | 248 | <tr> |
249 | <td colspan="2">建筑限高</td> | 249 | <td colspan="2" class="tdright">建筑限高</td> |
250 | <td colspan="2"> | 250 | <td colspan="2"> |
251 | <el-select class="formSelect" :disabled="formData.qszt!='0'" v-model="formData.jyjzxg"> | 251 | <el-select class="formSelect" :disabled="formData.qszt!='0'" v-model="formData.jyjzxg"> |
252 | <el-option | 252 | <el-option |
... | @@ -272,49 +272,49 @@ | ... | @@ -272,49 +272,49 @@ |
272 | :class="isInterval(formData.jyjzxg) ? 'formInput percent47' : 'formInput'" | 272 | :class="isInterval(formData.jyjzxg) ? 'formInput percent47' : 'formInput'" |
273 | /> | 273 | /> |
274 | </td> | 274 | </td> |
275 | <td colspan="2">建筑限高说明</td> | 275 | <td colspan="2" class="tdright">建筑限高说明</td> |
276 | <td colspan="4" class="psr"> | 276 | <td colspan="4" class="psr"> |
277 | <input type="text" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.jzxgsm"/> | 277 | <input type="text" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.jzxgsm"/> |
278 | </td> | 278 | </td> |
279 | </tr> | 279 | </tr> |
280 | <tr> | 280 | <tr> |
281 | <td colspan="2" rowspan="2">所在图幅号</td> | 281 | <td colspan="2" rowspan="2" class="tdright">所在图幅号</td> |
282 | <td colspan="2">比例尺</td> | 282 | <td colspan="2" class="tdright">比例尺</td> |
283 | <td colspan="8" class="psr"> | 283 | <td colspan="8" class="psr"> |
284 | <input type="text" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.blc"/> | 284 | <input type="text" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.blc"/> |
285 | </td> | 285 | </td> |
286 | </tr> | 286 | </tr> |
287 | <tr> | 287 | <tr> |
288 | <td colspan="2">图幅号</td> | 288 | <td colspan="2" class="tdright">图幅号</td> |
289 | <td colspan="8" class="psr"> | 289 | <td colspan="8" class="psr"> |
290 | <input type="text" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.tfh"/> | 290 | <input type="text" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.tfh"/> |
291 | </td> | 291 | </td> |
292 | </tr> | 292 | </tr> |
293 | 293 | ||
294 | <tr> | 294 | <tr> |
295 | <td colspan="2" rowspan="4">宗地四至</td> | 295 | <td colspan="2" rowspan="4" class="tdright">宗地四至</td> |
296 | <td colspan="2">北至<i class="requisite">*</i></td> | 296 | <td colspan="2" class="tdright">北至<i class="requisite">*</i></td> |
297 | <td colspan="8" class="psr"> | 297 | <td colspan="8" class="psr"> |
298 | <input type="text" @blur="inputBlur($event)" ref="zdszb" :disabled="formData.qszt!='0'" | 298 | <input type="text" @blur="inputBlur($event)" ref="zdszb" :disabled="formData.qszt!='0'" |
299 | class="formInput" v-model="formData.zdszb"/> | 299 | class="formInput" v-model="formData.zdszb"/> |
300 | </td> | 300 | </td> |
301 | </tr> | 301 | </tr> |
302 | <tr> | 302 | <tr> |
303 | <td colspan="2">东至<i class="requisite">*</i></td> | 303 | <td colspan="2" class="tdright">东至<i class="requisite">*</i></td> |
304 | <td colspan="8" class="psr"> | 304 | <td colspan="8" class="psr"> |
305 | <input type="text" @blur="inputBlur($event)" ref="zdszd" :disabled="formData.qszt!='0'" | 305 | <input type="text" @blur="inputBlur($event)" ref="zdszd" :disabled="formData.qszt!='0'" |
306 | class="formInput" v-model="formData.zdszd"/> | 306 | class="formInput" v-model="formData.zdszd"/> |
307 | </td> | 307 | </td> |
308 | </tr> | 308 | </tr> |
309 | <tr> | 309 | <tr> |
310 | <td colspan="2">南至<i class="requisite">*</i></td> | 310 | <td colspan="2" class="tdright">南至<i class="requisite">*</i></td> |
311 | <td colspan="8" class="psr"> | 311 | <td colspan="8" class="psr"> |
312 | <input type="text" @blur="inputBlur($event)" ref="zdszn" :disabled="formData.qszt!='0'" | 312 | <input type="text" @blur="inputBlur($event)" ref="zdszn" :disabled="formData.qszt!='0'" |
313 | class="formInput" v-model="formData.zdszn"/> | 313 | class="formInput" v-model="formData.zdszn"/> |
314 | </td> | 314 | </td> |
315 | </tr> | 315 | </tr> |
316 | <tr> | 316 | <tr> |
317 | <td colspan="2">西至<i class="requisite">*</i></td> | 317 | <td colspan="2" class="tdright">西至<i class="requisite">*</i></td> |
318 | <td colspan="8" class="psr"> | 318 | <td colspan="8" class="psr"> |
319 | <input type="text" @blur="inputBlur($event)" ref="zdszx" :disabled="formData.qszt!='0'" | 319 | <input type="text" @blur="inputBlur($event)" ref="zdszx" :disabled="formData.qszt!='0'" |
320 | class="formInput" v-model="formData.zdszx"/> | 320 | class="formInput" v-model="formData.zdszx"/> |
... | @@ -326,38 +326,38 @@ | ... | @@ -326,38 +326,38 @@ |
326 | </td> | 326 | </td> |
327 | </tr> | 327 | </tr> |
328 | <tr> | 328 | <tr> |
329 | <td colspan="2" rowspan="2">批准面积(㎡)</td> | 329 | <td colspan="2" rowspan="2" class="tdright">批准面积(㎡)</td> |
330 | <td colspan="2" rowspan="2"> | 330 | <td colspan="2" rowspan="2"> |
331 | <input type="text" :disabled="formData.qszt!='0'" onkeyup="value=value.replace(/[^\d\.]/g,'')" | 331 | <input type="text" :disabled="formData.qszt!='0'" onkeyup="value=value.replace(/[^\d\.]/g,'')" |
332 | class="formInput" v-model="formData.pzmj"/> | 332 | class="formInput" v-model="formData.pzmj"/> |
333 | </td> | 333 | </td> |
334 | <td colspan="2" rowspan="2">宗地面积(㎡)<i class="requisite">*</i></td> | 334 | <td colspan="2" rowspan="2" class="tdright">宗地面积(㎡)<i class="requisite">*</i></td> |
335 | <td colspan="2" rowspan="2"> | 335 | <td colspan="2" rowspan="2"> |
336 | <input type="text" :disabled="formData.qszt!='0'" @blur="inputBlur($event)" ref="zdmj" | 336 | <input type="text" :disabled="formData.qszt!='0'" @blur="inputBlur($event)" ref="zdmj" |
337 | onkeyup="value=value.replace(/[^\d\.]/g,'')" class="formInput" v-model="formData.zdmj"/> | 337 | onkeyup="value=value.replace(/[^\d\.]/g,'')" class="formInput" v-model="formData.zdmj"/> |
338 | </td> | 338 | </td> |
339 | <td colspan="2">建筑占地总面积</td> | 339 | <td colspan="2" class="tdright">建筑占地总面积</td> |
340 | <td colspan="2"> | 340 | <td colspan="2"> |
341 | <input type="text" :disabled="formData.qszt!='0'" onkeyup="value=value.replace(/[^\d\.]/g,'')" | 341 | <input type="text" :disabled="formData.qszt!='0'" onkeyup="value=value.replace(/[^\d\.]/g,'')" |
342 | class="formInput" v-model="formData.jzzdzmj"/> | 342 | class="formInput" v-model="formData.jzzdzmj"/> |
343 | </td> | 343 | </td> |
344 | </tr> | 344 | </tr> |
345 | <tr> | 345 | <tr> |
346 | <td colspan="2">建筑面积(㎡)</td> | 346 | <td colspan="2" class="tdright">建筑面积(㎡)</td> |
347 | <td colspan="2"> | 347 | <td colspan="2"> |
348 | <input type="text" :disabled="formData.qszt!='0'" onkeyup="value=value.replace(/[^\d\.]/g,'')" | 348 | <input type="text" :disabled="formData.qszt!='0'" onkeyup="value=value.replace(/[^\d\.]/g,'')" |
349 | class="formInput" v-model="formData.jzzmj"/> | 349 | class="formInput" v-model="formData.jzzmj"/> |
350 | </td> | 350 | </td> |
351 | </tr> | 351 | </tr> |
352 | <tr> | 352 | <tr> |
353 | <td colspan="2">共有/共用权利人情况</td> | 353 | <td colspan="2" class="tdright">共有/共用权利人情况</td> |
354 | <td colspan="10"> | 354 | <td colspan="10"> |
355 | <input type="text" :disabled="formData.qszt!='0'" class="formInput" | 355 | <input type="text" :disabled="formData.qszt!='0'" class="formInput" |
356 | v-model="formData.gygyqlrqk"/> | 356 | v-model="formData.gygyqlrqk"/> |
357 | </td> | 357 | </td> |
358 | </tr> | 358 | </tr> |
359 | <tr> | 359 | <tr> |
360 | <td colspan="2" rowspan="2">说明</td> | 360 | <td colspan="2" class="tdright" rowspan="2">说明</td> |
361 | <td colspan="10" rowspan="2"> | 361 | <td colspan="10" rowspan="2"> |
362 | <input type="text" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.sm"/> | 362 | <input type="text" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.sm"/> |
363 | </td> | 363 | </td> |
... | @@ -982,6 +982,11 @@ | ... | @@ -982,6 +982,11 @@ |
982 | height: 36px; | 982 | height: 36px; |
983 | border-color: #E6E6E6; | 983 | border-color: #E6E6E6; |
984 | } | 984 | } |
985 | .tdright { | ||
986 | text-align: right; | ||
987 | padding-right: 10px; | ||
988 | } | ||
989 | |||
985 | /deep/ .el-input__inner { | 990 | /deep/ .el-input__inner { |
986 | margin: 0; | 991 | margin: 0; |
987 | height: 36px; | 992 | height: 36px; | ... | ... |
... | @@ -238,6 +238,7 @@ | ... | @@ -238,6 +238,7 @@ |
238 | <el-select-tree | 238 | <el-select-tree |
239 | v-if="show" | 239 | v-if="show" |
240 | :default-expand-all="defaultExpandAll" | 240 | :default-expand-all="defaultExpandAll" |
241 | @change="updateSjfyyt(item1)" | ||
241 | :multiple="multiple" | 242 | :multiple="multiple" |
242 | :placeholder="placeholder" | 243 | :placeholder="placeholder" |
243 | :disabled="disableFlag" | 244 | :disabled="disableFlag" |
... | @@ -546,6 +547,11 @@ | ... | @@ -546,6 +547,11 @@ |
546 | } | 547 | } |
547 | }) | 548 | }) |
548 | }, | 549 | }, |
550 | |||
551 | updateSjfyyt(data){ | ||
552 | data.fwsjytbsm = data.fwytzdbsm; | ||
553 | }, | ||
554 | |||
549 | addYtInfo(){ | 555 | addYtInfo(){ |
550 | this.form.fwytList.push({ | 556 | this.form.fwytList.push({ |
551 | glbsm:'', | 557 | glbsm:'', | ... | ... |
... | @@ -84,6 +84,7 @@ | ... | @@ -84,6 +84,7 @@ |
84 | <!-- 循环逻辑幢下的层户 --> | 84 | <!-- 循环逻辑幢下的层户 --> |
85 | <div | 85 | <div |
86 | class="ljz-ch" | 86 | class="ljz-ch" |
87 | ref="ljzDlch" | ||
87 | :style="{ height: 'auto' }" | 88 | :style="{ height: 'auto' }" |
88 | v-if="ljzs.cs.length > 0" | 89 | v-if="ljzs.cs.length > 0" |
89 | > | 90 | > |
... | @@ -196,6 +197,7 @@ | ... | @@ -196,6 +197,7 @@ |
196 | <!-- <template > --> | 197 | <!-- <template > --> |
197 | <div | 198 | <div |
198 | class="zdy column-reverse" | 199 | class="zdy column-reverse" |
200 | ref="zrzDlch" | ||
199 | :style="{ 'min-height': cHeight + 'px' }" | 201 | :style="{ 'min-height': cHeight + 'px' }" |
200 | > | 202 | > |
201 | <table | 203 | <table |
... | @@ -307,7 +309,7 @@ | ... | @@ -307,7 +309,7 @@ |
307 | <el-form :model="fgData"> | 309 | <el-form :model="fgData"> |
308 | <el-form-item label="分割户数" required="" :label-width="formLabelWidth"> | 310 | <el-form-item label="分割户数" required="" :label-width="formLabelWidth"> |
309 | <el-input | 311 | <el-input |
310 | :disabled="fgData.fghs!=''" | 312 | :disabled="fgData.fgfx!=0" |
311 | v-model="fgData.fghs" | 313 | v-model="fgData.fghs" |
312 | autocomplete="off" | 314 | autocomplete="off" |
313 | ></el-input> | 315 | ></el-input> |
... | @@ -472,6 +474,11 @@ export default { | ... | @@ -472,6 +474,11 @@ export default { |
472 | this.ljzWidth += item.offsetWidth + 20; | 474 | this.ljzWidth += item.offsetWidth + 20; |
473 | }); | 475 | }); |
474 | } else { | 476 | } else { |
477 | if (this.$refs.ljzDlch != undefined) { | ||
478 | this.$refs.ljzDlch.forEach((item) => { | ||
479 | this.ljzWidth += item.offsetWidth + 20; | ||
480 | }); | ||
481 | } | ||
475 | } | 482 | } |
476 | //计算独立幢单元和独立层户宽度 | 483 | //计算独立幢单元和独立层户宽度 |
477 | //考虑this.$refs.zdy的length为0的情况,即自然幢下没有独立幢单元 | 484 | //考虑this.$refs.zdy的length为0的情况,即自然幢下没有独立幢单元 |
... | @@ -500,10 +507,8 @@ export default { | ... | @@ -500,10 +507,8 @@ export default { |
500 | } | 507 | } |
501 | } else { | 508 | } else { |
502 | //有且仅有独立层户 | 509 | //有且仅有独立层户 |
503 | if (this.$refs.hBsm != undefined) { | 510 | if (this.$refs.zrzDlch != undefined) { |
504 | this.$refs.hBsm.forEach((item) => { | 511 | this.zdyWidth = this.$refs.zrzDlch.offsetWidth+20; |
505 | this.zdyWidth += item.offsetWidth + 21; | ||
506 | }); | ||
507 | } | 512 | } |
508 | } | 513 | } |
509 | 514 | ||
... | @@ -538,7 +543,7 @@ export default { | ... | @@ -538,7 +543,7 @@ export default { |
538 | }); | 543 | }); |
539 | } | 544 | } |
540 | } else { | 545 | } else { |
541 | // this.zdyWidth = 124; | 546 | |
542 | } | 547 | } |
543 | }, | 548 | }, |
544 | //户单击事件 | 549 | //户单击事件 |
... | @@ -634,10 +639,18 @@ export default { | ... | @@ -634,10 +639,18 @@ export default { |
634 | //分割 | 639 | //分割 |
635 | this.lpbChVisible = true; | 640 | this.lpbChVisible = true; |
636 | this.fgData.oldbsm = item.bsm; | 641 | this.fgData.oldbsm = item.bsm; |
642 | console.log(item,'item'); | ||
637 | //判断户的实际sjcs为1,只能水平分割 | 643 | //判断户的实际sjcs为1,只能水平分割 |
638 | this.fgData.fgfx = item.sjcs == 1 ? 0 : 1; | 644 | this.fgData.fgfx = item.sjcs == 1 ? 0 : 1; |
645 | if(item.sjcs == 1){ | ||
646 | //判断户的实际sjcs为1,只能水平分割 | ||
647 | this.fgData.fgfx = 0; | ||
648 | this.fgData.fghs = ''; | ||
649 | }else{ | ||
650 | this.fgData.fgfx = 1; | ||
639 | //判断户的实际sjhs不为1,分割户数为sjhs的值 | 651 | //判断户的实际sjhs不为1,分割户数为sjhs的值 |
640 | this.fgData.fghs = item.sjhs == 1 ? '' : item.sjhs; | 652 | this.fgData.fghs = item.sjcs; |
653 | } | ||
641 | } | 654 | } |
642 | }else{ | 655 | }else{ |
643 | console.log(e, "e"); | 656 | console.log(e, "e"); |
... | @@ -795,6 +808,7 @@ export default { | ... | @@ -795,6 +808,7 @@ export default { |
795 | if(res.code == 200){ | 808 | if(res.code == 200){ |
796 | Message.success('分割成功'); | 809 | Message.success('分割成功'); |
797 | // 清除选中户 | 810 | // 清除选中户 |
811 | this.hfgDialogVisible = false | ||
798 | this.clearChoosedH(); | 812 | this.clearChoosedH(); |
799 | this.fghbChoosedList = []; | 813 | this.fghbChoosedList = []; |
800 | // 更新楼盘表 | 814 | // 更新楼盘表 | ... | ... |
... | @@ -7,41 +7,41 @@ | ... | @@ -7,41 +7,41 @@ |
7 | <th colspan="12">自然幢基本信息</th> | 7 | <th colspan="12">自然幢基本信息</th> |
8 | </tr> | 8 | </tr> |
9 | <tr> | 9 | <tr> |
10 | <td colspan="2">宗地代码</td> | 10 | <td colspan="2" class="tdright">宗地代码</td> |
11 | <td colspan="4" style="min-width:450px"> | 11 | <td colspan="4" style="min-width:450px"> |
12 | <input v-model="form.zddm" class="formInput" disabled> | 12 | <input v-model="form.zddm" class="formInput" disabled> |
13 | <input v-show="false" :disabled="form.qszt!='0'" maxlength="19" class="formInput" v-model="form.zdbsm"> | 13 | <input v-show="false" :disabled="form.qszt!='0'" maxlength="19" class="formInput" v-model="form.zdbsm"> |
14 | </td> | 14 | </td> |
15 | <td colspan="2" >自然幢号<i class="requisite">*</i></td> | 15 | <td colspan="2" class="tdright">自然幢号<i class="requisite">*</i></td> |
16 | <td colspan="4" class="psr"> | 16 | <td colspan="4" class="psr"> |
17 | <input class="formInput percent80" ref="zrzh" @blur="inputBlur($event)" :disabled="form.qszt!='0'" maxlength="24" v-model="form.zrzh"> | 17 | <input class="formInput percent80" ref="zrzh" @blur="inputBlur($event)" :disabled="form.qszt!='0'" maxlength="24" v-model="form.zrzh"> |
18 | <el-button @click.prevent="generatorCode" type="warning" class="createBtn" size="mini">生成</el-button> | 18 | <el-button @click.prevent="generatorCode" type="warning" class="createBtn" size="mini">生成</el-button> |
19 | </td> | 19 | </td> |
20 | </tr> | 20 | </tr> |
21 | <tr> | 21 | <tr> |
22 | <td colspan="2" >项目名称<i class="requisite">*</i></td> | 22 | <td colspan="2" class="tdright">项目名称<i class="requisite">*</i></td> |
23 | <td colspan="4" > | 23 | <td colspan="4" > |
24 | <input class="formInput " ref="xmmc" @blur="inputBlur($event)" :disabled="form.qszt!='0'" v-model="form.xmmc"> | 24 | <input class="formInput " ref="xmmc" @blur="inputBlur($event)" :disabled="form.qszt!='0'" v-model="form.xmmc"> |
25 | </td> | 25 | </td> |
26 | <td colspan="2" >不动产单元号<i class="requisite">*</i></td> | 26 | <td colspan="2" class="tdright">不动产单元号<i class="requisite">*</i></td> |
27 | <td colspan="4"> | 27 | <td colspan="4"> |
28 | <input class="formInput " ref="bdcdyh" @blur="inputBlur($event)" :disabled="form.qszt!='0'" maxlength="28" v-model="form.bdcdyh"> | 28 | <input class="formInput " ref="bdcdyh" @blur="inputBlur($event)" :disabled="form.qszt!='0'" maxlength="28" v-model="form.bdcdyh"> |
29 | </td> | 29 | </td> |
30 | </tr> | 30 | </tr> |
31 | 31 | ||
32 | <tr> | 32 | <tr> |
33 | <td colspan="2" >建筑物名称</td> | 33 | <td colspan="2" class="tdright">建筑物名称</td> |
34 | <td colspan="4" > | 34 | <td colspan="4" > |
35 | <input class="formInput" :disabled="form.qszt!='0'" v-model="form.jzwmc"> | 35 | <input class="formInput" :disabled="form.qszt!='0'" v-model="form.jzwmc"> |
36 | </td> | 36 | </td> |
37 | <td colspan="2" >建筑物基本用途</td> | 37 | <td colspan="2" class="tdright">建筑物基本用途</td> |
38 | <td colspan="4" > | 38 | <td colspan="4" > |
39 | <input class="formInput" :disabled="form.qszt!='0'" v-model="form.jzwjbyt"> | 39 | <input class="formInput" :disabled="form.qszt!='0'" v-model="form.jzwjbyt"> |
40 | </td> | 40 | </td> |
41 | </tr> | 41 | </tr> |
42 | 42 | ||
43 | <tr> | 43 | <tr> |
44 | <td colspan="2" >房屋性质<i class="requisite">*</i></td> | 44 | <td colspan="2" class="tdright">房屋性质<i class="requisite">*</i></td> |
45 | <td colspan="4" > | 45 | <td colspan="4" > |
46 | <el-select class="formSelect" ref="fwxz" :disabled="form.qszt!='0'" v-model="form.fwxzbsm" placeholder="请选择" > | 46 | <el-select class="formSelect" ref="fwxz" :disabled="form.qszt!='0'" v-model="form.fwxzbsm" placeholder="请选择" > |
47 | <el-option | 47 | <el-option |
... | @@ -52,7 +52,7 @@ | ... | @@ -52,7 +52,7 @@ |
52 | </el-option> | 52 | </el-option> |
53 | </el-select> | 53 | </el-select> |
54 | </td> | 54 | </td> |
55 | <td colspan="2" >竣工日期</td> | 55 | <td colspan="2" class="tdright">竣工日期</td> |
56 | <td colspan="4" > | 56 | <td colspan="4" > |
57 | <el-date-picker | 57 | <el-date-picker |
58 | :disabled="form.qszt!='0'" | 58 | :disabled="form.qszt!='0'" |
... | @@ -62,64 +62,65 @@ | ... | @@ -62,64 +62,65 @@ |
62 | </el-date-picker> | 62 | </el-date-picker> |
63 | </td> | 63 | </td> |
64 | </tr> | 64 | </tr> |
65 | 65 | <tr> | |
66 | <tr> | 66 | <td colspan="2" class="tdright">地下层数</td> |
67 | <td colspan="2" >建筑物高度(m)</td> | ||
68 | <td colspan="4" > | 67 | <td colspan="4" > |
69 | <input class="formInput" :disabled="form.qszt!='0'" v-model="form.jzwgd"> | 68 | <input class="formInput" :disabled="form.qszt!='0'" v-model="form.dxcs"> |
70 | </td> | 69 | </td> |
71 | <td colspan="2" >总套数</td> | 70 | <td colspan="2" class="tdright">地上层数</td> |
72 | <td colspan="4" > | 71 | <td colspan="4" > |
73 | <input class="formInput" :disabled="form.qszt!='0'" v-model="form.zts"> | 72 | <input class="formInput" :disabled="form.qszt!='0'" v-model="form.dscs"> |
74 | </td> | 73 | </td> |
75 | </tr> | 74 | </tr> |
76 | 75 | ||
77 | <tr> | 76 | <tr> |
78 | <td colspan="2" >幢用地面积(㎡)</td> | 77 | <td colspan="2" class="tdright">总层数</td> |
79 | <td colspan="4" > | 78 | <td colspan="4" > |
80 | <input class="formInput" :disabled="form.qszt!='0'" v-model="form.zydmj"> | 79 | <input class="formInput" :disabled="form.qszt!='0'" v-model="form.zcs"> |
81 | </td> | 80 | </td> |
82 | <td colspan="2" >幢占用地面积(㎡)</td> | 81 | <td colspan="2" class="tdright">总套数</td> |
83 | <td colspan="4" > | 82 | <td colspan="4" > |
84 | <input class="formInput" :disabled="form.qszt!='0'" v-model="form.zzdmj"> | 83 | <input class="formInput" :disabled="form.qszt!='0'" v-model="form.zts"> |
85 | </td> | 84 | </td> |
86 | </tr> | ||
87 | 85 | ||
86 | </tr> | ||
88 | <tr> | 87 | <tr> |
89 | <td colspan="2" >预测建筑面积(㎡)</td> | 88 | <td colspan="2" class="tdright">建筑物高度(m)</td> |
90 | <td colspan="4" > | 89 | <td colspan="4" > |
91 | <input class="formInput" :disabled="form.qszt!='0'" v-model="form.ycjzmj"> | 90 | <input class="formInput" :disabled="form.qszt!='0'" v-model="form.jzwgd"> |
92 | </td> | 91 | </td> |
93 | <td colspan="2" >实测建筑面积(㎡)</td> | 92 | <td colspan="2" class="tdright">地下深度(m)</td> |
94 | <td colspan="4" > | 93 | <td colspan="4" > |
95 | <input class="formInput" :disabled="form.qszt!='0'" v-model="form.scjzmj"> | 94 | <input class="formInput" :disabled="form.qszt!='0'" v-model="form.dxsd"> |
96 | </td> | 95 | </td> |
97 | </tr> | 96 | </tr> |
98 | 97 | ||
99 | <tr> | 98 | <tr> |
100 | <td colspan="2" >地下层数</td> | 99 | <td colspan="2" class="tdright">幢用地面积(㎡)</td> |
101 | <td colspan="4" > | 100 | <td colspan="4" > |
102 | <input class="formInput" :disabled="form.qszt!='0'" v-model="form.dxcs"> | 101 | <input class="formInput" :disabled="form.qszt!='0'" v-model="form.zydmj"> |
103 | </td> | 102 | </td> |
104 | <td colspan="2" >地上层数</td> | 103 | <td colspan="2" class="tdright">幢占用地面积(㎡)</td> |
105 | <td colspan="4" > | 104 | <td colspan="4" > |
106 | <input class="formInput" :disabled="form.qszt!='0'" v-model="form.dscs"> | 105 | <input class="formInput" :disabled="form.qszt!='0'" v-model="form.zzdmj"> |
107 | </td> | 106 | </td> |
108 | </tr> | 107 | </tr> |
109 | 108 | ||
110 | <tr> | 109 | <tr> |
111 | <td colspan="2" >总层数</td> | 110 | <td colspan="2" class="tdright">预测建筑面积(㎡)</td> |
112 | <td colspan="4" > | 111 | <td colspan="4" > |
113 | <input class="formInput" :disabled="form.qszt!='0'" v-model="form.zcs"> | 112 | <input class="formInput" :disabled="form.qszt!='0'" v-model="form.ycjzmj"> |
114 | </td> | 113 | </td> |
115 | <td colspan="2" >地下深度(m)</td> | 114 | <td colspan="2" class="tdright">实测建筑面积(㎡)</td> |
116 | <td colspan="4" > | 115 | <td colspan="4" > |
117 | <input class="formInput" :disabled="form.qszt!='0'" v-model="form.dxsd"> | 116 | <input class="formInput" :disabled="form.qszt!='0'" v-model="form.scjzmj"> |
118 | </td> | 117 | </td> |
119 | </tr> | 118 | </tr> |
120 | 119 | ||
120 | |||
121 | |||
121 | <tr> | 122 | <tr> |
122 | <td colspan="2" >产别</td> | 123 | <td colspan="2" class="tdright">产别</td> |
123 | <td colspan="4" > | 124 | <td colspan="4" > |
124 | <el-select v-model="form.fwcbbsm" :disabled="form.qszt!='0'" placeholder="请选择" > | 125 | <el-select v-model="form.fwcbbsm" :disabled="form.qszt!='0'" placeholder="请选择" > |
125 | <el-option | 126 | <el-option |
... | @@ -130,7 +131,7 @@ | ... | @@ -130,7 +131,7 @@ |
130 | </el-option> | 131 | </el-option> |
131 | </el-select> | 132 | </el-select> |
132 | </td> | 133 | </td> |
133 | <td colspan="2" >产权来源</td> | 134 | <td colspan="2" class="tdright">产权来源</td> |
134 | <td colspan="4" > | 135 | <td colspan="4" > |
135 | <el-select v-model="form.fwcqlybsm" :disabled="form.qszt!='0'" placeholder="请选择" > | 136 | <el-select v-model="form.fwcqlybsm" :disabled="form.qszt!='0'" placeholder="请选择" > |
136 | <el-option | 137 | <el-option |
... | @@ -157,6 +158,7 @@ | ... | @@ -157,6 +158,7 @@ |
157 | <el-select-tree style="width:100%" | 158 | <el-select-tree style="width:100%" |
158 | ref="ghyt" | 159 | ref="ghyt" |
159 | v-if="show" | 160 | v-if="show" |
161 | @change="updateSjfyyt(item1)" | ||
160 | :default-expand-all="defaultExpandAll" | 162 | :default-expand-all="defaultExpandAll" |
161 | :multiple="multiple" | 163 | :multiple="multiple" |
162 | :placeholder="placeholder" | 164 | :placeholder="placeholder" |
... | @@ -181,7 +183,7 @@ | ... | @@ -181,7 +183,7 @@ |
181 | :props="treeProps" | 183 | :props="treeProps" |
182 | :check-strictly="checkStrictly" | 184 | :check-strictly="checkStrictly" |
183 | :clearable="clearable" | 185 | :clearable="clearable" |
184 | v-model="item1.fwytzdbsm" | 186 | v-model="item1.fwsjytbsm" |
185 | ></el-select-tree> | 187 | ></el-select-tree> |
186 | </td> | 188 | </td> |
187 | </tr> | 189 | </tr> |
... | @@ -214,7 +216,7 @@ | ... | @@ -214,7 +216,7 @@ |
214 | </tr> | 216 | </tr> |
215 | 217 | ||
216 | <tr> | 218 | <tr> |
217 | <td colspan="2" > | 219 | <td colspan="2" class="tdright"> |
218 | <span>坐落<i class="requisite">*</i></span> | 220 | <span>坐落<i class="requisite">*</i></span> |
219 | </td> | 221 | </td> |
220 | <td colspan="10" > | 222 | <td colspan="10" > |
... | @@ -223,7 +225,7 @@ | ... | @@ -223,7 +225,7 @@ |
223 | </tr> | 225 | </tr> |
224 | 226 | ||
225 | <tr> | 227 | <tr> |
226 | <td colspan="2" rowspan="2" > | 228 | <td colspan="2" rowspan="2" class="tdright"> |
227 | <span>附加说明</span> | 229 | <span>附加说明</span> |
228 | </td> | 230 | </td> |
229 | <td colspan="10" rowspan="2" > | 231 | <td colspan="10" rowspan="2" > |
... | @@ -234,7 +236,7 @@ | ... | @@ -234,7 +236,7 @@ |
234 | </tr> | 236 | </tr> |
235 | 237 | ||
236 | <tr> | 238 | <tr> |
237 | <td colspan="2" rowspan="2" > | 239 | <td colspan="2" rowspan="2" class="tdright"> |
238 | <span>调查意见</span> | 240 | <span>调查意见</span> |
239 | </td> | 241 | </td> |
240 | <td colspan="10" > | 242 | <td colspan="10" > |
... | @@ -243,13 +245,13 @@ | ... | @@ -243,13 +245,13 @@ |
243 | </tr> | 245 | </tr> |
244 | 246 | ||
245 | <tr> | 247 | <tr> |
246 | <td colspan="4" rowspan="2"> | 248 | <td colspan="4" rowspan="2" class="tdright"> |
247 | <span>审查员</span> | 249 | <span>审查员</span> |
248 | </td> | 250 | </td> |
249 | <td colspan="2" > | 251 | <td colspan="2" > |
250 | <input class="formInput" :disabled="form.qszt!='0'" v-model="form.scy"> | 252 | <input class="formInput" :disabled="form.qszt!='0'" v-model="form.scy"> |
251 | </td> | 253 | </td> |
252 | <td colspan="2"> | 254 | <td colspan="2" class="tdright"> |
253 | <span>审查日期</span> | 255 | <span>审查日期</span> |
254 | </td> | 256 | </td> |
255 | <td colspan="2" > | 257 | <td colspan="2" > |
... | @@ -402,6 +404,11 @@ | ... | @@ -402,6 +404,11 @@ |
402 | }, | 404 | }, |
403 | mixins:[geoUtils], | 405 | mixins:[geoUtils], |
404 | methods: { | 406 | methods: { |
407 | |||
408 | updateSjfyyt(data){ | ||
409 | data.fwsjytbsm = data.fwytzdbsm; | ||
410 | }, | ||
411 | |||
405 | registerCall(){ | 412 | registerCall(){ |
406 | let data={ | 413 | let data={ |
407 | type:'zrz', | 414 | type:'zrz', |
... | @@ -814,6 +821,11 @@ | ... | @@ -814,6 +821,11 @@ |
814 | text-align: center; | 821 | text-align: center; |
815 | height: 36px; | 822 | height: 36px; |
816 | } | 823 | } |
824 | .tdright { | ||
825 | text-align: right; | ||
826 | padding-right: 10px; | ||
827 | } | ||
828 | |||
817 | /deep/ .el-input__inner { | 829 | /deep/ .el-input__inner { |
818 | margin: 0; | 830 | margin: 0; |
819 | height: 36px; | 831 | height: 36px; | ... | ... |
-
Please register or sign in to post a comment