From e8f734121a04baa8fe89740ec5bd9ee4f9459d3f Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期三, 26 二月 2025 09:42:27 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
UI-Project/src/views/PurchaseReturn/purchaseReturn.vue | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
index bc22be8..a68df18 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
@@ -500,7 +500,7 @@
}
function getRectColor2(state) {
switch (state) {
- case 2:
+ case 2:
return 'lightblue';
case 8:
return '#911005';
@@ -896,8 +896,8 @@
:style="{ position: 'absolute',
top: `${rect.y}px`,
left: `${rect.x}px`,
- width: `${rect.widtha}px`,
- height: `${rect.heighta}px`,
+ width: `${rect.width}px`,
+ height: `${rect.height}px`,
backgroundColor: rect.isActive ? '#ADFF2F' : getRectColor1(rect.state) }">
<div class="centered-text">
<div style="font-size: 15px;font-weight: bold;">{{ rect.glassId }}</div>
@@ -924,8 +924,8 @@
:style="{ position: 'absolute',
top: `${rect.y}px`,
left: `${rect.x}px`,
- width: `${rect.widtha}px`,
- height: `${rect.heighta}px`,
+ width: `${rect.width}px`,
+ height: `${rect.height}px`,
backgroundColor: rect.isActive ? '#ADFF2F' : getRectColor2(rect.state) }">
<div class="centered-text">
<div style="font-size: 15px;font-weight: bold;">{{ rect.glassId }}</div>
@@ -962,7 +962,7 @@
@click="showDialoga(rect)"
class="rect"
:style="{ position: 'absolute', top: `${rect.y}px`, left: `${rect.x}px`,
- width: `${rect.widtha}px`, height: `${rect.heighta}px`,
+ width: `${rect.width}px`, height: `${rect.height}px`,
backgroundColor: rect.isActive ? '#ADFF2F' : getRectColora(rect.state) }">
<div class="centered-text">
<div style="font-size: 15px;font-weight: bold;">{{ rect.glassId }}</div>
@@ -989,7 +989,7 @@
@click="showDialogb(rect)"
class="rect"
:style="{ position: 'absolute', top: `${rect.y}px`, left: `${rect.x}px`,
- width: `${rect.widtha}px`, height: `${rect.heighta}px`,
+ width: `${rect.width}px`, height: `${rect.height}px`,
backgroundColor: rect.isActive ? '#ADFF2F' : getRectColorb(rect.state) }">
<!-- backgroundColor: rect.state === 4 ? '#911005' : '#f8e3c5' }"> -->
<div class="centered-text">
--
Gitblit v1.8.0