From 62681d14e34466f4ed4eafaa2cef197c53e6fd82 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 26 二月 2025 14:07:05 +0800
Subject: [PATCH] 修改打印样式 修改报工界面查询条件 修改磨边获取出片线路条件 大理片非钢化出片添加宽度与数量限制
---
UI-Project/src/views/UnLoadGlass/PrintFlow.vue | 84 ++++++++++++++++++++----------------------
1 files changed, 40 insertions(+), 44 deletions(-)
diff --git a/UI-Project/src/views/UnLoadGlass/PrintFlow.vue b/UI-Project/src/views/UnLoadGlass/PrintFlow.vue
index 1391726..51fd3e6 100644
--- a/UI-Project/src/views/UnLoadGlass/PrintFlow.vue
+++ b/UI-Project/src/views/UnLoadGlass/PrintFlow.vue
@@ -13,7 +13,11 @@
import companyInfo from "@/lang/companyInfo";
import QRCode from "qrcode";
-
+const currentTime = new Date();
+const formattedTime = currentTime.getFullYear()
+ + '-' + (currentTime.getMonth() + 1) + '-'
+ + currentTime.getDate() + ' ' + currentTime.getHours() + ':'
+ + currentTime.getMinutes();formattedTime
const company = companyInfo()
const printMerge = null
let props = defineProps({
@@ -140,56 +144,53 @@
<tr v-for="(itemFlow, index) in item.detail" :key="index">
<td colspan="29">
<div style="float: left;"><input style="border: none;font-size: 28px;width: 70px;margin: 5px " /></div>
- <div id="bj" style="float: right;font-size: 28px">{{ id + 1 }}</div>
+ <div id="bj" style="float: right;font-size: 28px">{{ props.printLayer }}</div>
<div>{{ company.companyName }}</div>
<div>鐢熶骇娴佺▼鍗�</div>
- <div v-if="itemFlow.technologyNumberMerge != ''" style="text-align: right;font-weight: bolder">
- {{ itemFlow.otherRemarks }}
+ <div style="font-weight: bolder;display: flex;justify-content:space-between">
+ <div>
+ 鏃堕棿锛歿{formattedTime}}
+
+ </div>
+ <div>{{itemFlow.rack}}
娴佺▼鍗″彿锛� {{
itemFlow.process_id
- }}/{{ itemFlow.technologyNumberMerge }} 鍏� {{ flowCardCount }} 鏋�
+ }}/{{ props.printLayer }}
</div>
- <div v-else style="text-align: right;font-weight: bolder">
- {{ itemFlow.otherRemarks }}
- 娴佺▼鍗″彿锛� {{
- itemFlow.process_id
- }}/{{ itemFlow.technologyNumber }} 鍏� {{ flowCardCount }} 鏋�
- </div>
+ </div>
</td>
</tr>
- <tr v-for="(items, index) in item.detail" :key="index">
- <td class="tdNowrap">瀹㈡埛鍚嶇О锛�</td>
- <td colspan="2">{{ items.customer_name }}</td>
- <td class="tdNowrap">椤圭洰鍚嶇О锛�</td>
- <td colspan="2">{{ items.project }}</td>
- <td class="tdNowrap">宸ヨ壓娴佺▼锛�</td>
- <td colspan="22" style="width: 500px">{{ items.process }}</td>
- </tr>
- <tr v-for="(itemTr, index) in item.detail" :key="index">
- <td class="tdNowrap">纾ㄨ竟绫诲瀷锛�</td>
- <td colspan="2">{{ itemTr.edging_type }}</td>
- <td class="tdNowrap">鍗曠墖鍚嶇О锛�</td>
- <td colspan="2">{{ itemTr.glass_child }}</td>
- <td class="tdNowrap">浜у搧鍚嶇О锛�</td>
- <td colspan="22">{{ itemTr.product_name }}</td>
- </tr>
+ <tr v-for="(items,index) in item.detail" :key="index">
+ <td class="tdNowrap" style="width: 75px">瀹㈡埛鍚嶇О锛�</td>
+ <td colspan="1" style="width: 150px;font-size: 17px">{{ items.customer_name }}</td>
+ <td class="tdNowrap" style="min-width: 75px">纾ㄨ竟绫诲瀷锛�</td>
+ <td colspan="1" style="min-width: 50px">{{ items.edging_type }}</td>
+ <td colspan="2" style="min-width: 150px" class="tdNowrap">宸ヨ壓娴佺▼锛�</td>
+ <td :colspan="item.processList.length*2" style="width: 500px">{{ items.process }}</td>
+ </tr>
+ <tr v-for="(itemTr,index) in item.detail" :key="index">
+ <td class="tdNowrap">椤圭洰鍚嶇О锛�</td>
+ <td colspan="1" style="font-size: 17px">{{ itemTr.project }}</td>
+ <td class="tdNowrap">鍗曠墖鍚嶇О锛�</td>
+ <td colspan="1">{{ itemTr.glass_child }}</td>
+ <td colspan="2" class="tdNowrap">浜у搧鍚嶇О锛�</td>
+ <td :colspan="item.processList.length*2">{{ itemTr.product_name }}</td>
+ </tr>
<tr>
<td rowspan='2'>搴忓彿</td>
<!-- <td rowspan='2'>缂栧彿</td> -->
- <td rowspan="2">灏忕墖椤哄簭</td>
- <td rowspan='2' style="width: 90px">瀹�*楂�</td>
+ <td rowspan='4' style="width: 90px">瀹�*楂�</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>
+ <td rowspan='2'>鍗婂緞</td> -->
<td rowspan='2'>澶囨敞</td>
<td v-for="(itemPr, index) in item.processList" :key="index" colspan="2">{{ itemPr.process }}</td>
</tr>
<tr>
<template v-for=" n in item.processList.length">
- <td>姝ｅ搧</td>
- <td>娆″搧</td>
+ <td colspan='2'>姝ｅ搧</td>
</template>
</tr>
</thead>
@@ -198,7 +199,7 @@
<tr v-for="(itemDatile, index) in item.detailList" :key="index">
<td>{{ itemDatile.order_number }}</td>
<!-- <td>{{ itemDatile.s01Value }}</td> -->
- <td>{{ itemDatile.technology_number }}</td>
+ <!-- <td>{{ itemDatile.technology_number }}</td> -->
<td>{{ itemDatile.child_width }}</td>
<td class="item" style="width: 5%;height: 100%;">
{{ itemDatile.quantity }}
@@ -206,12 +207,11 @@
</td>
<td>{{ itemDatile.quantity1 }}</td>
<td>{{ itemDatile.total_area }}</td>
- <td>{{ itemDatile.perimeter }}</td>
- <td>{{ itemDatile.bend_radius }}</td>
+ <!-- <td>{{ itemDatile.perimeter }}</td>
+ <td>{{ itemDatile.bend_radius }}</td> -->
<td>{{ itemDatile.remarks }}</td>
<template v-for=" n in item.processList.length">
- <td></td>
- <td></td>
+ <td colspan='2'></td>
</template>
</tr>
@@ -234,7 +234,7 @@
</tr>
<tr>
<td>瀹屽伐绛惧悕</td>
- <td colspan="2"></td>
+ <td colspan="1"></td>
<td colspan="2"></td>
<td colspan="2"></td>
<td colspan="2"></td>
@@ -244,16 +244,12 @@
</tr>
<tr>
<td>璐ㄦ绛惧悕</td>
+ <td colspan="1"></td>
<td colspan="2"></td>
- <td colspan="2">鐢熶骇绛惧悕</td>
<td colspan="2"></td>
<template v-for=" n in item.processList.length">
<td colspan="2"></td>
</template>
- </tr>
- <tr>
- <td>鍘熺墖绠卞彿</td>
- <td colspan="28"></td>
</tr>
<tr v-for="(qrCodeItem, index) in item.detail" :key="index">
--
Gitblit v1.8.0