From f481c5fe4fc2aa80c77a760f4161e4ab3912cb45 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期六, 06 七月 2024 15:07:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/UnLoadGlass/loadmachineracktwo.vue | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/UI-Project/src/views/UnLoadGlass/loadmachineracktwo.vue b/UI-Project/src/views/UnLoadGlass/loadmachineracktwo.vue
index cd181fc..a469701 100644
--- a/UI-Project/src/views/UnLoadGlass/loadmachineracktwo.vue
+++ b/UI-Project/src/views/UnLoadGlass/loadmachineracktwo.vue
@@ -26,7 +26,21 @@
state: '鏈惎鐢�'
},
{
- id: '2',
+ id: '3',
+ long: '105',
+ wide: '183',
+ thick: '191',
+ state: '鏈惎鐢�'
+ },
+ {
+ id: '4',
+ long: '105',
+ wide: '183',
+ thick: '191',
+ state: '鏈惎鐢�'
+ },
+ {
+ id: '5',
long: '105',
wide: '183',
thick: '191',
@@ -70,6 +84,17 @@
}
}
+const dialogForm = () => {
+ ElMessageBox.confirm(
+ '鏄惁娓呯┖璇ユ潯淇℃伅?',
+ '鎻愮ず',
+ {
+ confirmButtonText: '鏄�',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning',
+ }
+ )
+}
const gridOptions = reactive({
border: "full",//琛ㄦ牸鍔犺竟妗�
keepSource: true,//淇濇寔婧愭暟鎹�
@@ -126,7 +151,7 @@
<el-table-column fixed="right" label="鎿嶄綔" align="center" width="200">
<template #default>
<el-button size="mini" type="text" plain v-show="state !== '宸插惎鐢�' " @click="dialogFormVisiblea = true">缁戝畾鏋跺瓙</el-button>
- <el-button size="mini" type="text" plain @click="dialogFormVisible = true">娓呯┖</el-button>
+ <el-button size="mini" type="text" plain @click="dialogForm">娓呯┖</el-button>
</template>
</el-table-column>
</el-table>
--
Gitblit v1.8.0