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 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -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 @@
- 取消
- 确定
+ 取消
+ 确定
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) }}
-
+
+
+ {{ getScopeDisplayNames(scope.row) }}
+
+
{{ scope.row.statusText || getStatusLabel(scope.row.status) }}
@@ -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 = {