From 8fbb9414ac41fd267691356147757602f3b6371c Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期二, 09 十二月 2025 12:27:41 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue | 167 ++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 110 insertions(+), 57 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 003968f..0467bcf 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue
@@ -21,7 +21,8 @@
const data = ref({
- printList: []
+ printList: [],
+ processName:[]
})
let props = defineProps({
@@ -30,6 +31,13 @@
printLike: null,
mergeTechnologyNumber:null
})
+
+//鎵撳嵃鏃堕棿
+const currentTime = new Date();
+const formattedTime = currentTime.getFullYear()
+ + '-' + (currentTime.getMonth() + 1) + '-'
+ + currentTime.getDate() + ' ' + currentTime.getHours() + ':'
+ + currentTime.getMinutes();formattedTime
const {currentRoute} = useRouter()
const route = currentRoute.value
@@ -45,6 +53,8 @@
}
data.value.printList = JSON.parse(props.printList)
+let name=company.companyName
+let replenishQRCode=company.replenishQRCode
//鍘婚櫎閲嶅瀵硅薄
// let uniqueObjects = {};
// // 閬嶅巻鍘熷鏁版嵁鏁扮粍
@@ -63,6 +73,7 @@
request.post(`/processCard/getSelectPrintingRefund/${merge}/${like}/${mergeTechnologyNumber}`, data.value).then((res) => {
if (res.code == 200) {
produceList.value = deepClone(res.data.data)
+ data.processName = res.data.data[0].processNameList
//澶勭悊鍗曠墖鍘氬害
for (let j = 0; j < produceList.value.length; j++) {
@@ -85,33 +96,34 @@
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
+ // console.log(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 => {
@@ -164,9 +176,12 @@
flowCardCount=produceList.value.length
-
handleSummary()
- handleGetQRCode()
+ if (replenishQRCode == 2){
+ handleGetQRCodeTj()//澶╂触鎵爜鏋姤宸ラ渶瑕佸悎骞跺眰鍙蜂簩缁寸爜
+ }else{
+ handleGetQRCode()//鎷嗗垎灞傚彿浜岀淮鐮�
+ }
} else {
ElMessage.warning(res.msg)
router.push("/login")
@@ -176,8 +191,40 @@
}
)
-
const handleGetQRCode = async () => {
+ for (let i = 0; i < produceList.value.length; i++) {
+ const detailItem = produceList.value[i].detail[0];
+ const detailList = produceList.value[i].detailList;
+
+ const mergeTechNumber = detailItem.mergeTechnologyNumber.toString();
+ const processId = detailItem.process_id;
+
+ detailItem.qrcodeList = [];
+
+ //鍌ㄥ瓨灞傚彿
+ const seenTechNumbers = new Set();
+
+ for (let j = 0; j < detailList.length; j++) {
+ const techNum = detailList[j].technology_number;
+
+ //鏈夊垯璺宠繃
+ if (seenTechNumbers.has(techNum)) continue;
+ const url = `${processId}/${techNum}`;
+
+ const qrcodeData = await QRCode.toDataURL(url);
+ detailItem.qrcodeList.push({
+ qrcode: qrcodeData,
+ technologyNumber: techNum
+ });
+
+ seenTechNumbers.add(techNum);
+ }
+ }
+};
+
+
+
+const handleGetQRCodeTj = async () => {
let technologyNumber=''
for (let i = 0; i < produceList.value.length; i++) {
const technologyNumber = produceList.value[i].detail[0].mergeTechnologyNumber.toString(); // 杞崲涓哄瓧绗︿覆浠ヤ究澶勭悊姣忎釜瀛楃
@@ -231,16 +278,18 @@
<thead>
<tr v-for="(itemFlow,index) in item.detail" :key="index">
<td colspan="34">
-
+ <div style="float: left;"><img id="img-pic" style="width: 42px;height: 32px" src="@/assets/northGlass.ico" alt=""></div>
<div id="bj" style="float: right;font-size: 28px">琛� {{ id + 1 }}</div>
<div style="left: 150px">{{ company.companyName }}</div>
- <div>鐢熶骇娴佺▼鍗�</div>
+ <div>({{itemFlow.order_type}})鐢熶骇娴佺▼鍗�</div>
<div style="font-weight: bolder;display: flex;justify-content:space-between">
<div>
琛ョ墖鍗曞彿锛歿{itemFlow.patch_id}}
- 鎵撳嵃浜猴細{{user.user.userName}}</div>
+ 鎵撳嵃浜猴細{{user.user.userName}}
+ 鏃堕棿锛歿{formattedTime}}
+ </div>
<div>
- <span style="font-size: 10px">{{itemFlow.otherRemarks}}</span>
+ <span v-if="name=='澶╂触鍖楃幓鐜荤拑宸ヤ笟鎶�鏈湁闄愬叕鍙革紙TJBB-QR7.1-01锛�'" style="font-size: 10px">{{itemFlow.otherRemarks}}</span>
娴佺▼鍗″彿锛� {{
itemFlow.process_id
}}/{{ itemFlow.technologyNumber }} 鍏� {{ item.count }} 鏋�
@@ -250,15 +299,16 @@
</tr>
<tr v-for="(items,index) in item.detail" :key="index">
<td class="tdNowrap">瀹㈡埛鍚嶇О锛�</td>
- <td colspan="2">{{ items.customer_name }}</td>
+ <td colspan="3">{{ items.customer_name }}</td>
<td class="tdNowrap">椤圭洰鍚嶇О锛�</td>
- <td colspan="8" style="min-width: 300px;">{{ items.project }}</td>
+ <td v-if="name=='娲涢槼鍖楁柟鐜荤拑鎶�鏈偂浠芥湁闄愬叕鍙�'" colspan="4" style="min-width: 250px;">{{ items.projectBatch }}</td>
+ <td v-else colspan="4" style="min-width: 250px;">{{ items.project }}</td>
<td class="tdNowrap">宸ヨ壓娴佺▼锛�</td>
- <td :colspan="2+item.processList.length*2" style="width: 500px">{{ items.process }}</td>
+ <td :colspan="4+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 colspan="3">{{ itemTr.edging_type }}</td>
<td class="tdNowrap">鍗曠墖鍚嶇О锛�</td>
<td colspan="8">{{ itemTr.glass_child }}</td>
<td class="tdNowrap">浜у搧鍚嶇О锛�</td>
@@ -267,12 +317,12 @@
<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>
@@ -292,7 +342,8 @@
<tr v-for="(itemDatile,index) in item.detailList" :key="index">
<td>{{ itemDatile.order_number }}</td>
- <td>{{ itemDatile.s01Value }}</td>
+ <td class="tdNowrap" v-if="name=='閲戝崕绂忓枩澶╂垚鐜荤拑鏈夐檺鍏徃' || name=='娴欐睙宸ㄦ槦鍢夋嘲鏂版潗鏂欐湁闄愬叕鍙�' ">{{ itemDatile.building_number }}</td>
+ <td class="tdNowrap" v-else>{{ itemDatile.s01Value }}</td>
<td>{{ itemDatile.technology_number }}</td>
<td>{{ itemDatile.child_width }}</td>
<td class="item" style="width: 5%;height: 100%;">
@@ -301,12 +352,12 @@
<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 class="tdNowrap">{{ itemDatile.patch_type }}</td>
+ <td class="tdNowrap">{{ itemDatile.patch_reason }}</td>
+ <td class="tdNowrap">{{ itemDatile.patch_processes }}</td>
+ <td class="tdNowrap">{{ itemDatile.responsible_team }}</td>
<td>{{ itemDatile.responsible_personnel }}</td>
- <td>{{ itemDatile.remarks }}</td>
+ <td class="tdNowrap">{{ itemDatile.remarks }}</td>
<template v-for=" n in item.processList.length">
<td></td>
<td></td>
@@ -325,18 +376,14 @@
</td>
</tr>
<tr v-for="(itemtextarea,index) in item.detail" :key="index">
- <td colspan="4" rowspan="5" style="width: 480px;height: 100px ">
- <div>
-
- </div>
- </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="1"></td>
<template v-for=" n in item.processList.length">
<td colspan="2"></td>
</template>
@@ -348,6 +395,8 @@
<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>
@@ -355,10 +404,12 @@
<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="1"></td>
<template v-for=" n in item.processList.length">
<td colspan="2"></td>
</template>
@@ -383,7 +434,9 @@
</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: 11px;text-align: left">{{itemtextareas.processing_note}}</textarea>
+ <div style="width: 100%;height: 100%;text-align: left">
+ <textarea v-if="!company.processFontSize" style="height: 99%;width: 99%;border: none;;font-size: 14px;font-weight: bold;overflow: hidden;text-align: left;vertical-align: middle">{{itemtextareas.processing_note}}</textarea>
+ <textarea v-else style="height: 99%;width: 99%;border: none;;font-size: 36px;font-weight: bold;overflow: hidden;text-align: left;vertical-align: middle">{{itemtextareas.processing_note}}</textarea>
</div>
</td>
</tr>
@@ -438,7 +491,7 @@
}
.tdNowrap {
-
+ white-space: nowrap;
}
#contentTable tfoot {
--
Gitblit v1.8.0