From 0007127ac6b22ab2669f55702f7c81f71dae683b Mon Sep 17 00:00:00 2001
From: 86134 <aa>
Date: 星期三, 15 十一月 2023 10:16:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/equipment/equipment/index.vue | 41 +++++++++++++++++++++++++++++++----------
1 files changed, 31 insertions(+), 10 deletions(-)
diff --git a/src/views/equipment/equipment/index.vue b/src/views/equipment/equipment/index.vue
index 7f41a17..9be5723 100644
--- a/src/views/equipment/equipment/index.vue
+++ b/src/views/equipment/equipment/index.vue
@@ -19,23 +19,23 @@
@refreshDataList="getData"
></table-form>
<el-dialog title="鏍囩鍒楄〃" :visible.sync="diaPrintTab" width="500px">
- <div class="dia_body" style="height: 400px;overflow-y: auto;padding: 0 10px;">
- <el-card class="box-card" v-for="(tem, i) in multipleSelection" :key="i" style="margin-bottom: 15px;">
+ <div class="dia_body">
+ <el-card class="box-card" id="printRaw" v-for="(tem, i) in multipleSelection" :key="i" style="margin-bottom: 30px;">
<el-row>
- <el-col :span="10" :offset="3">搴忓彿锛�</el-col>
- <el-col :span="10" style="font-weight: bold;">{{ i + 1 }}</el-col>
+ <el-col :span="8" :offset="1">搴忓彿锛�</el-col>
+ <el-col :span="7" style="font-weight: bold;">{{ i + 1 }}</el-col>
</el-row>
<el-row>
- <el-col :span="10" :offset="3">缂栧彿锛�</el-col>
+ <el-col :span="8" :offset="1">缂栧彿锛�</el-col>
<el-col :span="10" style="font-weight: bold;">{{ tem.number }}</el-col>
</el-row>
<el-row>
- <el-col :span="10" :offset="3">璁惧鍚嶇О锛�</el-col>
- <el-col :span="10" style="font-weight: bold;">{{ tem.name }}</el-col>
+ <el-col :span="8" :offset="1">璁惧鍚嶇О锛�</el-col>
+ <el-col :span="7" style="font-weight: bold;">{{ tem.name }}</el-col>
</el-row>
<el-row>
- <el-col :span="10" :offset="3">璁惧浜岀淮鐮侊細</el-col>
- <el-col :span="10">
+ <el-col :span="8" :offset="1">璁惧浜岀淮鐮侊細</el-col>
+ <el-col :span="7">
<vueQr :text="tem.number" :size="80" :margin="2"></vueQr>
</el-col>
</el-row>
@@ -43,7 +43,7 @@
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="diaPrintTab = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="diaPrintTab = false">鎵� 鍗�</el-button>
+ <el-button type="primary" @click="printFun()">鎵� 鍗�</el-button>
</span>
</el-dialog>
</basic-container>
@@ -58,6 +58,7 @@
import * as fecha from 'element-ui/lib/utils/date'
import { remote } from '../../../api/admin/dict'
import vueQr from 'vue-qr'
+import PrintJS from 'print-js'
export default {
data() {
return {
@@ -285,6 +286,26 @@
})
},
methods: {
+ printFun() {
+ // this.printDialogVisible = false;
+ this.diaPrintTab = false;
+ PrintJS({
+ printable: "printRaw",
+ type: "html",
+ // maxWidth: 900,
+ // // header: "鍘熸潗鏂欐娴嬫姤鍛�",
+ // style:"@page {margin:2.4cm 2cm ;resolution: 300dpi;}",
+ // targetStyles: ["*"],
+ // ignoreElements: ["no-ignore"],q
+ // orientation: 'portrait'
+ maxWidth:450,
+ targetStyles:['*'],
+ style:"@page {margin:0 ;resolution: 300dpi;portrait}",
+ onPrintDialogClose: this.erexcel=false,
+ targetStyles: ["*"], // 浣跨敤dom鐨勬墍鏈夋牱寮忥紝寰堥噸瑕�
+ font_size: '',
+ });
+ },
pullEquipFun(){
this.table.toolbar.find((e) => e.text === '鍚屾').loading = true
pullEquip().then(res=>{
--
Gitblit v1.9.3