张丁 修改合并数据页面bug3.0

ui/src/views/invoice/bookingworkticket/index.vue

@@ -1128,7 +1128,7 @@ export default {
             colspan: _col
           };
         }
-        if (columnIndex === 15) {
+        if (columnIndex === 13) {
           const _row = this.setTable(this.bookingworkticketList).merge[rowIndex];
           const _col = _row > 0 ? 1 : 0;
           return {
@@ -1136,7 +1136,7 @@ export default {
             colspan: _col
           };
         }
-        if (columnIndex === 14) {
+        if (columnIndex === 15) {
           const _row = this.setTable(this.bookingworkticketList).merge[rowIndex];
           const _col = _row > 0 ? 1 : 0;
           return {