From acaf8ca38cd32bc474bb46b593db2a8d75b9bfdd Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期六, 12 十月 2024 08:26:23 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue | 117 ++++++++++++++++++++++++++++++----------------------------
1 files changed, 60 insertions(+), 57 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 c2013ab..aec6100 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.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({
@@ -144,18 +146,26 @@
}
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]}`;
+ 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
+ });
- // 鐢熸垚 QR Code 骞跺瓨鍌ㄥ埌鏁扮粍涓�
- const qrcodeData = await QRCode.toDataURL(url);
- produceList.value[i].detail[0]["qrcodeList"].push({
- qrcode: qrcodeData,
- technologyNumber: technologyNumber[j]
- });
-
- }
+ // 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]
+ // });
+ //
+ // }
}
};
@@ -191,7 +201,7 @@
<template>
<!-- <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">
+ <table v-for="(item,id) in produceList" id="contentTable" :key="id" style="border-bottom: none">
<thead>
<tr v-for="(itemFlow,index) in item.detail" :key="index">
<td colspan="29">
@@ -199,17 +209,14 @@
<div id="bj" style="float: right;font-size: 28px">{{ id + 1 }}</div>
<div>{{ company.companyName }}</div>
<div>鐢熶骇娴佺▼鍗�</div>
- <div v-if="itemFlow.technologyNumberMerge!=''" style="text-align: right;font-weight: bolder">
- {{itemFlow.otherRemarks}}
- 娴佺▼鍗″彿锛� {{
- itemFlow.process_id
- }}/{{ itemFlow.technologyNumberMerge }} 鍏� {{ item.count }} 鏋�
- </div>
- <div v-else style="text-align: right;font-weight: bolder">
- {{itemFlow.otherRemarks}}
- 娴佺▼鍗″彿锛� {{
- itemFlow.process_id
- }}/{{ itemFlow.technologyNumber }} 鍏� {{ item.count }} 鏋�
+ <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>
@@ -217,17 +224,17 @@
<td class="tdNowrap">瀹㈡埛鍚嶇О锛�</td>
<td colspan="2">{{ items.customer_name }}</td>
<td class="tdNowrap">椤圭洰鍚嶇О锛�</td>
- <td colspan="2">{{ items.project }}</td>
+ <td colspan="4">{{ items.project }}</td>
<td class="tdNowrap">宸ヨ壓娴佺▼锛�</td>
- <td colspan="22" style="width: 500px">{{ items.process }}</td>
+ <td colspan="20" 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="4">{{ itemTr.glass_child }}</td>
<td class="tdNowrap">浜у搧鍚嶇О锛�</td>
- <td colspan="22">{{ itemTr.product_name }}</td>
+ <td colspan="20">{{ itemTr.product_name }}</td>
</tr>
<tr>
<td rowspan='2'>搴忓彿</td>
@@ -300,8 +307,6 @@
<td></td>
<td></td>
</tr>
- </tbody>
- <tfoot>
<tr style="height: 14px">
<td v-for="(itemsum,index) in item.detail" :key="index" colspan="29">
鏁伴噺锛�
@@ -347,23 +352,7 @@
<td colspan="2"></td>
<td colspan="2"></td>
</tr>
- <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="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>
<td colspan="28"></td>
@@ -385,28 +374,39 @@
</tr>
<tr v-if="company.remarkSwitch=='1'">
<td colspan="29">
- <div style="display: flex;flex-wrap: wrap;">
- <div v-for="(itemremark,index) in item.remarkList" :key="index">
+ <div style="display: flex;flex-wrap: wrap;">
+ <div class="nuber_xx" v-for="(itemremark,index) in item.remarkList" :key="index">
<span v-if="!(itemremark.S02==null&&itemremark.S03==null&&itemremark.S04==null&&itemremark.S05==null)">
缂栧彿锛歿{itemremark.S01}}
</span>
- <span v-if="itemremark.S02!=null">澶囨敞1锛歿{itemremark.S02}}</span>
- <span v-if="itemremark.S03!=null">澶囨敞2锛歿{itemremark.S03}}</span>
- <span v-if="itemremark.S04!=null">澶囨敞3锛歿{itemremark.S04}}</span>
- <span v-if="itemremark.S05!=null">澶囨敞4锛歿{itemremark.S05}}</span>
- </div>
- </div>
+ <span v-if="itemremark.S02!=null">澶囨敞1锛歿{itemremark.S02}}</span>
+ <span v-if="itemremark.S03!=null">澶囨敞2锛歿{itemremark.S03}}</span>
+ <span v-if="itemremark.S04!=null">澶囨敞3锛歿{itemremark.S04}}</span>
+ <span v-if="itemremark.S05!=null">澶囨敞4锛歿{itemremark.S05}}</span>
+ </div>
+ </div>
</td>
</tr>
+ </tbody>
+ <tfoot>
+
<tr v-for="(itemtextareas,index) in item.detail" :key="index">
<td colspan="29" style="width: 480px;height: 150px ">
<div style="width: 100%;height: 100%;text-align: left"><textarea style="height: 99%;width: 99%;border: none;;font-size: 12px;overflow: hidden;text-align: left;vertical-align: middle">{{itemtextareas.processing_note}}</textarea>
</div>
</td>
</tr>
-
+ <tr style="border-bottom: none">
+ <td colspan="29" style="text-align: left;border-bottom: none;">
+ <div>
+ <span>璐ㄦ绛惧悕锛�</span>
+ <span style="margin-left: 300px">鐢熶骇绛惧悕锛�</span>
+ </div>
+ </td>
+ </tr>
</tfoot>
</table>
+
</div>
</template>
@@ -416,6 +416,7 @@
margin: 0;
padding: 0;
}
+
td,input{
text-align: center;
}
@@ -465,13 +466,15 @@
background: none;
}
-
+.nuber_xx span{
+ font-size: 12px;
+}
@media print {
@page {
size: auto; /* auto is the initial value */
- margin: 4mm 5mm 5mm 5mm /* this affects the margin in the printer settings */
+ margin: 4mm 5mm 10mm 5mm /* this affects the margin in the printer settings */
}
--
Gitblit v1.8.0