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 | 33 +++++++++++++++++++--------------
1 files changed, 19 insertions(+), 14 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 6742aaa..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
@@ -8,7 +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()
const {t} = useI18n()
let router = useRouter()
let produceList = ref([])
@@ -40,17 +42,11 @@
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 = [];
- //
- // // 鑾峰彇姣忎釜鍏冪礌鐨� S01 鍊煎苟瀛樺偍鍒� s01Values 鏁扮粍涓�
- // produceList.value[0].numberList.forEach(element => {
- // const otherColumnsObject = JSON.parse(element.other_columns);
- // const s01Value = otherColumnsObject.S01;
- // s01Values.push(s01Value);
- // });
- // produceList.value[0].detailList.forEach((detail, index) => {
- // detail.s01Value = s01Values[index]; // 娣诲姞涓�涓悕涓� s01Value 鐨勬柊灞炴�э紝瀛樺偍瀵瑰簲鐨� S01 鍊�
- // });
// 閬嶅巻 res.data.numberList 鏁扮粍锛岃幏鍙栨瘡涓厓绱犵殑 S01 鍊煎苟瀛樺偍鍒� s01Values 鏁扮粍涓�
produceList.value[0].detailList.forEach(element => {
try {
@@ -158,9 +154,13 @@
<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 style="text-align: right;font-weight: bolder">娴佺▼鍗″彿锛� {{
+ <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>
@@ -255,9 +255,9 @@
鏁伴噺锛�
<label>{{ itemsum.quantity }}</label>
闈㈢Н锛�
- <label>{{ parseFloat(itemsum.gross_area, 2) }}</label>
+ <label>{{ parseFloat(itemsum.gross_area.toFixed(2)) }}</label>
閲嶉噺锛�
- <label>{{ itemsum.weight }}</label>
+ <label>{{ parseFloat(itemsum.weight.toFixed(2)) }}</label>
</td>
</tr>
<tr v-for="(itemtextarea,index) in item.detail" :key="index">
@@ -399,6 +399,11 @@
font-weight: bolder;
}
+@page {
+ size: auto; /* auto is the initial value */
+ margin: 13mm 6mm 0mm 6mm /* this affects the margin in the printer settings */
+
+}
@media print {
--
Gitblit v1.8.0