diff --git a/src/views/stock/report/stocktakingReport-page.vue b/src/views/stock/report/stocktakingReport-page.vue index 6e2af94..8835eb6 100644 --- a/src/views/stock/report/stocktakingReport-page.vue +++ b/src/views/stock/report/stocktakingReport-page.vue @@ -66,13 +66,17 @@ v-if="record.reviewResult === 'WAIT_REVIEW'" type="link" style="margin-left: 10px" - @click="showResultModal(record.id, record.auditType)" + @click="showResultModal(record.id, record.auditType, true)" > - 审核 + + 查看 + @@ -81,7 +85,7 @@ - + - + @@ -211,9 +215,14 @@ } }) + // 定义一个标记,用于控制是查看还是审核 flag=true审核,flag=false查看 + const flag = ref(false) const openResult = ref(false) const auditTypeRef = ref<'SCAN' | 'MANUAL'>() - const showResultModal = (applyId: number, auditType: 'SCAN' | 'MANUAL') => { + + // 点击 审核或者查看 按钮 + const showResultModal = (applyId: number, auditType: 'SCAN' | 'MANUAL', select: boolean) => { + flag.value = select auditTypeRef.value = auditType applyIdRef.value = applyId openResult.value = true @@ -233,6 +242,11 @@ //提交审核结果 const submit = () => { confirmLoading.value = true + if (!flag.value) { + confirmLoading.value = false + openResult.value = false + return + } api.materialApi.apply.submitReview( { applyId: applyIdRef.value,