From 67da82f0b0c24df5f19bbfcfec63801d9ae902d8 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期三, 13 十二月 2023 16:22:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/equipment/equipment/index.vue | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/src/views/equipment/equipment/index.vue b/src/views/equipment/equipment/index.vue
index c5911e0..f19e542 100644
--- a/src/views/equipment/equipment/index.vue
+++ b/src/views/equipment/equipment/index.vue
@@ -18,9 +18,11 @@
ref="addOrUpdate"
@refreshDataList="getData"
></table-form>
- <el-dialog title="鏍囩鍒楄〃" :visible.sync="diaPrintTab" width="500px">
+ </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: 30px; font-size: 16px !important;">
+ <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="8" :offset="1">搴忓彿锛�</el-col>
<el-col :span="7" style="font-weight: bold;">{{ tem.id }}</el-col>
@@ -41,12 +43,12 @@
</el-row>
</el-card>
</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>
- </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>
@@ -296,15 +298,17 @@
targetStyles:['*'],
style: `@page {
margin:0;
- size: 360px 175px;
+ padding: 0;
+ size: 360px 170px;
}
- hrml{
+ html{
zoom:100%;
}
@media print{
width: 360px;
- height: 175px;
+ height: 170px;
margin:0;
+ padding: 0;
}`,
onPrintDialogClose: this.erexcel=false,
targetStyles: ["*"], // 浣跨敤dom鐨勬墍鏈夋牱寮忥紝寰堥噸瑕�
@@ -339,7 +343,6 @@
},
handleSelectionChange(val) {
this.multipleSelection = val
- console.log(this.multipleSelection);
},
// 鏂板 / 淇敼
addOrUpdateHandle(row) {
--
Gitblit v1.9.3