From 90da064f25e72e810923ba326998de47138217f5 Mon Sep 17 00:00:00 2001
From: my_ong <429426262@qq.com>
Date: Sun, 9 Mar 2025 14:36:02 +0800
Subject: [PATCH] =?UTF-8?q?bug:=20:bug:=20=E7=95=8C=E9=9D=A2=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/stock/component/apply-form.vue       | 9 +++++----
 src/views/stock/report/outboundReport-page.vue | 7 +++++++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/views/stock/component/apply-form.vue b/src/views/stock/component/apply-form.vue
index fc34012..7392f4f 100644
--- a/src/views/stock/component/apply-form.vue
+++ b/src/views/stock/component/apply-form.vue
@@ -3,7 +3,7 @@
 	<div>
 		<a-form :model="formData" name="basic" layout="horizontal" label-wrap>
 			<a-form-item label="申请人" name="applicant">
-				<a-input v-model="formData.applicant" style="width: 40%" />
+				<a-input v-model:value="formData.applicant" style="width: 40%" />
 			</a-form-item>
 
 			<a-form-item label="申请类型" name="applyType">
@@ -15,7 +15,7 @@
 				</a-radio-group>
 			</a-form-item>
 			<a-form-item v-if="formData.applyType === 'SCRAP_OUT'" label="审核人" name="reviewer">
-				<a-select v-model:value="formData.viewer" style="width: 40%" :options="personList"></a-select>
+				<a-select v-model:value="formData.reviewer" style="width: 40%" :options="personList"></a-select>
 			</a-form-item>
 			<a-form-item label="申请日期" name="applyDate" style="width: 40%">
 				<a-date-picker v-model:value="formData.applyDate" />
@@ -122,6 +122,7 @@
 			applyDate: formData.value.applyDate.format('YYYY-MM-DD HH:mm:ss'),
 			isConfirm: true,
 			result: '',
+			reviewer: formData.value.reviewer,
 		}
 	}
 	defineExpose({ getTableData, getApplyForm })
@@ -131,14 +132,14 @@
 		applyDate: Dayjs // 申请日期
 		applyType: string // 申请类型
 		slectedList: number[] // 入库物料
-		viewer: string // 审核人
+		reviewer: string // 审核人
 	}
 	const formData = ref<FormData>({
 		applicant: '',
 		applyDate: dayjs(),
 		applyType: props.applyType,
 		slectedList: [],
-		viewer: '',
+		reviewer: '',
 	})
 
 	// 审核人
diff --git a/src/views/stock/report/outboundReport-page.vue b/src/views/stock/report/outboundReport-page.vue
index 90352eb..a7f2dbd 100644
--- a/src/views/stock/report/outboundReport-page.vue
+++ b/src/views/stock/report/outboundReport-page.vue
@@ -29,6 +29,9 @@
 					<template v-if="column.dataIndex === 'applyTypeInfo'">
 						{{ record.applyTypeInfo.description }}
 					</template>
+					<template v-if="column.dataIndex === 'operation'">
+						<a-button v-if="record.applyType === 'SCRAP_OUT'" type="link" style="margin-left: 10px">审核</a-button>
+					</template>
 				</template>
 			</a-table>
 		</div>
@@ -108,6 +111,10 @@
 			title: '备注',
 			dataIndex: 'remark',
 		},
+		{
+			title: '操作',
+			dataIndex: 'operation',
+		},
 	]
 
 	//分页信息