ERP_override.git

			@@ -62,7 +62,6 @@
			},//表头参数
			columns:[
			{type:'expand',fixed:"left",slots: { content:'content' },width: 50},
			{ type: 'seq',fixed:"left", title: '自序', width: 50 },
			{field: '1', width: 100, title: '序号',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, },
			{field: '2',width: 120, title: '楼层编号', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
			{field: '3', width: 100,title: '形状', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
			@@ -217,7 +216,7 @@
			],//table body实际数据
			//脚部求和
			footerMethod ({ columns, data }) {//页脚函数
			let footList=['7','11','12','13','14','15','16','17','18']
			let footList=['11','12','13','14','15','16','17','18']
			return[
			columns.map((column, columnIndex) => {
			if (columnIndex === 0) {
			@@ -262,6 +261,9 @@
			})

			const mergeCells = ref([
			{ row: 0, col: 1, rowspan: 3, colspan: 0},
			{ row: 3, col: 1, rowspan: 3, colspan: 0},

			{ row: 0, col: 2, rowspan: 3, colspan: 0},
			{ row: 3, col: 2, rowspan: 3, colspan: 0},

			@@ -271,11 +273,8 @@
			{ row: 0, col: 4, rowspan: 3, colspan: 0},
			{ row: 3, col: 4, rowspan: 3, colspan: 0},

			{ row: 0, col: 5, rowspan: 3, colspan: 0},
			{ row: 3, col: 5, rowspan: 3, colspan: 0},

			{ row: 0, col: 8, rowspan: 3, colspan: 0},
			{ row: 3, col: 8, rowspan: 3, colspan: 0},

			])

			</script>