From f4fcc315bb525eb134ff36b15a893d4d227f51aa Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 30 Oct 2024 09:05:57 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=B0=8F=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3=EF=BC=88=E8=BF=87=E7=A8=8B=E6=8A=BD=E6=A3=80=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qm/process2.vue      |  2 +-
 src/views/setting/print/A4.vue | 24 +++++++++++++-----------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/views/qm/process2.vue b/src/views/qm/process2.vue
index 407e80f9..38426b8d 100644
--- a/src/views/qm/process2.vue
+++ b/src/views/qm/process2.vue
@@ -122,7 +122,7 @@
 			></materials>
 		</el-dialog>
 		<el-dialog v-model="printVisible" width="1200px">
-			<print :baseData="rowItem" type="ptest_gx" @closePrint="printVisible=false"/>
+			<print :baseData="rowItem" type="ptest_cj" @closePrint="printVisible=false"/>
 		</el-dialog>
 	</el-container>
 </template>
diff --git a/src/views/setting/print/A4.vue b/src/views/setting/print/A4.vue
index 7b32e4a8..5c80749b 100644
--- a/src/views/setting/print/A4.vue
+++ b/src/views/setting/print/A4.vue
@@ -163,7 +163,8 @@
                         <li class="export_ulli export_ulli_h"></li>
                     </ul>
                     <ul class="export_ul">
-                        <li class="export_ulli">{{ baseData.count_ok }}</li>
+                        <li class="export_ulli" v-if="type=='ptest_gx'">{{ baseData.count_ok }}</li>
+                        <li class="export_ulli" v-else>{{ baseData.count_sampling_ok }}</li>
                         <li class="export_ulli">{{baseData.count_notok}}</li>
                         <li class="export_ulli">{{ baseData.rate }}</li>
                         <li class="export_ulli"></li>
@@ -197,16 +198,16 @@
                         <li class="export_ulli">{{baseData.count_n_txd}}</li>
                     </ul>
                     <ul class="export_ul" v-else>
-                        <li class="export_ulli">{{baseData.count_notok_json.count_n_hd}}</li>
-                        <li class="export_ulli">{{baseData.count_notok_json.count_n_qp}}</li>
-                        <li class="export_ulli">{{baseData.count_notok_json.count_n_swen}}</li>
-                        <li class="export_ulli">{{baseData.count_notok_json.count_n_bb}}</li>
-                        <li class="export_ulli">{{baseData.count_notok_json.count_n_hs}}</li>
-                        <li class="export_ulli">{{baseData.count_notok_json.count_n_md}}</li>
-                        <li class="export_ulli">{{baseData.count_notok_json.count_n_xbb}}</li>
-                        <li class="export_ulli">{{baseData.count_notok_json.count_n_wj}}</li>
-                        <li class="export_ulli">{{baseData.count_notok_json.count_n_yd}}</li>
-                        <li class="export_ulli">{{baseData.count_notok_json.count_n_txd}}</li>
+                        <li class="export_ulli" v-if="baseData.count_notok_json">{{baseData.count_notok_json.count_n_hd}}</li>
+                        <li class="export_ulli" v-if="baseData.count_notok_json">{{baseData.count_notok_json.count_n_qp}}</li>
+                        <li class="export_ulli" v-if="baseData.count_notok_json">{{baseData.count_notok_json.count_n_swen}}</li>
+                        <li class="export_ulli" v-if="baseData.count_notok_json">{{baseData.count_notok_json.count_n_bb}}</li>
+                        <li class="export_ulli" v-if="baseData.count_notok_json">{{baseData.count_notok_json.count_n_hs}}</li>
+                        <li class="export_ulli" v-if="baseData.count_notok_json">{{baseData.count_notok_json.count_n_md}}</li>
+                        <li class="export_ulli" v-if="baseData.count_notok_json">{{baseData.count_notok_json.count_n_xbb}}</li>
+                        <li class="export_ulli" v-if="baseData.count_notok_json">{{baseData.count_notok_json.count_n_wj}}</li>
+                        <li class="export_ulli" v-if="baseData.count_notok_json">{{baseData.count_notok_json.count_n_yd}}</li>
+                        <li class="export_ulli" v-if="baseData.count_notok_json">{{baseData.count_notok_json.count_n_txd}}</li>
                     </ul>
                 </div>
                 <!-- 尺寸检验/外观检验 -->
@@ -551,6 +552,7 @@
 			};
 		},
 		mounted() {
+            console.log('this.baseData',this.baseData)
             let that = this;
             that.printId = that.baseData.id;
             that.value = that.type+":"+that.printId;