From 95cafbee8f05dc6fbc6256c5cd84bcfe3621107f Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期四, 07 十二月 2023 17:30:38 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/views/equipment/equipment/index.vue | 65 +++++++++++++++++++++++--------- 1 files changed, 47 insertions(+), 18 deletions(-) diff --git a/src/views/equipment/equipment/index.vue b/src/views/equipment/equipment/index.vue index 5a2a8dc..f19e542 100644 --- a/src/views/equipment/equipment/index.vue +++ b/src/views/equipment/equipment/index.vue @@ -18,35 +18,37 @@ ref="addOrUpdate" @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;"> + </basic-container> + <el-dialog title="鏍囩鍒楄〃" :visible.sync="diaPrintTab" width="500px" top="5vh"> + <div style="width:100%;height:400px;overflow-y: auto;"> + <div class="dia_body" id="printRaw"> + <el-card class="box-card" v-for="(tem, i) in multipleSelection" :key="i" style="margin-bottom: 10px; font-size: 16px !important;"> <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;">{{ tem.id }}</el-col> </el-row> <el-row> - <el-col :span="10" :offset="3">缂栧彿锛�</el-col> - <el-col :span="10" style="font-weight: bold;">{{ tem.code }}</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> </el-card> </div> - <span slot="footer" class="dialog-footer"> - <el-button @click="diaPrintTab = false">鍙� 娑�</el-button> - <el-button type="primary" @click="diaPrintTab = false">鎵� 鍗�</el-button> - </span> - </el-dialog> - </basic-container> + </div> + <span slot="footer" class="dialog-footer"> + <el-button @click="diaPrintTab = false">鍙� 娑�</el-button> + <el-button type="primary" @click="printFun">鎵� 鍗�</el-button> + </span> + </el-dialog> </div> </template> @@ -58,6 +60,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 +288,33 @@ }) }, methods: { + printFun() { + // this.printDialogVisible = false; + this.diaPrintTab = false; + PrintJS({ + printable: 'printRaw',//椤甸潰 + type: "html",//鏂囨。绫诲瀷 + maxWidth:450, + targetStyles:['*'], + style: `@page { + margin:0; + padding: 0; + size: 360px 170px; + } + html{ + zoom:100%; + } + @media print{ + width: 360px; + height: 170px; + margin:0; + padding: 0; + }`, + onPrintDialogClose: this.erexcel=false, + targetStyles: ["*"], // 浣跨敤dom鐨勬墍鏈夋牱寮忥紝寰堥噸瑕� + font_size: '', + }); + }, pullEquipFun(){ this.table.toolbar.find((e) => e.text === '鍚屾').loading = true pullEquip().then(res=>{ @@ -313,7 +343,6 @@ }, handleSelectionChange(val) { this.multipleSelection = val - console.log(this.multipleSelection); }, // 鏂板 / 淇敼 addOrUpdateHandle(row) { -- Gitblit v1.9.3