d4c53d55 by weimo934

Merge remote-tracking branch 'origin/master'

2 parents 0d9fee7e e7c0cce7
......@@ -62,21 +62,21 @@
ref="hBsm"
:key="hsIndex"
:class="searchNum == hs.shbw || searchNum == hs.bdcdyh ? 'tdSelect' : ''"
@click="handleTdClick($event, hs.bsm,hs)"
@click="handleTdClick($event.target, hs.bsm,hs)"
@dblclick="dbclick(hs.bsm)"
@contextmenu.prevent="openMenu($event, hs, 'h')"
>
{{ hs.shbw }}
<span @click.stop="qsztClick" class="hqszt lin" v-show="hs.qszt == '0'"></span>
<span @click.stop="qsztClick" class="hqszt zheng" v-show="hs.qszt == '1'"></span>
<span @click.stop="qsztClick" class="hqszt xian" v-show="hs.qszt == '2'" ></span>
<ul class="dyzt">
<li style="background-color:#6EDEE1" v-show="hs.qqzt=='1'"></li>
<li style="background-color:#8ADC88" v-show="hs.bazt=='1'"></li>
<li style="background-color:#FF8282" v-show="hs.dyzt=='1'"></li>
<li style="background-color:#D7CECF" v-show="hs.cfzt=='1'"></li>
<li style="background-color:#D4A3EB" v-show="hs.yyzt=='1'"></li>
<li style="background-color:#A5A3FB" v-show="hs.xzzt=='1'"></li>
<span @click.stop="dyztIconClick" class="hqszt lin" v-show="hs.qszt == '0'"></span>
<span @click.stop="dyztIconClick" class="hqszt zheng" v-show="hs.qszt == '1'"></span>
<span @click.stop="dyztIconClick" class="hqszt xian" v-show="hs.qszt == '2'" ></span>
<ul class="dyzt" @click.stop="hDyztClick($event, hs.bsm,hs)">
<li style="background-color:#6EDEE1" v-show="hs.qqzt=='1'" @click.stop="dyztIconClick"></li>
<li style="background-color:#8ADC88" v-show="hs.bazt=='1'" @click.stop="dyztIconClick"></li>
<li style="background-color:#FF8282" v-show="hs.dyzt=='1'" @click.stop="dyztIconClick"></li>
<li style="background-color:#D7CECF" v-show="hs.cfzt=='1'" @click.stop="dyztIconClick"></li>
<li style="background-color:#D4A3EB" v-show="hs.yyzt=='1'" @click.stop="dyztIconClick"></li>
<li style="background-color:#A5A3FB" v-show="hs.xzzt=='1'" @click.stop="dyztIconClick"></li>
</ul>
</td>
</tr>
......@@ -128,21 +128,21 @@
ref="hBsm"
:key="hsIndex"
:class="searchNum == hs.shbw || searchNum == hs.bdcdyh ? 'tdSelect' : ''"
@click="handleTdClick($event, hs.bsm,hs)"
@click="handleTdClick($event.target, hs.bsm,hs)"
@dblclick="dbclick(hs.bsm)"
@contextmenu.prevent="openMenu($event, hs, 'h')"
>
{{ hs.shbw }}
<span @click.stop="qsztClick" class="hqszt lin" v-show="hs.qszt == '0'"></span>
<span @click.stop="qsztClick" class="hqszt zheng" v-show="hs.qszt == '1'"></span>
<span @click.stop="qsztClick" class="hqszt xian" v-show="hs.qszt == '2'" ></span>
<ul class="dyzt">
<li style="background-color:#6EDEE1" v-show="hs.qqzt=='1'"></li>
<li style="background-color:#8ADC88" v-show="hs.bazt=='1'"></li>
<li style="background-color:#FF8282" v-show="hs.dyzt=='1'"></li>
<li style="background-color:#D7CECF" v-show="hs.cfzt=='1'"></li>
<li style="background-color:#D4A3EB" v-show="hs.yyzt=='1'"></li>
<li style="background-color:#A5A3FB" v-show="hs.xzzt=='1'"></li>
<span @click.stop="dyztIconClick" class="hqszt lin" v-show="hs.qszt == '0'"></span>
<span @click.stop="dyztIconClick" class="hqszt zheng" v-show="hs.qszt == '1'"></span>
<span @click.stop="dyztIconClick" class="hqszt xian" v-show="hs.qszt == '2'" ></span>
<ul class="dyzt" @click.stop="hDyztClick($event, hs.bsm,hs)">
<li style="background-color:#6EDEE1" v-show="hs.qqzt=='1'" @click.stop="dyztIconClick"></li>
<li style="background-color:#8ADC88" v-show="hs.bazt=='1'" @click.stop="dyztIconClick"></li>
<li style="background-color:#FF8282" v-show="hs.dyzt=='1'" @click.stop="dyztIconClick"></li>
<li style="background-color:#D7CECF" v-show="hs.cfzt=='1'" @click.stop="dyztIconClick"></li>
<li style="background-color:#D4A3EB" v-show="hs.yyzt=='1'" @click.stop="dyztIconClick"></li>
<li style="background-color:#A5A3FB" v-show="hs.xzzt=='1'" @click.stop="dyztIconClick"></li>
</ul>
</td>
</tr>
......@@ -200,21 +200,21 @@
ref="hBsm"
:key="hsIndex"
:class="searchNum == hs.shbw || searchNum == hs.bdcdyh ? 'tdSelect' : ''"
@click="handleTdClick($event, hs.bsm,hs)"
@click="handleTdClick($event.target, hs.bsm,hs)"
@dblclick="dbclick(hs.bsm)"
@contextmenu.prevent="openMenu($event, hs, 'h')"
>
{{ hs.shbw }}
<span @click.stop="qsztClick" class="hqszt lin" v-show="hs.qszt == '0'"></span>
<span @click.stop="qsztClick" class="hqszt zheng" v-show="hs.qszt == '1'"></span>
<span @click.stop="qsztClick" class="hqszt xian" v-show="hs.qszt == '2'" ></span>
<ul class="dyzt">
<li style="background-color:#6EDEE1" v-show="hs.qqzt=='1'"></li>
<li style="background-color:#8ADC88" v-show="hs.bazt=='1'"></li>
<li style="background-color:#FF8282" v-show="hs.dyzt=='1'"></li>
<li style="background-color:#D7CECF" v-show="hs.cfzt=='1'"></li>
<li style="background-color:#D4A3EB" v-show="hs.yyzt=='1'"></li>
<li style="background-color:#A5A3FB" v-show="hs.xzzt=='1'"></li>
<span @click.stop="dyztIconClick" class="hqszt lin" v-show="hs.qszt == '0'"></span>
<span @click.stop="dyztIconClick" class="hqszt zheng" v-show="hs.qszt == '1'"></span>
<span @click.stop="dyztIconClick" class="hqszt xian" v-show="hs.qszt == '2'" ></span>
<ul class="dyzt" @click.stop="hDyztClick($event, hs.bsm,hs)">
<li style="background-color:#6EDEE1" v-show="hs.qqzt=='1'" @click.stop="dyztIconClick"></li>
<li style="background-color:#8ADC88" v-show="hs.bazt=='1'" @click.stop="dyztIconClick"></li>
<li style="background-color:#FF8282" v-show="hs.dyzt=='1'" @click.stop="dyztIconClick"></li>
<li style="background-color:#D7CECF" v-show="hs.cfzt=='1'" @click.stop="dyztIconClick"></li>
<li style="background-color:#D4A3EB" v-show="hs.yyzt=='1'" @click.stop="dyztIconClick"></li>
<li style="background-color:#A5A3FB" v-show="hs.xzzt=='1'" @click.stop="dyztIconClick"></li>
</ul>
</td>
</tr>
......@@ -254,21 +254,21 @@
ref="hBsm"
:key="hsIndex"
:class="searchNum == hs.shbw || searchNum == hs.bdcdyh ? 'tdSelect' : ''"
@click="handleTdClick($event, hs.bsm,hs)"
@click="handleTdClick($event.target, hs.bsm,hs)"
@dblclick="dbclick(hs.bsm)"
@contextmenu.prevent="openMenu($event, hs, 'h')"
>
{{ hs.shbw }}
<span @click.stop="qsztClick" class="hqszt lin" v-show="hs.qszt == '0'"></span>
<span @click.stop="qsztClick" class="hqszt zheng" v-show="hs.qszt == '1'"></span>
<span @click.stop="qsztClick" class="hqszt xian" v-show="hs.qszt == '2'" ></span>
<ul class="dyzt">
<li style="background-color:#6EDEE1" v-show="hs.qqzt=='1'"></li>
<li style="background-color:#8ADC88" v-show="hs.bazt=='1'"></li>
<li style="background-color:#FF8282" v-show="hs.dyzt=='1'"></li>
<li style="background-color:#D7CECF" v-show="hs.cfzt=='1'"></li>
<li style="background-color:#D4A3EB" v-show="hs.yyzt=='1'"></li>
<li style="background-color:#A5A3FB" v-show="hs.xzzt=='1'"></li>
<span @click.stop="dyztIconClick" class="hqszt lin" v-show="hs.qszt == '0'"></span>
<span @click.stop="dyztIconClick" class="hqszt zheng" v-show="hs.qszt == '1'"></span>
<span @click.stop="dyztIconClick" class="hqszt xian" v-show="hs.qszt == '2'" ></span>
<ul class="dyzt" @click.stop="hDyztClick($event, hs.bsm,hs)">
<li style="background-color:#6EDEE1" v-show="hs.qqzt=='1'" @click.stop="dyztIconClick"></li>
<li style="background-color:#8ADC88" v-show="hs.bazt=='1'" @click.stop="dyztIconClick"></li>
<li style="background-color:#FF8282" v-show="hs.dyzt=='1'" @click.stop="dyztIconClick"></li>
<li style="background-color:#D7CECF" v-show="hs.cfzt=='1'" @click.stop="dyztIconClick"></li>
<li style="background-color:#D4A3EB" v-show="hs.yyzt=='1'" @click.stop="dyztIconClick"></li>
<li style="background-color:#A5A3FB" v-show="hs.xzzt=='1'" @click.stop="dyztIconClick"></li>
</ul>
</td>
</tr>
......@@ -585,9 +585,9 @@ export default {
clearTimeout(self.time);
self.time = setTimeout(() => {
//判断点击的户是否选中
if (e.target.className.indexOf("tdSelect") == -1) {
if (e.className.indexOf("tdSelect") == -1) {
//未选中→选中
e.target.className = "tdSelect"; //加边框
e.className = "tdSelect"; //加边框
if(this.isHbfg){
this.fghbChoosedList.push(hs);
this.hbsmList.push(bsm); // 将户bsm放进hbsmList
......@@ -596,7 +596,7 @@ export default {
}
} else {
//选中→未选中
e.target.className = "";
e.className = "";
if(this.isHbfg){
this.deleteArrOption(this.fghbChoosedList, hs)
this.deleteArrOption(this.hbsmList, bsm);
......@@ -691,6 +691,13 @@ export default {
this.lpbChVisible = true;
}
},
// 户单元状态点击事件
hDyztClick(e,bsm,hs){
this.handleTdClick(e.target.parentNode,bsm,hs);
},
dyztIconClick(){
},
// 层选中事件
handleClickC(e, item) {
if (this.isHbfg) {
......@@ -786,10 +793,6 @@ export default {
}
});
},
//end
qsztClick(){
},
//户合并
handleHb(type){
let olbBsms = '';
......