From aaeff2d517b26bf2732182e4975f5b1156b752c3 Mon Sep 17 00:00:00 2001 From: wxw <Administrator@DESKTOP-5BIMHQ3> Date: 星期六, 07 六月 2025 11:37:28 +0800 Subject: [PATCH] 解决冲突 --- Web/src/views/device/sortPallet/index.vue | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Web/src/views/device/sortPallet/index.vue b/Web/src/views/device/sortPallet/index.vue index 698c6a7..15dc589 100644 --- a/Web/src/views/device/sortPallet/index.vue +++ b/Web/src/views/device/sortPallet/index.vue @@ -211,15 +211,15 @@ } //缁撴壒鎿嶄綔 function closeBindDialog(lotNo){ - if(lotNo==''){ - ElMessage.error('璇ュ伐浣嶆湭缁戝畾浠诲姟锛�'); - return; - } + // if(lotNo==''){ + // ElMessage.error('璇ュ伐浣嶆湭缁戝畾浠诲姟锛�'); + // return; + // } ElMessageBox.confirm(`纭畾瀵硅鎵规浠诲姟缁撴壒鍚�?`, '鎻愮ず', { confirmButtonText: '纭畾', cancelButtonText: '鍙栨秷', type: 'warning', - }) + }) .then(async () => { closeTaskForPLC(lotNo); }) -- Gitblit v1.8.0