From e79578c2387f4bc69ea8ae6bef17d0ebcbe65037 Mon Sep 17 00:00:00 2001
From: zxy <zhouxy1921@11.com>
Date: Tue, 20 Jan 2026 08:55:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E5=BA=9F=E6=8C=89=E9=92=AEbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mes-server/src/main/resources/application.yaml                | 2 +-
 .../mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mes-server/src/main/resources/application.yaml b/mes-server/src/main/resources/application.yaml
index 5f9aa56f..3013bd87 100644
--- a/mes-server/src/main/resources/application.yaml
+++ b/mes-server/src/main/resources/application.yaml
@@ -5,7 +5,7 @@ spring:
     name: mes-server
 
   profiles:
-    active: pro
+    active: local
 
 
   main:
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue
index f42598f7..9e4a52b8 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue
@@ -345,8 +345,8 @@ link type="primary" size="small" :disabled="ctrView || ctrDelete"
             交</el-button>
 <!--          <el-button   @click="handleStatus(3)" type="danger" v-if="btnCancel&&formData.status == 1" size="large">作-->
 <!--            废</el-button>  -->
-          <el-button   @click="handleDelete" type="danger" v-if="formData.status == 1" size="large">作
-            废</el-button>
+            <el-button @click="handleDelete" type="danger" v-if="btnCancel&&formData.status ==1 && query.type != 'create'" size="large">作 废</el-button>
+
         </template>
 
         <el-row justify="center">