From 1c13bd7a2cd2c8ba69a185da69344c8b59f4e561 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 04 七月 2024 09:29:15 +0800
Subject: [PATCH] 选中求和功能以及还原双击回车才能点击单元格
---
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProcess.vue | 270 +++++++++++++++++++++++++++++++++++-------------------
1 files changed, 175 insertions(+), 95 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 64d6f39..37c7ca6 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
@@ -5,40 +5,108 @@
import {Search} from "@element-plus/icons-vue"
import {useRouter} from 'vue-router'
import {changeFilterEvent, filterChanged} from "@/hook"
-
import {useI18n} from 'vue-i18n'
import deepClone from "@/utils/deepClone";
+import QRCode from "qrcode";
+import companyInfo from "@/stores/sd/companyInfo";
//璇█鑾峰彇
+const company = companyInfo()
const {t} = useI18n()
let router = useRouter()
let produceList = ref([])
-let details = ref([])
+let list = ref()
+const details = ref([])
+
const data = ref({
- printList:[]
+ printList: []
})
const {currentRoute} = useRouter()
const route = currentRoute.value
+const printMerge = route.query.printMerge
data.value.printList = JSON.parse(route.query.printList)
-let flowCardCount=data.value.printList.length
+let flowCardCount = data.value.printList.length
onMounted(() => {
- // if (id === null || id === undefined || id === '') {
- // return
- // }
+ // if (id === null || id === undefined || id === '') {
+ // return
+ // }
request.post(`/processCard/getSelectPrinting`, data.value).then((res) => {
if (res.code == 200) {
produceList.value = deepClone(res.data.data)
+ 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)
router.push("/login")
}
})
+
}
- )
+)
+
+
+const handleGetQRCode = async () => {
+ for (let i = 0; i < produceList.value.length; i++) {
+ const technologyNumber = produceList.value[i].detail[0].technologyNumber.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 printFlowCard = () => {
@@ -63,7 +131,7 @@
printId +
"{display:block;padding-top:1px}}";
//
- content.innerHTML = el.outerHTML;
+ content.innerHTML = el.outerHTML;
// // console.log("el.outerHTML", el.outerHTML);
body.appendChild(style);
@@ -79,53 +147,59 @@
</script>
<template>
- <el-button id="printButton" @click="printFlowCard">鎵撳嵃</el-button>
+ <el-button id="printButton" @click="printFlowCard();">{{ $t('basicData.print') }}</el-button>
<div id="printFlowCard">
<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 id="bj" style="float: right;font-size: 28px">{{ id+1 }}</div>
- <div>甯稿窞甯傚悏鍒╃幓鐠冩湁闄愬叕鍙�</div>
+ <div id="bj" style="float: right;font-size: 28px">{{ id + 1 }}</div>
+ <div>{{company.companyName}}</div>
<div>鐢熶骇娴佺▼鍗�</div>
- <div style="text-align: right;font-weight: bolder">娴佺▼鍗″彿锛� {{ itemFlow.process_id }}/{{ itemFlow.technologyNumber }} 鍏� {{flowCardCount}} 鏋�</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>
</td>
</tr>
<tr v-for="(items,index) in item.detail" :key="index">
- <td>瀹㈡埛鍚嶇О锛�</td>
+ <td class="tdNowrap">瀹㈡埛鍚嶇О锛�</td>
<td colspan="2">{{ items.customer_name }}</td>
- <td>椤圭洰鍚嶇О锛�</td>
+ <td class="tdNowrap">椤圭洰鍚嶇О锛�</td>
<td colspan="2">{{ items.project }}</td>
- <td style="width:100px">宸ヨ壓娴佺▼锛�</td>
- <td colspan="16">{{ items.process }}</td>
+ <td class="tdNowrap">宸ヨ壓娴佺▼锛�</td>
+ <td colspan="17">{{ items.process }}</td>
</tr>
<tr v-for="(itemTr,index) in item.detail" :key="index">
- <td>纾ㄨ竟绫诲瀷锛�</td>
+ <td class="tdNowrap">纾ㄨ竟绫诲瀷锛�</td>
<td colspan="2">{{ itemTr.edging_type }}</td>
- <td>鍗曠墖鍚嶇О锛�</td>
+ <td class="tdNowrap">鍗曠墖鍚嶇О锛�</td>
<td colspan="2">{{ itemTr.glass_child }}</td>
- <td>浜у搧鍚嶇О锛�</td>
- <td colspan="16">{{ itemTr.product_name }}</td>
+ <td class="tdNowrap">浜у搧鍚嶇О锛�</td>
+ <td colspan="17">{{ itemTr.product_name }}</td>
</tr>
-
- </thead>
- <tbody>
<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 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 v-for="(itemPr,index) in item.processList" :key="index" colspan="2">{{ itemPr.process }}</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>
@@ -145,14 +219,18 @@
<td>姝ｅ搧</td>
<td>娆″搧</td>
</tr>
+ </thead>
+ <tbody>
+
<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>{{ itemDatile.quantity }}</td>
+ <td class="item">{{ itemDatile.quantity }}</td>
<td>{{ itemDatile.total_area }}</td>
<td>{{ itemDatile.perimeter }}</td>
<td>{{ itemDatile.bend_radius }}</td>
- <td>{{ itemDatile.order_number }}</td>
+ <td>{{ itemDatile.remarks }}</td>
<td></td>
<td></td>
<td></td>
@@ -172,39 +250,23 @@
</tr>
</tbody>
<tfoot>
- <tr>
- <td colspan="24" v-for="(itemsum,index) in item.detail" :key="index">
+ <tr style="height: 14px">
+ <td v-for="(itemsum,index) in item.detail" :key="index" colspan="24">
鏁伴噺锛�
<label>{{ itemsum.quantity }}</label>
闈㈢Н锛�
- <label>{{ itemsum.gross_area }}</label>
+ <label>{{ parseFloat(itemsum.gross_area.toFixed(2)) }}</label>
閲嶉噺锛�
- <label>{{ itemsum.gross_area }}</label>
+ <label>{{ parseFloat(itemsum.weight.toFixed(2)) }}</label>
</td>
</tr>
<tr v-for="(itemtextarea,index) in item.detail" :key="index">
- <td colspan="6" rowspan="6" style="width: 450px;height: 150px ">
- <div style="width: 100%;height: 100%"><textarea style="height: 98%;width: 98%">{{ itemtextarea.processing_note }}</textarea></div>
+ <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>
</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>
- </tr>
- <tr>
- <td>鎺ュ彈绛惧悕</td>
<td></td>
<td></td>
<td></td>
@@ -240,6 +302,7 @@
<td></td>
<td></td>
<td></td>
+ <td></td>
</tr>
<tr>
<td>璐ㄦ绛惧悕</td>
@@ -259,30 +322,22 @@
<td></td>
<td></td>
<td></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>
</tr>
- <tr>
- <td colspan="17" rowspan="2">
- <div style="width: 60px;height: 60px;background-color: red"></div>
+ <tr v-for="(qrCodeItem,index) in item.detail" :key="index">
+ <td colspan="19">
+ <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;">
+ <img :src=qrCodeItems.qrcode>
+ </div>
+ <span style="float: left;font-weight: bolder">{{
+ qrCodeItem.process_id + "/" + qrCodeItems.technologyNumber
+ }}</span>
+ </span>
+ </span>
</td>
+
</tr>
</tfoot>
</table>
@@ -296,16 +351,14 @@
padding: 0;
}
-#printButton{
+#printButton {
margin-top: -40px;
width: 100px;
}
#printFlowCard {
- margin-top: -40px;
text-align: center;
- //font-weight: bolder;
- height: 600px;
+//font-weight: bolder; height: 600px;
}
#contentTable {
@@ -327,32 +380,59 @@
#contentTable tr td {
border: 1px solid black;
- height: 22px;
+ height: 18px;
font-weight: bolder;
}
-#contentTable tbody{
- height: 22px;
+
+#contentTable tbody {
+ white-space: nowrap;
+
}
-#contentTable tbody td {
- width: 50px;
+.tdNowrap {
+ white-space: nowrap;
+
}
-#contentTable tfoot{
+#contentTable tfoot {
font-size: 12px;
font-weight: bolder;
}
+@page {
+ size: auto; /* auto is the initial value */
+ margin: 13mm 6mm 0mm 6mm /* this affects the margin in the printer settings */
-footer {page-break-after: always;}
+}
-tbody{display:table-row-group;}
+@media print {
-table { page-break-inside:auto; }
-tr { page-break-inside:avoid; }
-td { page-break-inside:avoid; }
-thead { display:table-header-group; }
-tfoot { display:table-footer-group;page-break-inside:avoid; }
+ tbody {
+ display: table-row-group;
+ }
+
+ table {
+ page-break-before: always;
+ }
+
+ table {
+ page-break-inside: auto;
+ }
+
+ thead {
+ display: table-header-group;
+ }
+
+ tfoot {
+ display: table-footer-group;
+ page-break-inside: avoid;
+ }
+}
+
+.qrCode img {
+ width: 100%;
+ height: 100%;
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0