Commit 38e8c73b by 郑艺斌

fix: 站点配置合并单元格

parent c9c39049
......@@ -167,7 +167,7 @@ export default {
methods: {
// 合并表格
mergeRowMethod ({ row, _rowIndex, column, visibleData }) {
const fields = ['createDate', 'company_dictText', 'siteType_dictText', 'factoryId_dictText', 'floorNum', 'command', 'tempId_dictText', 'remark', 'status', 'updateDate']
const fields = ['createDate', 'company_dictText', 'siteType_dictText', 'name', 'factoryId_dictText', 'floorNum', 'command', 'tempId_dictText', 'remark', 'status', 'updateDate']
const cellValue = row[column.property]
if (cellValue && fields.includes(column.property)) {
const prevRow = visibleData[_rowIndex - 1] // 获取列表上一条数据
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment