From add613567296124356cf870be07d7e105f48afb6 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期三, 26 二月 2025 14:45:44 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
UI-Project/src/views/PurchaseReturn/purchaseStorage.vue | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue b/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
index adc9a10..868c247 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
@@ -24,7 +24,7 @@
@click="showDialog(rect.glassId)"
:style="{ position: 'absolute',
top: `${rect.y}px`, left: `${rect.x}px`, width: `${rect.width}px`, height: `${rect.height}px`,
- backgroundColor: rect.isActive ? '#ADFF2F' : getRectColor(rect.state)
+ backgroundColor: rect.isActive ? '#ADFF2F' : getRectColor(rect.status)
}"
>
<div class="centered-text">
@@ -36,11 +36,11 @@
</div>
</el-scrollbar>
<el-dialog v-model="blind" top="30vh" width="15%" style="text-align: center;" @close="handleDialogClose">
- <el-button :disabled="currentGlassRect?.state === 8 || currentGlassRect?.state === 9" type="warning"
+ <el-button :disabled="currentGlassRect?.status === 8 || currentGlassRect?.status === 9" type="warning"
plain :icon="Delete" @click="handleDamage(currentGlassId)" style="width: 140px;margin-left: 10px;">
{{ $t('order.dilapidation') }}
</el-button>
- <el-button :disabled="currentGlassRect?.state === 9 || currentGlassRect?.state === 8" type="danger"
+ <el-button :disabled="currentGlassRect?.status === 9 || currentGlassRect?.status === 8" type="danger"
plain @click="handleManualTake(currentGlassId)" style="width: 140px;margin-top: 10px;">
<el-icon class="el-icon--right">
<Upload/>
@@ -95,7 +95,7 @@
const response = await request.post('/temperingGlass/temperingGlassInfo/updateTemperingState', {
glassId: currentGlassId.value,
line: 4001,
- state: 8,
+ status: 8,
workingProcedure: '閽㈠寲',
})
if (response.code == 200) {
@@ -117,7 +117,7 @@
const response = await request.post('/temperingGlass/temperingGlassInfo/updateTemperingState', {
glassId: currentGlassId.value,
line: 4001,
- state: 9,
+ status: 9,
workingProcedure: '閽㈠寲',
})
if (response.code == 200) {
@@ -236,8 +236,8 @@
adjustedRects.value = adjustedRectsData;
}
};
-function getRectColor(state: number): string {
- switch (state) {
+function getRectColor(status: number): string {
+ switch (status) {
case -1:
return '#CDAF95';
case 0:
@@ -260,7 +260,7 @@
function updateRectStatus(glassId: string, status: number) {
adjustedRects.value.forEach(rect => {
if (rect.glassId === glassId) {
- rect.state = status; // 鏇存柊鐭╁舰鐨勭姸鎬�
+ rect.status = status; // 鏇存柊鐭╁舰鐨勭姸鎬�
}
});
}
--
Gitblit v1.8.0