From bdd0d478dfe892c4e62deaca6528059a71792fd6 Mon Sep 17 00:00:00 2001
From: my_ong <429426262@qq.com>
Date: Sat, 8 Mar 2025 20:38:12 +0800
Subject: [PATCH] =?UTF-8?q?bug:=20:bug:=20=E8=A7=A3=E5=86=B3=E6=89=93?=
 =?UTF-8?q?=E5=8C=85=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/stock/report/materialReport-page.vue    |  5 +++++
 src/views/stock/report/stocktakingReport-page.vue | 13 +++++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/views/stock/report/materialReport-page.vue b/src/views/stock/report/materialReport-page.vue
index 87b3631..f74fb7c 100644
--- a/src/views/stock/report/materialReport-page.vue
+++ b/src/views/stock/report/materialReport-page.vue
@@ -61,6 +61,11 @@
 
 	//表格列
 	const columns = [
+		{
+			title: '序号',
+			dataIndex: 'key',
+			customRender: ({ index }: { index: number }) => `${index + 1}`,
+		},
 		{
 			title: '物料编码',
 			dataIndex: 'code',
diff --git a/src/views/stock/report/stocktakingReport-page.vue b/src/views/stock/report/stocktakingReport-page.vue
index ed47bee..18410b9 100644
--- a/src/views/stock/report/stocktakingReport-page.vue
+++ b/src/views/stock/report/stocktakingReport-page.vue
@@ -29,8 +29,8 @@
 
 				<a-col :span="6" style="width: 180px">
 					<a-select v-model:value="auditType" :allow-clear="true" placeholder="盘点类型" style="width: 100%">
-						<a-select-option value="ALL">全部盘点</a-select-option>
-						<a-select-option value="PARTIAL">部分盘点</a-select-option>
+						<a-select-option value="SCAN">扫码盘点</a-select-option>
+						<a-select-option value="MANUAL">人工盘点</a-select-option>
 					</a-select>
 				</a-col>
 				<a-col :span="6">
@@ -51,7 +51,7 @@
 			>
 				<template #bodyCell="{ column, record }">
 					<template v-if="column.dataIndex === 'auditType'">
-						{{ record.auditType === 'ALL' ? '全部盘点' : '部分盘点' }}
+						{{ record.auditType === 'SCAN' ? '扫码盘点' : '人工盘点' }}
 					</template>
 					<template v-if="column.dataIndex === 'reviewResult'">
 						<!-- 不同状态不同颜色 -->
@@ -114,7 +114,7 @@
 	const startDate = ref<Dayjs>()
 	const taker = ref('')
 	const status = ref<Array<'PASS' | 'REJECT' | 'WAIT_SCAN' | 'WAIT_SUBMIT' | 'WAIT_REVIEW'>>()
-	const auditType = ref<'ALL' | 'PARTIAL'>()
+	const auditType = ref<'SCAN' | 'MANUAL'>()
 
 	// 加载数据的方法
 	const loadData = async (page = 1, size = 10) => {
@@ -143,8 +143,9 @@
 	//表格列
 	const columns = [
 		{
-			title: '申请序号',
-			dataIndex: 'id',
+			title: '序号',
+			dataIndex: 'key',
+			customRender: ({ index }: { index: number }) => `${index + 1}`,
 		},
 		{
 			title: '盘点类型',