From 4e3b8155722b66e25df3c6fd42cc586b68dea391 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 06 六月 2025 13:55:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/StockBasicData/stockBasicDatatwo.vue | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/UI-Project/src/views/StockBasicData/stockBasicDatatwo.vue b/UI-Project/src/views/StockBasicData/stockBasicDatatwo.vue
index 4352bbe..601fd1f 100644
--- a/UI-Project/src/views/StockBasicData/stockBasicDatatwo.vue
+++ b/UI-Project/src/views/StockBasicData/stockBasicDatatwo.vue
@@ -87,13 +87,12 @@
}
});
onBeforeUnmount(() => {
- console.log("鍏抽棴浜�")
closeWebSocket();
});
</script>
<template>
<div style="height: 500px;">
- <el-card style="flex: 1;margin-left: 10px;margin-top: 20px;" v-loading="loading">
+ <el-card style="flex: 1;margin-left: 10px;margin-top: 20px;" >
<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">
<el-table height="750" ref="table"
@selection-change="handleSelectionChange"
@@ -105,8 +104,8 @@
<el-table-column prop="glass_type" align="center" :label="$t('workOrder.glasstype')" min-width="120"/>
<el-table-column fixed="right" :label="$t('workOrder.operate')" align="center" width="200">
<template #default="scope">
- <el-button size="mini" type="text" plain @click="open(scope.row)">{{ $t('workOrder.breakage') }}</el-button>
- <el-button size="mini" type="text" plain @click="opena(scope.row)">{{ $t('workOrder.takeout') }}</el-button>
+ <el-button type="text" plain @click="open(scope.row)">{{ $t('workOrder.breakage') }}</el-button>
+ <el-button type="text" plain @click="opena(scope.row)">{{ $t('workOrder.takeout') }}</el-button>
</template>
</el-table-column>
</el-table>
--
Gitblit v1.8.0