From 27041dc55b967b1e12673b2d1308c85ccd95b799 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 16 八月 2024 14:29:14 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
UI-Project/src/views/UnLoadGlass/PrintFlow.vue | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/UI-Project/src/views/UnLoadGlass/PrintFlow.vue b/UI-Project/src/views/UnLoadGlass/PrintFlow.vue
index 6d3fa9b..235e147 100644
--- a/UI-Project/src/views/UnLoadGlass/PrintFlow.vue
+++ b/UI-Project/src/views/UnLoadGlass/PrintFlow.vue
@@ -211,11 +211,11 @@
</tr>
<tr>
<td rowspan='2'>搴忓彿</td>
+ <td rowspan='2'>缂栧彿</td>
<td v-if="like!=null" rowspan="2">灏忕墖椤哄簭</td>
<td v-else style="display: none;" rowspan="2">灏忕墖椤哄簭</td>
<td rowspan='2'>瀹�*楂�</td>
<td rowspan='2'>鏁伴噺</td>
- <td rowspan='2'>钀芥灦鏁�</td>
<td rowspan='2'>闈㈢Н</td>
<td rowspan='2'>鍛ㄩ暱</td>
<td rowspan='2'>鍗婂緞</td>
@@ -246,7 +246,7 @@
<tr v-for="(itemDatile,index) in item.detailList" :key="index">
<td>{{ itemDatile.order_number }}</td>
- <!-- <td>{{ itemDatile.s01Value }}</td> -->
+ <td>{{ itemDatile.s01Value }}</td>
<td v-if="like=='1'">{{ itemDatile.technology_number }}</td>
<td v-else style="display: none"></td>
<td>{{ itemDatile.child_width }}</td>
@@ -254,10 +254,9 @@
<!-- <el-input v-model="itemDatile.quantity" style="border: none" @keyup="handleSummary()"></el-input> -->
{{ itemDatile.quantity }}
</td>
- <td class="item" style="width: 5%;height: 100%;">
- <!-- <el-input v-model="itemDatile.quantity" style="border: none" @keyup="handleSummary()"></el-input> -->
+ <!-- <td class="item" style="width: 5%;height: 100%;">
{{ itemDatile.quantity1 }}
- </td>
+ </td> -->
<td>{{ itemDatile.total_area }}</td>
<td>{{ itemDatile.perimeter }}</td>
<td>{{ itemDatile.bend_radius }}</td>
--
Gitblit v1.8.0