From b9b44b51b201e2f5a9a1f3665c7fb76b5690f9af Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 23 十二月 2024 16:13:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/UnLoadGlass/loadmachineracktwo.vue | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/UI-Project/src/views/UnLoadGlass/loadmachineracktwo.vue b/UI-Project/src/views/UnLoadGlass/loadmachineracktwo.vue
index a69b6d2..6b6c564 100644
--- a/UI-Project/src/views/UnLoadGlass/loadmachineracktwo.vue
+++ b/UI-Project/src/views/UnLoadGlass/loadmachineracktwo.vue
@@ -3,13 +3,11 @@
import {reactive} from "vue";
import {useRouter} from "vue-router"
const router = useRouter()
-
const dialogFormVisiblea = ref(false)
import { ref } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
// import Landingindication from "./Landingindication.vue";
import Landingindicationtwo from "./Landingindicationtwo.vue";
-
const tableData = [
{
id: '1',
@@ -26,7 +24,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',
@@ -59,7 +71,6 @@
const getTableRow = (row,type) =>{
switch (type) {
case 'edit' :{
- //alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
router.push({path: '/main/returns/createReturns', query: { ReturnID: 'TH24010101' }})
break
}
@@ -69,7 +80,6 @@
}
}
}
-
const dialogForm = () => {
ElMessageBox.confirm(
'鏄惁娓呯┖璇ユ潯淇℃伅?',
@@ -118,9 +128,7 @@
}
],
})
-
</script>
-
<template>
<div>
<el-card style="flex: 1;margin-left: 10px;margin-top: 5px;" v-loading="loading">
@@ -143,7 +151,6 @@
</el-table>
</div>
</el-card>
-
</div>
<div style="display: flex;">
<!-- <div id="main-body">
@@ -176,9 +183,7 @@
</template>
</el-dialog>
</template>
-
<style scoped>
-
#dt { display:block; float:left;line-height: 20px;margin-left: 100px;}
#dta { display:block; float:left;line-height: 20px;margin-left: 80%;}
#dialog-footer{
--
Gitblit v1.8.0