6ba7b0cb by zhaoqian

Merge remote-tracking branch 'origin/master'

2 parents cbab5a5b faefdea0
...@@ -2,7 +2,8 @@ ...@@ -2,7 +2,8 @@
2 <div class="temp"> 2 <div class="temp">
3 <div class="qlxzAdd fl"> 3 <div class="qlxzAdd fl">
4 <span>权利性质</span> 4 <span>权利性质</span>
5 <i class="iconfont iconicon-test2" @click="handleClick(0, 'add')"></i> 5 <i class="iconfont iconicon-test2" v-if="formData.qszt=='0'" @click="handleClick(0, 'add')"></i>
6 <i class="iconfont iconicon-test2" v-if="formData.qszt!='0'" style="cursor: not-allowed;"></i>
6 </div> 7 </div>
7 <el-row 8 <el-row
8 class="qlxzModule fl" 9 class="qlxzModule fl"
...@@ -16,7 +17,8 @@ ...@@ -16,7 +17,8 @@
16 :key="childIndex + '1'" 17 :key="childIndex + '1'"
17 :class="childIndex > 0 ? 'childYT noTopBorder' : ''" 18 :class="childIndex > 0 ? 'childYT noTopBorder' : ''"
18 > 19 >
19 <i v-show="childIndex == 0" :style="{'margin-top':(items.list.length-1)*57 - 18 + 'px'}" class="iconfont icon- qlxzMinus" @click="handleClick(index, 'minus')"></i> 20 <i v-show="childIndex == 0 && formData.qszt=='0'" :style="{'margin-top':(items.list.length-1)*57 - 18 + 'px'}" class="iconfont icon- qlxzMinus" @click="handleClick(index, 'minus')"></i>
21 <i v-show="childIndex == 0 && formData.qszt!='0'" :style="{'margin-top':(items.list.length-1)*57 - 18 + 'px'}" class="iconfont icon- qlxzMinus" style="cursor: not-allowed;"></i>
20 <div 22 <div
21 :class="items.hasNotBorder ? 'itemShow whiteItem' : 'whiteItem'" 23 :class="items.hasNotBorder ? 'itemShow whiteItem' : 'whiteItem'"
22 v-if="items.isInside" 24 v-if="items.isInside"
...@@ -30,7 +32,8 @@ ...@@ -30,7 +32,8 @@
30 > 32 >
31 <template> 33 <template>
32 <span v-show ="childIndex == 0" :style="{'margin-top':(items.list.length-1)*57 - 40 + 'px'}">土地用途</span> 34 <span v-show ="childIndex == 0" :style="{'margin-top':(items.list.length-1)*57 - 40 + 'px'}">土地用途</span>
33 <i class="iconfont iconicon-test1" v-show ="childIndex == 0" :style="{'margin-top':(items.list.length-1)*57 + 'px'}" @click="handleInClick(index, childIndex, 'add')"></i> 35 <i class="iconfont iconicon-test1" v-show ="childIndex == 0 && formData.qszt=='0'" :style="{'margin-top':(items.list.length-1)*57 + 'px'}" @click="handleInClick(index, childIndex, 'add')"></i>
36 <i class="iconfont iconicon-test1" v-show ="childIndex == 0 && formData.qszt!='0'" :style="{'margin-top':(items.list.length-1)*57 + 'px'}" style="cursor: not-allowed;"></i>
34 </template> 37 </template>
35 </el-col> 38 </el-col>
36 <el-col 39 <el-col
...@@ -39,7 +42,8 @@ ...@@ -39,7 +42,8 @@
39 :key="childIndex + '18'" 42 :key="childIndex + '18'"
40 :class="childIndex > 0 ? 'childYT' : ''" 43 :class="childIndex > 0 ? 'childYT' : ''"
41 > 44 >
42 <i class="iconfont iconicon-test" @click="handleInClick(index, childIndex, 'minus')"></i> 45 <i class="iconfont iconicon-test" v-if="formData.qszt=='0'" @click="handleInClick(index, childIndex, 'minus')"></i>
46 <i class="iconfont iconicon-test" v-if="formData.qszt!='0'" style="cursor: not-allowed;"></i>
43 </el-col> 47 </el-col>
44 <template v-if="hasSyqx"> 48 <template v-if="hasSyqx">
45 <el-col 49 <el-col
......