|
@@ -938,29 +938,29 @@ const addNewData = () => {
|
|
|
switch (activeName.value) {
|
|
|
case 'one':
|
|
|
const table0Ref = proTable.value![0]
|
|
|
- if (table0Ref.tableData.length !== 0) {
|
|
|
+ if (table0Ref.tableData.length === 0) {
|
|
|
+ ElMessage.warning('请正确选择该组数据')
|
|
|
+ } else {
|
|
|
tabTwo.value = false
|
|
|
activeName.value = 'two'
|
|
|
- } else {
|
|
|
- ElMessage.warning('请正确选择该组数据')
|
|
|
}
|
|
|
break
|
|
|
case 'two':
|
|
|
const table1Ref = proTable.value![1]
|
|
|
- if (Object.keys(table1Ref.searchParam).length !== 0 && table1Ref.tableData.length !== 0) {
|
|
|
+ if (table1Ref.tableData.length === 0) {
|
|
|
+ ElMessage.warning('请正确选择该组数据')
|
|
|
+ } else {
|
|
|
tabThree.value = false
|
|
|
activeName.value = 'three'
|
|
|
- } else {
|
|
|
- ElMessage.warning('请正确选择该组数据')
|
|
|
}
|
|
|
break
|
|
|
case 'three':
|
|
|
const table2Ref = proTable.value![2]
|
|
|
- if (Object.keys(table2Ref.searchParam).length !== 0 && table2Ref.tableData.length !== 0) {
|
|
|
+ if (table2Ref.tableData.length === 0) {
|
|
|
+ ElMessage.warning('请正确选择该组数据')
|
|
|
+ } else {
|
|
|
tabFour.value = false
|
|
|
activeName.value = 'four'
|
|
|
- } else {
|
|
|
- ElMessage.warning('请正确选择该组数据')
|
|
|
}
|
|
|
break
|
|
|
default:
|
|
@@ -1084,6 +1084,10 @@ const onNext = () => {
|
|
|
}
|
|
|
formItem[dataName] = []
|
|
|
for (let i = 0; i <= flag; i++) {
|
|
|
+ if (proTable.value![i].tableData.length === 0) {
|
|
|
+ ElMessage.warning('数据存在空集,请正确选择数据')
|
|
|
+ return
|
|
|
+ }
|
|
|
let obj = proTable.value![i].searchParam
|
|
|
for (let key in obj) {
|
|
|
if (obj.hasOwnProperty(key) && obj[key] === '') {
|