From b74d3f3e8cfece410031916d18b9ebccb0aba731 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期三, 03 七月 2024 13:04:25 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/Replenish/PrintRepairProcess.vue | 71 ++++++++++++++++++++++++++++-------
1 files changed, 57 insertions(+), 14 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/Replenish/PrintRepairProcess.vue b/north-glass-erp/northglass-erp/src/views/pp/Replenish/PrintRepairProcess.vue
index ab70d0c..0f1cc80 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/Replenish/PrintRepairProcess.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/Replenish/PrintRepairProcess.vue
@@ -34,12 +34,46 @@
if (res.code == 200) {
produceList.value = deepClone(res.data.data)
- if (printMerge!==null && printMerge!==undefined && printMerge!==""){
+ if (printMerge !== null && printMerge !== undefined && printMerge !== "") {
produceList.value.forEach(item => {
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])
+ const s01Values = [];
+ // 閬嶅巻 res.data.numberList 鏁扮粍锛岃幏鍙栨瘡涓厓绱犵殑 S01 鍊煎苟瀛樺偍鍒� s01Values 鏁扮粍涓�
+ produceList.value[0].detailList.forEach(element => {
+ try {
+ const otherColumnsObject = JSON.parse(element.other_columns);
+ const s01Value = otherColumnsObject.S01;
+ if (s01Value) {
+ s01Values.push(s01Value);
+ } else {
+ // 濡傛灉 S01 鍊间负绌猴紝鍙互閫夋嫨娣诲姞榛樿鍊兼垨鑰呭拷鐣ヨ繖涓厓绱�
+ s01Values.push(''); // 渚嬪娣诲姞绌哄瓧绗︿覆
+ }
+ } catch (error) {
+ // console.error('Error parsing JSON or accessing S01 value:', error);
+ // 澶勭悊 JSON 瑙ｆ瀽閿欒鎴栧叾浠栧紓甯告儏鍐�
+ }
+ });
+ // 閬嶅巻 res.data.Detail 鏁扮粍锛屽皢 s01Values 涓殑鍊艰祴缁欐瘡涓鍗曡鎯呭璞＄殑 s01Value 灞炴��
+ produceList.value[0].detailList.forEach((detail, index) => {
+ if (index < s01Values.length) {
+ detail.s01Value = s01Values[index]; // 娣诲姞涓�涓悕涓� s01Value 鐨勬柊灞炴�э紝瀛樺偍瀵瑰簲鐨� S01 鍊�
+ } else {
+ detail.s01Value = ''; // 濡傛灉 s01Values 涓殑鍊间笉瓒筹紝鍙互娣诲姞榛樿鍊兼垨鑰呬笉杩涜璧嬪�煎鐞�
+ }
+ });
+
+
+
+
+
handleGetQRCode()
} else {
ElMessage.warning(res.msg)
@@ -48,7 +82,6 @@
})
}
-
)
@@ -71,8 +104,6 @@
}
}
};
-
-
// 鎵撳嵃鏂规硶
@@ -120,10 +151,14 @@
<thead>
<tr v-for="(itemFlow,index) in item.detail" :key="index">
<td colspan="24">
- <div id="bj" style="float: right;font-size: 28px">琛� {{ id + 1 }}</div>
+ <div id="bj" style="float: right;font-size: 28px">琛� {{ id + 1 }}</div>
<div>澶╂触鍖楁柟鐜荤拑鎶�鏈偂浠芥湁闄愬叕鍙�</div>
<div>鐢熶骇娴佺▼鍗�</div>
- <div style="text-align: right;font-weight: bolder">娴佺▼鍗″彿锛� {{
+ <div v-if="itemFlow.technologyNumberMerge!=''" style="text-align: right;font-weight: bolder">娴佺▼鍗″彿锛� {{
+ itemFlow.process_id
+ }}/{{ itemFlow.technologyNumberMerge }} 鍏� {{ flowCardCount }} 鏋�
+ </div>
+ <div v-else style="text-align: right;font-weight: bolder">娴佺▼鍗″彿锛� {{
itemFlow.process_id
}}/{{ itemFlow.technologyNumber }} 鍏� {{ flowCardCount }} 鏋�
</div>
@@ -135,7 +170,7 @@
<td class="tdNowrap">椤圭洰鍚嶇О锛�</td>
<td colspan="2">{{ items.project }}</td>
<td class="tdNowrap">宸ヨ壓娴佺▼锛�</td>
- <td colspan="16">{{ items.process }}</td>
+ <td colspan="17">{{ items.process }}</td>
</tr>
<tr v-for="(itemTr,index) in item.detail" :key="index">
<td class="tdNowrap">纾ㄨ竟绫诲瀷锛�</td>
@@ -143,10 +178,11 @@
<td class="tdNowrap">鍗曠墖鍚嶇О锛�</td>
<td colspan="2">{{ itemTr.glass_child }}</td>
<td class="tdNowrap">浜у搧鍚嶇О锛�</td>
- <td colspan="16">{{ itemTr.product_name }}</td>
+ <td colspan="17">{{ itemTr.product_name }}</td>
</tr>
<tr>
<td rowspan='2'>搴忓彿</td>
+ <td rowspan='2'>缂栧彿</td>
<td rowspan='2'>瀹�*楂�</td>
<td rowspan='2'>鏁伴噺</td>
<td rowspan='2'>闈㈢Н</td>
@@ -186,6 +222,7 @@
<tr v-for="(itemDatile,index) in item.detailList" :key="index">
<td>{{ itemDatile.order_number }}</td>
+ <td>{{itemDatile.s01Value}}</td>
<td>{{ itemDatile.child_width }}</td>
<td class="item">{{ itemDatile.quantity }}</td>
<td>{{ itemDatile.total_area }}</td>
@@ -216,9 +253,9 @@
鏁伴噺锛�
<label>{{ itemsum.quantity }}</label>
闈㈢Н锛�
- <label>{{ parseFloat(itemsum.gross_area,2) }}</label>
+ <label>{{ parseFloat(itemsum.gross_area.toFixed(2)) }}</label>
閲嶉噺锛�
- <label>{{ itemsum.weight }}</label>
+ <label>{{ parseFloat(itemsum.weight.toFixed(2)) }}</label>
</td>
</tr>
<tr v-for="(itemtextarea,index) in item.detail" :key="index">
@@ -242,9 +279,12 @@
<td></td>
<td></td>
<td></td>
+ <td></td>
+ <td></td>
</tr>
<tr>
<td>鐢熶骇鏃ユ湡</td>
+ <td></td>
<td></td>
<td></td>
<td></td>
@@ -280,15 +320,18 @@
<td></td>
<td></td>
<td></td>
+ <td></td>
</tr>
<tr v-for="(qrCodeItem,index) in item.detail" :key="index">
- <td colspan="19" >
+ <td colspan="19">
<span style="display: flex;">
- <span style="display: flex;width: 25%" v-for="(qrCodeItems,index) in qrCodeItem.qrcodeList" :key="index">
+ <span v-for="(qrCodeItems,index) in qrCodeItem.qrcodeList" :key="index" style="display: flex;width: 35%">
<div class='qrCode' style="width: 80px;height: 80px;">
- <img :src= qrCodeItems.qrcode>
+ <img :src=qrCodeItems.qrcode>
</div>
- <span style="float: left;font-weight: bolder">{{ qrCodeItem.process_id+"/"+qrCodeItems.technologyNumber }}</span>
+ <span style="float: left;font-weight: bolder">{{
+ qrCodeItem.process_id + "/" + qrCodeItems.technologyNumber
+ }}</span>
</span>
</span>
</td>
--
Gitblit v1.8.0