From 0a39446c65b3df8fb5693d243f075bc4a66ba5b4 Mon Sep 17 00:00:00 2001
From: my_ong <429426262@qq.com>
Date: Wed, 12 Mar 2025 11:20:47 +0800
Subject: [PATCH] =?UTF-8?q?sparkles:=20:sparkles:=20=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../stock/report/stocktakingReport-page.vue   | 28 ++++++++++++++-----
 1 file changed, 21 insertions(+), 7 deletions(-)

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)"
 						>
-							<template #icon>
-								<icon-font type="icon-plus" />
-							</template>
 							审核
 						</a-button>
+						<a-button
+							type="link"
+							style="margin-left: 10px"
+							@click="showResultModal(record.id, record.auditType, false)"
+						>
+							查看
+						</a-button>
 					</template>
 				</template>
 			</a-table>
@@ -81,7 +85,7 @@
 
 	<!-- 审核弹窗 -->
 	<a-modal v-model:open="openResult" title="盘点异常数据：" width="80%" :confirm-loading="confirmLoading" @ok="submit">
-		<result-form v-if="auditTypeRef === 'SCAN'" :apply-id="applyIdRef"></result-form>
+		<result-form v-if="auditTypeRef === 'SCAN'" :apply-id="applyIdRef" />
 		<vxe-table
 			v-if="auditTypeRef === 'MANUAL'"
 			v-model:data="manualData"
@@ -101,7 +105,7 @@
 			<vxe-column field="manualStock" title="手动核实数量" />
 			<vxe-column field="msg" title="异常原因" />
 		</vxe-table>
-		<a-form layout="vertical" style="margin-top: 20px">
+		<a-form v-if="flag" layout="vertical" style="margin-top: 20px">
 			<a-form-item label="审核意见">
 				<a-textarea v-model:value="remark" placeholder="请输入审核意见" :row="3" :maxlength="1000" />
 			</a-form-item>
@@ -211,9 +215,14 @@
 		}
 	})
 
+	// 定义一个标记，用于控制是查看还是审核 flag=true审核，flag=false查看
+	const flag = ref(false)
 	const openResult = ref<boolean>(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,