From d04aa3f34b1c5226d27da6af1150e900c8a73486 Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: Tue, 10 Sep 2024 14:18:18 +0800
Subject: [PATCH] bug修改
---
src/views/hazardousChemicals/finishedBasicInfo/components/finishedBasicDialog.vue | 4 ++++
src/views/hazardousChemicals/basicInfon/components/basicDialog.vue | 4 ++++
src/views/hazardousChemicals/warehouseManage/components/printCode.vue | 37 ++++++++++++++++++++++++++++++++++++-
3 files changed, 44 insertions(+), 1 deletions(-)
diff --git a/src/views/hazardousChemicals/basicInfon/components/basicDialog.vue b/src/views/hazardousChemicals/basicInfon/components/basicDialog.vue
index 29fa015..ea62d44 100644
--- a/src/views/hazardousChemicals/basicInfon/components/basicDialog.vue
+++ b/src/views/hazardousChemicals/basicInfon/components/basicDialog.vue
@@ -313,6 +313,10 @@
label: 'mg',
},
{
+ value: 'kg',
+ label: 'kg',
+ },
+ {
value: 'ml',
label: 'ml',
},
diff --git a/src/views/hazardousChemicals/finishedBasicInfo/components/finishedBasicDialog.vue b/src/views/hazardousChemicals/finishedBasicInfo/components/finishedBasicDialog.vue
index bde12db..5372392 100644
--- a/src/views/hazardousChemicals/finishedBasicInfo/components/finishedBasicDialog.vue
+++ b/src/views/hazardousChemicals/finishedBasicInfo/components/finishedBasicDialog.vue
@@ -314,6 +314,10 @@
label: 'mg',
},
{
+ value: 'kg',
+ label: 'kg',
+ },
+ {
value: 'ml',
label: 'ml',
},
diff --git a/src/views/hazardousChemicals/warehouseManage/components/printCode.vue b/src/views/hazardousChemicals/warehouseManage/components/printCode.vue
index a92c71e..9cdf7cc 100644
--- a/src/views/hazardousChemicals/warehouseManage/components/printCode.vue
+++ b/src/views/hazardousChemicals/warehouseManage/components/printCode.vue
@@ -35,6 +35,7 @@
<div style="font-size:14px;margin-bottom: 2px" id="codeTitle">{{scope.row.name}}—{{scope.row.productSn}}</div>
<vue-qr :size="100" :correctLevel="3" colorDark="black" :margin="0" :auto-color="true" :text="scope.row.code"></vue-qr>
<div style="font-size:10px;margin-top: 2px">{{scope.row.code}}</div>
+ <div class="page-break"></div>
</div>
</div>
</template>
@@ -51,7 +52,7 @@
<template #footer>
<span class="dialog-footer">
<el-button @click="handleClose" size="default">取 消</el-button>
- <el-button type="primary" @click="printEvent" size="default" v-preReClick>打印</el-button>
+ <el-button type="primary" @click="handlePrint" size="default" v-preReClick>打印</el-button>
</span>
</template>
</el-dialog>
@@ -225,6 +226,40 @@
// handleClose()
}
+const handlePrint = () => {
+ let data = [];
+ if(state.chooseList && state.chooseList.length>0){
+ data = state.chooseList;
+ }else {
+ data = state.dataList;
+ }
+ let qrCodes="";
+ for(const index in data){
+ console.log(index,"index");
+ qrCodes+=`<div class="my-list-col"><div class="centered-content changeFont">${document.getElementById(data[index].code).innerHTML}</div></div>`;
+ }
+ const printContent=document.createElement("div");
+ printContent.innerHTML=qrCodes;
+ document.getElementsByTagName("body")[0].style.zoom=0.92;
+ // 获取打印模板的DOM元素
+ if (printContent) {
+ // 显示打印模板，以便能够打印
+ printContent.classList.remove("print-hide");
+ // 使用vue-printjs打印模板内容
+ const style = "@media print {@page { size:auto;margin:0; } .page-break { page-break-after:always;} .changeFont{text-align:center;margin-top: 10px} ";
+ printJS({
+ printable: printContent,
+ type: "html",
+ style: style,
+ error: (err) => {
+ console.log("err", err);
+ },
+ font_size: "10px"
+ });
+ // 打印完成后隐藏打印模板
+ printContent.classList.add("print-hide");
+ }
+};
defineExpose({
openDialog
--
Gitblit v1.9.2