From dcfceb2d0eb537cd0db879363c3340f45033a9f1 Mon Sep 17 00:00:00 2001
From: WUSIJIAN <13825895+wsj0228@user.noreply.gitee.com>
Date: Tue, 24 Feb 2026 10:33:28 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E7=9B=98=E7=82=B9=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E4=B8=AD=E7=9A=84=E8=AE=A1=E5=88=92=E5=BC=80=E5=A7=8B?=
 =?UTF-8?q?=E5=92=8C=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?,=E4=BC=98=E5=8C=96=E7=9B=98=E7=82=B9=E8=8C=83=E5=9B=B4?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=80=BB=E8=BE=91=E6=94=AF=E6=8C=81=E6=8C=89?=
 =?UTF-8?q?=E4=BB=93=E5=BA=93/=E5=BA=93=E5=8C=BA/=E5=BA=93=E4=BD=8D?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=AF=B9=E5=BA=94=E5=90=8D=E7=A7=B0,?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=9B=98=E7=82=B9=E8=8C=83=E5=9B=B4=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E6=8A=BD=E5=B1=89=E5=BA=95=E9=83=A8=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../count/component/editInventoryCount.vue    | 34 ++-----------------
 .../count/component/scopeSelectDrawer.vue     |  4 +--
 src/views/assets/operation/count/index.vue    | 22 +++++++++++-
 3 files changed, 25 insertions(+), 35 deletions(-)

diff --git a/src/views/assets/operation/count/component/editInventoryCount.vue b/src/views/assets/operation/count/component/editInventoryCount.vue
index bcafe07..0736bba 100644
--- a/src/views/assets/operation/count/component/editInventoryCount.vue
+++ b/src/views/assets/operation/count/component/editInventoryCount.vue
@@ -40,30 +40,6 @@
 			<!-- 盘点范围选择抽屉 -->
 			<ScopeSelectDrawer ref="scopeDrawerRef" @confirm="onScopeConfirm" />
 			
-			<el-row :gutter="20">
-				<el-col :span="12">
-					<el-form-item label="计划开始" prop="plannedStartTime">
-						<el-date-picker
-							v-model="form.plannedStartTime"
-							type="datetime"
-							placeholder="请选择计划开始时间"
-							style="width: 100%"
-							value-format="YYYY-MM-DD HH:mm:ss"
-						/>
-					</el-form-item>
-				</el-col>
-				<el-col :span="12">
-					<el-form-item label="计划结束" prop="plannedEndTime">
-						<el-date-picker
-							v-model="form.plannedEndTime"
-							type="datetime"
-							placeholder="请选择计划结束时间"
-							style="width: 100%"
-							value-format="YYYY-MM-DD HH:mm:ss"
-						/>
-					</el-form-item>
-				</el-col>
-			</el-row>
 			
 			<el-form-item label="负责人" prop="assigneeId">
 				<el-input v-model="form.assigneeId" placeholder="请输入负责人" />
@@ -109,8 +85,6 @@ const form = reactive({
 	locationIds: [] as string[],
 	countType: undefined as number | undefined,
 	scope: 1 as number,
-	plannedStartTime: '',
-	plannedEndTime: '',
 	assigneeId: '',
 	participants: [] as string[],
 	remark: '',
@@ -171,8 +145,7 @@ const openDialog = async (row?: any) => {
 				form.description = data.description || '';
 				form.countType = data.countType;
 				form.scope = data.scope || 1;
-				form.plannedStartTime = data.plannedStartTime || '';
-				form.plannedEndTime = data.plannedEndTime || '';
+			
 				form.assigneeId = data.assigneeId || '';
 				form.remark = data.remark || '';
 				// 处理仓库/库区/库位ID（后端返回warehouseIDs，前端使用warehouseIds）
@@ -202,8 +175,7 @@ const resetForm = () => {
 	form.locationIds = [];
 	form.countType = undefined;
 	form.scope = 1;
-	form.plannedStartTime = '';
-	form.plannedEndTime = '';
+	
 	form.assigneeId = '';
 	form.participants = [];
 	form.remark = '';
@@ -255,8 +227,6 @@ const handleSubmit = async () => {
 				description: form.description || undefined,
 				countType: form.countType,
 				scope: form.scope,
-				plannedStartTime: form.plannedStartTime || undefined,
-				plannedEndTime: form.plannedEndTime || undefined,
 				participants: participantsInput.value ? participantsInput.value.split(',').map(s => s.trim()).filter(s => s) : undefined,
 				remark: form.remark || undefined,
 			};
diff --git a/src/views/assets/operation/count/component/scopeSelectDrawer.vue b/src/views/assets/operation/count/component/scopeSelectDrawer.vue
index 10d8fdb..8ea425b 100644
--- a/src/views/assets/operation/count/component/scopeSelectDrawer.vue
+++ b/src/views/assets/operation/count/component/scopeSelectDrawer.vue
@@ -106,8 +106,8 @@
 		</div>
 
 		<template #footer>
-			<el-button @click="handleClose">取消</el-button>
-			<el-button type="primary" @click="handleConfirm">确定</el-button>
+			<el-button style="margin-bottom: 10px;" @click="handleClose">取消</el-button>
+			<el-button style="margin-bottom: 10px; margin-right: 10px; " type="primary" @click="handleConfirm">确定</el-button>
 		</template>
 	</el-drawer>
 </template>
diff --git a/src/views/assets/operation/count/index.vue b/src/views/assets/operation/count/index.vue
index cdbc59a..67b5c83 100644
--- a/src/views/assets/operation/count/index.vue
+++ b/src/views/assets/operation/count/index.vue
@@ -71,7 +71,11 @@
 							{{ scope.row.scopeText || getScopeLabel(scope.row.scope) }}
 						</template>
 					</el-table-column>
-					<el-table-column prop="warehouseName" label="仓库" width="120" show-overflow-tooltip />
+					<el-table-column label="仓库/库区/库位" width="150" show-overflow-tooltip>
+						<template #default="scope">
+							{{ getScopeDisplayNames(scope.row) }}
+						</template>
+					</el-table-column>
 					<el-table-column prop="statusText" label="状态" width="100" align="center">
 						<template #default="scope">
 							<el-tag :type="getStatusTag(scope.row.status)">{{ scope.row.statusText || getStatusLabel(scope.row.status) }}</el-tag>
@@ -170,6 +174,22 @@ const getScopeLabel = (scope: number) => {
 	return labelMap[scope] || '未知';
 };
 
+// 根据盘点范围获取显示名称
+const getScopeDisplayNames = (row: any) => {
+	const scope = row.scope;
+	if (scope === 1) {
+		// 按仓库盘点，显示仓库名称
+		return (row.warehouseNames || []).join('、') || '-';
+	} else if (scope === 2) {
+		// 按库区盘点，显示库区名称
+		return (row.zoneNames || []).join('、') || '-';
+	} else if (scope === 3) {
+		// 按库位盘点，显示库位名称
+		return (row.locationNames || []).join('、') || '-';
+	}
+	return '-';
+};
+
 // 获取状态标签
 const getStatusTag = (status: number) => {
 	const tagMap: Record<number, string> = {