Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
03f28a9f by zhaoqian
Options

Merge remote-tracking branch 'origin/master'

2 parents 19a39201 5bf3d73b
Inline Side-by-side
Showing 8 changed files with 1064 additions and 170 deletions
...@@ -33,3 +33,14 @@ export function dzList(data) { ...@@ -33,3 +33,14 @@ export function dzList(data) {
33 data:data 33 data:data
34 }) 34 })
35 } 35 }
36 /**
37 * 多幢分割选择自然幢列表
38 * @param data
39 */
40 export function zrzList(data) {
41 return request({
42 url:'/fw/qjZrz/zrzList',
43 method:'post',
44 data:data
45 })
46 }
......
1 <template>
2 <div class="hb-tabs top20">
3 <div class="hbq">
4 <span class="tips" style="margin-left:0;">合并前多幢信息</span>
5 <table border="1">
6 <tr>
7 <td class="xh">序号</td>
8 <td class="zddm">宗地代码</td>
9 <td class="bdcdyh">不动产单元号</td>
10 <td class="xmmc">项目名称</td>
11 <td class="bdcqzh">不动产权证号</td>
12 <td class="qlr">权利人</td>
13 <td class="zl">坐落</td>
14 <td class="">
15 <el-button
16 type="primary"
17 class="changeBtn outAdd addMinus"
18 @click="newAddDz"
19 >+
20 </el-button>
21 <el-button
22 type="primary"
23 class="changeBtn outAdd addMinus"
24 @click="newAddZrz"
25 >+
26 </el-button>
27 </td>
28 </tr>
29 <tr v-if="dzhbqData.length==0">
30 <td colspan="8">
31 <span class="noData">暂无数据</span>
32 </td>
33 </tr>
34 <tr v-else v-for="(item,index) in dzhbqData" :key="index">
35 <td class="xh">{{index+1}}</td>
36 <td class="zddm">{{item.zddm}}</td>
37 <td class="bdcdyh">{{item.bdcdyh}}</td>
38 <td class="xmmc">{{item.xmmc}}</td>
39 <td class="bdcqzh">{{item.bdcqzh}}</td>
40 <td class="qlr">{{item.qlr}}</td>
41 <td class="zl">{{item.zl}}</td>
42 <td class="cz">
43 <el-button
44 type="primary"
45 class="changeBtn outMinus addMinus"
46 @click="deleteData(index)"
47 >-
48 </el-button>
49 </td>
50 </tr>
51 </table>
52 </div>
53 <div class="hbh dzhbh">
54 <span class="tips" style="width:100%;display:block;margin-left:0;">合并后多幢信息</span>
55 <el-card class="data">
56 <div slot="header" class="clearfix">
57 <span>多幢基本信息</span>
58 </div>
59 <ul class="zdjbxx">
60 <li>
61 <span class="label">行政区:</span>
62 <span class="value">
63 <el-select v-model="dzhbhData.xzqbsm" @change="changeXzq(dzhbhData.xzqbsm)">
64 <el-option
65 v-for="i in xzq"
66 :key="i.bsm"
67 :label="i.mc"
68 :value="i.bsm"
69 ></el-option>
70 </el-select>
71 </span>
72 </li>
73 <li>
74 <span class="label">地籍区:</span>
75 <span class="value">
76 <el-select v-model="dzhbhData.djqbsm" @change="changeDjq(dzhbhData.djqbsm)">
77 <el-option
78 v-for="i in djq"
79 :key="i.bsm"
80 :label="i.mc"
81 :value="i.bsm"
82 ></el-option>
83 </el-select>
84 </span>
85 </li>
86 <li>
87 <span class="label">地籍子区:</span>
88 <span class="value">
89 <el-select v-model="dzhbhData.djzqbsm" @change="$forceUpdate()">
90 <el-option
91 v-for="i in djzq"
92 :key="i.bsm"
93 :label="i.mc"
94 :value="i.bsm"
95 ></el-option>
96 </el-select>
97 </span>
98 </li>
99 <li>
100 <span class="label">所有权类型:</span>
101 <span class="value">
102 <el-select v-model="dzhbhData.syqlxbsm">
103 <el-option
104 v-for="i in syq"
105 :key="i.value"
106 :label="i.label"
107 :value="i.value"
108 ></el-option>
109 </el-select>
110 </span>
111 </li>
112 <li>
113 <span class="label">宗地特征码:</span>
114 <span class="value">
115 <el-select v-model="dzhbhData.zdtzmbsm">
116 <el-option
117 v-for="i in $store.state.zdtzmList"
118 :key="i.bsm"
119 :label="i.mc"
120 :value="i.bsm"
121 ></el-option>
122 </el-select>
123 </span>
124 </li>
125 <li>
126 <span class="label">项目名称:</span>
127 <span class="value">
128 <el-input type="text" v-model="dzhbhData.xmmc"></el-input>
129 </span>
130 </li>
131 </ul>
132 </el-card>
133 <div class="zxx">
134 <el-card class="zrz">
135 <div slot="header" class="clearfix">
136 <span style="margin-right:10px">幢信息</span>
137 <span style="margin-right:10px"><i class="iconfont iconduochuang"></i>多幢<span
138 style="color:red">{{dzList.length}}</span>幢</span>
139 <span><i class="iconfont iconziranchuang"></i>自然幢<span
140 style="color:red">{{zrzList.length}}</span>幢</span>
141 </div>
142 <ul>
143 <li v-for="(item,index) in dzList" :key="index"
144 >
145 <i class="iconfont iconduochuang"></i> {{item.xmmc}}
146 </li>
147 <li v-for="(item,index) in zrzList" :key="index"
148 >
149 <i class="iconfont iconziranchuang"></i> {{item.xmmc}}
150 </li>
151 </ul>
152 </el-card>
153 </div>
154 </div>
155 <div class="header-button">
156 <el-button type="primary" class="saveBtn" @click="save">保存</el-button>
157 </div>
158 <el-dialog
159 title="新增多幢"
160 :visible.sync="dzIsVisible"
161 width="70%"
162 @close="dzClose"
163 :modal-append-to-body="false"
164 >
165 <div class="search">
166 <el-row>
167 <el-col :span="24">
168 <el-form :inline="true" class="demo-form-inline">
169 <el-form-item label="宗地编码">
170 <el-input
171 v-model="queryData.zddm"
172 placeholder="输入宗地编码"
173 ></el-input>
174 </el-form-item>
175 <el-form-item label="不动产权证号">
176 <el-input
177 v-model="queryData.bdcqzh"
178 placeholder="输入不动产权证号"
179 ></el-input>
180 </el-form-item>
181 <el-form-item label="不动产单元号">
182 <el-input
183 maxlength="28"
184 v-model="queryData.bdcdyh"
185 placeholder="输入不动产单元号"
186 ></el-input>
187 </el-form-item>
188 <el-button type="primary" style="margin-left:30px" @click="search">查询</el-button>
189 <el-button type="warning" @click="reset">重置</el-button>
190 </el-form>
191 </el-col>
192 </el-row>
193 <el-row>
194 <el-col :span="24">
195 <el-form :inline="true" class="demo-form-inline">
196 <el-form-item label="权利人">
197 <el-input
198 v-model="queryData.qlrmc"
199 placeholder="输入权利人"
200 ></el-input>
201 </el-form-item>
202 <el-form-item label="坐落">
203 <el-input
204 v-model="queryData.zl"
205 placeholder="输入坐落"
206 ></el-input>
207 </el-form-item>
208 </el-form>
209 </el-col>
210 </el-row>
211 <div class="table-data">
212 <table border="1">
213 <tr>
214 <td>序号</td>
215 <td>操作</td>
216 <td>宗地代码</td>
217 <td>不动产单元号</td>
218 <td>项目名称</td>
219 <td>不动产权证号</td>
220 <td>权利人</td>
221 <td>坐落</td>
222 <td>自然幢数量</td>
223 </tr>
224 <tr v-if="Data.length==0">
225 <td colspan="9">
226 <span class="noData">暂无数据</span>
227 </td>
228 </tr>
229 <tr v-else v-for="(item,index) in Data" :key="index">
230 <td>{{index+1}}</td>
231 <td @click="addDzData(item)" class="xz">
232 <span>选择</span>
233 </td>
234 <td>{{item.zddm}}</td>
235 <td>{{item.bdcdyh}}</td>
236 <td>{{item.xmmc}}</td>
237 <td>{{item.bdcqzh}}</td>
238 <td>{{item.qlr}}</td>
239 <td>{{item.zl}}</td>
240 <td>{{item.zrzCount}}</td>
241 </tr>
242 </table>
243 </div>
244 </div>
245 <div class="page">
246 <el-pagination
247 background
248 layout="prev, pager, next,total"
249 :page-size="queryData.pageSize"
250 :total="total"
251 @current-change="currentChange"
252 >
253 </el-pagination>
254 </div>
255 </el-dialog>
256 <el-dialog
257 title="新增自然幢"
258 :visible.sync="zrzIsVisible"
259 width="70%"
260 @close="zrzClose"
261 :modal-append-to-body="false"
262 >
263 <div class="search">
264 <el-row>
265 <el-col :span="24">
266 <el-form :inline="true" class="demo-form-inline">
267 <el-form-item label="宗地编码">
268 <el-input
269 v-model="queryData.zddm"
270 placeholder="输入宗地编码"
271 ></el-input>
272 </el-form-item>
273 <el-form-item label="不动产权证号">
274 <el-input
275 v-model="queryData.bdcqzh"
276 placeholder="输入不动产权证号"
277 ></el-input>
278 </el-form-item>
279 <el-form-item label="不动产单元号">
280 <el-input
281 maxlength="28"
282 v-model="queryData.bdcdyh"
283 placeholder="输入不动产单元号"
284 ></el-input>
285 </el-form-item>
286 <el-button type="primary" style="margin-left:30px" @click="search">查询</el-button>
287 <el-button type="warning" @click="reset">重置</el-button>
288 </el-form>
289 </el-col>
290 </el-row>
291 <el-row>
292 <el-col :span="24">
293 <el-form :inline="true" class="demo-form-inline">
294 <el-form-item label="权利人">
295 <el-input
296 v-model="queryData.qlrmc"
297 placeholder="输入权利人"
298 ></el-input>
299 </el-form-item>
300 <el-form-item label="坐落">
301 <el-input
302 v-model="queryData.zl"
303 placeholder="输入坐落"
304 ></el-input>
305 </el-form-item>
306 </el-form>
307 </el-col>
308 </el-row>
309 <div class="table-data">
310 <table border="1">
311 <tr>
312 <td>序号</td>
313 <td>操作</td>
314 <td>宗地代码</td>
315 <td>不动产单元号</td>
316 <td>项目名称</td>
317 <td>不动产权证号</td>
318 <td>权利人</td>
319 <td>坐落</td>
320 </tr>
321 <tr v-if="Data.length==0">
322 <td colspan="8">
323 <span class="noData">暂无数据</span>
324 </td>
325 </tr>
326 <tr v-else v-for="(item,index) in Data" :key="index">
327 <td>{{index+1}}</td>
328 <td @click="addZrzData(item)" class="xz">
329 <span>选择</span>
330 </td>
331 <td>{{item.zddm}}</td>
332 <td>{{item.bdcdyh}}</td>
333 <td>{{item.xmmc}}</td>
334 <td>{{item.bdcqzh}}</td>
335 <td>{{item.qlr}}</td>
336 <td>{{item.zl}}</td>
337 </tr>
338 </table>
339 </div>
340 </div>
341 <div class="page">
342 <el-pagination
343 background
344 layout="prev, pager, next,total"
345 :page-size="queryData.pageSize"
346 :total="total"
347 @current-change="currentChange"
348 >
349 </el-pagination>
350 </div>
351 </el-dialog>
352 </div>
353 </template>
354
355 <script>
356 import {
357 getAllList,
358 getListByXzqbsm,
359 getListByPbsm,
360 getDdicByMC
361 } from "@api/common";
362 import {dzList, zrzList} from './../../api/search'
363 import {getQjZdjbxxDetailById} from './../../api/zd'
364
365 export default {
366 name: "dzHb",
367 data() {
368 return {
369 total: 1,
370 dzIsVisible: false,
371 zrzIsVisible: false,
372 dzhbqData: [], // 多幢合并前数据
373 dzhbhData: {}, // 多幢合并后数据
374 Data: [],
375 xzq: [],
376 djq: [],
377 djzq: [],
378 dzList: [],
379 zrzList: [],
380 zdbsm: '',
381 queryData: {
382 bdcdyh: "",
383 bdcqzh: "",
384 qlrmc: "",
385 xmmc: "",
386 zddm: "",
387 zl: "",
388 pageNo: 1,
389 pageSize: 10,
390 },
391 syq: [
392 {
393 label: "国家所有",
394 value: "G",
395 },
396 {
397 label: "集体所有",
398 value: "J",
399 },
400 {
401 label: "土地所有权未确定或有争议",
402 value: "Z",
403 }
404 ],
405 }
406 },
407 mounted() {
408 this.getXzqList();
409 },
410 methods: {
411 getZdData(id) {
412 getQjZdjbxxDetailById(id).then(res => {
413 this.dzhbhData.xzqbsm = res.result.xzqbsm
414 this.changeXzq(this.dzhbhData.xzqbsm)
415 this.dzhbhData.djqbsm = res.result.djqbsm
416 this.changeDjq(this.dzhbhData.djqbsm)
417 this.dzhbhData.djzqbsm = res.result.djzqbsm
418 this.dzhbhData.syqlxbsm = res.result.syqlxbsm
419 this.dzhbhData.zdtzmbsm = res.result.zdtzmbsm
420 })
421 },
422 newAddDz() {
423 this.dzIsVisible = true;
424 this.geDztData(this.queryData)
425 },
426 newAddZrz() {
427 this.zrzIsVisible = true;
428 this.geZrztData(this.queryData)
429 },
430 deleteData(index) {
431 let data = this.dzhbqData[index];
432 // 多幢
433 if (data.zrzCount) {
434 let dzIndex = this.dzList.indexOf(data);
435 this.dzList.splice(dzIndex, 1);
436
437 } else {
438 let zrzIndex = this.zrzList.indexOf(data);
439 this.zrzList.splice(zrzIndex, 1)
440 }
441 this.dzhbqData.splice(index, 1)
442 if (this.dzhbqData.length === 0) {
443 this.dzhbhData.xzqbsm = ""
444 this.dzhbhData.djqbsm = ""
445 this.dzhbhData.djzqbsm = ""
446 this.dzhbhData.syqlxbsm = ""
447 this.dzhbhData.zdtzmbsm = ""
448 }
449 },
450 save() {
451 },
452 dzClose() {
453 this.dzIsVisible = false;
454 },
455 zrzClose() {
456 this.zrzIsVisible = false;
457 },
458 currentChange(val) {
459 this.queryData.pageNo = val;
460 this.geDztData(this.queryData);
461 },
462 geDztData(data) {
463 dzList(data).then(res => {
464 this.Data = res.result.records
465 this.total = res.result.total;
466 })
467 },
468 geZrztData(data) {
469 zrzList(data).then(res => {
470 this.Data = res.result.records
471 this.total = res.result.total;
472 })
473 },
474 search() {
475 this.geDztData(this.queryData)
476 },
477 addData(data) {
478 if (this.dzhbqData.length === 0) {
479 this.zdbsm = data.zdbsm;
480 }
481 this.zrzIsVisible = false;
482 this.dzIsVisible = false;
483 this.dzhbqData.push(data);
484 },
485 addDzData(data) {
486 let arr = [];
487 arr = this.dzhbqData.filter(i => i.bsm === data.bsm);
488 if (arr.length > 0) {
489 this.$message.info("当前多幢已选择,请重新选择")
490 return
491 }
492 arr = this.dzhbqData.filter(i => i.zdbsm !== data.zdbsm);
493 if (arr.length > 0) {
494 this.$confirm('当前选择多幢不在同一宗地下,是否继续选择？')
495 .then(_ => {
496 this.dzList.push(data)
497 this.addData(data)
498 return
499 })
500 .catch(_ => {
501 return
502 });
503 } else {
504 this.dzList.push(data);
505 this.addData(data)
506 }
507 },
508 addZrzData(data) {
509 let arr = [];
510 arr = this.dzhbqData.filter(i => i.bsm === data.bsm);
511 if (arr.length > 0) {
512 this.$message.info("当前自然幢已选择,请重新选择")
513 return
514 }
515 arr = this.dzhbqData.filter(i => i.zdbsm !== data.zdbsm);
516 if (arr.length > 0) {
517 this.$confirm('当前选择多幢不在同一宗地下,是否继续选择？')
518 .then(_ => {
519 this.zrzList.push(data)
520 this.addData(data)
521 return
522 })
523 .catch(_ => {
524 return
525 });
526 }else {
527 this.zrzList.push(data)
528 this.addData(data)
529 }
530 },
531 getXzqList() {
532 getAllList()
533 .then((res) => {
534 this.xzq = res.result;
535 })
536 .catch((error) => {
537 });
538 },
539 changeXzq(id) {
540 this.djq = [];
541 this.djzq = [];
542 switch (this.tabName) {
543 case "zd":
544 this.zdhbhData.djqbsm = '';
545 this.zdhbhData.djzqbsm = '';
546 break
547 case "dz":
548 this.zdhbhData.djqbsm = '';
549 this.zdhbhData.djzqbsm = '';
550 break
551 default:
552 break
553 }
554 getListByXzqbsm(id)
555 .then((res) => {
556 if (res.result == null) {
557 this.djq = null;
558 } else {
559 this.djq = res.result;
560 }
561 })
562 .catch((error) => {
563 });
564 },
565 changeDjq(item) {
566 this.djzq = [];
567 this.dzhbqData.djzqbsm = '';
568 if (item == null) {
569 } else {
570 getListByPbsm(item)
571 .then((res) => {
572 if (res.result == null) {
573 this.djzq = null;
574 } else {
575 this.djzq = res.result;
576 }
577 })
578 .catch((error) => {
579 });
580 }
581 },
582 reset() {
583 this.queryData = {
584 bdcdyh: "",
585 bdcqzh: "",
586 qlrmc: "",
587 xmmc: "",
588 zddm: "",
589 zl: "",
590 pageNo: 1,
591 pageSize: 10
592 };
593 this.geDztData(this.queryData)
594 },
595 },
596 watch: {
597 zdbsm: function (bsm) {
598 this.getZdData(bsm)
599 }
600 }
601 }
602 </script>
603
604 <style scoped lang="less">
605 .hb {
606 .menu {
607 /deep/ .el-tabs__content {
608 position: unset;
609 margin-top: 62px;
610 overflow: visible;
611 }
612 /deep/ .el-tabs__header {
613 position: -webkit-fixed;
614 position: fixed;
615 top: 120px;
616 z-index: 999;
617 width: 100%;
618 margin-bottom: 0;
619 border: 0;
620 /deep/ .el-tabs__nav-scroll {
621 height: 50px;
622 box-sizing: border-box;
623 padding-left: 20px;
624 .el-tabs__active-bar {
625 display: none;
626 }
627 > .el-tabs__nav {
628 border: 0;
629 > .el-tabs__item {
630 border: 1px solid #DEDEDE;
631 height: 36px;
632 line-height: 32px;
633 padding: 0 20px;
634 margin: 9px 10px 9px 0;
635 background-color: #ffffff;
636 }
637 .is-active {
638 color: #006CFF;
639 border: 1px solid #006CFF;
640 }
641 }
642 }
643 /deep/ .el-tabs__nav-wrap::after {
644 width: 0;
645 }
646 }
647 }
648 }
649
650 .psn {
651 position: unset !important;
652 }
653
654 .hb-tabs {
655 height: auto;
656 width: 100%;
657 position: relative;
658
659 .addBtn {
660 position: absolute;
661 right: 30px;
662 top: 0;
663 z-index: 999;
664 }
665 .header {
666 box-sizing: border-box;
667 padding: 18px 18px 0 18px;
668 display: flex;
669 justify-items: left;
670 span {
671 width: 130px;
672 line-height: 40px;
673 color: #9B9B9B;
674 }
675 .el-input {
676 width: 200px;
677 margin-right: 20px;
678 }
679 }
680
681 .header-button {
682 width: 1624px;
683 height: 50px;
684 position: fixed;
685 bottom: 0;
686 text-align: center;
687 background-color: #ffffff;
688 }
689 table {
690 margin-top: 10px;
691 background-color: #fff;
692 font-size: 14px;
693 width: 100%;
694 tr:nth-of-type(odd) {
695 background: #FAFAFA;
696 th {
697 height: 36px;
698 }
699 }
700 .formInput {
701 margin: 0;
702 height: 36px;
703 outline: none;
704 border: none;
705 color: #606764;
706 overflow: visible;
707 text-align: center;
708 cursor: text;
709 }
710 tr:hover {
711 background-color: #F5F7FA;
712 }
713
714 }
715
716 td {
717 text-align: center;
718 height: 40px;
719 min-width: 50px;
720 }
721
722 table:hover {
723 cursor: pointer;
724 }
725
726 .noData {
727 color: #b2b2b2;
728 }
729 .saveBtn {
730 background-color: #00CACD;
731 border-color: #00CACD;
732 padding: 10px 30px;
733 margin-top: 8px;
734 }
735 .saveBtn:hover {
736 background-color: rgba(0, 202, 205, .8);
737 border-color: rgba(0, 202, 205, .8);
738 }
739 .xh {
740 width: 100px;
741 }
742 .xzq, .djq, .djzq {
743 width: 150px;
744 }
745 .tips {
746 color: #9B9B9B;
747 margin-left: 20px;
748 margin-bottom: 14px;
749 }
750 .hbq {
751 margin: 14px 20px 20px 20px;
752 }
753 .dzhbh {
754 box-sizing: border-box !important;
755 padding: 0 18px 0 0 !important;
756 margin-top: 10px !important;
757 display: block !important;
758 }
759 .hbh {
760 margin-left: 20px;
761 margin-top: 14px;
762 margin-bottom: 70px;
763 display: flex;
764 flex-direction: column;
765 flex-flow: nowrap;
766 .data {
767 width: 40%;
768 float: left;
769 }
770 .el-card {
771 border: 1px solid #E6E6E6;
772 background-color: white;
773 overflow: auto;
774 .clearfix {
775 span {
776 color: #9B9B9B;
777 }
778 }
779 /deep/ .el-card__body {
780 padding: 10px 12px;
781 }
782 ul {
783 li {
784 padding: 5px;
785 line-height: 20px;
786 color: #4A4A4A;
787 .label {
788 vertical-align: middle;
789 color: #4A4A4A;
790 display: inline-block;
791 width: 104px;
792 text-align: right;
793 }
794 .value {
795 vertical-align: middle;
796 color: #6D7278;
797 display: inline-block;
798 padding-left: 10px;
799 width: calc(100% - 116px);
800 word-break: break-all;
801 }
802 }
803 .hasChoosed {
804 color: #BBB;
805 }
806 }
807 .zdjbxx {
808 width: 100%;
809 height: 320px;
810 margin-bottom: 10px;
811 float: left;
812 }
813 .zdmap {
814 width: calc(100% - 380px);
815 height: 200px;
816 float: left;
817 }
818 }
819 .zxx {
820 width: calc(60% - 40px);
821 margin-left: 20px;
822 display: flex;
823 flex-direction: column;
824 flex-flow: nowrap;
825 float: left;
826 .title {
827 color: red;
828 text-align: center;
829 padding: 5px 0;
830 }
831 /deep/ .el-card__body {
832 height: 320px;
833 overflow-y: scroll;
834 position: relative;
835 }
836 .line {
837 width: 1px;
838 height: calc(100% - 20px);
839 background-color: #EDEDED;
840 position: absolute;
841 top: 10px;
842 left: 50%;
843 }
844 .dz {
845 width: 33%;
846 overflow: auto;
847 ul {
848 li {
849 width: 96% !important;
850 }
851 }
852
853 }
854 .zrz {
855 width: 100%;
856 overflow: auto;
857 }
858 ul {
859 overflow: auto;
860 width: 100%;
861 float: left;
862 margin-left: 10px;
863 li {
864 width: 23%;
865 padding: 5px;
866 text-align: left;
867 line-height: 20px;
868 display: inline-block;
869 .label {
870 width: 90px;
871 }
872 }
873 li:nth-of-type(even) {
874 .label {
875 width: 110px;
876 text-indent: 20px;
877 }
878 }
879 }
880 }
881 }
882 }
883
884 .cz {
885 color: blue;
886 }
887
888 .cz:hover {
889 color: blue;
890 text-decoration: underline;
891 }
892
893 .xz {
894 color: blue;
895 }
896
897 .table-data {
898 height: 480px;
899 }
900
901 /deep/ .el-select {
902 width: 100%;
903 }
904 </style>
1 <template> 1 <template>
2 <el-row> 2 <el-row>
3 <el-col :span="24"> 3 <el-col :span="24" style="margin-left: -10px;">
4 <el-row> 4 <el-row>
5 <el-col :span="24"> 5 <el-col :span="24">
6 <el-form :inline="true" class="demo-form-inline" label-width="106px"> 6 <el-form :inline="true" class="demo-form-inline" label-width="106px">
7 <el-form-item label="宗地编码"> 7 <el-form-item label="不动产单元号">
8 <el-input 8 <el-input
9 v-model="queryData.zddm" 9 maxlength="28"
10 placeholder="输入宗地编码" 10 v-model="queryData.bdcdyh"
11 placeholder="输入不动产单元号"
11 @change="query" 12 @change="query"
12 ></el-input> 13 ></el-input>
13 </el-form-item> 14 </el-form-item>
...@@ -18,11 +19,10 @@ ...@@ -18,11 +19,10 @@
18 @change="query" 19 @change="query"
19 ></el-input> 20 ></el-input>
20 </el-form-item> 21 </el-form-item>
21 <el-form-item label="不动产单元号:"> 22 <el-form-item label="宗地编码">
22 <el-input 23 <el-input
23 maxlength="28" 24 v-model="queryData.zddm"
24 v-model="queryData.bdcdyh" 25 placeholder="输入宗地编码"
25 placeholder="输入不动产单元号"
26 @change="query" 26 @change="query"
27 ></el-input> 27 ></el-input>
28 </el-form-item> 28 </el-form-item>
...@@ -41,6 +41,13 @@ ...@@ -41,6 +41,13 @@
41 <el-row class="row3" v-if="ismore"> 41 <el-row class="row3" v-if="ismore">
42 <el-col :span="22"> 42 <el-col :span="22">
43 <el-form :inline="true" class="demo-form-inline" label-width="106px"> 43 <el-form :inline="true" class="demo-form-inline" label-width="106px">
44 <el-form-item label="不动产权证号">
45 <el-input
46 placeholder="输入不动产权证号"
47 v-model="queryData.bdcqzh"
48 @change="query"
49 ></el-input>
50 </el-form-item>
44 <el-form-item label="权利人名称"> 51 <el-form-item label="权利人名称">
45 <el-input 52 <el-input
46 placeholder="输入权利人名称" 53 placeholder="输入权利人名称"
...@@ -48,20 +55,13 @@ ...@@ -48,20 +55,13 @@
48 @change="query" 55 @change="query"
49 ></el-input> 56 ></el-input>
50 </el-form-item> 57 </el-form-item>
51 <el-form-item label="坐落:"> 58 <el-form-item label="坐落">
52 <el-input 59 <el-input
53 v-model="queryData.zl" 60 v-model="queryData.zl"
54 placeholder="输入坐落地址" 61 placeholder="输入坐落地址"
55 @change="query" 62 @change="query"
56 ></el-input> 63 ></el-input>
57 </el-form-item> 64 </el-form-item>
58 <el-form-item label="不动产权证号">
59 <el-input
60 placeholder="输入不动产权证号"
61 v-model="queryData.bdcqzh"
62 @change="query"
63 ></el-input>
64 </el-form-item>
65 </el-form> 65 </el-form>
66 </el-col> 66 </el-col>
67 <el-col :span="2" :offset="offset"> 67 <el-col :span="2" :offset="offset">
......
...@@ -165,19 +165,11 @@ export default { ...@@ -165,19 +165,11 @@ export default {
165 this.getTreeList(); 165 this.getTreeList();
166 } 166 }
167 }, 167 },
168 "$store.state.zdbsm": function(bsm) {
169 this.getRightTree(bsm);
170 },
171 "$store.state.zrzbsm": function(bsm) {
172 this.getRightTreeByZrzbsm(this.$store.state.zrzbsm);
173 },
174
175 "$store.state.treeData":function (val) { 168 "$store.state.treeData":function (val) {
176 console.log(val,'val');
177 this.pd = val; 169 this.pd = val;
178 }, 170 },
179 '$store.state.treeZdbsm':function (val) { 171 '$store.state.treeZdbsm':function (val) {
180 console.log(val,'val'); 172 // console.log(val,'val');
181 }, 173 },
182 }, 174 },
183 mounted(){ 175 mounted(){
...@@ -210,7 +202,10 @@ export default { ...@@ -210,7 +202,10 @@ export default {
210 icon: "iconfont icontianjia", 202 icon: "iconfont icontianjia",
211 path: "/add", 203 path: "/add",
212 }, 204 },
213 { name: "更正", icon: "iconfont icongengzheng", path: "/modify" }, 205 {
206 name: "更正",
207 icon: "iconfont icongengzheng",
208 path: "/modify" },
214 { 209 {
215 name: "变更", 210 name: "变更",
216 icon: "iconfont iconbiangeng", 211 icon: "iconfont iconbiangeng",
......
...@@ -294,7 +294,7 @@ ...@@ -294,7 +294,7 @@
294 </table> 294 </table>
295 </div> 295 </div>
296 <dz-query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" 296 <dz-query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible"
297 :isClose="true" 297 :isClose="false"
298 @close="close"> 298 @close="close">
299 </dz-query-data> 299 </dz-query-data>
300 <div class="header-button" :style="{width:fgBoxWidth+'px'}"> 300 <div class="header-button" :style="{width:fgBoxWidth+'px'}">
...@@ -584,7 +584,6 @@ ...@@ -584,7 +584,6 @@
584 dzfgGetZrzxx(dzbsm){ 584 dzfgGetZrzxx(dzbsm){
585 dzfgGetZrzxx(dzbsm).then(res => { 585 dzfgGetZrzxx(dzbsm).then(res => {
586 if (res.success) { 586 if (res.success) {
587 console.log(res.result,'res.result');
588 res.result.forEach(item=>{ 587 res.result.forEach(item=>{
589 item.hasChoosed = '' 588 item.hasChoosed = ''
590 }) 589 })
...@@ -824,7 +823,12 @@ ...@@ -824,7 +823,12 @@
824 this.zdFgqData = data; 823 this.zdFgqData = data;
825 break; 824 break;
826 case "dz": 825 case "dz":
826 if (data.zrzCount < 2) {
827 this.$message.error("当前多幢下自然幢数量小于2,请重新选择")
828 break
829 }
827 this.dzFgqData = data; 830 this.dzFgqData = data;
831 this.centerDialogVisible=false;
828 break; 832 break;
829 case "h": 833 case "h":
830 this.hFgqData = data; 834 this.hFgqData = data;
......
...@@ -163,89 +163,11 @@ ...@@ -163,89 +163,11 @@
163 </div> 163 </div>
164 </el-tab-pane> 164 </el-tab-pane>
165 <el-tab-pane label="多幢合并" name="dz"> 165 <el-tab-pane label="多幢合并" name="dz">
166 <div class="hb-tabs top20"> 166 <dz-hb></dz-hb>
167 <!-- <el-button type="primary" class="addBtn" @click="newAdd">新增</el-button> -->
168 <div class="hbq">
169 <span class="tips" style="margin-left:0;">合并前多幢信息</span>
170 <table border="1">
171 <tr>
172 <td class="xh">序号</td>
173 <td class="zddm">宗地代码</td>
174 <td class="bdcdyh">不动产单元号</td>
175 <td class="xmmc">项目名称</td>
176 <td class="bdcqzh">不动产权证号</td>
177 <td class="qlr">权利人</td>
178 <td class="zl">坐落</td>
179 <td class="">
180 <el-button
181 type="primary"
182 class="changeBtn outAdd addMinus"
183 @click="newAdd"
184 >+
185 </el-button>
186 </td>
187 </tr>
188 <tr v-if="dzhbqData.length==0">
189 <td colspan="8">
190 <span class="noData">暂无数据</span>
191 </td>
192 </tr>
193 <tr v-else v-for="(item,index) in dzhbqData" :key="index">
194 <td class="xh">{{index+1}}</td>
195 <td class="zddm"><input type="text" class="formInput" v-model="item.zddm"
196 readonly="readonly"/></td>
197 <td class="bdcdyh"><input type="text" class="formInput" v-model="item.bdcdyh"
198 readonly="readonly"/></td>
199 <td class="xmmc"><input type="text" class="formInput" v-model="item.xmmc"
200 readonly="readonly"/></td>
201 <td class="bdcqzh"><input type="text" class="formInput" v-model="item.bdcqzh"
202 readonly="readonly"/></td>
203 <td class="qlr"><input type="text" class="formInput" v-model="item.qlr"
204 readonly="readonly"/></td>
205 <td class="zl"><input type="text" class="formInput" v-model="item.zl"
206 readonly="readonly"/></td>
207 <td class="cz">
208 <el-button
209 type="primary"
210 class="changeBtn outMinus addMinus"
211 @click="deleteData(item,index)"
212 >-
213 </el-button>
214 </td>
215 </tr>
216 </table>
217 </div>
218 <div class="hbh dzhbh">
219 <span class="tips" style="width:100%;display:block;margin-left:0;">合并后多幢信息</span>
220 <table border="1">
221 <tr>
222 <th class="xmmc">项目名称</th>
223 <th>幢信息</th>
224 </tr>
225 <tr v-for="item in dzhbhData" :key="item.bsm">
226 <td class="xmmc">
227 <input type="text" v-model="item.xmmc" class="formInput"/>
228 </td>
229 <td>
230 <!-- <span class="xz">选择</span> -->
231 </td>
232 </tr>
233 </table>
234 </div>
235 <query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :dylxs="['dz']"
236 :isZdClose="true"
237 @close="close"></query-data>
238 <div class="header-button" :style="{width:fgBoxWidth+'px'}">
239 <el-button type="primary" class="saveBtn" @click="dzhbSave">保存</el-button>
240 </div>
241 </div>
242 </el-tab-pane> 167 </el-tab-pane>
243 <el-tab-pane label="户合并" name="h"> 168 <el-tab-pane label="户合并" name="h">
244 <div class="hb-tabs psn" v-if="hhbtabs"> 169 <div class="hb-tabs psn" v-if="hhbtabs">
245 <hfghb></hfghb> 170 <hfghb></hfghb>
246 <!-- <div class="header-button" :style="{width:fgBoxWidth+'px'}">
247 <el-button type="primary" class="saveBtn">保存</el-button>
248 </div> -->
249 </div> 171 </div>
250 </el-tab-pane> 172 </el-tab-pane>
251 </el-tabs> 173 </el-tabs>
...@@ -259,22 +181,21 @@ ...@@ -259,22 +181,21 @@
259 getListByPbsm, 181 getListByPbsm,
260 getDdicByMC 182 getDdicByMC
261 } from "@api/common"; 183 } from "@api/common";
262 import {ZdHb} from "@api/zd" 184 import {ZdHb,getQjZdjbxxDetailById} from "@api/zd"
263 import {saveDzHb, ZdfggetZxx} from "@api/dz" 185 import {saveDzHb, ZdfggetZxx} from "@api/dz"
264 import QueryData from '@components/queryData/queryData' 186 import QueryData from '@components/queryData/queryData'
265 import zdQueryData from '@components/zdQueryData/zdQueryData' 187 import zdQueryData from '@components/zdQueryData/zdQueryData'
266 import hfghb from '../hfghb/index' 188 import hfghb from '../hfghb/index'
267 189 import dzHb from './../../../../components/dzHb/dzHb'
268 export default { 190 export default {
269 name: "", 191 name: "",
270 components: {QueryData, zdQueryData, hfghb}, 192 components: { zdQueryData, hfghb,dzHb},
271 props: {}, 193 props: {},
272 data() { 194 data() {
273 return { 195 return {
274 tabName: 'zd', 196 tabName: 'zd',
275 centerDialogVisible: false, 197 centerDialogVisible: false,
276 zdhbqData: [], // 宗地合并前数据 198 zdhbqData: [], // 宗地合并前数据
277 dzhbqData: [], // 多幢合并前数据
278 zdhbhData: {}, // 宗地合并后数据 199 zdhbhData: {}, // 宗地合并后数据
279 dzhbhData: [ 200 dzhbhData: [
280 { 201 {
...@@ -282,6 +203,7 @@ ...@@ -282,6 +203,7 @@
282 } 203 }
283 ], // 多幢合并后数据 204 ], // 多幢合并后数据
284 hhbhData: {}, // 户合并后数据 205 hhbhData: {}, // 户合并后数据
206 zdbsm:'', //宗地BSM
285 fgBoxWidth: 0, 207 fgBoxWidth: 0,
286 xzq: [], 208 xzq: [],
287 djq: [], 209 djq: [],
...@@ -319,13 +241,22 @@ ...@@ -319,13 +241,22 @@
319 this.hhbtabs = true 241 this.hhbtabs = true
320 } 242 }
321 }, 243 },
244 getZdData(id) {
245 getQjZdjbxxDetailById(id).then(res => {
246 this.zdhbhData.xzqbsm = res.result.xzqbsm
247 this.changeXzq(this.zdhbhData.xzqbsm)
248 this.zdhbhData.djqbsm = res.result.djqbsm
249 this.changeDjq(this.zdhbhData.djqbsm)
250 this.zdhbhData.djzqbsm = res.result.djzqbsm
251 this.zdhbhData.syqlxbsm = res.result.syqlxbsm
252 this.zdhbhData.zdtzmbsm = res.result.zdtzmbsm
253 })
254 },
322 save() { 255 save() {
323 switch (this.tabName) { 256 switch (this.tabName) {
324 case "zd": 257 case "zd":
325 this.zdHb(); 258 this.zdHb();
326 break 259 break
327 case "dz":
328 break
329 case "h": 260 case "h":
330 break; 261 break;
331 default: 262 default:
...@@ -368,15 +299,45 @@ ...@@ -368,15 +299,45 @@
368 hHb() { 299 hHb() {
369 300
370 }, 301 },
302 getData(data) {
303 let arr=[];
304 switch (this.tabName) {
305 case "zd":
306 arr = this.zdhbqData.filter(i => i.zdbsm === data.zdbsm);
307 if (arr.length > 0) {
308 this.$message.info("当前宗地已选择,请重新选择")
309 break
310 }
311 arr = this.zdhbqData.filter(i => i.xzqbsm !== data.xzqbsm || i.djqbsm !== data.djqbsm || i.djzqbsm !== data.djzqbsm);
312 if (arr.length > 0) {
313 this.$confirm('当前宗地不在同一地籍子区下,是否继续选择？')
314 .then(_ => {
315 this.addZdData(data);
316 })
317 .catch(_ => {
318 });
319 } else {
320 this.addZdData(data)
321 }
322 break
323 default:
324 break;
325 }
326 },
371 deleteData(item, index) { 327 deleteData(item, index) {
372 switch (this.tabName) { 328 switch (this.tabName) {
373 case "zd": 329 case "zd":
374 this.zdhbqData.splice(index, 1); 330 this.zdhbqData.splice(index, 1);
375 //删除幢信息中的数据 331 //删除幢信息中的数据
376 console.log(item);
377 console.log(this.zdZrzList, 'this.zdZrzList');
378 this.zdZrzList = this.zdZrzList.filter(i => i.zdbsm !== item.zdbsm); 332 this.zdZrzList = this.zdZrzList.filter(i => i.zdbsm !== item.zdbsm);
379 this.zdDzList = this.zdDzList.filter(i => i.zdbsm !== item.zdbsm); 333 this.zdDzList = this.zdDzList.filter(i => i.zdbsm !== item.zdbsm);
334 if (this.zdhbqData.length === 0) {
335 this.zdhbhData.xzqbsm = ""
336 this.zdhbhData.djqbsm = ""
337 this.zdhbhData.djzqbsm = ""
338 this.zdhbhData.syqlxbsm = ""
339 this.zdhbhData.zdtzmbsm = ""
340 }
380 break 341 break
381 case "dz": 342 case "dz":
382 this.dzhbqData.splice(index, 1) 343 this.dzhbqData.splice(index, 1)
...@@ -452,6 +413,9 @@ ...@@ -452,6 +413,9 @@
452 this.centerDialogVisible = true; 413 this.centerDialogVisible = true;
453 }, 414 },
454 addZdData(data) { 415 addZdData(data) {
416 if (this.zdhbqData.length === 0) {
417 this.zdbsm=data.zdbsm;
418 }
455 this.zdhbqData.push(data); 419 this.zdhbqData.push(data);
456 this.centerDialogVisible = false; 420 this.centerDialogVisible = false;
457 ZdfggetZxx(data.zdbsm).then(res => { 421 ZdfggetZxx(data.zdbsm).then(res => {
...@@ -475,7 +439,7 @@ ...@@ -475,7 +439,7 @@
475 } 439 }
476 }) 440 })
477 }, 441 },
478 getData(data) { 442 geDztData(data) {
479 let arr=[]; 443 let arr=[];
480 switch (this.tabName) { 444 switch (this.tabName) {
481 case "zd": 445 case "zd":
...@@ -502,10 +466,14 @@ ...@@ -502,10 +466,14 @@
502 this.$message.info("当前多幢已选择,请重新选择") 466 this.$message.info("当前多幢已选择,请重新选择")
503 break 467 break
504 } 468 }
505 if (this.dzhbqData.includes(data)) { 469 console.log(data,'data')
470 arr=this.dzhbqData.filter(i=>i.zdbsm !==data.zdbsm);
471 if (arr.length > 0) {
472 this.$message.info("当前选择多幢不在同一宗地下,请重新选择")
506 break 473 break
507 } 474 }
508 this.dzhbqData.push(data); 475 this.dzhbqData.push(data);
476 this.centerDialogVisible=false;
509 break 477 break
510 default: 478 default:
511 break; 479 break;
...@@ -538,7 +506,11 @@ ...@@ -538,7 +506,11 @@
538 } 506 }
539 }, 507 },
540 computed: {}, 508 computed: {},
541 watch: {}, 509 watch: {
510 zdbsm: function (bsm) {
511 this.getZdData(bsm)
512 }
513 },
542 } 514 }
543 </script> 515 </script>
544 <style scoped lang="less"> 516 <style scoped lang="less">
......
...@@ -156,6 +156,7 @@ import { insertDzjbxx } from "../../../api/dz"; ...@@ -156,6 +156,7 @@ import { insertDzjbxx } from "../../../api/dz";
156 export default { 156 export default {
157 name: "", 157 name: "",
158 components: {}, 158 components: {},
159 inject:['getRightTree','getRightTreeByZrzbsm'],
159 props: ['auth'], 160 props: ['auth'],
160 data() { 161 data() {
161 return { 162 return {
...@@ -269,6 +270,7 @@ export default { ...@@ -269,6 +270,7 @@ export default {
269 this.$store.state.zdbsm = res.result; 270 this.$store.state.zdbsm = res.result;
270 //todo 跳转到宗地基本信息内容表页面 (预留) 271 //todo 跳转到宗地基本信息内容表页面 (预留)
271 this.close(); 272 this.close();
273 this.getRightTree(this.$store.state.zdbsm);
272 this.$router.push({ 274 this.$router.push({
273 path: '/zd', query:{ 275 path: '/zd', query:{
274 source: 2, 276 source: 2,
...@@ -290,7 +292,6 @@ export default { ...@@ -290,7 +292,6 @@ export default {
290 //todo 在新增时，如果是点击顶部新建里面的自然幢则不传zdbsm 如果是点击右键里面的添加定着物则传zdbsm 292 //todo 在新增时，如果是点击顶部新建里面的自然幢则不传zdbsm 如果是点击右键里面的添加定着物则传zdbsm
291 this.$refs['ruleForm1'].validate((valid) => { 293 this.$refs['ruleForm1'].validate((valid) => {
292 if (valid) { 294 if (valid) {
293
294 this.ruleForm1.zdbsm = this.auth ? this.$store.state.zdbsm : ''; 295 this.ruleForm1.zdbsm = this.auth ? this.$store.state.zdbsm : '';
295 this.ruleForm1.dzbsm = this.auth ? this.$store.state.dzbsm : ''; 296 this.ruleForm1.dzbsm = this.auth ? this.$store.state.dzbsm : '';
296 insertZrzjbxx(this.ruleForm1) 297 insertZrzjbxx(this.ruleForm1)
...@@ -304,7 +305,10 @@ export default { ...@@ -304,7 +305,10 @@ export default {
304 this.$store.state.zdbsm=res.result.zdbsm; 305 this.$store.state.zdbsm=res.result.zdbsm;
305 this.$store.state.zrzbsm=res.result.bsm; 306 this.$store.state.zrzbsm=res.result.bsm;
306 this.$store.state.xmmc=res.result.xmmc; 307 this.$store.state.xmmc=res.result.xmmc;
308 this.$store.state.newZdbsm = res.result.zdbsm;
307 this.close(); 309 this.close();
310 //获取左侧树数据
311 this.getRightTreeByZrzbsm(this.$store.state.zdbsm);
308 this.$router.push({ 312 this.$router.push({
309 path: '/zrz', query:{ 313 path: '/zrz', query:{
310 source: 1, 314 source: 1,
...@@ -338,6 +342,7 @@ export default { ...@@ -338,6 +342,7 @@ export default {
338 this.$store.state.zdbsm=res.result.zdbsm; 342 this.$store.state.zdbsm=res.result.zdbsm;
339 this.$store.state.dzbsm=res.result.bsm; 343 this.$store.state.dzbsm=res.result.bsm;
340 this.$store.state.xmmc=res.result.xmmc; 344 this.$store.state.xmmc=res.result.xmmc;
345 this.$store.state.newZdbsm = res.result.zdbsm;
341 this.close(); 346 this.close();
342 this.$router.push({ 347 this.$router.push({
343 path: '/dz', query:{ 348 path: '/dz', query:{
......
...@@ -62,21 +62,21 @@ ...@@ -62,21 +62,21 @@
62 ref="hBsm" 62 ref="hBsm"
63 :key="hsIndex" 63 :key="hsIndex"
64 :class="searchNum == hs.shbw || searchNum == hs.bdcdyh ? 'tdSelect' : ''" 64 :class="searchNum == hs.shbw || searchNum == hs.bdcdyh ? 'tdSelect' : ''"
65 @click="handleTdClick($event, hs.bsm,hs)" 65 @click="handleTdClick($event.target, hs.bsm,hs)"
66 @dblclick="dbclick(hs.bsm)" 66 @dblclick="dbclick(hs.bsm)"
67 @contextmenu.prevent="openMenu($event, hs, 'h')" 67 @contextmenu.prevent="openMenu($event, hs, 'h')"
68 > 68 >
69 {{ hs.shbw }} 69 {{ hs.shbw }}
70 <span @click.stop="qsztClick" class="hqszt lin" v-show="hs.qszt == '0'">临</span> 70 <span @click.stop="dyztIconClick" class="hqszt lin" v-show="hs.qszt == '0'">临</span>
71 <span @click.stop="qsztClick" class="hqszt zheng" v-show="hs.qszt == '1'">正</span> 71 <span @click.stop="dyztIconClick" class="hqszt zheng" v-show="hs.qszt == '1'">正</span>
72 <span @click.stop="qsztClick" class="hqszt xian" v-show="hs.qszt == '2'" >现</span> 72 <span @click.stop="dyztIconClick" class="hqszt xian" v-show="hs.qszt == '2'" >现</span>
73 <ul class="dyzt"> 73 <ul class="dyzt" @click.stop="hDyztClick($event, hs.bsm,hs)">
74 <li style="background-color:#6EDEE1" v-show="hs.qqzt=='1'">确</li> 74 <li style="background-color:#6EDEE1" v-show="hs.qqzt=='1'" @click.stop="dyztIconClick">确</li>
75 <li style="background-color:#8ADC88" v-show="hs.bazt=='1'">备</li> 75 <li style="background-color:#8ADC88" v-show="hs.bazt=='1'" @click.stop="dyztIconClick">备</li>
76 <li style="background-color:#FF8282" v-show="hs.dyzt=='1'">抵</li> 76 <li style="background-color:#FF8282" v-show="hs.dyzt=='1'" @click.stop="dyztIconClick">抵</li>
77 <li style="background-color:#D7CECF" v-show="hs.cfzt=='1'">查</li> 77 <li style="background-color:#D7CECF" v-show="hs.cfzt=='1'" @click.stop="dyztIconClick">查</li>
78 <li style="background-color:#D4A3EB" v-show="hs.yyzt=='1'">异</li> 78 <li style="background-color:#D4A3EB" v-show="hs.yyzt=='1'" @click.stop="dyztIconClick">异</li>
79 <li style="background-color:#A5A3FB" v-show="hs.xzzt=='1'">限</li> 79 <li style="background-color:#A5A3FB" v-show="hs.xzzt=='1'" @click.stop="dyztIconClick">限</li>
80 </ul> 80 </ul>
81 </td> 81 </td>
82 </tr> 82 </tr>
...@@ -128,21 +128,21 @@ ...@@ -128,21 +128,21 @@
128 ref="hBsm" 128 ref="hBsm"
129 :key="hsIndex" 129 :key="hsIndex"
130 :class="searchNum == hs.shbw || searchNum == hs.bdcdyh ? 'tdSelect' : ''" 130 :class="searchNum == hs.shbw || searchNum == hs.bdcdyh ? 'tdSelect' : ''"
131 @click="handleTdClick($event, hs.bsm,hs)" 131 @click="handleTdClick($event.target, hs.bsm,hs)"
132 @dblclick="dbclick(hs.bsm)" 132 @dblclick="dbclick(hs.bsm)"
133 @contextmenu.prevent="openMenu($event, hs, 'h')" 133 @contextmenu.prevent="openMenu($event, hs, 'h')"
134 > 134 >
135 {{ hs.shbw }} 135 {{ hs.shbw }}
136 <span @click.stop="qsztClick" class="hqszt lin" v-show="hs.qszt == '0'">临</span> 136 <span @click.stop="dyztIconClick" class="hqszt lin" v-show="hs.qszt == '0'">临</span>
137 <span @click.stop="qsztClick" class="hqszt zheng" v-show="hs.qszt == '1'">正</span> 137 <span @click.stop="dyztIconClick" class="hqszt zheng" v-show="hs.qszt == '1'">正</span>
138 <span @click.stop="qsztClick" class="hqszt xian" v-show="hs.qszt == '2'" >现</span> 138 <span @click.stop="dyztIconClick" class="hqszt xian" v-show="hs.qszt == '2'" >现</span>
139 <ul class="dyzt"> 139 <ul class="dyzt" @click.stop="hDyztClick($event, hs.bsm,hs)">
140 <li style="background-color:#6EDEE1" v-show="hs.qqzt=='1'">确</li> 140 <li style="background-color:#6EDEE1" v-show="hs.qqzt=='1'" @click.stop="dyztIconClick">确</li>
141 <li style="background-color:#8ADC88" v-show="hs.bazt=='1'">备</li> 141 <li style="background-color:#8ADC88" v-show="hs.bazt=='1'" @click.stop="dyztIconClick">备</li>
142 <li style="background-color:#FF8282" v-show="hs.dyzt=='1'">抵</li> 142 <li style="background-color:#FF8282" v-show="hs.dyzt=='1'" @click.stop="dyztIconClick">抵</li>
143 <li style="background-color:#D7CECF" v-show="hs.cfzt=='1'">查</li> 143 <li style="background-color:#D7CECF" v-show="hs.cfzt=='1'" @click.stop="dyztIconClick">查</li>
144 <li style="background-color:#D4A3EB" v-show="hs.yyzt=='1'">异</li> 144 <li style="background-color:#D4A3EB" v-show="hs.yyzt=='1'" @click.stop="dyztIconClick">异</li>
145 <li style="background-color:#A5A3FB" v-show="hs.xzzt=='1'">限</li> 145 <li style="background-color:#A5A3FB" v-show="hs.xzzt=='1'" @click.stop="dyztIconClick">限</li>
146 </ul> 146 </ul>
147 </td> 147 </td>
148 </tr> 148 </tr>
...@@ -200,21 +200,21 @@ ...@@ -200,21 +200,21 @@
200 ref="hBsm" 200 ref="hBsm"
201 :key="hsIndex" 201 :key="hsIndex"
202 :class="searchNum == hs.shbw || searchNum == hs.bdcdyh ? 'tdSelect' : ''" 202 :class="searchNum == hs.shbw || searchNum == hs.bdcdyh ? 'tdSelect' : ''"
203 @click="handleTdClick($event, hs.bsm,hs)" 203 @click="handleTdClick($event.target, hs.bsm,hs)"
204 @dblclick="dbclick(hs.bsm)" 204 @dblclick="dbclick(hs.bsm)"
205 @contextmenu.prevent="openMenu($event, hs, 'h')" 205 @contextmenu.prevent="openMenu($event, hs, 'h')"
206 > 206 >
207 {{ hs.shbw }} 207 {{ hs.shbw }}
208 <span @click.stop="qsztClick" class="hqszt lin" v-show="hs.qszt == '0'">临</span> 208 <span @click.stop="dyztIconClick" class="hqszt lin" v-show="hs.qszt == '0'">临</span>
209 <span @click.stop="qsztClick" class="hqszt zheng" v-show="hs.qszt == '1'">正</span> 209 <span @click.stop="dyztIconClick" class="hqszt zheng" v-show="hs.qszt == '1'">正</span>
210 <span @click.stop="qsztClick" class="hqszt xian" v-show="hs.qszt == '2'" >现</span> 210 <span @click.stop="dyztIconClick" class="hqszt xian" v-show="hs.qszt == '2'" >现</span>
211 <ul class="dyzt"> 211 <ul class="dyzt" @click.stop="hDyztClick($event, hs.bsm,hs)">
212 <li style="background-color:#6EDEE1" v-show="hs.qqzt=='1'">确</li> 212 <li style="background-color:#6EDEE1" v-show="hs.qqzt=='1'" @click.stop="dyztIconClick">确</li>
213 <li style="background-color:#8ADC88" v-show="hs.bazt=='1'">备</li> 213 <li style="background-color:#8ADC88" v-show="hs.bazt=='1'" @click.stop="dyztIconClick">备</li>
214 <li style="background-color:#FF8282" v-show="hs.dyzt=='1'">抵</li> 214 <li style="background-color:#FF8282" v-show="hs.dyzt=='1'" @click.stop="dyztIconClick">抵</li>
215 <li style="background-color:#D7CECF" v-show="hs.cfzt=='1'">查</li> 215 <li style="background-color:#D7CECF" v-show="hs.cfzt=='1'" @click.stop="dyztIconClick">查</li>
216 <li style="background-color:#D4A3EB" v-show="hs.yyzt=='1'">异</li> 216 <li style="background-color:#D4A3EB" v-show="hs.yyzt=='1'" @click.stop="dyztIconClick">异</li>
217 <li style="background-color:#A5A3FB" v-show="hs.xzzt=='1'">限</li> 217 <li style="background-color:#A5A3FB" v-show="hs.xzzt=='1'" @click.stop="dyztIconClick">限</li>
218 </ul> 218 </ul>
219 </td> 219 </td>
220 </tr> 220 </tr>
...@@ -254,21 +254,21 @@ ...@@ -254,21 +254,21 @@
254 ref="hBsm" 254 ref="hBsm"
255 :key="hsIndex" 255 :key="hsIndex"
256 :class="searchNum == hs.shbw || searchNum == hs.bdcdyh ? 'tdSelect' : ''" 256 :class="searchNum == hs.shbw || searchNum == hs.bdcdyh ? 'tdSelect' : ''"
257 @click="handleTdClick($event, hs.bsm,hs)" 257 @click="handleTdClick($event.target, hs.bsm,hs)"
258 @dblclick="dbclick(hs.bsm)" 258 @dblclick="dbclick(hs.bsm)"
259 @contextmenu.prevent="openMenu($event, hs, 'h')" 259 @contextmenu.prevent="openMenu($event, hs, 'h')"
260 > 260 >
261 {{ hs.shbw }} 261 {{ hs.shbw }}
262 <span @click.stop="qsztClick" class="hqszt lin" v-show="hs.qszt == '0'">临</span> 262 <span @click.stop="dyztIconClick" class="hqszt lin" v-show="hs.qszt == '0'">临</span>
263 <span @click.stop="qsztClick" class="hqszt zheng" v-show="hs.qszt == '1'">正</span> 263 <span @click.stop="dyztIconClick" class="hqszt zheng" v-show="hs.qszt == '1'">正</span>
264 <span @click.stop="qsztClick" class="hqszt xian" v-show="hs.qszt == '2'" >现</span> 264 <span @click.stop="dyztIconClick" class="hqszt xian" v-show="hs.qszt == '2'" >现</span>
265 <ul class="dyzt"> 265 <ul class="dyzt" @click.stop="hDyztClick($event, hs.bsm,hs)">
266 <li style="background-color:#6EDEE1" v-show="hs.qqzt=='1'">确</li> 266 <li style="background-color:#6EDEE1" v-show="hs.qqzt=='1'" @click.stop="dyztIconClick">确</li>
267 <li style="background-color:#8ADC88" v-show="hs.bazt=='1'">备</li> 267 <li style="background-color:#8ADC88" v-show="hs.bazt=='1'" @click.stop="dyztIconClick">备</li>
268 <li style="background-color:#FF8282" v-show="hs.dyzt=='1'">抵</li> 268 <li style="background-color:#FF8282" v-show="hs.dyzt=='1'" @click.stop="dyztIconClick">抵</li>
269 <li style="background-color:#D7CECF" v-show="hs.cfzt=='1'">查</li> 269 <li style="background-color:#D7CECF" v-show="hs.cfzt=='1'" @click.stop="dyztIconClick">查</li>
270 <li style="background-color:#D4A3EB" v-show="hs.yyzt=='1'">异</li> 270 <li style="background-color:#D4A3EB" v-show="hs.yyzt=='1'" @click.stop="dyztIconClick">异</li>
271 <li style="background-color:#A5A3FB" v-show="hs.xzzt=='1'">限</li> 271 <li style="background-color:#A5A3FB" v-show="hs.xzzt=='1'" @click.stop="dyztIconClick">限</li>
272 </ul> 272 </ul>
273 </td> 273 </td>
274 </tr> 274 </tr>
...@@ -585,9 +585,9 @@ export default { ...@@ -585,9 +585,9 @@ export default {
585 clearTimeout(self.time); 585 clearTimeout(self.time);
586 self.time = setTimeout(() => { 586 self.time = setTimeout(() => {
587 //判断点击的户是否选中 587 //判断点击的户是否选中
588 if (e.target.className.indexOf("tdSelect") == -1) { 588 if (e.className.indexOf("tdSelect") == -1) {
589 //未选中→选中 589 //未选中→选中
590 e.target.className = "tdSelect"; //加边框 590 e.className = "tdSelect"; //加边框
591 if(this.isHbfg){ 591 if(this.isHbfg){
592 this.fghbChoosedList.push(hs); 592 this.fghbChoosedList.push(hs);
593 this.hbsmList.push(bsm); // 将户bsm放进hbsmList 593 this.hbsmList.push(bsm); // 将户bsm放进hbsmList
...@@ -596,7 +596,7 @@ export default { ...@@ -596,7 +596,7 @@ export default {
596 } 596 }
597 } else { 597 } else {
598 //选中→未选中 598 //选中→未选中
599 e.target.className = ""; 599 e.className = "";
600 if(this.isHbfg){ 600 if(this.isHbfg){
601 this.deleteArrOption(this.fghbChoosedList, hs) 601 this.deleteArrOption(this.fghbChoosedList, hs)
602 this.deleteArrOption(this.hbsmList, bsm); 602 this.deleteArrOption(this.hbsmList, bsm);
...@@ -691,6 +691,13 @@ export default { ...@@ -691,6 +691,13 @@ export default {
691 this.lpbChVisible = true; 691 this.lpbChVisible = true;
692 } 692 }
693 }, 693 },
694 // 户单元状态点击事件
695 hDyztClick(e,bsm,hs){
696 this.handleTdClick(e.target.parentNode,bsm,hs);
697 },
698 dyztIconClick(){
699
700 },
694 // 层选中事件 701 // 层选中事件
695 handleClickC(e, item) { 702 handleClickC(e, item) {
696 if (this.isHbfg) { 703 if (this.isHbfg) {
...@@ -786,10 +793,6 @@ export default { ...@@ -786,10 +793,6 @@ export default {
786 } 793 }
787 }); 794 });
788 }, 795 },
789 //end
790 qsztClick(){
791
792 },
793 //户合并 796 //户合并
794 handleHb(type){ 797 handleHb(type){
795 let olbBsms = ''; 798 let olbBsms = '';
......