From 5a656e598c979f3bffd4a589eca2f8a2c93c984e Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 18 十月 2024 08:50:13 +0800
Subject: [PATCH] 修改报告生成
---
src/components/do/b1-inspect-order-plan/circuit-parameters1.vue | 2 +-
src/components/do/b1-report-preparation/order.vue | 3 ++-
src/components/view/b1-inspection-order.vue | 12 ++++++------
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/circuit-parameters1.vue b/src/components/do/b1-inspect-order-plan/circuit-parameters1.vue
index 9f0b31e..1ac292c 100644
--- a/src/components/do/b1-inspect-order-plan/circuit-parameters1.vue
+++ b/src/components/do/b1-inspect-order-plan/circuit-parameters1.vue
@@ -189,7 +189,7 @@
<td>棰戞</td>
<td v-for="(item,index) in n.portList" :key="index+'aaa'">
<div style="display: flex;align-items: center;">
- <el-input size="small" placeholder="绔彛" v-model="item.value" :disabled="state>1"></el-input>
+ <el-input size="small" placeholder="棰戞" v-model="item.value" :disabled="state>1"></el-input>
</div>
</td>
<td :rowspan="n.angleList.length+1">
diff --git a/src/components/do/b1-report-preparation/order.vue b/src/components/do/b1-report-preparation/order.vue
index 2e76157..b17cf56 100644
--- a/src/components/do/b1-report-preparation/order.vue
+++ b/src/components/do/b1-report-preparation/order.vue
@@ -269,7 +269,8 @@
if(item1.state==1){
arr.push({
laboratory:item.laboratory,
- num:item1.num
+ num:item1.num,
+ insOrderUsersId:item1.id
})
}
})
diff --git a/src/components/view/b1-inspection-order.vue b/src/components/view/b1-inspection-order.vue
index dde0aa7..f3b34a3 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(){
--
Gitblit v1.9.3