From e4dd01f778dea3cc1c693c29b2c4c3bdc8fe0074 Mon Sep 17 00:00:00 2001
From: zhangdi <1104545947@qq.com>
Date: Thu, 9 Apr 2026 10:43:21 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=B5=81=E7=AE=A1=E7=90=86=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/logisticsManagement/logisticsDistribution.vue | 7 +++++++
 src/views/logisticsManagement/siteBasic.vue             | 9 ++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/views/logisticsManagement/logisticsDistribution.vue b/src/views/logisticsManagement/logisticsDistribution.vue
index 3509548..82886c3 100644
--- a/src/views/logisticsManagement/logisticsDistribution.vue
+++ b/src/views/logisticsManagement/logisticsDistribution.vue
@@ -150,6 +150,13 @@ export default {
               label: 'wcName',
               value: 'id',
             },
+          },
+           {
+            label: '区域',
+            prop: 'stationRegion',
+            search: false,
+            sortable: true,
+            span: 12,
           },
           {
             label: '状态',
diff --git a/src/views/logisticsManagement/siteBasic.vue b/src/views/logisticsManagement/siteBasic.vue
index 7c6e299..8bb16a4 100644
--- a/src/views/logisticsManagement/siteBasic.vue
+++ b/src/views/logisticsManagement/siteBasic.vue
@@ -23,7 +23,7 @@
       </template>
       <template #menu-right> </template>
       <template #menu="scope">
-        <el-button v-if="scope.row.stationStatus == '0'" type="text" @click="handleEdit(scope.row)"
+        <el-button v-if="scope.row.stationStatus == '0'||scope.row.stationStatus == '2'" type="text" @click="handleEdit(scope.row)"
           >占用</el-button
         >
         <el-button v-if="scope.row.stationStatus == '1'" type="text" @click="handleEdit(scope.row)"
@@ -38,6 +38,9 @@
         <el-tag v-if="scope.row.stationStatus == '1'" type="danger" @click="handleEdit(row)"
           >占用</el-tag
         >
+        <el-tag v-if="scope.row.stationStatus == '2'" type="danger" @click="handleEdit(row)"
+          >预占用</el-tag
+        >
       </template>
       <template #stationPosition="scope"> {{ scope.row.stationPosition }}楼 </template>
     </avue-crud>
@@ -177,6 +180,10 @@ export default {
                 label: '闲置',
                 value: 0,
               },
+               {
+                label: '预占用',
+                value: 2,
+              },
             ],
           },
           {