From 924ce82faeec6d896fcdc360b279215e84b69fb9 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 11 九月 2025 11:44:44 +0800
Subject: [PATCH] 1、代码补充提交

---
 UI-Project/src/views/PurchaseReturn/purchaseReturn.vue |   46 ++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
index c3cef19..69fdb96 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
@@ -29,6 +29,7 @@
 const cantakea = ref(true);
 const cantakeb = ref(true);
 const canona = ref(true);
+const canons = ref(true);
 const cantakeall = ref(true);
 const canonb = ref(true);
 const canSelectProjectb = ref(true);
@@ -42,6 +43,7 @@
 const engineerId = ref('')
 const router = useRouter()
 const currentGlassId = ref(null);
+const currentstartSlot = ref(null);
 const currentengineerId = ref(null);
 const currenttemperingLayoutId = ref(null);
 const currenttemperingFeedSequence = ref(null);
@@ -613,6 +615,7 @@
     adjustedRects1.value[index].isActive = true;  
   }  
   currentGlassId.value = rect.glassId;  
+  currentstartSlot.value = rect.slot;
   currentengineerId.value = rect.engineerId;  
   currenttemperingLayoutId.value = rect.temperingLayoutId;  
   currenttemperingFeedSequence.value = rect.temperingFeedSequence;  
@@ -640,6 +643,7 @@
     adjustedRects3.value[index].isActive = true;  
   }  
   currentGlassId.value = rect.glassId;  
+  currentstartSlot.value = rect.slot;
   currentengineerId.value = rect.engineerId;  
   currenttemperingLayoutId.value = rect.temperingLayoutId;  
   currenttemperingFeedSequence.value = rect.temperingFeedSequence;  
@@ -667,6 +671,7 @@
     adjustedRects2.value[index].isActive = true;  
   }  
   currentGlassId.value = rect.glassId;  
+  currentstartSlot.value = rect.slot;
   currentengineerId.value = rect.engineerId;  
   currenttemperingLayoutId.value = rect.temperingLayoutId;  
   currenttemperingFeedSequence.value = rect.temperingFeedSequence;  
@@ -694,6 +699,7 @@
     adjustedRects4.value[index].isActive = true;  
   }  
   currentGlassId.value = rect.glassId;  
+  currentstartSlot.value = rect.slot;
   currentengineerId.value = rect.engineerId;  
   currenttemperingLayoutId.value = rect.temperingLayoutId;  
   currenttemperingFeedSequence.value = rect.temperingFeedSequence;  
@@ -721,6 +727,7 @@
     adjustedRectsa.value[index].isActive = true;  
   }  
   currentGlassId.value = rect.glassId;  
+  currentstartSlot.value = rect.slot;
   currentengineerId.value = rect.engineerId;  
   currenttemperingLayoutId.value = rect.temperingLayoutId;  
   currenttemperingFeedSequence.value = rect.temperingFeedSequence;  
@@ -738,9 +745,15 @@
   } 
   if (currentRect.value.state == 1) {
     canona.value = false;
-  } else if (currentRect.value.state == 0) {
+  } else if (currentRect.value.state == 0||currentRect.value.state == -1) {
     canona.value = true;
   } 
+  if (currentRect.value.state == 1) {
+    canons.value = false;
+  } else if (currentRect.value.state == -1) {
+    canons.value = true;
+  } 
+
   if (currentRect.value.state > 5) {
     cantakeall.value = false;
   } else{
@@ -752,7 +765,8 @@
   if (index !== -1) {  
     adjustedRectsb.value[index].isActive = true;  
   }  
-  currentGlassId.value = rect.glassId;  
+  currentGlassId.value = rect.glassId; 
+  currentstartSlot.value = rect.slot; 
   currentengineerId.value = rect.engineerId;  
   currenttemperingLayoutId.value = rect.temperingLayoutId;  
   currenttemperingFeedSequence.value = rect.temperingFeedSequence;  
@@ -980,6 +994,28 @@
     })
     if (response.code == 200) {
       ElMessage.success('鎴愬姛锛�');
+      blinda.value = false;
+      updateoutColorsa();
+    } else {
+      // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
+      ElMessage.error(response.message);
+    }
+}
+catch (error) {
+    // 澶勭悊閿欒
+    console.error(error);
+  }
+}
+// 杩涚倝鍓嶅嚭鐗�
+const outTask = async (line) => {
+  try  {
+  const response = await request.post('/cacheVerticalGlass/bigStorageCageOutTask/temperingOut', {
+    glassId: currentGlassId.value,
+    endSlot: line,
+    startSlot: currentstartSlot.value,
+    })
+    if (response.code == 200) {
+      ElMessage.success(response.message);
       blinda.value = false;
       updateoutColorsa();
     } else {
@@ -1667,6 +1703,12 @@
         <el-button type="info" plain @click="handleal11" :disabled="!cantakeall" style="width: 150px;margin-left: 10px;margin-top: 10px;">
           {{ $t('processCard.intofurnace') }}
         </el-button>
+        <el-button type="success" plain :icon="Edit" @click="outTask(3002)" :disabled="!canons" style="width: 150px;margin-left: 10px;margin-top: 10px;">
+          {{ $t('searchOrder.specifyout') }}
+        </el-button>
+        <el-button type="success" plain :icon="Edit" @click="outTask(3001)" :disabled="!canons" style="width: 150px;margin-left: 10px;margin-top: 10px;">
+          {{ $t('searchOrder.outfilm') }}
+        </el-button>
   </el-dialog>  
   <!-- 宸插嚭鐐� -->
 <el-dialog v-model="blindb" top="30vh" width="15%" style="text-align: center;" @close="handleDialogCloseb">

--
Gitblit v1.8.0