From 43563027a42ec17833cec46e960492ddca9225db Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 04 七月 2024 14:29:50 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProcess.vue | 122 +++++++++++++++++-----------------------
1 files changed, 52 insertions(+), 70 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProcess.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProcess.vue
index 37c7ca6..6896970 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProcess.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProcess.vue
@@ -42,10 +42,11 @@
item.detail[0].technologyNumber = printMerge;
});
}
- let technologyNumberMerge = printMerge.split('').join(',');
- console.log(technologyNumberMerge)
- produceList.value[0].detail[0].technologyNumberMerge = technologyNumberMerge
- console.log(produceList.value[0].detail[0])
+ produceList.value.forEach(item =>{
+ let technologyNumberMerge = printMerge.split('').join(',');
+ item.detail[0].technologyNumberMerge = technologyNumberMerge
+ })
+
const s01Values = [];
// 閬嶅巻 res.data.numberList 鏁扮粍锛岃幏鍙栨瘡涓厓绱犵殑 S01 鍊煎苟瀛樺偍鍒� s01Values 鏁扮粍涓�
produceList.value[0].detailList.forEach(element => {
@@ -71,7 +72,6 @@
detail.s01Value = ''; // 濡傛灉 s01Values 涓殑鍊间笉瓒筹紝鍙互娣诲姞榛樿鍊兼垨鑰呬笉杩涜璧嬪�煎鐞�
}
});
-
@@ -202,22 +202,23 @@
<!-- <td colspan='2'></td>-->
</tr>
<tr>
- <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>{{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>
</tr>
</thead>
<tbody>
@@ -262,67 +263,48 @@
</tr>
<tr v-for="(itemtextarea,index) in item.detail" :key="index">
<td colspan="6" rowspan="6" style="width: 480px;height: 100px ">
- <div style="width: 100%;height: 100%"><textarea style="height: 99%;width: 99%">{{ itemtextarea.processing_note }}</textarea>
+<!-- <div style="width: 100%;height: 100%"><textarea style="height: 99%;width: 99%;font-size: 11px">{{ itemtextarea.processing_note }}</textarea>-->
+<!-- </div>-->
+ <div style="width: 100%;height: 100%"><textarea style="height: 99%;width: 99%;font-size: 11px">{{company.printLabel.printFlowCard.processingNote(itemtextarea)}}</textarea>
</div>
</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 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>
</tr>
<tr>
<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 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>
</tr>
<tr>
<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 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>
</tr>
<tr v-for="(qrCodeItem,index) in item.detail" :key="index">
<td colspan="19">
--
Gitblit v1.8.0