Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
3d02f5b4 by 焦泽平
Options

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

2 parents 5e99a5da 8509fedc
Inline Side-by-side
Showing 5 changed files with 112 additions and 159 deletions
...@@ -70,3 +70,13 @@ export function hhb(data) { ...@@ -70,3 +70,13 @@ export function hhb(data) {
70 data: data 70 data: data
71 }) 71 })
72 } 72 }
73 /**
74 * 户分割
75 */
76 export function hfg(data) {
77 return request({
78 url: '/bg/hSplitMerge/hFg',
79 method: 'post',
80 data: data
81 })
82 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -303,141 +303,11 @@ ...@@ -303,141 +303,11 @@
303 </div> 303 </div>
304 </el-tab-pane> 304 </el-tab-pane>
305 <el-tab-pane label="户分割" name="h"> 305 <el-tab-pane label="户分割" name="h">
306 <div class="fg-tabs"> 306 <div class="fg-tabs psn">
307 <span class="tips">分割前户信息</span> 307 <hfghb :isHb = false></hfghb>
308 <el-button type="primary" class="addBtn" @click="newAdd">新增</el-button> 308 <!-- <div class="header-button" :style="{width:fgBoxWidth+'px'}">
309 <div class="fgq">
310 <div class="data">
311 <ul>
312 <li><span>宗地代码:</span>{{hFgqData.zddm}}</li>
313 <li><span>不动产单元号:</span>{{hFgqData.bdcdyh}}</li>
314 <li><span>项目名称:</span>{{hFgqData.xmmc}}</li>
315 <li><span>不动产权证号:</span>{{hFgqData.bdcqzh}}</li>
316 <li><span>权利人:</span>{{hFgqData.qlr}}</li>
317 <li><span>坐落:</span>{{hFgqData.zl}}</li>
318 </ul>
319 </div>
320 <div class="zxx">
321 <div class="dz">
322 <div class="title">
323 <span>多幢信息({{zdZxx.zrzList.length}}个)</span>
324 </div>
325 <ul>
326 <li v-for="(item,index) in zdZxx.zrzList" :key="index">{{item.xmmc}}</li>
327 </ul>
328 </div>
329 <div class="zrz">
330 <div class="title">
331 <span>自然幢信息({{zdZxx.dzList.length}}个)</span>
332 </div>
333 <ul>
334 <li v-for="(item,index) in zdZxx.dzList" :key="index"
335 :class="(index+1)%2===0?'':'oddborder'">{{item.xmmc}}
336 </li>
337 </ul>
338 </div>
339 </div>
340 </div>
341 <div class="fgh">
342 <span class="tips">分割后户信息</span>
343 <table border="1">
344 <tr>
345 <th class="cz">操作</th>
346 <th class="xzq">行政区</th>
347 <th class="djq">地籍区</th>
348 <th class="djzq">地籍子区</th>
349 <th class="syqlx">所有权类型</th>
350 <th class="tdtzm">土地特征码</th>
351 <th class="xmmc">项目名称</th>
352 </tr>
353 <tr v-for="(item,index) in hFghData.newZdlist" :key="index">
354
355 <td class="cz">
356 <el-button
357 type="primary"
358 class="changeBtn outMinus addMinus"
359 @click="delRow(index)"
360 >-
361 </el-button
362 >
363 </td>
364 <td class="xzq">
365 <el-select v-model="item.xzqbsm" @change="changeXzq(item.xzqbsm,index)">
366 <el-option
367 v-for="i in xzq"
368 :key="i.bsm"
369 :label="i.mc"
370 :value="i.bsm"
371 ></el-option>
372 </el-select>
373 </td>
374 <td class="djq">
375 <el-select v-model="item.djqbsm" @change="changeDjq(item.djqbsm,index)">
376 <el-option
377 v-for="i in djq"
378 :key="i.bsm"
379 :label="i.mc"
380 :value="i.bsm"
381 ></el-option>
382 </el-select>
383 </td>
384 <td class="syqlx">
385 <el-select v-model="item.djzqbsm">
386 <el-option
387 v-for="i in djzq"
388 :key="i.bsm"
389 :label="i.mc"
390 :value="i.bsm"
391 ></el-option>
392 </el-select>
393 </td>
394 <td class="tdtzm">
395 <el-select v-model="item.syqlxbsm">
396 <el-option
397 v-for="i in syq"
398 :key="i.value"
399 :label="i.label"
400 :value="i.value"
401 ></el-option>
402 </el-select>
403 </td>
404 <td class="syqlx">
405 <el-select v-model="item.zdtzmbsm">
406 <el-option
407 v-for="i in tdtzm"
408 :key="i.bsm"
409 :label="i.mc"
410 :value="i.bsm"
411 ></el-option>
412 </el-select>
413 </td>
414 <td class="xmmc">
415 <input type="text" v-model="item.xmmc" class="formInput"/>
416 </td>
417 </tr>
418 <tr>
419 <td>
420 <el-button
421 type="primary"
422 class="changeBtn outAdd addMinus"
423 @click="addRow"
424 >+
425 </el-button>
426 </td>
427 <td></td>
428 <td></td>
429 <td></td>
430 <td></td>
431 <td></td>
432 <td></td>
433 </tr>
434 </table>
435 </div>
436 <query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :dylxs="['h']"
437 :isZdClose="true" @close="close"></query-data>
438 <div class="header-button" :style="{width:fgBoxWidth+'px'}">
439 <el-button type="primary" class="saveBtn" @click="save">保存</el-button> 309 <el-button type="primary" class="saveBtn" @click="save">保存</el-button>
440 </div> 310 </div> -->
441 </div> 311 </div>
442 </el-tab-pane> 312 </el-tab-pane>
443 </el-tabs> 313 </el-tabs>
...@@ -454,14 +324,14 @@ ...@@ -454,14 +324,14 @@
454 import {getQjZdjbxxDetailById, zdfg, getZrz} from './../../../../api/zd' 324 import {getQjZdjbxxDetailById, zdfg, getZrz} from './../../../../api/zd'
455 import {getZdxx, ZdfggetZxx,dzfgGetZrzxx,saveDzFg} from './../../../../api/dz' 325 import {getZdxx, ZdfggetZxx,dzfgGetZrzxx,saveDzFg} from './../../../../api/dz'
456 import {getHZdxx} from './../../../../api/h' 326 import {getHZdxx} from './../../../../api/h'
457 import QueryData from './../../../../components/queryData/queryData'
458 import zdQueryData from './../../../../components/zdQueryData/zdQueryData' 327 import zdQueryData from './../../../../components/zdQueryData/zdQueryData'
459 import dzQueryData from './../../../../components/dzQueryData/dzQueryData' 328 import dzQueryData from './../../../../components/dzQueryData/dzQueryData'
460 import {Message} from 'element-ui' 329 import {Message} from 'element-ui'
330 import hfghb from '../hfghb/index'
461 331
462 export default { 332 export default {
463 name: "", 333 name: "",
464 components: {QueryData, zdQueryData,dzQueryData}, 334 components: {zdQueryData,dzQueryData,hfghb},
465 props: {}, 335 props: {},
466 data() { 336 data() {
467 return { 337 return {
...@@ -1177,11 +1047,13 @@ ...@@ -1177,11 +1047,13 @@
1177 } 1047 }
1178 1048
1179 1049
1050 .psn{
1051 position: unset!important;
1052 }
1180 .fg-tabs { 1053 .fg-tabs {
1181 height: auto; 1054 height: auto;
1182 width: 100%; 1055 width: 100%;
1183 position: relative; 1056 position: relative;
1184 top: 20px;
1185 .table { 1057 .table {
1186 margin-top: 12px; 1058 margin-top: 12px;
1187 box-sizing: border-box; 1059 box-sizing: border-box;
......
...@@ -184,11 +184,11 @@ ...@@ -184,11 +184,11 @@
184 </div> 184 </div>
185 </el-tab-pane> 185 </el-tab-pane>
186 <el-tab-pane label="户合并" name="h"> 186 <el-tab-pane label="户合并" name="h">
187 <div class="hb-tabs psn"> 187 <div class="hb-tabs psn" v-if="hhbtabs">
188 <hfghb></hfghb> 188 <hfghb></hfghb>
189 <div class="header-button" :style="{width:fgBoxWidth+'px'}"> 189 <!-- <div class="header-button" :style="{width:fgBoxWidth+'px'}">
190 <el-button type="primary" class="saveBtn">保存</el-button> 190 <el-button type="primary" class="saveBtn">保存</el-button>
191 </div> 191 </div> -->
192 </div> 192 </div>
193 </el-tab-pane> 193 </el-tab-pane>
194 </el-tabs> 194 </el-tabs>
...@@ -201,11 +201,11 @@ ...@@ -201,11 +201,11 @@
201 getListByXzqbsm, 201 getListByXzqbsm,
202 getListByPbsm, 202 getListByPbsm,
203 getDdicByMC 203 getDdicByMC
204 } from "./../../../../api/common"; 204 } from "@api/common";
205 import {ZdHb} from "./../../../../api/zd" 205 import {ZdHb} from "@api/zd"
206 import {saveDzHb} from "./../../../../api/dz" 206 import {saveDzHb} from "@api/dz"
207 import QueryData from './../../../../components/queryData/queryData' 207 import QueryData from '@components/queryData/queryData'
208 import zdQueryData from './../../../../components/zdQueryData/zdQueryData' 208 import zdQueryData from '@components/zdQueryData/zdQueryData'
209 import hfghb from '../hfghb/index' 209 import hfghb from '../hfghb/index'
210 210
211 export default { 211 export default {
...@@ -245,6 +245,7 @@ ...@@ -245,6 +245,7 @@
245 value: "Z", 245 value: "Z",
246 } 246 }
247 ], 247 ],
248 hhbtabs:false,
248 } 249 }
249 }, 250 },
250 created() { 251 created() {
...@@ -257,6 +258,11 @@ ...@@ -257,6 +258,11 @@
257 }) 258 })
258 }, 259 },
259 methods: { 260 methods: {
261 handleClick(tab, event) {
262 if (tab.name == 'h') {
263 this.hhbtabs = true
264 }
265 },
260 save(){ 266 save(){
261 switch (this.tabName) { 267 switch (this.tabName) {
262 case "zd": 268 case "zd":
...@@ -392,9 +398,6 @@ ...@@ -392,9 +398,6 @@
392 }); 398 });
393 } 399 }
394 }, 400 },
395 handleClick(tab, event) {
396 console.log(tab, event);
397 },
398 close: function () { 401 close: function () {
399 this.centerDialogVisible = false; 402 this.centerDialogVisible = false;
400 }, 403 },
......
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
84 <div class="lpb-content" ref="lpbContentWrap" :style="{ height: lpbContentHeight + 'px' }"> 84 <div class="lpb-content" ref="lpbContentWrap" :style="{ height: lpbContentHeight + 'px' }">
85 <!-- 楼盘表主体 --> 85 <!-- 楼盘表主体 -->
86 <div class="lp-overview" :style="{ width: lpbContentwidth + 'px' }"> 86 <div class="lp-overview" :style="{ width: lpbContentwidth + 'px' }">
87 <lpbContent ref="lpbContent" :zrzbsm='zrzbsm' :isHbfg = true></lpbContent> 87 <lpbContent ref="lpbContent" :zrzbsm='zrzbsm' :isHbfg = true :isHb="isHb"></lpbContent>
88 </div> 88 </div>
89 <!-- 右侧图例 --> 89 <!-- 右侧图例 -->
90 <div class="lp-legend"> 90 <div class="lp-legend">
...@@ -215,7 +215,12 @@ import { getLpbMenuTree, batchScYcChange, getLpbTj,batchGeneratorBdcdyh,getLpbFw ...@@ -215,7 +215,12 @@ import { getLpbMenuTree, batchScYcChange, getLpbTj,batchGeneratorBdcdyh,getLpbFw
215 export default { 215 export default {
216 name:"", 216 name:"",
217 components:{lpbContent}, 217 components:{lpbContent},
218 props:{}, 218 props:{
219 isHb:{
220 type:Boolean,
221 default:true
222 }
223 },
219 data(){ 224 data(){
220 return { 225 return {
221 queryData:{ 226 queryData:{
...@@ -299,8 +304,8 @@ export default { ...@@ -299,8 +304,8 @@ export default {
299 created(){}, 304 created(){},
300 mounted(){ 305 mounted(){
301 this.$nextTick(()=>{ 306 this.$nextTick(()=>{
302 this.tableHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 360; 307 this.tableHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 320;
303 this.lpbContentHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 320; 308 this.lpbContentHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 270;
304 this.lpbContentwidth = this.$refs.lpbContentWrap.clientWidth - 34 - 6; 309 this.lpbContentwidth = this.$refs.lpbContentWrap.clientWidth - 34 - 6;
305 }) 310 })
306 }, 311 },
...@@ -495,12 +500,14 @@ export default { ...@@ -495,12 +500,14 @@ export default {
495 </script> 500 </script>
496 <style scoped lang="less"> 501 <style scoped lang="less">
497 .main{ 502 .main{
498 margin-bottom: 14px;
499 .el-row{ 503 .el-row{
500 box-sizing: border-box; 504 box-sizing: border-box;
501 padding-left: 2px; 505 padding-left: 2px;
502 margin-bottom: 6px; 506 margin-bottom: 6px;
503 } 507 }
508 .pagination{
509 padding-bottom: 0!important;
510 }
504 .lpb{ 511 .lpb{
505 box-sizing: border-box; 512 box-sizing: border-box;
506 padding-left: 2px; 513 padding-left: 2px;
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
13 ? 'bottom40 ljz-wrap' 13 ? 'bottom40 ljz-wrap'
14 : 'ljz-wrap' 14 : 'ljz-wrap'
15 " 15 "
16 :style="{'width':ljzWidth+'px'}"
16 v-show="lpbData.ljzs.length > 0" 17 v-show="lpbData.ljzs.length > 0"
17 > 18 >
18 <!-- 循环逻辑幢数据 --> 19 <!-- 循环逻辑幢数据 -->
...@@ -262,6 +263,9 @@ ...@@ -262,6 +263,9 @@
262 <!-- 合并 --> 263 <!-- 合并 -->
263 <li v-show="rightClickFlag == 'hb'" :class="canHb!='zyhb'? 'cantHb':''" @click="handleHb('zyhb')">左右合并</li> 264 <li v-show="rightClickFlag == 'hb'" :class="canHb!='zyhb'? 'cantHb':''" @click="handleHb('zyhb')">左右合并</li>
264 <li v-show="rightClickFlag == 'hb'" :class="canHb!='sxhb'? 'cantHb':''" @click="handleHb('sxhb')">上下合并</li> 265 <li v-show="rightClickFlag == 'hb'" :class="canHb!='sxhb'? 'cantHb':''" @click="handleHb('sxhb')">上下合并</li>
266 <!-- 分割 -->
267 <li v-show="rightClickFlag == 'fg'" @click="handleFg">户分割</li>
268 <!-- <li v-show="rightClickFlag == 'fg'" :class="canHb!='sxhb'? 'cantHb':''" @click="handleHb('sxhb')">上下合并</li> -->
265 269
266 </ul> 270 </ul>
267 <!-- 层操作弹框 --> 271 <!-- 层操作弹框 -->
...@@ -293,6 +297,26 @@ ...@@ -293,6 +297,26 @@
293 <el-button type="primary" @click="saveAddC">保存</el-button> 297 <el-button type="primary" @click="saveAddC">保存</el-button>
294 <el-button type="primary" @click="addCVisible = false">取消</el-button> 298 <el-button type="primary" @click="addCVisible = false">取消</el-button>
295 </div> 299 </div>
300 </el-dialog >
301 <!-- 户分割弹框 -->
302 <el-dialog
303 title = "户分割"
304 :visible.sync="hfgDialogVisible"
305 width="800px"
306 >
307 <el-form :model="fgData">
308 <el-form-item label="分割户数" required="" :label-width="formLabelWidth">
309 <el-input
310 :disabled="fgData.fghs!=''"
311 v-model="fgData.fghs"
312 autocomplete="off"
313 ></el-input>
314 </el-form-item>
315 </el-form>
316 <div class="btnGroup">
317 <el-button type="primary" @click="savefgData">保存</el-button>
318 <el-button type="primary" @click="hfgDialogVisible = false">取消</el-button>
319 </div>
296 </el-dialog> 320 </el-dialog>
297 <move-h 321 <move-h
298 :hbsm="chData.bsm" 322 :hbsm="chData.bsm"
...@@ -304,9 +328,9 @@ ...@@ -304,9 +328,9 @@
304 </div> 328 </div>
305 </template> 329 </template>
306 <script> 330 <script>
307 import moveH from "./../../../../../components/moveH/moveH"; 331 import moveH from "@components/moveH/moveH";
308 import { getLpb, insertUpDownC, deleteCByBsm } from "@api/lpb"; 332 import { getLpb, insertUpDownC, deleteCByBsm } from "@api/lpb";
309 import { hhb } from "@api/h"; 333 import { hhb,hfg } from "@api/h";
310 import { Message } from 'element-ui'; 334 import { Message } from 'element-ui';
311 export default { 335 export default {
312 name: "", 336 name: "",
...@@ -319,6 +343,10 @@ export default { ...@@ -319,6 +343,10 @@ export default {
319 zrzbsm:{ 343 zrzbsm:{
320 type:String, 344 type:String,
321 default:'' 345 default:''
346 },
347 isHb:{
348 type:Boolean,
349 default:true
322 } 350 }
323 }, 351 },
324 data() { 352 data() {
...@@ -363,7 +391,13 @@ export default { ...@@ -363,7 +391,13 @@ export default {
363 yclpbData:{}, 391 yclpbData:{},
364 sclpbData:{}, 392 sclpbData:{},
365 fghbChoosedList:[], 393 fghbChoosedList:[],
366 canHb:''//判断合并类型 394 canHb:'',//判断合并类型
395 hfgDialogVisible:false, //户分割弹框
396 fgData:{
397 fghs:"",
398 oldbsm:'',
399 fgfx:0
400 }
367 }; 401 };
368 }, 402 },
369 created() {}, 403 created() {},
...@@ -433,8 +467,8 @@ export default { ...@@ -433,8 +467,8 @@ export default {
433 dataChange() { 467 dataChange() {
434 //计算逻辑幢宽度 20为marginRight值 468 //计算逻辑幢宽度 20为marginRight值
435 this.ljzWidth = 20; 469 this.ljzWidth = 20;
436 if (this.$refs.ljz != undefined) { 470 if (this.$refs.ljzzdy != undefined) {
437 this.$refs.ljz.forEach((item) => { 471 this.$refs.ljzzdy.forEach((item) => {
438 this.ljzWidth += item.offsetWidth + 20; 472 this.ljzWidth += item.offsetWidth + 20;
439 }); 473 });
440 } else { 474 } else {
...@@ -576,8 +610,9 @@ export default { ...@@ -576,8 +610,9 @@ export default {
576 this.lpbChLeft = e.pageX; 610 this.lpbChLeft = e.pageX;
577 this.lpbChTop = e.pageY; 611 this.lpbChTop = e.pageY;
578 if (this.isHbfg) { 612 if (this.isHbfg) {
579 this.rightClickFlag = 'hb'; 613 this.rightClickFlag = this.isHb ? 'hb':'fg';
580 if (this.fghbChoosedList.length>1) { 614 if (this.fghbChoosedList.length>1) {
615 //合并
581 this.lpbChVisible = true; 616 this.lpbChVisible = true;
582 //判断选中户可以执行的合并类型 617 //判断选中户可以执行的合并类型
583 let chIsSame = this.fghbChoosedList.every((item)=> { 618 let chIsSame = this.fghbChoosedList.every((item)=> {
...@@ -595,6 +630,14 @@ export default { ...@@ -595,6 +630,14 @@ export default {
595 this.canHb = '' 630 this.canHb = ''
596 } 631 }
597 }) 632 })
633 }else{
634 //分割
635 this.lpbChVisible = true;
636 this.fgData.oldbsm = item.bsm;
637 //判断户的实际sjcs为1，只能水平分割
638 this.fgData.fgfx = item.sjcs == 1 ? 0 : 1;
639 //判断户的实际sjhs不为1，分割户数为sjhs的值
640 this.fgData.fghs = item.sjhs == 1 ? '' : item.sjhs;
598 } 641 }
599 }else{ 642 }else{
600 console.log(e, "e"); 643 console.log(e, "e");
...@@ -741,6 +784,24 @@ export default { ...@@ -741,6 +784,24 @@ export default {
741 }else{ 784 }else{
742 785
743 } 786 }
787 },
788 //户分割
789 handleFg(){
790 this.hfgDialogVisible = true;
791 },
792 //户分割保存
793 savefgData(){
794 hfg(this.fgData).then((res) => {
795 if(res.code == 200){
796 Message.success('分割成功');
797 // 清除选中户
798 this.clearChoosedH();
799 this.fghbChoosedList = [];
800 // 更新楼盘表
801 this.getLpb(this.zrzbsm, this.$parent.scyclx);
802 }
803 })
804 .catch(() => {});
744 } 805 }
745 }, 806 },
746 computed: { 807 computed: {
......