From f9ac6553e1e96f07b58ea4e0b51f6af9875219ea Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 28 二月 2025 10:32:42 +0800
Subject: [PATCH] 1、中空创建任务界面新增厚度查询，按流程卡升序排序
---
UI-Project/src/views/PurchaseReturn/purchaseReturn.vue | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
index bc22be8..b5f7a0e 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
@@ -496,16 +496,20 @@
return '#911005';
case 9:
return '#4682B4';
+ default:
+ return '#CDAF95';
}
}
function getRectColor2(state) {
switch (state) {
- case 2:
+ case 2:
return 'lightblue';
case 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) {
@@ -896,8 +904,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 +932,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 +970,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 +997,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