30767602 by tianhaohao@pashanhoo.com

Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

2 parents 56b602dd b30a2fcd
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
26 }}</el-checkbox> 26 }}</el-checkbox>
27 </p> 27 </p>
28 <!-- 独立层户 --> 28 <!-- 独立层户 -->
29 <ch-cpn v-if="ljz.cs.length" :ref="ljz.bsm" :ch="ljz.cs" /> 29 <ch-cpn v-if="ljz.cs.length" :ref="ljz.bsm" :ch="ljz.cs" :onlyShow="onlyShow"/>
30 <!-- 幢单元 --> 30 <!-- 幢单元 -->
31 <zdy-cpn v-if="ljz.zdys.length" :ref="'zdy' + ljz.bsm" :zdys="ljz.zdys" :onlyShow="onlyShow"/> 31 <zdy-cpn v-if="ljz.zdys.length" :ref="'zdy' + ljz.bsm" :zdys="ljz.zdys" :onlyShow="onlyShow"/>
32 </div> 32 </div>
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
47 }}</el-checkbox> 47 }}</el-checkbox>
48 </p> 48 </p>
49 <!-- 独立层户 --> 49 <!-- 独立层户 -->
50 <ch-cpn v-if="ljzarr[0].cs.length" :ref="ljzarr[0].bsm" :ch="ljzarr[0].cs" /> 50 <ch-cpn v-if="ljzarr[0].cs.length" :ref="ljzarr[0].bsm" :ch="ljzarr[0].cs" :onlyShow="onlyShow"/>
51 <!-- 幢单元 --> 51 <!-- 幢单元 -->
52 <zdy-cpn v-if="ljzarr[0].zdys.length" :ref="'zdy' + ljzarr[0].bsm" :zdys="ljzarr[0].zdys" :onlyShow="onlyShow"/> 52 <zdy-cpn v-if="ljzarr[0].zdys.length" :ref="'zdy' + ljzarr[0].bsm" :zdys="ljzarr[0].zdys" :onlyShow="onlyShow"/>
53 </div> 53 </div>
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
19 <span v-else>{{zdy.zdymc}}</span> 19 <span v-else>{{zdy.zdymc}}</span>
20 </p> 20 </p>
21 <!-- 每个幢单元下的层户 --> 21 <!-- 每个幢单元下的层户 -->
22 <ch-cpn :ref="zdy.bsm" :ch="zdy.cs" /> 22 <ch-cpn :ref="zdy.bsm" :ch="zdy.cs" :onlyShow="onlyShow"/>
23 </div> 23 </div>
24 </div> 24 </div>
25 </template> 25 </template>
......