判断条件

src/dashoo.cn/frontend_web/src/components/oilsupplier/goodslist2.vue

@@ -766,6 +766,7 @@
           return
         }
         _this.$axios.post('/suppliercertsub/check-certsub-lost', params).then(res => {
+          console.log(res.data, 777)
           _this.lostTableData = _this.mergeTableRow(res.data, ['Code'])
           this.loading = false
         }).catch(err => {
@@ -774,7 +775,6 @@
         })
       },
       objectSpanMethod ({ row, column, rowIndex, columnIndex }) {
-        console.log('没有啊')
         const span = column['property'] + '-span'
         if (row[span]) {
           return row[span]
@@ -783,7 +783,7 @@
       /**
        *  table合并行通用 */
       mergeTableRow (data, merge) {
-        if (!merge || merge.length === 0) {
+        if (!data || data.length === 0 || !merge || merge.length === 0) {
           return data
         }
         merge.forEach((m) => {