From e50fa16b6dbc4e7c50d5fbdbc04d2a556ca01c4e Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 02 十二月 2024 11:26:36 +0800
Subject: [PATCH] 补片流程卡调整
---
north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue | 280 ++++++++++++++++++++++++++++++++-----------------------
1 files changed, 162 insertions(+), 118 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue b/north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue
index 2fb8aea..b976556 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue
@@ -9,6 +9,7 @@
import deepClone from "@/utils/deepClone";
import QRCode from "qrcode";
import companyInfo from "@/stores/sd/companyInfo";
+import userInfo from "@/stores/userInfo"
//璇█鑾峰彇
const company = companyInfo()
const {t} = useI18n()
@@ -16,6 +17,7 @@
let produceList = ref([])
let list = ref()
const details = ref([])
+const user=userInfo()
const data = ref({
@@ -24,25 +26,46 @@
let props = defineProps({
printList:null,
- printMerge:null
+ printMerge:null,
+ printLike: null,
+ mergeTechnologyNumber:null
})
const {currentRoute} = useRouter()
const route = currentRoute.value
const printMerge = props.printMerge
+let mergeTechnologyNumber=props.mergeTechnologyNumber
let merge=props.printMerge
if (merge == '') {
merge = null
}
+let like = props.printLike
+if (like == '') {
+ like = null
+}
data.value.printList = JSON.parse(props.printList)
-let flowCardCount = data.value.printList.length
+
+//鍘婚櫎閲嶅瀵硅薄
+// let uniqueObjects = {};
+// // 閬嶅巻鍘熷鏁版嵁鏁扮粍
+// data.value.printList.forEach(obj => {
+// // 鏋勫缓涓�涓敮涓�閿紝渚嬪 'NG24071502A001_1'
+// let key = `${obj.process_id}_${obj.technology_number}_${obj.order_number}`;
+//
+// // 濡傛灉璇ラ敭涓嶅瓨鍦ㄤ簬 uniqueObjects 涓紝鍒欏皢璇ュ璞℃坊鍔犲埌 uniqueObjects 涓�
+// if (!uniqueObjects[key]) {
+// uniqueObjects[key] = obj;
+// }
+// });
+// data.value.printList = Object.values(uniqueObjects);
+let flowCardCount = null
onMounted(() => {
- request.post(`/processCard/getSelectPrinting/${merge}`, data.value).then((res) => {
+ request.post(`/processCard/getSelectPrintingRefund/${merge}/${like}/${mergeTechnologyNumber}`, data.value).then((res) => {
if (res.code == 200) {
produceList.value = deepClone(res.data.data)
//澶勭悊鍗曠墖鍘氬害
- for (let j = 0; j < produceList.value.length; j++) {
+ for (let j = 0; j < produceList.value.length; j++) {
let sumWeight = 0
produceList.value[j].detailList.forEach((item, index) => {
// 瑙ｆ瀽 separation 瀛楁鐨� JSON 瀛楃涓�
@@ -54,12 +77,12 @@
// 鍘婚櫎 'mm' 鍗曚綅
let thicknessWithoutUnit = thicknessValue.replace('mm', '');
- item.separation=thicknessWithoutUnit
+ item.separation = thicknessWithoutUnit
- sumWeight += item.width*item.height*item.quantity/1000000*item.separation*2.5*1;
+ sumWeight += item.width * item.height * item.quantity / 1000000 * item.separation * 2.5 * 1;
});
- produceList.value[j].detail[0].weight=sumWeight
+ produceList.value[j].detail[0].weight = sumWeight
}
//澶勭悊鍚堝苟鎵撳嵃
if (printMerge !== null && printMerge !== undefined && printMerge !== "") {
@@ -69,26 +92,29 @@
});
//鍚堝苟鎵撳嵃宸ヨ壓娴佺▼澶勭悊
- 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
- })
+ 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);
+ }
}
+ }
- 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 =>{
+ produceList.value.forEach(item => {
let technologyNumberMerge = printMerge.split('').join(',');
item.detail[0].technologyNumberMerge = technologyNumberMerge
})
@@ -98,8 +124,8 @@
for (let i = 0; i < produceList.value.length; i++) {
const s01Values = [];
// 閬嶅巻 detailList 鏁扮粍锛屾彁鍙� S01 鍊煎埌 s01Values 鏁扮粍
- if (produceList.value[i].detailList[0].other_columns!=null
- || produceList.value[i].detailList[0].other_columns!=undefined){
+ if (produceList.value[i].detailList[0].other_columns != null
+ || produceList.value[i].detailList[0].other_columns != undefined) {
produceList.value[i].detailList.forEach(element => {
const otherColumnsObject = JSON.parse(element.other_columns);
const s01Value = otherColumnsObject.S01;
@@ -114,7 +140,32 @@
}
+ // 浣跨敤涓�涓璞℃潵瀛樺偍鍚堝苟鍚庣殑缁撴灉
+ const mergedData = produceList.value.reduce((acc, item) => {
+ const processId = item.detail[0].process_id;
+ // 濡傛灉璇� process_id 灏氭湭鍦� acc 涓紝鍒濆鍖栧叾鏁扮粍
+ if (!acc[processId]) {
+ acc[processId] = {
+ processList: item.processList,
+ detailList: [],
+ detail: item.detail
+ };
+ }
+
+ // 鍚堝苟 detailList
+ acc[processId].detailList = acc[processId].detailList.concat(item.detailList);
+
+ return acc;
+ }, {});
+
+ // 灏嗗悎骞跺悗鐨勫璞¤浆鎹㈠洖鏁扮粍
+ produceList.value = Object.values(mergedData);
+
+ flowCardCount=produceList.value.length
+
+
+ handleSummary()
handleGetQRCode()
} else {
ElMessage.warning(res.msg)
@@ -127,22 +178,19 @@
const handleGetQRCode = async () => {
+ let technologyNumber=''
for (let i = 0; i < produceList.value.length; i++) {
- const technologyNumber = produceList.value[i].detail[0].technologyNumber.toString(); // 杞崲涓哄瓧绗︿覆浠ヤ究澶勭悊姣忎釜瀛楃
+ const technologyNumber = produceList.value[i].detail[0].mergeTechnologyNumber.toString(); // 杞崲涓哄瓧绗︿覆浠ヤ究澶勭悊姣忎釜瀛楃
produceList.value[i].detail[0]["qrcodeList"] = []; // 鍒濆鍖栦竴涓┖鏁扮粍鐢ㄦ潵瀛樺偍 QR Code
- for (let j = 0; j < technologyNumber.length; j++) {
- const processId = produceList.value[i].detail[0].process_id;
- const url = `${processId}/${technologyNumber[j]}`;
-
- // 鐢熸垚 QR Code 骞跺瓨鍌ㄥ埌鏁扮粍涓�
- const qrcodeData = await QRCode.toDataURL(url);
- produceList.value[i].detail[0]["qrcodeList"].push({
- qrcode: qrcodeData,
- technologyNumber: technologyNumber[j]
- });
-
- }
+ const processId = produceList.value[i].detail[0].process_id;
+ const url = `${processId}/${technologyNumber}`;
+ // 鐢熸垚 QR Code 骞跺瓨鍌ㄥ埌鏁扮粍涓�
+ const qrcodeData = await QRCode.toDataURL(url);
+ produceList.value[i].detail[0]["qrcodeList"].push({
+ qrcode: qrcodeData,
+ technologyNumber: technologyNumber
+ });
}
};
@@ -182,18 +230,19 @@
<table v-for="(item,id) in produceList" id="contentTable" :key="id">
<thead>
<tr v-for="(itemFlow,index) in item.detail" :key="index">
- <td colspan="24">
- <div style="float: left;"><input style="border: none;font-size: 28px;width: 70px "/></div>
+ <td colspan="34">
+ <div style="float: left;">琛ョ墖鍗曞彿锛歿{itemFlow.patch_id}}</div>
<div id="bj" style="float: right;font-size: 28px">琛� {{ id + 1 }}</div>
- <div>{{company.companyName}}</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 v-else style="text-align: right;font-weight: bolder">娴佺▼鍗″彿锛� {{
- itemFlow.process_id
- }}/{{ itemFlow.technologyNumber }} 鍏� {{ flowCardCount }} 鏋�
+ <div style="font-weight: bolder;display: flex;justify-content:space-between">
+ <div>鎵撳嵃浜猴細{{user.user.userName}}</div>
+ <div>
+ <span style="font-size: 10px">{{itemFlow.otherRemarks}}</span>
+ 娴佺▼鍗″彿锛� {{
+ itemFlow.process_id
+ }}/{{ itemFlow.technologyNumber }} 鍏� {{ item.count }} 鏋�
+ </div>
</div>
</td>
</tr>
@@ -201,81 +250,70 @@
<td class="tdNowrap">瀹㈡埛鍚嶇О锛�</td>
<td colspan="2">{{ items.customer_name }}</td>
<td class="tdNowrap">椤圭洰鍚嶇О锛�</td>
- <td colspan="2">{{ items.project }}</td>
+ <td colspan="8">{{ items.project }}</td>
<td class="tdNowrap">宸ヨ壓娴佺▼锛�</td>
- <td colspan="17" 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>
<td colspan="2">{{ itemTr.edging_type }}</td>
<td class="tdNowrap">鍗曠墖鍚嶇О锛�</td>
- <td colspan="2">{{ itemTr.glass_child }}</td>
+ <td colspan="8">{{ itemTr.glass_child }}</td>
<td class="tdNowrap">浜у搧鍚嶇О锛�</td>
- <td colspan="17">{{ itemTr.product_name }}</td>
+ <td :colspan="2+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'>瀹�*楂�</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>
+ <template v-for=" n in item.processList.length">
+ <td>{{ company.printLabel.printFlowCard.patch }}</td>
+ <td>{{ company.printLabel.printFlowCard.lackOf }}</td>
+ </template>
</tr>
</thead>
<tbody>
<tr v-for="(itemDatile,index) in item.detailList" :key="index">
<td>{{ itemDatile.order_number }}</td>
- <td>{{itemDatile.s01Value}}</td>
+ <td>{{ itemDatile.s01Value }}</td>
+ <td>{{ itemDatile.technology_number }}</td>
<td>{{ itemDatile.child_width }}</td>
- <td class="item" style="width: 5%;height: 100%;"><el-input @keyup="handleSummary()" style="border: none" v-model="itemDatile.quantity"></el-input></td>
+ <td class="item" style="width: 5%;height: 100%;">
+ <input v-model="itemDatile.quantity" style="width: 100%;height: 100%" @keyup="handleSummary()"/>
+ </td>
<td>{{ itemDatile.total_area }}</td>
<td>{{ itemDatile.perimeter }}</td>
<td>{{ itemDatile.bend_radius }}</td>
+ <td>{{ itemDatile.patch_type }}</td>
+ <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>
+ <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="24">
+ <td v-for="(itemsum,index) in item.detail" :key="index" colspan="34">
鏁伴噺锛�
<label>{{ itemsum.quantity }}</label>
闈㈢Н锛�
@@ -285,52 +323,50 @@
</td>
</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%;font-size: 11px">{{ itemtextarea.processing_note }}</textarea>-->
-<!-- </div>-->
- <div style="width: 100%;height: 100%;"><textarea style="height: 99%;width: 99%;border: none;;font-size: 11px">{{company.printLabel.printFlowCard.processingNote(itemtextarea)}}</textarea>
+ <td colspan="4" rowspan="5" style="width: 480px;height: 100px ">
+ <div>
+
</div>
</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>
+ <template v-for=" n in item.processList.length">
+ <td colspan="2"></td>
+ </template>
</tr>
<tr>
<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>
+ <template v-for=" n in item.processList.length">
+ <td colspan="2"></td>
+ </template>
</tr>
<tr>
<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>
- <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="29"></td>
</tr>
<tr v-for="(qrCodeItem,index) in item.detail" :key="index">
- <td colspan="19">
+ <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;">
@@ -342,7 +378,12 @@
</span>
</span>
</td>
-
+ </tr>
+ <tr v-for="(itemtextareas,index) in item.detail" :key="index">
+ <td colspan="34" 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>
+ </div>
+ </td>
</tr>
</tfoot>
</table>
@@ -391,12 +432,10 @@
}
#contentTable tbody {
- white-space: nowrap;
}
.tdNowrap {
- white-space: nowrap;
}
@@ -405,14 +444,19 @@
font-weight: bolder;
}
-@page {
- size: auto; /* auto is the initial value */
- margin: 2mm 0mm 0mm 1mm /* this affects the margin in the printer settings */
-
+input{
+ border: none;
+ background: none;
}
@media print {
+ @page {
+ size: auto; /* auto is the initial value */
+ margin: 2mm 4mm 0mm 4mm /* this affects the margin in the printer settings */
+
+ }
+
tbody {
display: table-row-group;
}
--
Gitblit v1.8.0