From 8ce2fb9627978e326a9994363fc3953d27838cab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=94=A1=E7=8E=B2?=
 <8702040+cai-ling@user.noreply.gitee.com>
Date: Wed, 18 Sep 2024 16:54:47 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/manage/mater-in-storage.vue |  2 +-
 pages/manage/route-lock.vue       | 22 +++++++++++++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/pages/manage/mater-in-storage.vue b/pages/manage/mater-in-storage.vue
index 1df3e84..83bb8dc 100644
--- a/pages/manage/mater-in-storage.vue
+++ b/pages/manage/mater-in-storage.vue
@@ -32,7 +32,7 @@
 					</view>
 				</view>
 			</view>
-			<view v-show="index === '1'" class="zd_wrapper grid-wraper">
+			<view class="zd_wrapper grid-wraper">
 				<view class="slide_new">
 					<table>
 						<thead>
diff --git a/pages/manage/route-lock.vue b/pages/manage/route-lock.vue
index b5e1ca9..f1c06aa 100644
--- a/pages/manage/route-lock.vue
+++ b/pages/manage/route-lock.vue
@@ -18,7 +18,7 @@
 		</view>
 		<view class="zd-row submit-bar">
 			<button class="zd-col-5 button-default" @tap="clearUp">清空</button>
-			<button class="zd-col-8 button-primary" :class="{'button-info': !index1}" :disabled="disabled" @tap="_updateRouteStatus('1')">锁定</button>
+			<button class="zd-col-8 button-primary" :class="{'button-info': !index1}" :disabled="disabled" @tap="toSure('1')">锁定</button>
 			<button class="zd-col-8 button-primary" :class="{'button-info': !index1}" :disabled="disabled" @tap="_updateRouteStatus('0')">释放</button>
 		</view>
 	</view>
@@ -45,6 +45,26 @@
 			this.title = options.title
 		},
 		methods: {
+			toSure (type) {
+				this.disabled = true
+				if (!this.index1) {
+					this.disabled = false
+					return
+				}
+				uni.showModal({
+					title: '提示',
+					cancelText: '取消',
+					confirmText: '确定',
+					content: '请确认当前锁定路线不存在AGV',
+					success: (res) => {
+						if (res.confirm) {
+							this._updateRouteStatus(type)
+						} else if (res.cancel) {
+							this.disabled = false
+						}
+					}
+				})
+			},
 			async _updateRouteStatus (type) {
 				this.disabled = true
 				if (!this.index1) {