From a0b6faef7b25572ef6f5c19aaacc8e0474ae7b3b Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 04 三月 2025 10:49:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 UI-Project/src/views/PurchaseReturn/purchaseReturn.vue |   30 +++++++++++++++++++-----------
 1 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
index a68df18..673c709 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
@@ -496,6 +496,8 @@
       return '#911005';
     case 9:
       return '#4682B4';
+    default:
+      return '#CDAF95'; 
   }
 } 
 function getRectColor2(state) {
@@ -506,6 +508,8 @@
       return '#911005';
     case 9:
       return '#4682B4';
+    default:
+      return '#CDAF95'; 
   }
 }
 function getRectColora(state) {
@@ -515,11 +519,13 @@
     case 1:
       return '#95d475';
     case -1:
-      return '#CDAF95';
+      return '#99BBFF';
     case 8:
       return '#911005';
     case 9:
       return '#4682B4';
+    default:
+      return '#CDAF95'; 
   }
 }
 function getRectColorb(state) {  
@@ -532,6 +538,8 @@
       return '#911005'; 
     case 9:
       return '#4682B4'; 
+    default:
+      return '#CDAF95'; 
   }  
 }
 function showDialog1(rect) {
@@ -655,7 +663,7 @@
     glassId: currentGlassId.value,
     // temperingFeedSequence: currenttemperingFeedSequence.value,
     line: 4001,
-    status: 8,
+    state: 8,
     workingProcedure: '閽㈠寲',
     })
     if (response.code == 200) {
@@ -675,7 +683,7 @@
   const response = await request.post('/temperingGlass/temperingGlassInfo/updateTemperingState', {
     glassId: currentGlassId.value,
     line: 4001,
-    status: 8,
+    state: 8,
     workingProcedure: '閽㈠寲',
     })
     if (response.code == 200) {
@@ -696,7 +704,7 @@
   const response = await request.post('/temperingGlass/temperingGlassInfo/updateTemperingState', {
     glassId: currentGlassId.value,
     line: 4001,
-    status: 8,
+    state: 8,
     workingProcedure: '閽㈠寲',
     })
     if (response.code == 200) {
@@ -717,7 +725,7 @@
   const response = await request.post('/temperingGlass/temperingGlassInfo/updateTemperingState', {
     glassId: currentGlassId.value,
     line: 4001,
-    status: 9,
+    state: 9,
     workingProcedure: '閽㈠寲',
     })
     if (response.code == 200) {
@@ -738,7 +746,7 @@
   const response = await request.post('/temperingGlass/temperingGlassInfo/updateTemperingState', {
     glassId: currentGlassId.value,
     line: 4001,
-    status: 1,
+    state: 1,
     workingProcedure: '閽㈠寲',
     })
     if (response.code == 200) {
@@ -759,7 +767,7 @@
   const response = await request.post('/temperingGlass/temperingGlassInfo/updateTemperingState', {
     glassId: currentGlassId.value,
     line: 4001,
-    status: 9,
+    state: 9,
     workingProcedure: '閽㈠寲',
     })
     if (response.code == 200) {
@@ -780,7 +788,7 @@
   const response = await request.post('/temperingGlass/temperingGlassInfo/updateTemperingState', {
     glassId: currentGlassId.value,
     line: 4001,
-    status: 9,
+    state: 9,
     workingProcedure: '閽㈠寲',
     })
     if (response.code == 200) {
@@ -801,7 +809,7 @@
   const response = await request.post('/temperingGlass/temperingGlassInfo/updateTemperingState', {
     glassId: currentGlassId.value,
     line: 4001,
-    status: 8,
+    state: 8,
     workingProcedure: '閽㈠寲',
     })
     if (response.code == 200) {
@@ -821,7 +829,7 @@
   const response = await request.post('/temperingGlass/temperingGlassInfo/updateTemperingState', {
     glassId: currentGlassId.value,
     line: 4001,
-    status: 9,
+    state: 9,
     workingProcedure: '閽㈠寲',
     })
     if (response.code == 200) {
@@ -841,7 +849,7 @@
   const response = await request.post('/temperingGlass/temperingGlassInfo/updateTemperingState', {
     glassId: currentGlassId.value,
     line: 4001,
-    status: 3,
+    state: 3,
     workingProcedure: '閽㈠寲',
     })
     if (response.code == 200) {

--
Gitblit v1.8.0