From 85aa4497849d485aa2e7ae01976ddc572f7022cc Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 04 七月 2024 13:13:06 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProcess.vue | 15 +++++++++------
1 files changed, 9 insertions(+), 6 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 c1f8d8c..6896970 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
@@ -8,10 +8,9 @@
import {useI18n} from 'vue-i18n'
import deepClone from "@/utils/deepClone";
import QRCode from "qrcode";
-import companyInfo from "@/stores/sd/companyInfo"
-
-const company = companyInfo()
+import companyInfo from "@/stores/sd/companyInfo";
//璇█鑾峰彇
+const company = companyInfo()
const {t} = useI18n()
let router = useRouter()
let produceList = ref([])
@@ -74,7 +73,6 @@
}
});
- console.log(produceList.value)
@@ -156,7 +154,7 @@
<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>{{company.companyName}}</div>
<div>鐢熶骇娴佺▼鍗�</div>
<div v-if="itemFlow.technologyNumberMerge!=''" style="text-align: right;font-weight: bolder">娴佺▼鍗″彿锛� {{
itemFlow.process_id
@@ -204,6 +202,7 @@
<!-- <td colspan='2'></td>-->
</tr>
<tr>
+
<td>{{company.printLabel.printFlowCard.patch}}</td>
<td>{{company.printLabel.printFlowCard.lackOf}}</td>
<td>{{company.printLabel.printFlowCard.patch}}</td>
@@ -271,6 +270,7 @@
</td>
<td>瀹屽伐绛惧悕</td>
<td></td>
+
<td colspan="2"></td>
<td colspan="2"></td>
<td colspan="2"></td>
@@ -283,6 +283,7 @@
<tr>
<td>鐢熶骇鏃ユ湡</td>
<td></td>
+
<td colspan="2"></td>
<td colspan="2"></td>
<td colspan="2"></td>
@@ -295,6 +296,7 @@
<tr>
<td>璐ㄦ绛惧悕</td>
<td></td>
+
<td colspan="2"></td>
<td colspan="2"></td>
<td colspan="2"></td>
@@ -381,7 +383,8 @@
@page {
size: auto; /* auto is the initial value */
- margin: 2mm 0mm 0mm 1mm; /* this affects the margin in the printer settings */
+ margin: 13mm 6mm 0mm 6mm /* this affects the margin in the printer settings */
+
}
@media print {
--
Gitblit v1.8.0