From a660db06773007b1be690e0674829c00a57aeb7b Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 24 十二月 2025 16:21:23 +0800
Subject: [PATCH] 订单首页流程卡新增楼层编号显示
---
north-glass-erp/northglass-erp/src/components/pp/PrintReworkProcess.vue | 191 ++++++++++++++++++-----------------------------
1 files changed, 72 insertions(+), 119 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/pp/PrintReworkProcess.vue b/north-glass-erp/northglass-erp/src/components/pp/PrintReworkProcess.vue
index fd39ab0..0e7dbb3 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintReworkProcess.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintReworkProcess.vue
@@ -41,6 +41,7 @@
if (like == '') {
like = null
}
+let name=company.companyName
data.value.printList = JSON.parse(props.printList)
let flowCardCount = data.value.printList.length
onMounted(() => {
@@ -69,33 +70,33 @@
produceList.value[j].detail[0].weight = sumWeight
}
//澶勭悊鍚堝苟鎵撳嵃
- if (printMerge !== null && printMerge !== undefined && printMerge !== "") {
-
- produceList.value.forEach(item => {
- item.detail[0].technologyNumber = printMerge;
- });
-
- //鍚堝苟鎵撳嵃宸ヨ壓娴佺▼澶勭悊
- if (like == null) {
- let process = produceList.value[0].detail[0].process
- let indexOfJiaJiao = process.indexOf('澶硅兌');
- if (indexOfJiaJiao !== -1) {
- // 浣跨敤 substring 鎴彇 "澶硅兌" 鍚庨潰鐨勯儴鍒嗭紝鍖呮嫭 "澶硅兌" 鏈韩
- let afterJiaJiao = process.substring(indexOfJiaJiao).trim();
- produceList.value.forEach(item => {
- item.detail[0].process = afterJiaJiao
- })
- }
-
- let indexOfProceList = produceList.value[0].processList
- let getProceList = indexOfProceList.findIndex(item => item.process === '澶硅兌');
-
- if (getProceList !== -1) {
- // 浣跨敤 filter 鏂规硶杩囨护鍑� "澶硅兌" 鍙婂叾涔嬪悗鐨勫璞�
- produceList.value[0].processList = indexOfProceList.filter((item, index) => index >= getProceList);
- }
- }
- }
+ // if (printMerge !== null && printMerge !== undefined && printMerge !== "") {
+ //
+ // produceList.value.forEach(item => {
+ // item.detail[0].technologyNumber = printMerge;
+ // });
+ //
+ // //鍚堝苟鎵撳嵃宸ヨ壓娴佺▼澶勭悊
+ // if (like == null) {
+ // let process = produceList.value[0].detail[0].process
+ // let indexOfJiaJiao = process.indexOf('澶硅兌');
+ // if (indexOfJiaJiao !== -1) {
+ // // 浣跨敤 substring 鎴彇 "澶硅兌" 鍚庨潰鐨勯儴鍒嗭紝鍖呮嫭 "澶硅兌" 鏈韩
+ // let afterJiaJiao = process.substring(indexOfJiaJiao).trim();
+ // produceList.value.forEach(item => {
+ // item.detail[0].process = afterJiaJiao
+ // })
+ // }
+ //
+ // let indexOfProceList = produceList.value[0].processList
+ // let getProceList = indexOfProceList.findIndex(item => item.process === '澶硅兌');
+ //
+ // if (getProceList !== -1) {
+ // // 浣跨敤 filter 鏂规硶杩囨护鍑� "澶硅兌" 鍙婂叾涔嬪悗鐨勫璞�
+ // produceList.value[0].processList = indexOfProceList.filter((item, index) => index >= getProceList);
+ // }
+ // }
+ // }
produceList.value.forEach(item => {
@@ -193,19 +194,18 @@
<table v-for="(item,id) in produceList" id="contentTable" :key="id">
<thead>
<tr v-for="(itemFlow,index) in item.detail" :key="index">
- <td colspan="33">
- <div style="float: left;">杩旂墖鍗曞彿锛歿{itemFlow.patch_id}}</div>
+ <td colspan="34">
+
<div id="bj" style="float: right;font-size: 28px">杩� {{ id + 1 }}</div>
<div>{{ company.companyName }}</div>
<div>鐢熶骇娴佺▼鍗�</div>
- <div v-if="itemFlow.technologyNumberMerge!=''" style="text-align: right;font-weight: bolder">娴佺▼鍗″彿锛� {{
- itemFlow.process_id
- }}/{{ itemFlow.technologyNumberMerge }} 鍏� {{ flowCardCount }} 鏋�
- </div>
<div style="font-weight: bolder;display: flex;justify-content:space-between">
- <div>鎵撳嵃浜猴細{{user.user.userName}}</div>
<div>
- {{itemFlow.otherRemarks}}
+ 杩旂墖鍗曞彿锛歿{itemFlow.patch_id}}
+ 鎵撳嵃浜猴細{{user.user.userName}}
+ </div>
+ <div>
+ <span v-if="name=='澶╂触鍖楃幓鐜荤拑宸ヤ笟鎶�鏈湁闄愬叕鍙革紙TJBB-QR7.1-01锛�'" style="font-size: 10px">{{itemFlow.otherRemarks}}</span>
娴佺▼鍗″彿锛� {{
itemFlow.process_id
}}/{{ itemFlow.technologyNumber }} 鍏� {{ item.count }} 鏋�
@@ -217,9 +217,9 @@
<td class="tdNowrap">瀹㈡埛鍚嶇О锛�</td>
<td colspan="2">{{ items.customer_name }}</td>
<td class="tdNowrap">椤圭洰鍚嶇О锛�</td>
- <td colspan="8">{{ items.project }}</td>
+ <td colspan="8" style="min-width: 300px;">{{ items.project }}</td>
<td class="tdNowrap">宸ヨ壓娴佺▼锛�</td>
- <td colspan="20" style="width: 500px">{{ items.process }}</td>
+ <td :colspan="2+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>
@@ -227,7 +227,7 @@
<td class="tdNowrap">鍗曠墖鍚嶇О锛�</td>
<td colspan="8">{{ itemTr.glass_child }}</td>
<td class="tdNowrap">浜у搧鍚嶇О锛�</td>
- <td colspan="20">{{ itemTr.product_name }}</td>
+ <td :colspan="2+item.processList.length*2">{{ itemTr.product_name }}</td>
</tr>
<tr>
<td rowspan='2'>搴忓彿</td>
@@ -237,36 +237,20 @@
<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 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>
-
- <td>{{ company.printLabel.printFlowCard.patch }}</td>
- <td>{{ company.printLabel.printFlowCard.lackOf }}</td>
- <td>{{ company.printLabel.printFlowCard.patch }}</td>
- <td>{{ company.printLabel.printFlowCard.lackOf }}</td>
- <td>{{ company.printLabel.printFlowCard.patch }}</td>
- <td>{{ company.printLabel.printFlowCard.lackOf }}</td>
- <td>{{ company.printLabel.printFlowCard.patch }}</td>
- <td>{{ company.printLabel.printFlowCard.lackOf }}</td>
- <td>{{ company.printLabel.printFlowCard.patch }}</td>
- <td>{{ company.printLabel.printFlowCard.lackOf }}</td>
- <td>{{ company.printLabel.printFlowCard.patch }}</td>
- <td>{{ company.printLabel.printFlowCard.lackOf }}</td>
- <td>{{ company.printLabel.printFlowCard.patch }}</td>
- <td>{{ company.printLabel.printFlowCard.lackOf }}</td>
- <td>{{ company.printLabel.printFlowCard.patch }}</td>
- <td>{{ company.printLabel.printFlowCard.lackOf }}</td>
- <td>{{ company.printLabel.printFlowCard.patch }}</td>
- <td>{{ company.printLabel.printFlowCard.lackOf }}</td>
- <td>{{ company.printLabel.printFlowCard.patch }}</td>
- <td>{{ company.printLabel.printFlowCard.lackOf }}</td>
+ <template v-for=" n in item.processList.length">
+ <td>{{ company.printLabel.printFlowCard.patch }}</td>
+ <td>{{ company.printLabel.printFlowCard.lackOf }}</td>
+ </template>
</tr>
</thead>
<tbody>
@@ -286,32 +270,17 @@
<td>{{ itemDatile.patch_reason }}</td>
<td>{{ itemDatile.patch_processes }}</td>
<td>{{ itemDatile.responsible_team }}</td>
+ <td>{{ itemDatile.responsible_personnel }}</td>
<td>{{ itemDatile.remarks }}</td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
+ <template v-for=" n in item.processList.length">
+ <td></td>
+ <td></td>
+ </template>
</tr>
</tbody>
<tfoot>
<tr style="height: 14px">
- <td v-for="(itemsum,index) in item.detail" :key="index" colspan="33">
+ <td v-for="(itemsum,index) in item.detail" :key="index" colspan="34">
鏁伴噺锛�
<label>{{ itemsum.quantity }}</label>
闈㈢Н锛�
@@ -321,16 +290,6 @@
</td>
</tr>
<tr v-for="(itemtextarea,index) in item.detail" :key="index">
- <td colspan="4" rowspan="5" style="width: 480px;height: 100px ">
- <div>
- 娆＄牬绫诲瀷锛歿{itemtextarea.breakage_type}}
- 娆＄牬鍘熷洜锛歿{itemtextarea.breakage_reason}}
- 璐ｄ换宸ュ簭锛歿{itemtextarea.responsible_process}}
- 璐ｄ换鐝粍锛歿{itemtextarea.responsible_team}}
- <span v-if="itemtextarea.responsible_personnel!=null">璐ｄ换淇℃伅锛歿{itemtextarea.responsible_personnel}}</span>
- </div>
- </td>
-
<td>瀹屽伐绛惧悕</td>
<td colspan="2"></td>
<td colspan="2"></td>
@@ -338,14 +297,10 @@
<td colspan="2"></td>
<td colspan="2"></td>
<td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
+ <td colspan="1"></td>
+ <template v-for=" n in item.processList.length">
+ <td colspan="2"></td>
+ </template>
</tr>
<tr>
<td>鐢熶骇鏃ユ湡</td>
@@ -355,38 +310,30 @@
<td colspan="2"></td>
<td colspan="2"></td>
<td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
+ <td colspan="1"></td>
+ <template v-for=" n in item.processList.length">
+ <td colspan="2"></td>
+ </template>
</tr>
<tr>
<td>璐ㄦ绛惧悕</td>
<td colspan="2"></td>
- <td colspan="2">鐢熶骇绛惧悕</td>
<td colspan="2"></td>
<td colspan="2"></td>
<td colspan="2"></td>
<td colspan="2"></td>
<td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
+ <td colspan="1"></td>
+ <template v-for=" n in item.processList.length">
+ <td colspan="2"></td>
+ </template>
</tr>
<tr>
<td>鍘熺墖绠卞彿</td>
- <td colspan="28"></td>
+ <td colspan="29"></td>
</tr>
<tr v-for="(qrCodeItem,index) in item.detail" :key="index">
- <td colspan="29">
+ <td colspan="30">
<span style="display: flex;">
<span v-for="(qrCodeItems,index) in qrCodeItem.qrcodeList" :key="index" style="display: flex;width: 35%">
<div class='qrCode' style="width: 80px;height: 80px;">
@@ -400,8 +347,10 @@
</td>
</tr>
<tr v-for="(itemtextareas,index) in item.detail" :key="index">
- <td colspan="33" rowspan="6" style="width: 99%;height: 150px ">
- <div style="width: 100%;height: 100%;"><textarea style="height: 99%;width: 99%;border: none;;font-size: 12px;text-align: left">{{itemtextareas.processing_note}}</textarea>
+ <td colspan="34" rowspan="6" style="width: 99%;height: 150px ">
+ <div v-if="name=='娴欐睙宸ㄦ槦鍢夋嘲鏂版潗鏂欐湁闄愬叕鍙�'" style="width: 100%;height: 100%;text-align: left"><textarea style="height: 99%;width: 99%;border: none;;font-size: 16px;font-weight: bold;overflow: hidden;text-align: left;vertical-align: middle">{{itemtextareas.processing_note}}</textarea>
+ </div>
+ <div v-else style="width: 100%;height: 100%;text-align: left"><textarea style="height: 99%;width: 99%;border: none;;font-size: 14px;overflow: hidden;text-align: left;vertical-align: middle">{{itemtextareas.processing_note}}</textarea>
</div>
</td>
</tr>
@@ -465,6 +414,10 @@
font-size: 12px;
font-weight: bolder;
}
+input{
+ border: none;
+ background: none;
+}
@page {
size: auto; /* auto is the initial value */
--
Gitblit v1.8.0