From b5397c4f12baf35a3200ce4d053d549ffa7ec2e4 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 01 七月 2024 17:24:09 +0800
Subject: [PATCH] 修改打印样式
---
src/components/do/b1-ins-order/add.vue | 15 +++++++++------
src/components/view/b1-inspection-order.vue | 2 +-
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index adbde7c..66c5d90 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -900,7 +900,8 @@
'RTS','A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z'],
inspectionItem:null,
circulateShow:false,
- circulateForm:{}
+ circulateForm:{},
+ isBsm2Val2:false
}
},
watch: {
@@ -1330,7 +1331,8 @@
this.$axios.post(this.$api.insOrder.upInsOrderOfState, {
state,
id: this.currentId,
- companyId:this.addObj.companyId
+ companyId:this.addObj.companyId,
+ laboratory:this.addObj.laboratory
}, {
headers: {
'Content-Type': 'application/json'
@@ -1601,13 +1603,13 @@
} else if (row.bsm === '1' && row.section !== '' && row.section !== null && row.state === 0) {
row.bsm1 = false
}
- if (row.bsm === '1' && row.inspectionItem === '鍏夌氦鎺ュご鎹熻��' && this.sampleList.length > 1 && row.state === 1) {
+ if (row.bsm === '1' && row.inspectionItem === '鍏夌氦鎺ュご鎹熻��' && this.sampleList.length > 1 && row.state === 1&&!this.isBsm2Val2) {
+ this.bsm2 = true
+ this.bsm1Dia = true
if (this.bsm2Val2.length === 0) {
this.bsm2Val = (this.sampleList.length - 1) * this.sampleList.length / 2
this.computationalPairing(this.sampleList.length)
this.bsm2Val2 = this.HaveJson(this.bsm2Val3)
- this.bsm2 = true
- this.bsm1Dia = true
}
} else if (row.bsm === '1' && row.inspectionItem === '鍏夌氦鎺ュご鎹熻��' && row.state === 1 && this.sampleList.length > 1) {
this.bsm2 = false
@@ -1887,7 +1889,7 @@
} else if (p.bsm === '1' && p.section !== '' && p.section !== null && p.state === 0) {
p.bsm1 = false
}
- if (p.bsm === '1' && p.inspectionItem === '鍏夌氦鎺ュご鎹熻��' && this.sampleList.length > 1 && p.state === 1) {
+ if (p.bsm === '1' && p.inspectionItem === '鍏夌氦鎺ュご鎹熻��' && this.sampleList.length > 1 && p.state === 1&&!this.isBsm2Val2) {
this.bsm2 = true
this.bsm1Dia = true
if (this.bsm2Val2.length === 0) {
@@ -2140,6 +2142,7 @@
return
}
}
+ this.isBsm2Val2 = true;
}
// if(this.bsm3){
// if(!this.bsm3Val){
diff --git a/src/components/view/b1-inspection-order.vue b/src/components/view/b1-inspection-order.vue
index d23da41..d7870f2 100644
--- a/src/components/view/b1-inspection-order.vue
+++ b/src/components/view/b1-inspection-order.vue
@@ -734,7 +734,7 @@
targetStyles:['*'],
style: `@page {
margin:0;
- size: 360px 175px landscape;
+ size: 360px 175px portrait;
}
html{
zoom:100%;
--
Gitblit v1.9.3