diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue index fee23d3..2857968 100644 --- a/src/components/ApprovalRecord/ApprovalRecordTable.vue +++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue @@ -59,9 +59,9 @@ } loadingTable.value = true fetchApproval(listQuery.value.processId).then((response) => { + list.value = [] response.data.forEach((item: Array, index: number) => { console.log(item, item.length, item[0].countersignOrSign === 2) - if (item.length > 1 && item[0].countersignOrSign === 2) { // 或签 console.log('或签数据处理', item) diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue index fee23d3..2857968 100644 --- a/src/components/ApprovalRecord/ApprovalRecordTable.vue +++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue @@ -59,9 +59,9 @@ } loadingTable.value = true fetchApproval(listQuery.value.processId).then((response) => { + list.value = [] response.data.forEach((item: Array, index: number) => { console.log(item, item.length, item[0].countersignOrSign === 2) - if (item.length > 1 && item[0].countersignOrSign === 2) { // 或签 console.log('或签数据处理', item) diff --git a/src/views/equipement/standard/book/detail.vue b/src/views/equipement/standard/book/detail.vue index 36487ab..aad95d3 100644 --- a/src/views/equipement/standard/book/detail.vue +++ b/src/views/equipement/standard/book/detail.vue @@ -145,6 +145,7 @@ // 点击保存 const saveForm = () => { + console.log(fun, '111') switch (current.value) { case 'book-basic': // 基本信息 bookBasicRef.value.saveForm() @@ -172,7 +173,14 @@ // 监听切换tab事件 const changeRadio = (label: any) => { + // 如果详情则不判断 + if ($route.path.includes('detail')) { + current.value = label + return + } console.log('切换前', label) + // 如果不是详情判断 内容是否被修改在提示 + ElMessageBox.confirm( '请问是否保存这个标签的内容?', '提示', @@ -180,14 +188,16 @@ confirmButtonText: '保存', cancelButtonText: '直接切换标签', type: 'warning', + showClose: false, // 是否展示关闭按钮 + closeOnClickModal: false, // 是否可通过点击遮罩层关闭 MessageBox + closeOnPressEscape: false, // 是否可通过按下 ESC 键关闭 MessageBox }, ) .then(() => { saveForm() - nextTick(() => { + setTimeout(() => { current.value = label - console.log('切换后', current.value) - }) + }, 1500) }).catch(() => { current.value = label // ElMessage.info('不保存') @@ -293,24 +303,34 @@ - + {{ item.name }} - + - + - + @@ -357,7 +384,10 @@ - +