From 7104751e2f26872d4891d01d42ee88cf19715d01 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期二, 08 七月 2025 17:46:01 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue | 282 +++++++++++++++++++++++++++++++++-----------------------
1 files changed, 165 insertions(+), 117 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue b/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
index 50f0e14..4206831 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
@@ -10,6 +10,7 @@
import QRCode from "qrcode";
import companyInfo from "@/stores/sd/companyInfo";
import userInfo from "@/stores/userInfo"
+import {add} from '@/utils/decimal'
//璇█鑾峰彇
const company = companyInfo()
const {t} = useI18n()
@@ -29,12 +30,19 @@
let props = defineProps({
printList: null,
printMerge: null,
- printLike: null
+ printLike: null,
+ printProject:null,
+ merges:null,
+ printFc:null,
+ flashback:null,
+ landingSequence:null,
+ compound:null
})
const {currentRoute} = useRouter()
const route = currentRoute.value
const printMerge = props.printMerge
+const printProject = props.printProject
//鎵撳嵃鏃堕棿
const currentTime = new Date();
@@ -51,98 +59,43 @@
if (like == '') {
like = null
}
+//鏍囪鍚堝苟鐨勬祦绋嬪崱
+let merges = props.merges
+if (merges == '') {
+ merges = null
+}
+
+//鎸囧畾灞傚悓鏋�
+let compound = props.compound
+if (compound == '') {
+ compound = null
+}
let name=company.companyName
+
+let printNumberFc = props.printFc
data.value.printList = JSON.parse(props.printList)
let flowCardCount = ''
onMounted(() => {
- request.post(`/processCard/getSelectPrinting/${merge}/${like}`, data.value).then((res) => {
- if (res.code == 200) {
- produceList.value = deepClone(res.data.data)
- //澶勭悊鍗曠墖鍘氬害
-
- for (let j = 0; j < produceList.value.length; j++) {
- let sumWeight = 0
- produceList.value[j].detailList.forEach((item, index) => {
- // 瑙ｆ瀽 separation 瀛楁鐨� JSON 瀛楃涓�
- let separationObj = JSON.parse(item.separation);
-
- // 鑾峰彇 thickness 鐨勫師濮嬪��
- let thicknessValue = separationObj.thickness;
-
- // 鍘婚櫎 'mm' 鍗曚綅
- let thicknessWithoutUnit = thicknessValue.replace('mm', '');
-
- item.separation = thicknessWithoutUnit
-
- sumWeight += item.width * item.height * item.quantity / 1000000 * item.separation * 2.5 * 1;
-
- });
- produceList.value[j].detail[0].weight = sumWeight
+ if(props.printProject!=null){
+ request.post(`/processCard/getSelectPrintProject/${printProject}/${merges}/${props.flashback}/${props.landingSequence}`).then((res) => {
+ if (res.code == 200) {
+ load(res.data.data)
+ } else {
+ ElMessage.warning(res.msg)
+ router.push("/login")
}
- //澶勭悊鍚堝苟鎵撳嵃
- 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 => {
- let technologyNumberMerge = printMerge.split('').join(',');
- item.detail[0].technologyNumberMerge = technologyNumberMerge
- })
- //澶勭悊缂栧彿鍒�
- //瀹氫箟瀛樻斁缂栧彿鏁扮粍
- const s01Values = [];
- 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) {
- produceList.value[i].detailList.forEach(element => {
- const otherColumnsObject = JSON.parse(element.other_columns);
- const s01Value = otherColumnsObject.S01;
- s01Values.push(s01Value || ''); // 濡傛灉 S01 鍊间负绌猴紝娣诲姞绌哄瓧绗︿覆鎴栬�呭叾浠栭粯璁ゅ��
- });
-
- // 灏� s01Values 涓殑鍊艰祴缁欐瘡涓鍗曡鎯呭璞＄殑 s01Value 灞炴��
- produceList.value[i].detailList.forEach((detail, index) => {
- detail.s01Value = index < s01Values.length ? s01Values[index] : ''; // 璧嬪�肩粰 s01Value 灞炴��
- });
- }
-
+ })
+ }else{
+ request.post(`/processCard/getSelectPrinting/${merge}/${like}/${merges}/${props.flashback}/${compound}/${props.landingSequence}`, data.value).then((res) => {
+ if (res.code == 200) {
+ load(res.data.data)
+ } else {
+ ElMessage.warning(res.msg)
+ router.push("/login")
}
- //澶勭悊鍚岄厤缃墦鍗�
- handleGetQRCode()
- handleSummary()
- AreaQuantitySummary()
- } else {
- ElMessage.warning(res.msg)
- router.push("/login")
- }
- })
+ })
+ }
+
}
)
@@ -157,27 +110,33 @@
technologyNumber = produceList.value[i].detail[0].technologyNumber.toString(); // 杞崲涓哄瓧绗︿覆浠ヤ究澶勭悊姣忎釜瀛楃
}
produceList.value[i].detail[0]["qrcodeList"] = []; // 鍒濆鍖栦竴涓┖鏁扮粍鐢ㄦ潵瀛樺偍 QR Code
+ if (compound == null ){
+ 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
+ });
+ }
+ else {
+ technologyNumber = compound
+ 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
- });
- // 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]
- // });
- //
- // }
+
+
}
};
@@ -196,7 +155,7 @@
totalQuantity += collection.quantity * 1;
//姣忎釜搴忓彿闈㈢Н
collection.total_area = parseFloat((collection.width * collection.height * collection.quantity / 1000000).toFixed(2))
- totalArea += collection.total_area * 1;
+ totalArea = add(totalArea, collection.total_area)
totalWeight += collection.width * collection.height * collection.quantity / 1000000 * collection.separation * 2.5 * 1;
//姣忎釜搴忓彿鍛ㄩ暱
collection.perimeter = parseFloat(((collection.width * 2 + collection.height * 2) * collection.quantity / 1000).toFixed(3))
@@ -208,16 +167,100 @@
}
}
-const AreaQuantitySummary = () => {
+const load = (data) => {
+ produceList.value = deepClone(data)
+ //澶勭悊鍗曠墖鍘氬害
+
+ for (let j = 0; j < produceList.value.length; j++) {
+ let sumWeight = 0
+ produceList.value[j].detailList.forEach((item, index) => {
+ // 瑙ｆ瀽 separation 瀛楁鐨� JSON 瀛楃涓�
+ let separationObj = JSON.parse(item.separation);
+
+ // 鑾峰彇 thickness 鐨勫師濮嬪��
+ let thicknessValue = separationObj.thickness;
+
+ // 鍘婚櫎 'mm' 鍗曚綅
+ let thicknessWithoutUnit = thicknessValue.replace('mm', '');
+
+ item.separation = thicknessWithoutUnit
+
+ sumWeight += item.width * item.height * item.quantity / 1000000 * item.separation * 2.5 * 1;
+
+ });
+ 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);
+ // }
+ // }
+ // }
+
+
+ // produceList.value.forEach(item => {
+ // let technologyNumberMerge = printMerge.split('').join(',');
+ // item.detail[0].technologyNumberMerge = technologyNumberMerge
+ // })
+ //澶勭悊缂栧彿鍒�
+ //瀹氫箟瀛樻斁缂栧彿鏁扮粍
+ const s01Values = [];
+ 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) {
+ produceList.value[i].detailList.forEach(element => {
+ const otherColumnsObject = JSON.parse(element.other_columns);
+ const s01Value = otherColumnsObject.S01;
+ s01Values.push(s01Value || ''); // 濡傛灉 S01 鍊间负绌猴紝娣诲姞绌哄瓧绗︿覆鎴栬�呭叾浠栭粯璁ゅ��
+ });
+
+ // 灏� s01Values 涓殑鍊艰祴缁欐瘡涓鍗曡鎯呭璞＄殑 s01Value 灞炴��
+ produceList.value[i].detailList.forEach((detail, index) => {
+ detail.s01Value = index < s01Values.length ? s01Values[index] : ''; // 璧嬪�肩粰 s01Value 灞炴��
+ });
+ }
+
+ }
+ //澶勭悊鍚岄厤缃墦鍗�
+ handleGetQRCode()
+ handleSummary()
+ AreaQuantitySummary()
+}
+
+const AreaQuantitySummary = () => {
for (let i = 0; i < produceList.value.length; i++) {
// 閬嶅巻褰撳墠椤圭洰鐨� detail 鏁扮粍
for (let j = 0; j < produceList.value[i].detail.length; j++) {
// 绱姞鏁伴噺
- totalQuantity += produceList.value[i].detail[j].quantity;
+ totalQuantity = add(totalQuantity,produceList.value[i].detail[j].quantity)
// 绱姞闈㈢Н
- totalArea += produceList.value[i].detail[j].gross_area;
+ totalArea = add(totalArea,produceList.value[i].detail[j].gross_area)
}
}
@@ -232,9 +275,13 @@
<tr v-for="(itemFlow,index) in item.detail" :key="index">
<td colspan="31">
<div style="float: left;"><input style="border: none;font-size: 28px;width: 70px;margin: 5px "/></div>
- <div id="bj" style="float: right;font-size: 28px">{{ id + 1 }}</div>
+ <div id="bj" v-if="printFc=='true'" style="float: right;font-size: 28px">{{ id + 1 }}</div>
+ <div id="bj" v-else style="float: right;font-size: 28px"></div>
<div>{{ company.companyName }}</div>
- <div>鐢熶骇娴佺▼鍗�</div>
+ <div>
+ 鐢熶骇娴佺▼鍗�<span style="font-weight: bold" v-if="printProject!=null">({{ printProject }})</span>
+ <span style="font-weight: bold" v-if="props.compound!=null">({{ props.compound }}灞傚悓鏋�)</span>
+ </div>
<div style="font-weight: bolder;display: flex;justify-content:space-between">
<div>
鎵撳嵃浜猴細{{user.user.userName}}
@@ -246,7 +293,8 @@
</span>
</div>
<div>
- <span v-if="name!='閲戝崕绂忓枩澶╂垚鐜荤拑鏈夐檺鍏徃'" style="font-size: 10px">{{itemFlow.otherRemarks}}</span>
+ <span v-if="name=='澶╂触鍖楃幓鐜荤拑宸ヤ笟鎶�鏈湁闄愬叕鍙革紙TJBB-QR7.1-01锛�'" style="font-size: 10px">{{itemFlow.otherRemarks}}</span>
+ {{itemFlow.rack}}
娴佺▼鍗″彿锛� {{
itemFlow.process_id
}}/{{ itemFlow.technologyNumber }} 鍏� {{ item.count }} 鏋�
@@ -276,7 +324,7 @@
<td rowspan='2'>缂栧彿</td>
<td rowspan="2">灏忕墖椤哄簭</td>
<td rowspan='2' style="width: 90px">瀹�*楂�</td>
- <td rowspan='2'>鏁伴噺</td>
+ <td rowspan='2' >鏁伴噺</td>
<td rowspan='2'>闈㈢Н</td>
<td rowspan='2'>鍛ㄩ暱</td>
<td rowspan='2'>鍗婂緞/澶囨敞</td>
@@ -299,7 +347,7 @@
<td v-else>{{ itemDatile.s01Value }}</td>
<td>{{ itemDatile.technology_number }}</td>
<td>{{ itemDatile.child_width }}</td>
- <td class="item" style="width: 5%;height: 100%;">
+ <td class="item" style="width: 60px;height: 100%;">
<input v-model="itemDatile.quantity" style="width: 100%;height: 100%" @keyup="handleSummary()"/>
</td>
<td>{{ itemDatile.total_area }}</td>
@@ -316,7 +364,7 @@
鏁伴噺锛�
<label>{{ itemsum.quantity }}</label>
闈㈢Н锛�
- <label>{{ parseFloat(itemsum.gross_area.toFixed(2)) }}</label>
+ <label>{{ itemsum.gross_area }}</label>
閲嶉噺锛�
<label>{{ parseFloat(itemsum.weight.toFixed(2)) }}</label>
</td>
@@ -352,7 +400,7 @@
<tr v-for="(qrCodeItem,index) in item.detail" :key="index">
<td colspan="31">
<span style="display: flex;">
- <span v-for="(qrCodeItems,index) in qrCodeItem.qrcodeList" :key="index" style="display: flex;width: 35%">
+ <span v-for="(qrCodeItems,index) in qrCodeItem.qrcodeList" :key="index" style="display: flex;width: 20%">
<div class='qrCode' style="width: 80px;height: 80px;">
<img :src=qrCodeItems.qrcode>
</div>
--
Gitblit v1.8.0