入表功调整
Showing
1 changed file
with
14 additions
and
9 deletions
| ... | @@ -466,7 +466,7 @@ const btnClick = async (btn, bType = null) => { | ... | @@ -466,7 +466,7 @@ const btnClick = async (btn, bType = null) => { |
| 466 | const row = btn.row; | 466 | const row = btn.row; |
| 467 | const { rIndex, level } = row; | 467 | const { rIndex, level } = row; |
| 468 | const inputVal = type == 'edit' ? row[`name${level}`] : ''; | 468 | const inputVal = type == 'edit' ? row[`name${level}`] : ''; |
| 469 | let isChange = false, rowList = tableData.value.filter(t => t[`code${level - 1}`] == row[`code${level - 1}`]); | 469 | let isChange = false, rowList = type == 'add-same' ? tableData.value.filter(t => t[`code${level - 1}`] == row[`code${level - 1}`]) : tableData.value.filter(t => t[`code${level}`] == row[`code${level}`]); |
| 470 | ElMessageBox.prompt('', '节点名称', { | 470 | ElMessageBox.prompt('', '节点名称', { |
| 471 | confirmButtonText: '确定', | 471 | confirmButtonText: '确定', |
| 472 | cancelButtonText: '取消', | 472 | cancelButtonText: '取消', |
| ... | @@ -487,7 +487,7 @@ const btnClick = async (btn, bType = null) => { | ... | @@ -487,7 +487,7 @@ const btnClick = async (btn, bType = null) => { |
| 487 | if (name.length > 10) { | 487 | if (name.length > 10) { |
| 488 | return '节点名称长度不能超过10个字符' | 488 | return '节点名称长度不能超过10个字符' |
| 489 | } | 489 | } |
| 490 | const isExist = rowList.find(a => a[`name${level}`] == name); | 490 | const isExist = rowList.find(a => type == 'add-same' ? a[`name${level}`] == name : a[`name${level + 1}`] == name); |
| 491 | if (isExist) { | 491 | if (isExist) { |
| 492 | return '节点名称已存在,请填写其他名称' | 492 | return '节点名称已存在,请填写其他名称' |
| 493 | } | 493 | } |
| ... | @@ -551,12 +551,17 @@ const btnClick = async (btn, bType = null) => { | ... | @@ -551,12 +551,17 @@ const btnClick = async (btn, bType = null) => { |
| 551 | tableData.value.splice(rIndex, 1); | 551 | tableData.value.splice(rIndex, 1); |
| 552 | } | 552 | } |
| 553 | } else { | 553 | } else { |
| 554 | let rowData = tableData.value[rIndex]; | 554 | const peerList = tableData.value.filter(t => t[`code${level - 1}`] == row[`code${level - 1}`]); |
| 555 | delete rowData[`name${level}`]; | 555 | if (peerList.length > 1) { |
| 556 | delete rowData[`code${level}`]; | 556 | tableData.value.splice(rIndex, 1); |
| 557 | const level4 = tableData.value.find(t => t.code4); | 557 | } else { |
| 558 | !level4 && (tableField.value.at(-2).visible = false); | 558 | let rowData = tableData.value[rIndex]; |
| 559 | delete rowData[`name${level}`]; | ||
| 560 | delete rowData[`code${level}`]; | ||
| 561 | } | ||
| 559 | } | 562 | } |
| 563 | const level4 = tableData.value.find(t => t.code4); | ||
| 564 | !level4 && (tableField.value.at(-2).visible = false); | ||
| 560 | getMergeRow(); | 565 | getMergeRow(); |
| 561 | }).catch(() => { | 566 | }).catch(() => { |
| 562 | ElMessage({ | 567 | ElMessage({ |
| ... | @@ -1326,8 +1331,8 @@ onUpdated(() => { | ... | @@ -1326,8 +1331,8 @@ onUpdated(() => { |
| 1326 | <span>{{ setLabel(row.title) }}</span> | 1331 | <span>{{ setLabel(row.title) }}</span> |
| 1327 | </template> | 1332 | </template> |
| 1328 | </el-table-column> --> | 1333 | </el-table-column> --> |
| 1329 | <el-table-column v-for="(item, index) in bookHeaders" :key="index" :prop="item.field" :label="item.label" | 1334 | <el-table-column v-for="(item, index) in bookHeaders" :key="index" :prop="item.field" |
| 1330 | :width="item.width" :align="item.align"> | 1335 | :label="item.label" :width="item.width" :align="item.align"> |
| 1331 | <template #default="scope"> | 1336 | <template #default="scope"> |
| 1332 | <span v-if="item.field == 'title'">{{ setLabel(scope.row[item.field]) }}</span> | 1337 | <span v-if="item.field == 'title'">{{ setLabel(scope.row[item.field]) }}</span> |
| 1333 | <span v-else>{{ changeNum(scope.row[item.field], 2, true) }}</span> | 1338 | <span v-else>{{ changeNum(scope.row[item.field], 2, true) }}</span> | ... | ... |
-
Please register or sign in to post a comment