From 2f798b6b48f5f0e0e2e6bf8f876b6f50b12ca937 Mon Sep 17 00:00:00 2001
From: my_ong <429426262@qq.com>
Date: Wed, 12 Mar 2025 10:13:04 +0800
Subject: [PATCH] =?UTF-8?q?sparkles:=20:sparkles:=20=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E4=BA=BA=E5=B7=A5=E7=9B=98=E7=82=B9=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../stock/report/stocktakingReport-page.vue   | 63 ++++++++++++++-----
 .../stock/stocktaking/stocktaking-page.vue    |  1 -
 2 files changed, 47 insertions(+), 17 deletions(-)

diff --git a/src/views/stock/report/stocktakingReport-page.vue b/src/views/stock/report/stocktakingReport-page.vue
index 18410b9..6e2af94 100644
--- a/src/views/stock/report/stocktakingReport-page.vue
+++ b/src/views/stock/report/stocktakingReport-page.vue
@@ -66,7 +66,7 @@
 							v-if="record.reviewResult === 'WAIT_REVIEW'"
 							type="link"
 							style="margin-left: 10px"
-							@click="showResultModal(record.id)"
+							@click="showResultModal(record.id, record.auditType)"
 						>
 							<template #icon>
 								<icon-font type="icon-plus" />
@@ -81,20 +81,38 @@
 
 	<!-- 审核弹窗 -->
 	<a-modal v-model:open="openResult" title="盘点异常数据：" width="80%" :confirm-loading="confirmLoading" @ok="submit">
-		<result-form :apply-id="applyIdRef">
-			<a-form layout="vertical" style="margin-top: 20px">
-				<a-form-item label="审核意见">
-					<a-textarea v-model:value="remark" placeholder="请输入审核意见" :row="3" :maxlength="1000" />
-				</a-form-item>
+		<result-form v-if="auditTypeRef === 'SCAN'" :apply-id="applyIdRef"></result-form>
+		<vxe-table
+			v-if="auditTypeRef === 'MANUAL'"
+			v-model:data="manualData"
+			border
+			show-overflow
+			max-height="500"
+			size="medium"
+		>
+			<vxe-column type="seq" title="序号" width="60" />
+			<vxe-column field="id" title="物料id" :visible="false" />
+			<vxe-column field="name" title="物料名称" />
+			<vxe-column field="code" title="编码" />
+			<vxe-column field="spec" title="规格" />
+			<vxe-column field="price" title="价格" />
+			<vxe-column field="typeName" title="类型" />
+			<vxe-column field="stock" title="库存数量" />
+			<vxe-column field="manualStock" title="手动核实数量" />
+			<vxe-column field="msg" title="异常原因" />
+		</vxe-table>
+		<a-form layout="vertical" style="margin-top: 20px">
+			<a-form-item label="审核意见">
+				<a-textarea v-model:value="remark" placeholder="请输入审核意见" :row="3" :maxlength="1000" />
+			</a-form-item>
 
-				<a-form-item label="审核结果">
-					<a-radio-group v-model:value="reviewResult" button-style="solid">
-						<a-radio-button value="PASS">审核通过</a-radio-button>
-						<a-radio-button value="REJECT" style="margin-left: 20px">退回重盘</a-radio-button>
-					</a-radio-group>
-				</a-form-item>
-			</a-form>
-		</result-form>
+			<a-form-item label="审核结果">
+				<a-radio-group v-model:value="reviewResult" button-style="solid">
+					<a-radio-button value="PASS">审核通过</a-radio-button>
+					<a-radio-button value="REJECT" style="margin-left: 20px">退回重盘</a-radio-button>
+				</a-radio-group>
+			</a-form-item>
+		</a-form>
 	</a-modal>
 </template>
 
@@ -194,9 +212,22 @@
 	})
 
 	const openResult = ref<boolean>(false)
-	const showResultModal = (applyId: number) => {
-		openResult.value = true
+	const auditTypeRef = ref<'SCAN' | 'MANUAL'>()
+	const showResultModal = (applyId: number, auditType: 'SCAN' | 'MANUAL') => {
+		auditTypeRef.value = auditType
 		applyIdRef.value = applyId
+		openResult.value = true
+		if (auditType === 'MANUAL') {
+			getManualData(applyId)
+		}
+	}
+
+	// 查询人工盘点数据
+	const manualData = ref<Array<material.ManualStockDTO>>()
+	const getManualData = (applyId: number) => {
+		api.materialApi.apply.getManualStock(applyId, (data) => {
+			manualData.value = data
+		})
 	}
 
 	//提交审核结果
diff --git a/src/views/stock/stocktaking/stocktaking-page.vue b/src/views/stock/stocktaking/stocktaking-page.vue
index 6143bc7..06a0aaa 100644
--- a/src/views/stock/stocktaking/stocktaking-page.vue
+++ b/src/views/stock/stocktaking/stocktaking-page.vue
@@ -270,7 +270,6 @@
 		{
 			title: '操作',
 			dataIndex: 'operation',
-			width: 400,
 		},
 	]