|
@@ -446,11 +446,11 @@
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<span
|
|
|
- v-if="scope.row.addressPlace.indexOf('新地址') >= 0"
|
|
|
+ v-if="scope.row.addressPlace!=null && scope.row.addressPlace.indexOf('新地址') >= 0"
|
|
|
style="color:red"
|
|
|
>{{ scope.row.addressPlace }}</span
|
|
|
>
|
|
|
- <span v-show="scope.row.addressPlace.indexOf('新地址') < 0">{{
|
|
|
+ <span v-show="scope.row.addressPlace == null || scope.row.addressPlace.indexOf('新地址') < 0">{{
|
|
|
scope.row.addressPlace
|
|
|
}}</span>
|
|
|
</template>
|
|
@@ -5663,12 +5663,14 @@ export default {
|
|
|
) {
|
|
|
a = this.visibleList[0].rowKey
|
|
|
}
|
|
|
+ //console.log("tableData"+JSON.stringify(this.tableData));
|
|
|
this.visibleList = []
|
|
|
this.visibleList = this.tableData.slice(
|
|
|
0,
|
|
|
Math.floor(this.maxHeight / this.itemHeight) + 1
|
|
|
)
|
|
|
this.getSpanArr(this.visibleList)
|
|
|
+ //console.log("visibleListsss"+JSON.stringify(this.visibleList));
|
|
|
this.$refs.tableRef.bodyWrapper.scrollTop = 30 * (a - 1)
|
|
|
// this.getTotalNum(this.tableData)
|
|
|
loading.close()
|
|
@@ -5862,7 +5864,6 @@ export default {
|
|
|
0,
|
|
|
Math.floor(this.maxHeight / this.itemHeight) + 1
|
|
|
)
|
|
|
-
|
|
|
this.getSpanArr(this.visibleList)
|
|
|
this.$refs.tableRef.bodyWrapper.scrollTop = 30 * (a - 1)
|
|
|
loading.close()
|