Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
f098346b by weimo934
Options

Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem

2 parents 0317fdb6 9a4588de
Expand all
Inline Side-by-side
Showing 17 changed files with 111 additions and 67 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)=>{
......
...@@ -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 // 更新楼盘表
......