From 3845f43c43252185a134566a63670de9d1c2d253 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 28 十月 2024 15:06:45 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/tx-lims-before into master
---
src/components/view/b1-inspection-order.vue | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/components/view/b1-inspection-order.vue b/src/components/view/b1-inspection-order.vue
index dde0aa7..9c1b6e6 100644
--- a/src/components/view/b1-inspection-order.vue
+++ b/src/components/view/b1-inspection-order.vue
@@ -429,7 +429,7 @@
</el-row>
</span>
</el-dialog>
- <div class="el-dialog__body" style="overflow-y: auto;position: fixed;top:60px;right: 20px;z-index: 9999;">
+ <div class="el-dialog__body" style="overflow-y: auto;position: fixed;top:60px;right: 20px;z-index: 9999;display: none;">
<div id="printMOrder" class="printMOrder" ref="printMOrder">
<el-card class="box-card" v-for="(item, i) in checkDataList" :key="i+'uuuuu'" style="font-size: 16px !important;page-break-after: always;color: #000;box-shadow: none;margin: 0 !important;padding: 0 !important;">
<div>
@@ -942,7 +942,7 @@
targetStyles: ["*"], // 浣跨敤dom鐨勬墍鏈夋牱寮忥紝寰堥噸瑕�
printable: 'printMOrder',//椤甸潰
type: "html",//鏂囨。绫诲瀷
- maxWidth:360,
+ maxWidth:720,
header: '',
style:
`@page {
@@ -951,18 +951,18 @@
margin-top: 0.4cm;
margin-bottom: 0.4cm;
padding-bottom: 0px;
- size: 400px 75px collapse;
+ size: 800px 600px collapse;
}
html{
zoom:100%;
}
@media print{
- width: 400px;
- height: 75px;
+ width: 800px;
+ height: 600px;
margin:0;
}`,
- font_size: '0.29cm',
+ font_size: '16px',
});
},
async print(){
@@ -998,7 +998,10 @@
this.$refs['ValueTable'].selectList(e)
},
refresh() {
+ let state = this.componentData.entity.state
this.componentData.entity = this.HaveJson(this.entityCopy)
+ this.componentData.entity.state = state
+ this.refreshTable()
this.upIndex++
},
// 鏉冮檺鍒嗛厤
--
Gitblit v1.9.3