Skip to content

任超 / js.CadastralSystem

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

Merge remote-tracking branch 'origin/master'

2 parents 0d9fee7e e7c0cce7
Inline Side-by-side
Showing 1 changed file with 54 additions and 51 deletions
...@@ -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 = '';
......