Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
9449e558 by 杨威
Options

Merge remote-tracking branch 'origin/master' into master

2 parents f8ad8093 60b00c34
Inline Side-by-side
Showing 3 changed files with 114 additions and 89 deletions
...@@ -603,26 +603,35 @@ ...@@ -603,26 +603,35 @@
603 }, 603 },
604 saveZd() { 604 saveZd() {
605 if(this.zdFghData.oldZdbsm === ''){ 605 if(this.zdFghData.oldZdbsm === ''){
606 Message.info("请选择需要分割的宗地") 606 Message.warning("请选择需要分割的宗地")
607 return 607 return
608 } 608 }
609 if(this.tempBsmList.length === (this.zdZxx.dzList.length + this.zdZxx.zrzList.length)){ 609 if(this.tempBsmList.length === (this.zdZxx.dzList.length + this.zdZxx.zrzList.length)){
610 zdfg(this.zdFghData).then(res => { 610 if (this.zdFghData.newZdlist.every(i => i.xmmc != '')) {
611 if (res.success) { 611 vm.loadingShow('正在保存中');
612 this.$store.state.zdbsms = res.result; 612 zdfg(this.zdFghData).then(res => {
613 //更新目录树 613 vm.loadingHide()
614 this.getTreeByS(res.result); 614 if (res.success) {
615 this.$router.push({ 615 this.$store.state.zdbsms = res.result;
616 path: '/zd', 616 //更新目录树
617 query: { 617 this.getTreeByS(res.result);
618 bsm: res.result[0], 618 this.$router.push({
619 source: 3, //分割标识 619 path: '/zd',
620 } 620 query: {
621 }); 621 bsm: res.result[0],
622 } else { 622 source: 3, //分割标识
623 Message.error("保存失败") 623 }
624 } 624 });
625 }) 625 } else {
626 Message.error("保存失败")
627 }
628 }).catch((err)=>{
629 vm.loadingHide()
630 Message.error(err)
631 })
632 }else{
633 Message.warning("请完善分割后的宗地项目名称后重试")
634 }
626 }else{ 635 }else{
627 this.$message.warning("幢信息未选择完成，无法保存") 636 this.$message.warning("幢信息未选择完成，无法保存")
628 } 637 }
...@@ -1093,7 +1102,7 @@ ...@@ -1093,7 +1102,7 @@
1093 width: calc(100% - 40px); 1102 width: calc(100% - 40px);
1094 /deep/.el-input__inner { 1103 /deep/.el-input__inner {
1095 margin: 0; 1104 margin: 0;
1096 height: 44px; 1105 height: 43px;
1097 outline: none; 1106 outline: none;
1098 border: none; 1107 border: none;
1099 color: #606764; 1108 color: #606764;
......
...@@ -183,25 +183,25 @@ ...@@ -183,25 +183,25 @@
183 switch (row.dylx) { 183 switch (row.dylx) {
184 case "zd": 184 case "zd":
185 this.$store.state.zdbsm = row.glbsm; 185 this.$store.state.zdbsm = row.glbsm;
186 this.getRightTree(row.glbsm,'1'); 186 this.getRightTree(row.glbsm,'0,1,2');
187 break; 187 break;
188 case "zrz": 188 case "zrz":
189 this.$store.state.zrzbsm = row.glbsm; 189 this.$store.state.zrzbsm = row.glbsm;
190 this.getTreeByBsm(row.glbsm,row.dylx,'1'); 190 this.getTreeByBsm(row.glbsm,row.dylx,'0,1,2');
191 break; 191 break;
192 case "h": 192 case "h":
193 case "h0": 193 case "h0":
194 case "h1": 194 case "h1":
195 this.$store.state.hbsm = row.glbsm; 195 this.$store.state.hbsm = row.glbsm;
196 this.getTreeByBsm(row.glbsm,'h','1'); 196 this.getTreeByBsm(row.glbsm,'h','0,1,2');
197 break; 197 break;
198 case "dz": 198 case "dz":
199 this.$store.state.dzbsm = row.glbsm; 199 this.$store.state.dzbsm = row.glbsm;
200 this.getTreeByBsm(row.glbsm,row.dylx,'1'); 200 this.getTreeByBsm(row.glbsm,row.dylx,'0,1,2');
201 break; 201 break;
202 case "gzw": 202 case "gzw":
203 this.$store.state.dzbsm = row.glbsm; 203 this.$store.state.dzbsm = row.glbsm;
204 this.getTreeByBsm(row.glbsm,row.dylx,'1'); 204 this.getTreeByBsm(row.glbsm,row.dylx,'0,1,2');
205 break; 205 break;
206 206
207 default: 207 default:
......
...@@ -28,45 +28,67 @@ ...@@ -28,45 +28,67 @@
28 <!-- <td colspan="4" >--> 28 <!-- <td colspan="4" >-->
29 <!-- <el-input v-model="form.ydybsm" disabled></el-input>--> 29 <!-- <el-input v-model="form.ydybsm" disabled></el-input>-->
30 <!-- </td>--> 30 <!-- </td>-->
31 <td colspan="2" align="center" > 31 <td colspan="2" align="center" >逻辑幢号</td>
32 <span>坐落<i class="requisite">*</i></span> 32 <td colspan="4" >
33 </td> 33 <el-input v-model="form.ljzh" disabled></el-input>
34 <td colspan="4" >
35 <input class="formInput" v-model="form.zl" ref="zl" @blur="inputBlur($event)" :disabled="disableFlag" />
36 </td> 34 </td>
35
37 </tr> 36 </tr>
38 37
39 <tr height="30"> 38 <tr height="30">
40 <td colspan="2" align="center" >逻辑幢号</td> 39 <td colspan="2" align="center" >房屋性质<i class="requisite">*</i></td>
41 <td colspan="4" > 40 <td colspan="4" >
42 <el-input v-model="form.ljzh" disabled></el-input> 41 <el-select v-model="form.fwxzbsm" placeholder="请选择" :disabled="disableFlag" ref="fwxzbsm">
42 <el-option
43 v-for="item in $store.state.fwxzOptions"
44 :key="item.bsm"
45 :label="item.mc"
46 :value="item.bsm">
47 </el-option>
48 </el-select>
43 </td> 49 </td>
44 <td colspan="2" align="center" >层号</td> 50
51 <td colspan="2" align="center" >所在单元</td>
45 <td colspan="4" > 52 <td colspan="4" >
46 <el-input v-model="form.ch" :disabled="disableFlag"></el-input> 53 <el-input v-model="form.zdymc" disabled></el-input>
47 </td> 54 </td>
55
48 </tr> 56 </tr>
49 57
50 <tr height="30"> 58 <tr height="30">
51 <td colspan="2" align="center" >实际层数</td> 59 <td colspan="2" align="center" >层号</td>
52 <td colspan="4" > 60 <td colspan="4" >
53 <el-input v-model="form.sjcs" :disabled="disableFlag"></el-input> 61 <el-input v-model="form.ch" :disabled="disableFlag"></el-input>
54 </td> 62 </td>
63
55 <td colspan="2" align="center" >实际层</td> 64 <td colspan="2" align="center" >实际层</td>
56 <td colspan="4" > 65 <td colspan="4" >
57 <el-input v-model="form.sjc" :disabled="disableFlag"></el-input> 66 <el-input v-model="form.sjc" disabled></el-input>
58 </td> 67 </td>
68
59 </tr> 69 </tr>
60 70
61 <tr height="30"> 71 <tr height="30">
62 <td colspan="2" align="center" >所在单元</td>
63 <td colspan="4" >
64 <el-input v-model="form.zdymc" :disabled="disableFlag"></el-input>
65 </td>
66 <td colspan="2" align="center" >房屋编号</td> 72 <td colspan="2" align="center" >房屋编号</td>
67 <td colspan="4" > 73 <td colspan="4" >
68 <el-input v-model="form.fwbh" :disabled="disableFlag"></el-input> 74 <el-input v-model="form.fwbh" :disabled="disableFlag"></el-input>
69 </td> 75 </td>
76 <td colspan="2" align="center" >实际层数</td>
77 <td colspan="4" >
78 <el-input v-model="form.sjcs" disabled></el-input>
79 </td>
80
81 </tr>
82 <tr height="30">
83 <td colspan="2" align="center" >室号</td>
84 <td colspan="4" >
85 <el-input v-model="form.shbw" :disabled="disableFlag"></el-input>
86 </td>
87 <td colspan="2" align="center" >户号</td>
88 <td colspan="4" >
89 <el-input v-model="form.hh" disabled></el-input>
90 </td>
91
70 </tr> 92 </tr>
71 93
72 <tr height="30"> 94 <tr height="30">
...@@ -81,30 +103,16 @@ ...@@ -81,30 +103,16 @@
81 </el-option> 103 </el-option>
82 </el-select> 104 </el-select>
83 </td> 105 </td>
84 <td colspan="2" align="center" >房屋性质<i class="requisite">*</i></td>
85 <td colspan="4" >
86 <el-select v-model="form.fwxzbsm" placeholder="请选择" :disabled="disableFlag" ref="fwxzbsm">
87 <el-option
88 v-for="item in $store.state.fwxzOptions"
89 :key="item.bsm"
90 :label="item.mc"
91 :value="item.bsm">
92 </el-option>
93 </el-select>
94 </td>
95 </tr>
96 106
97 <tr height="30"> 107 <td colspan="2" align="center" >名义层</td>
98 <td colspan="2" align="center" >户号</td>
99 <td colspan="4" > 108 <td colspan="4" >
100 <el-input v-model="form.hh" :disabled="disableFlag"></el-input> 109 <el-input v-model="form.myc" disabled></el-input>
101 </td>
102 <td colspan="2" align="center" >室号</td>
103 <td colspan="4" >
104 <el-input v-model="form.shbw" :disabled="disableFlag"></el-input>
105 </td> 110 </td>
111
112
106 </tr> 113 </tr>
107 114
115
108 <tr height="30"> 116 <tr height="30">
109 <td colspan="2" align="center" >户型</td> 117 <td colspan="2" align="center" >户型</td>
110 <td colspan="4" > 118 <td colspan="4" >
...@@ -157,52 +165,52 @@ ...@@ -157,52 +165,52 @@
157 165
158 <tr height="30"> 166 <tr height="30">
159 <td colspan="2" rowspan="6" align="center" >预测</td> 167 <td colspan="2" rowspan="6" align="center" >预测</td>
160 <td colspan="2" align="center" >建筑面积（㎡） </td> 168 <td colspan="2" align="center" >建筑面积(㎡)</td>
161 <td colspan="2" align="center" > 169 <td colspan="2" align="center" >
162 <el-input v-model="form.ycjzmj" type="number" :disabled="form.scyclx==='1'||disableFlag"></el-input> 170 <el-input v-model="form.ycjzmj" type="number" :disabled="form.scyclx==='1'||disableFlag"></el-input>
163 </td> 171 </td>
164 <td colspan="2" rowspan="6" align="center" >实测</td> 172 <td colspan="2" rowspan="6" align="center" >实测</td>
165 <td colspan="2" align="center" >建筑面积（㎡）</td> 173 <td colspan="2" align="center" >建筑面积(㎡)</td>
166 <td colspan="2" align="center" > 174 <td colspan="2" align="center" >
167 <el-input v-model="form.scjzmj" type="number" :disabled="form.scyclx==='0'||disableFlag"></el-input> 175 <el-input v-model="form.scjzmj" type="number" :disabled="form.scyclx==='0'||disableFlag"></el-input>
168 </td> 176 </td>
169 </tr> 177 </tr>
170 <tr height="30"> 178 <tr height="30">
171 <td colspan="2" align="center" >套内建筑面积（㎡））</td> 179 <td colspan="2" align="center" >套内建筑面积(㎡)</td>
172 <td colspan="2" align="center" > 180 <td colspan="2" align="center" >
173 <el-input v-model="form.yctnjzmj" type="number" :disabled="form.scyclx==='1'||disableFlag"></el-input> 181 <el-input v-model="form.yctnjzmj" type="number" :disabled="form.scyclx==='1'||disableFlag"></el-input>
174 </td> 182 </td>
175 <td colspan="2" align="center" >套内建筑面积（㎡）</td> 183 <td colspan="2" align="center" >套内建筑面积(㎡)</td>
176 <td colspan="2" align="center" > 184 <td colspan="2" align="center" >
177 <el-input v-model="form.sctnjzmj" type="number" :disabled="form.scyclx==='0'||disableFlag"></el-input> 185 <el-input v-model="form.sctnjzmj" type="number" :disabled="form.scyclx==='0'||disableFlag"></el-input>
178 </td> 186 </td>
179 </tr> 187 </tr>
180 <tr height="30"> 188 <tr height="30">
181 <td colspan="2" align="center" >分摊建筑面积（㎡）</td> 189 <td colspan="2" align="center" >分摊建筑面积(㎡)</td>
182 <td colspan="2" align="center" > 190 <td colspan="2" align="center" >
183 <el-input v-model="form.ycftjzmj" type="number" :disabled="form.scyclx==='1'||disableFlag"></el-input> 191 <el-input v-model="form.ycftjzmj" type="number" :disabled="form.scyclx==='1'||disableFlag"></el-input>
184 </td> 192 </td>
185 <td colspan="2" align="center" >分摊建筑面积（㎡）</td> 193 <td colspan="2" align="center" >分摊建筑面积(㎡)</td>
186 <td colspan="2" align="center" > 194 <td colspan="2" align="center" >
187 <el-input v-model="form.scftjzmj" type="number" :disabled="form.scyclx==='0'||disableFlag"></el-input> 195 <el-input v-model="form.scftjzmj" type="number" :disabled="form.scyclx==='0'||disableFlag"></el-input>
188 </td> 196 </td>
189 </tr> 197 </tr>
190 <tr height="30"> 198 <tr height="30">
191 <td colspan="2" align="center" >地下部分建筑面积（㎡）</td> 199 <td colspan="2" align="center" >地下部分建筑面积(㎡)</td>
192 <td colspan="2" align="center" > 200 <td colspan="2" align="center" >
193 <el-input v-model="form.ycdxbfjzmj" type="number" :disabled="form.scyclx==='1'||disableFlag"></el-input> 201 <el-input v-model="form.ycdxbfjzmj" type="number" :disabled="form.scyclx==='1'||disableFlag"></el-input>
194 </td> 202 </td>
195 <td colspan="2" align="center" >地下部分建筑面积（㎡）</td> 203 <td colspan="2" align="center" >地下部分建筑面积(㎡)</td>
196 <td colspan="2" align="center" > 204 <td colspan="2" align="center" >
197 <el-input v-model="form.scdxbfjzmj" type="number" :disabled="form.scyclx==='0'||disableFlag"></el-input> 205 <el-input v-model="form.scdxbfjzmj" type="number" :disabled="form.scyclx==='0'||disableFlag"></el-input>
198 </td> 206 </td>
199 </tr> 207 </tr>
200 <tr height="30"> 208 <tr height="30">
201 <td colspan="2" align="center" >其它建筑面积（㎡）</td> 209 <td colspan="2" align="center" >其它建筑面积(㎡)</td>
202 <td colspan="2" align="center" > 210 <td colspan="2" align="center" >
203 <el-input v-model="form.ycqtjzmj" type="number" :disabled="form.scyclx==='1'||disableFlag"></el-input> 211 <el-input v-model="form.ycqtjzmj" type="number" :disabled="form.scyclx==='1'||disableFlag"></el-input>
204 </td> 212 </td>
205 <td colspan="2" align="center" >其它建筑面积（㎡）</td> 213 <td colspan="2" align="center" >其它建筑面积(㎡)</td>
206 <td colspan="2" align="center" > 214 <td colspan="2" align="center" >
207 <el-input v-model="form.scqtjzmj" type="number" :disabled="form.scyclx==='0'||disableFlag"></el-input> 215 <el-input v-model="form.scqtjzmj" type="number" :disabled="form.scyclx==='0'||disableFlag"></el-input>
208 </td> 216 </td>
...@@ -217,7 +225,29 @@ ...@@ -217,7 +225,29 @@
217 <input class="formInput" v-model="form.scftxs" type="number" :disabled="form.scyclx==='0'||disableFlag" @blur="inputFtxsBlur($event)" ref="scftxs" /> 225 <input class="formInput" v-model="form.scftxs" type="number" :disabled="form.scyclx==='0'||disableFlag" @blur="inputFtxsBlur($event)" ref="scftxs" />
218 </td> 226 </td>
219 </tr> 227 </tr>
228 <tr height="30">
229 <td colspan="2" align="center" >共有土地面积(㎡)</td>
230 <td colspan="2" >
231 <el-input v-model="form.gytdmj" type="number" :disabled="disableFlag"></el-input>
232 </td>
233 <td colspan="2" align="center" >分摊土地面积(㎡)</td>
234 <td colspan="2" >
235 <el-input v-model="form.fttdmj" type="number" :disabled="disableFlag"></el-input>
236 </td>
237 <td colspan="2" align="center" >多幢独用土地面积(㎡)</td>
238 <td colspan="2" >
239 <el-input v-model="form.dytdmj" type="number" :disabled="disableFlag"></el-input>
240 </td>
241 </tr>
220 242
243 <tr>
244 <td colspan="2" align="center" >
245 <span>坐落<i class="requisite">*</i></span>
246 </td>
247 <td colspan="10" >
248 <input class="formInput" v-model="form.zl" ref="zl" @blur="inputBlur($event)" :disabled="disableFlag" />
249 </td>
250 </tr>
221 251
222 <tr height="30" v-for="(item1,index) in form.fwytList" :key="index"> 252 <tr height="30" v-for="(item1,index) in form.fwytList" :key="index">
223 <td v-if="index===0" colspan="2" :rowspan="ytTitleRowspan" align="center" id="ytTitle"> 253 <td v-if="index===0" colspan="2" :rowspan="ytTitleRowspan" align="center" id="ytTitle">
...@@ -228,10 +258,10 @@ ...@@ -228,10 +258,10 @@
228 @click="addYtInfo" 258 @click="addYtInfo"
229 >+</el-button 259 >+</el-button
230 > 260 >
231 <span>用途<i class="requisite">*</i></span> 261 <span>房屋用途<i class="requisite">*</i></span>
232 </td> 262 </td>
233 263
234 <td width="30" colspan="1" align="center" > 264 <td width="30" colspan="2" align="center" >
235 <el-button 265 <el-button
236 type="primary" 266 type="primary"
237 class="changeBtn addMinus inMinus" 267 class="changeBtn addMinus inMinus"
...@@ -240,7 +270,7 @@ ...@@ -240,7 +270,7 @@
240 > 270 >
241 规划用途 271 规划用途
242 </td> 272 </td>
243 <td width="30" colspan="4" align="center" > 273 <td width="30" colspan="2" align="center" >
244 <el-select-tree 274 <el-select-tree
245 ref="ghyt" 275 ref="ghyt"
246 v-if="show" 276 v-if="show"
...@@ -256,7 +286,7 @@ ...@@ -256,7 +286,7 @@
256 v-model="item1.fwytzdbsm" 286 v-model="item1.fwytzdbsm"
257 ></el-select-tree> 287 ></el-select-tree>
258 </td> 288 </td>
259 <td width="30" colspan="1" align="center" >用途</td> 289 <td width="30" colspan="2" align="center" >用途</td>
260 <td width="30" colspan="4" align="center" > 290 <td width="30" colspan="4" align="center" >
261 <el-select-tree 291 <el-select-tree
262 ref="yt" 292 ref="yt"
...@@ -286,10 +316,10 @@ ...@@ -286,10 +316,10 @@
286 > 316 >
287 <span>房屋结构<i class="requisite">*</i></span> 317 <span>房屋结构<i class="requisite">*</i></span>
288 </td> 318 </td>
289 <td colspan="1" align="center" > 319 <td colspan="2" align="center" >
290 <span @click="deleteFwjgInfo(index)">删除</span> 320 <span @click="deleteFwjgInfo(index)">房屋结构</span>
291 </td> 321 </td>
292 <td colspan="9" > 322 <td colspan="8" >
293 <el-select v-model="item1.fwjgzdbsm" ref="fwjg" placeholder="请选择" :disabled="disableFlag"> 323 <el-select v-model="item1.fwjgzdbsm" ref="fwjg" placeholder="请选择" :disabled="disableFlag">
294 <el-option 324 <el-option
295 v-for="item in $store.state.jgOptions" 325 v-for="item in $store.state.jgOptions"
...@@ -301,20 +331,6 @@ ...@@ -301,20 +331,6 @@
301 </td> 331 </td>
302 </tr> 332 </tr>
303 333
304 <tr height="30">
305 <td colspan="2" align="center" >共有土地面积（㎡）</td>
306 <td colspan="2" >
307 <el-input v-model="form.gytdmj" type="number" :disabled="disableFlag"></el-input>
308 </td>
309 <td colspan="2" align="center" >分摊土地面积（㎡）</td>
310 <td colspan="2" >
311 <el-input v-model="form.fttdmj" type="number" :disabled="disableFlag"></el-input>
312 </td>
313 <td colspan="2" align="center" >多幢独用土地面积（㎡）</td>
314 <td colspan="2" >
315 <el-input v-model="form.dytdmj" type="number" :disabled="disableFlag"></el-input>
316 </td>
317 </tr>
318 334
319 335
320 <tr> 336 <tr>
......