From ad2437550eb0c8f3c3c8736df1a38a713f920ec2 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期五, 15 十二月 2023 10:13:40 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/equipment/equipment/index.vue | 53 +++++++++++++++++++++++++++++++++--------------------
1 files changed, 33 insertions(+), 20 deletions(-)
diff --git a/src/views/equipment/equipment/index.vue b/src/views/equipment/equipment/index.vue
index 2b59511..083640d 100644
--- a/src/views/equipment/equipment/index.vue
+++ b/src/views/equipment/equipment/index.vue
@@ -18,12 +18,14 @@
ref="addOrUpdate"
@refreshDataList="getData"
></table-form>
- <el-dialog title="鏍囩鍒楄〃" :visible.sync="diaPrintTab" width="500px">
- <div class="dia_body">
- <el-card class="box-card" id="printRaw" v-for="(tem, i) in multipleSelection" :key="i" style="margin-bottom: 30px;">
+ </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="8" :offset="1">搴忓彿锛�</el-col>
- <el-col :span="7" style="font-weight: bold;">{{ i + 1 }}</el-col>
+ <el-col :span="7" style="font-weight: bold;">{{ tem.id }}</el-col>
</el-row>
<el-row>
<el-col :span="8" :offset="1">缂栧彿锛�</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>
@@ -234,12 +236,12 @@
type: 'primary',
fun: this.labelPrint
},
- // {
- // text: '鍚屾',
- // type: 'primary',
- // loading: false,
- // fun: this.pullEquipFun
- // }
+ {
+ text: '鍚屾',
+ type: 'primary',
+ loading: false,
+ fun: this.pullEquipFun
+ }
],
operator: [
{
@@ -289,13 +291,25 @@
printFun() {
// this.printDialogVisible = false;
this.diaPrintTab = false;
- console.log(printRaw);
PrintJS({
- printable: "printRaw",//椤甸潰
+ printable: 'printRaw',//椤甸潰
type: "html",//鏂囨。绫诲瀷
maxWidth:450,
targetStyles:['*'],
- style:"@page {margin:0 ;resolution: 300dpi;portrait}",
+ 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: '',
@@ -329,7 +343,6 @@
},
handleSelectionChange(val) {
this.multipleSelection = val
- console.log(this.multipleSelection);
},
// 鏂板 / 淇敼
addOrUpdateHandle(row) {
--
Gitblit v1.9.3